From d6566f0dbedd64942f7919117859a882d3818efa Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 6 Nov 2026 10:22:42 -0500 Subject: [PATCH 1/2] feat: GOG achievements on by default, drop stores engine row (#2168) --- .../droiddeck/launcher/stores/gog/GogComet.kt | 2 +- .../droiddeck/launcher/ui/StoresDownloads.kt | 1 - .../com/droiddeck/launcher/ui/StoresWidgets.kt | 18 ------------------ app/src/main/res/values-ar/strings.xml | 3 --- app/src/main/res/values-b+es+419/strings.xml | 3 --- app/src/main/res/values-bg/strings.xml | 3 --- app/src/main/res/values-cs/strings.xml | 3 --- app/src/main/res/values-da/strings.xml | 3 --- app/src/main/res/values-de/strings.xml | 3 --- app/src/main/res/values-el/strings.xml | 3 --- app/src/main/res/values-es/strings.xml | 3 --- app/src/main/res/values-fi/strings.xml | 3 --- app/src/main/res/values-fr/strings.xml | 3 --- app/src/main/res/values-hi/strings.xml | 3 --- app/src/main/res/values-hu/strings.xml | 3 --- app/src/main/res/values-in/strings.xml | 3 --- app/src/main/res/values-it/strings.xml | 3 --- app/src/main/res/values-ja/strings.xml | 3 --- app/src/main/res/values-ko/strings.xml | 3 --- app/src/main/res/values-ms/strings.xml | 3 --- app/src/main/res/values-nb/strings.xml | 3 --- app/src/main/res/values-nl/strings.xml | 3 --- app/src/main/res/values-pl/strings.xml | 3 --- app/src/main/res/values-pt-rPT/strings.xml | 3 --- app/src/main/res/values-pt/strings.xml | 3 --- app/src/main/res/values-ro/strings.xml | 3 --- app/src/main/res/values-ru/strings.xml | 3 --- app/src/main/res/values-sv/strings.xml | 3 --- app/src/main/res/values-th/strings.xml | 3 --- app/src/main/res/values-tr/strings.xml | 3 --- app/src/main/res/values-uk/strings.xml | 3 --- app/src/main/res/values-vi/strings.xml | 3 --- app/src/main/res/values-zh-rCN/strings.xml | 3 --- app/src/main/res/values-zh-rHK/strings.xml | 3 --- app/src/main/res/values-zh-rTW/strings.xml | 3 --- app/src/main/res/values/strings.xml | 3 --- 36 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/StoresWidgets.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt index 6bc1980f2a..dec376c456 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt @@ -39,7 +39,7 @@ object GogComet { var status by mutableStateOf("off") private set - fun enabled(context: Context) = GogPrefs.get(context).getBoolean("achievements", false) + fun enabled(context: Context) = GogPrefs.get(context).getBoolean("achievements", true) fun setEnabled(context: Context, on: Boolean) { GogPrefs.get(context).edit().putBoolean("achievements", on).apply() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index bd6898e68f..e4b70af9fe 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -545,6 +545,5 @@ internal fun storesSettingsStep(at: Rect, s: androidx.compose.runtime.Stateمخصَّص المتاجر فئة سرعة التنزيل - محرك المتاجر - ● المحرك جاهز - غير مبنيّ متوازن سريع أقصى 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 0ed75155df..8b1721bc10 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2298,9 +2298,6 @@ Personalizados Tiendas Nivel de velocidad de descarga - Motor de las tiendas - ● Motor listo - Sin compilar Equilibrado Rápido Máximo diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 60892c4e26..358d75a9aa 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2229,9 +2229,6 @@ Персонализирана Магазини Скорост на изтегляне - Ядро на магазините - ● Ядрото е готово - Не е компилирано Балансирано Бързо Максимално diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index cd16bb55a5..6754288b86 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2279,9 +2279,6 @@ Vlastní Obchody Úroveň rychlosti stahování - Jádro obchodů - ● Jádro je připraveno - Není sestaveno Vyvážené Rychlé Maximální diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 5cd13422dc..ea071e368d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2229,9 +2229,6 @@ Brugerdefineret Butikker Downloadhastighed - Butiksmotor - ● Motor klar - Ikke bygget Afbalanceret Hurtig Maks diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1d018727b0..80592b9cf9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2221,9 +2221,6 @@ Eigene Stores Download-Tempo - Store-Engine - ● Engine bereit - Nicht gebaut Ausgewogen Schnell Max. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c707441971..ed95ca732b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2229,9 +2229,6 @@ Προσαρμοσμένο Καταστήματα Επίπεδο ταχύτητας λήψης - Μηχανή καταστημάτων - ● Η μηχανή είναι έτοιμη - Δεν έχει χτιστεί Ισορροπημένο Ταχύ Μέγιστο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 515377e570..ec88bde659 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2254,9 +2254,6 @@ Personalizados Tiendas Nivel de velocidad de descarga - Motor de las tiendas - ● Motor listo - Sin compilar Equilibrado Rápido Máximo diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 117684b0e9..99d8f2927e 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2229,9 +2229,6 @@ Mukautettu Kaupat Latausnopeuden taso - Kauppojen moottori - ● Moottori valmis - Ei koottu Tasapainotettu Nopea Maksimi diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ddfb37df98..c1f038b346 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2254,9 +2254,6 @@ Personnalisé Boutiques Niveau de vitesse de téléchargement - Moteur des boutiques - ● Moteur prêt - Non compilé Équilibré Rapide Max diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0a0352c9c0..b93df883c4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2229,9 +2229,6 @@ कस्टम स्टोर डाउनलोड स्पीड टियर - स्टोर इंजन - ● इंजन तैयार - नहीं बना बैलेंस्ड फ़ास्ट मैक्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f874f6ec3f..c5c237894f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2229,9 +2229,6 @@ Egyéni Áruházak Letöltési sebességi szint - Áruházmotor - ● A motor kész - Nincs buildelve Kiegyensúlyozott Gyors Max diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d4533a63df..ae21a832e2 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2204,9 +2204,6 @@ Khusus Toko Tingkat kecepatan unduhan - Mesin toko - ● Mesin siap - Belum dibuat Seimbang Cepat Maks diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7f961d5b2e..8b398a0bf0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2246,9 +2246,6 @@ Personalizzati Negozi Livello di velocità di download - Motore dei negozi - ● Motore pronto - Non compilato Bilanciato Veloce Massimo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d65ec2dd54..bc94884bc4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2204,9 +2204,6 @@ カスタム ストア ダウンロード速度レベル - ストアエンジン - ● エンジン準備完了 - 未ビルド バランス 高速 最大 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 616b3ac824..a95aee40d6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2204,9 +2204,6 @@ 사용자 정의 스토어 다운로드 속도 단계 - 스토어 엔진 - ● 엔진 준비됨 - 빌드되지 않음 균형 빠름 최대 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 36f616f735..31ef4ac49a 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2204,9 +2204,6 @@ Tersuai Kedai Tahap kelajuan muat turun - Enjin kedai - ● Enjin sedia - Tidak dibina Seimbang Pantas Maksimum diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 77e3064058..a043a54e44 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2229,9 +2229,6 @@ Egendefinert Butikker Nedlastingshastighetsnivå - Butikkmotor - ● Motor klar - Ikke bygget Balansert Rask Maks diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9362590926..35c7869b43 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2229,9 +2229,6 @@ Aangepast Winkels Niveau voor downloadsnelheid - Winkels-engine - ● Engine gereed - Niet gebouwd Gebalanceerd Snel Max diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 659e20825e..d2a2215b0a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2279,9 +2279,6 @@ Własna Sklepy Poziom szybkości pobierania - Mechanizm sklepów - ● Mechanizm gotowy - Nie zbudowano Zbalansowany Szybki Maksymalny diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3d75d649b4..a9e731fdbf 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2246,9 +2246,6 @@ Personalizados Lojas Nível de velocidade de transferência - Motor das lojas - ● Motor pronto - Não compilado Equilibrado Rápido Máximo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7968e00e17..d7fbad21ab 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2246,9 +2246,6 @@ Personalizado Lojas Nível de velocidade de download - Mecanismo das lojas - ● Mecanismo pronto - Não compilado Equilibrado Rápido Máximo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3421e379f6..d1063b3e66 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2254,9 +2254,6 @@ Personalizat Magazine Nivelul vitezei de descărcare - Motorul magazinelor - ● Motor pregătit - Necompilat Echilibrat Rapid Maxim diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f5d7878aa0..d439181311 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2362,9 +2362,6 @@ Свои Магазины Уровень скорости загрузки - Движок магазинов - ● Движок готов - Не собран Сбалансированный Быстрый Максимальный diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5ac758d35d..9974ee7e40 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2229,9 +2229,6 @@ Egna Butiker Nedladdningshastighet - Butiksmotor - ● Motor redo - Inte byggd Balanserad Snabb Max diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 056bc0fabf..918e464e95 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2204,9 +2204,6 @@ กำหนดเอง สโตร์ ระดับความเร็วการดาวน์โหลด - เอนจินสโตร์ - ● เอนจินพร้อมใช้งาน - ยังไม่สร้าง สมดุล เร็ว สูงสุด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 215f70eb33..a216eba5c4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2221,9 +2221,6 @@ Özel Mağazalar İndirme hızı katmanı - Mağazalar motoru - ● Motor hazır - Derlenmedi Dengeli Hızlı Maks diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2ab7524fe0..ba1e2c40cd 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2279,9 +2279,6 @@ Власна Магазини Рівень швидкості завантаження - Рушій магазинів - ● Рушій готовий - Не зібрано Збалансований Швидкий Максимальний diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 20a229dbc8..67fce23953 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2204,9 +2204,6 @@ Tùy chỉnh Cửa hàng Mức tốc độ tải - Engine stores - ● Engine sẵn sàng - Chưa build Cân bằng Nhanh Tối đa diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index eb1a16a5b0..3741cc7a20 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2285,9 +2285,6 @@ 自定义 游戏商店 下载速度档位 - 商店引擎 - ● 引擎就绪 - 未构建 均衡 快速 最高 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8372aa2b25..13d936163e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2204,9 +2204,6 @@ 自訂 商店 下載速度等級 - 商店引擎 - ● 引擎已就緒 - 未建置 平衡 快速 最高 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 582f999643..36d9e27c97 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2204,9 +2204,6 @@ 自訂 遊戲商店 下載速度等級 - 商店引擎 - ● 引擎已就緒 - 尚未組建 平衡 快速 最高 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd341f6477..cc711e86e6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2454,9 +2454,6 @@ Custom Stores Download speed tier - Stores engine - ● Engine ready - Not built Balanced Fast Max From a1bc8467fd8c4591c5b2aa5c89b7e2215e063786 Mon Sep 17 00:00:00 2001 From: William Allen Date: Fri, 6 Nov 2026 09:43:44 -0600 Subject: [PATCH 2/2] feat: show Steam launch options on the Launch tab (#2163) * Show Steam launch options on the Launch tab * fix: Launch options is one row on the Launch tab, like the shortcut fields * fix(launch): reread Steam's launch options when the game page resumes * fix(launch): keep launch options disabled while they reload on resume * fix(launch): a saved launch option is not replaced by a read that started before it * fix(launch): an unreadable Steam config keeps the shown launch options instead of clearing them * fix(launch): an unparsable Steam config and a pending reload keep the shown launch options * fix(launch): the resume reload follows the game the panel shows --------- Co-authored-by: maxjivi05 --- .../launcher/frontend/SteamLaunchOptions.kt | 7 +- .../droiddeck/launcher/ui/AddedGameEditor.kt | 116 +++++++++++------- .../com/droiddeck/launcher/ui/GameDetail.kt | 6 + .../frontend/SteamLaunchOptionsTest.kt | 5 +- .../ui/SteamLaunchOptionsVisibilityTest.kt | 21 ++++ 5 files changed, 109 insertions(+), 46 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/SteamLaunchOptionsVisibilityTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt index cc832db347..9a8137d352 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt @@ -14,8 +14,8 @@ object SteamLaunchOptions { private const val TAG = "SteamLaunchOptions" private val STEAM = listOf("UserLocalConfigStore", "Software", "Valve", "Steam") - fun current(context: Context, appId: Int): String = - SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: steam(SessionPrefs.activeSteamRoot(context), appId).orEmpty() + fun current(context: Context, appId: Int): String? = + SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: steam(SessionPrefs.activeSteamRoot(context), appId) enum class Saved { YES, NO, DESKTOP } @@ -35,7 +35,8 @@ object SteamLaunchOptions { internal fun steam(steamHome: File, appId: Int): String? { val config = AddedGames.accountConfig(steamHome) ?: return null val text = runCatching { File(config, "localconfig.vdf").readText() }.getOrNull() ?: return null - return launchOptions(text, appId) + if (section(text, STEAM) == null) return null + return launchOptions(text, appId).orEmpty() } internal fun write(steamHome: File, appId: Int, options: String): Boolean { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt index 7e0103ec8e..89e1480869 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -49,7 +49,9 @@ import androidx.compose.ui.input.InputMode import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalConfiguration import android.content.Context +import androidx.compose.runtime.DisposableEffect import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -60,6 +62,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver import coil.compose.AsyncImage import com.droiddeck.launcher.R import com.droiddeck.launcher.frontend.AddedGameArt @@ -192,7 +196,7 @@ internal fun SteamGameArtEditor( game: com.droiddeck.launcher.frontend.Library.SteamGame, onClose: () -> Unit, onChanged: () -> Unit, ) { val target = remember(game.appId) { ArtTarget.of(game) } - ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged, launchAppId = game.appId) + ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged) } @Composable @@ -208,25 +212,17 @@ internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Uni @Composable private fun ArtOnlyEditor( name: String, target: ArtTarget?, refresh: Any?, describe: (Context) -> List, - onClose: () -> Unit, onChanged: () -> Unit, launchAppId: Int? = null, + onClose: () -> Unit, onChanged: () -> Unit, ) { val app = LocalContext.current.applicationContext - val colors = MaterialTheme.colorScheme - val scope = rememberCoroutineScope() val shown = rememberShown(onClose) val close = { shown.targetState = false } var version by remember { mutableIntStateOf(0) } var arts by remember { mutableStateOf>(emptyList()) } var artSlot by remember { mutableStateOf(null) } var logoOpen by remember { mutableStateOf(false) } - var launchOptions by remember { mutableStateOf(null) } - var launchVersion by remember { mutableIntStateOf(0) } - var editingLaunch by remember { mutableStateOf(null) } - var launchSaving by remember { mutableStateOf(false) } - var launchError by remember { mutableStateOf(null) } val position = rememberLogoPosition(target, version) LaunchedEffect(version, refresh) { if (target != null) arts = withContext(Dispatchers.IO) { describe(app) } } - LaunchedEffect(launchAppId, launchVersion) { if (launchAppId != null) launchOptions = withContext(Dispatchers.IO) { SteamLaunchOptions.current(app, launchAppId) } } val first = remember { FocusRequester() } LaunchedEffect(Unit) { focusWithinFrames({ false }) { first } } AppDialog(shown, close, "artEditor", wide = false, maxWidth = 460.dp) { @@ -236,19 +232,10 @@ private fun ArtOnlyEditor( verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()), ) { - if (launchAppId != null) { - FieldRow(stringResource(R.string.edit_launch_options), focus = first, onClick = { if (!launchSaving) launchOptions?.let { editingLaunch = it } }) { - val options = launchOptions - if (options == null || launchSaving) Loading() else ValueText(options.ifEmpty { "—" }, muted = options.isEmpty()) - } - val error = launchError - if (error != null) Text(stringResource(error), fontSize = 12.sp, color = colors.error, modifier = Modifier.padding(start = 4.dp)) - else Text(stringResource(R.string.edit_launch_options_steam_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp)) - } - Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = if (launchAppId != null) 8.dp else 2.dp)) + Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp)) for (slot in AddedGameArt.Slot.values()) key(slot) { val state = arts.firstOrNull { it.slot == slot } - FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER && launchAppId == null) first else null, onClick = { if (target != null) artSlot = slot }) { + FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER) first else null, onClick = { if (target != null) artSlot = slot }) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { SlotThumb(slot, state?.file) if (state != null) ValueText(artSourceLabel(state.source), muted = true) else Loading() @@ -258,27 +245,6 @@ private fun ArtOnlyEditor( PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } } } - val before = editingLaunch - if (before != null && launchAppId != null) TextEntryDialog(stringResource(R.string.edit_launch_options), before, onDismiss = { editingLaunch = null }) { value -> - if (launchSaving || value == before.trim()) return@TextEntryDialog - launchSaving = true - scope.launch { - try { - val saved = withContext(Dispatchers.IO) { SteamLaunchOptions.set(app, launchAppId, value, before) } - launchError = when (saved) { - SteamLaunchOptions.Saved.YES -> null - SteamLaunchOptions.Saved.DESKTOP -> R.string.edit_launch_options_desktop - SteamLaunchOptions.Saved.NO -> R.string.edit_launch_options_not_saved - } - if (saved == SteamLaunchOptions.Saved.YES) launchOptions = value else { - launchOptions = null - launchVersion++ - } - } finally { - launchSaving = false - } - } - } val chosen = target ?: return artSlot?.let { slot -> ArtChooserDialog(chosen, slot, arts.firstOrNull { it.slot == slot }, onBack = { artSlot = null }, onCloseAll = { artSlot = null; close() }) { version++; onChanged() } @@ -287,6 +253,72 @@ private fun ArtOnlyEditor( if (logoOpen && loaded != null) LogoPositionHost(chosen, arts, loaded, onBack = { logoOpen = false }, onCloseAll = { logoOpen = false; close() }) { version++; onChanged() } } +@Composable +internal fun SteamLaunchOptionsPanel(appId: Int) { + val app = LocalContext.current.applicationContext + val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() + var options by remember(appId) { mutableStateOf(null) } + var version by remember(appId) { mutableIntStateOf(0) } + var editing by remember(appId) { mutableStateOf(null) } + var saving by remember(appId) { mutableStateOf(false) } + var loading by remember(appId) { mutableStateOf(false) } + var error by remember(appId) { mutableStateOf(null) } + LaunchedEffect(appId, version) { + options = withContext(Dispatchers.IO) { SteamLaunchOptions.current(app, appId) } ?: options.orEmpty() + loading = false + } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle, appId) { + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_RESUME && !saving) { + loading = true + version++ + } + } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } + Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { + val value = options + MenuItem( + stringResource(R.string.edit_launch_options), checked = false, enabled = value != null && !saving && !loading, + detail = if (value == null || saving || loading) "…" else value.ifEmpty { "—" }, + ) { if (!saving && !loading) options?.let { editing = it } } + val message = error + Text( + stringResource(message ?: R.string.edit_launch_options_steam_hint), + fontSize = 12.sp, + color = if (message == null) colors.onSurfaceVariant else colors.error, + modifier = Modifier.padding(start = 4.dp), + ) + } + val before = editing + if (before != null) TextEntryDialog(stringResource(R.string.edit_launch_options), before, onDismiss = { editing = null }) { value -> + if (saving || value == before.trim()) return@TextEntryDialog + saving = true + scope.launch { + try { + val saved = withContext(Dispatchers.IO) { SteamLaunchOptions.set(app, appId, value, before) } + error = when (saved) { + SteamLaunchOptions.Saved.YES -> null + SteamLaunchOptions.Saved.DESKTOP -> R.string.edit_launch_options_desktop + SteamLaunchOptions.Saved.NO -> R.string.edit_launch_options_not_saved + } + if (saved == SteamLaunchOptions.Saved.YES) { + options = value + version++ + } else { + options = null + version++ + } + } finally { + saving = false + } + } + } +} + private class LoadedPosition(val value: LogoPosition.Value?) @Composable 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 915a621756..e1e027d78f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -808,11 +808,17 @@ private fun LaunchTab(game: Library.SteamGame, s: FrontEndState, a: FrontEndActi val host = rememberMenuHost() Column(verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth()) { LaunchSettings(s, a, host, game, hopRail ?: GameRef.key(game)) + if (canEditSteamLaunchOptions(game, s.shortcutPicker)) { + SteamLaunchOptionsPanel(game.appId) + } val folder = game.gameFiles if (game.library == Library.ADDED && game.source == Library.ADDED && !s.shortcutPicker && folder != null) ShortcutFields(game, folder) } } +internal fun canEditSteamLaunchOptions(game: Library.SteamGame, shortcutPicker: Boolean): Boolean = + !shortcutPicker && game.source == Library.SOURCE_STEAM && game.library != Library.ADDED + @Composable private fun ShortcutFields(game: Library.SteamGame, folder: File) { val ctx = LocalContext.current diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt index 46cdd111c5..67d073fa9c 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt @@ -117,7 +117,10 @@ class SteamLaunchOptionsTest { assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) config.writeText(SteamLaunchOptions.withLaunchOptions(config.readText(), 1790600, "-vulkan")!!) assertEquals("-vulkan", SteamLaunchOptions.steam(home, 1790600)) - assertNull(SteamLaunchOptions.steam(home, 400)) + assertEquals("", SteamLaunchOptions.steam(home, 400)) + assertNull(SteamLaunchOptions.steam(steamHome(tmp.newFolder("Unread")), 1790600)) + config.writeText("") + assertNull(SteamLaunchOptions.steam(home, 1790600)) } private val app get() = RuntimeEnvironment.getApplication() diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SteamLaunchOptionsVisibilityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SteamLaunchOptionsVisibilityTest.kt new file mode 100644 index 0000000000..2d18b72922 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/SteamLaunchOptionsVisibilityTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class SteamLaunchOptionsVisibilityTest { + private fun game(library: String = "main", source: String = Library.SOURCE_STEAM) = + Library.SteamGame(42, "Test game", null, library, source = source) + + @Test fun nativeSteamGamesExposeLaunchOptionsOutsideShortcutPicking() { + assertTrue(canEditSteamLaunchOptions(game(), shortcutPicker = false)) + } + + @Test fun pickerAddedAndStoreGamesDoNotExposeSteamLaunchOptions() { + assertFalse(canEditSteamLaunchOptions(game(), shortcutPicker = true)) + assertFalse(canEditSteamLaunchOptions(game(library = Library.ADDED), shortcutPicker = false)) + assertFalse(canEditSteamLaunchOptions(game(source = "gog"), shortcutPicker = false)) + } +}