From 012d2579accaf18cca95f779c31b32b18cb453c4 Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Sun, 10 May 2026 15:03:12 +0100 Subject: [PATCH 1/7] git commit -m "fix(): Disable install button and give warning for not able to support 3rd party launchers in Epic" --- .../java/app/gamenative/ui/data/GameDisplayInfo.kt | 1 + .../ui/screen/library/LibraryAppScreen.kt | 14 +++++++++++++- .../ui/screen/library/appscreen/EpicAppScreen.kt | 13 +++++++++++-- app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 3 ++- app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 5 +++-- app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 3 ++- app/src/main/res/values-zh-rTW/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 1 + 17 files changed, 44 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/app/gamenative/ui/data/GameDisplayInfo.kt b/app/src/main/java/app/gamenative/ui/data/GameDisplayInfo.kt index 8aead2a8bf..3e9c81a248 100644 --- a/app/src/main/java/app/gamenative/ui/data/GameDisplayInfo.kt +++ b/app/src/main/java/app/gamenative/ui/data/GameDisplayInfo.kt @@ -22,5 +22,6 @@ data class GameDisplayInfo( val headerUrl: String? = null, // Header image URL (for SteamGridDB, can use grid as header) val compatibilityMessage: String? = null, // Compatibility message text (e.g., "Works on your GPU") val compatibilityColor: ULong? = null, // Compatibility message color (ARGB) + val disabledWarning: String ? = null // Warning message if the game is disabled (e.g., "Not compatible due to 3rd party Client") ) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt index 937d077b40..47c97d865b 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt @@ -192,6 +192,7 @@ private fun PrimaryActionButton( val buttonColor = when { isDownloading -> PluviaTheme.colors.statusDownloading isInstalled -> PluviaTheme.colors.statusInstalled + !enabled -> PluviaTheme.colors.textMuted else -> PluviaTheme.colors.statusAvailable } @@ -272,7 +273,8 @@ private fun PrimaryActionButton( ) } } - } else { + } + else { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), @@ -935,6 +937,15 @@ internal fun AppScreenContent( color = Color(displayInfo.compatibilityColor), ) } + // Compatibility status (if applicable) + if (displayInfo.disabledWarning != null && buttonEnabled == false) { + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = displayInfo.disabledWarning, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.error, + ) + } } } @@ -1242,6 +1253,7 @@ private fun Preview_AppScreen() { sizeFromStore = null, lastPlayedText = null, playtimeText = null, + disabledWarning = "3rd Party games not supported" ) PluviaTheme { Surface { diff --git a/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt index 8f1310e2fc..158af53fe5 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt @@ -45,7 +45,6 @@ import kotlinx.coroutines.withContext import app.gamenative.ui.util.SnackbarManager import timber.log.Timber -// TODO: Verify all tests and do DLC auto-install with base game. class EpicAppScreen : BaseAppScreen() { companion object { @@ -273,6 +272,11 @@ class EpicAppScreen : BaseAppScreen() { sizeFromStore = sizeFromStore, compatibilityMessage = compatibilityMessage, compatibilityColor = compatibilityColor, + disabledWarning = if (game != null && game.thirdPartyManagedApp.isNotEmpty()) { + context.getString(R.string.epic_disabled_warning_third_party_client, game.thirdPartyManagedApp) + } else { + null + } ) Timber.tag(TAG).d("Returning GameDisplayInfo: name=${displayInfo.name}, iconUrl=${displayInfo.iconUrl}, heroImageUrl=${displayInfo.heroImageUrl}, developer=${displayInfo.developer}, installLocation=${displayInfo.installLocation}") return displayInfo @@ -293,10 +297,15 @@ class EpicAppScreen : BaseAppScreen() { override fun isValidToDownload(context: Context, libraryItem: LibraryItem): Boolean { Timber.tag(TAG).d("isValidToDownload: checking appId=${libraryItem.appId}") + // Epic games can be downloaded if not already installed or downloading val installed = isInstalled(context, libraryItem) val downloading = isDownloading(context, libraryItem) - val valid = !installed && !downloading + + val game = EpicService.getEpicGameOf(libraryItem.gameId) + val requiresThirdPartyApp = game?.thirdPartyManagedApp?.isNotEmpty() == true + + val valid = !installed && !downloading && !requiresThirdPartyApp Timber.tag(TAG).d("isValidToDownload: appId=${libraryItem.appId}, installed=$installed, downloading=$downloading, valid=$valid") return valid } diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 1e503fb15f..eed5ed3079 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1234,6 +1234,7 @@ Logger ud fra Amazon Games… + Spil med tredjeparts-launcher understøttes ikke (%1$s) Afinstallér spil Er du sikker på, at du vil afinstallere %1$s? Denne handling kan ikke fortrydes. Download spil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a72a9f0726..017c4b7f8a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1304,6 +1304,7 @@ Melde von Amazon Games ab… + Spiele mit Drittanbieter-Launcher werden nicht unterstützt (%1$s) Spiel deinstallieren Möchtest du %1$s wirklich deinstallieren? Diese Aktion kann nicht rückgängig gemacht werden. Spiel herunterladen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 27d90a70b8..86cc1615b4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -54,6 +54,7 @@ ¿Deseas desinstalar %1$s? Esta acción no se puede deshacer. Instalar juego La aplicación a instalar requiere el siguiente espacio. ¿Deseas continuar?\n\n\tTamaño de descarga: %1$s\n\tEspacio disponible: %2$s + Los juegos con lanzador de terceros no son compatibles (%1$s) Desinstalar juego ¿Deseas desinstalar %1$s? Esta acción no se puede deshacer. Instalar juego diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 97f5922dec..1618f214fd 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1364,6 +1364,7 @@ Déconnexion d\'Amazon Games… + Les jeux nécessitant un lanceur tiers ne sont pas pris en charge (%1$s) Désinstaller le jeu Êtes-vous sûr de vouloir désinstaller %1$s ? Cette action ne peut pas être annulée. Télécharger le jeu diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index cc44bff4bb..a9e71cf7b5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1360,6 +1360,7 @@ Uscita da Amazon Games… + I giochi con launcher di terze parti non sono supportati (%1$s) Disinstalla gioco Sei sicuro di voler disinstallare %1$s? Questa azione non può essere annullata. Scarica gioco diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5c463e9eec..431e705624 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -54,6 +54,7 @@ %1$s을(를) 제거하시겠습니까? 이 작업은 취소할 수 없습니다. 게임 다운로드 설치할 앱의 공간 요구사항은 다음과 같습니다. 계속하시겠습니까?\n\n\t다운로드 크기: %1$s\n\t사용 가능한 공간: %2$s + 서드파티 런처 게임은 지원되지 않습니다 (%1$s) 게임 제거 %1$s을(를) 제거하시겠습니까? 이 작업은 취소할 수 없습니다. 게임 다운로드 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a5b681fadc..f707110886 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -54,6 +54,7 @@ Czy na pewno chcesz odinstalować %1$s? Tej akcji nie można cofnąć. Pobierz grę Instalowana aplikacja ma następujące wymagania dotyczące miejsca. Czy chcesz kontynuować?\n\n\tRozmiar pobierania: %1$s\n\tDostępne miejsce: %2$s + Gry wymagające zewnętrznego launchera nie są obsługiwane (%1$s) Odinstaluj grę Czy na pewno chcesz odinstalować %1$s? Tej akcji nie można cofnąć. Pobierz grę @@ -865,7 +866,7 @@ Menedżer sterowników Wybierz sterownik Importuj ZIP z urządzenia - + Menedżer zawartości Importuj .wcp z urządzenia diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4090a95f42..63c11b8fa2 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1234,6 +1234,7 @@ Saindo do Amazon Games… + Jogos com launcher de terceiros não são suportados (%1$s) Desinstalar jogo Tem certeza de que deseja desinstalar %1$s? Esta ação não pode ser desfeita. Baixar jogo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ac772c39bb..b9cbb2438a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1369,6 +1369,7 @@ Se deconectează de la Amazon Games… + Jocurile cu lansator terț nu sunt acceptate (%1$s) Dezinstalare joc Sigur vrei să dezinstalezi %1$s? Această acțiune nu poate fi anulată. Descărcare joc diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3106a5af4d..5cd975d777 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -374,6 +374,7 @@ Ошибка удаления: %1$s Ошибка удаления: %1$s Вы уверены, что хотите удалить %1$s? Это действие не может быть отменено. + Игры со сторонними лаунчерами не поддерживаются (%1$s) Удалить игру Ошибка: невалидно Ошибка @@ -675,9 +676,9 @@ Ubuntu RootFs - releases.ubuntu.com/focal Переключить выпадающее меню Закрыть Лупа - Вы уже вошли на другом устройстве и играете в %s. + Вы уже вошли на другом устройстве и играете в %s. Вы всё ещё можете играть в эту игру, но это отключит другой сеанс от Steam. - Вы уже вошли на другом устройстве (%1$s) и играете в %2$s (%3$s), и это сохранение ещё не в облаке. + Вы уже вошли на другом устройстве (%1$s) и играете в %2$s (%3$s), и это сохранение ещё не в облаке. Вы всё ещё можете играть в эту игру, но это отключит другой сеанс от Steam и может создать конфликт сохранений, когда прогресс того сеанса синхронизируется Приложение запущено Сеанс приложения приостановлен. Пожалуйста, перезапустите приложение. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 863e48f29d..2adec2b2c4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1363,6 +1363,7 @@ Вихід з Amazon Games… + Ігри зі стороннім лаунчером не підтримуються (%1$s) Деінсталювати гру Ви впевнені, що хочете деінсталювати %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 dd00a899ea..159784f42f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1359,6 +1359,7 @@ 正在从 Amazon Games 注销… + 不支持需要第三方启动器的游戏 (%1$s) 卸载游戏 您确定要卸载 %1$s 吗？此操作无法撤回。 下载游戏 @@ -1513,4 +1514,4 @@ 将从 Steam 下载 Lossless Scaling 以启用帧生成。 正在下载 Lossless Scaling… 降低画质以提升吞吐量 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2fb11d37bd..65b41eb42a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1362,6 +1362,7 @@ 正在從 Amazon Games 登出… + 不支援需要第三方啟動器的遊戲 (%1$s) 卸載遊戲 您確定要卸載 %1$s 嗎？此操作無法撤回。 下載遊戲 @@ -1505,4 +1506,4 @@ 將從 Steam 下載 Lossless Scaling 以啟用幀生成。 正在下載 Lossless Scaling… 降低畫質以提升吞吐量 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9e96128cb7..4dbc9f6436 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,6 +54,7 @@ Are you sure you want to uninstall %1$s? This action cannot be undone. Download Game The app being installed has the following space requirements. Would you like to proceed?\n\n\tDownload Size: %1$s\n\tAvailable Space: %2$s + Third-party launcher games are currently not supported on Epic Store Uninstall Game Are you sure you want to uninstall %1$s? This action cannot be undone. Download Game From f68cac658afecb1519564bba15737611a80774b9 Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Sun, 10 May 2026 15:09:17 +0100 Subject: [PATCH 2/7] fix(): adjusted colour to make it more vibrantly red. --- .../java/app/gamenative/ui/screen/library/LibraryAppScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt index 47c97d865b..8aadf2ab02 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt @@ -943,7 +943,7 @@ internal fun AppScreenContent( Text( text = displayInfo.disabledWarning, style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.error, + color = Color.Red.copy(alpha = 0.8f), ) } } From b43fe06cb77ba568138629dbedfd3c5cdffab3b0 Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Sun, 10 May 2026 16:06:56 +0100 Subject: [PATCH 3/7] fix(): fixed translations and adjusted to remove the injected property as we don't really care for it. --- .../gamenative/ui/screen/library/appscreen/EpicAppScreen.kt | 4 ++-- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt index 158af53fe5..a663318329 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/appscreen/EpicAppScreen.kt @@ -273,12 +273,12 @@ class EpicAppScreen : BaseAppScreen() { compatibilityMessage = compatibilityMessage, compatibilityColor = compatibilityColor, disabledWarning = if (game != null && game.thirdPartyManagedApp.isNotEmpty()) { - context.getString(R.string.epic_disabled_warning_third_party_client, game.thirdPartyManagedApp) + context.getString(R.string.epic_disabled_warning_third_party_client) } else { null } ) - Timber.tag(TAG).d("Returning GameDisplayInfo: name=${displayInfo.name}, iconUrl=${displayInfo.iconUrl}, heroImageUrl=${displayInfo.heroImageUrl}, developer=${displayInfo.developer}, installLocation=${displayInfo.installLocation}") + Timber.tag(TAG).d("Returning GameDisplayInfo: name=${displayInfo.name}, iconUrl=${displayInfo.iconUrl}, heroImageUrl=${displayInfo.heroImageUrl}, developer=${displayInfo.developer}, installLocation=${displayInfo.installLocation} thirdPartyApp=${game?.thirdPartyManagedApp}") return displayInfo } diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index eed5ed3079..aea880a7bc 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1234,7 +1234,7 @@ Logger ud fra Amazon Games… - Spil med tredjeparts-launcher understøttes ikke (%1$s) + Spil med tredjeparts-launcher understøttes ikke i øjeblikket på Epic Store Afinstallér spil Er du sikker på, at du vil afinstallere %1$s? Denne handling kan ikke fortrydes. Download spil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 017c4b7f8a..70d6133436 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1304,7 +1304,7 @@ Melde von Amazon Games ab… - Spiele mit Drittanbieter-Launcher werden nicht unterstützt (%1$s) + Spiele mit Drittanbieter-Launcher werden im Epic Store derzeit nicht unterstützt Spiel deinstallieren Möchtest du %1$s wirklich deinstallieren? Diese Aktion kann nicht rückgängig gemacht werden. Spiel herunterladen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 86cc1615b4..be1742692e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -54,7 +54,7 @@ ¿Deseas desinstalar %1$s? Esta acción no se puede deshacer. Instalar juego La aplicación a instalar requiere el siguiente espacio. ¿Deseas continuar?\n\n\tTamaño de descarga: %1$s\n\tEspacio disponible: %2$s - Los juegos con lanzador de terceros no son compatibles (%1$s) + Los juegos con lanzador de terceros no son compatibles actualmente en Epic Store Desinstalar juego ¿Deseas desinstalar %1$s? Esta acción no se puede deshacer. Instalar juego diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1618f214fd..17115c74bc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1364,7 +1364,7 @@ Déconnexion d\'Amazon Games… - Les jeux nécessitant un lanceur tiers ne sont pas pris en charge (%1$s) + Les jeux nécessitant un lanceur tiers ne sont actuellement pas pris en charge sur Epic Store Désinstaller le jeu Êtes-vous sûr de vouloir désinstaller %1$s ? Cette action ne peut pas être annulée. Télécharger le jeu diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a9e71cf7b5..b3d5f66a8e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1360,7 +1360,7 @@ Uscita da Amazon Games… - I giochi con launcher di terze parti non sono supportati (%1$s) + I giochi con launcher di terze parti non sono attualmente supportati su Epic Store Disinstalla gioco Sei sicuro di voler disinstallare %1$s? Questa azione non può essere annullata. Scarica gioco diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 431e705624..2baa5c8735 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -54,7 +54,7 @@ %1$s을(를) 제거하시겠습니까? 이 작업은 취소할 수 없습니다. 게임 다운로드 설치할 앱의 공간 요구사항은 다음과 같습니다. 계속하시겠습니까?\n\n\t다운로드 크기: %1$s\n\t사용 가능한 공간: %2$s - 서드파티 런처 게임은 지원되지 않습니다 (%1$s) + 서드파티 런처 게임은 현재 Epic Store에서 지원되지 않습니다 게임 제거 %1$s을(를) 제거하시겠습니까? 이 작업은 취소할 수 없습니다. 게임 다운로드 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f707110886..e804a41448 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -54,7 +54,7 @@ Czy na pewno chcesz odinstalować %1$s? Tej akcji nie można cofnąć. Pobierz grę Instalowana aplikacja ma następujące wymagania dotyczące miejsca. Czy chcesz kontynuować?\n\n\tRozmiar pobierania: %1$s\n\tDostępne miejsce: %2$s - Gry wymagające zewnętrznego launchera nie są obsługiwane (%1$s) + Gry wymagające zewnętrznego launchera nie są obecnie obsługiwane w Epic Store Odinstaluj grę Czy na pewno chcesz odinstalować %1$s? Tej akcji nie można cofnąć. Pobierz grę diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 63c11b8fa2..5810c94182 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1234,7 +1234,7 @@ Saindo do Amazon Games… - Jogos com launcher de terceiros não são suportados (%1$s) + Jogos com launcher de terceiros não são suportados atualmente na Epic Store Desinstalar jogo Tem certeza de que deseja desinstalar %1$s? Esta ação não pode ser desfeita. Baixar jogo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b9cbb2438a..f870d6b627 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1369,7 +1369,7 @@ Se deconectează de la Amazon Games… - Jocurile cu lansator terț nu sunt acceptate (%1$s) + Jocurile cu lansator terț nu sunt acceptate în prezent pe Epic Store Dezinstalare joc Sigur vrei să dezinstalezi %1$s? Această acțiune nu poate fi anulată. Descărcare joc diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5cd975d777..8b6b325c4f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -374,7 +374,7 @@ Ошибка удаления: %1$s Ошибка удаления: %1$s Вы уверены, что хотите удалить %1$s? Это действие не может быть отменено. - Игры со сторонними лаунчерами не поддерживаются (%1$s) + Игры со сторонними лаунчерами в настоящее время не поддерживаются в Epic Store Удалить игру Ошибка: невалидно Ошибка diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2adec2b2c4..864e7bd1f4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1363,7 +1363,7 @@ Вихід з Amazon Games… - Ігри зі стороннім лаунчером не підтримуються (%1$s) + Ігри зі стороннім лаунчером наразі не підтримуються в Epic Store Деінсталювати гру Ви впевнені, що хочете деінсталювати %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 159784f42f..2097fd1f75 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1359,7 +1359,7 @@ 正在从 Amazon Games 注销… - 不支持需要第三方启动器的游戏 (%1$s) + Epic 商店目前不支持需要第三方启动器的游戏 卸载游戏 您确定要卸载 %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 65b41eb42a..3a0ae529a7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1362,7 +1362,7 @@ 正在從 Amazon Games 登出… - 不支援需要第三方啟動器的遊戲 (%1$s) + Epic 商店目前不支援需要第三方啟動器的遊戲 卸載遊戲 您確定要卸載 %1$s 嗎？此操作無法撤回。 下載遊戲 From 0a2dc494fcda116ad3765fd9a9a85c72555c3d73 Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Fri, 22 May 2026 08:45:11 +0100 Subject: [PATCH 4/7] fix(): Adjusted libraryAppScreen to show only the warning when it's available instead of both the warning AND the compat info --- .../ui/screen/library/LibraryAppScreen.kt | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt index 8aadf2ab02..84e0487bdb 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt @@ -926,9 +926,16 @@ internal fun AppScreenContent( } } } - } - - // Compatibility status (if applicable) + } + // DisabledWarning or compatibility notice for game. + if(displayInfo.disabledWarning != null && buttonEnabled == false){ + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = displayInfo.disabledWarning, + style = MaterialTheme.typography.labelSmall, + color = Color.Red.copy(alpha = 0.8f), + ) + } else if { if (displayInfo.compatibilityMessage != null && displayInfo.compatibilityColor != null) { Spacer(modifier = Modifier.height(8.dp)) Text( @@ -937,15 +944,6 @@ internal fun AppScreenContent( color = Color(displayInfo.compatibilityColor), ) } - // Compatibility status (if applicable) - if (displayInfo.disabledWarning != null && buttonEnabled == false) { - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = displayInfo.disabledWarning, - style = MaterialTheme.typography.labelSmall, - color = Color.Red.copy(alpha = 0.8f), - ) - } } } From 19516ef077eab5b9b0a034bcd7e0605f0e9a5362 Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Fri, 22 May 2026 08:48:52 +0100 Subject: [PATCH 5/7] fix(): Fix extra brace --- .../java/app/gamenative/ui/screen/library/LibraryAppScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt index 84e0487bdb..628c6a13dd 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt @@ -945,7 +945,6 @@ internal fun AppScreenContent( ) } } - } // Content section below hero with solid background Column( From 1647c801f5b3fc473eb2dd07857e42860daf774f Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Fri, 22 May 2026 08:51:49 +0100 Subject: [PATCH 6/7] fix(): brakets and syntax fix --- .../ui/screen/library/LibraryAppScreen.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt index 628c6a13dd..15e110fe01 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt @@ -935,15 +935,13 @@ internal fun AppScreenContent( style = MaterialTheme.typography.labelSmall, color = Color.Red.copy(alpha = 0.8f), ) - } else if { - if (displayInfo.compatibilityMessage != null && displayInfo.compatibilityColor != null) { - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = displayInfo.compatibilityMessage, - style = MaterialTheme.typography.labelSmall, - color = Color(displayInfo.compatibilityColor), - ) - } + } else if (displayInfo.compatibilityMessage != null && displayInfo.compatibilityColor != null) { + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = displayInfo.compatibilityMessage, + style = MaterialTheme.typography.labelSmall, + color = Color(displayInfo.compatibilityColor), + ) } // Content section below hero with solid background From 8ae6a2bd65f08aeeeb7ebf144b240dffc73b2c75 Mon Sep 17 00:00:00 2001 From: Daniel Joyce Date: Fri, 22 May 2026 09:02:32 +0100 Subject: [PATCH 7/7] fix(): fixed formatting etc. --- .../app/gamenative/ui/screen/library/LibraryAppScreen.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt index 15e110fe01..42182aba72 100644 --- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt +++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt @@ -273,8 +273,7 @@ private fun PrimaryActionButton( ) } } - } - else { + } else { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), @@ -943,6 +942,8 @@ internal fun AppScreenContent( color = Color(displayInfo.compatibilityColor), ) } + } + } // Content section below hero with solid background Column(