From 1b6b0156bca66a493d131e4de20ffd29484f1218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 13 Jan 2026 12:28:48 +0100 Subject: [PATCH] Fix theme selection for android --- .../java/io/guh/nymeaapp/NymeaAppActivity.java | 13 ++++++++++++- version.txt | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java index 75dbb601..f0464be2 100644 --- a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java +++ b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java @@ -50,7 +50,13 @@ public class NymeaAppActivity extends QtActivity @Override public void onCreate(Bundle savedInstanceState) { Log.w(TAG, "Create activity"); - setTheme(R.style.NormalTheme); + int themeId = resolveStyleResource("NormalTheme"); + if (themeId != 0) { + setTheme(themeId); + } else { + Log.w(TAG, "NormalTheme style missing, falling back to system theme"); + setTheme(android.R.style.Theme_DeviceDefault_DayNight); + } super.onCreate(savedInstanceState); if (Build.VERSION.SDK_INT >= 35) { // Let the system handle insets to avoid double padding in Qt content. @@ -259,4 +265,9 @@ public class NymeaAppActivity extends QtActivity Log.e(TAG, "Failed to inspect android.app.static_init_classes meta-data", exception); } } + + private int resolveStyleResource(String resourceName) { + // Resolve app resources dynamically to support branded package names. + return getResources().getIdentifier(resourceName, "style", getPackageName()); + } } diff --git a/version.txt b/version.txt index 32a7722c..327037ca 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ 1.11.2 -698 +699