From 57b7c99b9ae378fd9c19a1a41da22839dffaced9 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Mon, 2 Nov 2026 06:05:39 +0300 Subject: [PATCH 01/16] fix: keep games being updated in the installed list for every store (#1989) --- .../com/droiddeck/launcher/stores/StoreInstallRoot.kt | 2 +- .../java/com/droiddeck/launcher/stores/StoresState.kt | 2 +- .../droiddeck/launcher/stores/StoreInstallRootTest.kt | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index c26bcd17d6..6814ad4e95 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -246,7 +246,7 @@ object StoreInstallRoot { val sidecar = StoreGameSidecar.read(folder) when { sidecar == null -> Unfinished(store, null, folder) - store == Store.GOG && sidecar.state == StoreGameSidecar.STATE_UPDATING -> null + sidecar.state == StoreGameSidecar.STATE_UPDATING -> null !sidecar.isInstalled -> Unfinished(store, sidecar.id, folder) else -> null } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index cf774f47bd..2902cd3664 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -81,7 +81,7 @@ object StoresState { runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(app) } val found = Store.entries.mapNotNull { store -> StoreAccounts.displayName(app, store)?.let { store to it } } val onDisk = StoreInstallRoot.gameFolders(app).mapNotNull { folder -> - StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.store == Store.GOG && it.state == StoreGameSidecar.STATE_UPDATING }?.let { InstalledStoreGame(it, folder) } + StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.state == StoreGameSidecar.STATE_UPDATING }?.let { InstalledStoreGame(it, folder) } } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(app) }.getOrDefault(emptyList()) val partial = StoreInstallRoot.unfinished(app) val version = if (StoresNative.available) StoresNative.version ?: "" else "" diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index 78508a525f..09cf7fc265 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -201,6 +201,15 @@ class StoreInstallRootTest { assertTrue(StoreInstallRoot.unfinished(app).none { it.folder.absolutePath == half.absolutePath }) } + @Test fun aGameBeingUpdatedIsNotAnUnfinishedInstallForAnyStore() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + for (store in listOf(Store.EPIC, Store.ITCH, Store.XBOX, Store.AMAZON)) { + val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), store), StoreInstallRoot.folderName("Updating", "u1")).apply { mkdirs() } + StoreGameSidecar(store, "u1", "Updating", "Updating.exe", state = StoreGameSidecar.STATE_UPDATING).write(folder) + assertTrue(StoreInstallRoot.unfinished(app).none { it.folder.absolutePath == folder.absolutePath }) + } + } + @Test fun theScratchCacheIsPrivateAndNamedSafely() { val dir = StoreInstallRoot.scratchDir(app, Store.EPIC, "a/b:c") assertTrue(dir.absolutePath.startsWith(app.cacheDir.absolutePath)) From 92ec0929aee269ae315703b41b7e37197a3c669d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 1 Nov 2026 22:17:24 -0500 Subject: [PATCH 02/16] fix: remove the Bottom screen HUD descriptions from the HUD settings (#1988) * fix: remove the Bottom screen HUD descriptions from the performance HUD settings * fix: remove the telemetry blurb, speed units row and tap hint from the bottom stats page * fix: keep steamClientLabel --- .../launcher/ui/BottomTelemetryPage.kt | 23 +------------------ .../launcher/ui/DroidDeckHudSettings.kt | 6 ++--- app/src/main/res/values-ar/strings.xml | 4 ---- app/src/main/res/values-b+es+419/strings.xml | 4 ---- app/src/main/res/values-bg/strings.xml | 4 ---- app/src/main/res/values-cs/strings.xml | 4 ---- app/src/main/res/values-da/strings.xml | 4 ---- app/src/main/res/values-de/strings.xml | 4 ---- app/src/main/res/values-el/strings.xml | 4 ---- app/src/main/res/values-es/strings.xml | 4 ---- app/src/main/res/values-fi/strings.xml | 4 ---- app/src/main/res/values-fr/strings.xml | 4 ---- app/src/main/res/values-hi/strings.xml | 4 ---- app/src/main/res/values-hu/strings.xml | 4 ---- app/src/main/res/values-in/strings.xml | 4 ---- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 4 ---- app/src/main/res/values-ko/strings.xml | 4 ---- app/src/main/res/values-ms/strings.xml | 4 ---- app/src/main/res/values-nb/strings.xml | 4 ---- app/src/main/res/values-nl/strings.xml | 4 ---- app/src/main/res/values-pl/strings.xml | 4 ---- app/src/main/res/values-pt-rPT/strings.xml | 4 ---- app/src/main/res/values-pt/strings.xml | 4 ---- app/src/main/res/values-ro/strings.xml | 4 ---- app/src/main/res/values-ru/strings.xml | 4 ---- app/src/main/res/values-sv/strings.xml | 4 ---- app/src/main/res/values-th/strings.xml | 4 ---- app/src/main/res/values-tr/strings.xml | 4 ---- app/src/main/res/values-uk/strings.xml | 4 ---- app/src/main/res/values-vi/strings.xml | 4 ---- app/src/main/res/values-zh-rCN/strings.xml | 4 ---- app/src/main/res/values-zh-rHK/strings.xml | 4 ---- app/src/main/res/values-zh-rTW/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 7 ------ 35 files changed, 4 insertions(+), 160 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt index 41c690f90a..934ad773a7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -132,7 +132,7 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } var unknown by remember { mutableStateOf>(emptyList()) } var strip by remember { mutableStateOf(StatsStrip.from(SessionPrefs.statsStrip(context))) } var dash by remember { mutableStateOf(StatsDash.from(SessionPrefs.statsDash(context))) } - var speedUnit by remember { mutableStateOf(SpeedUnit.from(SessionPrefs.statsSpeedUnit(context))) } + val speedUnit = SpeedUnit.from(SessionPrefs.statsSpeedUnit(context)) val shownUnit = speedUnit.resolve(Resources.getSystem().configuration.locales[0].country) val fpsHistory = remember { History(PERF_N) } val cpuHistory = remember { History(PERF_N) } @@ -374,10 +374,6 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } )) } } - if (race == null && thunder.isEmpty() && elite == null && running == null) { - Text(stringResource(R.string.bottom_telemetry_help), - fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) - } if (outputs.isNotEmpty() || menuGames.isNotEmpty()) TelemetryCard(stringResource(R.string.bottom_telemetry_send_title)) { if (outputs.isNotEmpty()) SwitchRow(stringResource(R.string.bottom_telemetry_send_auto), stringResource(R.string.bottom_telemetry_send_auto_hint), auto, true) { want -> scope.launch { @@ -420,12 +416,6 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } Text(stringResource(R.string.bottom_telemetry_port_busy, busyPorts.sorted().joinToString()), fontSize = 13.sp, color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) } - ChoiceRow(stringResource(R.string.stats_speed_units), - if (speedUnit == SpeedUnit.AUTO) stringResource(R.string.stats_speed_units_auto, shownUnit.label) else speedUnit.label) { - speedUnit = speedUnit.next() - SessionPrefs.setStatsSpeedUnit(context, speedUnit.id) - } - Text(stringResource(R.string.stats_tap_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) } } } @@ -465,19 +455,8 @@ private fun httpGet(url: String): String { } } - internal fun steamClientLabel(arch: String): Int = if (arch == "x86_64") R.string.stats_steam_client_x86 else R.string.stats_steam_client_arm -@Composable -private fun ChoiceRow(title: String, value: String, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - Row(Modifier.fillMaxWidth().clickable(role = Role.Button, onClick = onClick).padding(horizontal = 4.dp, vertical = 6.dp), - verticalAlignment = Alignment.CenterVertically) { - Text(title, fontSize = 15.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) - Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = LocalPalette.current.primary) - } -} - @Composable private fun SwitchRow(title: String, hint: String?, checked: Boolean, enabled: Boolean, onChange: (Boolean) -> Unit) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 505bf44937..95768fb659 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -110,13 +110,13 @@ private fun BottomStripSettings(host: MenuHost, track: (String) -> Modifier) { var hudOn by remember { mutableStateOf(SessionPrefs.bottomHud(context)) } var onTabs by remember { mutableStateOf(SessionPrefs.bottomStripOnTabs(context)) } var shown by remember { mutableStateOf(SessionPrefs.bottomStripMetrics(context)) } - SettingsGroup(stringResource(R.string.bottom_hud_group), detail = stringResource(R.string.bottom_hud_group_detail)) { - ToggleRow(host, "bottom-hud", stringResource(R.string.bottom_hud_group), stringResource(R.string.bottom_hud_hint), hudOn, + SettingsGroup(stringResource(R.string.bottom_hud_group)) { + ToggleRow(host, "bottom-hud", stringResource(R.string.bottom_hud_group), null, hudOn, chipModifier = track("bottom-hud")) { on -> hudOn = on SessionPrefs.setBottomHud(context, on) } - ToggleRow(host, "bottom-strip-tabs", stringResource(R.string.bottom_strip_tabs), stringResource(R.string.bottom_strip_tabs_hint), onTabs, + ToggleRow(host, "bottom-strip-tabs", stringResource(R.string.bottom_strip_tabs), null, onTabs, enabled = hudOn, chipModifier = track("bottom-strip-tabs")) { on -> onTabs = on SessionPrefs.setBottomStripOnTabs(context, on) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 28f6862c23..73c992152e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1890,8 +1890,6 @@ دواسة الوقود والمكابح، آخر 10 s السرعة، %1$s الترس - وحدات السرعة - تلقائي (%1$s) عميل Steam ARM عميل Steam x86 دواسة الوقود @@ -1909,7 +1907,6 @@ الوقود، t الرئيسي %1$s t الاحتياطي %1$s t - انقر على الشريط العلوي أو لوحة العدادات لتغيير نمطها. إرسال بيانات لوحة العدادات تلقائي يفعّلها لكل لعبة مدرجة هنا، بما في ذلك الألعاب التي يُعثر عليها لاحقًا. تبقى الألعاب التي توقفها متوقفة. @@ -1948,7 +1945,6 @@ الرصيد War Thunder Elite Dangerous - فعِّل إخراج البيانات في لعبة السباق (يُسمّى غالبًا القياس عن بُعد أو UDP) لرؤية لوحة عدادات حية هنا. تبقى البيانات على هذا الجهاز. يستقبل المنفذ %1$d بيانات (%2$d حزمة بحجم %3$d بايت)، لكن بتنسيق لا تستطيع هذه الصفحة قراءته بعد. يستخدم برنامج آخر المنفذ %1$s بالفعل، لذا لا يمكن عرض تلك اللعبة هنا. 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 d78cd0c5a1..1107fdbeab 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1888,8 +1888,6 @@ Acelerador y freno, últimos 10 s Velocidad, %1$s Marcha - Unidades de velocidad - Automático (%1$s) Cliente de Steam ARM Cliente de Steam x86 Acelerador @@ -1907,7 +1905,6 @@ Combustible, t Principal %1$s t Reserva %1$s t - Toca la franja superior o el tablero para cambiar su estilo. Enviar datos al panel Automático Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados. @@ -1946,7 +1943,6 @@ Saldo War Thunder Elite Dangerous - Activa la salida de datos de un juego de carreras (a menudo llamada telemetría o UDP) para ver aquí un panel en vivo. Los datos no salen de este dispositivo. El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer. Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí. Eliminando el runtime de Linux diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 434621739e..bdd38d411a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1802,8 +1802,6 @@ Газ и спирачка, последните 10 s Скорост, %1$s Предавка - Единици за скорост - Автоматично (%1$s) Steam клиент ARM Steam клиент x86 Газ @@ -1821,7 +1819,6 @@ Гориво, t Основно %1$s t Резерв %1$s t - Докоснете горната лента или таблото, за да смените стила му. Изпращане на данни за таблото Автоматично Включва го за всяка игра от списъка тук, включително игри, открити по-късно. Игрите, които изключите, остават изключени. @@ -1860,7 +1857,6 @@ Баланс War Thunder Elite Dangerous - Включете извеждането на данни в състезателна игра (често наричано телеметрия или UDP), за да виждате тук табло на живо. Данните остават на това устройство. Порт %1$d получава данни (%2$d пакета по %3$d байта), но във формат, който тази страница все още не може да чете. Друга програма вече използва порт %1$s, затова тази игра не може да се показва тук. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e060b5590d..825df28c9c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1846,8 +1846,6 @@ Plyn a brzda, posledních 10 s Rychlost, %1$s Rychlostní stupeň - Jednotky rychlosti - Automaticky (%1$s) Klient Steam ARM Klient Steam x86 Plyn @@ -1865,7 +1863,6 @@ Palivo, t Hlavní %1$s t Rezerva %1$s t - Klepnutím na horní pruh nebo palubní desku změníte jejich styl. Odesílat data pro palubní desku Automaticky Zapne to pro každou zde uvedenou hru, včetně her nalezených později. Hry, které vypnete, zůstanou vypnuté. @@ -1904,7 +1901,6 @@ Zůstatek War Thunder Elite Dangerous - Zapněte v závodní hře výstup dat (často nazývaný telemetrie nebo UDP) a uvidíte zde živou palubní desku. Data zůstávají v tomto zařízení. Port %1$d přijímá data (%2$d paketů po %3$d bajtech), ale ve formátu, který tato stránka zatím neumí přečíst. Port %1$s již používá jiný program, takže se zde tato hra nemůže zobrazit. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index fda22db685..8722c4dacc 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1802,8 +1802,6 @@ Speeder og bremse, seneste 10 s Hastighed, %1$s Gear - Hastighedsenheder - Auto (%1$s) Steam-klient ARM Steam-klient x86 Speeder @@ -1821,7 +1819,6 @@ Brændstof, t Hoved %1$s t Reserve %1$s t - Tryk på den øverste bjælke eller instrumentbrættet for at skifte stil. Send instrumentbrætdata Auto Slår det til for alle spil på listen her, også spil, der findes senere. Spil, du slår fra, forbliver slået fra. @@ -1860,7 +1857,6 @@ Saldo War Thunder Elite Dangerous - Slå dataoutput til i et racerspil (ofte kaldet telemetri eller UDP) for at se et live-instrumentbræt her. Det forbliver på denne enhed. Port %1$d modtager data (%2$d pakker á %3$d bytes), men i et format, som denne side endnu ikke kan læse. Et andet program bruger allerede port %1$s, så det spil kan ikke vises her. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 05094d7eba..a8a431e18a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1794,8 +1794,6 @@ Gas und Bremse, letzte 10 s Geschwindigkeit, %1$s Gang - Geschwindigkeitseinheit - Automatisch (%1$s) Steam-Client ARM Steam-Client x86 Gas @@ -1813,7 +1811,6 @@ Treibstoff, t Haupttank %1$s t Reserve %1$s t - Tippe auf die obere Leiste oder die Instrumentenanzeige, um ihren Stil zu ändern. Dashboard-Daten senden Automatisch Schaltet es für jedes hier aufgeführte Spiel ein, auch für später gefundene Spiele. Spiele, die du ausschaltest, bleiben aus. @@ -1852,7 +1849,6 @@ Guthaben War Thunder Elite Dangerous - Aktiviere die Datenausgabe eines Rennspiels (oft Telemetrie oder UDP genannt), um hier ein Live-Cockpit zu sehen. Die Daten bleiben auf diesem Gerät. Port %1$d empfängt Daten (%2$d Pakete mit %3$d Bytes), aber in einem Format, das diese Seite noch nicht lesen kann. Ein anderes Programm verwendet bereits Port %1$s, daher kann dieses Spiel hier nicht angezeigt werden. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 48814a4617..bd5bf28d64 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1802,8 +1802,6 @@ Γκάζι και φρένο, τελευταία 10 s Ταχύτητα, %1$s Σχέση - Μονάδες ταχύτητας - Αυτόματα (%1$s) Πελάτης Steam ARM Πελάτης Steam x86 Γκάζι @@ -1821,7 +1819,6 @@ Καύσιμο, t Κύριο %1$s t Εφεδρικό %1$s t - Πατήστε τη λωρίδα στο πάνω μέρος ή τον πίνακα οργάνων για να αλλάξετε το στυλ του. Αποστολή δεδομένων πίνακα Αυτόματα Το ενεργοποιεί για κάθε παιχνίδι της λίστας, μαζί και όσα βρεθούν αργότερα. Τα παιχνίδια που απενεργοποιείτε παραμένουν ανενεργά. @@ -1860,7 +1857,6 @@ Υπόλοιπο War Thunder Elite Dangerous - Ενεργοποιήστε την έξοδο δεδομένων ενός αγωνιστικού παιχνιδιού (συχνά λέγεται τηλεμετρία ή UDP) για να δείτε εδώ ζωντανό πίνακα οργάνων. Τα δεδομένα μένουν σε αυτή τη συσκευή. Η θύρα %1$d λαμβάνει δεδομένα (%2$d πακέτα των %3$d byte), αλλά σε μορφή που αυτή η σελίδα δεν μπορεί ακόμα να διαβάσει. Ένα άλλο πρόγραμμα χρησιμοποιεί ήδη τη θύρα %1$s, οπότε αυτό το παιχνίδι δεν μπορεί να εμφανιστεί εδώ. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 05b2c8dd7e..8f8103644a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1824,8 +1824,6 @@ Acelerador y freno, últimos 10 s Velocidad, %1$s Marcha - Unidades de velocidad - Automático (%1$s) Cliente de Steam ARM Cliente de Steam x86 Acelerador @@ -1843,7 +1841,6 @@ Combustible, t Principal %1$s t Reserva %1$s t - Toca la franja superior o el cuadro de instrumentos para cambiar su estilo. Enviar datos al panel Automático Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados. @@ -1882,7 +1879,6 @@ Saldo War Thunder Elite Dangerous - Activa la salida de datos de un juego de carreras (a menudo llamada telemetría o UDP) para ver aquí un panel en directo. Los datos no salen de este dispositivo. El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer. Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2fce2dfe43..f23c31a17e 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1802,8 +1802,6 @@ Kaasu ja jarru, viimeiset 10 s Nopeus, %1$s Vaihde - Nopeuden yksiköt - Automaattinen (%1$s) Steam-asiakasohjelma ARM Steam-asiakasohjelma x86 Kaasu @@ -1821,7 +1819,6 @@ Polttoaine, t Päätankki %1$s t Varatankki %1$s t - Napauta yläpalkkia tai kojelautaa vaihtaaksesi sen tyyliä. Lähetä kojelaudan tiedot Automaattinen Kytkee sen päälle jokaiselle tässä luetellulle pelille, myös myöhemmin löytyville. Pois kytkemäsi pelit pysyvät pois päältä. @@ -1860,7 +1857,6 @@ Saldo War Thunder Elite Dangerous - Kytke kilpa-ajopelin datan ulostulo päälle (usein nimeltään telemetria tai UDP), niin näet täällä reaaliaikaisen kojelaudan. Tiedot pysyvät tällä laitteella. Portti %1$d vastaanottaa dataa (%2$d pakettia, kukin %3$d tavua), mutta muodossa, jota tämä sivu ei vielä osaa lukea. Toinen ohjelma käyttää jo porttia %1$s, joten peliä ei voida näyttää täällä. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 32d904252e..543e16d257 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1824,8 +1824,6 @@ Accélérateur et frein, 10 dernières s Vitesse, %1$s Rapport - Unités de vitesse - Automatique (%1$s) Client Steam ARM Client Steam x86 Accélérateur @@ -1843,7 +1841,6 @@ Carburant, t Principal %1$s t Réserve %1$s t - Appuyez sur la bande supérieure ou sur le tableau de bord pour changer son style. Envoyer les données du tableau de bord Automatique L\'active pour chaque jeu listé ici, y compris les jeux trouvés plus tard. Les jeux que vous désactivez restent désactivés. @@ -1882,7 +1879,6 @@ Solde War Thunder Elite Dangerous - Activez la sortie de données d\'un jeu de course (souvent appelée télémétrie ou UDP) pour voir ici un tableau de bord en direct. Les données restent sur cet appareil. Le port %1$d reçoit des données (%2$d paquets de %3$d octets), mais dans un format que cette page ne sait pas encore lire. Un autre programme utilise déjà le port %1$s ; ce jeu ne peut donc pas s\'afficher ici. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1e34f532fe..45ef464e62 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1802,8 +1802,6 @@ थ्रॉटल और ब्रेक, पिछले 10 s स्पीड, %1$s गियर - स्पीड की इकाई - ऑटोमैटिक (%1$s) Steam क्लाइंट ARM Steam क्लाइंट x86 थ्रॉटल @@ -1821,7 +1819,6 @@ फ़्यूल, t मुख्य %1$s t रिज़र्व %1$s t - स्टाइल बदलने के लिए ऊपर की पट्टी या डैश पर टैप करें। डैशबोर्ड डेटा भेजें ऑटोमैटिक यहां दिए हर गेम के लिए इसे चालू करता है, बाद में मिलने वाले गेम भी शामिल हैं। जिन गेम को आप बंद करते हैं, वे बंद ही रहते हैं। @@ -1860,7 +1857,6 @@ बैलेंस War Thunder Elite Dangerous - यहां लाइव डैश देखने के लिए किसी रेसिंग गेम का डेटा आउटपुट (अक्सर टेलीमेट्री या UDP कहलाता है) चालू करें। यह इसी डिवाइस पर रहता है। पोर्ट %1$d पर डेटा आ रहा है (%3$d बाइट के %2$d पैकेट), लेकिन ऐसे फ़ॉर्मैट में जिसे यह पेज अभी पढ़ नहीं सकता। पोर्ट %1$s को कोई दूसरा प्रोग्राम पहले से इस्तेमाल कर रहा है, इसलिए वह गेम यहां नहीं दिख सकता। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 16f61c7b89..e9c693d02b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1802,8 +1802,6 @@ Gáz és fék, utolsó 10 s Sebesség, %1$s Fokozat - Sebesség mértékegysége - Automatikus (%1$s) Steam-kliens ARM Steam-kliens x86 Gáz @@ -1821,7 +1819,6 @@ Üzemanyag, t Fő %1$s t Tartalék %1$s t - Koppintson a felső sávra vagy a műszerfalra a stílus módosításához. Műszerfal-adatok küldése Automatikus Bekapcsolja az itt felsorolt összes játéknál, a később talált játékokat is beleértve. A kikapcsolt játékok kikapcsolva maradnak. @@ -1860,7 +1857,6 @@ Egyenleg War Thunder Elite Dangerous - Kapcsolja be egy autóversenyes játék adatkimenetét (gyakran telemetria vagy UDP néven szerepel), hogy itt élő műszerfalat lásson. Az adatok ezen az eszközön maradnak. A(z) %1$d port adatokat fogad (%2$d csomag, egyenként %3$d bájt), de olyan formátumban, amelyet ez az oldal még nem tud olvasni. A(z) %1$s portot már egy másik program használja, ezért az a játék itt nem jeleníthető meg. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 31389966c8..fe04ab97d8 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1780,8 +1780,6 @@ Gas dan rem, 10 s terakhir Kecepatan, %1$s Gigi - Satuan kecepatan - Otomatis (%1$s) Klien Steam ARM Klien Steam x86 Gas @@ -1799,7 +1797,6 @@ Bahan bakar, t Utama %1$s t Cadangan %1$s t - Ketuk bilah atas atau dasbor untuk mengubah gayanya. Kirim data dasbor Otomatis Mengaktifkannya untuk setiap gim yang tercantum di sini, termasuk gim yang ditemukan nanti. Gim yang Anda matikan tetap mati. @@ -1838,7 +1835,6 @@ Saldo War Thunder Elite Dangerous - Aktifkan keluaran data gim balap (sering disebut telemetri atau UDP) untuk melihat dasbor langsung di sini. Data tetap berada di perangkat ini. Port %1$d menerima data (%2$d paket berukuran %3$d byte), tetapi dalam format yang belum dapat dibaca halaman ini. Program lain sudah menggunakan port %1$s, jadi gim tersebut tidak dapat ditampilkan di sini. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7e2e5158cf..3dc322e7ac 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1816,8 +1816,6 @@ Acceleratore e freno, ultimi 10 s Velocità, %1$s Marcia - Unità di velocità - Automatico (%1$s) Client Steam ARM Client Steam x86 Acceleratore @@ -1835,7 +1833,6 @@ Carburante, t Principale %1$s t Riserva %1$s t - Tocca la barra superiore o il cruscotto per cambiarne lo stile. Invia dati al cruscotto Automatico Lo attiva per ogni gioco elencato qui, compresi i giochi trovati in seguito. I giochi che disattivi restano disattivati. @@ -1874,7 +1871,6 @@ Saldo War Thunder Elite Dangerous - Attiva l\'output dati di un gioco di corse (spesso chiamato telemetria o UDP) per vedere qui un cruscotto in tempo reale. I dati restano su questo dispositivo. La porta %1$d riceve dati (%2$d pacchetti da %3$d byte), ma in un formato che questa pagina non sa ancora leggere. Un altro programma usa già la porta %1$s, quindi quel gioco non può essere mostrato qui. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a1c5a5b34d..ea759df1f8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1780,8 +1780,6 @@ スロットルとブレーキ(直近10 s) 速度(%1$s) ギア - 速度の単位 - 自動(%1$s) Steamクライアント ARM Steamクライアント x86 スロットル @@ -1799,7 +1797,6 @@ 燃料(t) メイン %1$s t 予備 %1$s t - 上部のバーまたはダッシュをタップすると、表示スタイルを変更できます。 ダッシュボード用データを送信 自動 ここに表示されているすべてのゲーム(後から見つかったゲームを含む)でオンにします。オフにしたゲームはオフのままです。 @@ -1838,7 +1835,6 @@ 残高 War Thunder Elite Dangerous - レースゲームのデータ出力(テレメトリーやUDPと呼ばれることが多い)をオンにすると、ここにライブダッシュが表示されます。データはこのデバイス内にとどまります。 ポート%1$dでデータを受信していますが(%3$dバイトのパケット%2$d個)、このページではまだ読み取れない形式です。 別のプログラムがすでにポート%1$sを使用しているため、そのゲームはここに表示できません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 79cd6826c9..9f3f85e373 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1780,8 +1780,6 @@ 스로틀 및 브레이크, 최근 10 s 속도, %1$s 기어 - 속도 단위 - 자동(%1$s) Steam 클라이언트 ARM Steam 클라이언트 x86 스로틀 @@ -1799,7 +1797,6 @@ 연료, t 메인 %1$s t 예비 %1$s t - 상단 막대나 계기판을 탭하면 스타일이 바뀝니다. 계기판 데이터 보내기 자동 나중에 발견된 게임을 포함해 여기에 나열된 모든 게임에서 켭니다. 직접 끈 게임은 꺼진 상태로 유지됩니다. @@ -1838,7 +1835,6 @@ 잔액 War Thunder Elite Dangerous - 레이싱 게임의 데이터 출력(흔히 텔레메트리 또는 UDP라고 함)을 켜면 여기에서 실시간 계기판을 볼 수 있습니다. 데이터는 이 기기에만 남습니다. 포트 %1$d에서 데이터를 받고 있지만(%3$d바이트 패킷 %2$d개), 이 페이지가 아직 읽을 수 없는 형식입니다. 다른 프로그램이 이미 포트 %1$s을(를) 사용하고 있어 해당 게임을 여기에 표시할 수 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 69a8545f40..43312006f7 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1780,8 +1780,6 @@ Pendikit dan brek, 10 s terakhir Kelajuan, %1$s Gear - Unit kelajuan - Automatik (%1$s) Klien Steam ARM Klien Steam x86 Pendikit @@ -1799,7 +1797,6 @@ Bahan api, t Utama %1$s t Simpanan %1$s t - Ketik jalur atas atau papan pemuka untuk menukar gayanya. Hantar data papan pemuka Automatik Menghidupkannya untuk setiap permainan yang disenaraikan di sini, termasuk permainan yang ditemui kemudian. Permainan yang anda matikan kekal mati. @@ -1838,7 +1835,6 @@ Baki War Thunder Elite Dangerous - Hidupkan output data permainan lumba (sering dipanggil telemetri atau UDP) untuk melihat papan pemuka langsung di sini. Data kekal pada peranti ini. Port %1$d menerima data (%2$d paket bersaiz %3$d bait), tetapi dalam format yang belum dapat dibaca oleh halaman ini. Program lain sudah menggunakan port %1$s, jadi permainan itu tidak dapat dipaparkan di sini. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index e47b649701..b9be6a70aa 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1802,8 +1802,6 @@ Gass og brems, siste 10 s Fart, %1$s Gir - Fartsenheter - Automatisk (%1$s) Steam-klient ARM Steam-klient x86 Gass @@ -1821,7 +1819,6 @@ Drivstoff, t Hoved %1$s t Reserve %1$s t - Trykk på den øverste stripen eller dashbordet for å endre stilen. Send dashborddata Automatisk Slår det på for alle spill som er oppført her, også spill som blir funnet senere. Spill du slår av, forblir av. @@ -1860,7 +1857,6 @@ Saldo War Thunder Elite Dangerous - Slå på datautgangen i et racingspill (ofte kalt telemetri eller UDP) for å se et direkte dashbord her. Dataene blir på denne enheten. Port %1$d mottar data (%2$d pakker på %3$d byte), men i et format denne siden ikke kan lese ennå. Et annet program bruker allerede port %1$s, så det spillet kan ikke vises her. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 99483ded81..76f7aa11c3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1802,8 +1802,6 @@ Gas en rem, laatste 10 s Snelheid, %1$s Versnelling - Snelheidseenheid - Automatisch (%1$s) Steam-client ARM Steam-client x86 Gas @@ -1821,7 +1819,6 @@ Brandstof, t Hoofdtank %1$s t Reserve %1$s t - Tik op de bovenste balk of het dashboard om de stijl te wijzigen. Dashboardgegevens verzenden Automatisch Zet het aan voor elke game in deze lijst, ook voor games die later worden gevonden. Games die je uitzet, blijven uit. @@ -1860,7 +1857,6 @@ Saldo War Thunder Elite Dangerous - Zet de gegevensuitvoer van een racegame aan (vaak telemetrie of UDP genoemd) om hier een live dashboard te zien. De gegevens blijven op dit apparaat. Poort %1$d ontvangt gegevens (%2$d pakketten van %3$d bytes), maar in een formaat dat deze pagina nog niet kan lezen. Een ander programma gebruikt poort %1$s al, dus die game kan hier niet worden getoond. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9e75c495d7..c74e8dedfd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1846,8 +1846,6 @@ Gaz i hamulec, ostatnie 10 s Prędkość, %1$s Bieg - Jednostki prędkości - Automatycznie (%1$s) Klient Steam ARM Klient Steam x86 Gaz @@ -1865,7 +1863,6 @@ Paliwo, t Główne %1$s t Rezerwa %1$s t - Dotknij górnego paska lub zegarów, aby zmienić ich wygląd. Wysyłaj dane do panelu Automatycznie Włącza wysyłanie dla każdej gry z tej listy, także dla gier znalezionych później. Gry, które wyłączysz, pozostaną wyłączone. @@ -1904,7 +1901,6 @@ Saldo War Thunder Elite Dangerous - Włącz wyjście danych w grze wyścigowej (często nazywane telemetrią lub UDP), aby zobaczyć tu zegary na żywo. Dane nie opuszczają tego urządzenia. Port %1$d odbiera dane (%2$d pakietów po %3$d bajtów), ale w formacie, którego ta strona jeszcze nie odczytuje. Port %1$s jest już używany przez inny program, więc tej gry nie da się tu pokazać. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 811793d455..defb213d1d 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1816,8 +1816,6 @@ Acelerador e travão, últimos 10 s Velocidade, %1$s Mudança - Unidade de velocidade - Automático (%1$s) Cliente Steam ARM Cliente Steam x86 Acelerador @@ -1835,7 +1833,6 @@ Combustível, t Principal %1$s t Reserva %1$s t - Toque na faixa superior ou no painel para alterar o estilo. Enviar dados para o painel Automático Ativa para todos os jogos aqui listados, incluindo os encontrados mais tarde. Os jogos que desativar permanecem desativados. @@ -1874,7 +1871,6 @@ Saldo War Thunder Elite Dangerous - Ative a saída de dados de um jogo de corridas (muitas vezes chamada telemetria ou UDP) para ver aqui um painel em direto. Os dados ficam neste dispositivo. A porta %1$d está a receber dados (%2$d pacotes de %3$d bytes), mas num formato que esta página ainda não consegue ler. Outro programa já utiliza a porta %1$s, por isso esse jogo não pode aparecer aqui. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bef3c33023..2615c5ad08 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1816,8 +1816,6 @@ Acelerador e freio, últimos 10 s Velocidade, %1$s Marcha - Unidade de velocidade - Automático (%1$s) Cliente Steam ARM Cliente Steam x86 Acelerador @@ -1835,7 +1833,6 @@ Combustível, t Principal %1$s t Reserva %1$s t - Toque na faixa superior ou no painel para mudar o estilo. Enviar dados para o painel Automático Ativa para todos os jogos listados aqui, incluindo os encontrados depois. Os jogos que você desativar continuam desativados. @@ -1874,7 +1871,6 @@ Saldo War Thunder Elite Dangerous - Ative a saída de dados de um jogo de corrida (muitas vezes chamada de telemetria ou UDP) para ver um painel ao vivo aqui. Os dados ficam neste dispositivo. A porta %1$d está recebendo dados (%2$d pacotes de %3$d bytes), mas em um formato que esta página ainda não consegue ler. Outro programa já usa a porta %1$s, então esse jogo não pode aparecer aqui. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f832025acd..5e117cba6b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1824,8 +1824,6 @@ Accelerație și frână, ultimele 10 s Viteză, %1$s Treaptă - Unități de viteză - Automat (%1$s) Client Steam ARM Client Steam x86 Accelerație @@ -1843,7 +1841,6 @@ Combustibil, t Principal %1$s t Rezervă %1$s t - Atinge banda de sus sau bordul pentru a-i schimba stilul. Trimite date pentru tabloul de bord Automat Activează trimiterea pentru fiecare joc din listă, inclusiv pentru jocurile găsite mai târziu. Jocurile pe care le dezactivezi rămân dezactivate. @@ -1882,7 +1879,6 @@ Sold War Thunder Elite Dangerous - Activează ieșirea de date a unui joc de curse (numită adesea telemetrie sau UDP) pentru a vedea aici un bord în timp real. Datele rămân pe acest dispozitiv. Portul %1$d primește date (%2$d pachete de %3$d octeți), dar într-un format pe care această pagină nu îl poate citi încă. Alt program folosește deja portul %1$s, așa că acel joc nu poate fi afișat aici. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a6a1d134e9..5fa685926d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1846,8 +1846,6 @@ Газ и тормоз за последние 10 s Скорость, %1$s Передача - Единицы скорости - Автоматически (%1$s) Клиент Steam ARM Клиент Steam x86 Газ @@ -1865,7 +1863,6 @@ Топливо, t Основное %1$s t Резерв %1$s t - Коснитесь верхней полосы или панели, чтобы сменить ее стиль. Передавать данные на дашборд Автоматически Включает передачу для всех игр в этом списке, в том числе найденных позже. Игры, для которых вы ее выключили, остаются выключенными. @@ -1904,7 +1901,6 @@ Баланс War Thunder Elite Dangerous - Включите вывод данных в гоночной игре (часто он называется телеметрией или UDP), чтобы видеть здесь приборную панель в реальном времени. Данные остаются на этом устройстве. Порт %1$d получает данные (пакетов: %2$d, размер: %3$d байт), но в формате, который эта страница пока не умеет читать. Порт %1$s уже занят другой программой, поэтому эта игра не может отображаться здесь. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a108761321..8f89510e47 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1802,8 +1802,6 @@ Gas och broms, senaste 10 s Hastighet, %1$s Växel - Hastighetsenhet - Automatisk (%1$s) Steam-klient ARM Steam-klient x86 Gas @@ -1821,7 +1819,6 @@ Bränsle, t Huvudtank %1$s t Reserv %1$s t - Tryck på den övre remsan eller instrumentpanelen för att byta stil. Skicka data till instrumentpanelen Automatiskt Slår på det för alla spel i listan, även spel som hittas senare. Spel som du stänger av förblir avstängda. @@ -1860,7 +1857,6 @@ Saldo War Thunder Elite Dangerous - Slå på datautmatning i ett racingspel (kallas ofta telemetri eller UDP) för att se en liveinstrumentpanel här. Datan stannar på den här enheten. Port %1$d tar emot data (%2$d paket på %3$d byte), men i ett format som den här sidan inte kan läsa än. Ett annat program använder redan port %1$s, så det spelet kan inte visas här. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 37c0bc635d..e56ececd31 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1780,8 +1780,6 @@ คันเร่งและเบรก 10 s ล่าสุด ความเร็ว, %1$s เกียร์ - หน่วยความเร็ว - อัตโนมัติ (%1$s) ไคลเอนต์ Steam ARM ไคลเอนต์ Steam x86 คันเร่ง @@ -1799,7 +1797,6 @@ เชื้อเพลิง, t หลัก %1$s t สำรอง %1$s t - แตะแถบด้านบนหรือหน้าปัดเพื่อเปลี่ยนรูปแบบ ส่งข้อมูลแดชบอร์ด อัตโนมัติ เปิดใช้สำหรับทุกเกมที่แสดงที่นี่ รวมถึงเกมที่พบในภายหลัง เกมที่คุณปิดไว้จะยังคงปิดอยู่ @@ -1838,7 +1835,6 @@ ยอดเงิน War Thunder Elite Dangerous - เปิดการส่งออกข้อมูลของเกมแข่งรถ (มักเรียกว่าเทเลเมทรีหรือ UDP) เพื่อดูหน้าปัดแบบสดที่นี่ ข้อมูลจะอยู่บนอุปกรณ์นี้เท่านั้น พอร์ต %1$d ได้รับข้อมูล (%2$d แพ็กเก็ต ขนาด %3$d ไบต์) แต่อยู่ในรูปแบบที่หน้านี้ยังอ่านไม่ได้ มีโปรแกรมอื่นใช้พอร์ต %1$s อยู่แล้ว เกมนั้นจึงแสดงที่นี่ไม่ได้ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a2df0d777e..380ea77773 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1794,8 +1794,6 @@ Gaz ve fren, son 10 s Hız, %1$s Vites - Hız birimi - Otomatik (%1$s) Steam İstemcisi ARM Steam İstemcisi x86 Gaz @@ -1813,7 +1811,6 @@ Yakıt, t Ana %1$s t Yedek %1$s t - Stilini değiştirmek için üst şeride veya göstergeye dokunun. Gösterge verilerini gönder Otomatik Sonradan bulunanlar dahil, burada listelenen her oyun için açar. Kapattığınız oyunlar kapalı kalır. @@ -1852,7 +1849,6 @@ Bakiye War Thunder Elite Dangerous - Burada canlı bir gösterge görmek için yarış oyununun veri çıkışını (genellikle telemetri veya UDP olarak geçer) açın. Veriler bu cihazda kalır. %1$d portu veri alıyor (%3$d baytlık %2$d paket), ancak bu sayfanın henüz okuyamadığı bir biçimde. %1$s portunu zaten başka bir program kullanıyor, bu yüzden o oyun burada gösterilemez. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c43da44fe7..d11cb4d917 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1846,8 +1846,6 @@ Газ і гальмо, останні 10 s Швидкість, %1$s Передача - Одиниці швидкості - Автоматично (%1$s) Клієнт Steam ARM Клієнт Steam x86 Газ @@ -1865,7 +1863,6 @@ Пальне, t Основне %1$s t Резерв %1$s t - Торкніться верхньої смуги або панелі, щоб змінити її стиль. Надсилати дані для панелі Автоматично Вмикає це для кожної гри в цьому списку, зокрема для знайдених пізніше. Ігри, які ви вимкнете, лишаються вимкненими. @@ -1904,7 +1901,6 @@ Баланс War Thunder Elite Dangerous - Увімкніть виведення даних у гоночній грі (часто це називається телеметрією або UDP), щоб бачити тут живу панель. Дані лишаються на цьому пристрої. Порт %1$d отримує дані (пакетів: %2$d, по %3$d байт), але у форматі, який ця сторінка ще не вміє читати. Порт %1$s уже використовує інша програма, тому ця гра не може відображатися тут. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bc472c3237..bd560f50d9 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1780,8 +1780,6 @@ Ga và phanh, 10 s gần nhất Tốc độ, %1$s Số - Đơn vị tốc độ - Tự động (%1$s) Client Steam ARM Client Steam x86 Ga @@ -1799,7 +1797,6 @@ Nhiên liệu, t Chính %1$s t Dự trữ %1$s t - Nhấn vào dải phía trên hoặc bảng đồng hồ để đổi kiểu hiển thị. Gửi dữ liệu bảng đồng hồ Tự động Bật cho mọi game trong danh sách này, kể cả game được tìm thấy sau này. Game bạn đã tắt sẽ vẫn tắt. @@ -1838,7 +1835,6 @@ Số dư War Thunder Elite Dangerous - Bật xuất dữ liệu của game đua xe (thường gọi là telemetry hoặc UDP) để xem bảng đồng hồ trực tiếp ở đây. Dữ liệu chỉ ở trên thiết bị này. Cổng %1$d đang nhận dữ liệu (%2$d gói, mỗi gói %3$d byte), nhưng ở định dạng mà trang này chưa đọc được. Một chương trình khác đang dùng cổng %1$s, nên game đó không thể hiển thị ở đây. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9477b8a4df..b881f1e716 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1857,8 +1857,6 @@ 油门和刹车,最近 10 s 速度,%1$s 挡位 - 速度单位 - 自动(%1$s) Steam 客户端 ARM Steam 客户端 x86 油门 @@ -1876,7 +1874,6 @@ 燃料,t 主油箱 %1$s t 备用 %1$s t - 点按顶部横条或仪表可更改其样式。 发送仪表盘数据 自动 为此处列出的所有游戏开启,包括之后发现的游戏。你手动关闭的游戏会保持关闭。 @@ -1915,7 +1912,6 @@ 余额 War Thunder Elite Dangerous - 开启赛车游戏的数据输出(通常称为遥测或 UDP),即可在此查看实时仪表。数据仅保留在此设备上。 端口 %1$d 正在接收数据(%2$d 个 %3$d 字节的数据包),但其格式本页面暂时无法读取。 端口 %1$s 已被其他程序占用,因此该游戏无法在此显示。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 5380c1264c..caced3676f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1780,8 +1780,6 @@ 油門和剎車,最近 10 s 速度,%1$s 檔位 - 速度單位 - 自動(%1$s) Steam 用戶端 ARM Steam 用戶端 x86 油門 @@ -1799,7 +1797,6 @@ 燃料,t 主油箱 %1$s t 備用 %1$s t - 點按頂部橫條或儀表即可變更其樣式。 傳送儀表板資料 自動 為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。 @@ -1838,7 +1835,6 @@ 餘額 War Thunder Elite Dangerous - 開啟賽車遊戲的資料輸出(通常稱為遙測或 UDP),即可在此查看即時儀表。資料只會留在這部裝置上。 連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。 其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fceb4e0868..ad9a72246d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1780,8 +1780,6 @@ 油門和煞車,最近 10 s 速度,%1$s 檔位 - 速度單位 - 自動(%1$s) Steam 用戶端 ARM Steam 用戶端 x86 油門 @@ -1799,7 +1797,6 @@ 燃料,t 主油箱 %1$s t 備用 %1$s t - 點按頂部橫條或儀表即可變更其樣式。 傳送儀表板資料 自動 為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。 @@ -1838,7 +1835,6 @@ 餘額 War Thunder Elite Dangerous - 開啟賽車遊戲的資料輸出(通常稱為遙測或 UDP),即可在此查看即時儀表。資料只會留在這部裝置上。 連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。 其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5ba641e605..c30b06c8dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1927,8 +1927,6 @@ Throttle and brake, last 10 s Speed, %1$s Gear - Speed units - Automatic (%1$s) Steam Client ARM Steam Client x86 Throttle @@ -1946,7 +1944,6 @@ Fuel, t Main %1$s t Reserve %1$s t - Tap the HUD, the top strip or the dash to change its style. Frame time last %1$d s avg frame @@ -1985,10 +1982,7 @@ Volume %1$d%% In-game stats Bottom screen HUD - Works with the top HUD off and does not change it. The number switches below are for the Line strip: under the tabs, and the Line style above a game\'s dashboard. - The big HUD, the Line strip and the strip under the tabs. A game\'s dashboard stays. Strip on every tab - Shows the line under the tabs while you use the bottom screen. 1% and 0.1% lows CPU temperature FPS @@ -2006,7 +2000,6 @@ Balance War Thunder Elite Dangerous - Turn on a game\'s data output (often called telemetry or UDP) to see a live dash here. It stays on this device. Port %1$d receives data (%2$d packets of %3$d bytes), but in a format this page cannot read yet. Another program already uses port %1$s, so that game cannot show here. From 313b6a59d2ed57e984b71822356614d6c762c70e Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 1 Nov 2026 23:14:18 -0500 Subject: [PATCH 03/16] feat(dual-screen): single-screen mode on the Retroid Pocket Duo and AYN Thor while another window holds the bottom screen (#1979) * feat(dual-screen): step aside on the Retroid Pocket Duo's bottom screen while another window holds it When the Duo's double-Home performance panel or another app (Chrome, YouTube) is on the bottom screen, DroidDeck switches to single-screen mode: the launcher's bottom panel and the in-game bottom controls close and the top screen takes its single-screen layout. When the bottom screen is back on its home screen, dual-screen mode returns, with the in-game controls reopening in the mode they had. The DroidDeck shortcuts accessibility service watches the bottom screen's windows on the Duo only. An app opened under DroidDeck's panel is caught by its window opening on that display; the Retroid panel and any app on top are read from the window list. * fix(dual-screen): log the bottom screen's holders only when they change * fix(dual-screen): the topmost window other than DroidDeck's decides who holds the bottom screen Apps opened under DroidDeck's bottom panel are still listed beneath it, so DroidDeck's own windows are skipped and the next full-size window decides. Fallback home screens such as Settings' boot-time one no longer count as a home screen. * fix(dual-screen): catch apps opened under the in-game bottom controls The in-game bottom controls hide the windows beneath them from the window list, so an app opening a window on the bottom screen while only DroidDeck is listed now holds the screen until the list can see it. * fix(dual-screen): keyboards never hold the bottom screen; watch the built-in panel only Keyboard windows opening on the bottom screen no longer count as an app arriving, so typing with the in-game bottom keyboard keeps the controls up. Only the built-in bottom panel is watched, so an external display can't close the controls. An arrival recorded while a check runs is kept for the next check, and stopping the watcher clears the held state after any running check. * feat(dual-screen): step aside on the AYN Thor's bottom screen too The bottom-screen watch now runs on every handheld in DualScreen's known dual-screen models, the Retroid Pocket Duo and the AYN Thor, including model names that extend them such as AYN Thor Max. * fix(dual-screen): only the current bottom-screen watch publishes; Thor variants match when the display type is hidden * fix: session drawer top row scrolls and Stop stays an icon-only button * fix: docked drawer drops the second-screen page; tapping the active mode returns to none * fix: docked drawer drops the bottom-screen mode icons; the Mode page keeps them * fix: restore the second-screen drawer page when docked * feat: dual screen launcher and dual screen sessions are separate Automatic/On/Off settings * fix: session drawer top row keeps its right alignment --------- Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- app/src/main/AndroidManifest.xml | 8 + .../droiddeck/launcher/FrontEndActivity.kt | 15 +- .../com/droiddeck/launcher/SessionActivity.kt | 22 ++- .../launcher/input/BottomScreenGuests.kt | 149 ++++++++++++++++++ .../droiddeck/launcher/input/DualScreen.kt | 30 +++- .../launcher/input/HomeButtonService.kt | 12 +- .../launcher/session/SessionPrefs.kt | 28 ++-- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 4 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 30 ++-- .../droiddeck/launcher/ui/SessionOverlay.kt | 63 +------- app/src/main/res/values-ar/strings.xml | 4 - app/src/main/res/values-b+es+419/strings.xml | 4 - app/src/main/res/values-bg/strings.xml | 4 - app/src/main/res/values-cs/strings.xml | 4 - app/src/main/res/values-da/strings.xml | 4 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-el/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 4 - app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-hi/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-in/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-ko/strings.xml | 4 - app/src/main/res/values-ms/strings.xml | 4 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rPT/strings.xml | 4 - app/src/main/res/values-pt/strings.xml | 4 - app/src/main/res/values-ro/strings.xml | 4 - app/src/main/res/values-ru/strings.xml | 4 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-th/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values-uk/strings.xml | 4 - app/src/main/res/values-vi/strings.xml | 4 - app/src/main/res/values-zh-rCN/strings.xml | 4 - app/src/main/res/values-zh-rHK/strings.xml | 4 - app/src/main/res/values-zh-rTW/strings.xml | 4 - app/src/main/res/values/strings.xml | 8 +- app/src/main/res/xml/home_button_service.xml | 2 +- .../launcher/input/BottomScreenGuestsTest.kt | 76 +++++++++ .../launcher/input/DualScreenTest.kt | 16 ++ 47 files changed, 358 insertions(+), 235 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e5b17b50e3..b537705617 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,14 @@ + + + + + + + + diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index eda3e08a5b..1c8c8cb9e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -549,7 +549,7 @@ class FrontEndActivity : ComponentActivity() { private var dualDisplayId by mutableStateOf(-1) private var dualScreenDevice by mutableStateOf(false) private var dualScreenMode by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) - private var dualScreenLauncher by mutableStateOf(true) + private var dualScreenSessions by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) private var dualScreenControls by mutableStateOf(true) private var launcherStarted = false private lateinit var displayManager: DisplayManager @@ -558,6 +558,7 @@ class FrontEndActivity : ComponentActivity() { override fun onDisplayRemoved(displayId: Int) = refreshSecondScreenDisplays() override fun onDisplayChanged(displayId: Int) = refreshSecondScreenDisplays() } + private val bottomScreenListener: () -> Unit = { refreshSecondScreenDisplays() } private val secondScreenTouchListener = object : android.hardware.input.InputManager.InputDeviceListener { override fun onInputDeviceAdded(deviceId: Int) = refreshSecondScreenDisplays() override fun onInputDeviceRemoved(deviceId: Int) = refreshSecondScreenDisplays() @@ -1082,7 +1083,7 @@ class FrontEndActivity : ComponentActivity() { dualScreen = dualDisplayId >= 0 && com.droiddeck.launcher.ui.DualScreenPanel.available, dualScreenDevice = dualScreenDevice, dualScreenMode = dualScreenMode, - dualScreenLauncher = dualScreenLauncher, + dualScreenSessions = dualScreenSessions, dualScreenControls = dualScreenControls, packages = packageRows, packageCatalogLoading = catalogLoading, @@ -1316,8 +1317,8 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDualScreenMode(this, mode) refreshSecondScreenDisplays() }, - onDualScreenLauncher = { on -> - SessionPrefs.setDualScreenLauncher(this, on) + onDualScreenSessions = { mode -> + SessionPrefs.setDualScreenSessionMode(this, mode) refreshSecondScreenDisplays() }, onDualScreenControls = { on -> @@ -1733,6 +1734,7 @@ class FrontEndActivity : ComponentActivity() { addDataScheme("file") }) displayManager.registerDisplayListener(secondScreenDisplayListener, ui) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) getSystemService(android.hardware.input.InputManager::class.java)?.registerInputDeviceListener(secondScreenTouchListener, ui) launcherStarted = true refreshSecondScreenDisplays() @@ -1777,6 +1779,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.StoresState.libraryListener = null com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) getSystemService(android.hardware.input.InputManager::class.java)?.unregisterInputDeviceListener(secondScreenTouchListener) launcherStarted = false com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) @@ -1815,10 +1818,10 @@ class FrontEndActivity : ComponentActivity() { dualScreenMode = SessionPrefs.dualScreenMode(this) secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId) dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null - dualScreenLauncher = SessionPrefs.dualScreenLauncher(this) + dualScreenSessions = SessionPrefs.dualScreenSessionMode(this) dualScreenControls = SessionPrefs.dualScreenSessionControls(this) val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId) - dualDisplayId = if (dualScreenLauncher) target?.displayId ?: -1 else -1 + dualDisplayId = target?.displayId ?: -1 syncDualPanel() } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 1aa82d33cf..c334972670 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -475,6 +475,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var sessionActivityDisplayId = Display.DEFAULT_DISPLAY private lateinit var displayManager: DisplayManager private var secondScreenPresentation: SecondScreenPresentation? = null + private val bottomScreenListener: () -> Unit = { + if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false) + refreshSecondScreenDisplays() + } + private val displayListener = object : DisplayManager.DisplayListener { override fun onDisplayAdded(displayId: Int) { notifyActivityDisplayStateChanged(displayId) @@ -2746,15 +2751,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun dockDrawer(): Boolean { if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false - if (!SessionPrefs.dualScreenLauncher(this)) return false - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false if (secondScreenDisplays.none { it.id == target.displayId }) return false val shown = secondScreenPresentation?.display?.displayId return shown == null || shown == target.displayId } private fun openDockedMenu(): Boolean { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false return try { val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also { selectedSecondScreenDisplay = target.displayId @@ -3039,7 +3043,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun openDualScreenControls() { if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return if (!SessionPrefs.dualScreenSessionControls(this)) return - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId @@ -3087,6 +3091,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) return } + if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId)) { + if (secondScreenPresentation != null) closeSecondScreen(reset = false) + secondScreenMode = mode + SessionState.secondScreenMode = mode + return + } var presentation = secondScreenPresentation if (presentation?.display?.displayId != target.displayId) { dropDockedDrawer() @@ -3295,7 +3305,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun openBottomKeyboard() { if (!started) return if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (drawerOpen) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId @@ -3977,6 +3987,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(false) refreshActivityDisplayId() displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper())) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) { contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver) } @@ -3997,6 +4008,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(true) updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) diff --git a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt new file mode 100644 index 0000000000..ae44dc0e6c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt @@ -0,0 +1,149 @@ +package com.droiddeck.launcher.input + +import android.accessibilityservice.AccessibilityService +import android.accessibilityservice.AccessibilityServiceInfo +import android.content.Intent +import android.content.pm.PackageManager +import android.graphics.Rect +import android.hardware.display.DisplayManager +import android.os.Build +import android.os.Handler +import android.os.HandlerThread +import android.util.Log +import android.view.Display +import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityWindowInfo +import android.view.inputmethod.InputMethodManager +import java.util.concurrent.ConcurrentHashMap + +object BottomScreenGuests { + enum class Top { HOME, GUEST, NONE } + + internal const val MIN_COVER = 0.5f + + internal fun classify(pkg: String?, homes: Set): Top = when (pkg) { + null -> Top.NONE + in homes -> Top.HOME + else -> Top.GUEST + } + + internal fun holder(topPkg: String?, arrival: String?, homes: Set): String? = when { + topPkg != null -> topPkg.takeIf { classify(it, homes) == Top.GUEST } + arrival != null -> arrival.takeIf { classify(it, homes) == Top.GUEST } + else -> null + } + + internal fun ignorable(type: Int): Boolean = type == AccessibilityWindowInfo.TYPE_INPUT_METHOD || + type == AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY || + type == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER || + type == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY + + fun supported(model: String = Build.MODEL, sdk: Int = Build.VERSION.SDK_INT): Boolean = + sdk >= 33 && DualScreen.yieldsBottom(model) +} + +class BottomScreenWatch(private val service: AccessibilityService) { + private class Arrival(val pkg: String) + + private val thread = HandlerThread("bottom-screen").apply { start() } + private val handler = Handler(thread.looper) + private val own = service.packageName + private val arrivals = ConcurrentHashMap() + private var homes: Set = emptySet() + private var keyboards: Set = emptySet() + private var holders: Map = emptyMap() + private val check = Runnable { evaluate() } + + fun start() { + current = this + service.serviceInfo = service.serviceInfo?.apply { + eventTypes = eventTypes or AccessibilityEvent.TYPE_WINDOWS_CHANGED or AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED + flags = flags or AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS + } + handler.post { + homes = homePackages() + keyboards = keyboardPackages() + evaluate() + } + } + + fun onEvent(event: AccessibilityEvent) { + when (event.eventType) { + AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> { + val pkg = event.packageName?.toString() ?: return + if (event.displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return + arrivals[event.displayId] = Arrival(pkg) + } + AccessibilityEvent.TYPE_WINDOWS_CHANGED -> Unit + else -> return + } + handler.removeCallbacks(check) + handler.postDelayed(check, 150) + } + + fun stop() { + handler.removeCallbacksAndMessages(null) + handler.post { + if (current === this) { + current = null + DualScreen.setTaken(emptySet()) + } + } + thread.quitSafely() + } + + private fun evaluate() { + val seen = HashMap(arrivals) + val all = runCatching { service.windowsOnAllDisplays }.getOrNull() ?: return + val displays = service.getSystemService(DisplayManager::class.java) ?: return + val taken = mutableMapOf() + for (i in 0 until all.size()) { + val id = all.keyAt(i) + if (id == Display.DEFAULT_DISPLAY) continue + val display = displays.getDisplay(id)?.takeIf(DualScreen::builtIn) ?: continue + val windows = all.valueAt(i) + val topPkg = windows.asSequence() + .filter { !BottomScreenGuests.ignorable(it.type) && cover(it, display) >= BottomScreenGuests.MIN_COVER } + .sortedByDescending { it.layer } + .firstNotNullOfOrNull { packageOf(it)?.takeUnless { pkg -> pkg == own } } + val arrival = seen[id] + if (topPkg != null && arrival != null) arrivals.remove(id, arrival) + BottomScreenGuests.holder(topPkg, arrival?.pkg?.takeUnless { it in keyboards }, homes)?.let { taken[id] = it } + } + if (current !== this) return + if (taken != holders) Log.i(TAG, "bottom screen holders: $taken") + holders = taken + DualScreen.setTaken(taken.keys) + } + + private fun cover(window: AccessibilityWindowInfo, display: Display): Float { + val bounds = Rect().also(window::getBoundsInScreen) + val area = display.mode.physicalWidth.toFloat() * display.mode.physicalHeight + return if (area <= 0f) 0f else bounds.width().toFloat() * bounds.height() / area + } + + private fun packageOf(window: AccessibilityWindowInfo): String? = + runCatching { window.getRoot(0)?.packageName?.toString() }.getOrNull() + + private fun homePackages(): Set { + val pm = service.packageManager + return listOf(Intent.CATEGORY_HOME, Intent.CATEGORY_SECONDARY_HOME).flatMap { category -> + runCatching { + pm.queryIntentActivities(Intent(Intent.ACTION_MAIN).addCategory(category), PackageManager.MATCH_ALL) + .filter { it.priority >= 0 } + .mapNotNull { it.activityInfo?.packageName } + }.getOrDefault(emptyList()) + }.toSet() + } + + private fun keyboardPackages(): Set = + runCatching { + service.getSystemService(InputMethodManager::class.java)?.inputMethodList.orEmpty().map { it.packageName }.toSet() + }.getOrDefault(emptySet()) + + private companion object { + @Volatile var current: BottomScreenWatch? = null + const val TAG = "BottomScreen" + const val SYSTEM_UI = "com.android.systemui" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt index e8d7fd71e2..cfd37c95c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt @@ -18,6 +18,23 @@ object DualScreen { private const val TYPE_INTERNAL = 1 private val knownModels = setOf("retroid pocket duo", "ayn thor") private val touchedDisplays = mutableSetOf() + private val takenListeners = java.util.concurrent.CopyOnWriteArraySet<() -> Unit>() + @Volatile private var takenDisplays: Set = emptySet() + private val main by lazy { android.os.Handler(android.os.Looper.getMainLooper()) } + + fun yieldsBottom(model: String): Boolean = model.trim().lowercase().let { m -> knownModels.any(m::startsWith) } + + fun taken(displayId: Int): Boolean = displayId in takenDisplays + + fun setTaken(ids: Set) { + if (ids == takenDisplays) return + takenDisplays = ids + main.post { takenListeners.forEach { it() } } + } + + fun watchTaken(listener: () -> Unit) { takenListeners += listener } + + fun unwatchTaken(listener: () -> Unit) { takenListeners -= listener } fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? { val primary = displayManager.getDisplay(primaryDisplayId) @@ -61,20 +78,25 @@ object DualScreen { (x.max - x.min + 1f).roundToInt() to (y.max - y.min + 1f).roundToInt() } - fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = - when (SessionPrefs.dualScreenMode(context)) { + fun sessionDisplay(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = + display(context, displayManager, primaryDisplayId, SessionPrefs.dualScreenSessionMode(context)) + + fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int, mode: String = SessionPrefs.dualScreenMode(context)): Display? = + when (mode) { MODE_OFF -> null MODE_ON -> internalDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId) else -> builtInDisplay(displayManager, primaryDisplayId) - } + }?.takeUnless { taken(it.displayId) } fun anyDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull { it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 } + fun builtIn(display: Display): Boolean = isBuiltIn(displayType(display), Build.MODEL) + internal fun isBuiltIn(type: Int?, model: String): Boolean = - if (type != null) type == TYPE_INTERNAL else model.trim().lowercase() in knownModels + if (type != null) type == TYPE_INTERNAL else yieldsBottom(model) private fun displayType(display: Display): Int? = runCatching { Display::class.java.getMethod("getType").invoke(display) as Int }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt index 61dfe32c4e..f9d9d34f4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -46,12 +46,20 @@ object HomeButtonShortcuts { } class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { + private var bottomScreen: BottomScreenWatch? = null + override fun onServiceConnected() { getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) + if (bottomScreen == null && BottomScreenGuests.supported()) bottomScreen = BottomScreenWatch(this).also { it.start() } + } + + private fun stopBottomScreen() { + bottomScreen?.stop() + bottomScreen = null } override fun onKeyEvent(event: KeyEvent) = HomeButtonShortcuts.onKeyEvent(this, event) - override fun onAccessibilityEvent(event: AccessibilityEvent?) {} + override fun onAccessibilityEvent(event: AccessibilityEvent?) { event?.let { bottomScreen?.onEvent(it) } } override fun onInterrupt() { HomeButtonShortcuts.release() } override fun onInputDeviceAdded(deviceId: Int) {} override fun onInputDeviceChanged(deviceId: Int) {} @@ -59,12 +67,14 @@ class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListen override fun onUnbind(intent: Intent?): Boolean { HomeButtonShortcuts.release() + stopBottomScreen() com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) return super.onUnbind(intent) } override fun onDestroy() { HomeButtonShortcuts.release() + stopBottomScreen() getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) super.onDestroy() } 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 6913143cad..bbb877f77d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -86,12 +86,26 @@ object SessionPrefs { prefs(context).edit().putBoolean("animations", on).apply() } - fun dualScreenMode(context: Context): String = - prefs(context).getString("dualScreenMode", null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } - ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + private fun savedDualScreenMode(context: Context, key: String): String? = + prefs(context).getString(key, null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } + + private fun legacyDualScreenMode(context: Context): String = + if (!prefs(context).getBoolean("dualScreenLauncher", true)) com.droiddeck.launcher.input.DualScreen.MODE_OFF + else savedDualScreenMode(context, "dualScreenMode") ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + + fun dualScreenMode(context: Context): String = legacyDualScreenMode(context) fun setDualScreenMode(context: Context, mode: String) { - prefs(context).edit().putString("dualScreenMode", mode).apply() + val sessions = dualScreenSessionMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", mode).putString("dualScreenSessionMode", sessions).apply() + } + + fun dualScreenSessionMode(context: Context): String = + savedDualScreenMode(context, "dualScreenSessionMode") ?: legacyDualScreenMode(context) + + fun setDualScreenSessionMode(context: Context, mode: String) { + val launcher = dualScreenMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", launcher).putString("dualScreenSessionMode", mode).apply() } fun secondScreenPanel(context: Context): String? = prefs(context).getString("secondScreenPanel", null) @@ -162,12 +176,6 @@ object SessionPrefs { prefs(context).edit().putStringSet("telemetryOff", keys.toSet()).apply() } - fun dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true) - - fun setDualScreenLauncher(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("dualScreenLauncher", on).apply() - } - fun dualScreenSessionControls(context: Context): Boolean = prefs(context).getBoolean("dualScreenSessionControls", true) fun setDualScreenSessionControls(context: Context, on: Boolean) { 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 b3a2223049..1c257fe297 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -12,7 +12,7 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", - "dualScreenMode", "dualScreenLauncher", "dualScreenSessionControls", + "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", 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 0c91a88735..f40d82d391 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -133,7 +133,7 @@ class FrontEndState( val dualScreen: Boolean = false, val dualScreenDevice: Boolean = false, val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, - val dualScreenLauncher: Boolean = true, + val dualScreenSessions: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, val dualScreenControls: Boolean = true, val packages: List? = null, val packageCatalogLoading: Boolean = false, @@ -238,7 +238,7 @@ class FrontEndActions( val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onDualScreenMode: (String) -> Unit = {}, - val onDualScreenLauncher: (Boolean) -> Unit = {}, + val onDualScreenSessions: (String) -> Unit = {}, val onDualScreenControls: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 6bf7042072..16d18840d8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -435,21 +435,23 @@ internal fun SetupPanel( s.launcherFullscreen, ) { a.onLauncherFullscreen(it) } if (s.dualScreenDevice) { - ChoiceRow( - host, "dual-screen", stringResource(R.string.setup_dual_screen), stringResource(R.string.setup_dual_screen_hint), - listOf( - com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), - com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), - com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), - ), - s.dualScreenMode, onPick = a.onDualScreenMode, + val dualModes = listOf( + com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), + com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), + com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), ) - } - if (s.dualScreenDevice && s.dualScreenMode != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { - ToggleRow(host, "dual-screen-menu", stringResource(R.string.setup_dual_screen_menu), - stringResource(R.string.setup_dual_screen_menu_hint), s.dualScreenLauncher) { a.onDualScreenLauncher(it) } - ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), - stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + ChoiceRow( + host, "dual-screen", stringResource(R.string.setup_dual_screen_launcher), stringResource(R.string.setup_dual_screen_launcher_hint), + dualModes, s.dualScreenMode, onPick = a.onDualScreenMode, + ) + ChoiceRow( + host, "dual-screen-sessions", stringResource(R.string.setup_dual_screen_sessions), stringResource(R.string.setup_dual_screen_sessions_hint), + dualModes, s.dualScreenSessions, onPick = a.onDualScreenSessions, + ) + if (s.dualScreenSessions != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { + ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), + stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + } } } } 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 81c084d6e9..8bcf13c7de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -29,6 +29,7 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.foundation.layout.offset import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.widthIn import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Terminal import androidx.compose.material.icons.outlined.Dashboard @@ -475,8 +476,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SteamActionPill( stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"), ) { host.open = null; a.onClose() } - Spacer(Modifier.width(4.dp)) - BottomScreenModes(a, focus.track(page, "bottom-modes")) { host.open = null } } Spacer(Modifier.weight(1f)) SteamActionPill( @@ -876,69 +875,15 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") val shape = RoundedCornerShape(20.dp) val stopDescription = stringResource(R.string.stop_session) - val stopLabel = stringResource(R.string.drawer_stop) - var iconOnly by remember(stopLabel, androidx.compose.ui.platform.LocalConfiguration.current.screenWidthDp) { mutableStateOf(false) } Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = modifier.heightIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, + modifier = modifier.heightIn(min = 44.dp).widthIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") .clip(shape).background(fill).glideBorder(hot, shape, colors.error.copy(alpha = 0.9f), colors.error.copy(alpha = 0.55f)) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onClick) .controllerConfirm(onClick = onClick) - .padding(start = 12.dp, end = 14.dp), + .padding(horizontal = 12.dp), ) { Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp)) - if (!iconOnly) Text( - stopLabel, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error, - maxLines = 1, softWrap = false, onTextLayout = { if (it.hasVisualOverflow) iconOnly = true }, - ) - } -} - -@Composable -private fun BottomScreenModes(a: DrawerActions, modifier: Modifier, onPick: () -> Unit) { - val pal = LocalPalette.current - val colors = MaterialTheme.colorScheme - val modes = buildList { - if (com.droiddeck.launcher.session.SessionState.deckPad) add(SecondScreenMode.DECK_CONTROLS to Icons.Outlined.SportsEsports) - add(SecondScreenMode.KEYBOARD_TRACKPAD to Icons.Outlined.Keyboard) - add(SecondScreenMode.TERMINAL to Icons.Outlined.Terminal) - if (a.dashboardAvailable) add(SecondScreenMode.DASHBOARD to Icons.Outlined.Dashboard) - if (a.desktopAvailable) add(SecondScreenMode.DESKTOP to Icons.Outlined.DesktopWindows) - } - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(4.dp), - modifier = modifier.focusGroup().clip(RoundedCornerShape(26.dp)).border(1.dp, pal.line, RoundedCornerShape(26.dp)).padding(4.dp), - ) { - modes.forEach { (mode, icon) -> - val selected = a.secondScreenMode == mode - val source = remember { MutableInteractionSource() } - val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value - val shape = RoundedCornerShape(20.dp) - val pick = { onPick(); a.onSecondScreenMode(mode) } - val label = stringResource(mode.label) - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.size(width = 52.dp, height = 40.dp).semantics { contentDescription = label } - .clip(shape) - .background(when { - selected -> pal.signal - hot -> pal.signal.copy(alpha = 0.14f) - else -> Color.Transparent - }) - .glideBorder(hot, shape, pal.signal) - .hoverable(source) - .selectable(selected, interactionSource = source, indication = LocalIndication.current, role = Role.Tab, onClick = pick) - .controllerConfirm(onClick = pick), - ) { - Icon(icon, contentDescription = null, modifier = Modifier.size(22.dp), - tint = when { - selected -> colors.background - hot -> pal.signal - else -> colors.onBackground - }) - } - } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 73c992152e..e9cd80f9d2 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -893,13 +893,9 @@ ملء الشاشة يخفي شريطي الحالة والتنقّل في Android يعرض شريطي الحالة والتنقّل في Android - الشاشة المزدوجة - يستخدم الوضع التلقائي الشاشة الثانية في الأجهزة المحمولة التي تحتوي على شاشة مدمجة. يستخدم وضع التشغيل أي شاشة ثانية. يُبقي وضع الإيقاف كل شيء على شاشة واحدة. تلقائي تشغيل إيقاف - قائمة الشاشة السفلية - ينقل الأقسام وقائمة اللعبة إلى الشاشة الثانية ويتم الكتابة هناك، لتبقى الشاشة العلوية بعرضها الكامل. يبدّل L2 وR2 بين الأقسام. عناصر تحكم الشاشة السفلية في الألعاب يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة. الكتابة على الشاشة العلوية 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 1107fdbeab..98f67f76cd 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -911,13 +911,9 @@ Pantalla completa Oculta las barras de estado y navegación de Android Muestra las barras de estado y navegación de Android - Pantalla dual - Automático usa la segunda pantalla en consolas portátiles que la traen integrada. Activado usa cualquier segunda pantalla. Desactivado deja todo en una sola pantalla. Automático Activado Desactivado - Menú en la pantalla inferior - Mueve las secciones y el menú del juego a la segunda pantalla y escribe ahí, para que la pantalla superior conserve la vista completa. L2 y R2 cambian de sección. Controles en la pantalla inferior en juegos Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión. Escribiendo en la pantalla superior diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bdd38d411a..e1f8d394a5 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -881,13 +881,9 @@ Цял екран Скрива лентите за състояние и навигация на Android Показва лентите за състояние и навигация на Android - Двоен екран - Автоматично използва втория екран на преносими устройства с вграден такъв. Вкл. използва всеки втори дисплей. Изкл. държи всичко на един екран. Автоматично Вкл. Изкл. - Меню на долния екран - Премества секциите и менюто по време на игра на втория екран и въвеждането става там, така горният екран остава с пълен изглед. L2 и R2 сменят секциите. Контроли на долния екран в игрите Отваря тракпада и клавиатурата на втория екран при стартиране на сесия. Въвеждане за горния екран diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 825df28c9c..3313161ea5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -887,13 +887,9 @@ Celá obrazovka Skryje stavový a navigační panel Androidu Zobrazí stavový a navigační panel Androidu - Dvě obrazovky - Automaticky používá druhou obrazovku na kapesních zařízeních, která ji mají vestavěnou. Zapnuto používá jakýkoli druhý displej. Vypnuto nechá vše na jedné obrazovce. Automaticky Zapnuto Vypnuto - Nabídka na spodní obrazovce - Přesune sekce a herní nabídku na druhou obrazovku a píše se tam, takže horní obrazovka zůstane celá volná. L2 a R2 přepínají sekce. Ovládání na spodní obrazovce ve hrách Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce. Psaní pro horní obrazovku diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8722c4dacc..e095bfffe4 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -881,13 +881,9 @@ Fuldskærm Skjuler Androids status- og navigationsbjælker Viser Androids status- og navigationsbjælker - Dobbeltskærm - Automatisk bruger den anden skærm på håndholdte enheder med en indbygget ekstra skærm. Til bruger enhver anden skærm. Fra holder alt på én skærm. Automatisk Til Fra - Menu på nederste skærm - Flytter sektionerne og menuen i spillet til den anden skærm og skriver der, så den øverste skærm beholder hele visningen. L2 og R2 skifter sektion. Kontroller på nederste skærm i spil Åbner pegefeltet og tastaturet på den anden skærm, når en session starter. Skriver til den øverste skærm diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a8a431e18a..1f280286a5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -873,13 +873,9 @@ Vollbild Blendet die Status- und Navigationsleiste von Android aus Zeigt die Status- und Navigationsleiste von Android an - Zwei Bildschirme - Automatisch nutzt den zweiten Bildschirm auf Handhelds mit eingebautem Zweitbildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus lässt alles auf einem Bildschirm. Automatisch Ein Aus - Menü auf dem unteren Bildschirm - Verschiebt die Bereiche und das Menü im Spiel auf den zweiten Bildschirm und tippt dort, damit der obere Bildschirm die volle Ansicht behält. L2 und R2 wechseln den Bereich. Steuerung auf dem unteren Bildschirm in Spielen Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm. Eingabe für den oberen Bildschirm diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index bd5bf28d64..7ffe86fd91 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -881,13 +881,9 @@ Πλήρης οθόνη Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android - Διπλή οθόνη - Το Αυτόματο χρησιμοποιεί τη δεύτερη οθόνη σε φορητές συσκευές με ενσωματωμένη. Το Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Το Ανενεργό κρατά τα πάντα σε μία οθόνη. Αυτόματο Ενεργό Ανενεργό - Μενού κάτω οθόνης - Μεταφέρει τις ενότητες και το μενού του παιχνιδιού στη δεύτερη οθόνη και η πληκτρολόγηση γίνεται εκεί, ώστε η πάνω οθόνη να κρατά την πλήρη προβολή. Τα L2 και R2 αλλάζουν ενότητα. Χειριστήρια κάτω οθόνης στα παιχνίδια Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία. Πληκτρολόγηση για την πάνω οθόνη diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8f8103644a..32acc2d900 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -884,13 +884,9 @@ Pantalla completa Oculta las barras de estado y navegación de Android Muestra las barras de estado y navegación de Android - Pantalla doble - Automático usa la segunda pantalla en consolas portátiles que la llevan integrada. Activado usa cualquier segunda pantalla. Desactivado lo mantiene todo en una pantalla. Automático Activado Desactivado - Menú en la pantalla inferior - Mueve las secciones y el menú del juego a la segunda pantalla y se escribe allí, para que la pantalla superior mantenga la vista completa. L2 y R2 cambian de sección. Controles en la pantalla inferior en juegos Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión. Escribiendo en la pantalla superior diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f23c31a17e..576685c47e 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -881,13 +881,9 @@ Koko näyttö Piilottaa Androidin tila- ja navigointipalkit Näyttää Androidin tila- ja navigointipalkit - Kaksi näyttöä - Automaattinen käyttää toista näyttöä kämmenlaitteissa, joissa sellainen on sisäänrakennettuna. Päällä käyttää mitä tahansa toista näyttöä. Pois pitää kaiken yhdellä näytöllä. Automaattinen Päällä Pois - Alanäytön valikko - Siirtää osiot ja pelin aikaisen valikon toiselle näytölle ja kirjoitus tehdään siellä, joten yläruutu säilyttää koko näkymän. L2 ja R2 vaihtavat osiota. Alanäytön ohjaimet peleissä Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa. Kirjoitus yläruudulle diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 543e16d257..c5097f314d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -884,13 +884,9 @@ Plein écran Masquer la barre d\'état et la barre de navigation Android Afficher la barre d\'état et la barre de navigation Android - Double écran - Automatique utilise le second écran sur les consoles portables qui en ont un intégré. Activé utilise n\'importe quel second écran. Désactivé garde tout sur un seul écran. Automatique Activé Désactivé - Menu sur l\'écran du bas - Déplace les sections et le menu en jeu sur le second écran et la saisie s\'y fait, pour que l\'écran du haut garde toute la vue. L2 et R2 changent de section. Commandes sur l\'écran du bas en jeu Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session. Saisie pour l\'écran du haut diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 45ef464e62..f90bd69595 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -881,13 +881,9 @@ फ़ुलस्क्रीन Android स्टेटस और नेविगेशन बार छिपाता है Android स्टेटस और नेविगेशन बार दिखाता है - डुअल स्क्रीन - ऑटोमैटिक, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड पर दूसरी स्क्रीन इस्तेमाल करता है। चालू किसी भी दूसरे डिस्प्ले का इस्तेमाल करता है। बंद सब कुछ एक स्क्रीन पर रखता है। ऑटोमैटिक चालू बंद - नीचे की स्क्रीन पर मेनू - सेक्शन और गेम के दौरान का मेनू दूसरी स्क्रीन पर ले जाता है और टाइपिंग वहीं होती है, ताकि ऊपर की स्क्रीन पूरा दृश्य दिखाए। L2 और R2 सेक्शन बदलते हैं। गेम में नीचे की स्क्रीन के कंट्रोल सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है। ऊपर की स्क्रीन के लिए टाइपिंग diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e9c693d02b..8526960ba4 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -881,13 +881,9 @@ Teljes képernyő Elrejti az Android állapot- és navigációs sávokat Megjeleníti az Android állapot- és navigációs sávokat - Két képernyő - Az Automatikus a beépített második képernyővel rendelkező kézikonzolokon használja a második képernyőt. A Be bármilyen második kijelzőt használ. A Ki mindent egy képernyőn tart. Automatikus Be Ki - Menü az alsó képernyőn - A szakaszokat és a játék közbeni menüt a második képernyőre helyezi, és ott történik a gépelés, így a felső képernyő teljes nézetet kap. Az L2 és R2 vált szakaszt. Alsó képernyős vezérlők játékokban Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn. Gépelés a felső képernyőre diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index fe04ab97d8..05abf15fad 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -878,13 +878,9 @@ Layar penuh Menyembunyikan bilah status dan navigasi Android Menampilkan bilah status dan navigasi Android - Layar ganda - Otomatis memakai layar kedua pada perangkat genggam yang memiliki layar bawaan. Aktif memakai layar kedua apa pun. Nonaktif membuat semuanya tetap di satu layar. Otomatis Aktif Nonaktif - Menu layar bawah - Memindahkan bagian dan menu dalam game ke layar kedua dan mengetik di sana, agar layar atas tetap menampilkan tampilan penuh. L2 dan R2 berpindah bagian. Kontrol layar bawah dalam game Membuka trackpad dan keyboard di layar kedua saat sesi dimulai. Mengetik untuk layar atas diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3dc322e7ac..a4c97d92f2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -876,13 +876,9 @@ Schermo intero Nasconde la barra di stato e la barra di navigazione di Android Mostra la barra di stato e la barra di navigazione di Android - Doppio schermo - Automatico usa il secondo schermo sulle console portatili che ne hanno uno integrato. Attivo usa qualsiasi secondo schermo. Disattivo tiene tutto su un solo schermo. Automatico Attivo Disattivo - Menu sullo schermo inferiore - Sposta le sezioni e il menu di gioco sul secondo schermo e si digita lì, così lo schermo superiore mantiene la vista completa. L2 e R2 cambiano sezione. Controlli sullo schermo inferiore nei giochi Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione. Digitazione per lo schermo superiore diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ea759df1f8..db8252aec4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -878,13 +878,9 @@ 全画面 Androidのステータスバーとナビゲーションバーを非表示 Androidのステータスバーとナビゲーションバーを表示 - デュアル画面 - 自動では、2画面目を内蔵した携帯機でその画面を使います。オンではどの2画面目でも使います。オフではすべてを1画面に表示します。 自動 オン オフ - 下画面メニュー - セクションとゲーム中のメニューを2画面目に移し、入力もそこで行うため、上画面は全体表示のままになります。L2とR2でセクションを切り替えます。 ゲーム中の下画面コントロール セッション開始時に2画面目にトラックパッドとキーボードを開きます。 上画面に入力中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9f3f85e373..a8e34c3988 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -878,13 +878,9 @@ 전체 화면 Android 상태 표시줄 및 탐색 표시줄 숨기기 Android 상태 표시줄 및 탐색 표시줄 표시 - 듀얼 화면 - 자동은 두 번째 화면이 내장된 휴대용 기기에서 그 화면을 사용합니다. 켜기는 모든 두 번째 디스플레이를 사용합니다. 끄기는 모든 것을 한 화면에 둡니다. 자동 켜기 끄기 - 하단 화면 메뉴 - 섹션과 게임 중 메뉴를 두 번째 화면으로 옮기고 입력도 그곳에서 하므로 상단 화면은 전체 보기를 유지합니다. L2와 R2로 섹션을 전환합니다. 게임 중 하단 화면 컨트롤 세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다. 상단 화면에 입력 중 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 43312006f7..c480939a49 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -878,13 +878,9 @@ Skrin penuh Menyembunyikan bar status dan navigasi Android Memaparkan bar status dan navigasi Android - Dwi skrin - Automatik menggunakan skrin kedua pada peranti pegang tangan yang mempunyai skrin terbina dalam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan semuanya pada satu skrin. Automatik Hidup Mati - Menu skrin bawah - Memindahkan bahagian dan menu dalam permainan ke skrin kedua dan menaip di sana, supaya skrin atas kekal dengan paparan penuh. L2 dan R2 menukar bahagian. Kawalan skrin bawah dalam permainan Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula. Menaip untuk skrin atas diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b9be6a70aa..7d49438836 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -881,13 +881,9 @@ Fullskjerm Skjuler Androids status- og navigasjonslinjer Viser Androids status- og navigasjonslinjer - Dobbel skjerm - Automatisk bruker den andre skjermen på håndholdte enheter med innebygd skjerm. På bruker enhver annen skjerm. Av holder alt på én skjerm. Automatisk På Av - Meny på nederste skjerm - Flytter seksjonene og menyen i spillet til den andre skjermen og skriver der, så den øverste skjermen beholder hele visningen. L2 og R2 bytter seksjon. Kontroller på nederste skjerm i spill Åpner styreflaten og tastaturet på den andre skjermen når en økt starter. Skriver for den øverste skjermen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 76f7aa11c3..ce3f5fdfe5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -881,13 +881,9 @@ Volledig scherm Verbergt de statusbalk en navigatiebalk van Android Toont de statusbalk en navigatiebalk van Android - Dubbel scherm - Automatisch gebruikt het tweede scherm op handhelds met een ingebouwd scherm. Aan gebruikt elk tweede scherm. Uit houdt alles op één scherm. Automatisch Aan Uit - Menu op het onderste scherm - Verplaatst de onderdelen en het menu in het spel naar het tweede scherm en typt daar, zodat het bovenste scherm het volledige beeld houdt. L2 en R2 wisselen van onderdeel. Bediening op het onderste scherm in games Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start. Typen voor het bovenste scherm diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c74e8dedfd..6cd7eef206 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -887,13 +887,9 @@ Pełny ekran Ukrywa systemowe paski stanu i nawigacji Pokazuje systemowe paski stanu i nawigacji - Dwa ekrany - Automatycznie używa drugiego ekranu w urządzeniach przenośnych, które mają go wbudowanego. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone zostawia wszystko na jednym ekranie. Automatycznie Włączone Wyłączone - Menu na dolnym ekranie - Przenosi sekcje i menu w grze na drugi ekran i tam odbywa się pisanie, dzięki czemu górny ekran zachowuje pełny widok. L2 i R2 przełączają sekcje. Sterowanie na dolnym ekranie w grach Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji. Pisanie dla górnego ekranu diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index defb213d1d..ed5df7013e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -876,13 +876,9 @@ Ecrã inteiro Oculta as barras de estado e de navegação do Android Mostra as barras de estado e de navegação do Android - Ecrã duplo - Automático usa o segundo ecrã em consolas portáteis com ecrã secundário integrado. Ativado usa qualquer segundo ecrã. Desativado mantém tudo num só ecrã. Automático Ativado Desativado - Menu no ecrã inferior - Move as secções e o menu do jogo para o segundo ecrã e a escrita é feita lá, para que o ecrã superior mantenha a vista completa. L2 e R2 mudam de secção. Controlos no ecrã inferior nos jogos Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa. A escrever para o ecrã superior diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2615c5ad08..17223e030d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -876,13 +876,9 @@ Tela cheia Oculta as barras de status e de navegação do Android Mostra as barras de status e de navegação do Android - Tela dupla - Automático usa a segunda tela em portáteis que têm uma integrada. Ativado usa qualquer segunda tela. Desativado mantém tudo em uma tela. Automático Ativado Desativado - Menu na tela inferior - Move as seções e o menu do jogo para a segunda tela e a digitação acontece lá, para que a tela superior mantenha a visão completa. L2 e R2 trocam de seção. Controles na tela inferior nos jogos Abre o trackpad e o teclado na segunda tela quando uma sessão começa. Digitando para a tela superior diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5e117cba6b..f46ca94f54 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -884,13 +884,9 @@ Ecran complet Ascunde barele de stare și de navigare Android Arată barele de stare și de navigare Android - Ecran dublu - Automat folosește al doilea ecran pe consolele portabile care au unul integrat. Pornit folosește orice al doilea afișaj. Oprit păstrează totul pe un singur ecran. Automat Pornit Oprit - Meniu pe ecranul de jos - Mută secțiunile și meniul din joc pe al doilea ecran și scrierea se face acolo, astfel încât ecranul de sus păstrează imaginea completă. L2 și R2 schimbă secțiunea. Comenzi pe ecranul de jos în jocuri Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune. Scriere pentru ecranul de sus diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5fa685926d..44a3a5005e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -887,13 +887,9 @@ Полноэкранный режим Скрывает строку состояния и панель навигации Android Показывает строку состояния и панель навигации Android - Два экрана - Автоматически — использует второй экран на портативных устройствах со встроенным вторым экраном. Вкл. — использует любой второй дисплей. Выкл. — всё остаётся на одном экране. Автоматически Вкл. Выкл. - Меню на нижнем экране - Переносит разделы и меню в игре на второй экран, и ввод выполняется там, поэтому верхний экран остаётся полностью свободным. L2 и R2 переключают разделы. Управление на нижнем экране в играх Открывает тачпад и клавиатуру на втором экране при запуске сеанса. Ввод для верхнего экрана diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8f89510e47..88c1852e58 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -881,13 +881,9 @@ Helskärm Döljer Androids statusfält och navigeringsfält Visar Androids statusfält och navigeringsfält - Dubbelskärm - Automatiskt använder den andra skärmen på handhållna enheter med en inbyggd andra skärm. På använder vilken andra skärm som helst. Av håller allt på en skärm. Automatiskt På Av - Meny på nedre skärmen - Flyttar avsnitten och menyn i spelet till den andra skärmen och skrivandet sker där, så att den övre skärmen behåller hela vyn. L2 och R2 byter avsnitt. Kontroller på nedre skärmen i spel Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar. Skriver för den övre skärmen diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e56ececd31..0cf02f24bb 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -878,13 +878,9 @@ เต็มจอ ซ่อนแถบสถานะและแถบนำทางของ Android แสดงแถบสถานะและแถบนำทางของ Android - หน้าจอคู่ - อัตโนมัติจะใช้หน้าจอที่สองบนเครื่องพกพาที่มีหน้าจอที่สองในตัว เปิดจะใช้หน้าจอที่สองใดก็ได้ ปิดจะแสดงทุกอย่างบนหน้าจอเดียว อัตโนมัติ เปิด ปิด - เมนูหน้าจอล่าง - ย้ายส่วนต่าง ๆ และเมนูระหว่างเล่นเกมไปที่หน้าจอที่สองและพิมพ์ที่นั่น เพื่อให้หน้าจอบนแสดงเต็มพื้นที่ L2 และ R2 ใช้สลับส่วน ปุ่มควบคุมหน้าจอล่างในเกม เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน กำลังพิมพ์ให้หน้าจอบน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 380ea77773..c1aa70c7fc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -873,13 +873,9 @@ Tam ekran Android durum ve gezinme çubuklarını gizler Android durum ve gezinme çubuklarını gösterir - Çift ekran - Otomatik, dahili ikinci ekranı olan el konsollarında ikinci ekranı kullanır. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, her şeyi tek ekranda tutar. Otomatik Açık Kapalı - Alt ekran menüsü - Bölümleri ve oyun içi menüyü ikinci ekrana taşır ve yazma orada yapılır, böylece üst ekran tam görünümü korur. L2 ve R2 bölümler arasında geçiş yapar. Oyunlarda alt ekran kontrolleri Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar. Üst ekran için yazılıyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d11cb4d917..ee1706bfdb 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -887,13 +887,9 @@ Повний екран Приховує рядок стану та панель навігації Android Показує рядок стану та панель навігації Android - Два екрани - Автоматично — використовує другий екран на портативних пристроях із вбудованим другим екраном. Увімк. — використовує будь-який другий дисплей. Вимк. — усе лишається на одному екрані. Автоматично Увімк. Вимк. - Меню на нижньому екрані - Переносить розділи та меню в грі на другий екран, і введення відбувається там, тож верхній екран лишається повністю вільним. L2 і R2 перемикають розділи. Керування на нижньому екрані в іграх Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу. Введення для верхнього екрана diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bd560f50d9..2cc18d5e8e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -878,13 +878,9 @@ Toàn màn hình Ẩn thanh trạng thái và thanh điều hướng của Android Hiện thanh trạng thái và thanh điều hướng của Android - Màn hình kép - Tự động dùng màn hình thứ hai trên máy cầm tay có màn hình thứ hai tích hợp. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ mọi thứ trên một màn hình. Tự động Bật Tắt - Menu ở màn hình dưới - Chuyển các mục và menu trong trò chơi sang màn hình thứ hai và nhập liệu ở đó, để màn hình trên giữ toàn bộ khung nhìn. L2 và R2 chuyển mục. Điều khiển màn hình dưới khi chơi game Mở bàn di chuột và bàn phím trên màn hình thứ hai khi phiên bắt đầu. Đang nhập cho màn hình trên diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b881f1e716..f2f0f10fa9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -878,13 +878,9 @@ 全屏 隐藏 Android 状态栏和导航栏 显示 Android 状态栏和导航栏 - 双屏 - 自动:在内置第二块屏幕的掌机上使用该屏幕。开启:使用任何第二块显示器。关闭:所有内容只显示在一块屏幕上。 自动 开启 关闭 - 下屏菜单 - 将各个分区和游戏内菜单移到第二块屏幕并在那里输入,让上屏保持完整画面。L2 和 R2 切换分区。 游戏中的下屏控制 会话开始时在第二块屏幕上打开触控板和键盘。 正在为上屏输入 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index caced3676f..6af88be055 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -878,13 +878,9 @@ 全螢幕 隱藏 Android 狀態列和導覽列 顯示 Android 狀態列和導覽列 - 雙屏 - 自動:在內置第二塊螢幕的掌機上使用該螢幕。開啟:使用任何第二塊顯示器。關閉:所有內容只顯示在一塊螢幕上。 自動 開啟 關閉 - 下屏選單 - 將各個分區和遊戲內選單移到第二塊螢幕並在那裡輸入,讓上屏保持完整畫面。L2 和 R2 切換分區。 遊戲中的下屏控制 工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。 正在為上屏輸入 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ad9a72246d..74a53be9aa 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -878,13 +878,9 @@ 全螢幕 隱藏 Android 狀態列和導覽列 顯示 Android 狀態列和導覽列 - 雙螢幕 - 自動:在內建第二個螢幕的掌機上使用該螢幕。開啟:使用任何第二個顯示器。關閉:所有內容只顯示在一個螢幕上。 自動 開啟 關閉 - 下螢幕選單 - 將各個區塊和遊戲內選單移到第二個螢幕並在那裡輸入,讓上螢幕保持完整畫面。L2 和 R2 切換區塊。 遊戲中的下螢幕控制 工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。 正在為上螢幕輸入 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c30b06c8dd..e6f2f133d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -942,13 +942,13 @@ Fullscreen Hides the Android status and navigation bars Shows the Android status and navigation bars - Dual screen - Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps the launcher and games on one screen; you can still pick a second screen from the session menu. + Dual screen launcher + Automatic puts the launcher sections (Steam, Library, Stores and the rest) on the second screen of handhelds with a built-in one. On uses any second display. Off keeps the launcher on one screen. + Dual screen sessions + Automatic docks the in-game menu on the built-in second screen instead of a pop-over. On uses any second display. Off keeps the menu on the game screen; you can still pick a second screen from it. Automatic On Off - Bottom screen menu - Moves the sections and the in-game menu to the second screen and types there, so the top screen keeps the full view. L2 and R2 switch sections. Bottom screen controls in games Opens the trackpad and keyboard on the second screen when a session starts. Typing on the top screen diff --git a/app/src/main/res/xml/home_button_service.xml b/app/src/main/res/xml/home_button_service.xml index 3b094dcd54..0c67e9effd 100644 --- a/app/src/main/res/xml/home_button_service.xml +++ b/app/src/main/res/xml/home_button_service.xml @@ -3,5 +3,5 @@ android:accessibilityFeedbackType="feedbackGeneric" android:accessibilityFlags="flagRequestFilterKeyEvents" android:canRequestFilterKeyEvents="true" - android:canRetrieveWindowContent="false" + android:canRetrieveWindowContent="true" android:description="@string/integration_shortcuts_service_description" /> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt new file mode 100644 index 0000000000..d9c959dae9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.accessibility.AccessibilityWindowInfo +import com.droiddeck.launcher.input.BottomScreenGuests.Top +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class BottomScreenGuestsTest { + private val homes = setOf("com.android.launcher3", "com.retroidpocket.gamelauncher") + + @After fun clear() = DualScreen.setTaken(emptySet()) + + @Test fun onlyTheRetroidPocketDuoAndAynThorWatchTheirBottomScreen() { + assertTrue(BottomScreenGuests.supported("Retroid Pocket Duo", 36)) + assertTrue(BottomScreenGuests.supported(" retroid pocket duo ", 33)) + assertFalse(BottomScreenGuests.supported("Retroid Pocket Duo", 32)) + assertTrue(BottomScreenGuests.supported("AYN Thor", 33)) + assertTrue(BottomScreenGuests.supported("AYN Thor Max", 34)) + assertFalse(BottomScreenGuests.supported("AYN Odin 2", 36)) + assertFalse(BottomScreenGuests.supported("Pixel 8", 36)) + } + + @Test fun anyWindowButTheHomeScreenHoldsTheScreen() { + assertEquals(Top.HOME, BottomScreenGuests.classify("com.android.launcher3", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.android.chrome", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.retroidpocket.dualscreen.assistant", homes)) + assertEquals(Top.NONE, BottomScreenGuests.classify(null, homes)) + } + + @Test fun theWindowListDecidesWhenItSeesPastDroidDeck() { + assertEquals("com.android.chrome", BottomScreenGuests.holder("com.android.chrome", null, homes)) + assertEquals(null, BottomScreenGuests.holder("com.android.launcher3", "com.android.chrome", homes)) + } + + @Test fun anAppOpenedUnderDroidDeckHoldsTheScreenUntilTheListSeesIt() { + assertEquals("com.google.android.youtube", BottomScreenGuests.holder(null, "com.google.android.youtube", homes)) + assertEquals(null, BottomScreenGuests.holder(null, "com.android.launcher3", homes)) + assertEquals(null, BottomScreenGuests.holder(null, null, homes)) + } + + @Test fun keyboardsAndOverlaysNeverTakeTheScreen() { + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_INPUT_METHOD)) + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_APPLICATION)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_SYSTEM)) + } + + @Test fun listenersHearWhenTheScreenIsTakenAndFreed() { + var calls = 0 + val listener: () -> Unit = { calls++ } + DualScreen.watchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertTrue(DualScreen.taken(2)) + assertFalse(DualScreen.taken(0)) + DualScreen.setTaken(setOf(2)) + DualScreen.setTaken(emptySet()) + shadowOf(Looper.getMainLooper()).idle() + assertFalse(DualScreen.taken(2)) + assertEquals(2, calls) + DualScreen.unwatchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(2, calls) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt index c5fd50d60c..e50fcbadf4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt @@ -29,6 +29,7 @@ class DualScreenTest { @Test fun knownModelsCountWhenTheTypeIsHidden() { assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo")) assertTrue(DualScreen.isBuiltIn(null, " AYN Thor ")) + assertTrue(DualScreen.isBuiltIn(null, "AYN Thor Max")) assertFalse(DualScreen.isBuiltIn(null, "Pixel 8")) } @@ -65,4 +66,19 @@ class DualScreenTest { SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) } + + @Test fun launcherAndSessionsKeepSeparateModes() { + SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenSessionMode(context)) + SessionPrefs.setDualScreenSessionMode(context, DualScreen.MODE_ON) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_ON, SessionPrefs.dualScreenSessionMode(context)) + } + + @Test fun anOldDisabledMenuToggleTurnsBothOff() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("dualScreenLauncher", false).commit() + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenSessionMode(context)) + } } From 55da0afd061f5d300d608cb00067de2585d18ca7 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:07:26 -0500 Subject: [PATCH 04/16] fix(hud): GPU clock and load without root on Adreno 8xx and hardware-scheduled kernels (#1981) On phones where Android blocks the GPU's sysfs files for apps, the HUD reads the GPU without root (#1969). On Adreno 8xx that showed no GPU clock and only the partial load from Vulkan timing (OnePlus 13, Adreno 830, reported by iamTooShaar). - GPU clock: the clock job used the Adreno 6xx/7xx registers. The register layout is now picked from the KGSL chip id: on 8xx CP_ALWAYS_ON_COUNTER is 0x8e7 and the RBBM cycle countable is 1. Unknown later generations read nothing. - GPU load: hardware-scheduled kgsl kernels (every 8xx, and some 7xx such as the AYANEO Pocket FIT's) never write the memstore ringbuffer timestamps. When those stay 0, the reader samples the contexts' own memstore entries (every context that has submitted work, up to 64, contexts with new or running work first). - HUD diagnostics report: a "GPU readers without root" line with the reason each reader works or fails, "none" instead of "null", and the per-core CPU % source named honestly. Tested: iamTooShaar's OnePlus 13 shows GPU clock and load with the PR test build (06be2c5). Pocket FIT standalone build of the final readers against the kernel's sysfs numbers: idle 1-2 % vs 3-4 %, GPU job loop 25-29 % vs 28-30 %, clock 1050 MHz vs 1050 MHz. The review fixes after the test build were not tested on the OnePlus 13. --- app/src/main/cpp/gpuclock/kgsl_busy.c | 41 +++++++++++-- app/src/main/cpp/gpuclock/kgsl_busy.h | 40 +++++++++++++ app/src/main/cpp/gpuclock/kgsl_clock.c | 21 ++++--- app/src/main/cpp/gpuclock/kgsl_layout.h | 27 +++++++++ .../launcher/hud/DroidDeckHudHost.kt | 6 +- .../droiddeck/launcher/hud/HudMetrics.java | 23 ++++++-- .../launcher/session/GpuStatsComponent.kt | 13 ++++- .../droiddeck/launcher/session/KgslBusy.kt | 23 +++++++- .../droiddeck/launcher/session/KgslClock.kt | 32 +++++++++-- .../droiddeck/launcher/session/KgslErrors.kt | 11 ++++ .../launcher/session/GpuReaderStatusTest.kt | 30 ++++++++++ tools/tests/kgsl_busy_harness.c | 57 +++++++++++++++++++ tools/tests/test_kgsl_busy.py | 4 +- 13 files changed, 299 insertions(+), 29 deletions(-) create mode 100644 app/src/main/cpp/gpuclock/kgsl_layout.h create mode 100644 app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.c b/app/src/main/cpp/gpuclock/kgsl_busy.c index a611147935..ec652c8d1b 100644 --- a/app/src/main/cpp/gpuclock/kgsl_busy.c +++ b/app/src/main/cpp/gpuclock/kgsl_busy.c @@ -1,5 +1,6 @@ // Whole-GPU busy share without root on Adreno (KGSL) devices whose kgsl sysfs is blocked for apps: a thread -// samples the memstore ringbuffer timestamps (kgsl_busy.h) once a millisecond while running. +// samples the memstore timestamps (kgsl_busy.h) once a millisecond while running. Ringbuffer entries are used where +// the kernel writes them; on hardware-scheduled kernels, which leave them at 0, the contexts' own entries are used. #include #include #include @@ -15,13 +16,21 @@ #include "kgsl_busy.h" #define SAMPLE_NS 1000000L +// Context mode: how many samples between scans of the context entries. +#define SCAN_EVERY 200 + +enum { MODE_RINGBUFFER = 1, MODE_CONTEXTS = 2 }; struct reader { int fd; void *map; size_t bytes; int first; + int mode; uint32_t last[KGSL_BUSY_SLOTS]; + uint32_t *seen, *ctx_last; + int live[KGSL_BUSY_MAX_LIVE]; + int live_count; pthread_mutex_t lock; pthread_t thread; int thread_on; @@ -32,9 +41,18 @@ struct reader { static void *sample_loop(void *arg) { struct reader *r = arg; const struct timespec gap = {0, SAMPLE_NS}; + int until_scan = 0; while (atomic_load(&r->run)) { - int moved = 0; - int busy = kgsl_busy_sample(r->map, r->first, r->last, &moved); + int moved = 0, busy; + if (r->mode == MODE_CONTEXTS) { + if (until_scan-- <= 0) { + r->live_count = kgsl_busy_scan_contexts(r->map, r->first, r->seen, r->live, KGSL_BUSY_MAX_LIVE); + until_scan = SCAN_EVERY; + } + busy = kgsl_busy_sample_contexts(r->map, r->live, r->live_count, r->ctx_last, &moved); + } else { + busy = kgsl_busy_sample(r->map, r->first, r->last, &moved); + } if (busy) atomic_fetch_add(&r->busy, 1); if (moved) atomic_fetch_add(&r->moves, 1); atomic_fetch_add(&r->samples, 1); @@ -62,6 +80,8 @@ static void reader_close(struct reader *r) { reader_run(r, 0); if (r->map && r->map != MAP_FAILED) munmap(r->map, r->bytes); if (r->fd >= 0) close(r->fd); + free(r->seen); + free(r->ctx_last); pthread_mutex_destroy(&r->lock); free(r); } @@ -85,7 +105,16 @@ static int reader_open(struct reader **out) { int moved = 0, started = 0; kgsl_busy_sample(r->map, r->first, r->last, &moved); for (int i = 0; i < KGSL_BUSY_SLOTS; i++) started |= r->last[i] != 0; - if (!started) { reader_close(r); return -ENODATA; } + if (started) { + r->mode = MODE_RINGBUFFER; + } else { + r->seen = calloc((size_t)r->first, sizeof(uint32_t)); + r->ctx_last = calloc((size_t)r->first, sizeof(uint32_t)); + if (!r->seen || !r->ctx_last) { reader_close(r); return -ENOMEM; } + r->live_count = kgsl_busy_scan_contexts(r->map, r->first, r->seen, r->live, KGSL_BUSY_MAX_LIVE); + kgsl_busy_sample_contexts(r->map, r->live, r->live_count, r->ctx_last, &moved); + r->mode = MODE_CONTEXTS; + } *out = r; return 0; } @@ -103,6 +132,10 @@ JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeOpen( return e ? 0 : (jlong)(intptr_t)r; } +JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeMode(JNIEnv *env, jclass cls, jlong handle) { + return handle ? ((struct reader *)(intptr_t)handle)->mode : 0; +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeRun(JNIEnv *env, jclass cls, jlong handle, jboolean on) { if (handle) reader_run((struct reader *)(intptr_t)handle, on ? 1 : 0); } diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.h b/app/src/main/cpp/gpuclock/kgsl_busy.h index 2179cf533f..0ca7bfb067 100644 --- a/app/src/main/cpp/gpuclock/kgsl_busy.h +++ b/app/src/main/cpp/gpuclock/kgsl_busy.h @@ -34,4 +34,44 @@ static inline int kgsl_busy_sample(const volatile uint32_t *memstore, int first, return busy; } +// Hardware-scheduled kernels (every gen8 GPU and some gen7 ones: .gpudev = *_hwsched_gpudev in adreno-gpulist.h) +// leave the ringbuffer entries at 0. The GMU firmware writes each context's own entry instead +// (gen8_hwsched_hfi.c send_context_pointers). Context ids run from 1 below the ringbuffer entries, lowest free first, +// and kgsl zeroes an entry when its context is created or destroyed. +#define KGSL_BUSY_MAX_LIVE 64 + +// Collects the contexts to sample: every entry below first with a non-zero start stamp (kgsl zeroes an entry when its +// context is created or destroyed). Entries whose start stamp changed since the previous scan (seen[]) or that are +// busy now come first, so the max_live cap only drops idle ones. Returns how many ids went into live[]. +static inline int kgsl_busy_scan_contexts(const volatile uint32_t *memstore, int first, uint32_t *seen, int *live, int max_live) { + int n = 0, idle = 0; + int idle_ids[KGSL_BUSY_MAX_LIVE]; + for (int id = 1; id < first; id++) { + const volatile uint32_t *entry = memstore + (size_t)id * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + int changed = sop != seen[id]; + seen[id] = sop; + if ((changed || sop != eop) && n < max_live) live[n++] = id; + else if (sop != 0 && idle < KGSL_BUSY_MAX_LIVE) idle_ids[idle++] = id; + } + for (int i = 0; i < idle && n < max_live; i++) live[n++] = idle_ids[i]; + return n; +} + +// 1 when a live context has a submission between its start and end timestamps. *moved is set when a start +// timestamp differs from last[] (indexed by context id), which then holds the new ones. +static inline int kgsl_busy_sample_contexts(const volatile uint32_t *memstore, const int *live, int count, uint32_t *last, int *moved) { + int busy = 0; + for (int i = 0; i < count; i++) { + const volatile uint32_t *entry = memstore + (size_t)live[i] * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + if (sop != eop) busy = 1; + if (sop != last[live[i]]) { + *moved = 1; + last[live[i]] = sop; + } + } + return busy; +} + #endif diff --git a/app/src/main/cpp/gpuclock/kgsl_clock.c b/app/src/main/cpp/gpuclock/kgsl_clock.c index b021208b4d..e70a1d537c 100644 --- a/app/src/main/cpp/gpuclock/kgsl_clock.c +++ b/app/src/main/cpp/gpuclock/kgsl_clock.c @@ -16,21 +16,18 @@ #include #include "../adrenotools/src/hook/kgsl.h" +#include "kgsl_layout.h" #define CP_TYPE7_PKT 0x70000000u #define CP_NOP 0x10u #define CP_REG_TO_MEM 0x3eu -#define CP_ALWAYS_ON_COUNTER 0x980u -#define RBBM_ALWAYS_COUNT 0u -// gen7 CP protection marks registers 0x000-0x4ff readable by command buffers (adreno-gpulist.h); a counter -// kgsl places anywhere else is not read. -#define READABLE_LAST 0x4ffu #define XO_HZ 19200000.0 #define NOP_DWORDS 0x3fffu #define NOP_BLOCKS 4 struct sampler { int fd; + const struct kgsl_layout *layout; unsigned context; unsigned counter_reg; struct kgsl_gpumem_alloc_id ib, out; @@ -60,7 +57,7 @@ static void sampler_close(struct sampler *s) { if (s->out.id) { struct kgsl_gpumem_free_id f = {.id = s->out.id}; ioctl(s->fd, IOCTL_KGSL_GPUMEM_FREE_ID, &f); } if (s->context) { struct kgsl_drawctxt_destroy d = {.drawctxt_id = s->context}; ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &d); } if (s->counter_reg) { - struct kgsl_perfcounter_put p = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = RBBM_ALWAYS_COUNT}; + struct kgsl_perfcounter_put p = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = s->layout->cycles}; ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_PUT, &p); } close(s->fd); @@ -69,7 +66,7 @@ static void sampler_close(struct sampler *s) { } static void emit_reads(struct sampler *s, size_t *n, unsigned pass) { - const unsigned regs[2] = {CP_ALWAYS_ON_COUNTER, s->counter_reg}; + const unsigned regs[2] = {s->layout->always_on, s->counter_reg}; for (unsigned k = 0; k < 2; k++) { uint64_t dst = s->out.gpuaddr + (uint64_t)(pass * 2 + k) * sizeof(uint64_t); s->ib_map[(*n)++] = pkt7(CP_REG_TO_MEM, 3); @@ -85,10 +82,16 @@ static int sampler_open(struct sampler **out) { if (!s) return -ENOMEM; s->fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); if (s->fd < 0) { int e = -errno; s->fd = -1; sampler_close(s); return e; } - struct kgsl_perfcounter_get get = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = RBBM_ALWAYS_COUNT}; + struct kgsl_devinfo info; + memset(&info, 0, sizeof(info)); + struct kgsl_device_getproperty prop = {.type = KGSL_PROP_DEVICE_INFO, .value = &info, .sizebytes = sizeof(info)}; + if (ioctl(s->fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &prop)) { int e = -errno; sampler_close(s); return e; } + s->layout = kgsl_layout_for(info.chip_id); + if (!s->layout) { sampler_close(s); return -ENOTSUP; } + struct kgsl_perfcounter_get get = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = s->layout->cycles}; if (ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_GET, &get)) { int e = -errno; sampler_close(s); return e; } s->counter_reg = get.offset; - if (!get.offset || get.offset > READABLE_LAST) { sampler_close(s); return -ERANGE; } + if (!get.offset || get.offset > s->layout->readable_last) { sampler_close(s); return -ERANGE; } struct kgsl_drawctxt_create ctx = {.flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE}; if (ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_CREATE, &ctx)) { int e = -errno; sampler_close(s); return e; } s->context = ctx.drawctxt_id; diff --git a/app/src/main/cpp/gpuclock/kgsl_layout.h b/app/src/main/cpp/gpuclock/kgsl_layout.h new file mode 100644 index 0000000000..f486ddfdb2 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_layout.h @@ -0,0 +1,27 @@ +#ifndef DROIDDECK_KGSL_LAYOUT_H +#define DROIDDECK_KGSL_LAYOUT_H +#include + +// Register layout per GPU generation. A counter kgsl places outside the range the kernel's CP protection lets +// command buffers read (adreno-gpulist.h *_protected_regs) is not read. +struct kgsl_layout { + unsigned always_on; // CP_ALWAYS_ON_COUNTER + unsigned cycles; // RBBM countable that counts GPU cycles + unsigned readable_last; // last register of the readable range starting at 0 +}; +// A6xx/A7xx: CP_ALWAYS_ON_COUNTER 0x980, RBBM countable 0 = ALWAYS_COUNT, 0x000-0x4ff readable (gen7 list). +static const struct kgsl_layout KGSL_LAYOUT_A7XX = {0x980u, 0u, 0x4ffu}; +// A8xx: CP_ALWAYS_ON_COUNTER 0x8e7 (gen8_reg.h), RBBM countable 1 = US_ALWAYS_COUNT (0 is NEVER_COUNT, Mesa +// a8xx_perfcntrs.xml), 0x000-0x3a3 readable (gen8_0_0_protected_regs). +static const struct kgsl_layout KGSL_LAYOUT_A8XX = {0x8e7u, 1u, 0x3a3u}; + +// The KGSL chip id's top byte: 0x44 on every A8xx (Adreno 810/829/830/840, Mesa freedreno_devices.py), +// 0x43 or the generation number on A6xx/A7xx. Later generations are not known, so nothing is read there. +static inline const struct kgsl_layout *kgsl_layout_for(unsigned chip_id) { + unsigned core = chip_id >> 24; + if (core == 0x44u) return &KGSL_LAYOUT_A8XX; + if (core > 0x44u) return NULL; + return &KGSL_LAYOUT_A7XX; +} + +#endif diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index a3c217e4b9..46a56ff0af 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -193,11 +193,15 @@ class DroidDeckHudHost(context: Context) { metrics.snapshot() Thread.sleep(500) val mango = metrics.snapshot() + fun shown(value: Any?, unit: String) = if (value == null) "none" else "$value$unit" + val readers = com.droiddeck.launcher.session.GpuStatsComponent.readerStatus() file.writeText(metrics.also { it.setMangoReadings(null) }.buildDiagnosticsReport(context) + "\n== As the HUD shows them (MangoHud's sources) ==\n" + - "CPU ${mango.cpuPercent}% ${mango.cpuTempC}°C, GPU ${mango.gpuPercent}% ${mango.gpuClockMhz}MHz ${mango.gpuTempC}°C, " + + "CPU ${shown(mango.cpuPercent, "%")} ${shown(mango.cpuTempC, "°C")}, GPU ${shown(mango.gpuPercent, "%")} " + + "${shown(mango.gpuClockMhz, "MHz")} ${shown(mango.gpuTempC, "°C")}, " + "RAM ${mango.ramUsedText()}/${mango.ramTotalText()}, VRAM ${mango.vramText()}, battery ${mango.battery.percent}% " + "${mango.battery.watts}W charging=${mango.battery.charging}\n" + "GPU feeds: ${com.droiddeck.launcher.session.GpuStatsComponent.sources.ifEmpty { "none (no session, or kgsl absent)" }}\n" + + (if (readers.isNotEmpty()) "GPU readers without root: $readers\n" else "") + "CPU temperature zones: ${LinuxRuntime.cpuTempZones().joinToString { it.name }}\n" + "Frames: ${if (feed.engine.isNotEmpty() || feed.pid > 0) "gamescope (pid ${feed.pid}, ${feed.engine})" else "compositor"}, " + "fps ${feed.stats.fps}\n") diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java index 759e013512..51a4e42608 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -870,6 +870,9 @@ public class HudMetrics { private long[] lastCoreTotal = null; private long[] lastCoreIdle = null; + private static final int PER_CORE_STAT = 1, PER_CORE_ESTIMATE = 2; + /** Sources of the last per-core reading: PER_CORE_STAT and/or PER_CORE_ESTIMATE (clock speed); 0 when no core was read. */ + private volatile int perCoreSources = 0; public int[] readPerCorePercent() { int cores = Runtime.getRuntime().availableProcessors(); @@ -909,13 +912,20 @@ public class HudMetrics { } } } catch (Exception ignored) {} + int sources = 0; for (int i = 0; i < out.length; i++) { - if (out[i] >= 0) continue; + if (out[i] >= 0) { + sources |= PER_CORE_STAT; + continue; + } Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); Long max = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/cpuinfo_max_freq"); - if (cur != null && max != null && max > 0L) + if (cur != null && max != null && max > 0L) { out[i] = clampPercent((int) ((Math.max(0L, Math.min(cur, max)) * 100L) / max)); + sources |= PER_CORE_ESTIMATE; + } } + perCoreSources = sources; return out; } @@ -1008,10 +1018,13 @@ public class HudMetrics { int v = s.perCorePercent[i]; cores.append('c').append(i).append('=').append(v < 0 ? "?" : (v + "%")); } - if (s.perCorePercent.length > 0) - metricHit(sb, "Per-core %", cores.toString(), "/proc/stat (per-cpu lines)"); + int coreSources = perCoreSources; + if (s.perCorePercent.length > 0 && coreSources != 0) + metricHit(sb, "Per-core %", cores.toString(), coreSources == PER_CORE_STAT ? "/proc/stat (per-cpu lines)" + : coreSources == PER_CORE_ESTIMATE ? "scaling_cur_freq / cpuinfo_max_freq (clock estimate)" + : "/proc/stat (per-cpu lines); scaling_cur_freq / cpuinfo_max_freq (clock estimate) for the other cores"); else - metricMiss(sb, "Per-core %", "/proc/stat"); + metricMiss(sb, "Per-core %", "/proc/stat", "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); StringBuilder coreClk = new StringBuilder(); for (int i = 0; i < s.perCoreClockMhz.length; i++) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt index 8d2a3801d5..a5ddcb95d7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt @@ -31,6 +31,8 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { fun prepare(): Boolean { sources = "" + KgslBusy.status = "not tried" + KgslClock.status = "not tried" if (!File(KGSL).exists()) return false val unreadable = MANGOHUD_FILES.any { File(KGSL, it).let { f -> f.exists() && !f.canRead() } } // Where SELinux hides the kgsl nodes completely (exists() is false too), the layer and cycle-counter feeds stand in. @@ -96,6 +98,7 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { if (load.failed) { memstore?.close() memstore = null + KgslBusy.status += ", but the stamps never moved" Log.i(TAG, "hud: kgsl memstore timestamps never moved; GPU load from Vulkan timing") } else if (load.working) { Log.i(TAG, "hud: GPU load from the kgsl memstore (all GPU work)") @@ -114,7 +117,9 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { } private fun memstoreSource(): String = when { - memstoreLoad?.working == true -> "kgsl memstore ringbuffer timestamps (all GPU work)" + memstoreLoad?.working == true -> + if (memstore?.mode == KgslBusy.MODE_CONTEXTS) "kgsl memstore per-context timestamps (all GPU work)" + else "kgsl memstore ringbuffer timestamps (all GPU work)" memstoreLoad?.failed == true -> LAYER_SOURCE else -> "kgsl memstore once its timestamps move; until then $LAYER_SOURCE" } @@ -339,6 +344,12 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { /** Where the running session's GPU feeds come from, for the HUD diagnostics export. */ @Volatile var sources = "" + + /** Why the no-root GPU readers work or not, for the HUD diagnostics export; empty where they were not needed. */ + fun readerStatus(): String = + if (KgslBusy.status == "not tried" && KgslClock.status == "not tried") "" + else "kgsl memstore ${KgslBusy.status}; GPU cycle counter ${KgslClock.status}" + private const val STALE_MS = 30_000L fun guestLoadDir(root: File) = File(root, GUEST_LOAD_DIR.removePrefix("/")) diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt index dad62121a9..d3962dd765 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt @@ -10,6 +10,7 @@ object KgslBusy { private const val TAG = "SessionService" @JvmStatic private external fun nativeOpen(error: IntArray): Long + @JvmStatic private external fun nativeMode(handle: Long): Int @JvmStatic private external fun nativeRun(handle: Long, on: Boolean) @JvmStatic private external fun nativeRead(handle: Long, out: LongArray): Boolean @JvmStatic private external fun nativeClose(handle: Long) @@ -24,7 +25,10 @@ object KgslBusy { if (handle != 0L) nativeRun(handle, on) } - /** Running totals: busy samples, samples, samples in which a ringbuffer started new work. */ + /** Which memstore entries are watched: [MODE_RINGBUFFER] or [MODE_CONTEXTS] (hardware-scheduled kernels). */ + val mode: Int = if (handle != 0L) runCatching { nativeMode(handle) }.getOrDefault(0) else 0 + + /** Running totals: busy samples, samples, samples in which a ringbuffer or context started new work. */ @Synchronized fun counts(): LongArray? { if (handle == 0L) return null val out = LongArray(3) @@ -37,14 +41,27 @@ object KgslBusy { } } + const val MODE_RINGBUFFER = 1 + const val MODE_CONTEXTS = 2 + + /** What the last [open] found, for the HUD diagnostics export. */ + @Volatile var status = "not tried" + fun open(): Reader? { - if (!loaded) return null + if (!loaded) { + status = "gpuclock library did not load" + return null + } val error = IntArray(1) val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) if (handle == 0L) { + status = "open failed: ${KgslErrors.describe(error[0])}" Log.i(TAG, "hud: no GPU load from the kgsl memstore (open error ${error[0]})") return null } - return Reader(handle) + val reader = Reader(handle) + status = if (reader.mode == MODE_CONTEXTS) "per-context stamps (hardware-scheduled kernel)" else "ringbuffer stamps" + Log.i(TAG, "hud: kgsl memstore reader uses $status") + return reader } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt index 11c7367efb..a8089cb328 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt @@ -20,7 +20,10 @@ object KgslClock { class Sampler internal constructor(private var handle: Long) : AutoCloseable { /** MHz, or null when this sample was refused or failed its checks. */ - @Synchronized fun mhz(): Int? = if (handle == 0L) null else nativeSample(handle).takeIf { it > 0 } + @Synchronized fun mhz(): Int? = sample().takeIf { it > 0 } + + /** MHz, or a negative native code: -errno from kgsl or [RANGE_CHECK_FAILED]. */ + @Synchronized fun sample(): Int = if (handle == 0L) CLOSED else nativeSample(handle) @Synchronized override fun close() { if (handle != 0L) nativeClose(handle) @@ -28,22 +31,41 @@ object KgslClock { } } - /** A sampler that already produced one good reading, or null (the reason goes to the log). */ + /** -EBADF, what the native side also returns for a closed handle. */ + private const val CLOSED = -9 + + /** The native sample code for a reading that failed its range checks (kgsl_clock.c sampler_mhz). */ + const val RANGE_CHECK_FAILED = -1000 + + /** What the last [open] found, for the HUD diagnostics export. */ + @Volatile var status = "not tried" + + /** A sampler that already produced one good reading, or null (the reason goes to the log and [status]). */ fun open(): Sampler? { - if (!loaded) return null + if (!loaded) { + status = "gpuclock library did not load" + return null + } val error = IntArray(1) val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) if (handle == 0L) { + status = "open failed: ${KgslErrors.describe(error[0])}" Log.i(TAG, "hud: no GPU clock from the cycle counter (open error ${error[0]})") return null } val sampler = Sampler(handle) - val first = (0 until 3).firstNotNullOfOrNull { sampler.mhz() } + var code = 0 + val first = (0 until 3).firstNotNullOfOrNull { + code = sampler.sample() + code.takeIf { it > 0 } + } if (first == null) { - Log.i(TAG, "hud: GPU cycle counter gave no usable reading") + status = "no usable reading: ${KgslErrors.describe(code)}" + Log.i(TAG, "hud: GPU cycle counter gave no usable reading ($code)") sampler.close() return null } + status = "working ($first MHz at start)" Log.i(TAG, "hud: GPU clock from the cycle counter ($first MHz now)") return sampler } diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt new file mode 100644 index 0000000000..819b627664 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.session + +/** Readable text for the negative errno codes the gpuclock library returns. */ +internal object KgslErrors { + fun describe(code: Int): String { + if (code == 0) return "no error code" + if (code == KgslClock.RANGE_CHECK_FAILED) return "sample out of range" + val name = runCatching { android.system.OsConstants.errnoName(-code) }.getOrNull() + return if (name != null) "$name ($code)" else "error $code" + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt new file mode 100644 index 0000000000..c7e6867cca --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Test + +class GpuReaderStatusTest { + @After fun reset() { + KgslBusy.status = "not tried" + KgslClock.status = "not tried" + } + + @Test fun emptyWhereTheReadersWereNotNeeded() { + assertEquals("", GpuStatsComponent.readerStatus()) + } + + @Test fun namesBothReaders() { + KgslBusy.status = "per-context stamps (hardware-scheduled kernel)" + KgslClock.status = "working (680 MHz at start)" + assertEquals( + "kgsl memstore per-context stamps (hardware-scheduled kernel); GPU cycle counter working (680 MHz at start)", + GpuStatsComponent.readerStatus(), + ) + } + + @Test fun rangeCheckFailureIsNamed() { + assertEquals("sample out of range", KgslErrors.describe(KgslClock.RANGE_CHECK_FAILED)) + assertEquals("no error code", KgslErrors.describe(0)) + } +} diff --git a/tools/tests/kgsl_busy_harness.c b/tools/tests/kgsl_busy_harness.c index 14e96bf64f..74255eb08e 100644 --- a/tools/tests/kgsl_busy_harness.c +++ b/tools/tests/kgsl_busy_harness.c @@ -3,6 +3,7 @@ #include #include "kgsl_busy.h" +#include "kgsl_layout.h" #define ENTRIES 819 @@ -52,5 +53,61 @@ int main(void) { assert(moved == 0); puts("PASS: kgsl memstore busy"); + + // Hardware-scheduled kernels: ringbuffer entries stay 0, contexts carry the stamps. + memset(memstore, 0, sizeof(memstore)); + static uint32_t seen[ENTRIES], ctx_last[ENTRIES]; + int live[KGSL_BUSY_MAX_LIVE]; + stamp(3, 50, 50); + stamp(9, 21, 20); + stamp(first - 1, 4, 4); + int count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + assert(count == 3 && live[0] == 3 && live[1] == 9 && live[2] == first - 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 1 && ctx_last[9] == 21); + + // Busy or newly started contexts come first; idle ones that have run work stay in the list. + stamp(9, 21, 21); + stamp(5, 2, 1); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + assert(count == 4 && live[0] == 5 && live[1] == 3 && live[2] == 9 && live[3] == first - 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 0); + stamp(5, 2, 2); + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 0); + + // Entry 0 (global) and the ringbuffer entries are not contexts; the live list is capped. + memset(memstore, 0, sizeof(memstore)); + memset(seen, 0, sizeof(seen)); + stamp(0, 8, 7); + stamp(first, 8, 7); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == 0); + for (int id = 1; id <= KGSL_BUSY_MAX_LIVE + 10; id++) stamp(id, 1, 1); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + stamp(KGSL_BUSY_MAX_LIVE + 5, 2, 1); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + assert(live[0] == KGSL_BUSY_MAX_LIVE + 5); + stamp(KGSL_BUSY_MAX_LIVE + 5, 0, 0); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + for (int i = 0; i < count; i++) assert(live[i] != KGSL_BUSY_MAX_LIVE + 5); + puts("PASS: kgsl memstore contexts"); + + assert(kgsl_layout_for(0x44050001u) == &KGSL_LAYOUT_A8XX); // Adreno 830 + assert(kgsl_layout_for(0x44030a20u) == &KGSL_LAYOUT_A8XX); // Adreno 829 + assert(kgsl_layout_for(0x43020100u) == &KGSL_LAYOUT_A7XX); // Adreno 722 + assert(kgsl_layout_for(0x43050a01u) == &KGSL_LAYOUT_A7XX); // Adreno 740 + assert(kgsl_layout_for(0x07010000u) == &KGSL_LAYOUT_A7XX); // Adreno 710 + assert(kgsl_layout_for(0x06030001u) == &KGSL_LAYOUT_A7XX); // Adreno 630 + assert(kgsl_layout_for(0x45000000u) == NULL); + assert(KGSL_LAYOUT_A8XX.always_on == 0x8e7u && KGSL_LAYOUT_A8XX.cycles == 1u); + assert(KGSL_LAYOUT_A7XX.always_on == 0x980u && KGSL_LAYOUT_A7XX.cycles == 0u); + puts("PASS: kgsl counter layout"); return 0; } diff --git a/tools/tests/test_kgsl_busy.py b/tools/tests/test_kgsl_busy.py index 7655b98739..6b75f56b53 100644 --- a/tools/tests/test_kgsl_busy.py +++ b/tools/tests/test_kgsl_busy.py @@ -1,4 +1,4 @@ -"""Exercise the HUD's kgsl memstore busy sampling (app/src/main/cpp/gpuclock/kgsl_busy.h).""" +"""Exercise the HUD's kgsl memstore busy sampling and counter layout (app/src/main/cpp/gpuclock).""" import os from pathlib import Path import shutil @@ -27,6 +27,8 @@ class KgslBusyTest(unittest.TestCase): result = subprocess.run([str(self.binary)], capture_output=True, text=True) self.assertEqual(result.returncode, 0, result.stdout + result.stderr) self.assertIn('PASS: kgsl memstore busy', result.stdout) + self.assertIn('PASS: kgsl memstore contexts', result.stdout) + self.assertIn('PASS: kgsl counter layout', result.stdout) if __name__ == '__main__': From 2bc6985ae385d8833916cd66ba5ec95d1123a536 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 07:03:02 -0500 Subject: [PATCH 05/16] feat: choose Steam or Desktop to open when DroidDeck starts (#1993) --- .../droiddeck/launcher/FrontEndActivity.kt | 25 +++++++++++-------- .../launcher/session/SessionPrefs.kt | 13 +++++++--- .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/ModeSettingsDialog.kt | 18 +++++++------ app/src/main/res/values-ar/strings.xml | 4 +-- app/src/main/res/values-b+es+419/strings.xml | 4 +-- app/src/main/res/values-bg/strings.xml | 4 +-- app/src/main/res/values-cs/strings.xml | 4 +-- app/src/main/res/values-da/strings.xml | 4 +-- app/src/main/res/values-de/strings.xml | 4 +-- app/src/main/res/values-el/strings.xml | 4 +-- app/src/main/res/values-es/strings.xml | 4 +-- app/src/main/res/values-fi/strings.xml | 4 +-- app/src/main/res/values-fr/strings.xml | 4 +-- app/src/main/res/values-hi/strings.xml | 4 +-- app/src/main/res/values-hu/strings.xml | 4 +-- app/src/main/res/values-in/strings.xml | 4 +-- app/src/main/res/values-it/strings.xml | 4 +-- app/src/main/res/values-ja/strings.xml | 4 +-- app/src/main/res/values-ko/strings.xml | 4 +-- app/src/main/res/values-ms/strings.xml | 4 +-- app/src/main/res/values-nb/strings.xml | 4 +-- app/src/main/res/values-nl/strings.xml | 4 +-- app/src/main/res/values-pl/strings.xml | 4 +-- app/src/main/res/values-pt-rPT/strings.xml | 4 +-- app/src/main/res/values-pt/strings.xml | 4 +-- app/src/main/res/values-ro/strings.xml | 4 +-- app/src/main/res/values-ru/strings.xml | 4 +-- app/src/main/res/values-sv/strings.xml | 4 +-- app/src/main/res/values-th/strings.xml | 4 +-- app/src/main/res/values-tr/strings.xml | 4 +-- app/src/main/res/values-uk/strings.xml | 4 +-- app/src/main/res/values-vi/strings.xml | 4 +-- app/src/main/res/values-zh-rCN/strings.xml | 4 +-- app/src/main/res/values-zh-rHK/strings.xml | 4 +-- app/src/main/res/values-zh-rTW/strings.xml | 4 +-- app/src/main/res/values/strings.xml | 4 +-- 37 files changed, 103 insertions(+), 87 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 1c8c8cb9e7..311fd75fcc 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -461,7 +461,7 @@ class FrontEndActivity : ComponentActivity() { private var fexPreset by mutableStateOf("") private var forceSsbs by mutableStateOf(false) private var steamClientArch by mutableStateOf("arm64") - private var runSteamAtStartup by mutableStateOf(false) + private var startupSession by mutableStateOf(SessionPrefs.STARTUP_OFF) private var bootMovie by mutableStateOf(com.droiddeck.launcher.session.BootMovie.DROIDDECK_30) private var bootMovieSound by mutableStateOf(true) private var bootMovieCustomName by mutableStateOf(null) @@ -1523,7 +1523,7 @@ class FrontEndActivity : ComponentActivity() { } } - if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() } + if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled(cold = true) } else { restoreCompatLaunch(savedInstanceState) pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH) @@ -1566,9 +1566,14 @@ class FrontEndActivity : ComponentActivity() { startSteamAtStartupIfEnabled() } - private fun startSteamAtStartupIfEnabled() { - if (intent.action != Intent.ACTION_MAIN) return - if (SessionPrefs.runSteamAtStartup(this) && !isFinishing && !isDestroyed) startSteamSession() + private fun startSteamAtStartupIfEnabled(cold: Boolean = false) { + if (intent.action != Intent.ACTION_MAIN && !(cold && intent.action == null)) return + if (isFinishing || isDestroyed) return + when (SessionPrefs.startupSession(this)) { + SessionPrefs.STARTUP_STEAM -> startSteamSession() + SessionPrefs.STARTUP_DESKTOP -> startSession(Intent(this, SessionActivity::class.java) + .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_DESKTOP)) + } } private fun playSteam() { @@ -2146,7 +2151,7 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = steamRepairQueued, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, - runSteamAtStartup = mode == SessionService.MODE_STEAM && runSteamAtStartup, + startupSession = startupSession, bootMovie = if (mode == SessionService.MODE_STEAM) bootMovie else null, bootMovieSound = bootMovieSound, bootMovieCustomName = bootMovieCustomName, @@ -2236,9 +2241,9 @@ class FrontEndActivity : ComponentActivity() { onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, onSteamController = { id -> SessionPrefs.setSteamController(this, id); steamController = id }, - onRunSteamAtStartup = { on -> - SessionPrefs.setRunSteamAtStartup(this, on) - runSteamAtStartup = on + onStartupSession = { id -> + SessionPrefs.setStartupSession(this, id) + startupSession = id }, onBootMovie = { id -> com.droiddeck.launcher.session.BootMovie.select(this, id); loadBootMovie() }, onBootMovieSound = { on -> SessionPrefs.setBootMovieSound(this, on); bootMovieSound = on }, @@ -2429,7 +2434,7 @@ class FrontEndActivity : ComponentActivity() { returnAfterGame = SessionPrefs.returnAfterGame(this) loadShaderPrecache(mode) steamController = SessionPrefs.steamController(this) - runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) + startupSession = SessionPrefs.startupSession(this) loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) upscaler = SessionPrefs.upscaler(this) 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 bbb877f77d..a6bcaed7cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -960,10 +960,17 @@ object SessionPrefs { prefs(context).edit().apply { if (name == null) remove("bootMovieCustomName") else putString("bootMovieCustomName", name) }.apply() } - fun runSteamAtStartup(context: Context): Boolean = prefs(context).getBoolean("runSteamAtStartup", false) + const val STARTUP_OFF = "" + const val STARTUP_STEAM = "steam" + const val STARTUP_DESKTOP = "desktop" - fun setRunSteamAtStartup(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("runSteamAtStartup", on).apply() + fun startupSession(context: Context): String { + val p = prefs(context) + return p.getString("startupSession", null) ?: if (p.getBoolean("runSteamAtStartup", false)) STARTUP_STEAM else STARTUP_OFF + } + + fun setStartupSession(context: Context, id: String) { + prefs(context).edit().putString("startupSession", id).remove("runSteamAtStartup").apply() } fun addedGamesDirs(context: Context): List { 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 1c257fe297..07d330e10e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -11,7 +11,7 @@ object SettingsReset { private const val TAG = "SettingsReset" internal val SESSION_KEYS = setOf( - "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", + "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 63508ba42e..315b8d6c08 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -89,7 +89,7 @@ class ModeSettings( val steamController: String? = null, val unfoldedControls: Boolean? = null, val unfoldedControlsWithController: Boolean = false, - val runSteamAtStartup: Boolean = false, + val startupSession: String = SessionPrefs.STARTUP_OFF, val bootMovie: String? = null, val bootMovieSound: Boolean = true, val bootMovieCustomName: String? = null, @@ -141,7 +141,7 @@ class ModeSettingsActions( val onSteamController: (String) -> Unit = {}, val onUnfoldedControls: (Boolean) -> Unit = {}, val onUnfoldedControlsWithController: (Boolean) -> Unit = {}, - val onRunSteamAtStartup: (Boolean) -> Unit = {}, + val onStartupSession: (String) -> Unit = {}, val onBootMovie: (String) -> Unit = {}, val onBootMovieSound: (Boolean) -> Unit = {}, val onImportBootMovie: () -> Unit = {}, @@ -355,11 +355,15 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: ToggleRow(host, "pip-auto", stringResource(R.string.pip_auto), null, s.pipAutoEnter, onChange = a.onPipAutoEnter) } - if (steam) SettingsGroup(stringResource(R.string.mode_startup)) { - ToggleRow( - host, "steam-startup", stringResource(R.string.mode_steam_startup), - stringResource(R.string.mode_steam_startup_hint), - s.runSteamAtStartup, onChange = a.onRunSteamAtStartup, + SettingsGroup(stringResource(R.string.mode_startup)) { + ChoiceRow( + host, "startup-session", stringResource(R.string.mode_startup_session), + stringResource(R.string.mode_startup_session_hint), + listOf( + SessionPrefs.STARTUP_OFF to stringResource(R.string.common_never), + SessionPrefs.STARTUP_STEAM to stringResource(R.string.rail_steam), + SessionPrefs.STARTUP_DESKTOP to stringResource(R.string.rail_desktop), + ), s.startupSession, onPick = a.onStartupSession, ) } extras.performance() diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e9cd80f9d2..98e2321e68 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -318,8 +318,8 @@ تأخير التعليق في الخلفية أثناء قيام Steam بالتنزيل. «تلقائي» يوقف مؤقتًا في الخلفية ويستأنف عند الظهور. «يدوي» ينتظر الضغط على «استئناف». «أبدًا» يُبقيه قيد التشغيل. بدء التشغيل - تشغيل Steam مع DroidDeck - يفتح جلسة Steam عند تشغيل DroidDeck. + الفتح عند التشغيل + يبدأ هذه الجلسة عند تشغيل DroidDeck. Decky جارٍ البحث عن إصدارات… جاهز لتثبيت %1$s. 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 98f67f76cd..5a31def7b6 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -318,8 +318,8 @@ Retrasa la suspensión en segundo plano mientras Steam esté descargando. Auto pausa en segundo plano y reanuda al mostrarse. Manual espera a Reanudar. Nunca sigue ejecutándose. Inicio - Iniciar Steam con DroidDeck - Abre la sesión de Steam al iniciar DroidDeck. + Abrir al iniciar + Inicia esta sesión cuando se abre DroidDeck. Decky Buscando versiones… Listo para instalar %1$s. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e1f8d394a5..4bca78ed5d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -318,8 +318,8 @@ Отлага фоновото спиране, докато Steam активно изтегля. Автоматично поставя на пауза във фонов режим и продължава при показване. Ръчно изчаква „Продължи“. Никога продължава да работи. Стартиране - Стартиране на Steam заедно с DroidDeck - Отваря сесията на Steam при стартиране на DroidDeck. + Отваряне при стартиране + Стартира тази сесия, когато DroidDeck се стартира. Decky Проверка за издания… Готово за инсталиране на %1$s. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3313161ea5..3a479c7551 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -318,8 +318,8 @@ Oddálí pozastavení na pozadí, pokud Steam aktivně stahuje. Automaticky pozastaví na pozadí a obnoví při zobrazení. Manuálně čeká na Obnovit. Nikdy běh nezastavuje. Spouštění - Spustit Steam s DroidDeck - Otevře relaci Steamu při spuštění DroidDeck. + Otevřít při spuštění + Spustí tuto relaci při spuštění DroidDeck. Decky Hledání vydání… Připraveno k instalaci %1$s. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e095bfffe4..7ce1ae1d45 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -318,8 +318,8 @@ Udskyder baggrundspause, mens Steam aktivt downloader. Auto sætter på pause i baggrunden og genoptager, når den vises. Manuel venter på Genoptag. Aldrig fortsætter med at køre. Opstart - Start Steam med DroidDeck - Åbner Steam-sessionen, når DroidDeck starter. + Åbn ved start + Starter denne session, når DroidDeck startes. Decky Søger efter udgivelser… Klar til at installere %1$s. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1f280286a5..c2a250fb1a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -318,8 +318,8 @@ Verzögert das Anhalten im Hintergrund, solange Steam aktiv herunterlädt. Auto pausiert im Hintergrund und setzt fort, sobald die App wieder sichtbar ist. Manuell wartet auf „Fortsetzen“. Nie lässt alles weiterlaufen. Start - Steam mit DroidDeck starten - Öffnet die Steam-Sitzung, wenn DroidDeck startet. + Beim Start öffnen + Startet diese Sitzung, wenn DroidDeck startet. Decky Suche nach Releases… Bereit zur Installation von %1$s. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7ffe86fd91..72d2b9356d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -318,8 +318,8 @@ Καθυστερεί την αναστολή παρασκηνίου όσο το Steam κάνει ενεργά λήψη. Το Αυτόματο θέτει σε παύση στο παρασκήνιο και συνεχίζει όταν εμφανίζεται. Το Μη αυτόματο περιμένει το Συνέχιση. Το Ποτέ συνεχίζει να εκτελείται. Εκκίνηση - Εκκίνηση του Steam με το DroidDeck - Ανοίγει τη συνεδρία Steam όταν εκκινείται το DroidDeck. + Άνοιγμα κατά την εκκίνηση + Ξεκινά αυτή τη συνεδρία όταν ανοίγει το DroidDeck. Decky Έλεγχος για εκδόσεις… Έτοιμο για εγκατάσταση %1$s. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 32acc2d900..e084f25ead 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -318,8 +318,8 @@ Retrasa la suspensión en segundo plano mientras Steam esté descargando. Auto pausa en segundo plano y reanuda al mostrarse. Manual espera a Reanudar. Nunca sigue ejecutándose. Inicio - Iniciar Steam con DroidDeck - Abre la sesión de Steam al iniciar DroidDeck. + Abrir al iniciar + Inicia esta sesión cuando se abre DroidDeck. Decky Buscando versiones… Listo para instalar %1$s. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 576685c47e..dc52bc46eb 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -318,8 +318,8 @@ Viivästytä taustakeskeytystä, kun Steam lataa aktiivisesti. Automaattinen keskeyttää taustalla ja jatkaa, kun sovellus tulee näkyviin. Manuaalinen odottaa Jatka-painiketta. Ei koskaan pitää sovelluksen aina käynnissä. Käynnistys - Käynnistä Steam DroidDeckin kanssa - Avaa Steam-istunnon, kun DroidDeck käynnistyy. + Avaa käynnistyksessä + Käynnistää tämän istunnon, kun DroidDeck avataan. Decky Tarkistetaan julkaisuja… Valmiina asentamaan %1$s. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c5097f314d..8d52998f0c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -318,8 +318,8 @@ Retarde la mise en pause en arrière-plan tant que Steam télécharge. Le mode automatique met en pause en arrière-plan et reprend à l\'affichage. Le mode manuel nécessite d\'appuyer sur « Reprendre ». Ne reste jamais en cours d\'exécution. Démarrage - Lancer Steam à l\'ouverture de DroidDeck - Ouvre une session Steam au démarrage de DroidDeck. + Ouvrir au démarrage + Lance cette session au démarrage de DroidDeck. Decky Vérification des versions… Prêt à installer %1$s. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f90bd69595..632e1a8066 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -318,8 +318,8 @@ Steam के सक्रिय रूप से डाउनलोड करते समय बैकग्राउंड सस्पेंशन को टालें। ऑटो बैकग्राउंड में रुकता है और दिखने पर फिर से शुरू होता है। मैनुअल फिर से शुरू करें का इंतज़ार करता है। कभी नहीं वाला चलता रहता है। स्टार्टअप - DroidDeck के साथ Steam शुरू करें - DroidDeck लॉन्च होने पर Steam सेशन खोलता है। + लॉन्च पर खोलें + DroidDeck खुलने पर यह सेशन शुरू करता है। Decky रिलीज़ देखी जा रही हैं… %1$s इंस्टॉल करने के लिए तैयार। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8526960ba4..200d5410bf 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -318,8 +318,8 @@ Elhalasztja a háttérbeli felfüggesztést, amíg a Steam aktívan letölt. Az Automatikus szüneteltet a háttérben, és megjelenéskor folytatja. A Manuális megvárja a Folytatást. A Soha mindig futva tartja. Indítás - Steam indítása a DroidDeckkel - Megnyitja a Steam-munkamenetet a DroidDeck indulásakor. + Megnyitás indításkor + A DroidDeck indulásakor elindítja ezt a munkamenetet. Decky Kiadások keresése… Készen áll a %1$s telepítésére. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 05abf15fad..8f1b2d4f64 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -318,8 +318,8 @@ Menunda penjedaan latar belakang saat Steam sedang aktif mengunduh. Otomatis menjeda di latar belakang dan melanjutkan saat ditampilkan. Manual menunggu Lanjutkan. Tidak pernah terus berjalan. Mulai - Mulai Steam bersama DroidDeck - Membuka sesi Steam saat DroidDeck diluncurkan. + Buka saat peluncuran + Memulai sesi ini saat DroidDeck diluncurkan. Decky Memeriksa rilis… Siap menginstal %1$s. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a4c97d92f2..eef6c71a96 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -318,8 +318,8 @@ Ritarda la sospensione in background mentre Steam sta scaricando. Auto mette in pausa in background e riprende quando l\'app torna visibile. Manuale attende Riprendi. Mai lascia tutto in esecuzione. Avvio - Avvia Steam con DroidDeck - Apre la sessione Steam all\'avvio di DroidDeck. + Apri all\'avvio + Avvia questa sessione all\'avvio di DroidDeck. Decky Ricerca di release… Pronto per installare %1$s. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index db8252aec4..4dfbf1888c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -318,8 +318,8 @@ Steamがダウンロード中は、バックグラウンドでの一時停止を遅らせます。 自動ではバックグラウンドで一時停止し、表示すると再開します。手動では「再開」をタップするまで待機します。「しない」では実行し続けます。 起動 - DroidDeck起動時にSteamを起動 - DroidDeckの起動時にSteamセッションを開きます。 + 起動時に開く + DroidDeck の起動時にこのセッションを開始します。 Decky リリースを確認中… %1$sをインストールする準備ができました。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a8e34c3988..84502f7e7b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -318,8 +318,8 @@ Steam이 다운로드 중일 때는 백그라운드 일시 중지를 미룹니다. 자동: 백그라운드에서 일시 중지되고 다시 표시되면 재개됩니다. 수동: \"재개\"를 탭할 때까지 기다립니다. 안 함: 계속 실행됩니다. 시작 - DroidDeck을 열 때 Steam 시작 - DroidDeck이 시작될 때 Steam 세션을 엽니다. + 실행 시 열기 + DroidDeck을 실행할 때 이 세션을 시작합니다. Decky 릴리스 확인 중… %1$s을(를) 설치할 준비가 되었습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index c480939a49..bdae3d8784 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -318,8 +318,8 @@ Lambatkan penjedaan latar belakang semasa Steam aktif memuat turun. Auto menjeda di latar belakang dan menyambung semula apabila dipaparkan. Manual menunggu Sambung. Jangan sekali-kali terus berjalan. Permulaan - Mulakan Steam bersama DroidDeck - Membuka sesi Steam apabila DroidDeck dilancarkan. + Buka semasa pelancaran + Memulakan sesi ini apabila DroidDeck dilancarkan. Decky Menyemak keluaran… Sedia untuk memasang %1$s. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7d49438836..f21e994d70 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -318,8 +318,8 @@ Utsetter bakgrunnspause mens Steam laster aktivt ned. Auto setter på pause i bakgrunnen og gjenopptar når den vises. Manuell venter på Gjenoppta. Aldri lar den fortsette å kjøre. Oppstart - Start Steam med DroidDeck - Åpner Steam-sesjonen når DroidDeck starter. + Åpne ved oppstart + Starter denne økten når DroidDeck starter. Decky Ser etter utgivelser… Klar til å installere %1$s. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ce3f5fdfe5..9eba9f0047 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -318,8 +318,8 @@ Stel onderbreken op de achtergrond uit zolang Steam actief downloadt. Automatisch pauzeert op de achtergrond en hervat zodra de app weer zichtbaar is. Handmatig wacht op Hervatten. Nooit laat alles doorlopen. Opstarten - Steam starten met DroidDeck - Opent de Steam-sessie als DroidDeck start. + Openen bij start + Start deze sessie wanneer DroidDeck start. Decky Zoeken naar releases… Klaar om %1$s te installeren. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6cd7eef206..92941eeaf3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -318,8 +318,8 @@ Opóźnia wstrzymanie w tle, gdy Steam aktywnie pobiera. „Auto” wstrzymuje w tle i wznawia po powrocie. „Ręcznie” czeka na „Wznów”. „Nigdy” nie przerywa działania. Uruchamianie - Uruchamiaj Steam z DroidDeck - Otwiera sesję Steam przy uruchomieniu DroidDeck. + Otwórz przy uruchomieniu + Uruchamia tę sesję po uruchomieniu DroidDeck. Decky Sprawdzanie wydań… Gotowe do instalacji: %1$s. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ed5df7013e..ac8eac1e03 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -318,8 +318,8 @@ Adia a suspensão em segundo plano enquanto o Steam está a transferir. Automático: pausa em segundo plano e retoma ao voltar a ser apresentada. Manual: aguarda por Retomar. Nunca: continua em execução. Arranque - Iniciar o Steam com o DroidDeck - Abre a sessão do Steam quando o DroidDeck é iniciado. + Abrir ao iniciar + Inicia esta sessão quando o DroidDeck é aberto. Decky A procurar versões… Pronto para instalar %1$s. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 17223e030d..b3d20eb86b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -318,8 +318,8 @@ Adia a suspensão em segundo plano enquanto a Steam estiver baixando. Automático pausa em segundo plano e retoma quando o app reaparece. Manual aguarda Retomar. Nunca continua em execução. Inicialização - Iniciar a Steam com o DroidDeck - Abre a sessão da Steam quando o DroidDeck é iniciado. + Abrir ao iniciar + Inicia esta sessão quando o DroidDeck é aberto. Decky Procurando versões… Pronto para instalar %1$s. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f46ca94f54..0ad675136f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -318,8 +318,8 @@ Întârzie suspendarea în fundal cât timp Steam descarcă activ. Automat pune pe pauză în fundal și reia atunci când este afișată. Manual așteaptă Reluare. Niciodată continuă să ruleze. Pornire - Pornește Steam odată cu DroidDeck - Deschide sesiunea Steam la lansarea DroidDeck. + Deschide la pornire + Pornește această sesiune când se lansează DroidDeck. Decky Se verifică versiunile… Pregătit pentru instalarea %1$s. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 44a3a5005e..17df27216a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -318,8 +318,8 @@ Откладывает приостановку в фоне, пока Steam что-то скачивает. Авто: пауза в фоне и возобновление при показе. Вручную: ждет нажатия «Продолжить». Никогда: сессия продолжает работать. Запуск - Запускать Steam при открытии DroidDeck - Открывает сессию Steam при запуске DroidDeck. + Открывать при запуске + Запускает этот сеанс при запуске DroidDeck. Decky Проверка выпусков… Готово к установке %1$s. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 88c1852e58..946ce4fc41 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -318,8 +318,8 @@ Skjut upp bakgrundspausning medan Steam aktivt laddar ned. Auto pausar i bakgrunden och återupptar när den visas. Manuell väntar på Återuppta. Aldrig fortsätter köra. Uppstart - Starta Steam med DroidDeck - Öppnar Steam-sessionen när DroidDeck startar. + Öppna vid start + Startar den här sessionen när DroidDeck startar. Decky Söker efter utgåvor… Redo att installera %1$s. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0cf02f24bb..30e69f2e71 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -318,8 +318,8 @@ เลื่อนการหยุดพื้นหลังชั่วคราวออกไปขณะ Steam กำลังดาวน์โหลดอยู่ อัตโนมัติจะหยุดชั่วคราวเมื่ออยู่ในพื้นหลังและดำเนินการต่อเมื่อแสดงผล กำหนดเองรอการกดดำเนินการต่อ ไม่มีวันทำงานต่อเนื่องตลอด การเริ่มทำงาน - เริ่ม Steam พร้อมกับ DroidDeck - เปิดเซสชัน Steam เมื่อ DroidDeck เริ่มทำงาน + เปิดเมื่อเริ่มต้น + เริ่มเซสชันนี้เมื่อเปิด DroidDeck Decky กำลังค้นหารุ่นที่เผยแพร่… พร้อมติดตั้ง %1$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c1aa70c7fc..a1f6116e09 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -318,8 +318,8 @@ Steam etkin olarak indirme yaparken arka planda askıya almayı erteler. Otomatik: arka planda duraklatır, gösterilince devam eder. Manuel: Devam et\'i bekler. Asla: çalışmaya devam eder. Başlangıç - Steam\'i DroidDeck ile başlat - DroidDeck açıldığında Steam oturumunu açar. + Açılışta başlat + DroidDeck açıldığında bu oturumu başlatır. Decky Sürümler kontrol ediliyor… %1$s yüklenmeye hazır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ee1706bfdb..e901908359 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -318,8 +318,8 @@ Відкладає призупинення у фоні, поки Steam активно щось завантажує. «Авто» призупиняє сеанс у фоні й відновлює, коли додаток знову на екрані. «Вручну» чекає на «Відновити». «Ніколи» — сеанс працює далі. Запуск - Запускати Steam разом із DroidDeck - Відкриває сеанс Steam під час запуску DroidDeck. + Відкривати під час запуску + Запускає цей сеанс під час запуску DroidDeck. Decky Пошук випусків… Можна встановити %1$s. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2cc18d5e8e..2a7c052951 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -318,8 +318,8 @@ Trì hoãn tạm dừng nền khi Steam đang tải xuống. Tự động tạm dừng ở nền và tiếp tục khi hiển thị lại. Thủ công chờ nhấn Tiếp tục. Không bao giờ giữ nó luôn chạy. Khởi động - Khởi động Steam cùng DroidDeck - Mở phiên Steam khi DroidDeck khởi chạy. + Mở khi khởi chạy + Bắt đầu phiên này khi DroidDeck khởi chạy. Decky Đang kiểm tra bản phát hành… Sẵn sàng cài %1$s. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f2f0f10fa9..17aee27ba7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -318,8 +318,8 @@ Steam 正在下载时推迟后台暂停。 自动会在后台暂停并在显示时恢复。手动会等待点按恢复。“从不”则保持运行。 启动 - 随 DroidDeck 启动 Steam - 启动 DroidDeck 时打开 Steam 会话。 + 启动时打开 + DroidDeck 启动时开始此会话。 Decky 正在检查发布版本… 已就绪,可安装 %1$s。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 6af88be055..ffb08a1189 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -318,8 +318,8 @@ Steam 正在下載時,延遲在背景暫停。 「自動」會在背景時暫停,並在重新顯示時繼續;「手動」會等你按「繼續」;「從不」會保持執行。 啟動 - 隨 DroidDeck 啟動 Steam - DroidDeck 啟動時開啟 Steam 會話。 + 啟動時開啟 + DroidDeck 啟動時開始此工作階段。 Decky 正在檢查發佈版本… 可安裝 %1$s。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 74a53be9aa..f914d0eedb 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -318,8 +318,8 @@ Steam 正在下載時,延後在背景暫停。 「自動」會在背景時暫停,並在重新顯示時繼續。「手動」會等你點擊「繼續」。「從不」則會持續執行。 啟動 - 隨 DroidDeck 啟動 Steam - DroidDeck 啟動時開啟 Steam 工作階段。 + 啟動時開啟 + DroidDeck 啟動時開始此工作階段。 Decky 正在檢查發行版本… 已準備好安裝 %1$s。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6f2f133d9..bbef6462a8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -342,8 +342,8 @@ Delay background suspension while Steam is actively downloading. Auto pauses in the background and resumes when shown. Manual waits for Resume. Never keeps running. Startup - Start Steam with DroidDeck - Opens the Steam session when DroidDeck launches. + Open at launch + Starts this session when DroidDeck launches. Decky Checking for releases… Ready to install %1$s. From 55362d68efbf5ba6ff8f302b914a1d37d0b73a06 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 07:03:20 -0500 Subject: [PATCH 06/16] fix: wall scrims overhang the window so no edge pixels stay unshaded (#1994) --- .../main/java/com/droiddeck/launcher/ui/LiftSheet.kt | 2 +- .../main/java/com/droiddeck/launcher/ui/SteamHome.kt | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt index c428b8b97d..3b89f47d2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt @@ -460,7 +460,7 @@ internal fun LiftHero( scrim { sink.value } if (shown || open) Box( Modifier.fillMaxSize() - .graphicsLayer { alpha = sink.value }.background(Color.Black.copy(alpha = 0.42f)) + .overhang().graphicsLayer { alpha = sink.value }.background(Color.Black.copy(alpha = 0.42f)) .focusProperties { canFocus = false } .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, enabled = open && !launching) { close() }, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 671bcabe1a..b24c0f2cf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -38,6 +38,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.geometry.Rect import androidx.compose.ui.layout.boundsInParent +import androidx.compose.ui.layout.layout +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.layout.onPlaced import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -166,11 +168,17 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) ) } +internal fun Modifier.overhang(by: androidx.compose.ui.unit.Dp = 4.dp): Modifier = layout { measurable, constraints -> + val e = by.roundToPx() + val placeable = measurable.measure(Constraints.fixed(constraints.maxWidth + e * 2, constraints.maxHeight + e * 2)) + layout(constraints.maxWidth, constraints.maxHeight) { placeable.place(-e, -e) } +} + @Composable internal fun WallFade() { val colors = MaterialTheme.colorScheme Box( - Modifier.fillMaxSize().background( + Modifier.fillMaxSize().overhang().background( Brush.horizontalGradient( 0f to colors.background.copy(alpha = 0.97f), 0.34f to colors.background.copy(alpha = 0.86f), @@ -179,7 +187,7 @@ internal fun WallFade() { ), ), ) - Box(Modifier.fillMaxSize().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) + Box(Modifier.fillMaxSize().overhang().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) } @Composable From b16b67e6c4a48fd315485255a8b397f3f334d377 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 09:08:48 -0500 Subject: [PATCH 07/16] feat: desktop session follows the app language (#1971) --- .../launcher/runtime/DesktopLanguage.kt | 69 +++++++++++++++++++ .../launcher/session/DesktopLocale.kt | 64 +++++++++++++++++ .../launcher/session/SessionService.kt | 12 +++- .../launcher/runtime/DesktopLanguageTest.kt | 32 +++++++++ .../launcher/session/DesktopLocaleTest.kt | 51 ++++++++++++++ tools/linuxfs/desktop/droiddeck-desktop | 7 ++ 6 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt new file mode 100644 index 0000000000..c1bb3a192d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.session.DesktopLocale +import java.io.File +import java.util.Locale + +object DesktopLanguage { + private const val TAG = "DesktopLanguage" + private const val INDEX = "desktop-kde.i18n.txt" + private const val ABSENT = "absent" + + class Pack(val locale: String, val sha256: String, val size: Long) + + internal fun parseIndex(text: String): Map = text.lineSequence().mapNotNull { line -> + val parts = line.trim().split(' ') + if (parts.size != 3 || !parts[0].matches(Regex("[A-Za-z_]+")) || !parts[1].matches(Regex("[0-9a-fA-F]{64}"))) return@mapNotNull null + Pack(parts[0], parts[1], parts[2].toLongOrNull() ?: return@mapNotNull null) + }.associateBy { it.locale } + + /** KDE ships region packs (pt_BR, zh_TW) beside bare-language ones (pt, es). */ + internal fun candidates(locale: Locale): List { + val region = DesktopLocale.lang(locale).removeSuffix(".UTF-8") + if (region == DesktopLocale.DEFAULT.removeSuffix(".UTF-8") || region.startsWith("en")) return emptyList() + return listOfNotNull(region, "zh_TW".takeIf { region == "zh_HK" }, region.substringBefore('_')).distinct() + } + + internal fun baseUrl(desktopUrl: String) = desktopUrl.substringBeforeLast('/') + "/" + + private fun marker(root: File, tag: String, name: String) = File(root, ".droiddeck-i18n-$tag-$name") + + /** Installs the desktop's translations for [locale]; false when a download failed and is worth retrying. */ + @Synchronized + fun ensure(context: Context, locale: Locale): Boolean { + val root = LinuxRuntime.rootDir(context) + if (!DesktopCatalog.desktopInstalled(root)) return true + val entry = DesktopCatalog.desktopEntry(context) + val pending = candidates(locale).filterNot { marker(root, entry.version, it).isFile } + if (pending.isEmpty()) return true + val base = baseUrl(entry.url) + val index = parseIndex(Downloader.downloadString(base + INDEX) ?: return false) + var complete = true + for (name in pending) { + val pack = index[name] + if (pack == null) { + FileUtils.writeString(marker(root, entry.version, name), ABSENT) + continue + } + val download = File(context.cacheDir, "i18n-$name-${pack.sha256.take(12)}.download") + try { + val ok = Downloader.downloadFile( + base + "desktop-kde-i18n-$name.tar.zst", download, true, pack.sha256, java.util.function.Consumer { }, + ) && pack.sha256.equals(Hashes.sha256(download), ignoreCase = true) && + LinuxRuntimeInstaller.extract(context, download, root, null) + if (ok) FileUtils.writeString(marker(root, entry.version, name), pack.sha256) else complete = false + } catch (e: Exception) { + Log.w(TAG, "language pack $name: $e") + complete = false + } finally { + download.delete() + } + } + return complete + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt b/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt new file mode 100644 index 0000000000..68ada01296 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt @@ -0,0 +1,64 @@ +package com.droiddeck.launcher.session + +import java.util.Locale + +object DesktopLocale { + const val DEFAULT = "C.UTF-8" + + private val regions = mapOf( + "en" to "US", "id" to "ID", "ms" to "MY", "cs" to "CZ", "da" to "DK", "de" to "DE", + "es" to "ES", "fr" to "FR", "it" to "IT", "hu" to "HU", "nl" to "NL", "nb" to "NO", + "pl" to "PL", "pt" to "PT", "ro" to "RO", "fi" to "FI", "sv" to "SE", "vi" to "VN", + "tr" to "TR", "el" to "GR", "bg" to "BG", "ru" to "RU", "uk" to "UA", "ar" to "EG", + "hi" to "IN", "th" to "TH", "ja" to "JP", "ko" to "KR", "zh" to "CN", + ) + + private val systemRegions = mapOf( + "en" to setOf("US", "GB", "AU", "CA", "IN", "NZ", "IE", "ZA", "SG"), + "fr" to setOf("FR", "CA", "BE", "CH", "LU"), + "de" to setOf("DE", "AT", "CH", "LU"), + "it" to setOf("IT", "CH"), + "nl" to setOf("NL", "BE"), + "pt" to setOf("PT", "BR"), + "sv" to setOf("SE", "FI"), + "ar" to setOf("EG", "SA", "AE", "MA", "DZ", "TN", "JO", "KW", "IQ"), + ) + + private val traditionalRegions = setOf("TW", "HK", "MO") + + fun lang(locale: Locale): String { + val language = when (locale.language) { + "in" -> "id" + "no", "nn" -> "nb" + else -> locale.language + } + val region = when { + language == "es" && SteamLanguage.forLocale(locale) == "latam" -> + locale.country.takeIf { it.length == 2 && it != "US" } ?: "MX" + language == "zh" -> chineseRegion(locale) + locale.country in systemRegions[language].orEmpty() -> locale.country + else -> regions[language] ?: return DEFAULT + } + return "${language}_$region.UTF-8" + } + + private fun chineseRegion(locale: Locale): String = when { + locale.script == "Hans" -> "CN" + locale.script == "Hant" -> if (locale.country == "HK") "HK" else "TW" + locale.country == "HK" -> "HK" + locale.country in traditionalRegions -> "TW" + else -> "CN" + } + + fun language(locale: Locale): String? { + val lang = lang(locale) + if (lang == DEFAULT) return null + val full = lang.removeSuffix(".UTF-8") + val short = full.substringBefore('_') + return when { + short == "en" -> full + full == "zh_HK" -> "zh_HK:zh_TW:zh" + else -> "$full:$short" + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 04bedeefb0..679dce6e2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -648,6 +648,10 @@ class SessionService : Service() { } if (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP) OfflineMode.apply(this, root) + if (SessionState.mode == MODE_DESKTOP) { + runCatching { com.droiddeck.launcher.runtime.DesktopLanguage.ensure(this, com.droiddeck.launcher.core.AppLanguage.effective(this)) } + .onFailure { Log.w(TAG, "desktop language pack: $it") } + } val networkLink = LinuxNetworkLinkComponent(this, root) networkLink.attach(this) @@ -777,7 +781,13 @@ class SessionService : Service() { guest.add("USER=root") guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games") guest.add("TERM=xterm-256color") - guest.add("LANG=C.UTF-8") + if (SessionState.mode == MODE_DESKTOP) { + val appLocale = com.droiddeck.launcher.core.AppLanguage.effective(this) + guest.add("LANG=" + DesktopLocale.lang(appLocale)) + DesktopLocale.language(appLocale)?.let { guest.add("LANGUAGE=$it") } + } else { + guest.add("LANG=C.UTF-8") + } guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale( com.droiddeck.launcher.core.AppLanguage.effective(this), com.droiddeck.launcher.core.AppLanguage.system(this).country, diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt new file mode 100644 index 0000000000..909e6b4d95 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.runtime + +import java.util.Locale +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class DesktopLanguageTest { + private val sha = "a".repeat(64) + + @Test fun indexListsPacksAndSkipsMalformedLines() { + val index = DesktopLanguage.parseIndex("pt_BR $sha 1200\ntr $sha 900\nbad line\nxx short 5\n") + assertEquals(setOf("pt_BR", "tr"), index.keys) + assertTrue(DesktopLanguage.parseIndex("../../x $sha 5\n").isEmpty()) + assertEquals(1200L, index.getValue("pt_BR").size) + } + + @Test fun regionPackThenBareLanguage() { + assertEquals(listOf("pt_BR", "pt"), DesktopLanguage.candidates(Locale.forLanguageTag("pt-BR"))) + assertEquals(listOf("tr_TR", "tr"), DesktopLanguage.candidates(Locale.forLanguageTag("tr"))) + assertEquals(listOf("zh_HK", "zh_TW", "zh"), DesktopLanguage.candidates(Locale.forLanguageTag("zh-HK"))) + } + + @Test fun englishAndUnknownNeedNoPack() { + assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("en")).isEmpty()) + assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("sw")).isEmpty()) + } + + @Test fun packsLiveBesideTheDesktopArchive() { + assertEquals("https://h/r/t/", DesktopLanguage.baseUrl("https://h/r/t/desktop-kde.tar.zst")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt b/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt new file mode 100644 index 0000000000..91cff65994 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.core.AppLanguage +import java.util.Locale +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class DesktopLocaleTest { + private fun lang(tag: String) = DesktopLocale.lang(Locale.forLanguageTag(tag)) + + @Test fun appLanguagesMapToGlibcLocales() { + assertEquals("en_US.UTF-8", lang("en")) + assertEquals("tr_TR.UTF-8", lang("tr")) + assertEquals("pt_BR.UTF-8", lang("pt-BR")) + assertEquals("pt_PT.UTF-8", lang("pt-PT")) + assertEquals("es_MX.UTF-8", lang("es-419")) + assertEquals("zh_CN.UTF-8", lang("zh-CN")) + assertEquals("zh_TW.UTF-8", lang("zh-TW")) + assertEquals("zh_HK.UTF-8", lang("zh-HK")) + } + + @Test fun chineseScriptBeatsRegion() { + assertEquals("zh_CN.UTF-8", lang("zh-Hans-HK")) + assertEquals("zh_TW.UTF-8", lang("zh-Hant-CN")) + assertEquals("zh_TW.UTF-8", lang("zh-MO")) + assertEquals("zh_HK:zh_TW:zh", DesktopLocale.language(Locale.forLanguageTag("zh-HK"))) + } + + @Test fun systemRegionsSurvive() { + assertEquals("en_GB.UTF-8", lang("en-GB")) + assertEquals("fr_CA.UTF-8", lang("fr-CA")) + assertEquals("de_DE.UTF-8", lang("de-XX")) + } + + @Test fun everyAppLanguageHasALocale() { + AppLanguage.supported.forEach { assertTrue(it, lang(it) != DesktopLocale.DEFAULT) } + } + + @Test fun unknownLanguagesFallBack() { + assertEquals(DesktopLocale.DEFAULT, lang("sw")) + } + + @Test fun languageListPrefersTheRegionThenTheLanguage() { + assertEquals("pt_BR:pt", DesktopLocale.language(Locale.forLanguageTag("pt-BR"))) + assertEquals("tr_TR:tr", DesktopLocale.language(Locale.forLanguageTag("tr"))) + assertEquals("en_US", DesktopLocale.language(Locale.forLanguageTag("en"))) + assertNull(DesktopLocale.language(Locale.forLanguageTag("sw"))) + } +} diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index f10cff2474..df09229f8b 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -31,6 +31,13 @@ export BL_DESKTOP=1 ln -sf /usr/local/bin/droiddeck-steam-launch /usr/local/bin/steamdeck-steam 2>/dev/null ln -sf /usr/local/bin/droiddeck-steam-shim /usr/local/bin/steam 2>/dev/null python3 /usr/local/bin/droiddeck-desktop-games 2>&1 | sed 's/^/[games] /' +# startplasma applies this file over the session environment, and keeps what an earlier session wrote. +kwriteconfig6 --file plasma-localerc --group Formats --key LANG "${LANG:-C.UTF-8}" +if [ -n "${LANGUAGE:-}" ]; then + kwriteconfig6 --file plasma-localerc --group Translations --key LANGUAGE "$LANGUAGE" +else + kwriteconfig6 --file plasma-localerc --group Translations --key LANGUAGE --delete +fi cat > /usr/share/applications/droiddeck-steam-x64.desktop <<'ENTRY' [Desktop Entry] Type=Application From 0050b5eb6bafb63990145ca77d27cd3ccbe94f3b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 09:23:22 -0500 Subject: [PATCH 08/16] fix: docked HUD tab FPS number sits between the old and halved sizes (#2003) --- .../java/com/droiddeck/launcher/hud/DroidDeckHudView.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index f4d315b5a8..b7acc74b3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -1483,10 +1483,10 @@ class DroidDeckHudView(context: Context) : View(context) { internal val isDragging: Boolean get() = lockController.isDragging() || tabDragging private companion object { - const val TAB_NUM_SP = 10f - const val TAB_LABEL_SP = 6f - const val TAB_PAD_X_SP = 5f - const val TAB_PAD_Y_SP = 4f + const val TAB_NUM_SP = 15f + const val TAB_LABEL_SP = 7.25f + const val TAB_PAD_X_SP = 7f + const val TAB_PAD_Y_SP = 5.5f const val REFRESH_MS = 500L private const val HUE_IDLE_MS = 500L const val MIN_SCALE = 0.5f From 3583643a11a25eedf77e15d33e2685348b1f19c7 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Mon, 2 Nov 2026 18:05:30 +0300 Subject: [PATCH 09/16] feat: Add the Game Jolt store (#1986) --- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/stores/CloudSaves.kt | 6 +- .../droiddeck/launcher/stores/LoginFlows.kt | 2 + .../com/droiddeck/launcher/stores/Store.kt | 5 +- .../launcher/stores/StoreArchiveUnpacker.kt | 231 +++++++++++++++++ .../launcher/stores/StoreInstallRoot.kt | 2 +- .../launcher/stores/StoreLoginActivity.kt | 4 + .../droiddeck/launcher/stores/StoreSizes.kt | 3 +- .../droiddeck/launcher/stores/StoresState.kt | 13 +- .../launcher/stores/gamejolt/GameJoltApi.kt | 72 ++++++ .../launcher/stores/gamejolt/GameJoltAuth.kt | 24 ++ .../stores/gamejolt/GameJoltBackend.kt | 86 +++++++ .../stores/gamejolt/GameJoltBrowse.kt | 163 ++++++++++++ .../stores/gamejolt/GameJoltBuilds.kt | 85 +++++++ .../stores/gamejolt/GameJoltCatalog.kt | 76 ++++++ .../stores/gamejolt/GameJoltCollections.kt | 120 +++++++++ .../stores/gamejolt/GameJoltInstaller.kt | 239 ++++++++++++++++++ .../stores/gamejolt/GameJoltLibrary.kt | 74 ++++++ .../launcher/stores/gamejolt/GameJoltLogin.kt | 55 ++++ .../launcher/stores/gamejolt/GameJoltPrefs.kt | 11 + .../stores/gamejolt/GameJoltPricing.kt | 28 ++ .../stores/gamejolt/GameJoltUpdates.kt | 188 ++++++++++++++ .../launcher/stores/itch/ItchInstaller.kt | 219 +--------------- .../droiddeck/launcher/ui/FrontEndScreen.kt | 1 + .../com/droiddeck/launcher/ui/GameDetail.kt | 19 +- .../launcher/ui/GameJoltBrowseBar.kt | 157 ++++++++++++ .../launcher/ui/GameJoltBuildPicker.kt | 129 ++++++++++ .../launcher/ui/GameJoltUpdateButton.kt | 61 +++++ .../droiddeck/launcher/ui/ItchBrowseBar.kt | 55 +++- .../com/droiddeck/launcher/ui/LibraryPage.kt | 79 +++--- .../droiddeck/launcher/ui/SettingsWidgets.kt | 4 +- .../com/droiddeck/launcher/ui/StoreChips.kt | 2 + .../com/droiddeck/launcher/ui/StoresPage.kt | 23 +- app/src/main/res/values-ar/strings.xml | 29 +++ app/src/main/res/values-b+es+419/strings.xml | 29 +++ app/src/main/res/values-bg/strings.xml | 29 +++ app/src/main/res/values-cs/strings.xml | 29 +++ app/src/main/res/values-da/strings.xml | 29 +++ app/src/main/res/values-de/strings.xml | 29 +++ app/src/main/res/values-el/strings.xml | 29 +++ app/src/main/res/values-es/strings.xml | 29 +++ app/src/main/res/values-fi/strings.xml | 29 +++ app/src/main/res/values-fr/strings.xml | 29 +++ app/src/main/res/values-hi/strings.xml | 29 +++ app/src/main/res/values-hu/strings.xml | 29 +++ app/src/main/res/values-in/strings.xml | 29 +++ app/src/main/res/values-it/strings.xml | 29 +++ app/src/main/res/values-ja/strings.xml | 29 +++ app/src/main/res/values-ko/strings.xml | 29 +++ app/src/main/res/values-ms/strings.xml | 29 +++ app/src/main/res/values-nb/strings.xml | 29 +++ app/src/main/res/values-nl/strings.xml | 29 +++ app/src/main/res/values-pl/strings.xml | 29 +++ app/src/main/res/values-pt-rPT/strings.xml | 29 +++ app/src/main/res/values-pt/strings.xml | 29 +++ app/src/main/res/values-ro/strings.xml | 29 +++ app/src/main/res/values-ru/strings.xml | 29 +++ app/src/main/res/values-sv/strings.xml | 29 +++ app/src/main/res/values-th/strings.xml | 29 +++ app/src/main/res/values-tr/strings.xml | 29 +++ app/src/main/res/values-uk/strings.xml | 29 +++ app/src/main/res/values-vi/strings.xml | 29 +++ app/src/main/res/values-zh-rCN/strings.xml | 29 +++ app/src/main/res/values-zh-rHK/strings.xml | 29 +++ app/src/main/res/values-zh-rTW/strings.xml | 29 +++ app/src/main/res/values/strings.xml | 29 +++ .../launcher/stores/StoreInstallRootTest.kt | 5 + .../stores/gamejolt/GameJoltBrowseTest.kt | 36 +++ .../stores/gamejolt/GameJoltBuildsTest.kt | 41 +++ .../gamejolt/GameJoltCollectionsTest.kt | 28 ++ .../stores/gamejolt/GameJoltPricingTest.kt | 52 ++++ .../stores/gamejolt/GameJoltUpdatesTest.kt | 63 +++++ .../launcher/ui/LibraryEntriesTest.kt | 5 + docs/development/gamejolt-store.md | 66 +++++ 74 files changed, 3215 insertions(+), 275 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt create mode 100644 docs/development/gamejolt-store.md diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 01657d289c..0d099cbf0b 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -55,6 +55,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.epic.EpicBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.amazon.AmazonBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.itch.ItchBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.gamejolt.GameJoltBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) com.droiddeck.launcher.sync.Syncthing.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index ace3304159..2af7a9bff4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -148,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -173,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index 79ca0f8492..4e53c5ea08 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -12,11 +12,13 @@ internal object LoginFlows { Store.GOG -> GogFlow(state, browserUserAgent) Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() + Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } + @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { override val startUrl: String get() = GogAuth.authUrl(state) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index 54476b6e19..b7d0fbce1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -5,9 +5,12 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { EPIC("epic", "Epic Games", "Epic"), AMAZON("amazon", "Amazon Games", "Amazon"), XBOX("xbox", "Xbox", "Xbox"), - ITCH("itch", "itch.io", "itch"), + ITCH("itch", "Itch.io", "Itch.io"), + GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), BATTLENET("battlenet", "Battle.net", "Battle.net"); + val folder: String get() = if (this == ITCH) "itch" else shortLabel + companion object { fun byId(id: String?): Store? = entries.firstOrNull { it.id == id } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt new file mode 100644 index 0000000000..ef355cc038 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt @@ -0,0 +1,231 @@ +package com.droiddeck.launcher.stores + +import android.content.Context +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.itch.ItchArchives +import org.apache.commons.compress.MemoryLimitException +import org.apache.commons.compress.archivers.sevenz.SevenZFile +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream +import org.apache.commons.compress.archivers.zip.ZipFile +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream +import org.apache.commons.compress.compressors.xz.XZCompressorInputStream +import java.io.BufferedInputStream +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.nio.file.Files +import java.util.concurrent.atomic.AtomicBoolean + +internal class StoreArchiveUnpacker( + private val app: Context, + private val cancelled: AtomicBoolean, + private val label: String, + private val unsupported: Int, + private val extractFailed: Int, + private val logName: String, +) { + var work: File = File("") + + fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { + when (val kind = ItchArchives.kind(archive, filename)) { + "zip" -> unzip(archive, handle) + "7z" -> try { + sevenZip(archive, handle) + } catch (e: MemoryLimitException) { + handle.log("$label: ${archive.name} needs more memory than the app has, unpacking it in the runtime") + unrar(archive, handle, kind) + } + "rar" -> unrar(archive, handle, kind) + "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) + "tar" -> untar(archive, null, handle) + "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) + else -> copy(archive, File(work, filename.ifBlank { "game" })) + } + } + + private fun target(name: String): File? { + val file = File(work, name.replace('\\', '/')) + val root = work.canonicalPath + val path = file.canonicalPath + return if (path == root || path.startsWith(root + File.separator)) file else null + } + + private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { + if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(unsupported, kind)) + val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null + else listOf(work.absolutePath) + fun bsdtar(args: List, onLine: (String) -> Unit) = + GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = logName, extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> + if (!line.startsWith("proot ")) onLine(line) + } + var entries = 0L + bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } + var done = 0L + val tail = ArrayDeque() + val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> + if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { + if (tail.size == 5) tail.removeFirst() + tail.addLast(line) + } + } + if (cancelled.get()) return + if (code != 0) { + handle.log("$label: bsdtar exited $code: ${tail.joinToString(" | ")}") + throw IllegalStateException(app.getString(extractFailed, code)) + } + } + + private fun sevenZip(archive: File, handle: DownloadQueue.JobHandle) { + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() + Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> + while (true) { + if (cancelled.get()) return + val entry = seven.nextEntry ?: break + val file = target(entry.name) + if (file == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = seven.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } + + private fun untar(archive: File, codec: String?, handle: DownloadQueue.JobHandle): Unit? { + val total = archive.length() + var written = 0L + var entries = 0 + val buffer = ByteArray(64 * 1024) + val opened = runCatching { + FileInputStream(archive).use { raw -> + val stream = when (codec) { + "gz" -> GzipCompressorInputStream(BufferedInputStream(raw)) + "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) + "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) + else -> BufferedInputStream(raw) + } + stream.use { input -> + TarArchiveInputStream(input).use { tar -> + while (true) { + if (cancelled.get()) return null + val entry = tar.nextEntry ?: break + entries++ + val file = target(entry.name) + if (file == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return null + val read = tar.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } + true + } + if (opened.isSuccess && entries > 0) return Unit + if (opened.isFailure && codec == null) throw opened.exceptionOrNull() ?: IllegalStateException("tar") + return null + } + + private fun single(archive: File, codec: String, handle: DownloadQueue.JobHandle) { + val name = archive.name.substringBeforeLast('.') + val file = target(name.ifBlank { "game" }) ?: throw IllegalStateException("archive") + file.parentFile?.mkdirs() + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + FileInputStream(archive).use { raw -> + val stream = when (codec) { + "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) + "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) + else -> GzipCompressorInputStream(BufferedInputStream(raw)) + } + stream.use { input -> + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + + private fun copy(source: File, target: File) { + target.parentFile?.mkdirs() + FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } + } + + private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + ZipFile.builder().setFile(archive).get().use { zip -> + for (entry in zip.entries) { + if (cancelled.get()) return + val target = target(entry.name) + if (target == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + target.mkdirs() + continue + } + target.parentFile?.mkdirs() + zip.getInputStream(entry).use { input -> + FileOutputStream(target).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index 6814ad4e95..2ba84041f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -218,7 +218,7 @@ object StoreInstallRoot { fun isRemovable(context: Context, folder: File): Boolean = !folder.absolutePath.startsWith(internalRoot(context).absolutePath + "/") - fun storeDir(root: File, store: Store): File = File(root, store.shortLabel) + fun storeDir(root: File, store: Store): File = File(root, store.folder) fun gameFolders(context: Context): List = roots(context).flatMap { root -> Store.entries.flatMap { store -> diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 91d96f6ec5..228d97cd78 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -273,6 +273,10 @@ class StoreLoginActivity : ComponentActivity() { if (url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) } + override fun doUpdateVisitedHistory(view: WebView?, url: String?, isReload: Boolean) { + if (!isPopup && store == Store.GAMEJOLT && url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) + } + override fun onPageFinished(view: WebView?, url: String?) { if (url != null && view != null && flow?.readsPage == true && flow?.isRedirect(url) == true) complete(view, url) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 290676c9ed..545c981e50 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -54,7 +54,7 @@ object StoreSizes { when (item.store) { Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() - Store.ITCH -> {} + Store.ITCH, Store.GAMEJOLT -> {} Store.GOG, Store.XBOX, Store.BATTLENET -> {} } } @@ -113,5 +113,6 @@ object StoreSizes { } Store.GOG, Store.XBOX, Store.BATTLENET -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) + Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 2902cd3664..f28c402e8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -131,7 +131,11 @@ object StoresState { fun detailItem(store: Store, id: String): CatalogItem? = detailCatalogItem( store, id, library[store].orEmpty(), - found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() else emptyList(), + found[store].orEmpty() + when (store) { + Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() + Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState.items + com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.items() + else -> emptyList() + }, shelves[store], ) @@ -191,6 +195,10 @@ object StoresState { backend?.signOut(app) if (store == Store.GOG) com.droiddeck.launcher.stores.gog.GogComet.replaceAccount { StoreAccounts.clear(app, store) } else if (store != Store.XBOX || backend == null) StoreAccounts.clear(app, store) + if (store == Store.GAMEJOLT) { + com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.clear() + com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.clear(app) + } if (store == Store.ITCH) { com.droiddeck.launcher.stores.itch.ItchCollections.clear() com.droiddeck.launcher.stores.itch.ItchUpdates.clear(app) @@ -218,10 +226,12 @@ object StoresState { var pendingInstall by mutableStateOf(null) var itchPicking by mutableStateOf(null) + var gameJoltPicking by mutableStateOf(null) fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } + if (item.store == Store.GAMEJOLT && item.extra["buildId"].isNullOrEmpty()) { gameJoltPicking = item; return } if (isUnfinished(item)) { install(context, item); return } val targets = StoreInstallRoot.targets(context) val preferred = StoreInstallRoot.defaultTarget(context) @@ -285,6 +295,7 @@ object StoresState { installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } uninstalling.remove(key) if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) + if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) } }) main.post(onDone) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt new file mode 100644 index 0000000000..fce0696a15 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.stores.gamejolt + +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder + +internal class GameJoltAnswer(val code: Int, val json: JSONObject?) { + val ok: Boolean get() = code in 200..299 + val payload: JSONObject? get() = json?.optJSONObject("payload") + val user: JSONObject? get() = json?.optJSONObject("user") +} + +internal object GameJoltApi { + const val SITE = "https://gamejolt.com" + const val LOGIN = "$SITE/login" + + private const val BASE = "$SITE/site-api" + private const val MAX_BYTES = 6_000_000 + + fun get(path: String, cookies: String = ""): GameJoltAnswer = send("GET", path, cookies, null) + + fun post(path: String, cookies: String = "", body: String = ""): GameJoltAnswer = send("POST", path, cookies, body) + + fun overview(gameId: String, cookies: String): GameJoltAnswer = get("/web/discover/games/overview/$gameId", cookies) + + fun search(query: String, page: Int, cookies: String): GameJoltAnswer = + get("/web/search/games?q=${URLEncoder.encode(query, "UTF-8")}&page=$page", cookies) + + fun browse(queryString: String, cookies: String): GameJoltAnswer = get("/web/discover/games?$queryString", cookies) + + fun pageUrl(slug: String, id: String): String = "$SITE/games/$slug/$id" + + private fun readBounded(input: java.io.InputStream): String { + val out = java.io.ByteArrayOutputStream() + val buffer = ByteArray(16 * 1024) + while (out.size() < MAX_BYTES) { + val read = input.read(buffer, 0, minOf(buffer.size, MAX_BYTES - out.size())) + if (read < 0) break + out.write(buffer, 0, read) + } + return out.toString(Charsets.UTF_8.name()) + } + + private fun send(method: String, path: String, cookies: String, body: String?): GameJoltAnswer { + var conn: HttpURLConnection? = null + return try { + conn = (URL(BASE + path).openConnection() as HttpURLConnection).apply { + connectTimeout = 25_000 + readTimeout = 25_000 + requestMethod = method + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "application/json") + if (cookies.isNotBlank()) setRequestProperty("Cookie", cookies) + if (body != null) { + doOutput = true + setRequestProperty("Content-Type", "application/x-www-form-urlencoded") + } + } + if (body != null) conn.outputStream.use { it.write(body.toByteArray()) } + val code = conn.responseCode + val stream = if (code in 200..399) conn.inputStream else conn.errorStream + val text = stream?.use { readBounded(it) }.orEmpty() + GameJoltAnswer(code, runCatching { JSONObject(text) }.getOrNull()) + } catch (e: Exception) { + GameJoltAnswer(0, null) + } finally { + runCatching { conn?.disconnect() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt new file mode 100644 index 0000000000..1cc9f05758 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONObject + +internal object GameJoltAuth { + fun cookies(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("access_token").orEmpty() + + fun save(context: Context, cookies: String, user: JSONObject) { + val name = user.optString("display_name").ifBlank { user.optString("username") } + StoreAccounts.write( + context.applicationContext, Store.GAMEJOLT, + JSONObject().put("access_token", cookies).put("user_id", user.optLong("id").toString()).put("username", user.optString("username")).put("display_name", name), + ) + } + + fun username(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("username").orEmpty() + + fun userId(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("user_id").orEmpty() + + fun clear(context: Context) = StoreAccounts.clear(context.applicationContext, Store.GAMEJOLT) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt new file mode 100644 index 0000000000..09444f42a8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt @@ -0,0 +1,86 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.content.Intent +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import java.io.File + +object GameJoltBackend : StoreBackend { + override val store: Store = Store.GAMEJOLT + + init { + LoginFlows.gameJoltFlow = { agent -> GameJoltLogin(agent) } + } + + override fun signIn(context: Context) { + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + val app = context.applicationContext + GameJoltPrefs.get(app).edit().clear().apply() + GameJoltAuth.clear(app) + GameJoltLibrary.reset() + StoresState.post { + StoresState.library.remove(store) + StoresState.shelves.remove(store) + StoresState.found.remove(store) + StoresState.problems.remove(store) + StoresState.status.remove(store) + } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + if (force) GameJoltLibrary.reset() + Thread({ GameJoltLibrary.sync(app, force) }, "gamejolt-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + StoresState.post { StoresState.shelves[store] = StoreShelves() } + } + + override fun search(context: Context, query: String): List { + val cookies = GameJoltAuth.cookies(context) + val items = ArrayList() + for (page in 1..2) { + val answer = GameJoltApi.search(query, page, cookies) + val found = if (answer.ok) GameJoltCatalog.items(answer.payload?.optJSONArray("games")) else emptyList() + if (found.isEmpty()) break + items.addAll(found) + } + StoresState.logLine("Game Jolt search: \"$query\" returned ${items.size} games") + return items.distinctBy { it.id } + } + + override fun install(context: Context, item: CatalogItem, root: File) { + val app = context.applicationContext + if (!item.isFree && !item.owned) { + StoresState.logLine("Game Jolt: \"${item.title}\" is a paid game, opening its page instead") + return + } + val folder = StoreInstallRoot.folderFor(app, Store.GAMEJOLT, item.id, item.title, root) + val entry = DownloadEntry( + Store.GAMEJOLT, item.id, item.title, cover = item.imageUrl, bytesTotal = StoreSizes.size(item), + location = StoreInstallRoot.labelFor(app, folder), + ) + DownloadQueue.enqueue(app, entry) { GameJoltInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt new file mode 100644 index 0000000000..4aa8df90da --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt @@ -0,0 +1,163 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoresState +import java.net.URLEncoder + +internal data class GameJoltQuery( + val section: String = GameJoltBrowse.SECTION_FEATURED, + val price: String = GameJoltBrowse.PRICE_ANY, + val os: Set = emptySet(), + val browser: Set = emptySet(), + val maturity: Set = emptySet(), + val status: Set = emptySet(), + val partners: Boolean = false, + val tags: List = emptyList(), +) + +internal object GameJoltBrowse { + const val SECTION_FEATURED = "featured" + const val SECTION_HOT = "hot" + const val SECTION_BEST = "best" + const val SECTION_NEW = "new" + val sections = listOf(SECTION_FEATURED, SECTION_HOT, SECTION_BEST, SECTION_NEW) + + const val PRICE_ANY = "any" + const val PRICE_FREE = "free" + const val PRICE_SALE = "sale" + const val PRICE_PAID = "paid" + const val PRICE_UNDER_5 = "5-less" + const val PRICE_UNDER_15 = "15-less" + const val PRICE_UNDER_30 = "30-less" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15, PRICE_UNDER_30) + + val systems = listOf("windows", "mac", "linux", "other") + val browsers = listOf("html", "flash", "unity") + val maturities = listOf("everyone", "teen", "adult") + val statuses = listOf("complete", "wip") + + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') + + fun queryString(query: GameJoltQuery, page: Int): String { + val parts = ArrayList() + parts.add("section=${query.section.takeIf { it in sections } ?: SECTION_FEATURED}") + query.tags.forEach { parts.add("tag=" + enc(tagSlug(it))) } + if (query.price != PRICE_ANY && query.price in prices) parts.add("f_price=${query.price}") + systems.filter { it in query.os }.forEach { parts.add("f_os%5B%5D=$it") } + browsers.filter { it in query.browser }.forEach { parts.add("f_browser%5B%5D=$it") } + maturities.filter { it in query.maturity }.forEach { parts.add("f_maturity%5B%5D=$it") } + statuses.filter { it in query.status }.forEach { parts.add("f_status%5B%5D=$it") } + if (query.partners) parts.add("f_partners%5B%5D=partners") + if (page > 1) parts.add("page=$page") + return parts.joinToString("&") + } + + private fun enc(value: String): String = URLEncoder.encode(value, "UTF-8") + + class Page(val items: List, val code: Int, val rawIds: List) + + fun effective(query: GameJoltQuery, showMature: Boolean): GameJoltQuery { + val playable = query.copy(status = query.status.filterTo(HashSet()) { it in statuses }.ifEmpty { statuses.toSet() }) + if (showMature) return playable + val allowed = playable.maturity - "adult" + return playable.copy(maturity = allowed.ifEmpty { setOf("everyone", "teen") }) + } + + fun page(context: Context, query: GameJoltQuery, page: Int, showMature: Boolean): Page { + val cookies = GameJoltAuth.cookies(context) + val asked = effective(query, showMature) + val answer = fetch(queryString(asked, page), cookies) + val all = if (answer.ok) GameJoltCatalog.items(answer.payload?.optJSONArray("games")) else emptyList() + return Page(all, answer.code, all.map { it.id }) + } + + private fun fetch(qs: String, cookies: String): GameJoltAnswer { + val answer = GameJoltApi.browse(qs, cookies) + val games = if (answer.ok) answer.payload?.optJSONArray("games") else null + StoresState.logLine("Game Jolt browse: ?$qs answered ${answer.code} with ${games?.length() ?: 0} games") + return answer + } +} + +internal object GameJoltBrowseState { + var query by mutableStateOf(GameJoltQuery()) + private set + var items by mutableStateOf>(emptyList()) + private set + var loading by mutableStateOf(false) + private set + var ended by mutableStateOf(false) + private set + var failed by mutableStateOf(false) + private set + + private var next = 1 + private var generation = 0 + private var loadedMature: Boolean? = null + private val seenRaw = HashSet() + + fun sync(context: Context, showMature: Boolean) { + if (!showMature && "adult" in query.maturity) { + reset() + query = query.copy(maturity = query.maturity - "adult") + more(context) + return + } + val before = loadedMature ?: return + if (before != showMature) more(context) + } + + private fun reset() { + generation++ + items = emptyList() + ended = false + failed = false + loading = false + next = 1 + seenRaw.clear() + } + + fun choose(context: Context, wanted: GameJoltQuery) { + if (wanted == query) return + reset() + query = wanted + more(context) + } + + fun more(context: Context, retry: Boolean = false) { + val app = context.applicationContext + val mature = SessionPrefs.storesShowMature(app) + if (loadedMature != null && loadedMature != mature) reset() + if (loading || ended || (failed && !retry)) return + loading = true + failed = false + val mine = generation + val asked = query + val page = next + loadedMature = mature + Thread({ + val answer = runCatching { GameJoltBrowse.page(app, asked, page, mature) }.getOrNull() + StoresState.post { + if (mine != generation) return@post + loading = false + if (answer == null || answer.code !in 200..299) { + failed = true + return@post + } + if (answer.rawIds.filter { seenRaw.add(it) }.isEmpty()) { + ended = true + return@post + } + next = page + 1 + val known = items.mapTo(HashSet()) { it.id } + val fresh = answer.items.filter { known.add(it.id) } + if (fresh.isEmpty()) more(app) else items = items + fresh + } + }, "gamejolt-browse").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt new file mode 100644 index 0000000000..a014e7d6ec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.stores.CatalogItem +import org.json.JSONArray +import org.json.JSONObject + +internal class GameJoltBuild( + val id: String, + val packageId: String, + val packageTitle: String, + val version: String, + val filename: String, + val size: Long, + val stamp: String, + val platforms: Set, + val folder: String, + val executable: String, +) { + val installable: Boolean get() = "windows" in platforms +} + +internal object GameJoltBuilds { + fun parse(payload: JSONObject?): List { + if (payload == null) return emptyList() + val packages = objects(payload.optJSONArray("packages")).associate { it.optLong("id") to it.optString("title") } + val releases = objects(payload.optJSONArray("releases")).associateBy { it.optLong("id") } + val launch = objects(payload.optJSONArray("launchOptions")) + val builds = objects(payload.optJSONArray("builds")).filter { it.optJSONObject("primary_file") != null } + val newest = builds.groupBy { it.optLong("game_package_id") }.mapValues { (_, list) -> + list.maxOfOrNull { releaseRank(releases[it.optLong("game_release_id")], it.optLong("game_release_id")) } + } + return builds + .filter { newest[it.optLong("game_package_id")] == releaseRank(releases[it.optLong("game_release_id")], it.optLong("game_release_id")) } + .map { build -> + val file = build.optJSONObject("primary_file") + val release = releases[build.optLong("game_release_id")] + val id = build.optLong("id") + GameJoltBuild( + id = id.toString(), + packageId = build.optLong("game_package_id").toString(), + packageTitle = packages[build.optLong("game_package_id")].orEmpty(), + version = release?.optString("version_number").orEmpty(), + filename = file?.optString("filename").orEmpty().substringAfterLast('/').substringAfterLast('\\'), + size = file?.optLong("filesize") ?: 0L, + stamp = release?.optLong("published_on")?.takeIf { it > 0L }?.toString().orEmpty(), + platforms = platforms(build), + folder = build.optString("folder"), + executable = launch.firstOrNull { it.optLong("game_build_id") == id && it.optString("os").startsWith("windows") }?.optString("executable_path").orEmpty(), + ) + } + .sortedWith(compareByDescending { it.installable }.thenByDescending { it.stamp.toLongOrNull() ?: 0L }.thenByDescending { it.id.toLongOrNull() ?: 0L }) + } + + fun platforms(build: JSONObject): Set { + val found = LinkedHashSet() + if (build.optBoolean("os_windows") || build.optBoolean("os_windows_64")) found.add("windows") + if (build.optBoolean("os_linux") || build.optBoolean("os_linux_64")) found.add("linux") + if (build.optBoolean("os_mac") || build.optBoolean("os_mac_64")) found.add("osx") + if (build.optBoolean("os_other")) found.add("other") + return if (found.isEmpty()) setOf("web") else found + } + + fun load(context: Context, gameId: String): List? { + val answer = GameJoltApi.overview(gameId, GameJoltAuth.cookies(context)) + if (!answer.ok) return null + return parse(answer.payload) + } + + fun byId(builds: List, id: String): GameJoltBuild? = builds.firstOrNull { it.id == id } + + fun preferred(builds: List): GameJoltBuild? = builds.firstOrNull { it.installable } + + fun size(context: Context, item: CatalogItem): Long { + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val builds = load(context, gameId) ?: return 0L + val chosen = item.extra["buildId"]?.let { byId(builds, it) } ?: preferred(builds) + return chosen?.size ?: 0L + } + + private fun releaseRank(release: JSONObject?, id: Long): Long = (release?.optLong("published_on") ?: 0L) * 1_000_000L + id + + private fun objects(array: JSONArray?): List = + if (array == null) emptyList() else (0 until array.length()).mapNotNull { array.optJSONObject(it) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt new file mode 100644 index 0000000000..5303d65b47 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.stores.gamejolt + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.cleanStoreText +import org.json.JSONArray +import org.json.JSONObject +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.TimeZone +import java.util.concurrent.atomic.AtomicBoolean + +internal object GameJoltCatalog { + private const val PAID = "paid" + private val sellableLogged = AtomicBoolean(false) + + fun items(games: JSONArray?, owned: Boolean = false): List { + if (games == null) return emptyList() + return (0 until games.length()).mapNotNull { games.optJSONObject(it)?.let { game -> item(game, owned) } }.distinctBy { it.id } + } + + fun item(game: JSONObject, owned: Boolean = false): CatalogItem? { + val id = game.optLong("id") + if (id <= 0L) return null + val slug = game.optString("slug") + val sellable = game.optJSONObject("sellable") + val paid = sellable?.optString("type") == PAID + if (paid) noteSellable(sellable) + val developer = game.optJSONObject("developer") + val author = developer?.optString("display_name").orEmpty().ifBlank { developer?.optString("username").orEmpty() } + val thumbnail = game.optJSONObject("thumbnail_media_item")?.optString("img_url").orEmpty().ifBlank { game.optString("img_thumbnail") } + val header = game.optJSONObject("header_media_item")?.optString("img_url").orEmpty().ifBlank { game.optString("img_thumbnail") } + val price = if (paid) GameJoltPricing.of(sellable) else null + val compatibility = game.optJSONObject("compatibility") + val tags = buildList { + if (compatibility?.optBoolean("os_windows") == true) add("Windows") + if (compatibility?.optBoolean("os_linux") == true) add("Linux") + if (compatibility?.optBoolean("os_mac") == true) add("macOS") + }.joinToString(", ") + return CatalogItem( + store = Store.GAMEJOLT, + id = id.toString(), + title = game.optString("title").ifBlank { "Game Jolt game $id" }, + imageUrl = header.ifBlank { null }, + tallImageUrl = thumbnail.ifBlank { null }, + tags = tags, + isFree = !paid, + hasPrice = paid, + finalPrice = price?.final.orEmpty(), + originalPrice = price?.original.orEmpty(), + discountPercent = price?.discount ?: 0, + owned = owned, + storeUrl = GameJoltApi.pageUrl(slug.ifBlank { "game" }, id.toString()), + developer = author, + publisher = author, + releaseDate = date(game.optLong("published_on")), + description = cleanStoreText(game.optString("description")), + mature = game.optBoolean("has_adult_content"), + extra = mapOf("gameId" to id.toString(), "slug" to slug), + ) + } + + private fun noteSellable(sellable: JSONObject?) { + if (sellable == null || !sellableLogged.compareAndSet(false, true)) return + val pricing = sellable.optJSONArray("pricings")?.optJSONObject(0) + StoresState.logLine("Game Jolt: a paid game carries sellable keys [${sellable.keys().asSequence().joinToString(",")}] and pricing keys [${pricing?.keys()?.asSequence()?.joinToString(",").orEmpty()}]") + } + + private fun date(stamp: Long): String { + if (stamp <= 0L) return "" + val millis = if (stamp > 100_000_000_000L) stamp else stamp * 1000L + return SimpleDateFormat("yyyy-MM-dd", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }.format(Date(millis)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt new file mode 100644 index 0000000000..887a071acb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.net.URLEncoder +import java.util.concurrent.ConcurrentHashMap + +internal class GameJoltCollection(val id: String, val title: String) + +internal object GameJoltCollections { + const val FOLLOWED = "followed" + private const val PLAYLIST = "playlist:" + + var list by mutableStateOf>(emptyList()) + private set + var selected by mutableStateOf(null) + private set + private val games = mutableStateMapOf>() + private val loading = ConcurrentHashMap.newKeySet() + @Volatile private var generation = 0 + + fun items(): List = games.values.flatten() + + fun gamesOf(id: String): List? = games[id] + + fun chosen(): GameJoltCollection? = list.firstOrNull { it.id == selected } + + fun clear() { + generation++ + StoresState.post { + list = emptyList() + selected = null + games.clear() + } + } + + fun load(context: Context) { + val app = context.applicationContext + val started = generation + val guard = "$started:" + if (!loading.add(guard)) return + Thread({ + try { + val cookies = GameJoltAuth.cookies(app) + if (cookies.isBlank()) return@Thread + val playlists = playlists(cookies) ?: return@Thread + val parsed = listOf(GameJoltCollection(FOLLOWED, app.getString(R.string.stores_gamejolt_followed))) + parse(playlists) + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + list = parsed + if (selected != null && parsed.none { it.id == selected }) selected = null + } + StoresState.logLine("Game Jolt: ${parsed.size} collections") + selected?.let { fetchGames(app, it, started) } + } finally { + loading.remove(guard) + } + }, "gamejolt-collections").start() + } + + fun select(context: Context, id: String?) { + selected = id + if (id == null) return + val app = context.applicationContext + val started = generation + Thread({ fetchGames(app, id, started) }, "gamejolt-collection-games").start() + } + + private fun playlists(cookies: String): JSONArray? { + val library = GameJoltApi.get("/web/library", cookies) + if (!library.ok) return null + library.payload?.optJSONArray("playlists")?.let { return it } + val nested = library.payload?.optJSONArray("collections") + if (nested != null) { + val out = JSONArray() + for (i in 0 until nested.length()) nested.optJSONObject(i)?.optJSONObject("playlist")?.let { out.put(it) } + if (out.length() > 0) return out + } + return GameJoltApi.get("/web/library/playlists", cookies).takeIf { it.ok }?.payload?.optJSONArray("playlists") ?: JSONArray() + } + + internal fun parse(playlists: JSONArray): List = (0 until playlists.length()).mapNotNull { i -> + val playlist = playlists.optJSONObject(i) ?: return@mapNotNull null + val id = playlist.optLong("id").takeIf { it > 0L } ?: return@mapNotNull null + val title = playlist.optString("name").ifBlank { return@mapNotNull null } + GameJoltCollection("$PLAYLIST$id", title) + } + + internal fun path(id: String, username: String): String? = when { + id == FOLLOWED -> "/web/library/games/followed/@${URLEncoder.encode(username, "UTF-8")}" + id.startsWith(PLAYLIST) -> id.removePrefix(PLAYLIST).toLongOrNull()?.let { "/web/library/games/playlist/$it" } + else -> null + } + + private fun fetchGames(app: Context, id: String, started: Int) { + val guard = "$started:$id" + if (!loading.add(guard)) return + try { + val path = path(id, GameJoltAuth.username(app)) ?: return + val found = GameJoltLibrary.games(app, path, false) + if (found == null) { + StoresState.logLine("Game Jolt: collection $id failed") + return + } + StoresState.post { if (started == generation) games[id] = found } + StoresState.logLine("Game Jolt: collection $id has ${found.size} games") + } finally { + loading.remove(guard) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt new file mode 100644 index 0000000000..c6653bf9be --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt @@ -0,0 +1,239 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreArchiveUnpacker +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import com.droiddeck.launcher.stores.itch.ItchArchives +import com.droiddeck.launcher.stores.itch.ItchStaging +import java.io.File +import java.io.FileOutputStream +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.atomic.AtomicBoolean + +internal class GameJoltInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + private var work: File = folder + private var updating = false + private var previous: StoreGameSidecar? = null + private val commit = Any() + private val unpacker = StoreArchiveUnpacker(app, cancelled, "Game Jolt", R.string.stores_gamejolt_archive, R.string.stores_gamejolt_extract_failed, "gamejolt-unrar") + + override fun run(handle: DownloadQueue.JobHandle): String? { + val cookies = GameJoltAuth.cookies(app) + if (cookies.isBlank()) throw IllegalStateException(app.getString(R.string.stores_sync_sign_in)) + if (!item.isFree && !item.owned) throw IllegalStateException(app.getString(R.string.stores_gamejolt_not_owned)) + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val before = StoreGameSidecar.read(folder) + previous = before + updating = before != null && (before.isInstalled || before.state == StoreGameSidecar.STATE_UPDATING) + val resuming = before?.let { it.state == StoreGameSidecar.STATE_INSTALLING && it.id == item.id } == true + StoreInstalls.begin(folder, Store.GAMEJOLT, item.id, item.title, item.imageUrl, item.imageUrl) + handle.stage(DownloadStage.MANIFEST) + val builds = GameJoltBuilds.load(app, gameId) ?: throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_game)) + val chosen = item.extra["buildId"].orEmpty() + val build = (if (chosen.isBlank()) GameJoltBuilds.preferred(builds) else GameJoltBuilds.byId(builds, chosen))?.takeIf { it.installable } + ?: throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_build)) + handle.log("Game Jolt: installing build ${build.id} (${build.filename}, ${build.size} bytes, platforms ${build.platforms.joinToString(",")}, launch ${build.executable.ifBlank { "none" }})") + val scratch = StoreInstallRoot.scratchDir(app, Store.GAMEJOLT, item.id) + scratch.mkdirs() + val filename = build.filename.trim().takeUnless { it.isBlank() || it == "." || it == ".." } ?: "download.bin" + val archive = File(scratch, filename) + val exe = try { + handle.stage(DownloadStage.DOWNLOAD) + download(build, archive, handle) + if (cancelled.get()) return null + handle.stage(DownloadStage.INSTALL) + install(build, archive, filename, handle, resuming) + } catch (t: Throwable) { + if (!cancelled.get()) dropCaches(scratch) + throw t + } + if (exe == null) { + if (cancelled.get()) return null + dropCaches(scratch) + throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_exe)) + } + archive.delete() + StoreInstalls.deleteTree(scratch) + val sidecar = StoreGameSidecar( + store = Store.GAMEJOLT, + id = item.id, + title = item.title, + exe = exe, + args = previous?.args.orEmpty(), + env = previous?.env.orEmpty(), + installVersion = build.stamp, + installedAt = System.currentTimeMillis(), + cover = item.imageUrl, + hero = item.imageUrl, + extra = mapOf("gameId" to gameId, "buildId" to build.id, "packageId" to build.packageId) + (if (item.isFree) emptyMap() else mapOf("paid" to "1")), + cloud = false, + ) + StoreInstalls.complete(app, folder, sidecar) { done, steps -> handle.stageProgress(done.toLong(), steps.toLong()) } + GameJoltUpdates.applied(app, item.key) + return folder.path + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) dropCaches(StoreInstallRoot.scratchDir(app, Store.GAMEJOLT, item.id)) + } + + private fun dropCaches(scratch: File) { + if (!updating) { + StoreInstalls.discard(app, folder, listOf(scratch)) + return + } + synchronized(commit) { + StoreInstalls.deleteTree(scratch) + ItchStaging.delete(File(folder, ItchStaging.DIR)) + } + } + + private fun download(build: GameJoltBuild, target: File, handle: DownloadQueue.JobHandle) { + val origin = File(target.path + ".from") + val stamp = "${build.id} ${build.stamp} ${build.size}" + if (!target.isFile || runCatching { origin.readText() }.getOrNull() != stamp) { + target.delete() + origin.writeText(stamp) + } + val expected = build.size + if (expected > 0 && target.length() == expected) { + handle.progress(expected, expected) + return + } + for (attempt in 0..1) { + val have = target.length() + val url = downloadLink(build) + var conn: HttpURLConnection? = null + try { + conn = (URL(url).openConnection() as HttpURLConnection).apply { + connectTimeout = 30_000 + readTimeout = 60_000 + instanceFollowRedirects = true + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "*/*") + if (have > 0) setRequestProperty("Range", "bytes=$have-") + } + val code = conn.responseCode + if (code == 416 && attempt == 0) { + target.delete() + continue + } + if (code !in 200..299) throw IllegalStateException(app.getString(R.string.stores_gamejolt_download_failed, code)) + val append = code == 206 && have > 0 + if (have > 0) handle.log(if (append) "Game Jolt: resuming at $have bytes" else "Game Jolt: server ignored the resume, starting over") + var done = if (append) have else 0L + val total = conn.contentLengthLong.takeIf { it > 0 }?.let { if (append) it + have else it } ?: expected + handle.progress(done, total) + val buffer = ByteArray(128 * 1024) + conn.inputStream.use { input -> + FileOutputStream(target, append).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + done += read + handle.progress(done, total) + } + } + } + if (total > 0 && done < total) throw IllegalStateException(app.getString(R.string.stores_gamejolt_download_failed, code)) + return + } finally { + runCatching { conn?.disconnect() } + } + } + } + + private fun downloadLink(build: GameJoltBuild): String { + val answer = GameJoltApi.post("/web/discover/games/builds/get-download-url/${build.id}", GameJoltAuth.cookies(app)) + val url = answer.payload?.optString("url").orEmpty() + if (url.startsWith("https://")) return url + throw IllegalStateException( + when { + answer.code == 0 -> app.getString(R.string.stores_gamejolt_download_unreachable) + answer.ok -> app.getString(R.string.stores_gamejolt_download_no_link) + else -> app.getString(R.string.stores_gamejolt_download_failed, answer.code) + }, + ) + } + + private fun clearPartialInstall() { + folder.listFiles()?.forEach { + if (it.name == StoreGameSidecar.FILE_NAME) return@forEach + if (it.isDirectory) StoreInstalls.deleteTree(it) else it.delete() + } + } + + private fun install(build: GameJoltBuild, archive: File, filename: String, handle: DownloadQueue.JobHandle, resuming: Boolean): String? { + work = if (updating) File(folder, ItchStaging.DIR) else folder + if (updating) ItchStaging.delete(work) + work.mkdirs() + unpacker.work = work + if (resuming) clearPartialInstall() + val exe = try { + val kind = ItchArchives.kind(archive, filename) + if (kind == "exe") archive.copyTo(File(work, filename), overwrite = true) else unpacker.unpack(archive, filename, handle) + var picked = pick(build, filename) + var passes = 0 + while (picked.isBlank() && passes < 2 && !cancelled.get()) { + val inner = ItchArchives.inner(work) ?: break + handle.log("Game Jolt: no exe yet, unpacking ${inner.name}") + unpacker.unpack(inner, inner.name, handle) + if (cancelled.get()) break + inner.delete() + picked = pick(build, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }) + passes++ + } + picked + } catch (t: Throwable) { + if (updating) ItchStaging.delete(work) + throw t + } + if (exe.isBlank()) { + handle.log("Game Jolt: no exe found in ${folder.name}") + if (updating) ItchStaging.delete(work) + return null + } + if (updating) synchronized(commit) { + if (cancelled.get()) { + ItchStaging.delete(work) + return null + } + try { + StoreInstalls.markUpdating(folder) + } catch (t: Throwable) { + ItchStaging.delete(work) + throw t + } + ItchStaging.merge(work, folder) + ItchStaging.delete(work) + } + return exe + } + + private fun pick(build: GameJoltBuild, hint: String?): String { + if (build.executable.isNotBlank()) { + val declared = File(work, build.executable.trimStart('/')) + val inside = runCatching { declared.canonicalPath.startsWith(work.canonicalPath + File.separator) }.getOrDefault(false) + if (inside && declared.isFile) return declared.relativeTo(work).path + } + return StoreExe.pick(work, hint?.ifBlank { null } ?: build.filename.substringBeforeLast('.').ifBlank { null }, item.title) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt new file mode 100644 index 0000000000..e5f69d4f19 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.mergeItems +import java.net.URLEncoder +import java.util.concurrent.atomic.AtomicBoolean + +internal object GameJoltLibrary { + private const val MAX_PAGES = 20 + private const val THROTTLE_MS = 10 * 60 * 1000L + + private val running = AtomicBoolean(false) + @Volatile private var syncedAt = 0L + + fun sync(context: Context, force: Boolean) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + try { + val cookies = GameJoltAuth.cookies(app) + val name = GameJoltAuth.username(app) + if (cookies.isBlank() || name.isBlank()) { + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems[Store.GAMEJOLT] = app.getString(R.string.stores_sync_sign_in) + } + return + } + val have = StoresState.library[Store.GAMEJOLT].orEmpty() + if (!force && have.isNotEmpty() && System.currentTimeMillis() - syncedAt < THROTTLE_MS) return + if (have.isEmpty()) StoresState.post { StoresState.status[Store.GAMEJOLT] = app.getString(R.string.stores_sync_game_list) } + val items = games(app, "/web/library/games/owned/@${URLEncoder.encode(name, "UTF-8")}", true) + if (items == null) { + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems[Store.GAMEJOLT] = app.getString(R.string.stores_sync_failed) + } + return + } + syncedAt = System.currentTimeMillis() + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems.remove(Store.GAMEJOLT) + StoresState.library[Store.GAMEJOLT] = mergeItems(StoresState.library[Store.GAMEJOLT], items) + } + StoresState.logLine("Game Jolt: ${items.size} owned games") + } finally { + running.set(false) + } + } + + fun reset() { + syncedAt = 0L + } + + fun games(context: Context, path: String, owned: Boolean): List? { + val cookies = GameJoltAuth.cookies(context) + val out = ArrayList() + val seen = HashSet() + for (page in 1..MAX_PAGES) { + val answer = GameJoltApi.get(if (page == 1) path else "$path?page=$page", cookies) + if (!answer.ok) return if (page == 1) null else out + val batch = GameJoltCatalog.items(answer.payload?.optJSONArray("games"), owned).filter { seen.add(it.id) } + if (batch.isEmpty()) break + out.addAll(batch) + val total = answer.payload?.optInt("totalGamesCount") ?: 0 + if (total in 1..out.size) break + } + return out + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt new file mode 100644 index 0000000000..e8a547ed2b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.net.Uri +import android.util.Log +import android.webkit.CookieManager +import android.webkit.WebView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.WebCookies + +internal class GameJoltLogin(override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = GameJoltApi.LOGIN + + override fun isRedirect(url: String): Boolean { + val uri = Uri.parse(url) + if (uri.host != HOST && uri.host != "www.$HOST") return false + val path = uri.path.orEmpty() + return AUTH_PATHS.none { path == it || path.startsWith("$it/") } + } + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(listOf(GameJoltApi.SITE), HOST, listOf("/")) { done() } } + .onFailure { + Log.w(TAG, "could not clear the previous web sign-in: ${it.javaClass.simpleName}") + done() + } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? { + val manager = CookieManager.getInstance() + manager.flush() + val cookies = manager.getCookie(GameJoltApi.SITE).orEmpty() + if (cookies.isBlank()) { + Log.w(TAG, "no cookies after the sign-in redirect") + return activity.getString(R.string.stores_login_error_verification) + } + val answer = GameJoltApi.get("/web/search/games?q=a", cookies) + val user = answer.user + Log.d(TAG, "verify: code=${answer.code} cookies=${cookies.split(';').joinToString(",") { it.substringBefore('=').trim() }} userKeys=${user?.keys()?.asSequence()?.joinToString(",").orEmpty()}") + if (user == null || user.optLong("id") <= 0L) return activity.getString(R.string.stores_login_error_verification) + return try { + GameJoltAuth.save(activity, cookies, user) + null + } catch (e: Exception) { + Log.w(TAG, "saving the sign-in failed: ${e.javaClass.simpleName}") + activity.getString(R.string.stores_login_error_generic) + } + } + + companion object { + private const val TAG = "GameJoltLogin" + private const val HOST = "gamejolt.com" + private val AUTH_PATHS = listOf("/login", "/join", "/auth", "/forgot", "/terms", "/privacy", "/help", "/legal", "/site-api", "/x", "/oauth") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt new file mode 100644 index 0000000000..3790e3ea6a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.content.SharedPreferences + +object GameJoltPrefs { + const val FILE = "stores.gamejolt" + + @JvmStatic + fun get(context: Context): SharedPreferences = context.applicationContext.getSharedPreferences(FILE, Context.MODE_PRIVATE) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt new file mode 100644 index 0000000000..2986f0f7c4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONObject +import java.util.Locale + +internal object GameJoltPricing { + class Price(val final: String, val original: String, val discount: Int) + + fun of(sellable: JSONObject?): Price? { + val list = sellable?.optJSONArray("pricings") ?: return null + val entries = (0 until list.length()).mapNotNull { list.optJSONObject(it) }.filter { it.optLong("amount") > 0L } + val sale = entries.firstOrNull { it.optBoolean("promotional") } + val regular = entries.firstOrNull { !it.optBoolean("promotional") } + val now = sale ?: regular ?: return null + val was = if (sale != null && regular != null && regular.optLong("amount") > sale.optLong("amount")) regular else null + val percent = if (was == null) 0 else { + val before = was.optLong("amount") + (((before - now.optLong("amount")) * 100 + before / 2) / before).toInt() + } + return Price(format(now), was?.let(::format).orEmpty(), percent) + } + + private fun format(pricing: JSONObject): String { + val amount = String.format(Locale.US, "%.2f", pricing.optLong("amount") / 100.0) + val currency = pricing.optString("currency_code").takeIf { it.isNotBlank() && it != "null" && !it.equals("USD", ignoreCase = true) } + return if (currency == null) "$$amount" else "$amount $currency" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt new file mode 100644 index 0000000000..9b8b6a3642 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.widget.Toast +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONObject +import java.util.concurrent.atomic.AtomicBoolean + +internal class GameJoltUpdate(val buildId: String, val stamp: String, val filename: String, val replaced: Boolean) + +internal object GameJoltUpdates { + private const val KEY_AT = "updates_checked_at" + private const val KEY_FOUND = "updates_found" + private const val THROTTLE_MS = 6 * 60 * 60 * 1000L + private const val GAP_MS = 1_000L + + val available = mutableStateMapOf() + var checkingKey by mutableStateOf(null) + private set + + private val running = AtomicBoolean(false) + private val restored = AtomicBoolean(false) + @Volatile private var generation = 0 + + internal fun evaluate(builds: List?, buildId: String, packageId: String, version: String): GameJoltUpdate? { + if (builds == null || buildId.isBlank()) return null + val installable = builds.filter { it.installable } + val samePackage = installable.filter { it.packageId == packageId } + if (samePackage.isNotEmpty()) { + if (samePackage.any { it.id == buildId }) return null + val same = samePackage.firstOrNull { newer(it, buildId, version) } ?: return null + return GameJoltUpdate(same.id, same.stamp, same.filename, false) + } + val next = installable.firstOrNull() ?: return null + return if (next.id == buildId) null else GameJoltUpdate(next.id, next.stamp, next.filename, true) + } + + private fun newer(build: GameJoltBuild, buildId: String, version: String): Boolean { + val stamp = build.stamp.toLongOrNull() ?: 0L + val have = version.toLongOrNull() ?: 0L + if (stamp != have) return stamp > have + return (build.id.toLongOrNull() ?: 0L) > (buildId.toLongOrNull() ?: 0L) + } + + internal fun encode(found: Map): String = JSONObject().also { out -> + for ((key, u) in found) out.put(key, JSONObject().put("buildId", u.buildId).put("stamp", u.stamp).put("filename", u.filename).put("replaced", u.replaced)) + }.toString() + + internal fun decode(raw: String?): Map { + val json = runCatching { JSONObject(raw.orEmpty()) }.getOrNull() ?: return emptyMap() + val out = LinkedHashMap() + for (key in json.keys()) { + val u = json.optJSONObject(key) ?: continue + val id = u.optString("buildId") + if (id.isBlank()) continue + out[key] = GameJoltUpdate(id, u.optString("stamp"), u.optString("filename"), u.optBoolean("replaced")) + } + return out + } + + private fun restore(app: Context) { + if (!restored.compareAndSet(false, true)) return + val started = generation + val saved = decode(GameJoltPrefs.get(app).getString(KEY_FOUND, null)) + StoresState.post { + if (started != generation) return@post + for ((k, v) in saved) if (k !in available) available[k] = v + } + } + + private fun save(app: Context) { + GameJoltPrefs.get(app).edit().putString(KEY_FOUND, encode(available.toMap())).apply() + } + + private fun snapshot(game: InstalledStoreGame): Triple = + Triple(game.sidecar.installVersion, game.sidecar.extra["buildId"].orEmpty(), game.sidecar.extra["packageId"].orEmpty()) + + fun check(context: Context) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + val started = generation + Thread({ + try { + restore(app) + val prefs = GameJoltPrefs.get(app) + if (System.currentTimeMillis() - prefs.getLong(KEY_AT, 0L) < THROTTLE_MS) return@Thread + if (GameJoltAuth.cookies(app).isBlank()) return@Thread + val games = StoresState.installed.toList().filter { it.sidecar.store == Store.GAMEJOLT && it.sidecar.isInstalled } + val found = LinkedHashMap() + val answered = HashSet() + val seen = HashMap>() + var failed = false + games.forEachIndexed { i, game -> + if (i > 0) Thread.sleep(GAP_MS) + val extra = game.sidecar.extra + seen[game.key] = snapshot(game) + val builds = GameJoltBuilds.load(app, extra["gameId"].orEmpty().ifEmpty { game.sidecar.id }) + if (builds == null) failed = true + else { + answered += game.key + evaluate(builds, extra["buildId"].orEmpty(), extra["packageId"].orEmpty(), game.sidecar.installVersion)?.let { found[game.key] = it } + } + } + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + for (k in answered) { + val now = StoresState.installed.firstOrNull { it.key == k } ?: continue + if (seen[k] != snapshot(now)) continue + val u = found[k] + if (u != null) available[k] = u else available.remove(k) + } + save(app) + } + if (!failed && started == generation) prefs.edit().putLong(KEY_AT, System.currentTimeMillis()).apply() + StoresState.logLine("Game Jolt: checked ${games.size} installed games, ${found.size} with updates") + } finally { + running.set(false) + } + }, "gamejolt-updates").start() + } + + fun checkGame(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + if (checkingKey != null) return + checkingKey = game.key + val started = generation + val before = snapshot(game) + Thread({ + try { + val extra = game.sidecar.extra + val builds = GameJoltBuilds.load(app, extra["gameId"].orEmpty().ifEmpty { game.sidecar.id }) + val found = evaluate(builds, before.second, before.third, before.first) + StoresState.post { + if (started != generation) return@post + val now = StoresState.installed.firstOrNull { it.key == game.key } + if (builds != null && now != null && snapshot(now) == before) { + if (found != null) available[game.key] = found else available.remove(game.key) + save(app) + } + val text = when { + builds == null -> app.getString(R.string.stores_sync_failed) + found != null -> app.getString(R.string.stores_itch_updates_found, 1) + else -> app.getString(R.string.upd_current_status) + } + Toast.makeText(app, text, Toast.LENGTH_SHORT).show() + } + StoresState.logLine("Game Jolt: checked ${game.sidecar.title}, ${if (found != null) "update available" else "up to date"}") + } finally { + StoresState.post { checkingKey = null } + } + }, "gamejolt-update-check").start() + } + + fun start(context: Context, game: InstalledStoreGame, update: GameJoltUpdate) { + val app = context.applicationContext + if (StoresState.uninstalling.containsKey(game.key)) return + val root = game.folder.parentFile?.parentFile ?: return + val item = CatalogItem( + Store.GAMEJOLT, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, + isFree = game.sidecar.extra["paid"] != "1", owned = true, extra = game.sidecar.extra + ("buildId" to update.buildId), + ) + StoresState.install(app, item, root) + } + + fun applied(context: Context, key: String) { + val app = context.applicationContext + StoresState.post { + available.remove(key) + save(app) + } + } + + fun clear(context: Context) { + val app = context.applicationContext + generation++ + GameJoltPrefs.get(app).edit().remove(KEY_AT).remove(KEY_FOUND).apply() + StoresState.post { available.clear() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt index 3896091e3d..79b2725f1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt @@ -2,10 +2,9 @@ package com.droiddeck.launcher.stores.itch import android.content.Context import com.droiddeck.launcher.R -import com.droiddeck.launcher.runtime.GuestCommand -import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreArchiveUnpacker import com.droiddeck.launcher.stores.StoreExe import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreInstallRoot @@ -13,20 +12,10 @@ import com.droiddeck.launcher.stores.StoreInstalls import com.droiddeck.launcher.stores.StoreNet import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadStage -import org.apache.commons.compress.MemoryLimitException -import org.apache.commons.compress.archivers.sevenz.SevenZFile -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream -import org.apache.commons.compress.archivers.zip.ZipFile -import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream -import org.apache.commons.compress.compressors.xz.XZCompressorInputStream -import java.io.BufferedInputStream import java.io.File -import java.io.FileInputStream import java.io.FileOutputStream import java.net.HttpURLConnection import java.net.URL -import java.nio.file.Files import java.util.concurrent.atomic.AtomicBoolean internal class ItchInstaller( @@ -39,6 +28,7 @@ internal class ItchInstaller( private var updating = false private var previous: StoreGameSidecar? = null private val commit = Any() + private val unpacker = StoreArchiveUnpacker(app, cancelled, "itch.io", R.string.stores_itch_archive, R.string.stores_itch_extract_failed, "itch-unrar") override fun run(handle: DownloadQueue.JobHandle): String? { val key = ItchAuth.key(app) @@ -225,16 +215,17 @@ internal class ItchInstaller( work = if (updating) File(folder, ItchStaging.DIR) else folder if (updating && !patched) ItchStaging.delete(work) work.mkdirs() + unpacker.work = work if (resuming) clearPartialInstall() val exe = try { - if (!patched) unpack(archive, filename, handle) + if (!patched) unpacker.unpack(archive, filename, handle) val hint = filename.substringBeforeLast('.') var picked = StoreExe.pick(work, hint.ifBlank { null }, item.title) var passes = 0 while (picked.isBlank() && passes < 2 && !cancelled.get()) { val inner = ItchArchives.inner(work) ?: break handle.log("itch.io: no exe yet, unpacking ${inner.name}") - unpack(inner, inner.name, handle) + unpacker.unpack(inner, inner.name, handle) if (cancelled.get()) break inner.delete() picked = StoreExe.pick(work, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }, item.title) @@ -267,205 +258,5 @@ internal class ItchInstaller( return exe } - private fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { - when (val kind = ItchArchives.kind(archive, filename)) { - "zip" -> unzip(archive, handle) - "7z" -> try { - sevenZip(archive, handle) - } catch (e: MemoryLimitException) { - handle.log("itch.io: ${archive.name} needs more memory than the app has, unpacking it in the runtime") - unrar(archive, handle, kind) - } - "rar" -> unrar(archive, handle, kind) - "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) - "tar" -> untar(archive, null, handle) - "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) - else -> copy(archive, File(work, filename.ifBlank { "game" })) - } - } - - private fun target(name: String): File? { - val file = File(work, name.replace('\\', '/')) - val root = work.canonicalPath - val path = file.canonicalPath - return if (path == root || path.startsWith(root + File.separator)) file else null - } - - private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { - if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.stores_itch_archive, kind)) - val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null - else listOf(work.absolutePath) - fun bsdtar(args: List, onLine: (String) -> Unit) = - GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = "itch-unrar", extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> - if (!line.startsWith("proot ")) onLine(line) - } - var entries = 0L - bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } - var done = 0L - val tail = ArrayDeque() - val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> - if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { - if (tail.size == 5) tail.removeFirst() - tail.addLast(line) - } - } - if (cancelled.get()) return - if (code != 0) { - handle.log("itch.io: bsdtar exited $code: ${tail.joinToString(" | ")}") - throw IllegalStateException(app.getString(R.string.stores_itch_extract_failed, code)) - } - } - - private fun sevenZip(archive: File, handle: DownloadQueue.JobHandle) { - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() - Files.newByteChannel(archive.toPath()).use { channel -> - SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> - while (true) { - if (cancelled.get()) return - val entry = seven.nextEntry ?: break - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = seven.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - - private fun untar(archive: File, codec: String?, handle: DownloadQueue.JobHandle): Unit? { - val total = archive.length() - var written = 0L - var entries = 0 - val buffer = ByteArray(64 * 1024) - val opened = runCatching { - FileInputStream(archive).use { raw -> - val stream = when (codec) { - "gz" -> GzipCompressorInputStream(BufferedInputStream(raw)) - "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) - "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) - else -> BufferedInputStream(raw) - } - stream.use { input -> - TarArchiveInputStream(input).use { tar -> - while (true) { - if (cancelled.get()) return null - val entry = tar.nextEntry ?: break - entries++ - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return null - val read = tar.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - true - } - if (opened.isSuccess && entries > 0) return Unit - if (opened.isFailure && codec == null) throw opened.exceptionOrNull() ?: IllegalStateException("tar") - return null - } - - private fun single(archive: File, codec: String, handle: DownloadQueue.JobHandle) { - val name = archive.name.substringBeforeLast('.') - val file = target(name.ifBlank { "game" }) ?: throw IllegalStateException("archive") - file.parentFile?.mkdirs() - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - FileInputStream(archive).use { raw -> - val stream = when (codec) { - "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) - "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) - else -> GzipCompressorInputStream(BufferedInputStream(raw)) - } - stream.use { input -> - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - - private fun copy(source: File, target: File) { - target.parentFile?.mkdirs() - FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } - } - - private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - ZipFile.builder().setFile(archive).get().use { zip -> - for (entry in zip.entries) { - if (cancelled.get()) return - val target = target(entry.name) - if (target == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - target.mkdirs() - continue - } - target.parentFile?.mkdirs() - zip.getInputStream(entry).use { input -> - FileOutputStream(target).use { out -> - while (true) { - if (cancelled.get()) return - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - private companion object } 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 f40d82d391..eff9453d6a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -701,6 +701,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com StoreTheme(com.droiddeck.launcher.stores.Store.XBOX) { XboxStoreDialogs() } com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } + com.droiddeck.launcher.stores.StoresState.gameJoltPicking?.let { item -> StoreTheme(item.store) { GameJoltBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.gameJoltPicking = null } } } StepsLayer(screenAt) appToChooseDisplay?.let { app -> 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 f2f7d5ee93..f7efc043ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -98,6 +98,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLanguage import com.droiddeck.launcher.stores.StoreSizes import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.gamejolt.GameJoltApi import com.droiddeck.launcher.stores.battlenet.BattleNetInstall import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadState @@ -139,7 +140,7 @@ internal enum class GameTab { ABOUT, ACHIEVEMENTS, LAUNCH, SAVES, INSTALL } @Composable internal fun GameDetail( - key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, + key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, inStore: Boolean = false, ) { val narrow = LocalNarrowPane.current val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 @@ -218,6 +219,7 @@ internal fun GameDetail( if (!s.shortcutPicker) CompositionLocalProvider(LocalPillButtons provides true) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { if (installed != null && installed.sidecar.store == Store.ITCH) ItchCheckButton(installed) + if (installed != null && installed.sidecar.store == Store.GAMEJOLT) GameJoltCheckButton(installed) RemoveButton(title, game, installed, a) } } @@ -232,7 +234,7 @@ internal fun GameDetail( color = MaterialTheme.colorScheme.error, maxLines = 3, overflow = TextOverflow.Ellipsis, ) Spacer(Modifier.height(2.dp)) - GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked) } + GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked, inStore = inStore) } } } if (StoresMotion.heroLands) header() else Rise(1) { header() } @@ -382,7 +384,7 @@ private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) { @Composable internal fun GameActions( store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, - s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, + s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, inStore: Boolean = false, ) { val ctx = LocalContext.current val storeKey = if (store != null && id != null) "${store.id}:$id" else null @@ -409,10 +411,16 @@ internal fun GameActions( if (compactMenu) GameMoreMenu(game, a) else { FileButtons(game, a) GameShortcutMenu(game, a) - EditArtButton(game) } } if (store == Store.ITCH && installed != null) ItchUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GAMEJOLT && installed != null) GameJoltUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GAMEJOLT && installed != null) GameJoltVersionButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (inStore && store == Store.GAMEJOLT && installed != null) { + SecondaryButton(stringResource(R.string.stores_view_on, Store.GAMEJOLT.shortLabel)) { + openUrl(ctx, item?.storeUrl.orEmpty().ifBlank { GameJoltApi.pageUrl("game", installed.sidecar.id) }) + } + } if (store == Store.GOG && installed != null) GogMaintenanceActions(installed) if (store == Store.XBOX && id != null) XboxInstalledStream(id, game?.name ?: item?.title.orEmpty(), item) if (store == Store.XBOX && installed != null && id != null) { @@ -435,6 +443,7 @@ internal fun GameActions( } SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } } + if (game != null && !compactMenu) EditArtButton(game) } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -482,7 +491,7 @@ internal fun GameActions( } if (!item.accessible) SecondaryButton(buyLabel(item)) { openStoreUrl(ctx, item) } } - item != null && item.store == Store.ITCH && item.isFree -> { + item != null && (item.store == Store.ITCH || item.store == Store.GAMEJOLT) && item.isFree -> { InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt new file mode 100644 index 0000000000..96057ea1d7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt @@ -0,0 +1,157 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.runtime.Composable +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.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowse +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState +import com.droiddeck.launcher.stores.gamejolt.GameJoltQuery + +@Composable +internal fun GameJoltBrowseBar(showMature: Boolean) { + val ctx = LocalContext.current + val query = GameJoltBrowseState.query + var picking by remember { mutableStateOf(false) } + LaunchedEffect(Unit) { if (GameJoltBrowseState.items.isEmpty()) GameJoltBrowseState.more(ctx) } + fun toggle(set: Set, value: String): Set = if (value in set) set - value else set + value + Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + ChipRow { + BrowseDropdown(sectionLabel(query.section)) { first, close -> + GameJoltBrowse.sections.forEachIndexed { index, section -> + MenuItem(sectionLabel(section), query.section == section, focusRequester = if (index == 0) first else null) { + GameJoltBrowseState.choose(ctx, query.copy(section = section)) + close() + } + } + } + BrowseDropdown(priceLabel(query.price)) { first, close -> + GameJoltBrowse.prices.forEachIndexed { index, price -> + MenuItem(priceLabel(price), query.price == price, focusRequester = if (index == 0) first else null) { + GameJoltBrowseState.choose(ctx, query.copy(price = price)) + close() + } + } + } + val anyPlatform = stringResource(R.string.stores_itch_platform_any) + BrowseDropdown(browseSummary(GameJoltBrowse.systems.filter { it in query.os }.map { systemLabel(it) }, anyPlatform)) { first, _ -> + MenuItem(anyPlatform, query.os.isEmpty(), focusRequester = first) { GameJoltBrowseState.choose(ctx, query.copy(os = emptySet())) } + for (os in GameJoltBrowse.systems) MenuItem(systemLabel(os), os in query.os) { GameJoltBrowseState.choose(ctx, query.copy(os = toggle(query.os, os))) } + } + BrowseDropdown(browseSummary(GameJoltBrowse.browsers.filter { it in query.browser }.map { browserLabel(it) }, stringResource(R.string.stores_gamejolt_filter_browser))) { first, _ -> + GameJoltBrowse.browsers.forEachIndexed { index, browser -> + MenuItem(browserLabel(browser), browser in query.browser, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(browser = toggle(query.browser, browser))) } + } + } + val maturities = GameJoltBrowse.maturities.filter { showMature || it != "adult" } + BrowseDropdown(browseSummary(maturities.filter { it in query.maturity }.map { maturityLabel(it) }, stringResource(R.string.stores_gamejolt_filter_maturity))) { first, _ -> + maturities.forEachIndexed { index, maturity -> + MenuItem(maturityLabel(maturity), maturity in query.maturity, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(maturity = toggle(query.maturity, maturity))) } + } + } + BrowseDropdown(browseSummary(GameJoltBrowse.statuses.filter { it in query.status }.map { statusLabel(it) }, stringResource(R.string.stores_gamejolt_filter_status))) { first, _ -> + GameJoltBrowse.statuses.forEachIndexed { index, status -> + MenuItem(statusLabel(status), status in query.status, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(status = toggle(query.status, status))) } + } + } + val partners = stringResource(R.string.stores_gamejolt_partners) + BrowseDropdown(if (query.partners) partners else stringResource(R.string.stores_gamejolt_filter_partners)) { first, _ -> + MenuItem(partners, query.partners, focusRequester = first) { GameJoltBrowseState.choose(ctx, query.copy(partners = !query.partners)) } + } + } + ChipRow { + for (tag in query.tags) BrowseChip("$tag ✕", true) { GameJoltBrowseState.choose(ctx, query.copy(tags = query.tags - tag)) } + BrowseChip(stringResource(R.string.stores_itch_tag_add), false) { picking = true } + } + } + if (picking) TextEntryDialog( + stringResource(R.string.stores_itch_tag_title), "", number = false, confirm = stringResource(R.string.common_ok), + onSubmit = { value -> GameJoltBrowse.tagSlug(value).takeIf { it.isNotEmpty() }?.let { GameJoltBrowseState.choose(ctx, query.copy(tags = (query.tags + it).distinct())) } }, + onDismiss = { picking = false }, id = "gamejolt-tag", + ) +} + +@Composable +internal fun GameJoltLoadMore() { + val ctx = LocalContext.current + val count = GameJoltBrowseState.items.size + LaunchedEffect(Unit) { GameJoltBrowseState.more(ctx) } + if (GameJoltBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (GameJoltBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_dl_retry), false) { GameJoltBrowseState.more(ctx, retry = true) } + } + else if (!GameJoltBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_itch_load_more), false) { GameJoltBrowseState.more(ctx) } + } +} + +@Composable +private fun sectionLabel(section: String): String = stringResource( + when (section) { + GameJoltBrowse.SECTION_HOT -> R.string.stores_gamejolt_section_hot + GameJoltBrowse.SECTION_BEST -> R.string.stores_gamejolt_section_best + GameJoltBrowse.SECTION_NEW -> R.string.stores_gamejolt_section_new + else -> R.string.stores_gamejolt_section_featured + }, +) + +@Composable +private fun priceLabel(price: String): String = stringResource( + when (price) { + GameJoltBrowse.PRICE_FREE -> R.string.stores_itch_price_free + GameJoltBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + GameJoltBrowse.PRICE_PAID -> R.string.stores_itch_price_paid + GameJoltBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5 + GameJoltBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15 + GameJoltBrowse.PRICE_UNDER_30 -> R.string.stores_gamejolt_price_under_30 + else -> R.string.stores_itch_price_any + }, +) + +@Composable +private fun systemLabel(os: String): String = stringResource( + when (os) { + "windows" -> R.string.stores_itch_platform_windows + "mac" -> R.string.stores_itch_platform_macos + "linux" -> R.string.stores_itch_platform_linux + else -> R.string.stores_gamejolt_os_other + }, +) + +@Composable +private fun browserLabel(browser: String): String = when (browser) { + "html" -> "HTML" + "flash" -> "Flash" + else -> "Unity" +} + +@Composable +private fun maturityLabel(maturity: String): String = stringResource( + when (maturity) { + "everyone" -> R.string.stores_gamejolt_maturity_everyone + "teen" -> R.string.stores_gamejolt_maturity_teen + else -> R.string.stores_gamejolt_maturity_adult + }, +) + +@Composable +private fun statusLabel(status: String): String = stringResource( + when (status) { + "complete" -> R.string.stores_gamejolt_status_complete + else -> R.string.stores_gamejolt_status_early + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt new file mode 100644 index 0000000000..7e5f06600a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt @@ -0,0 +1,129 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +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.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.gamejolt.GameJoltApi +import com.droiddeck.launcher.stores.gamejolt.GameJoltBuild +import com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private const val CHOOSE = "choose" + +@Composable +internal fun GameJoltVersionButton(installed: InstalledStoreGame, enabled: Boolean) { + SecondaryButton(stringResource(R.string.stores_itch_pick_title), enabled = enabled) { + val sidecar = installed.sidecar + val paid = sidecar.extra["paid"] == "1" + StoresState.gameJoltPicking = CatalogItem( + store = Store.GAMEJOLT, id = sidecar.id, title = sidecar.title, imageUrl = sidecar.cover, isFree = !paid, + storeUrl = GameJoltApi.pageUrl("game", sidecar.id), + extra = mapOf("gameId" to (sidecar.extra["gameId"] ?: sidecar.id), CHOOSE to "1"), + ) + } +} + +@Composable +internal fun GameJoltBuildPicker(requested: CatalogItem, onDismiss: () -> Unit) { + val item = requested.copy(owned = requested.owned || StoresState.library[Store.GAMEJOLT].orEmpty().any { it.id == requested.id && it.owned }) + val ctx = LocalContext.current + val app = ctx.applicationContext + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var loaded by remember(requested) { mutableStateOf?>(null) } + var failed by remember(requested) { mutableStateOf(false) } + + val install: (GameJoltBuild) -> Unit = install@{ build -> + if (!shown.targetState) return@install + val tagged = item.copy( + extra = item.extra + mapOf("buildId" to build.id), + sizeBytes = build.size.takeIf { it > 0 } ?: item.sizeBytes, + ) + close() + StoresState.requestInstall(ctx, tagged) + } + + LaunchedEffect(requested) { + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val result = withContext(Dispatchers.IO) { GameJoltBuilds.load(app, gameId) } + if (result == null) { failed = true; return@LaunchedEffect } + loaded = result + if ((item.isFree || item.owned) && item.extra[CHOOSE] != "1" && shown.targetState) result.singleOrNull()?.takeIf { it.installable }?.let { install(it) } + } + + AppDialog(shown, close, "gameJoltBuilds", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(R.string.stores_itch_pick_title), close) + Text(item.title, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + val list = loaded + when { + failed -> Text(stringResource(R.string.stores_gamejolt_pick_failed), fontSize = 13.sp, color = colors.onSurfaceVariant) + list == null -> LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 8.dp)) + list.isEmpty() -> Text(stringResource(R.string.stores_itch_pick_none), fontSize = 13.sp, color = colors.onSurfaceVariant) + else -> Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + for (build in list) key(build.id) { BuildRow(item, build) { install(build) } } + } + } + } +} + +@Composable +private fun BuildRow(item: CatalogItem, build: GameJoltBuild, onInstall: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val linux = "linux" in build.platforms && !build.installable + val canInstall = build.installable && (item.isFree || item.owned) + val names = build.platforms.map { platformName(it) } + val detail = listOfNotNull( + names.joinToString(", "), + build.size.takeIf { it > 0 }?.let { formatBytes(it) }, + build.version.takeIf { it.isNotBlank() }, + ).joinToString(" · ") + ListRow(enabled = !linux, onClick = { if (canInstall) onInstall() else openStoreUrl(ctx, item) }) { + Column(Modifier.weight(1f)) { + Text(build.filename.ifBlank { build.packageTitle.ifBlank { item.title } }, fontSize = 13.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(detail, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val label = when { + canInstall -> stringResource(R.string.stores_install) + linux -> stringResource(R.string.stores_itch_build_linux_soon) + else -> stringResource(R.string.stores_gamejolt_build_open) + } + Text(label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +@Composable +private fun platformName(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_build_windows + "linux" -> R.string.stores_itch_build_linux + "osx" -> R.string.stores_itch_build_macos + "other" -> R.string.stores_gamejolt_os_other + else -> R.string.stores_itch_build_web + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt new file mode 100644 index 0000000000..c351495142 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt @@ -0,0 +1,61 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdate +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates + +@Composable +internal fun GameJoltCheckButton(installed: InstalledStoreGame) { + val ctx = LocalContext.current + IconAction(Icons.Filled.Refresh, stringResource(R.string.store_check_updates), "game:check-updates", enabled = GameJoltUpdates.checkingKey == null, frosted = true) { + GameJoltUpdates.checkGame(ctx, installed) + } +} + +@Composable +internal fun GameJoltUpdateButton(installed: InstalledStoreGame, enabled: Boolean) { + val ctx = LocalContext.current + val update = GameJoltUpdates.available[installed.key] ?: return + var asking by remember { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.common_update), enabled = enabled) { + if (update.replaced) asking = true else GameJoltUpdates.start(ctx, installed, update) + } + if (asking) GameJoltReplacedDialog(installed, update) { asking = false } +} + +@Composable +private fun GameJoltReplacedDialog(installed: InstalledStoreGame, update: GameJoltUpdate, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "gameJoltUpdate", wide = false, maxWidth = 460.dp) { + DialogTitleRow(installed.sidecar.title, close) + Text( + stringResource(R.string.stores_itch_update_replaced, update.filename.ifBlank { update.buildId }), + fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + PrimaryButton(stringResource(R.string.common_update)) { + close() + GameJoltUpdates.start(ctx, installed, update) + } + SecondaryButton(stringResource(R.string.common_cancel)) { close() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 276d131fee..fe65d598f4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -19,6 +20,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -27,6 +29,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -44,16 +47,29 @@ internal fun ItchBrowseBar() { var picking by remember { mutableStateOf(false) } Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { ChipRow { - for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) } - } - ChipRow { - for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) } - } - ChipRow { - BrowseChip(stringResource(R.string.stores_itch_platform_any), query.platforms.isEmpty()) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } - for (platform in ItchBrowse.platformNames) { - val on = platform in query.platforms - BrowseChip(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + BrowseDropdown(sortLabel(query.sort)) { first, close -> + ItchBrowse.sorts.forEachIndexed { index, sort -> + MenuItem(sortLabel(sort), query.sort == sort, focusRequester = if (index == 0) first else null) { + ItchBrowseState.choose(ctx, query.copy(sort = sort)) + close() + } + } + } + BrowseDropdown(priceLabel(query.price)) { first, close -> + ItchBrowse.prices.forEachIndexed { index, price -> + MenuItem(priceLabel(price), query.price == price, focusRequester = if (index == 0) first else null) { + ItchBrowseState.choose(ctx, query.copy(price = price)) + close() + } + } + } + val anyPlatform = stringResource(R.string.stores_itch_platform_any) + BrowseDropdown(browseSummary(ItchBrowse.platformNames.filter { it in query.platforms }.map { platformLabel(it) }, anyPlatform)) { first, _ -> + MenuItem(anyPlatform, query.platforms.isEmpty(), focusRequester = first) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } + for (platform in ItchBrowse.platformNames) { + val on = platform in query.platforms + MenuItem(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + } } } ChipRow { @@ -83,7 +99,7 @@ internal fun ItchLoadMore() { } @Composable -private fun ChipRow(content: @Composable () -> Unit) { +internal fun ChipRow(content: @Composable () -> Unit) { Row( horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).selectableGroup(), @@ -91,7 +107,22 @@ private fun ChipRow(content: @Composable () -> Unit) { } @Composable -private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { +internal fun BrowseDropdown(text: String, content: @Composable ColumnScope.(FocusRequester, () -> Unit) -> Unit) { + var expanded by remember { mutableStateOf(false) } + Box { + CompositionLocalProvider(LocalChipMinWidth provides 0.dp) { ValueChip(text, expanded) { expanded = !expanded } } + AnchoredMenu(expanded, onDismiss = { expanded = false }, compact = true, minWidth = 160.dp) { first -> content(first) { expanded = false } } + } +} + +internal fun browseSummary(labels: List, empty: String): String = when (labels.size) { + 0 -> empty + 1, 2 -> labels.joinToString(", ") + else -> "${labels.first()} +${labels.size - 1}" +} + +@Composable +internal fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val shape = RoundedCornerShape(8.dp) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 482aeb5a63..6550a2fd06 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -102,7 +102,8 @@ import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadStage import com.droiddeck.launcher.stores.download.DownloadState import com.droiddeck.launcher.stores.formatBytes -import com.droiddeck.launcher.stores.itch.ItchCollection +import com.droiddeck.launcher.stores.gamejolt.GameJoltCollections +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates import com.droiddeck.launcher.stores.itch.ItchCollections import com.droiddeck.launcher.stores.itch.ItchUpdates import com.droiddeck.launcher.stores.gog.GogMaintenance @@ -142,20 +143,20 @@ internal fun libraryEntries( return out.distinctBy { it.key } } -internal fun collectionEntries(all: List, items: List): List { +internal fun collectionEntries(all: List, items: List, store: Store = Store.ITCH): List { val keys = items.map { it.key }.toSet() - val itch = all.filter { it.source == Store.ITCH.id } - val have = itch.mapNotNull { it.storeKey }.toSet() - return itch.filter { it.storeKey in keys } + - items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), Store.ITCH.id, it.title, null, it, false) } + val own = all.filter { it.source == store.id } + val have = own.mapNotNull { it.storeKey }.toSet() + return own.filter { it.storeKey in keys } + + items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), store.id, it.title, null, it, false) } } internal fun installedFirst(entries: List): List = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal fun librarySources(entries: List, order: List): List = +internal fun librarySources(entries: List, order: List, always: Set = emptySet()): List = (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) - .filter { source -> entries.any { it.source == source } } + .filter { source -> source in always || entries.any { it.source == source } } internal object LibraryDisplay { val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) @@ -225,7 +226,11 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } var collectionShows by remember { mutableStateOf?>(null) } val setShowUninstalled = { show: Boolean -> - val picked = ItchCollections.selected.takeIf { LibraryView.source == Store.ITCH.id } + val picked = when (LibraryView.source) { + Store.ITCH.id -> ItchCollections.selected + Store.GAMEJOLT.id -> GameJoltCollections.selected + else -> null + } if (picked != null) collectionShows = picked to show else { showUninstalled = show @@ -233,21 +238,32 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } } val itchSignedIn = owned.containsKey(Store.ITCH) - val listed = librarySources(all, SessionPrefs.storesTabOrder(ctx)) - val sources = if (itchSignedIn && Store.ITCH.id !in listed) listed + Store.ITCH.id else listed + val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) + val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn }).toSet()) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL - LaunchedEffect(source, itchSignedIn) { if (source == Store.ITCH.id && itchSignedIn) { - ItchCollections.load(ctx) - ItchUpdates.check(ctx) - } } - val collection = if (source == Store.ITCH.id) ItchCollections.chosen() else null - val pool = if (collection == null) all else collectionEntries(all, ItchCollections.gamesOf(collection.id).orEmpty()) + LaunchedEffect(source, itchSignedIn, gameJoltSignedIn) { + if (source == Store.ITCH.id && itchSignedIn) { + ItchCollections.load(ctx) + ItchUpdates.check(ctx) + } + if (source == Store.GAMEJOLT.id && gameJoltSignedIn) { + GameJoltCollections.load(ctx) + GameJoltUpdates.check(ctx) + } + } + val collectionId = when (source) { + Store.ITCH.id -> ItchCollections.chosen()?.id + Store.GAMEJOLT.id -> GameJoltCollections.chosen()?.id + else -> null + } + val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } + val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) val matching = pool.filter { (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } - val listUninstalled = if (collection == null) showUninstalled else collectionShows?.takeIf { it.first == collection.id }?.second ?: true + val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true val candidates = if (listUninstalled) matching else matching.filter { it.installed } val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort @@ -332,7 +348,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (all.isEmpty() && open == null && !itchSignedIn) { + if (all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -453,7 +469,7 @@ private fun LibraryGrid( contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = source == Store.ITCH.id) } + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } @@ -514,7 +530,7 @@ private fun LazyGridScope.libraryGrid(entries: List, empty: Int, t @Composable private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, - showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Boolean, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Store?, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current @@ -532,7 +548,7 @@ private fun LibraryHeader( ) { DisplayButton() if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) - if (collections) CollectionsButton() + if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) GameFileFolderActions(s, a) @@ -725,7 +741,7 @@ internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?, showDownlo } } -private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available } == true || +private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available || it in GameJoltUpdates.available } == true || e.source == Store.GOG.id && (e.item?.id ?: e.game?.storeId)?.let { GogMaintenance.checks[it]?.state } == GogMaintenance.State.AVAILABLE @Composable @@ -863,16 +879,21 @@ private fun LibraryFilterButton(showUninstalled: Boolean?, onShowUninstalled: (B } @Composable -private fun CollectionsButton() { +private fun CollectionsButton(store: Store) { val pal = LocalPalette.current val ctx = LocalContext.current val title = stringResource(R.string.itch_collections) val all = stringResource(R.string.stores_tab_all) var at by remember { mutableStateOf(null) } + val gameJolt = store == Store.GAMEJOLT + val chosenTitle = if (gameJolt) GameJoltCollections.chosen()?.title else ItchCollections.chosen()?.title + val selectedId = if (gameJolt) GameJoltCollections.selected else ItchCollections.selected Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { - HeaderIconButton(title + " · " + (ItchCollections.chosen()?.title ?: all), CollectionsIcon, "itch-collections") { + HeaderIconButton(title + " · " + (chosenTitle ?: all), CollectionsIcon, "${store.id}-collections") { val from = at ?: return@HeaderIconButton - val choices = listOf(null) + ItchCollections.list + val choices = listOf?>(null) + if (gameJolt) GameJoltCollections.list.map { c -> + c.id to (c.title + (GameJoltCollections.gamesOf(c.id)?.let { " (" + it.size + ")" }.orEmpty())) + } else ItchCollections.list.map { c -> c.id to (c.title + " (" + c.count + ")") } Steps.ask(StepAsk( anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = choices.size, handle = { Icon(CollectionsIcon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, @@ -880,12 +901,12 @@ private fun CollectionsButton() { StepTitle(title) StepList { choices.forEachIndexed { i, c -> - val picked = c?.id == ItchCollections.selected + val picked = c?.first == selectedId StepChoice( - c?.let { it.title + " (" + it.count + ")" } ?: all, selected = picked, enabled = open, + c?.second ?: all, selected = picked, enabled = open, modifier = Modifier.fillMaxWidth().stepItem(i).then(if (picked) Modifier.focusRequester(first) else Modifier), ) { - ItchCollections.select(ctx, c?.id) + if (gameJolt) GameJoltCollections.select(ctx, c?.first) else ItchCollections.select(ctx, c?.first) Steps.fold() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index b389992cf6..df74bb5850 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -26,6 +26,7 @@ import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.size import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.stateDescription import androidx.compose.foundation.shape.CircleShape @@ -371,11 +372,12 @@ fun MenuItem( .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) .glideBorder(hot && enabled, RoundedCornerShape(8.dp), pal.signal) .alpha(if (enabled) 1f else 0.4f) + .semantics { selected = checked } .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) .padding(horizontal = 10.dp, vertical = 9.dp), ) { - Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f)) + Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f).clearAndSetSemantics {}) if (leading != null) { leading() Spacer(Modifier.width(8.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 40bfd22c4c..1d2aef9d6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -31,6 +31,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.AMAZON.id -> SourceColours(Color(0xFF3A2A0A), Color(0xFFFFC266), Color(0xFFFF9900)) Store.XBOX.id -> SourceColours(Color(0xFF17381B), Color(0xFFC6EDC2), Color(0xFF70C850)) Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) + Store.GAMEJOLT.id -> SourceColours(Color(0xFF232E00), Color(0xFFE3FF66), Color(0xFFCCFF00)) Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) @@ -45,6 +46,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.AMAZON.id -> Store.AMAZON.label Store.XBOX.id -> Store.XBOX.label Store.ITCH.id -> Store.ITCH.label + Store.GAMEJOLT.id -> Store.GAMEJOLT.label Store.BATTLENET.id -> Store.BATTLENET.label else -> stringResource(R.string.source_added) } 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 35c21173eb..f9e2ed798f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -130,6 +130,7 @@ import coil.compose.AsyncImage import com.droiddeck.launcher.R import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState import com.droiddeck.launcher.stores.itch.ItchBrowseState import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreTab @@ -389,7 +390,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } } }, - ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }) } + ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }, inStore = true) } } FlightLayer(hostAt) StoresMotion.step?.let { ask -> @@ -827,8 +828,10 @@ private fun Storefront( fun shown(i: CatalogItem) = s.storesShowMature || !i.mature || i.accessible fun shelf(l: List?) = l?.filter(::shown) LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } - val browsing = store == Store.ITCH && q.isEmpty() && ItchBrowseState.active - val browseItems = if (browsing) ItchBrowseState.items else emptyList() + val gameJolt = store == Store.GAMEJOLT + LaunchedEffect(gameJolt, s.storesShowMature) { if (gameJolt) GameJoltBrowseState.sync(ctx, s.storesShowMature) } + val browsing = q.isEmpty() && ((store == Store.ITCH && ItchBrowseState.active) || gameJolt) + val browseItems = if (!browsing) emptyList() else if (gameJolt) GameJoltBrowseState.items else ItchBrowseState.items val catalog = store == Store.BATTLENET && q.isEmpty() val visible = remember(found, library, shelves, q, s.storesShowMature, browsing, browseItems, catalog) { if (catalog) shelf(shelves?.trending) ?: emptyList() @@ -840,8 +843,10 @@ private fun Storefront( .filter { (it.title.lowercase().contains(q) || it.key in foundKeys) && shown(it) } } val nothing = stringResource(when { - browsing && ItchBrowseState.loading -> R.string.stores_shelves_loading - browsing && ItchBrowseState.failed -> R.string.stores_itch_browse_failed + browsing && gameJolt && GameJoltBrowseState.loading -> R.string.stores_shelves_loading + browsing && gameJolt && GameJoltBrowseState.failed -> R.string.stores_gamejolt_browse_failed + browsing && !gameJolt && ItchBrowseState.loading -> R.string.stores_shelves_loading + browsing && !gameJolt && ItchBrowseState.failed -> R.string.stores_itch_browse_failed catalog && shelves == null -> R.string.stores_shelves_loading else -> R.string.stores_nothing_matches }) @@ -857,7 +862,8 @@ private fun Storefront( val bareTab = if (searching) visible.isEmpty() else shelves == null || shelves.isEmpty val barLine = StoresState.status[store]?.takeIf { bareTab && syncCount(it) != null } val itchBar = store == Store.ITCH && q.isEmpty() - val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) + (if (catalog) 1 else 0) + val gameJoltBar = gameJolt && q.isEmpty() + val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar || gameJoltBar) 1 else 0) + (if (catalog) 1 else 0) val card: @Composable (CatalogItem) -> Unit = { item -> val first = if (searching) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true @@ -906,12 +912,14 @@ private fun Storefront( barLine?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } if (itchBar) item(key = "itch-browse-bar", span = { GridItemSpan(maxLineSpan) }) { ItchBrowseBar() } + if (gameJoltBar) item(key = "gamejolt-browse-bar", span = { GridItemSpan(maxLineSpan) }) { GameJoltBrowseBar(s.storesShowMature) } if (catalog) item(key = "catalog-label", span = { GridItemSpan(maxLineSpan) }) { Box(Modifier.padding(top = 10.dp)) { SectionLabel(stringResource(R.string.bnet_store)) } } if (searching) { storeGrid(visible, nothing, card) - if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } + if (browsing && gameJolt) item(key = "gamejolt-more", span = { GridItemSpan(maxLineSpan) }) { GameJoltLoadMore() } + else if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } } else item(key = "shelves", span = { GridItemSpan(maxLineSpan) }) { Column { Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) @@ -1147,6 +1155,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.AMAZON -> Color(0xFFFF9900) to Color(0xFFE07800) Store.XBOX -> Color(0xFF70C850) to Color(0xFF107C10) Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) + Store.GAMEJOLT -> Color(0xFFCCFF00) to Color(0xFFA3CC00) Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) null -> return base } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 98e2321e68..8ef0684fde 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3754,4 +3754,33 @@ إصلاح الملفات تحديث التثبيت اختيار + ليس في مكتبة Game Jolt الخاصة بك + لا يوجد تنزيل لنظام Windows لهذه اللعبة + لم يتم العثور على لعبة Windows في التنزيل + تعذر العثور على هذه اللعبة على Game Jolt + تعذّر تحميل الألعاب من Game Jolt + استجاب Game Jolt بـ HTTP %1$d + تعذر تحميل التنزيلات من Game Jolt + فتح على Game Jolt + أرشيفات %1$s غير مدعومة + تعذر استخراج التنزيل (رمز الخروج %1$d) + تعذر الوصول إلى Game Jolt + لم يوفر Game Jolt رابط تنزيل + مميزة + رائجة + الأفضل + جديدة + 30$ أو أقل + أخرى + لجميع الأعمار + المراهقون + للبالغين + مكتملة + وصول مبكر + ألعاب الشركاء + المتصفح + التصنيف العمري + الحالة + الشركاء + الألعاب المتابَعة 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 5a31def7b6..9cd7421dcc 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3616,4 +3616,33 @@ Reparar archivos Renovar la instalación Seleccionar + No está en tu biblioteca de Game Jolt + Este juego no tiene descarga para Windows + No se encontró un juego de Windows en la descarga + No se encontró este juego en Game Jolt + No se pudieron cargar los juegos de Game Jolt + Game Jolt respondió HTTP %1$d + No se pudieron cargar las descargas de Game Jolt + Abrir en Game Jolt + Los archivos %1$s no son compatibles + No se pudo extraer la descarga (salida %1$d) + No se pudo conectar con Game Jolt + Game Jolt no entregó un enlace de descarga + Destacados + Populares + Mejores + Nuevos + $30 o menos + Otros + Todas las edades + Adolescentes + Maduro + Completo + Acceso anticipado + Juegos de socios + Navegador + Clasificación + Estado + Socios + Juegos seguidos diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 4bca78ed5d..a8e1c9f743 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3606,4 +3606,33 @@ Поправка на файловете Обновяване на инсталацията Избор + Не е в библиотеката ви в Game Jolt + Няма изтегляне за Windows за тази игра + В изтеглянето не е намерена игра за Windows + Играта не беше намерена в Game Jolt + Игрите от Game Jolt не можаха да се заредят + Game Jolt отговори HTTP %1$d + Изтеглянията от Game Jolt не можаха да се заредят + Отваряне в Game Jolt + Архивите %1$s не се поддържат + Изтеглянето не можа да бъде разархивирано (код %1$d) + Game Jolt не може да бъде достигнат + Game Jolt не даде връзка за изтегляне + Препоръчани + Популярни + Най-добри + Нови + $30 или по-малко + Други + За всички възрасти + Тийнейджъри + За възрастни + Завършени + Ранен достъп + Игри на партньори + Браузър + Зрялост + Статус + Партньори + Следвани игри diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3a479c7551..b8b3382b2b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3680,4 +3680,33 @@ Opravit soubory Obnovit instalaci Vybrat + Není ve vaší knihovně Game Jolt + Pro tuto hru není ke stažení verze pro Windows + Ve stahování nebyla nalezena hra pro Windows + Tuto hru se na Game Jolt nepodařilo najít + Hry z Game Jolt se nepodařilo načíst + Game Jolt odpovědělo HTTP %1$d + Stahování z Game Jolt se nepodařilo načíst + Otevřít na Game Jolt + Archivy %1$s nejsou podporovány + Stažený soubor nelze rozbalit (kód %1$d) + Game Jolt není dostupný + Game Jolt neposkytl odkaz ke stažení + Doporučené + Populární + Nejlepší + Nové + 30 $ nebo méně + Jiné + Pro všechny věkové skupiny + Teenageři + Pro dospělé + Dokončeno + Předběžný přístup + Hry partnerů + Prohlížeč + Věkové hodnocení + Stav + Partneři + Sledované hry diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7ce1ae1d45..2d4082298e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3606,4 +3606,33 @@ Reparer filer Opdater installationen Vælg + Ikke i dit Game Jolt-bibliotek + Ingen Windows-download til dette spil + Der blev ikke fundet et Windows-spil i downloaden + Kunne ikke finde dette spil på Game Jolt + Kunne ikke hente spil fra Game Jolt + Game Jolt svarede HTTP %1$d + Kunne ikke indlæse downloads fra Game Jolt + Åbn på Game Jolt + %1$s-arkiver understøttes ikke + Downloaden kunne ikke udpakkes (kode %1$d) + Kunne ikke nå Game Jolt + Game Jolt gav ikke et downloadlink + Fremhævede + Populære + Bedste + Nye + $30 eller mindre + Andet + Alle aldre + Teenagere + Voksne + Færdige + Early access + Partnerspil + Browser + Modenhed + Status + Partnere + Fulgte spil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c2a250fb1a..8157b7e1ea 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3606,4 +3606,33 @@ Dateien reparieren Installation erneuern Auswählen + Nicht in deiner Game Jolt-Bibliothek + Kein Windows-Download für dieses Spiel + Im Download wurde kein Windows-Spiel gefunden + Dieses Spiel wurde auf Game Jolt nicht gefunden + Spiele von Game Jolt konnten nicht geladen werden + Game Jolt antwortete mit HTTP %1$d + Die Downloads von Game Jolt konnten nicht geladen werden + Auf Game Jolt öffnen + %1$s-Archive werden nicht unterstützt + Download konnte nicht entpackt werden (Code %1$d) + Game Jolt ist nicht erreichbar + Game Jolt hat keinen Download-Link geliefert + Empfohlen + Angesagt + Beste + Neu + 30 $ oder weniger + Andere + Alle Altersgruppen + Jugendliche + Erwachsene + Fertig + Early Access + Partnerspiele + Browser + Altersfreigabe + Status + Partner + Gefolgte Spiele diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 72d2b9356d..a627bc4168 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3606,4 +3606,33 @@ Επιδιόρθωση αρχείων Ανανέωση εγκατάστασης Επιλογή + Δεν είναι στη βιβλιοθήκη σας στο Game Jolt + Δεν υπάρχει λήψη για Windows για αυτό το παιχνίδι + Δεν βρέθηκε παιχνίδι Windows στη λήψη + Δεν βρέθηκε αυτό το παιχνίδι στο Game Jolt + Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το Game Jolt + Το Game Jolt απάντησε HTTP %1$d + Δεν ήταν δυνατή η φόρτωση των λήψεων από το Game Jolt + Άνοιγμα στο Game Jolt + Τα αρχεία %1$s δεν υποστηρίζονται + Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d) + Δεν ήταν δυνατή η σύνδεση με το Game Jolt + Το Game Jolt δεν έδωσε σύνδεσμο λήψης + Προτεινόμενα + Δημοφιλή + Καλύτερα + Νέα + 30$ ή λιγότερο + Άλλα + Όλες οι ηλικίες + Έφηβοι + Ενήλικες + Ολοκληρωμένα + Πρώιμη πρόσβαση + Παιχνίδια συνεργατών + Πρόγραμμα περιήγησης + Ωριμότητα + Κατάσταση + Συνεργάτες + Παιχνίδια που ακολουθείτε diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e084f25ead..a3247ba1cd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3643,4 +3643,33 @@ Reparar archivos Renovar la instalación Seleccionar + No está en tu biblioteca de Game Jolt + No hay descarga para Windows de este juego + No se ha encontrado un juego de Windows en la descarga + No se ha encontrado este juego en Game Jolt + No se pudieron cargar los juegos de Game Jolt + Game Jolt respondió HTTP %1$d + No se pudieron cargar las descargas de Game Jolt + Abrir en Game Jolt + Los archivos %1$s no son compatibles + No se ha podido extraer la descarga (código %1$d) + No se pudo conectar con Game Jolt + Game Jolt no proporcionó un enlace de descarga + Destacados + Populares + Mejores + Nuevos + 30 $ o menos + Otros + Todas las edades + Adolescentes + Adultos + Completo + Acceso anticipado + Juegos de socios + Navegador + Clasificación + Estado + Socios + Juegos seguidos diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index dc52bc46eb..a733c907c8 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3606,4 +3606,33 @@ Korjaa tiedostot Päivitä asennus Valitse + Ei Game Jolt-kirjastossasi + Ei Windows-latausta tälle pelille + Latauksesta ei löytynyt Windows-peliä + Peliä ei löytynyt Game Joltista + Pelien lataaminen Game Joltista epäonnistui + Game Jolt vastasi HTTP %1$d + Latausten haku Game Joltista epäonnistui + Avaa Game Joltissa + %1$s-arkistot eivät ole tuettuja + Latausta ei voitu purkaa (koodi %1$d) + Game Joltiin ei saatu yhteyttä + Game Jolt ei antanut latauslinkkiä + Esittelyssä + Kuumat + Parhaat + Uudet + 30 $ tai alle + Muu + Kaikenikäisille + Nuoret + Aikuiset + Valmis + Ennakkojulkaisu + Kumppanien pelit + Selain + Ikärajat + Tila + Kumppanit + Seuratut pelit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8d52998f0c..a59fa6f5ca 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3643,4 +3643,33 @@ Réparer les fichiers Actualiser l\'installation Sélectionner + Absent de votre bibliothèque Game Jolt + Pas de téléchargement Windows pour ce jeu + Aucun jeu Windows trouvé dans le téléchargement + Ce jeu est introuvable sur Game Jolt + Impossible de charger les jeux de Game Jolt + Game Jolt a répondu HTTP %1$d + Impossible de charger les téléchargements depuis Game Jolt + Ouvrir sur Game Jolt + Les archives %1$s ne sont pas prises en charge + Impossible d\'extraire le téléchargement (code %1$d) + Impossible de joindre Game Jolt + Game Jolt n\'a pas fourni de lien de téléchargement + À la une + Tendances + Meilleurs + Nouveaux + 30 $ ou moins + Autre + Tous publics + Adolescents + Adultes + Terminé + Accès anticipé + Jeux partenaires + Navigateur + Classification + Statut + Partenaires + Jeux suivis diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 632e1a8066..c6325ed999 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3606,4 +3606,33 @@ फ़ाइलें रिपेयर करें इंस्टॉलेशन रिफ़्रेश करें चुनें + आपकी Game Jolt लाइब्रेरी में नहीं + इस गेम के लिए Windows डाउनलोड नहीं है + डाउनलोड में कोई Windows गेम नहीं मिला + यह गेम Game Jolt पर नहीं मिला + Game Jolt से गेम लोड नहीं हो सके + Game Jolt ने HTTP %1$d लौटाया + Game Jolt से डाउनलोड लोड नहीं हो सके + Game Jolt पर खोलें + %1$s आर्काइव समर्थित नहीं हैं + डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d) + Game Jolt तक नहीं पहुँचा जा सका + Game Jolt ने डाउनलोड लिंक नहीं दिया + फ़ीचर्ड + लोकप्रिय + सर्वश्रेष्ठ + नए + $30 या उससे कम + अन्य + सभी उम्र + किशोर + वयस्क + पूर्ण + अर्ली एक्सेस + पार्टनर गेम + ब्राउज़र + आयु वर्ग + स्थिति + पार्टनर + फ़ॉलो किए गए गेम diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 200d5410bf..f35b74f262 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3606,4 +3606,33 @@ Fájlok javítása Telepítés frissítése Kiválasztás + Nincs a Game Jolt-könyvtáradban + Ehhez a játékhoz nincs Windows-letöltés + A letöltésben nem található Windows-játék + A játék nem található a Game Jolt-on + Nem sikerült betölteni a játékokat a Game Jolt-ról + A Game Jolt HTTP %1$d választ adott + A letöltések betöltése a Game Jolt-ról nem sikerült + Megnyitás a Game Jolt-on + A(z) %1$s archívumok nem támogatottak + A letöltés nem bontható ki (kód: %1$d) + A Game Jolt nem érhető el + A Game Jolt nem adott letöltési hivatkozást + Kiemelt + Népszerű + Legjobb + Új + 30 $ vagy kevesebb + Egyéb + Minden korosztály + Tinédzserek + Felnőtt + Kész + Korai hozzáférés + Partnerjátékok + Böngésző + Korhatár + Állapot + Partnerek + Követett játékok diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8f1b2d4f64..90d529218a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3578,4 +3578,33 @@ Perbaiki file Segarkan instalasi Pilih + Tidak ada di pustaka Game Jolt Anda + Tidak ada unduhan Windows untuk game ini + Tidak ada game Windows di unduhan + Game ini tidak ditemukan di Game Jolt + Tidak dapat memuat game dari Game Jolt + Game Jolt menjawab HTTP %1$d + Tidak dapat memuat unduhan dari Game Jolt + Buka di Game Jolt + Arsip %1$s tidak didukung + Tidak dapat mengekstrak unduhan (kode %1$d) + Tidak dapat menghubungi Game Jolt + Game Jolt tidak memberikan tautan unduhan + Unggulan + Sedang tren + Terbaik + Baru + $30 atau kurang + Lainnya + Semua umur + Remaja + Dewasa + Selesai + Akses awal + Game mitra + Peramban + Klasifikasi usia + Status + Mitra + Game yang diikuti diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index eef6c71a96..2a0664db65 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3643,4 +3643,33 @@ Ripara file Aggiorna installazione Seleziona + Non è nella tua libreria Game Jolt + Nessun download per Windows di questo gioco + Nessun gioco Windows trovato nel download + Gioco non trovato su Game Jolt + Impossibile caricare i giochi da Game Jolt + Game Jolt ha risposto HTTP %1$d + Impossibile caricare i download da Game Jolt + Apri su Game Jolt + Gli archivi %1$s non sono supportati + Impossibile estrarre il download (codice %1$d) + Impossibile raggiungere Game Jolt + Game Jolt non ha fornito un link di download + In evidenza + Di tendenza + Migliori + Nuovi + 30 $ o meno + Altro + Per tutti + Adolescenti + Adulti + Completo + Accesso anticipato + Giochi dei partner + Browser + Classificazione + Stato + Partner + Giochi seguiti diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4dfbf1888c..ed27707c11 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3578,4 +3578,33 @@ ファイルを修復 インストールを更新 選択 + Game Jolt ライブラリにありません + このゲームには Windows 版のダウンロードがありません + ダウンロードに Windows 版のゲームが見つかりません + Game Jolt でこのゲームが見つかりませんでした + Game Jolt のゲームを読み込めませんでした + Game Jolt が HTTP %1$d を返しました + Game Jolt からダウンロードを読み込めませんでした + Game Jolt で開く + %1$s 形式のアーカイブには対応していません + ダウンロードを展開できませんでした (終了コード %1$d) + Game Jolt に接続できませんでした + Game Jolt がダウンロードリンクを提供しませんでした + 注目 + 人気急上昇 + ベスト + 新着 + 30ドル以下 + その他 + 全年齢 + ティーン + 成人向け + 完成 + アーリーアクセス + パートナーのゲーム + ブラウザ + 対象年齢 + ステータス + パートナー + フォロー中のゲーム diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 84502f7e7b..821641cab2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3578,4 +3578,33 @@ 파일 복구 설치 새로 고침 선택 + Game Jolt 라이브러리에 없습니다 + 이 게임의 Windows 다운로드가 없습니다 + 다운로드에서 Windows 게임을 찾을 수 없습니다 + Game Jolt에서 이 게임을 찾을 수 없습니다 + Game Jolt에서 게임을 불러오지 못했습니다 + Game Jolt가 HTTP %1$d을(를) 반환했습니다 + Game Jolt에서 다운로드를 불러오지 못했습니다 + Game Jolt에서 열기 + %1$s 압축 파일은 지원하지 않습니다 + 다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d) + Game Jolt에 연결할 수 없습니다 + Game Jolt에서 다운로드 링크를 제공하지 않았습니다 + 추천 + 인기 + 베스트 + 신규 + $30 이하 + 기타 + 전체 이용가 + 청소년 + 성인 + 완성 + 앞서 해보기 + 파트너 게임 + 브라우저 + 연령 등급 + 상태 + 파트너 + 팔로우한 게임 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index bdae3d8784..1d2b2ff463 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3578,4 +3578,33 @@ Baik pulih fail Segar semula pemasangan Pilih + Tiada dalam pustaka Game Jolt anda + Tiada muat turun Windows untuk permainan ini + Tiada permainan Windows ditemui dalam muat turun + Permainan ini tidak ditemui di Game Jolt + Tidak dapat memuatkan permainan daripada Game Jolt + Game Jolt menjawab HTTP %1$d + Tidak dapat memuatkan muat turun daripada Game Jolt + Buka di Game Jolt + Arkib %1$s tidak disokong + Tidak dapat mengekstrak muat turun (kod %1$d) + Tidak dapat menghubungi Game Jolt + Game Jolt tidak memberikan pautan muat turun + Pilihan + Hangat + Terbaik + Baharu + $30 atau kurang + Lain-lain + Semua peringkat umur + Remaja + Dewasa + Siap + Akses awal + Permainan rakan kongsi + Pelayar + Kematangan + Status + Rakan kongsi + Permainan diikuti diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f21e994d70..c0ecc73a29 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3606,4 +3606,33 @@ Reparer filer Oppdater installasjonen Velg + Ikke i Game Jolt-biblioteket ditt + Ingen Windows-nedlasting for dette spillet + Fant ikke noe Windows-spill i nedlastingen + Fant ikke dette spillet på Game Jolt + Kunne ikke laste spill fra Game Jolt + Game Jolt svarte HTTP %1$d + Kunne ikke laste inn nedlastingene fra Game Jolt + Åpne på Game Jolt + %1$s-arkiver støttes ikke + Kunne ikke pakke ut nedlastingen (kode %1$d) + Kunne ikke nå Game Jolt + Game Jolt ga ingen nedlastingslenke + Fremhevet + Populære + Beste + Nye + $30 eller mindre + Annet + Alle aldre + Tenåringer + Voksne + Ferdig + Early access + Partnerspill + Nettleser + Aldersgrense + Status + Partnere + Fulgte spill diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9eba9f0047..576631973c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3606,4 +3606,33 @@ Bestanden repareren Installatie vernieuwen Kiezen + Niet in je Game Jolt-bibliotheek + Geen Windows-download voor dit spel + Geen Windows-game gevonden in de download + Deze game is niet gevonden op Game Jolt + Games van Game Jolt konden niet worden geladen + Game Jolt antwoordde HTTP %1$d + De downloads van Game Jolt konden niet worden geladen + Openen op Game Jolt + %1$s-archieven worden niet ondersteund + Download kan niet worden uitgepakt (code %1$d) + Game Jolt is niet bereikbaar + Game Jolt gaf geen downloadlink + Uitgelicht + Populair + Beste + Nieuw + $30 of minder + Overig + Alle leeftijden + Tieners + Volwassenen + Voltooid + Early access + Partnerspellen + Browser + Leeftijdsklasse + Status + Partners + Gevolgde games diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 92941eeaf3..93b8a830ed 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3680,4 +3680,33 @@ Napraw pliki Odśwież instalację Wybierz + Nie ma go w Twojej bibliotece Game Jolt + Brak wersji na Windows dla tej gry + W pobranych plikach nie znaleziono gry na Windows + Nie znaleziono tej gry w Game Jolt + Nie udało się wczytać gier z Game Jolt + Game Jolt odpowiedziało HTTP %1$d + Nie udało się wczytać plików z Game Jolt + Otwórz w Game Jolt + Archiwa %1$s nie są obsługiwane + Nie można rozpakować pobranego pliku (kod %1$d) + Nie można połączyć się z Game Jolt + Game Jolt nie podał linku do pobrania + Polecane + Na czasie + Najlepsze + Nowe + 30 $ lub mniej + Inne + Dla wszystkich + Nastolatki + Dla dorosłych + Ukończone + Wczesny dostęp + Gry partnerów + Przeglądarka + Kategoria wiekowa + Status + Partnerzy + Obserwowane gry diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ac8eac1e03..5640c1c578 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3643,4 +3643,33 @@ Reparar ficheiros Renovar instalação Selecionar + Não está na sua biblioteca do Game Jolt + Sem transferência para Windows deste jogo + Não foi encontrado nenhum jogo para Windows na transferência + Não foi possível encontrar este jogo no Game Jolt + Não foi possível carregar os jogos do Game Jolt + O Game Jolt respondeu HTTP %1$d + Não foi possível carregar as transferências do Game Jolt + Abrir no Game Jolt + Ficheiros %1$s não são suportados + Não foi possível extrair a transferência (código %1$d) + Não foi possível aceder ao Game Jolt + O Game Jolt não forneceu uma ligação de transferência + Em destaque + Em alta + Melhores + Novos + 30 $ ou menos + Outros + Todas as idades + Adolescentes + Adulto + Completo + Acesso antecipado + Jogos de parceiros + Navegador + Classificação + Estado + Parceiros + Jogos seguidos diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b3d20eb86b..fa704f1e34 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3643,4 +3643,33 @@ Reparar arquivos Renovar instalação Selecionar + Não está na sua biblioteca do Game Jolt + Sem download para Windows deste jogo + Nenhum jogo para Windows encontrado no download + Não foi possível encontrar este jogo no Game Jolt + Não foi possível carregar os jogos do Game Jolt + O Game Jolt respondeu HTTP %1$d + Não foi possível carregar os downloads do Game Jolt + Abrir no Game Jolt + Arquivos %1$s não são suportados + Não foi possível extrair o download (código %1$d) + Não foi possível acessar o Game Jolt + O Game Jolt não forneceu um link de download + Em destaque + Em alta + Melhores + Novos + US$ 30 ou menos + Outros + Todas as idades + Adolescentes + Adulto + Completo + Acesso antecipado + Jogos de parceiros + Navegador + Classificação + Status + Parceiros + Jogos seguidos diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 0ad675136f..fafe91aab3 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3643,4 +3643,33 @@ Repară fișierele Reîmprospătează instalarea Selectează + Nu este în biblioteca ta Game Jolt + Nu există descărcare pentru Windows la acest joc + Nu s-a găsit niciun joc Windows în descărcare + Jocul nu a fost găsit pe Game Jolt + Nu s-au putut încărca jocurile de pe Game Jolt + Game Jolt a răspuns HTTP %1$d + Descărcările de pe Game Jolt nu au putut fi încărcate + Deschide pe Game Jolt + Arhivele %1$s nu sunt acceptate + Descărcarea nu a putut fi extrasă (cod %1$d) + Nu s-a putut contacta Game Jolt + Game Jolt nu a oferit un link de descărcare + Recomandate + În tendințe + Cele mai bune + Noi + 30 $ sau mai puțin + Altele + Toate vârstele + Adolescenți + Adulți + Finalizat + Acces anticipat + Jocuri partenere + Browser + Maturitate + Stare + Parteneri + Jocuri urmărite diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 17df27216a..d31b5b54ab 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3680,4 +3680,33 @@ Восстановить файлы Обновить установку Выбрать + Нет в вашей библиотеке Game Jolt + Для этой игры нет загрузки для Windows + В загрузке не найдена игра для Windows + Не удалось найти эту игру на Game Jolt + Не удалось загрузить игры с Game Jolt + Game Jolt ответил HTTP %1$d + Не удалось загрузить список файлов с Game Jolt + Открыть на Game Jolt + Архивы %1$s не поддерживаются + Не удалось распаковать загрузку (код %1$d) + Не удалось связаться с Game Jolt + Game Jolt не предоставил ссылку для скачивания + Рекомендуемые + Популярные + Лучшие + Новые + 30 $ или дешевле + Другое + Для всех возрастов + Подростки + Для взрослых + Завершена + Ранний доступ + Игры партнёров + Браузер + Возрастной рейтинг + Статус + Партнёры + Отслеживаемые игры diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 946ce4fc41..645c25857d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3606,4 +3606,33 @@ Reparera filer Uppdatera installationen Välj + Inte i ditt Game Jolt-bibliotek + Ingen Windows-nedladdning för det här spelet + Inget Windows-spel hittades i nedladdningen + Spelet hittades inte på Game Jolt + Det gick inte att läsa in spel från Game Jolt + Game Jolt svarade HTTP %1$d + Det gick inte att läsa in nedladdningarna från Game Jolt + Öppna på Game Jolt + %1$s-arkiv stöds inte + Det gick inte att packa upp nedladdningen (kod %1$d) + Det gick inte att nå Game Jolt + Game Jolt gav ingen nedladdningslänk + Utvalda + Populära + Bästa + Nya + $30 eller mindre + Övrigt + Alla åldrar + Tonåringar + Vuxna + Färdigt + Tidig åtkomst + Partnerspel + Webbläsare + Åldersgräns + Status + Partner + Följda spel diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 30e69f2e71..41318ab7c5 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3578,4 +3578,33 @@ ซ่อมแซมไฟล์ รีเฟรชการติดตั้ง เลือก + ไม่มีในคลัง Game Jolt ของคุณ + เกมนี้ไม่มีการดาวน์โหลดสำหรับ Windows + ไม่พบเกม Windows ในไฟล์ที่ดาวน์โหลด + ไม่พบเกมนี้บน Game Jolt + โหลดเกมจาก Game Jolt ไม่ได้ + Game Jolt ตอบกลับ HTTP %1$d + โหลดรายการดาวน์โหลดจาก Game Jolt ไม่ได้ + เปิดบน Game Jolt + ไม่รองรับไฟล์ %1$s + แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d) + ไม่สามารถเชื่อมต่อ Game Jolt ได้ + Game Jolt ไม่ได้ให้ลิงก์ดาวน์โหลด + แนะนำ + มาแรง + ยอดนิยมสูงสุด + ใหม่ + $30 หรือต่ำกว่า + อื่น ๆ + ทุกวัย + วัยรุ่น + ผู้ใหญ่ + เสร็จสมบูรณ์ + เข้าถึงก่อนใคร + เกมของพาร์ตเนอร์ + เบราว์เซอร์ + ระดับเนื้อหา + สถานะ + พาร์ตเนอร์ + เกมที่ติดตาม diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a1f6116e09..e8347fab3d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3606,4 +3606,33 @@ Dosyaları onar Kurulumu yenile Seç + Game Jolt kütüphanenizde yok + Bu oyunun Windows indirmesi yok + İndirmede Windows oyunu bulunamadı + Bu oyun Game Jolt\'ta bulunamadı + Game Jolt oyunları yüklenemedi + Game Jolt HTTP %1$d yanıtı verdi + İndirmeler Game Jolt\'tan yüklenemedi + Game Jolt\'ta aç + %1$s arşivleri desteklenmiyor + İndirme ayıklanamadı (kod %1$d) + Game Jolt\'a ulaşılamadı + Game Jolt bir indirme bağlantısı vermedi + Öne çıkanlar + Popüler + En iyiler + Yeni + 30 $ veya daha az + Diğer + Her yaş + Gençler + Yetişkin + Tamamlandı + Erken erişim + Ortak oyunlar + Tarayıcı + Yaş sınırı + Durum + Ortaklar + Takip edilen oyunlar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e901908359..d4aa241f24 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3680,4 +3680,33 @@ Відновити файли Оновити встановлення Вибрати + Немає у вашій бібліотеці Game Jolt + Для цієї гри немає завантаження для Windows + У завантаженні не знайдено гри для Windows + Не вдалося знайти цю гру на Game Jolt + Не вдалося завантажити ігри з Game Jolt + Game Jolt відповів HTTP %1$d + Не вдалося завантажити список файлів з Game Jolt + Відкрити на Game Jolt + Архіви %1$s не підтримуються + Не вдалося розпакувати завантаження (код %1$d) + Не вдалося зв\'язатися з Game Jolt + Game Jolt не надав посилання для завантаження + Рекомендовані + Популярні + Найкращі + Нові + 30 $ або менше + Інше + Для всіх віків + Підлітки + Для дорослих + Завершена + Рання версія + Ігри партнерів + Браузер + Вікова категорія + Статус + Партнери + Ігри, за якими ви стежите diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2a7c052951..a93d71508c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3578,4 +3578,33 @@ Sửa tệp Làm mới bản cài Chọn + Không có trong thư viện Game Jolt của bạn + Không có bản tải Windows cho game này + Không tìm thấy trò chơi Windows trong bản tải xuống + Không tìm thấy trò chơi này trên Game Jolt + Không tải được game từ Game Jolt + Game Jolt trả về HTTP %1$d + Không thể tải danh sách tải xuống từ Game Jolt + Mở trên Game Jolt + Không hỗ trợ tệp %1$s + Không thể giải nén bản tải xuống (mã %1$d) + Không thể kết nối với Game Jolt + Game Jolt không cung cấp liên kết tải xuống + Nổi bật + Thịnh hành + Hay nhất + Mới + $30 trở xuống + Khác + Mọi lứa tuổi + Thanh thiếu niên + Người lớn + Hoàn chỉnh + Truy cập sớm + Game của đối tác + Trình duyệt + Độ tuổi + Trạng thái + Đối tác + Game đang theo dõi diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 17aee27ba7..8808906445 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3578,4 +3578,33 @@ 修复文件 刷新安装 选择 + 不在你的 Game Jolt 库中 + 这个游戏没有 Windows 下载 + 下载内容中未找到 Windows 游戏 + 在 Game Jolt 上找不到这款游戏 + 无法从 Game Jolt 加载游戏 + Game Jolt 返回 HTTP %1$d + 无法从 Game Jolt 加载下载内容 + 在 Game Jolt 上打开 + 不支持 %1$s 压缩包 + 无法解压下载内容(代码 %1$d) + 无法连接到 Game Jolt + Game Jolt 未提供下载链接 + 精选 + 热门 + 最佳 + 最新 + 30 美元以下 + 其他 + 全年龄 + 青少年 + 成人 + 已完成 + 抢先体验 + 合作伙伴游戏 + 浏览器 + 内容分级 + 状态 + 合作伙伴 + 已关注的游戏 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ffb08a1189..095cb890c3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3578,4 +3578,33 @@ 修復檔案 重新整理安裝 選擇 + 不在你的 Game Jolt 收藏庫中 + 這個遊戲沒有 Windows 下載 + 下載內容中找不到 Windows 遊戲 + 在 Game Jolt 找不到這款遊戲 + 無法從 Game Jolt 載入遊戲 + Game Jolt 回應 HTTP %1$d + 無法從 Game Jolt 載入下載內容 + 在 Game Jolt 開啟 + 不支援 %1$s 壓縮檔 + 無法解壓下載內容(代碼 %1$d) + 無法連線至 Game Jolt + Game Jolt 沒有提供下載連結 + 精選 + 熱門 + 最佳 + 最新 + 30 美元或以下 + 其他 + 全年齡 + 青少年 + 成人 + 已完成 + 搶先體驗 + 合作夥伴遊戲 + 瀏覽器 + 內容分級 + 狀態 + 合作夥伴 + 已追蹤的遊戲 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f914d0eedb..56005e1ff8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3578,4 +3578,33 @@ 修復檔案 重新整理安裝 選取 + 不在你的 Game Jolt 收藏庫中 + 這個遊戲沒有 Windows 下載 + 下載內容中找不到 Windows 遊戲 + 在 Game Jolt 找不到這款遊戲 + 無法從 Game Jolt 載入遊戲 + Game Jolt 回應 HTTP %1$d + 無法從 Game Jolt 載入下載內容 + 在 Game Jolt 開啟 + 不支援 %1$s 壓縮檔 + 無法解壓縮下載內容(代碼 %1$d) + 無法連線至 Game Jolt + Game Jolt 未提供下載連結 + 精選 + 熱門 + 最佳 + 最新 + 30 美元或以下 + 其他 + 全年齡 + 青少年 + 成人 + 已完成 + 搶先體驗 + 合作夥伴遊戲 + 瀏覽器 + 內容分級 + 狀態 + 合作夥伴 + 已追蹤的遊戲 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbef6462a8..6f88608575 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3683,4 +3683,33 @@ %1$s and %2$d more Restart now Later + Not in your Game Jolt library + No Windows download for this game + No Windows game found in the download + Could not find this game on Game Jolt + Could not load games from Game Jolt + Game Jolt answered HTTP %1$d + Could not load the downloads from Game Jolt + Open on Game Jolt + Could not reach Game Jolt + Game Jolt did not give a download link + %1$s archives are not supported + Could not extract the download (exit %1$d) + Featured + Hot + Best + New + $30 or less + Other + All ages + Teen + Mature + Complete + Early access + Partner games + Browser + Maturity + Status + Partners + Followed games diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index 09cf7fc265..c368ca082b 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -298,4 +298,9 @@ class StoreInstallRootTest { assertFalse(StoreInstallRoot.insufficientSpace(1L, 1L)) assertFalse(StoreInstallRoot.insufficientSpace(0L, 0L)) } + + @Test fun itchKeepsTheFolderItsGamesWereInstalledInWhateverItsDisplayName() { + assertEquals("itch", StoreInstallRoot.storeDir(File("/games"), Store.ITCH).name) + assertEquals("Game Jolt", StoreInstallRoot.storeDir(File("/games"), Store.GAMEJOLT).name) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt new file mode 100644 index 0000000000..97b90c6da2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.junit.Assert.assertEquals +import org.junit.Test + +class GameJoltBrowseTest { + private fun qs(query: GameJoltQuery = GameJoltQuery(), page: Int = 1) = GameJoltBrowse.queryString(query, page) + + @Test fun theDefaultQueryAsksForTheFeaturedSectionByName() { + assertEquals("section=featured", qs()) + } + + @Test fun sectionsPriceAndPagesUseTheSiteNames() { + assertEquals("section=hot", qs(GameJoltQuery(section = GameJoltBrowse.SECTION_HOT))) + assertEquals("section=featured&f_price=5-less&page=3", qs(GameJoltQuery(price = GameJoltBrowse.PRICE_UNDER_5), 3)) + assertEquals("section=featured&f_price=free", qs(GameJoltQuery(price = GameJoltBrowse.PRICE_FREE))) + } + + @Test fun listFiltersKeepTheSiteOrderWhateverTheSelectionOrder() { + assertEquals("section=featured&f_os%5B%5D=windows&f_os%5B%5D=linux", qs(GameJoltQuery(os = setOf("linux", "windows")))) + assertEquals("section=featured&f_browser%5B%5D=html&f_maturity%5B%5D=everyone&f_status%5B%5D=complete&f_partners%5B%5D=partners", + qs(GameJoltQuery(browser = setOf("html"), maturity = setOf("everyone"), status = setOf("complete"), partners = true))) + } + + @Test fun devlogGamesAreNeverAskedFor() { + assertEquals(setOf("complete", "wip"), GameJoltBrowse.effective(GameJoltQuery(), true).status) + assertEquals(setOf("complete", "wip"), GameJoltBrowse.effective(GameJoltQuery(status = setOf("devlog")), true).status) + assertEquals(setOf("wip"), GameJoltBrowse.effective(GameJoltQuery(status = setOf("wip", "devlog")), false).status) + assertEquals("section=featured&f_status%5B%5D=complete&f_status%5B%5D=wip", qs(GameJoltBrowse.effective(GameJoltQuery(), true).copy(maturity = emptySet()))) + } + + @Test fun tagsAreSluggedAndRepeatable() { + assertEquals("co-op", GameJoltBrowse.tagSlug(" Co-Op ")) + assertEquals("section=featured&tag=action&tag=co-op", qs(GameJoltQuery(tags = listOf("Action", "co op")))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt new file mode 100644 index 0000000000..7f20f12fd7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltBuildsTest { + private fun build(id: Int, pkg: Int, release: Int, name: String, vararg flags: String) = JSONObject() + .put("id", id).put("game_package_id", pkg).put("game_release_id", release) + .put("primary_file", JSONObject().put("filename", name).put("filesize", 100)) + .also { b -> flags.forEach { b.put(it, true) } } + + private fun payload(vararg builds: JSONObject) = JSONObject() + .put("packages", JSONArray().put(JSONObject().put("id", 1).put("title", "Main"))) + .put("releases", JSONArray().put(JSONObject().put("id", 10).put("published_on", 100).put("version_number", "1.0")).put(JSONObject().put("id", 11).put("published_on", 200).put("version_number", "1.1"))) + .put("builds", JSONArray(builds.toList())) + .put("launchOptions", JSONArray()) + + @Test fun onlyTheNewestReleaseOfAPackageIsKept() { + val list = GameJoltBuilds.parse(payload(build(1, 1, 10, "old.zip", "os_windows"), build(2, 1, 11, "new.zip", "os_windows"))) + assertEquals(listOf("2"), list.map { it.id }) + assertEquals("1.1", list.first().version) + } + + @Test fun windowsBuildsAreInstallableAndSortFirst() { + val list = GameJoltBuilds.parse(payload(build(1, 1, 11, "game-linux.zip", "os_linux"), build(2, 1, 11, "game-win.zip", "os_windows"))) + assertEquals(listOf("2", "1"), list.map { it.id }) + assertTrue(list[0].installable) + assertFalse(list[1].installable) + } + + @Test fun aBuildWithoutAnOsFlagIsWeb() { + assertEquals(setOf("web"), GameJoltBuilds.platforms(JSONObject())) + assertEquals(setOf("windows", "osx"), GameJoltBuilds.platforms(JSONObject().put("os_windows", true).put("os_mac", true))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt new file mode 100644 index 0000000000..0e8e1d1ee4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltCollectionsTest { + @Test fun playlistsBecomeCollectionsByIdAndName() { + val list = JSONArray() + .put(JSONObject().put("id", 7).put("name", "test list")) + .put(JSONObject().put("id", 0).put("name", "no id")) + .put(JSONObject().put("id", 9).put("name", "")) + val parsed = GameJoltCollections.parse(list) + assertEquals(listOf("playlist:7"), parsed.map { it.id }) + assertEquals(listOf("test list"), parsed.map { it.title }) + } + + @Test fun eachCollectionHasItsOwnGameListEndpoint() { + assertEquals("/web/library/games/followed/@some+one", GameJoltCollections.path(GameJoltCollections.FOLLOWED, "some one")) + assertEquals("/web/library/games/playlist/7", GameJoltCollections.path("playlist:7", "x")) + assertNull(GameJoltCollections.path("playlist:abc", "x")) + assertNull(GameJoltCollections.path("other", "x")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt new file mode 100644 index 0000000000..48c2f85024 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltPricingTest { + private fun pricing(amount: Long, promotional: Boolean = false, currency: Any = JSONObject.NULL) = + JSONObject().put("amount", amount).put("promotional", promotional).put("currency_code", currency) + + private fun sellable(vararg pricings: JSONObject) = JSONObject().put("type", "paid").put("pricings", JSONArray(pricings.toList())) + + @Test fun aRegularPriceIsShownInDollars() { + val price = GameJoltPricing.of(sellable(pricing(99)))!! + assertEquals("$0.99", price.final) + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aPromotionalPriceBesideTheRegularOneIsASale() { + val price = GameJoltPricing.of(sellable(pricing(500), pricing(350, promotional = true)))!! + assertEquals("$3.50", price.final) + assertEquals("$5.00", price.original) + assertEquals(30, price.discount) + } + + @Test fun aPromotionalPriceAloneShowsNoDiscount() { + val price = GameJoltPricing.of(sellable(pricing(350, promotional = true)))!! + assertEquals("$3.50", price.final) + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aPromotionalPriceNotBelowTheRegularOneIsNotASale() { + val price = GameJoltPricing.of(sellable(pricing(500), pricing(500, promotional = true)))!! + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aGameWithoutPricingsHasNoPrice() { + assertNull(GameJoltPricing.of(sellable())) + assertNull(GameJoltPricing.of(null)) + } + + @Test fun anotherCurrencyIsNamed() { + assertEquals("1.50 EUR", GameJoltPricing.of(sellable(pricing(150, currency = "EUR")))!!.final) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt new file mode 100644 index 0000000000..109da6c362 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltUpdatesTest { + private fun build(id: String, pkg: String, stamp: String, windows: Boolean = true, name: String = "game.zip") = + GameJoltBuild(id, pkg, "Main", "1.0", name, 100L, stamp, if (windows) setOf("windows") else setOf("linux"), "", "") + + @Test fun aNewerReleaseOfTheSamePackageIsAnUpdate() { + val update = GameJoltUpdates.evaluate(listOf(build("20", "1", "200", name = "new.zip")), "10", "1", "100")!! + assertEquals("20", update.buildId) + assertEquals("new.zip", update.filename) + assertFalse(update.replaced) + } + + @Test fun theInstalledBuildIsNotAnUpdate() { + assertNull(GameJoltUpdates.evaluate(listOf(build("10", "1", "100")), "10", "1", "100")) + } + + @Test fun anOlderBuildIsNotAnUpdate() { + assertNull(GameJoltUpdates.evaluate(listOf(build("5", "1", "50")), "10", "1", "100")) + } + + @Test fun theSameReleaseTimeWithAHigherBuildIdIsAnUpdate() { + assertEquals("11", GameJoltUpdates.evaluate(listOf(build("11", "1", "100")), "10", "1", "100")?.buildId) + } + + @Test fun otherPackagesDoNotCount() { + assertEquals("30", GameJoltUpdates.evaluate(listOf(build("40", "2", "900"), build("30", "1", "300")), "10", "1", "100")?.buildId) + } + + @Test fun aRemovedPackageFallsBackToTheNewPreferredBuildAndSaysSo() { + val update = GameJoltUpdates.evaluate(listOf(build("40", "2", "900")), "10", "1", "100")!! + assertEquals("40", update.buildId) + assertTrue(update.replaced) + } + + @Test fun nonWindowsBuildsAreNeverOffered() { + assertNull(GameJoltUpdates.evaluate(listOf(build("40", "1", "900", windows = false)), "10", "1", "100")) + } + + @Test fun nothingToCompareMeansNoUpdate() { + assertNull(GameJoltUpdates.evaluate(null, "10", "1", "100")) + assertNull(GameJoltUpdates.evaluate(listOf(build("40", "1", "900")), "", "1", "100")) + } + + @Test fun foundUpdatesSurviveEncodingAndDropEntriesWithoutABuild() { + val saved = GameJoltUpdates.encode(mapOf("gamejolt:1" to GameJoltUpdate("20", "200", "new.zip", true))) + val back = GameJoltUpdates.decode(saved).getValue("gamejolt:1") + assertEquals("20", back.buildId) + assertEquals("200", back.stamp) + assertEquals("new.zip", back.filename) + assertTrue(back.replaced) + assertEquals(emptyMap(), GameJoltUpdates.decode("""{"gamejolt:1":{"stamp":"1"}}""")) + assertEquals(emptyMap(), GameJoltUpdates.decode("not json")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index d703d09bec..7674ab242d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -87,6 +87,11 @@ class LibraryEntriesTest { assertEquals(listOf("epic", "gog", "battlenet"), librarySources(entries, listOf("missing", "epic", "epic", "amazon"))) } + @Test fun aSignedInStoreWithNoGamesKeepsItsPlaceInTheStoreOrder() { + val entries = listOf("steam", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + assertEquals(listOf("steam", "xbox", "itch", "gamejolt"), librarySources(entries, listOf("xbox", "itch", "gamejolt"), setOf("itch", "gamejolt"))) + } + @Test fun gameKeysNameEitherAnAppOrAStoreProduct() { GameRef.parse("app:440").let { assertEquals(440, it.appId); assertNull(it.store) } GameRef.parse("app:-12").let { assertEquals(-12, it.appId) } diff --git a/docs/development/gamejolt-store.md b/docs/development/gamejolt-store.md new file mode 100644 index 0000000000..ae8ca0f456 --- /dev/null +++ b/docs/development/gamejolt-store.md @@ -0,0 +1,66 @@ +# Game Jolt store + +The Game Jolt Store tab mirrors the itch.io one: browse, search, game page, build picker, installs, library, collections and updates. + +## Sign-in + +Game Jolt shows the normal sign-in card until an account is signed in. Signing in opens +`StoreLoginActivity` on `https://gamejolt.com/login` (`GameJoltLogin`). The flow is not a token redirect: +Game Jolt is a single-page site, so `StoreLoginActivity.Client.doUpdateVisitedHistory` also reports +navigations, and any gamejolt.com page outside the sign-in, sign-up and legal paths counts as signed in. +`finish` reads the WebView cookies, asks `/web/search/games?q=a` for the top-level `user`, and stores +the cookie header and the user through `GameJoltAuth` (encrypted, `StoreAccounts`). The log names the +cookies and the user keys, never their values. + +## Data + +`GameJoltApi` talks to `https://gamejolt.com/site-api/web/...` with the stored cookies. Games come back as +`{payload, user}`; `GameJoltCatalog` turns a game into a `CatalogItem` (paid only when `sellable.type` is +`paid`). + +Browse queries (`GameJoltBrowse.queryString`): `section=` is always sent first (featured, hot, best, new). +Game Jolt answers 404 to any browse request without it, even an empty one. The rest are `tag=`, `f_price=`, +and `f_os[]`, `f_browser[]`, `f_maturity[]`, `f_status[]`, `f_partners[]`, `page=`. Every page logs its query, +status and game count. The filters are drop-down menus (`BrowseDropdown`, shared with the itch bar). Devlog games have no playable +copy, so the status filter only offers complete and early access, and a browse always asks for those two. With mature +content off, `adult` is stripped from the query, including a stored one. + +## Prices + +`GameJoltPricing.of` reads `sellable.pricings[]` (amounts in cents). The promotional entry is the current price +and the regular entry the original, only when the original is higher; the percent uses integer math. USD (or no +currency) formats as `$12.34`, another currency as `12.34 EUR`. `CatalogItem` carries `finalPrice`, +`originalPrice` and `discountPercent`, so tiles and the game page show prices and sale badges. + +## Library and collections + +`GameJoltLibrary.sync` fetches `/web/library/games/owned/@` (paged, at most every ten minutes, forced by +the refresh action) and merges the games into the store library as owned. `GameJoltCollections` lists the +read-only collections: followed games (`/web/library/games/followed/@`) and the account's playlists +(`/web/library/games/playlist/`). The Library page shows them through the same `CollectionsButton` as itch. +Ownership comes from `sellables[0].is_owned`; `packages[0].is_game_owner` is not reliable. Library chips list a store when it has games in +the list; a signed-in Itch.io or Game Jolt account keeps its chip, in store order, so its collections stay reachable. + +## Builds and installs + +`GameJoltBuilds.parse` reads the overview payload, keeps the newest release of each package and marks +Windows builds installable. The picker (`GameJoltBuildPicker`) installs Windows builds of free games and of paid games the account owns; +Linux builds say "Not supported yet" and everything else, including paid games not owned, opens the Game Jolt page. +`GameJoltInstaller` asks `builds/get-download-url/` for a signed link on every attempt, resumes with +`Range`, unpacks through `StoreArchiveUnpacker` (shared with itch) and picks the launch option or an exe. +An update downloads again and merges through `ItchStaging`, like itch. + +## Updates + +`GameJoltUpdates` works like `ItchUpdates` (see `itch-updates.md`). The install record keeps the release +`published_on` as `installVersion` and `gameId`, `buildId` and `packageId` in `extra`. `evaluate` compares them +with the current builds: a newer release of the same package is an update; if the package is gone, the first +installable Windows build is offered as a replaced build. The automatic check runs when the Game Jolt Library +source opens, at most every six hours, one game per second. A Check for updates button on an installed game's page +checks that game only. Updates stage through `ItchStaging` and the safe folder. Uninstalling or finishing an +install clears the record. Install folders use `Store.folder`, so the Itch.io display name never moves them. + +## Controller + +The menus, chips and buttons are the shared components (`MenuItem`, `AnchoredMenu`, `ValueChip`, `BrowseChip`, +`IconAction`) that already take focus and confirm from a controller. The first menu entry takes initial focus. From 89a2ae87d7f03039f1b15a49fb36cbb813e83278 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 13:39:53 -0500 Subject: [PATCH 10/16] fix: drop the HUD watermark and use the wordmark in headers (#2011) --- .../launcher/hud/DroidDeckHudView.kt | 39 +++++--------- .../com/droiddeck/launcher/hud/WordmarkArt.kt | 54 +++++++++++++++++++ .../com/droiddeck/launcher/ui/StatsHud.kt | 9 +--- .../com/droiddeck/launcher/ui/StatsStrips.kt | 3 +- .../com/droiddeck/launcher/ui/Wordmark.kt | 39 ++++---------- 5 files changed, 80 insertions(+), 64 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index b7acc74b3b..7aa76e00da 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -125,6 +125,7 @@ class DroidDeckHudView(context: Context) : View(context) { private var accent = 0xFF1A9FFF.toInt() private var surfaceRgb = 0x121417 private var headerMark: RectF? = null + private var headerWordmark: RectF? = null private var chipRect: RectF? = null var dock = DroidDeckHudDock.NONE @@ -167,12 +168,9 @@ class DroidDeckHudView(context: Context) : View(context) { color = colGraph } private val headerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } - private val wordmarkPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) - } - private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val sans: Boolean = false, val glow: Boolean = false) { - fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, sans, glow) + private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) { + fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, glow) } private class Span(val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) private class HudRow(val label: Span, val vals: List, val inline: Boolean = false) @@ -523,7 +521,7 @@ class DroidDeckHudView(context: Context) : View(context) { private fun rebuild() { glyphs.clear(); tileRects.clear(); graphRect = null - headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null + headerMark = null; headerWordmark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null val s = snap if (s == null) { contentW = 0f; contentH = 0f; return } if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } @@ -576,24 +574,18 @@ class DroidDeckHudView(context: Context) : View(context) { private fun footerClock(): Boolean = showClockTime && size == DroidDeckHudSize.PILL - private fun measureSans(text: String, sizePx: Float): Float { wordmarkPaint.textSize = sizePx; return wordmarkPaint.measureText(text) } - private fun panelInset() = sp(8f) private fun panelLeft() = sp(13f) private fun contentLeft() = panelLeft() + sp(16f) private fun addPanelHeader(left: Float, inner: Float): Pair { - val wordPx = sp(10f); val clockPx = sp(9.5f); val gapH = sp(7f) - wordmarkPaint.textSize = wordPx - val markH = wordmarkPaint.fontMetrics.let { it.descent - it.ascent } * 0.95f + val clockPx = sp(9.5f); val gapH = sp(7f) + val wordH = sp(12f) val markTop = inner + gapH - val markLeft = left - DroidDeckMark.inkLeftFor(markH) - headerMark = RectF(markLeft, markTop, markLeft + DroidDeckMark.widthFor(markH), markTop + markH) - val midY = markTop + markH / 2f - var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(6f) - wordmarkPaint.getTextBounds("DroidDeck", 0, 9, inkRect) - glyphs.add(Glyph(x, midY - inkRect.exactCenterY(), "DroidDeck", blend(colValue), wordPx, sans = true)) - x += measureSans("DroidDeck", wordPx) + val wordW = WordmarkArt.widthFor(wordH) + headerWordmark = RectF(left, markTop, left + wordW, markTop + wordH) + val midY = markTop + wordH / 2f + var x = left + wordW if (showClockTime) { measurePaint.textSize = clockPx measurePaint.getTextBounds("0", 0, 1, inkRect) @@ -605,7 +597,7 @@ class DroidDeckHudView(context: Context) : View(context) { glyphs.add(Glyph(x, base, t, blend(colDim), clockPx)) x += measure(t, clockPx) } - dDividerTop = markTop + markH + gapH + dDividerTop = markTop + wordH + gapH return Pair(dDividerTop + max(1f, density), x) } @@ -647,7 +639,7 @@ class DroidDeckHudView(context: Context) : View(context) { } var right = panel.right for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else measurePaint + val paint = measurePaint paint.textSize = g.sizePx paint.getTextBounds(g.text, 0, g.text.length, inkRect) if (inkRect.isEmpty) continue @@ -1319,7 +1311,7 @@ class DroidDeckHudView(context: Context) : View(context) { stripRect?.let { drawStrip(canvas, it) } for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else drawPaint + val paint = drawPaint paint.textSize = g.sizePx paint.color = g.color if (g.glow) paint.setShadowLayer(sp(6f), 0f, 0f, withAlpha(colGraph, 217)) @@ -1327,6 +1319,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (g.glow) paint.clearShadowLayer() } headerMark?.let { DroidDeckMark.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } + headerWordmark?.let { WordmarkArt.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } graphRect?.let { drawGraph(canvas, it) } @@ -1416,10 +1409,6 @@ class DroidDeckHudView(context: Context) : View(context) { headerPaint.color = withAlpha(accent, 90) c.drawRect(panel.left, dDividerTop, roundEdgeX(panel, dDividerTop, stroke), dividerBottom, headerPaint) } - val halfRound = dRadius >= panel.height() / 2f - 0.5f - val wmH = if (halfRound) panel.height() * 0.92f else min(panel.height(), panel.width()) * 0.55f - DroidDeckMark.draw(c, panel.right - DroidDeckMark.widthFor(wmH) - (if (halfRound) panel.height() * 0.02f else sp(10f)), - panel.centerY() - wmH / 2f, wmH, Color.argb(20, 255, 255, 255), withAlpha(accent, 20)) c.restore() if (stroke > 0f) { val h = stroke / 2f diff --git a/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt new file mode 100644 index 0000000000..d19c7d6e51 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path +import androidx.compose.ui.graphics.asAndroidPath +import androidx.compose.ui.graphics.vector.PathParser + +internal object WordmarkArt { + const val BOX_X = 239.135f + const val BOX_Y = 120.02f + const val BOX_W = 1040.7f - 239.135f + const val BOX_H = 243.2f - 120.02f + const val MARK_SCALE = 0.527445f + + const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" + const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" + const val LETTERS = + "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + + "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + + "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + + "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + + "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + + "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + + "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + + "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + + "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" + + private fun parse(d: String): Path = PathParser().parsePathString(d).toPath().asAndroidPath() + private val letters by lazy { parse(LETTERS) } + private val leftHalf by lazy { parse(LEFT_HALF) } + private val rightHalf by lazy { parse(RIGHT_HALF) } + private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + + fun widthFor(height: Float): Float = height * BOX_W / BOX_H + + fun draw(canvas: Canvas, left: Float, top: Float, height: Float, inkColor: Int, ballColor: Int) { + val k = height / BOX_H + canvas.save() + canvas.translate(left, top) + canvas.scale(k, k) + canvas.translate(-BOX_X, -BOX_Y) + paint.color = inkColor + canvas.drawPath(letters, paint) + canvas.translate(239.135f, 123.36f) + canvas.scale(MARK_SCALE, MARK_SCALE) + canvas.translate(31.98f, 0f) + canvas.drawPath(leftHalf, paint) + canvas.drawPath(rightHalf, paint) + paint.color = ballColor + canvas.drawCircle(63.98f, 111.86f, 55.98f, paint) + canvas.restore() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt index 8caa4e6dec..80c7689f23 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt @@ -61,7 +61,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R -import com.droiddeck.launcher.hud.DroidDeckMark import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.session.StatsHud @@ -164,10 +163,6 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, val divider = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = argb(if (dim) 38 else 90, a) } val blur = BlurMaskFilter(4.dp.toPx(), BlurMaskFilter.Blur.NORMAL) val line = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = stroke; color = argb(if (dim) 90 else 255, a) } - val markH = min(h, w) * 0.55f - val markX = w - DroidDeckMark.widthFor(markH) - 16.dp.toPx() - val markBody = android.graphics.Color.argb(if (dim) 9 else 20, 255, 255, 255) - val markOrb = argb(if (dim) 9 else 20, a) onDrawBehind { drawIntoCanvas { canvas -> val c = canvas.nativeCanvas @@ -176,7 +171,6 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, c.clipPath(body) c.drawRect(0f, 0f, w, headerPx + 1f, band) c.drawRect(0f, headerPx, w, headerPx + max(1f, density), divider) - DroidDeckMark.draw(c, markX, (h - markH) / 2f, markH, markBody, markOrb) c.restore() for (pass in 0..2) { line.maskFilter = if (pass < 2) blur else null @@ -189,8 +183,7 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, .padding(start = 24.dp, end = 34.dp, bottom = 14.dp), ) { Row(Modifier.fillMaxWidth().height(HEADER), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - DroidDeckLogo(16.dp, body = headerInk, orb = if (dim) accent.copy(alpha = 0.5f) else accent) - Text("DroidDeck", fontSize = 14.sp, fontWeight = FontWeight.Bold, color = headerInk, maxLines = 1) + Wordmark(14.dp, ink = headerInk, ball = if (dim) accent.copy(alpha = 0.5f) else accent) if (clock.isNotEmpty()) { Text("·", fontSize = 13.sp, fontFamily = Mono, color = HudInk.sep) Text(clock, fontSize = 13.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.dim, maxLines = 1) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt index 1d2480688f..fc900a4f56 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt @@ -111,8 +111,7 @@ private fun LogoBadge(size: Dp) { private fun LogoHeader(clock: String, game: String?) { val colors = MaterialTheme.colorScheme Row(Modifier.fillMaxWidth().padding(horizontal = 2.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - DroidDeckLogo(16.dp) - Text("DroidDeck", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Wordmark(14.dp, ink = colors.onBackground) Text(game.orEmpty(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) if (clock.isNotEmpty()) Text(clock, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt index c0aefad254..887caa3c37 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.vector.PathParser @@ -16,22 +17,21 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.WordmarkArt @Composable -internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { - val ink = MaterialTheme.colorScheme.onBackground - val ball = LocalPalette.current.signal +internal fun Wordmark(height: Dp, modifier: Modifier = Modifier, ink: Color = MaterialTheme.colorScheme.onBackground, ball: Color = LocalPalette.current.signal) { val name = stringResource(R.string.app_name) - val letters = remember { PathParser().parsePathString(LETTERS).toPath() } - val leftHalf = remember { PathParser().parsePathString(LEFT_HALF).toPath() } - val rightHalf = remember { PathParser().parsePathString(RIGHT_HALF).toPath() } - Canvas(modifier.height(height).width(height * (BOX_W / BOX_H)).semantics { contentDescription = name }) { - val k = size.height / BOX_H + val letters = remember { PathParser().parsePathString(WordmarkArt.LETTERS).toPath() } + val leftHalf = remember { PathParser().parsePathString(WordmarkArt.LEFT_HALF).toPath() } + val rightHalf = remember { PathParser().parsePathString(WordmarkArt.RIGHT_HALF).toPath() } + Canvas(modifier.height(height).width(height * (WordmarkArt.BOX_W / WordmarkArt.BOX_H)).semantics { contentDescription = name }) { + val k = size.height / WordmarkArt.BOX_H scale(k, k, Offset.Zero) { - translate(-BOX_X, -BOX_Y) { + translate(-WordmarkArt.BOX_X, -WordmarkArt.BOX_Y) { drawPath(letters, ink) translate(239.135f, 123.36f) { - scale(MARK_SCALE, MARK_SCALE, Offset.Zero) { + scale(WordmarkArt.MARK_SCALE, WordmarkArt.MARK_SCALE, Offset.Zero) { translate(31.98f, 0f) { drawPath(leftHalf, ink) drawPath(rightHalf, ink) @@ -43,22 +43,3 @@ internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { } } } - -private const val BOX_X = 239.135f -private const val BOX_Y = 120.02f -private const val BOX_W = 1040.7f - 239.135f -private const val BOX_H = 243.2f - 120.02f -private const val MARK_SCALE = 0.527445f - -private const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" -private const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" -private const val LETTERS = - "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + - "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + - "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + - "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + - "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + - "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + - "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + - "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + - "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" From 3fbd86c89ddff17df9bbc0980add8b384c2db47d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 14:29:39 -0500 Subject: [PATCH 11/16] fix: bottom screen frame graph updates smoothly and no longer looks jagged (#2013) --- .../main/java/com/droiddeck/launcher/ui/BottomStrip.kt | 2 +- .../com/droiddeck/launcher/ui/BottomTelemetryPage.kt | 2 +- .../main/java/com/droiddeck/launcher/ui/StatsHud.kt | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt index 58f1bd76dd..3df2090bc4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.withContext import java.io.File -private const val STRIP_FRAME_MS = 100L +private const val STRIP_FRAME_MS = 33L private const val STRIP_METRICS_MS = 500L private const val STRIP_TEMP_PLAIN = 0xFFF2F5F9.toInt() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt index 934ad773a7..4aee7fc22f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -96,7 +96,7 @@ private const val ELITE_MS = 1_000L private const val ELITE_SEARCH_MS = 10_000L private const val OUTPUT_SCAN_MS = 3_000L private const val PERF_N = 60 -private const val FRAME_MS = 100L +private const val FRAME_MS = 33L private const val MINUTE_NS = 60_000_000_000L private const val TEMP_PLAIN = 0xFFF2F5F9.toInt() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt index 80c7689f23..b14dd39dc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt @@ -65,6 +65,7 @@ import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.session.StatsHud import java.io.File +import kotlin.math.ceil import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt @@ -264,13 +265,18 @@ private fun lowsText(d: HudData, size: TextUnit, accent: Color, deep: Boolean = } } +private val GRAPH_MIN_GAP = 3.dp + @Composable private fun Graph(values: List, lo: Float, hi: Float, color: Color, modifier: Modifier) { Canvas(modifier) { if (values.size < 2 || hi <= lo) return@Canvas + val stride = ceil(GRAPH_MIN_GAP.toPx() * (values.size - 1) / size.width).toInt().coerceAtLeast(1) + val points = if (stride == 1) values else values.chunked(stride) { it.average().toFloat() } + if (points.size < 2) return@Canvas val path = Path() - values.forEachIndexed { i, v -> - val x = i / (values.size - 1f) * size.width + points.forEachIndexed { i, v -> + val x = i / (points.size - 1f) * size.width val y = size.height - ((v - lo) / (hi - lo)).coerceIn(0f, 1f) * size.height if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) } From 8d3616eccd9127188453b61cd9d1c44657becf5a Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Mon, 2 Nov 2026 16:43:22 -0500 Subject: [PATCH 12/16] feat(dual-screen): swap screens - game on the bottom screen, panel on top (#2006) Swap screens for dual-screen handhelds: the game moves to the built-in bottom screen while the top screen shows the Dashboard or the KDE desktop. Swap button in the Dashboard and Desktop bars and a Show the game on row in the session menu. The desktop resizes to the screen it is on, Follow screen and Match screen sessions take the bottom screen's shape, the keyboard opens on the top screen, and the game swaps back on session end, picture-in-picture, glasses, or when the bottom screen is taken. Review follow-ups cover desktop restart, refresh pacing, key and pointer ownership, touch cancellation and bottom surface recovery. --- .../com/droiddeck/launcher/SessionActivity.kt | 287 +++++++++++++++--- .../launcher/session/BottomDesktop.kt | 37 ++- .../launcher/session/SessionState.kt | 1 + .../droiddeck/launcher/ui/BottomDashboard.kt | 7 +- .../launcher/ui/BottomDesktopPanel.kt | 70 +++-- .../droiddeck/launcher/ui/BottomGameScreen.kt | 66 ++++ .../launcher/ui/SecondScreenPresentation.kt | 3 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 8 + .../wayland/BottomDesktopCompositorService.kt | 15 + app/src/main/res/drawable/ic_bottom_swap.xml | 5 + app/src/main/res/values/strings.xml | 6 + .../launcher/session/BottomDesktopSizeTest.kt | 25 ++ .../launcher/ui/BottomDesktopFitTest.kt | 21 ++ .../launcher/ui/GameScreenSwapTest.kt | 35 +++ 14 files changed, 515 insertions(+), 71 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt create mode 100644 app/src/main/res/drawable/ic_bottom_swap.xml create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index c334972670..fb344c1943 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -37,6 +37,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.unit.dp @@ -294,9 +295,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun alignCursorToGuest(): Boolean { if (pointerLocked || !CompositorHost.isStarted) return false if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return false - if (surfaceView.width <= 0 || surfaceView.height <= 0) return false - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (outputView().width <= 0 || outputView().height <= 0) return false + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (kotlin.math.abs(x - cursorPos.x) < 0.75f && kotlin.math.abs(y - cursorPos.y) < 0.75f) return false cursorPos = androidx.compose.ui.geometry.Offset(x, y) return true @@ -421,6 +422,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesSettings by mutableStateOf(Glasses.settings.value) private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) + private var bottomGame: com.droiddeck.launcher.ui.BottomGameScreen? = null + private var bottomOutputActive by mutableStateOf(false) + private val topDesktopKeys = mutableSetOf>() + private var bottomRecoveries = 0 + private var gameOnBottom by mutableStateOf(SessionState.gameOnBottom) + private var bottomSwapAvailable by mutableStateOf(false) private var pausedFrame by mutableStateOf(null) private var pausedFrameWanted = false private var pauseAnimated by mutableStateOf(false) @@ -477,6 +484,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var secondScreenPresentation: SecondScreenPresentation? = null private val bottomScreenListener: () -> Unit = { if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false) + updateBottomGame() refreshSecondScreenDisplays() } @@ -494,6 +502,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onDisplayChanged(displayId: Int) { notifyActivityDisplayStateChanged(displayId) followPanelRefresh(displayId) + updateBottomGame() refreshSecondScreenDisplays() } } @@ -525,7 +534,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun followPanelRefresh(displayId: Int) { if (!CompositorHost.isStarted) return - val output = glassesScreen?.display + val output = bottomGame?.takeIf { bottomOutputActive }?.display ?: glassesScreen?.display ?: (if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay) ?: return if (output.displayId != displayId) return applyOutputPacing() @@ -585,6 +594,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM))) SessionState.secondScreenAutoOpened = false SessionState.secondScreenProvisional = false + SessionState.gameOnBottom = false + gameOnBottom = false } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) @@ -844,9 +855,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { androidx.compose.runtime.DisposableEffect(Unit) { onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) } } - androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi, bottomOutputActive) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(bottomOutputActive) { hud.setHidden(pipUi || bottomOutputActive) } androidx.compose.runtime.LaunchedEffect(pipUi) { - hud.setHidden(pipUi) + hud.setHidden(pipUi || bottomOutputActive) applyOutputPacing() if (pipUi != frameGenPip) { frameGenPip = pipUi @@ -882,10 +894,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible && !uiPointer, + CursorOverlay({ cursorPos }, cursorVisible && !uiPointer && !bottomOutputActive, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity) + if (bottomOutputActive && !loading.visible) SwappedTopPanel() val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { @@ -1192,6 +1205,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, + gameOnBottom = bottomOutputActive, + gameSwapAvailable = bottomSwapAvailable, + onGameOnBottom = { on -> drawerOpen = false; putGameOnBottom(on) }, dashboardAvailable = bottomPages().isNotEmpty(), desktopAvailable = com.droiddeck.launcher.session.BottomDesktop.available(), secondScreenDisplays = secondScreenDisplays, @@ -2073,7 +2089,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val live = windowOutputSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) val size = live ?: if (SessionState.running) previous else glassesOutputSize() ?: outputSize() SessionState.outputSize = size - if (!SessionState.running) SessionState.refreshHz = refreshHz() + if (!SessionState.running) SessionState.refreshHz = refreshHz(holder) val panel = panelBounds() SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1) Thread({ @@ -2123,7 +2139,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CompositorHost.startOrAttach( this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, - applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), + applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(holder), outputFpsLimit(), ) onOutputAttached(holder) if (SessionState.running && size != previous) { @@ -2165,6 +2181,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun windowOutputSize(width: Int, height: Int): Pair? { if (isInPictureInPictureMode || width <= 0 || height <= 0) return null + if (bottomGame != null) return when { + SessionState.followScreen -> + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, false, SessionState.followScale) + resolutionChoice() == com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN -> + (width and 1.inv()) to (height and 1.inv()) + else -> null + } return if (SessionState.followScreen) com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted(), SessionState.followScale) else if (glassesScreen == null) outputSize() else null @@ -2211,12 +2234,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun surfaceDestroyed(holder: SurfaceHolder) { if (holder !== outputHolder()) return - cancelTouchGestures() + cancelOutputTouches() surfaceW = 0 surfaceH = 0 glassesOutputActive = false + bottomOutputActive = false if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(false) CompositorHost.detach(holder.surface) + bottomGame?.takeIf { it.holder === holder }?.let { screen -> uiHandler.post { recoverBottomOutput(screen) } } } private fun cancelTouchGestures() { @@ -2239,19 +2264,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun displayMode(): String = SessionPrefs.displayMode(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, intent.getStringExtra(SessionService.EXTRA_PROGRAM)) - private fun outputSize(): Pair { + private fun outputSize(): Pair = + com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), + resolutionChoice(), SessionPrefs.portrait(this) && !controlsBelowWanted()) + + private fun resolutionChoice(): String { val mode = displayMode() - val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) - val choice = if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && + return if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode)) com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN - else SessionPrefs.resolutionChoice(this, mode, panel) - return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice, - SessionPrefs.portrait(this) && !controlsBelowWanted()) + else SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) } - private fun refreshHz(): Float { + private fun refreshHz(): Float = refreshHz(null) + + private fun refreshHz(holder: SurfaceHolder?): Float { + bottomGame?.takeIf { if (holder != null) holder === it.holder else bottomOutputActive } + ?.hz?.takeIf { it > 1f }?.let { return minOf(it, PerfMode.peakRefreshCap(this)) } glassesScreen?.hz?.takeIf { it > 1f }?.let { return it } val display = if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay val wanted = window.attributes.preferredDisplayModeId @@ -2600,6 +2630,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } if ((pcKeyboardOpen || achievementsOpen) && fromController) return super.dispatchKeyEvent(event) + if (!fromController && event.keyCode != KeyEvent.KEYCODE_BACK && sendToTopDesktop(event)) return true if (joyConVr?.onKeyEvent(event) == true) return true if (fromController && event.keyCode != KeyEvent.KEYCODE_BACK && padMouseMode() && padMouse.onKey(event)) return true if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true @@ -2611,6 +2642,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return super.dispatchKeyEvent(event) } + private fun sendToTopDesktop(event: KeyEvent): Boolean { + val key = event.deviceId to event.keyCode + val owned = if (event.action == KeyEvent.ACTION_UP) topDesktopKeys.remove(key) else topDesktopFocused() + if (!owned || !super.dispatchKeyEvent(event)) return false + if (event.action == KeyEvent.ACTION_DOWN) topDesktopKeys += key + return true + } + + private fun topDesktopFocused(): Boolean { + if (!bottomOutputActive) return false + var view: View? = currentFocus + while (view != null) { + if (view is com.droiddeck.launcher.ui.BottomDesktopPanel) return true + view = view.parent as? View + } + return false + } + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (pipUi) return true notePress(event) @@ -2750,7 +2799,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun focusDrawer(): Boolean = dockedMenu()?.focusMenu() ?: sessionOverlay.requestFocus() private fun dockDrawer(): Boolean { - if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false + if (pipUi || !started || glassesScreen != null || bottomGame != null || !::displayManager.isInitialized) return false val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false if (secondScreenDisplays.none { it.id == target.displayId }) return false val shown = secondScreenPresentation?.display?.displayId @@ -2865,7 +2914,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) cursorVisible = false } override fun onButton(button: Int, pressed: Boolean) { @@ -2893,7 +2942,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { scrollRestY = 0f val rect = drawnRect() ?: return val x = rect.left + rect.width() * PAD_SCROLL_POINTER_X - WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, surfaceView.width), InputSpace.y(rect.centerY(), surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, outputView().width), InputSpace.y(rect.centerY(), outputView().height)) cursorVisible = false } override fun onScroll(dx: Float, dy: Float) = scrollListener.onScroll(dx, dy) @@ -2941,10 +2990,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun placeTouchpadAtGuest(rect: android.graphics.RectF) { - if (pointerLocked || !CompositorHost.isStarted || surfaceView.width <= 0 || surfaceView.height <= 0) return + if (pointerLocked || !CompositorHost.isStarted || outputView().width <= 0 || outputView().height <= 0) return if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (rect.contains(x, y)) touchpad.place(x, y) } @@ -2960,7 +3009,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3025,6 +3074,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { .filter { glassesScreen == null || it.id != glasses.displayId } val oldIds = secondScreenDisplays.map { it.id }.toSet() secondScreenDisplays = candidates + bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null val newIds = candidates.map { it.id }.toSet() if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) { closeSecondScreen(reset = true) @@ -3091,7 +3141,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) return } - if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId)) { + if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId) || bottomGame?.display?.displayId == target.displayId) { if (secondScreenPresentation != null) closeSecondScreen(reset = false) secondScreenMode = mode SessionState.secondScreenMode = mode @@ -3133,6 +3183,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { menu = { DroidDeckTheme { SessionMenu(docked = true) } }, + onSwap = if (com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, dashboard = if (bottomPages().isEmpty()) null else ({ DroidDeckTheme { BottomDashboard( @@ -3141,6 +3192,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, + onSwap = if (bottomSwapAvailable && com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, strip = { pageId -> com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } }, @@ -3157,7 +3209,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { )) private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { - val presentation = secondScreenPresentation ?: return + val presentation = secondScreenPresentation + if (presentation == null) { + if (!bottomOutputActive) return + listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it)) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action}", e) } + .isSuccess + } + return + } val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } @@ -3188,7 +3249,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun captureScreenshot(onDone: (Boolean) -> Unit) { - val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null + val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView + else if (::surfaceView.isInitialized) surfaceView else null val width = source?.width ?: 0 val height = source?.height ?: 0 if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { @@ -3252,7 +3314,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun controlsBelowWanted(): Boolean { - if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false + if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } @@ -3298,7 +3360,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val px = rect.left + nx * rect.width() val py = rect.top + ny * rect.height() - WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, surfaceView.width), InputSpace.y(py, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, outputView().width), InputSpace.y(py, outputView().height)) showCursor(px, py) } @@ -3463,8 +3525,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun drawnRect(): android.graphics.RectF? { - val width = surfaceView.width.takeIf { it > 0 } ?: return null - val height = surfaceView.height.takeIf { it > 0 } ?: return null + val width = outputView().width.takeIf { it > 0 } ?: return null + val height = outputView().height.takeIf { it > 0 } ?: return null topPictureMapped = CompositorHost.isStarted && WaylandCompositor.nativeGamePictureRect(gamePictureBounds) if (topPictureMapped) return android.graphics.RectF( gamePictureBounds[0], gamePictureBounds[1], gamePictureBounds[2], gamePictureBounds[3]) @@ -3560,7 +3622,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) WaylandCompositor.nativeSendTouch(action, pointerId, - InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3624,7 +3686,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun updatePointerCapture() { if (!::surfaceView.isInitialized) return val view = window.decorView - val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && mouseAttached() + val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && !bottomOutputActive && mouseAttached() if (want == view.hasPointerCapture()) return if (want) view.requestPointerCapture() else view.releasePointerCapture() } @@ -3632,7 +3694,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var platformPointerShown: Boolean? = null private fun appUiOwnsPointer(): Boolean = - drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive + drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive || bottomOutputActive private fun applyPlatformPointer(shown: Boolean) { if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return @@ -3855,7 +3917,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun capturePausedFrame(manual: Boolean = false) { - if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive || bottomOutputActive) return if (SessionState.suspended && pausedFrame != null) return if ((suspendPolicy == SessionPrefs.SUSPEND_NEVER && !manual && !SessionState.manualPause) || !::surfaceView.isInitialized) return if (surfaceView.holder.surface?.isValid != true) return @@ -3970,6 +4032,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() updateGlassesScreen() + updateBottomGame() } override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { @@ -3999,6 +4062,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionService.setActivityVisible(this, true, sessionActivityDisplayId) Glasses.rescan() updateGlassesScreen() + updateBottomGame() updateHandCamera() } @@ -4013,6 +4077,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() + updateBottomGame() if (startedScreens == 0) SessionService.setActivityVisible(this, false, sessionActivityDisplayId) super.onStop() } @@ -4322,15 +4387,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.trackingRecovery?.update(trackingRecovery, glasses.sbs) } - private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: surfaceView.holder + private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: bottomGame?.holder ?: surfaceView.holder + + private fun outputView(): SurfaceView = bottomGame?.takeIf { bottomOutputActive }?.surfaceView ?: surfaceView private fun onOutputAttached(holder: SurfaceHolder) { if (holder !== outputHolder()) return glassesOutputActive = glassesScreen?.holder === holder - if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive) - surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE + bottomOutputActive = bottomGame?.holder === holder + if (bottomOutputActive) bottomRecoveries = 0 + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive || bottomOutputActive) + surfaceView.visibility = if (glassesOutputActive || bottomOutputActive) View.INVISIBLE else View.VISIBLE Log.i(TAG, "compositor output attached: " + - if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" else "phone") + if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" + else if (bottomOutputActive) "bottom screen display ${bottomGame?.display?.displayId}" else "phone") if (pausedFrameWanted) uiHandler.postDelayed({ if (pausedFrameWanted && pausedFrame == null && resumed) capturePausedFrame() }, PAUSED_FRAME_REDRAW_MS) @@ -4348,6 +4418,140 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) } + private fun bottomGameDisplay(): Display? { + if (!::displayManager.isInitialized) return null + return com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) + ?.takeIf { it.isValid && com.droiddeck.launcher.input.DualScreen.builtIn(it) } + } + + private fun putGameOnBottom(on: Boolean) { + if (on && bottomGame == null && bottomGameDisplay() == null) { + android.widget.Toast.makeText(this, R.string.swap_screens_unavailable, android.widget.Toast.LENGTH_SHORT).show() + return + } + SessionState.gameOnBottom = on + gameOnBottom = on + Log.i(TAG, "game screen: " + if (on) "bottom" else "top") + updateBottomGame() + } + + private fun updateBottomGame() { + if (!::surfaceView.isInitialized) return + val target = bottomGameDisplay() + val want = com.droiddeck.launcher.ui.GameScreenSwap.wanted( + requested = gameOnBottom, + activityStarted = started && !runtimeRemovalBlocked, + sessionEnded = ended, + inPip = pipUi || isInPictureInPictureMode, + glassesOutput = glassesScreen != null, + bottomScreenFree = target != null, + ) + val shown = if (want) target else null + val current = bottomGame + if (current != null && current.display.displayId == shown?.displayId) return + if (current != null || shown != null) cancelOutputTouches() + if (current != null) { + restoreTopOutput(current) + runCatching { current.dismiss() } + } + if (shown != null) { + closeSecondScreen(reset = false) + val screen = com.droiddeck.launcher.ui.BottomGameScreen(this, shown, this, ::onBottomGameTouch) + bottomGame = screen + surfaceW = 0 + surfaceH = 0 + screen.setOnDismissListener { + if (bottomGame === screen) { + restoreTopOutput(screen) + refreshSecondScreenDisplays() + } + } + try { + screen.show() + } catch (e: Exception) { + restoreTopOutput(screen) + runCatching { screen.dismiss() } + Log.w(TAG, "could not show the game on ${shown.name}", e) + } + if (bottomGame === screen) Log.i(TAG, "requested game output on the bottom screen (display ${shown.displayId})") + } + refreshSecondScreenDisplays() + } + + private fun cancelOutputTouches() { + cancelTouchGestures() + if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() + if (CompositorHost.isStarted && deliversTouches(routedTouchMode)) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + + private fun recoverBottomOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen || bottomOutputActive || !started || screen.holder.surface?.isValid == true) return + Log.i(TAG, "bottom screen surface gone - game back on the top screen") + restoreTopOutput(screen) + runCatching { screen.dismiss() } + refreshSecondScreenDisplays() + if (++bottomRecoveries <= BOTTOM_RECOVERY_TRIES) uiHandler.postDelayed({ updateBottomGame() }, BOTTOM_RECOVERY_MS) + } + + private fun restoreTopOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen) return + bottomGame = null + bottomOutputActive = false + surfaceW = 0 + surfaceH = 0 + CompositorHost.detach(screen.holder.surface) + if (glassesScreen != null) return + surfaceView.visibility = View.VISIBLE + applyOutputPacing() + if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) + } + + private fun onBottomGameTouch(event: MotionEvent): Boolean { + if (pipUi) return true + if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) return false + notePress(event) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + drawerControllerActive = false + gestureTouchStreamGate.reset() + } + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) return false + return onTouchEvent(event) + } + + @androidx.compose.runtime.Composable + private fun SwappedTopPanel() { + val pages = bottomPages() + val swapBack = { putGameOnBottom(false) } + androidx.compose.foundation.layout.Box( + Modifier.fillMaxSize().background(androidx.compose.material3.MaterialTheme.colorScheme.background) + .pointerInput(Unit) { awaitPointerEventScope { while (true) awaitPointerEvent() } }, + ) { + if (secondScreenMode == SecondScreenMode.DESKTOP && com.droiddeck.launcher.session.BottomDesktop.available()) { + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> + com.droiddeck.launcher.ui.BottomDesktopPanel(context, null, { drawerOpen = true }, + (({ tapSteamButton() }) to ({ tapQam() })).takeIf { SessionState.mode == SessionService.MODE_STEAM }, swapBack, + fullResolution = true) + }, + modifier = Modifier.fillMaxSize(), + ) + } else if (pages.isNotEmpty()) BottomDashboard( + pages, com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + onClose = null, + onMenu = { drawerOpen = true }, + onSwap = swapBack, + strip = { pageId -> + com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } + }, + ) else androidx.compose.material3.Button(onClick = swapBack, modifier = Modifier.align(androidx.compose.ui.Alignment.Center)) { + androidx.compose.material3.Text(getString(R.string.swap_screens)) + } + } + } + private fun glassesOutputSize(): Pair? { if (glassesScreen == null || glasses.width <= 0 || glasses.height <= 0) return null val panel = (if (glasses.sbs) glasses.width / 2 else glasses.width) to glasses.height @@ -4405,6 +4609,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { runCatching { current.dismiss() } } if (target != null) { + bottomGame?.let { restoreTopOutput(it); runCatching { it.dismiss() } } val screen = GlassesScreen(this, target, Glasses.outputHz(), this, Glasses.outputResolution()) glassesScreen = screen applyOutputPacing() @@ -4430,6 +4635,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() refreshSecondScreenDisplays() applyCardboard(cardboard) + if (target == null) updateBottomGame() } private fun onGlassesSteamVr(now: SteamVr.Status) { @@ -4541,6 +4747,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) glassesScope.cancel() glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } + bottomGame?.let { screen -> bottomGame = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() if (::memoryHud.isInitialized) memoryHud.stop() @@ -4626,6 +4833,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val PAUSED_FRAME_REDRAW_MS = 150L private const val SETTINGS_WATCH_MS = 1_000L private const val SETTINGS_WATCH_CHECKS = 600 + private const val BOTTOM_RECOVERY_MS = 1_000L + private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt index 923ee29996..36b9c3dfdc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -61,7 +61,9 @@ object BottomDesktop { /** The proot to freeze with the session when it pauses. */ val suspendPid: Int get() = guestPid private var guestGeneration = 0 - private var outputSize = 0 to 0 + var outputSize = 0 to 0 + private set + private var attachedSurface: Surface? = null private var cursorShown = false /** The session generation whose launch the running compositor and guest belong to; -1 when none. */ private var owner = -1 @@ -97,16 +99,8 @@ object BottomDesktop { fun available(): Boolean = launch?.installed == true && SessionState.running && SessionState.mode != SessionService.MODE_DESKTOP - /** - * The desktop renders below the panel's resolution: about 720 pixels on the short side keeps - * Plasma's text big enough to touch and its software rendering cheap. A running desktop keeps its size. - */ - fun outputSizeFor(width: Int, height: Int): Pair { - if ((state == State.STARTING || state == State.RUNNING) && outputSize.first > 0) return outputSize - if (width <= 0 || height <= 0) return 0 to 0 - val scale = maxOf(1f, Math.round(minOf(width, height) / TARGET_SHORT_SIDE * 2f) / 2f) - return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) - } + fun outputSizeFor(width: Int, height: Int, fullResolution: Boolean = false): Pair = + desktopOutputSize(width, height, fullResolution, TARGET_SHORT_SIDE) fun addListener(listener: () -> Unit) { listeners.add(listener) } @@ -148,6 +142,7 @@ object BottomDesktop { appContext = context.applicationContext owner = current.generation outputSize = width to height + attachedSurface = surface val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } val msg = Message.obtain(null, Comp.MSG_ATTACH).apply { arg1 = owner @@ -169,7 +164,19 @@ object BottomDesktop { } } - fun detach() { + fun resize(surface: Surface, width: Int, height: Int) { + if (surface !== attachedSurface || width <= 0 || height <= 0 || outputSize == (width to height)) return + outputSize = width to height + pendingAttach?.data?.apply { + putInt(Comp.KEY_WIDTH, width) + putInt(Comp.KEY_HEIGHT, height) + } + service?.let { send(it, Message.obtain(null, Comp.MSG_RESIZE, width, height)) } + } + + fun detach(surface: Surface? = null) { + if (surface != null && attachedSurface != null && surface !== attachedSurface) return + attachedSurface = null pendingAttach = null service?.let { send(it, Message.obtain(null, Comp.MSG_DETACH)) } } @@ -351,3 +358,9 @@ object BottomDesktop { }, "bottom-desktop-start").start() } } + +internal fun desktopOutputSize(width: Int, height: Int, fullResolution: Boolean, targetShortSide: Float): Pair { + if (width <= 0 || height <= 0) return 0 to 0 + val scale = if (fullResolution) 1f else maxOf(1f, Math.round(minOf(width, height) / targetShortSide * 2f) / 2f) + return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 8e63d05c67..2e66d2b80f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -93,6 +93,7 @@ object SessionState { @Volatile var secondScreenDisplay = -1 @Volatile var secondScreenAutoOpened = false @Volatile var secondScreenProvisional = false + @Volatile var gameOnBottom = false @Volatile var steamLibraryMounts: Map = emptyMap() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt index d5991b5c09..f6be827cf5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material.icons.outlined.SwapVert import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -84,10 +85,11 @@ fun BottomDashboard( pages: List, remembered: String?, onPage: (String) -> Unit, - onClose: () -> Unit, + onClose: (() -> Unit)?, onMenu: (() -> Unit)?, gameStarts: Int = 0, strip: (@Composable (String?) -> Unit)? = null, + onSwap: (() -> Unit)? = null, ) { val colors = MaterialTheme.colorScheme var current by remember { mutableStateOf(pickBottomPage(remembered, pages.map { it.id })) } @@ -100,7 +102,7 @@ fun BottomDashboard( val labels = bottomTabsWithLabels(maxWidth.value, pages.size) Column(Modifier.fillMaxSize().padding(horizontal = 12.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { Row(Modifier.fillMaxWidth().height(48.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) + if (onClose != null) BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) Row(Modifier.weight(1f).horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { pages.forEach { p -> PageTab(p, p.id == page?.id, labels) { @@ -109,6 +111,7 @@ fun BottomDashboard( } } } + if (onSwap != null) BarButton(Icons.Outlined.SwapVert, stringResource(R.string.swap_screens), "bottom-swap", onSwap) if (onMenu != null) BarButton(Icons.Outlined.Menu, stringResource(R.string.touch_droiddeck_menu), "bottom-menu", onMenu) } strip?.invoke(page?.id) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt index d6b80ac813..0b838b8f1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.graphics.Color +import android.os.Build import android.os.SystemClock import android.graphics.Typeface import android.view.Gravity @@ -13,6 +14,7 @@ import android.view.SurfaceHolder import android.view.SurfaceView import android.view.View import android.view.ViewConfiguration +import android.view.WindowInsets import android.graphics.RectF import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.platform.ComposeView @@ -33,9 +35,11 @@ import com.droiddeck.launcher.session.BottomDesktop @SuppressLint("ViewConstructor") class BottomDesktopPanel( context: Context, - onClose: () -> Unit, + onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, + onSwap: (() -> Unit)? = null, + private val fullResolution: Boolean = false, ) : LinearLayout(context), SurfaceHolder.Callback { private lateinit var surfaceView: SurfaceView private val area = FrameLayout(context).apply { clipChildren = true } @@ -66,7 +70,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) isFocusable = true isFocusableInTouchMode = true - addView(bar(onClose, onMenu, steamButtons), LayoutParams(-1, -2)) + addView(bar(onClose, onMenu, steamButtons, onSwap), LayoutParams(-1, -2)) area.addView(keyboardHost) addSurface() area.addView(status, FrameLayout.LayoutParams(-1, -1)) @@ -83,7 +87,7 @@ class BottomDesktopPanel( area.addView(surfaceView, 1, FrameLayout.LayoutParams(fullWidth.takeIf { it > 0 } ?: -1, fullHeight.takeIf { it > 0 } ?: -1)) } - private fun bar(onClose: () -> Unit, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?): View { + private fun bar(onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)?): View { val bar = LinearLayout(context).apply { orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL @@ -91,7 +95,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) } fun gap() = View(context).apply { layoutParams = LayoutParams(dp(6), 1) } - bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose)) + onClose?.let { bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), it)) } title = TextView(context).apply { textSize = 14f typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) @@ -106,6 +110,10 @@ class BottomDesktopPanel( bar.addView(gap()) bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_keyboard, context.getString(R.string.second_show_keyboard)) { keyboardHost.toggle() }) + onSwap?.let { + bar.addView(gap()) + bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_swap, context.getString(R.string.swap_screens), it)) + } onMenu?.let { bar.addView(gap()) bar.addView(DeckControlsPanel.menuButton(context, it)) @@ -187,7 +195,9 @@ class BottomDesktopPanel( addSurface() return } - if (attached) attach(surfaceView.holder) + if (!attached) return + attached = false + syncSurface(surfaceView.holder) } private fun showState() { @@ -208,13 +218,28 @@ class BottomDesktopPanel( if (w != fullWidth || h > fullHeight || !keyboardHost.shown) { fullWidth = w fullHeight = h - surfaceView.layoutParams = FrameLayout.LayoutParams(w, h) + val (desktopW, desktopH) = BottomDesktop.outputSizeFor(w, h, fullResolution) + val (fitW, fitH) = if (w - desktopW in 0..1 && h - desktopH in 0..1) desktopW to desktopH + else fitDesktop(w, h, desktopW, desktopH) + surfaceView.layoutParams = if (fitW == w && fitH == h) FrameLayout.LayoutParams(w, h) + else FrameLayout.LayoutParams(fitW, fitH, Gravity.CENTER_HORIZONTAL).apply { topMargin = (h - fitH) / 2 } + surfaceView.post { syncSurface(surfaceView.holder) } } pan() } + private fun imeOverlap(): Int { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return 0 + if (area.height < fullHeight) return 0 + val ime = rootWindowInsets?.getInsets(WindowInsets.Type.ime())?.bottom ?: return 0 + if (ime <= 0) return 0 + val at = IntArray(2) + area.getLocationInWindow(at) + return (at[1] + area.height - (rootView.height - ime)).coerceIn(0, area.height) + } + private fun pan() { - val visible = area.height + val visible = area.height - imeOverlap() val hidden = (fullHeight - visible).coerceAtLeast(0) val anchor = if (directTouch) lastTouchY else trackpad.y surfaceView.translationY = if (hidden == 0 || !keyboardHost.shown) 0f @@ -223,24 +248,27 @@ class BottomDesktopPanel( override fun surfaceCreated(holder: SurfaceHolder) = Unit - override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { - if (!attached) attach(holder) - } + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) = syncSurface(holder) override fun surfaceDestroyed(holder: SurfaceHolder) { if (holder !== surfaceView.holder) return attached = false surfaceUsed = false - BottomDesktop.detach() + BottomDesktop.detach(holder.surface) } - private fun attach(holder: SurfaceHolder) { - val frame = holder.surfaceFrame - val (width, height) = BottomDesktop.outputSizeFor(fullWidth.takeIf { it > 0 } ?: frame.width(), - fullHeight.takeIf { it > 0 } ?: frame.height()) + private fun syncSurface(holder: SurfaceHolder) { + if (holder !== surfaceView.holder || fullWidth <= 0 || fullHeight <= 0 || !holder.surface.isValid) return + val (width, height) = BottomDesktop.outputSizeFor(fullWidth, fullHeight, fullResolution) if (width <= 0 || height <= 0) return + val frame = holder.surfaceFrame if (frame.width() != width || frame.height() != height) { - holder.setFixedSize(width, height) + val params = surfaceView.layoutParams + if (params.width == width && params.height == height) holder.setSizeFromLayout() else holder.setFixedSize(width, height) + return + } + if (attached) { + BottomDesktop.resize(holder.surface, width, height) return } attached = true @@ -299,7 +327,7 @@ class BottomDesktopPanel( override fun onWheel(steps: Int) = BottomDesktop.sendScene(SCENE_WHEEL, steps) override fun onScroll(dx: Float, dy: Float) { - val (outW, outH) = BottomDesktop.outputSizeFor(surfaceView.width, surfaceView.height) + val (outW, outH) = BottomDesktop.outputSize scrollRestX += dx * outW / surfaceView.width.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL scrollRestY += dy * outH / surfaceView.height.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL val h = scrollRestX.toInt() @@ -343,3 +371,11 @@ class BottomDesktopPanel( const val TEXT_FIELD_TAP_MS = 1_000L } } + +internal fun fitDesktop(areaW: Int, areaH: Int, desktopW: Int, desktopH: Int): Pair { + if (areaW <= 0 || areaH <= 0 || desktopW <= 0 || desktopH <= 0) return areaW to areaH + val widthLimited = areaW.toLong() * desktopH <= areaH.toLong() * desktopW + val w = if (widthLimited) areaW else (desktopW.toLong() * areaH / desktopH).toInt() + val h = if (widthLimited) (desktopH.toLong() * areaW / desktopW).toInt() else areaH + return if (areaW - w <= 4 && areaH - h <= 4) areaW to areaH else w to h +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt new file mode 100644 index 0000000000..ba5b5af126 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Presentation +import android.graphics.Color +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.View +import android.view.ViewGroup +import android.view.WindowManager +import android.widget.FrameLayout + +class BottomGameScreen( + private val activity: Activity, + display: Display, + private val callback: SurfaceHolder.Callback, + private val onTouch: (MotionEvent) -> Boolean, +) : Presentation(activity, display) { + val surfaceView = SurfaceView(getContext()) + val holder: SurfaceHolder get() = surfaceView.holder + + val hz: Float get() = display.mode.refreshRate + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val root = FrameLayout(context).apply { setBackgroundColor(Color.BLACK) } + root.addView(surfaceView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + setContentView(root) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + surfaceView.setOnTouchListener { _, event -> onTouch(event) } + surfaceView.holder.addCallback(callback) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + activity.dispatchKeyEvent(event) || super.dispatchKeyEvent(event) + + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + activity.dispatchGenericMotionEvent(event) || super.dispatchGenericMotionEvent(event) +} + +object GameScreenSwap { + fun wanted( + requested: Boolean, + activityStarted: Boolean, + sessionEnded: Boolean, + inPip: Boolean, + glassesOutput: Boolean, + bottomScreenFree: Boolean, + ): Boolean = requested && activityStarted && !sessionEnded && !inPip && !glassesOutput && bottomScreenFree +} 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 df4182e0de..26251ddada 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -58,6 +58,7 @@ class SecondScreenPresentation( private val onMenu: (() -> Unit)? = null, private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null, private val dashboard: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val onSwap: (() -> Unit)? = null, ) : Presentation(sessionActivity, display) { private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null @@ -246,7 +247,7 @@ class SecondScreenPresentation( SecondScreenMode.DESKTOP -> { ownComposeViews() root.addView(BottomDesktopPanel(context, onClose, onMenu, - (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }), weightParams()) + (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }, onSwap), weightParams()) } SecondScreenMode.NONE -> Unit } 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 8bcf13c7de..4ecf45256f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -245,6 +245,9 @@ class DrawerActions( val textureAnisotropy: Int? = 0, val textureLodBias: String? = TextureFiltering.LOD_BIAS_OFF, val secondScreenMode: SecondScreenMode, + val gameOnBottom: Boolean = false, + val gameSwapAvailable: Boolean = false, + val onGameOnBottom: (Boolean) -> Unit = {}, val dashboardAvailable: Boolean = false, val desktopAvailable: Boolean = false, val secondScreenDisplays: List, @@ -1176,6 +1179,11 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, chipModifier = track("second-screen-display"), onPick = a.onSecondScreenDisplay) } + if (a.gameSwapAvailable || a.gameOnBottom) SettingsGroup(stringResource(R.string.swap_game_screen_group)) { + ChoiceRow(host, "game-screen", stringResource(R.string.swap_game_screen), null, + listOf(false to stringResource(R.string.swap_game_screen_top), true to stringResource(R.string.swap_game_screen_bottom)), + a.gameOnBottom, chipModifier = track("game-screen"), onPick = a.onGameOnBottom) + } } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt index 59c182dd35..26faded94c 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt @@ -20,12 +20,15 @@ class BottomDesktopCompositorService : Service() { private var client: Messenger? = null /** Echoed in every reply, so the session process can tell replies to an earlier attach apart. */ @Volatile private var attachTag = 0 + private var outputWidth = 0 + private var outputHeight = 0 private val handler = object : Handler(Looper.getMainLooper()) { override fun handleMessage(msg: Message) { when (msg.what) { MSG_ATTACH -> attach(msg) MSG_DETACH -> CompositorHost.detach(null) + MSG_RESIZE -> resize(msg.arg1, msg.arg2) MSG_TOUCH -> WaylandCompositor.nativeSendTouch(msg.arg1 and 0xff, msg.arg1 shr 8, msg.arg2 ushr 16, msg.arg2 and 0xffff) MSG_KEY -> WaylandCompositor.nativeSendKey(msg.arg1, msg.arg2) @@ -75,15 +78,26 @@ class BottomDesktopCompositorService : Service() { } val turnip = com.droiddeck.launcher.gpu.TurnipDriver(this) val driverId = if (CompositorHost.isStarted) null else turnip.install() + val resized = CompositorHost.isStarted && (width != outputWidth || height != outputHeight) val started = CompositorHost.startOrAttach( this, surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, applicationInfo.nativeLibraryDir, width, height, data.getFloat(KEY_REFRESH, 60f), 0, ) + outputWidth = width + outputHeight = height + if (resized) WaylandCompositor.nativeResizeOutput(width, height) Log.i(TAG, (if (started) "compositor started" else "compositor attached") + " at ${width}x$height in ${runtimeDir.path}") reply(MSG_ATTACHED) } + private fun resize(width: Int, height: Int) { + if (width <= 0 || height <= 0 || !CompositorHost.isStarted || (width == outputWidth && height == outputHeight)) return + outputWidth = width + outputHeight = height + WaylandCompositor.nativeResizeOutput(width, height) + } + private fun reply(what: Int) { val target = client ?: return runCatching { target.send(Message.obtain(null, what, attachTag, 0)) } @@ -102,6 +116,7 @@ class BottomDesktopCompositorService : Service() { const val MSG_POINTER = 8 const val MSG_SCENE = 9 const val MSG_CURSOR = 10 + const val MSG_RESIZE = 11 const val MSG_ATTACHED = 101 const val MSG_FIRST_FRAME = 102 const val KEY_RUNTIME_DIR = "runtimeDir" diff --git a/app/src/main/res/drawable/ic_bottom_swap.xml b/app/src/main/res/drawable/ic_bottom_swap.xml new file mode 100644 index 0000000000..e8ef8120df --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_swap.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f88608575..556d23d95a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1903,6 +1903,12 @@ The desktop couldn\'t start. Its logs are in this session\'s bottom-desktop folder. The desktop is closed. Nothing to show here yet. + Swap screens + The bottom screen is not free right now + Game screen + Show the game on + Top screen + Bottom screen Downloads No downloads running. Steam diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt new file mode 100644 index 0000000000..bafa252400 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopSizeTest { + @Test fun theDuosBottomPanelKeepsItsPixels() { + assertEquals(1280 to 848, desktopOutputSize(1280, 848, false, 720f)) + } + + @Test fun aLargerPanelRendersBelowItsResolution() { + assertEquals(826 to 646, desktopOutputSize(1240, 970, false, 720f)) + assertEquals(1280 to 644, desktopOutputSize(1920, 968, false, 720f)) + } + + @Test fun theTopScreenAfterASwapGetsItsOwnPixelsAndTheWideShape() { + assertEquals(1920 to 968, desktopOutputSize(1920, 968, true, 720f)) + assertEquals(1920 to 968, desktopOutputSize(1920, 969, true, 720f)) + } + + @Test fun noPanelNoSize() { + assertEquals(0 to 0, desktopOutputSize(0, 848, true, 720f)) + assertEquals(0 to 0, desktopOutputSize(1280, 0, false, 720f)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt new file mode 100644 index 0000000000..42922163a8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopFitTest { + @Test fun aDesktopOfThePanelsShapeFillsThePanel() { + assertEquals(1280 to 870, fitDesktop(1280, 870, 1280, 870)) + assertEquals(1280 to 870, fitDesktop(1280, 870, 1278, 868)) + } + + @Test fun aDesktopOfAnotherShapeIsFittedNotStretched() { + val (w, h) = fitDesktop(1920, 1016, 1280, 870) + assertEquals(1016, h) + assertEquals(1494, w) + } + + @Test fun nothingToFitLeavesThePanelSize() { + assertEquals(1920 to 1016, fitDesktop(1920, 1016, 0, 0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt new file mode 100644 index 0000000000..04ff32d59c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class GameScreenSwapTest { + private fun wanted( + requested: Boolean = true, + activityStarted: Boolean = true, + sessionEnded: Boolean = false, + inPip: Boolean = false, + glassesOutput: Boolean = false, + bottomScreenFree: Boolean = true, + ) = GameScreenSwap.wanted(requested, activityStarted, sessionEnded, inPip, glassesOutput, bottomScreenFree) + + @Test fun thePickedSwapPutsTheGameOnTheBottomScreen() { + assertTrue(wanted()) + } + + @Test fun withoutAPickTheGameStaysOnTop() { + assertFalse(wanted(requested = false)) + } + + @Test fun theGameComesBackToTheTopWhenTheSessionIsHiddenOrEnds() { + assertFalse(wanted(activityStarted = false)) + assertFalse(wanted(sessionEnded = true)) + assertFalse(wanted(inPip = true)) + } + + @Test fun glassesAndAHeldBottomScreenWin() { + assertFalse(wanted(glassesOutput = true)) + assertFalse(wanted(bottomScreenFree = false)) + } +} From bc5edb81dbceb1011074f84743007b0118638c50 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Mon, 2 Nov 2026 17:05:16 -0500 Subject: [PATCH 13/16] fix(battlenet): list World of Warcraft: Forever in the Library (#2018) Forever was missing for two reasons. Its install was not a known title, so the scan skipped it as "not listed". And every WoW version installs into the same World of Warcraft folder, so once one version was listed the Library dropped the others as the same game. - Forever is a title: launch code WoWF, product wowf, folder _forever_. - An install whose uid is not known is matched by the product code product.db records for it. - When versions share the folder, the one listed first keeps it and the others use their own version folder (_forever_, _classic_, ...). Each title's folder is remembered, so a shortcut keeps its app id when another version is installed or removed. Games installed before this update are listed on the next Library scan. They do not need to be installed again. --- .../droiddeck/launcher/runtime/BattleNet.kt | 66 +++++++++++++---- .../launcher/session/SessionPrefs.kt | 3 + .../launcher/runtime/BattleNetTest.kt | 73 +++++++++++++++++++ 3 files changed, 128 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index e3a64e9628..72e77145c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -17,13 +17,14 @@ object BattleNet { const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" - class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null) + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null, val flavor: String? = null) internal val TITLES = listOf( - Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow"), - Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic"), - Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era"), - Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary"), + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow", flavor = "_retail_"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic", flavor = "_classic_"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era", flavor = "_classic_era_"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary", flavor = "_anniversary_"), + Title("wow_forever", "World of Warcraft: Forever", "WoWF", shop = "world-of-warcraft-forever", product = "wowf", flavor = "_forever_"), Title("diablo3", "Diablo III", "D3", shop = "diablo-iii", product = "d3"), Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), Title("s2", "StarCraft II", "S2", shop = "starcraft-ii", product = "s2"), @@ -58,7 +59,7 @@ object BattleNet { Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed", product = "aqua"), ) - val STORE: List get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } + val STORE: List<Title> get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" && it.code != "WoWF" } fun notInstalled(title: Title, installedIds: Collection<String?>) = installedIds.mapNotNull { id -> id?.let(::title)?.code }.none { it == title.code } @@ -159,24 +160,56 @@ object BattleNet { return if (base.isNotEmpty() && id.substringAfterLast('_') in LOCALES) TITLES.firstOrNull { it.uid == base } else null } + internal fun titleForProduct(product: String): Title? { + val code = product.trim() + if (code.isEmpty()) return null + return TITLES.firstOrNull { it.product.equals(code, ignoreCase = true) } ?: TITLES.firstOrNull { it.code.equals(code, ignoreCase = true) } + } + fun games(context: Context): List<Game> { val pfx = File(prefix(context), "pfx") + val agent = runCatching { productDbInstalls(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull() val entries = installs( runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()), - runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull(), + agent?.map { it.uid to it.path }, ) - val found = LinkedHashMap<String, Game>() + val products = agent.orEmpty().filter { it.product.isNotEmpty() }.associate { it.uid.lowercase() to it.product } + val listed = LinkedHashMap<String, Triple<Title, String, File>>() for ((uid, path) in entries) { - val title = title(uid) + val title = title(uid) ?: products[uid.lowercase()]?.let(::titleForProduct) if (title == null) { if (uid.lowercase() !in NOT_GAMES) Log.i(TAG, "not listed: $uid (no launch code known)") continue } - if (title.code in found) continue + if (title.code in listed) continue val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue - found[title.code] = Game(title.uid, title.name, title.code, folder, uid) + listed[title.code] = Triple(title, uid, folder) } - return found.values.toList() + val saved = listed.mapValues { (code, _) -> com.droiddeck.launcher.session.SessionPrefs.battleNetFolder(context, code) } + val folders = ownFolders(listed.mapValues { it.value.first to it.value.third }, saved) + return listed.map { (code, found) -> + val folder = folders.getValue(code) + if (saved[code] != folder.path) com.droiddeck.launcher.session.SessionPrefs.setBattleNetFolder(context, code, folder.path) + Game(found.first.uid, found.first.name, code, folder, found.second) + } + } + + internal fun ownFolders(games: Map<String, Pair<Title, File>>, saved: Map<String, String?>): Map<String, File> { + val out = HashMap<String, File>() + val taken = HashSet<File>() + fun options(title: Title, folder: File) = listOfNotNull(folder, title.flavor?.let { File(folder, it) }?.takeIf { it.isDirectory }) + for ((code, game) in games) { + val keep = saved[code]?.let(::File)?.takeIf { it in options(game.first, game.second) && it !in taken } ?: continue + out[code] = keep + taken.add(keep) + } + for ((code, game) in games) { + if (code in out) continue + val pick = options(game.first, game.second).firstOrNull { it !in taken } ?: game.second + out[code] = pick + taken.add(pick) + } + return games.keys.associateWith { out.getValue(it) } } internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { @@ -250,17 +283,22 @@ object BattleNet { return out.toString() } - internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { + internal class AgentInstall(val uid: String, val path: String, val product: String) + + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? = productDbInstalls(bytes)?.map { it.uid to it.path } + + internal fun productDbInstalls(bytes: ByteArray): List<AgentInstall>? { val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null return installs.map { (_, start, end) -> runCatching { val install = fields(bytes, start, end) val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } + val product = install.firstOrNull { it.first == 2 }?.let { String(bytes, it.second, it.third - it.second) }.orEmpty() val path = install.firstOrNull { it.first == 3 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { String(bytes, it.second, it.third - it.second) } val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { s -> varints(bytes, s.second, s.third)[1] } - if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path + if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else AgentInstall(uid, path, product) }.getOrElse { return null } }.filterNotNull() } 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 a6bcaed7cb..bbe6ee2a9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -841,6 +841,9 @@ object SessionPrefs { fun battleNetNoSteamSet(context: Context): Boolean = prefs(context).getBoolean("battleNetNoSteamSet", false) fun setBattleNetNoSteamSet(context: Context) { prefs(context).edit().putBoolean("battleNetNoSteamSet", true).apply() } + fun battleNetFolder(context: Context, code: String): String? = prefs(context).getString("battleNetFolder:$code", null) + fun setBattleNetFolder(context: Context, code: String, path: String) { prefs(context).edit().putString("battleNetFolder:$code", path).apply() } + fun clearCachedApps(context: Context): Boolean = prefs(context).getBoolean("clearCachedApps", false) fun setClearCachedApps(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clearCachedApps", on).apply() } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index a2c5e483bb..77800dc1e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -259,6 +259,78 @@ class BattleNetTest { BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) } + @Test fun wowForeverIsListedBesideRetailInTheSharedWorldOfWarcraftFolder() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_retail_").mkdirs() + File(wow, "_forever_").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoW", "WoWF"), games.map { it.code }) + assertEquals(listOf(wow, File(wow, "_forever_")), games.map { it.folder }) + assertEquals("World of Warcraft: Forever", games[1].name) + assertEquals(2, games.map { it.folder.canonicalPath }.distinct().size) + val shortcut = BattleNet.shortcut(context, games[1])!! + assertTrue(shortcut.launchOptions.endsWith("--exec=\"launch WoWF\"")) + } + + @Test fun anInstallWithAnUnknownUidIsListedByItsProductCode() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + File(pfx, "drive_c/Games/World of Warcraft").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + field(1, message(field(1, "unknown_thing"), field(2, "nothing"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoWF"), games.map { it.code }) + assertEquals("wowf_live", games[0].installUid) + assertEquals("wow_forever", games[0].uid) + assertEquals("WoWF", BattleNet.titleForProduct("WOWF")?.code) + assertEquals("WTCG", BattleNet.titleForProduct("wtcg")?.code) + assertNull(BattleNet.titleForProduct("")) + assertEquals(listOf(Triple("wowf_live", "C:/Games/World of Warcraft", "wowf")), + BattleNet.productDbInstalls(message(field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft")))))))!! + .map { Triple(it.uid, it.path, it.product) }) + } + + @Test fun aGameKeepsTheFolderItWasListedWithWhenAnotherVersionComesOrGoes() { + val root = File(context.filesDir, "World of Warcraft").apply { mkdirs() } + val retailDir = File(root, "_retail_").apply { mkdirs() } + val foreverDir = File(root, "_forever_").apply { mkdirs() } + val wow = BattleNet.title("wow")!! + val forever = BattleNet.title("wow_forever")!! + val classic = BattleNet.title("wow_classic")!! + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to null))) + assertEquals(mapOf("WoW" to root, "WoWF" to foreverDir), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWF" to (forever to root)), mapOf("WoW" to null, "WoWF" to null))) + assertEquals(mapOf("WoWF" to foreverDir), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to foreverDir.path))) + assertEquals(mapOf("WoW" to retailDir, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to root.path))) + assertEquals(mapOf("WoW" to root, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to null))) + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to "/elsewhere"))) + } + + @Test fun theListedFolderIsRememberedAcrossScans() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_forever_").mkdirs() + val db = File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").apply { parentFile!!.mkdirs() } + val retail = field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + val forever = field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + db.writeBytes(message(retail, forever)) + assertEquals(listOf(wow, File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever)) + assertEquals(listOf(File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever, retail)) + assertEquals(listOf(File(wow, "_forever_"), wow), BattleNet.games(context).map { it.folder }) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) @@ -291,6 +363,7 @@ class BattleNetTest { assertEquals(codes.distinct(), codes) assertTrue("Fen" in codes && "OSI" in codes && "WTCG" in codes) assertFalse(BattleNet.STORE.any { it.uid == "d3cn" || it.uid == "fen" }) + assertFalse(BattleNet.STORE.any { it.code == "WoWC" || it.code == "WoWF" }) assertEquals("fenris", BattleNet.STORE.first { it.code == "Fen" }.uid) assertTrue(BattleNet.STORE.all { it.uid.matches(Regex("[a-z0-9_]{1,32}")) }) val installed = listOf("fenris", "diablo3_enus", null) From 5fe3021e5ee70163f466c44873fbce2a090a07d7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 17:40:55 -0500 Subject: [PATCH 14/16] feat: suggest Steam libraries found on internal storage and cards (#2023) * feat: suggest Steam libraries found on internal storage and cards * fix: add found card libraries by their readable path and drop superseded scan results --- .../droiddeck/launcher/FrontEndActivity.kt | 34 +++++++- .../launcher/session/SteamLibraries.kt | 85 ++++++++++++++++--- .../launcher/ui/ModeSettingsDialog.kt | 17 ++++ app/src/main/res/values/strings.xml | 6 ++ .../launcher/session/SteamLibrariesTest.kt | 24 ++++++ 5 files changed, 153 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 311fd75fcc..9d9e306672 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -496,19 +496,39 @@ class FrontEndActivity : ComponentActivity() { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> setGameStorage(path, GameStorage.labelFor(this, path)) } } private var steamLibraries by mutableStateOf<List<SteamLibraries.Entry>>(emptyList()) + private var foundSteamLibraries by mutableStateOf<List<SteamLibraries.Found>>(emptyList()) + private var allFilesAccessMissing by mutableStateOf(false) + private var steamLibraryScan = 0 private val pickSteamLibrary = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> val path = if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data) else null - if (path != null) Thread({ + if (path != null) addSteamLibrary(path) + } + + private fun addSteamLibrary(path: String) { + Thread({ val result = SteamLibraries.add(this, path) ui.post { steamLibraries = SteamLibraries.list(this) + refreshFoundSteamLibraries() refresh() - if (result is SteamLibraries.AddResult.Refused) { - android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + when { + result is SteamLibraries.AddResult.Refused -> + android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + result is SteamLibraries.AddResult.Added && result.entry.path != path -> + android.widget.Toast.makeText(this, getString(R.string.libraries_used_inner, result.entry.label), android.widget.Toast.LENGTH_LONG).show() } } }, "steam-library-add").start() } + + private fun refreshFoundSteamLibraries() { + allFilesAccessMissing = com.droiddeck.launcher.files.AllFilesAccess.missing() + val scan = ++steamLibraryScan + Thread({ + val found = SteamLibraries.found(this) + ui.post { if (scan == steamLibraryScan) foundSteamLibraries = found } + }, "steam-library-scan").start() + } private var romsDir by mutableStateOf<String?>(null) private var steamGames by mutableStateOf<List<Library.SteamGame>>(emptyList()) private var steamGamesX64 by mutableStateOf(false) @@ -1681,6 +1701,7 @@ class FrontEndActivity : ComponentActivity() { override fun onResume() { super.onResume() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() compatLaunchVisible = true com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, false) @@ -2141,6 +2162,8 @@ class FrontEndActivity : ComponentActivity() { gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, storageOptions = storageOptions, steamLibraries = steamLibraries, + foundSteamLibraries = foundSteamLibraries, + allFilesAccessMissing = allFilesAccessMissing, storageDiagnostics = mode == SessionService.MODE_STEAM && storageDiagnostics, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, forceSsbs = forceSsbs, @@ -2208,6 +2231,8 @@ class FrontEndActivity : ComponentActivity() { onAddSteamLibrary = { pickSteamLibrary.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.libraries_pick), null)) }, + onAddFoundSteamLibrary = { path -> addSteamLibrary(path) }, + onAllowAllFilesAccess = { com.droiddeck.launcher.files.AllFilesAccess.open(this) }, onRenameSteamLibrary = { id, label -> SteamLibraries.rename(this, id, label) steamLibraries = SteamLibraries.list(this) @@ -2217,6 +2242,7 @@ class FrontEndActivity : ComponentActivity() { SteamLibraries.remove(this, id) steamLibraries = SteamLibraries.list(this) refresh() + refreshFoundSteamLibraries() }, onStorageDiagnostics = { on -> SessionPrefs.setStorageDiagnosticsEnabled(this, on) @@ -2453,6 +2479,7 @@ class FrontEndActivity : ComponentActivity() { refreshWifiDiscovery() gameStorage = SessionPrefs.gameStorage(this) steamLibraries = SteamLibraries.list(this) + if (mode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() storageDiagnostics = SessionPrefs.storageDiagnosticsEnabled(this) settingsMode = mode Thread({ @@ -2483,6 +2510,7 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setGameStorage(this, path, label) gameStorage = path checkUsbLink() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() } private fun checkUsbLink() { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt index 2d1ea267fc..06f63c32bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.os.storage.StorageManager import com.droiddeck.launcher.R +import com.droiddeck.launcher.files.StorageRoots import com.droiddeck.launcher.frontend.AddedGames import java.io.File import org.json.JSONArray @@ -49,15 +50,12 @@ object SteamLibraries { class Refused(val reason: String) : AddResult() } - fun add(context: Context, path: String, label: String = defaultLabel(context, File(path))): AddResult { + fun add(context: Context, picked: String, label: String? = null): AddResult { val entries = list(context) if (entries.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + val path = innerLibrary(File(picked))?.path ?: picked val host = canonical(File(path)) - val taken = entries.map { canonical(it.host) } + listOfNotNull( - GameStorage.effective(context)?.let { canonical(File(it.path)) }, - canonical(SessionPrefs.steamRoot(context, "arm64")), - ) - if (taken.any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + if (taken(context, entries).any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) // Adding a Games folder itself is fine; a child of one would make it overlap and hide the rest of that folder. if (AddedGames.roots(context).any { host.startsWith(canonical(it.host) + "/") }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) GameStorage.prepare(context, path)?.let { return AddResult.Refused(it) } @@ -67,13 +65,70 @@ object SteamLibraries { if (current.any { overlaps(canonical(it.host), host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) // A removed library's mount stays registered with Steam until its next session, so ids are never reused. val next = maxOf(SessionPrefs.steamLibraryNextId(context), (current.maxOfOrNull { it.id.toInt() } ?: 0) + 1) - val entry = Entry(next.toString(), path, clean(label).ifEmpty { File(path).name }) + val entry = Entry(next.toString(), path, clean(label ?: defaultLabel(context, File(path))).ifEmpty { File(path).name }) save(context, current + entry) SessionPrefs.setSteamLibraryNextId(context, next + 1) return AddResult.Added(entry) } } + private fun taken(context: Context, entries: List<Entry>): List<String> = entries.map { canonical(it.host) } + listOfNotNull( + GameStorage.effective(context)?.let { canonical(File(it.path)) }, + canonical(SessionPrefs.steamRoot(context, "arm64")), + ) + + class Found(val path: String, val shown: String, val label: String, val games: Int) + + /** Reads storage; call off the main thread. */ + fun found(context: Context): List<Found> { + val entries = list(context) + val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val hits = ArrayList<Pair<File, Int>>() + for (root in StorageRoots.list(context)) { + if (!root.readable) continue + for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { + val games = gameCount(dir) + if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + } + } + val picked = ArrayList<Pair<File, Int>>() + for (hit in hits.sortedByDescending { it.second }) { + if (picked.none { overlaps(canonical(it.first), canonical(hit.first)) }) picked += hit + } + return picked.map { (dir, games) -> + val shown = File(storagePath(dir.path)) + Found(dir.path, shown.path, defaultLabel(context, shown), games) + } + } + + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ + private fun rawView(dir: File): File { + if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir + val raw = File("/mnt/media_rw/" + dir.path.removePrefix("/storage/")) + return if (raw.canRead() && raw.list() != null) raw else dir + } + + internal fun innerLibrary(picked: File): File? { + if (gameCount(picked) > 0) return null + return candidates(picked, 1).filter { it != picked && gameCount(it) > 0 }.singleOrNull() + } + + internal fun candidates(root: File, depth: Int): List<File> { + val out = arrayListOf(root) + var level = listOf(root) + repeat(depth) { + level = level.flatMap { dir -> + dir.listFiles { f -> f.isDirectory && !f.name.startsWith(".") && f.name != "steamapps" && !(dir == root && f.name == "Android") } + .orEmpty().sortedBy { it.name } + }.take(SCAN_LIMIT - out.size) + out += level + } + return out + } + + internal fun gameCount(library: File): Int = + File(library, "steamapps").list()?.count { it.startsWith("appmanifest_") && it.endsWith(".acf") } ?: 0 + fun rename(context: Context, id: String, label: String) { val name = clean(label).takeIf { it.isNotEmpty() } ?: return synchronized(lock) { save(context, list(context).map { if (it.id == id) Entry(it.id, it.path, name) else it }) } @@ -84,17 +139,27 @@ object SteamLibraries { synchronized(lock) { save(context, list(context).filterNot { it.id == id }) } } - fun defaultLabel(context: Context, folder: File): String { + fun defaultLabel(context: Context, picked: File): String { + val folder = File(storagePath(picked.path)) val volume = try { context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) } catch (e: Exception) { null } - val name = folder.name.ifEmpty { context.getString(R.string.gstore_folder) } + val parent = folder.parentFile + val named = if (folder.name.equals("Steam", true) && parent != null && !volumeRoot(parent)) parent else folder + val name = named.name.ifEmpty { context.getString(R.string.gstore_folder) } return clean(if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume)) } + private fun volumeRoot(dir: File): Boolean = dir.parent in setOf("/storage", "/mnt/media_rw", "/storage/emulated") || dir.parent == null + internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) + private fun storagePath(path: String): String = if (path.startsWith("/mnt/media_rw/")) "/storage/" + path.removePrefix("/mnt/media_rw/") else path + + private fun canonical(file: File): String = storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + + private const val SCAN_DEPTH = 2 + private const val SCAN_LIMIT = 4000 } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 315b8d6c08..dfaf8b6f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -75,6 +75,8 @@ class ModeSettings( val gameStorage: String? = null, val storageOptions: List<com.droiddeck.launcher.session.GameStorage.Option> = emptyList(), val steamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Entry> = emptyList(), + val foundSteamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Found> = emptyList(), + val allFilesAccessMissing: Boolean = false, val storageDiagnostics: Boolean = false, val fexPreset: String? = null, val forceSsbs: Boolean = false, @@ -126,6 +128,8 @@ class ModeSettingsActions( val onPickGameStorageFolder: () -> Unit = {}, val onStorageDiagnostics: (Boolean) -> Unit = {}, val onAddSteamLibrary: () -> Unit = {}, + val onAddFoundSteamLibrary: (path: String) -> Unit = {}, + val onAllowAllFilesAccess: () -> Unit = {}, val onRenameSteamLibrary: (id: String, label: String) -> Unit = { _, _ -> }, val onRemoveSteamLibrary: (id: String) -> Unit = {}, val onFexPreset: (String) -> Unit = {}, @@ -421,6 +425,19 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } } } + if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) for (found in s.foundSteamLibraries) { + SettingsRow( + found.label, + stringResource(R.string.libraries_found_hint, pluralStringResource(R.plurals.mode_added_count, found.games, found.games), found.shown), + ) { + SecondaryButton(stringResource(R.string.libraries_add_found), compact = true) { a.onAddFoundSteamLibrary(found.path) } + } + } + if (s.allFilesAccessMissing && s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) { + SettingsRow(stringResource(R.string.libraries_access_title), stringResource(R.string.libraries_access_hint)) { + SecondaryButton(stringResource(R.string.libraries_access_allow), compact = true, onClick = a.onAllowAllFilesAccess) + } + } SettingsRow( stringResource(R.string.libraries_add), if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) stringResource(R.string.libraries_hint) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 556d23d95a..32911e9d6e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -464,6 +464,12 @@ <string name="libraries_overlap">That folder is already a library or inside one</string> <string name="libraries_missing">%1$s · not available</string> <string name="libraries_applies_next">Applies from the next Steam session</string> + <string name="libraries_found_hint">Found on this device · %1$s · %2$s</string> + <string name="libraries_add_found">Add</string> + <string name="libraries_access_title">Find libraries on internal storage</string> + <string name="libraries_access_hint">Allow all files access so DroidDeck can see Steam libraries other apps keep on internal storage</string> + <string name="libraries_access_allow">Allow</string> + <string name="libraries_used_inner">Added %1$s, the Steam library inside the folder you chose</string> <string name="mode_storage_note">Games that stream assets from SD or shared storage may stutter.</string> <string name="mode_storage_diagnostics">Storage diagnostics</string> <string name="mode_storage_diagnostics_hint">Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 183618ab85..1fa5a5aaf7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -65,6 +65,30 @@ class SteamLibrariesTest { assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) } + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } + + @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val app2 = tmp.newFolder("OtherApp") + library(File(app2, "Steam")) + val entry = (SteamLibraries.add(app, app2.path) as SteamLibraries.AddResult.Added).entry + assertEquals(File(app2, "Steam").path, entry.path) + assertEquals("OtherApp", entry.label) + val empty = tmp.newFolder("Empty") + assertEquals(empty.path, (SteamLibraries.add(app, empty.path) as SteamLibraries.AddResult.Added).entry.path) + } + + @Test fun scanLooksTwoLevelsDownAndSkipsHiddenAndAppFolders() { + val volume = tmp.newFolder("volume") + val shallow = library(File(volume, "SteamLibrary")) + val deep = library(File(volume, "Some App/Steam")) + library(File(volume, "Android/data/x")) + library(File(volume, ".hidden/Steam")) + library(File(volume, "a/b/c")) + val withGames = SteamLibraries.candidates(volume, 2).filter { SteamLibraries.gameCount(it) > 0 } + assertEquals(setOf(shallow, deep), withGames.toSet()) + } + @Test fun unreadableOrInvalidEntriesAreDropped() { assertTrue(SteamLibraries.parse("{oops").isEmpty()) assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) From cae095ce3097c3a90272da472b3f671866d56dc2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 2 Nov 2026 17:53:02 -0500 Subject: [PATCH 15/16] fix: download monitor polls off the main thread so slow storage can't ANR the session (#2020) * fix: download monitor polls off the main thread so slow storage can't ANR the session * fix: cancel the queued download poll before the service shuts its executor down * fix: ignore download monitor submissions that arrive after the service shut it down --- .../launcher/session/SessionService.kt | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 679dce6e2e..7e748b7f92 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -70,6 +70,7 @@ class SessionService : Service() { private val mainHandler = Handler(Looper.getMainLooper()) private var suspendController: SessionSuspendController? = null private val steamDownloadMonitor = SteamDownloadMonitor() + private val downloadMonitorExecutor = java.util.concurrent.Executors.newSingleThreadExecutor { Thread(it, "steam-download-monitor").apply { isDaemon = true } } private var downloadMonitorTask: Runnable? = null private var downloadActive = false private var clientInstallActive = false @@ -346,7 +347,7 @@ class SessionService : Service() { screenOn = readScreenOn() manualPauseRequested = false suspendDownloadNow = false - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false clientInstallActive = false steamSleepToken = null @@ -1979,6 +1980,9 @@ class SessionService : Service() { (getSystemService(Context.DISPLAY_SERVICE) as? DisplayManager)?.unregisterDisplayListener(displayListener) displayListenerRegistered = false } + downloadMonitorTask?.let(mainHandler::removeCallbacks) + downloadMonitorTask = null + downloadMonitorExecutor.shutdown() super.onDestroy() } @@ -2102,12 +2106,20 @@ class SessionService : Service() { SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && (steamDownloadsInBackground || !SessionState.firstFrameSeen) + private fun runOnDownloadMonitor(task: () -> Unit) { + try { + downloadMonitorExecutor.execute(task) + } catch (e: java.util.concurrent.RejectedExecutionException) { + Log.d(TAG, "download monitor already shut down") + } + } + private fun updateDownloadMonitoring() { if (!downloadWatchWanted()) { val wasActive = downloadActive downloadMonitorTask?.let(mainHandler::removeCallbacks) downloadMonitorTask = null - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false if (clientInstallActive) SessionEvents.record("steam.client_download", mapOf("active" to false)) clientInstallActive = false @@ -2129,18 +2141,30 @@ class SessionService : Service() { val wasInstalling = clientInstallActive clientInstallActive = !SessionState.firstFrameSeen && (clientInstallActive || SteamDownloadMonitor.clientInstallPending(root)) - downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( - root, - receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), - client = SessionState.steamClientArch, - mounts = steamLibraryMounts, - ) - if (wasInstalling != clientInstallActive) { - SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + val receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()) + val client = SessionState.steamClientArch + val mounts = steamLibraryMounts + val self = this + val finish = { monitored: Boolean -> + if (downloadMonitorTask === self) { + downloadActive = clientInstallActive || monitored + if (wasInstalling != clientInstallActive) { + SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + } + if (wasActive != downloadActive) refreshNotification() + updateSuspendPolicy() + mainHandler.postDelayed(self, DOWNLOAD_POLL_MS) + } + } + if (clientInstallActive || !steamDownloadsInBackground) { + finish(false) + return + } + runOnDownloadMonitor { + val monitored = runCatching { steamDownloadMonitor.poll(root, receivedBytes = receivedBytes, client = client, mounts = mounts) } + .getOrDefault(false) + mainHandler.post { finish(monitored) } } - if (wasActive != downloadActive) refreshNotification() - updateSuspendPolicy() - mainHandler.postDelayed(this, DOWNLOAD_POLL_MS) } } downloadMonitorTask = poll From cdde9d3390defe4ee0c8f8236b9ee7b00d288b78 Mon Sep 17 00:00:00 2001 From: Moroni Granja <moronigranja@gmail.com> Date: Mon, 2 Nov 2026 20:06:08 -0300 Subject: [PATCH 16/16] fix: a GOG game whose installer cannot run gets its install registry (#2022) --- docs/development/stores.md | 11 ++ .../usr/local/bin/droiddeck-store-launch | 134 +++++++++++++++++- tools/tests/test_store_launch.py | 114 +++++++++++++++ 3 files changed, 254 insertions(+), 5 deletions(-) diff --git a/docs/development/stores.md b/docs/development/stores.md index 1209b7c478..e2995c863b 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -233,6 +233,17 @@ picker. Its launcher sets five FuelPump variables frozen at install time: `FUEL_ `AMAZON_GAMES_FUEL_DISPLAY_NAME` (the account name, `Player` without one). No Amazon Games SDK files are deployed into the prefix and `fuel.json` `PostInstall` steps are not run. +GOG's registry data reaches the prefix before Proton starts: a `goggame-<id>.script` install action +with `setRegistry` becomes a `.reg` import through the game's own Proton (`reg.exe import /reg:32`), +once per script revision - `.droiddeck-gog-registry` in the prefix holds the import's hash - and a +failed import is retried on the next launch. GOG completes some installs by running a support +installer from the game folder (the script's `Execute` action); under ARM64 FEX that 32-bit +self-extractor stops at "Path not found", so the values it installs are applied from +`GOG_INSTALL_REGISTRY` in `droiddeck-store-launch` instead: The Witcher: Enhanced Edition's +`HKLM\Software\CD Projekt Red\The Witcher` block and its text/voice languages (#694), without which +`witcher.exe` exits during startup. The language comes from the installed product's +`goggame-<id>.info`, and a script's own `setRegistry` entries always win over the built-in table. + A game's web links reach Android: `droiddeck-store-launch` sets the prefix's `HKCU\Software\Wine\WineBrowser` `Browsers` to `/usr/local/bin/droiddeck-open-url`, which is also `xdg-open` first on the game's PATH, and hands http(s) addresses to the app, which opens them in diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 0ac9d47e55..131c049062 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -357,6 +357,27 @@ GOG_ROOTS = {"HKEY_LOCAL_MACHINE": "HKEY_LOCAL_MACHINE", "HKLM": "HKEY_LOCAL_MAC "HKEY_CLASSES_ROOT": "HKEY_CLASSES_ROOT", "HKCR": "HKEY_CLASSES_ROOT"} WINE_USER = "C:\\users\\steamuser" +# GOG completes some installs by running a support installer from the game folder (the +# goggame-<id>.script "Execute" action). Under ARM64 FEX that 32-bit self-extractor stops at +# "Path not found", so the values it would write are applied here instead. Only products GOG +# ships no setRegistry action for are listed; a script's own entries always win. +# The Witcher: Enhanced Edition (#694) exits during startup unless the installer's +# HKLM\Software\CD Projekt Red\The Witcher keys exist - the same ones The Witcher's own +# setup writes (InstallFolder, RegionVersion, IsDjinniInstalled) plus its language. +GOG_INSTALL_REGISTRY = { + "1207658924": [ + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "InstallFolder", "string", "{app}\\"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "RegionVersion", "string", "US"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "IsDjinniInstalled", "dword", 1), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "Language", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "TextLanguage", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "VoiceLanguage", "string", "{language}"), + ], +} +# The Witcher's text and voice language IDs, from its installer's registry data. +GOG_LANGUAGE_IDS = {"en": 3, "fr": 11, "de": 10, "es": 12, "it": 13, "ru": 14, "cs": 15, "hu": 16, + "zh": 21, "pl": 5} + def gog_paths(folder, product): app = windows_path(str(folder)) @@ -416,8 +437,94 @@ def gog_entry(arguments, paths): return None -def gog_registry(folder): - entries, skipped = [], 0 +def gog_installed_products(folder): + products = {} + for info in sorted(Path(folder).glob("goggame-*.info")): + product = info.name[len("goggame-"):-len(".info")] + if not product.isdigit(): + continue + try: + products[product] = json.loads(info.read_text(encoding="utf-8-sig")) + except (OSError, ValueError): + products[product] = {} + return products + + +def gog_language_id(info): + languages = info.get("languages") if isinstance(info, dict) else None + if isinstance(languages, str): + languages = [languages] + code = str(languages[0]).lower()[:2] if isinstance(languages, list) and languages else "" + return GOG_LANGUAGE_IDS.get(code, GOG_LANGUAGE_IDS["en"]) + + +GOG_VALUE_HIVES = {"hklm": "local_machine", "hkey_local_machine": "local_machine", + "hkcu": "current_user", "hkey_current_user": "current_user", + "hkcr": "classes_root", "hkey_classes_root": "classes_root"} + + +def gog_value_key(root, section, name, view32=True): + """A registry value's identity, keeping the root and the 32-bit view apart. + + The fallback import always targets the 32-bit view (`/reg:32`), which Wine keeps under + `Software\\Wow6432Node` for HKLM: a native HKLM value must not pass for the 32-bit one. + HKCU\\Software is shared by both views, so its values read the same either way. + """ + text = section.replace("\\\\", "\\").strip("\\").lower() + hive = GOG_VALUE_HIVES.get(root.lower(), root.lower()) + if text.startswith("software\\wow6432node\\"): + text = text[len("software\\wow6432node\\"):] + elif hive == "local_machine" and not view32 and text.startswith("software\\"): + text = "native\\" + text + elif text.startswith("software\\"): + text = text[len("software\\"):] + return "%s|%s|%s" % (hive, text, name.lower()) + + +def gog_registry_values(pfx): + """Values already in the prefix, so install defaults never overwrite a player's choice.""" + values = set() + for file, root in (("system.reg", "hklm"), ("user.reg", "hkcu")): + try: + lines = (pfx / file).read_text(encoding="utf-8", errors="ignore").splitlines() + except OSError: + continue + section = "" + for line in lines: + if line.startswith("["): + end = line.find("]") + section = line[1:end] if end > 0 else line[1:] + continue + match = re.match(r'^"([^"]+)"=', line) + if match and section: + values.add(gog_value_key(root, section, match.group(1), view32=False)) + return values + + +def gog_scripted_products(folder): + products = set() + for script in sorted(Path(folder).glob(GOG_SCRIPTS)): + try: + actions = json.loads(script.read_text(encoding="utf-8-sig")).get("actions") + except (OSError, ValueError, AttributeError): + continue + if isinstance(actions, list) and any( + isinstance(action, dict) and isinstance(action.get("install"), dict) + and action["install"].get("action") == "setRegistry" for action in actions): + products.add(script.name[len("goggame-"):-len(".script")]) + return products + + +def gog_expected_values(folder): + """The fallback values a launch must find, so the marker never hides one that was deleted.""" + scripted = gog_scripted_products(folder) + return [gog_value_key(root, subkey, name) for product in gog_installed_products(folder) + if product in GOG_INSTALL_REGISTRY and product not in scripted + for root, subkey, name, _kind, _value in GOG_INSTALL_REGISTRY[product]] + + +def gog_registry(folder, existing=()): + entries, skipped, scripted = [], 0, set() for script in sorted(Path(folder).glob(GOG_SCRIPTS)): product = script.name[len("goggame-"):-len(".script")] try: @@ -434,11 +541,28 @@ def gog_registry(folder): skipped += 1 else: entries.append(entry) + scripted.add(product) + for product, info in gog_installed_products(folder).items(): + if product in scripted or product not in GOG_INSTALL_REGISTRY: + continue + paths = dict(gog_paths(folder, product), language=str(gog_language_id(info))) + for root, subkey, name, kind, value in GOG_INSTALL_REGISTRY[product]: + if gog_value_key(root, subkey, name) in existing: + continue + entry = gog_entry({"root": root, "subkey": subkey, "valueName": name, + "valueType": kind, "valueData": value}, paths) + if entry is None: + skipped += 1 + else: + entries.append(entry) return entries, skipped def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=None): - entries, skipped = gog_registry(folder) + pfx = Path(compat_data) / "pfx" if compat_data else None + existing = gog_registry_values(pfx) if pfx else set() + entries, skipped = gog_registry(folder, existing) + expected = gog_expected_values(folder) if installation: product = str(installation["id"]) if not product.isdigit(): @@ -465,10 +589,10 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=Non return "no-proton" + note text = "Windows Registry Editor Version 5.00\r\n\r\n" + "".join(entry + "\r\n\r\n" for entry in entries) stamp = hashlib.sha256(text.encode("utf-8")).hexdigest() - pfx = Path(compat_data) / "pfx" marker = pfx / GOG_REGISTRY_MARK try: - if marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file(): + if (marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file() + and set(expected) <= existing): return "ready" + note Path(compat_data).mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory(prefix="droiddeck-gog-") as tmp: diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index fcdcbb21ec..7ea5a1ae79 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -438,6 +438,120 @@ class GogRegistry(unittest.TestCase): ], entries) self.assertEqual(3, skipped) + def test_a_game_whose_support_installer_cannot_run_gets_the_install_registry(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'language': 'English', 'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + {'install': {'action': 'Execute', 'arguments': {'executable': 'galaxy_the_witcher_enhanced_edition_2.1.0.15.exe'}}}, + ]) + entries, skipped = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"RegionVersion"="US"', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"IsDjinniInstalled"=dword:00000001', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"Language"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"TextLanguage"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"VoiceLanguage"="3"', + ], entries) + self.assertEqual(0, skipped) + + def test_a_players_language_choice_is_not_overwritten(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + (data / 'pfx').mkdir(parents=True) + (data / 'pfx/user.reg').write_text( + '[Software\\\\OtherApp] 1\n"InstallFolder"="C:\\\\Other"\n\n' + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n"TextLanguage"="5"\n') + imported = [] + def run(argv, **kwargs): + imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + (data / 'pfx/system.reg').write_text('Wine registry') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + store.apply_gog_registry(folder, str(data), str(proton)) + text = imported[0] + self.assertNotIn('"TextLanguage"', text) + self.assertIn('"VoiceLanguage"', text) + self.assertIn('"InstallFolder"', text) + + def test_malformed_language_metadata_falls_back_to_english(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': 3})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="3"', entries[3]) + + def test_a_native_hklm_value_does_not_replace_the_32_bit_fallback(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + pfx = Path(root) / 'pfx' + pfx.mkdir() + (pfx / 'system.reg').write_text( + '[Software\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\Native"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertTrue(any('"InstallFolder"' in entry for entry in entries)) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\32bit"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertFalse(any('"InstallFolder"' in entry for entry in entries)) + + def test_a_deleted_fallback_value_is_imported_again(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + pfx = data / 'pfx' + pfx.mkdir(parents=True) + imported = [] + def run(argv, **kwargs): + imported.append(argv) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"InstallFolder"="C:\\\\Game"\n"RegionVersion"="US"\n' + '"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + (pfx / 'user.reg').write_text( + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n' + '"TextLanguage"="3"\n"VoiceLanguage"="3"\n') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + self.assertEqual('written=6', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual('none', store.apply_gog_registry(folder, str(data), str(proton))) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"RegionVersion"="US"\n"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + self.assertEqual('written=1', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual(2, len(imported)) + + def test_the_install_language_selects_the_titles_language_id(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['pl-PL']})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="5"', entries[3]) + + def test_a_script_that_sets_registry_keeps_its_own_values(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + set_registry(root='HKLM', subkey='Software\\CD Projekt Red\\The Witcher', + valueName='InstallFolder', valueData='{app}\\', valueType='string'), + ]) + entries, _ = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + ], entries) + def test_a_game_without_a_script_starts_without_proton(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog')