1 files changed, 93 insertions, 20 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp
index c5b9ba9dee..7b9072df69 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.cpp
+++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp
@@ -4,6 +4,7 @@
 #include "androidjnimain.h"
 #include "androidjnimenu.h"
 #include "qandroidplatformtheme.h"
+#include "qandroidplatformiconengine.h"
 #include "qandroidplatformmenubar.h"
 #include "qandroidplatformmenu.h"
 #include "qandroidplatformmenuitem.h"
@@ -22,6 +23,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcQpaMenus, "qt.qpa.menus")
+
 using namespace Qt::StringLiterals;
 
 namespace {
@@ -158,14 +161,10 @@ QJsonObject AndroidStyle::loadStyleData()
     if (!stylePath.isEmpty() && !stylePath.endsWith(slashChar))
         stylePath += slashChar;
 
-    Q_ASSERT(!stylePath.isEmpty());
-
-    QString androidTheme = QLatin1StringView(qgetenv("QT_ANDROID_THEME"));
-    if (!androidTheme.isEmpty() && !androidTheme.endsWith(slashChar))
-        androidTheme += slashChar;
+    if (QAndroidPlatformIntegration::colorScheme() == Qt::ColorScheme::Dark)
+        stylePath += "darkUiMode/"_L1;
 
-    if (!androidTheme.isEmpty() && QFileInfo::exists(stylePath + androidTheme + "style.json"_L1))
-        stylePath += androidTheme;
+    Q_ASSERT(!stylePath.isEmpty());
 
     QFile f(stylePath + "style.json"_L1);
     if (!f.open(QIODevice::ReadOnly))
@@ -185,13 +184,22 @@ QJsonObject AndroidStyle::loadStyleData()
     return document.object();
 }
 
-static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette)
+static void loadAndroidStyle(QPalette *defaultPalette, std::shared_ptr<AndroidStyle> &style)
 {
     double pixelDensity = QHighDpiScaling::isActive() ? QtAndroid::pixelDensity() : 1.0;
-    std::shared_ptr<AndroidStyle> style = std::make_shared<AndroidStyle>();
+    if (style) {
+        style->m_standardPalette = QPalette();
+        style->m_palettes.clear();
+        style->m_fonts.clear();
+        style->m_QWidgetsFonts.clear();
+    } else {
+        style = std::make_shared<AndroidStyle>();
+    }
+
     style->m_styleData = AndroidStyle::loadStyleData();
+
     if (style->m_styleData.isEmpty())
-        return std::shared_ptr<AndroidStyle>();
+        return;
 
     {
         QFont font("Droid Sans Mono"_L1, 14.0 * 100 / 72);
@@ -293,11 +301,43 @@ static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette)
             // Extract palette information
         }
     }
-    return style;
+}
+
+QAndroidPlatformTheme *QAndroidPlatformTheme::m_instance = nullptr;
+
+QAndroidPlatformTheme *QAndroidPlatformTheme::instance(
+    QAndroidPlatformNativeInterface *androidPlatformNativeInterface)
+{
+    if (androidPlatformNativeInterface && !m_instance) {
+        m_instance = new QAndroidPlatformTheme(androidPlatformNativeInterface);
+    }
+    return m_instance;
 }
 
 QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *androidPlatformNativeInterface)
 {
+    updateStyle();
+
+    androidPlatformNativeInterface->m_androidStyle = m_androidStyleData;
+
+    // default in case the style has not set a font
+    m_systemFont = QFont("Roboto"_L1, 14.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi
+}
+
+QAndroidPlatformTheme::~QAndroidPlatformTheme()
+{
+    m_instance = nullptr;
+}
+
+void QAndroidPlatformTheme::updateColorScheme()
+{
+    updateStyle();
+    QWindowSystemInterface::handleThemeChange();
+}
+
+void QAndroidPlatformTheme::updateStyle()
+{
+    QColor windowText = Qt::black;
     QColor background(229, 229, 229);
     QColor light = background.lighter(150);
     QColor mid(background.darker(130));
@@ -314,7 +354,27 @@ QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *an
     QColor highlight(148, 210, 231);
     QColor disabledShadow = shadow.lighter(150);
 
-    m_defaultPalette = QPalette(Qt::black,background,light,dark,mid,text,base);
+    if (colorScheme() == Qt::ColorScheme::Dark) {
+        // Colors were prepared based on Theme.DeviceDefault.DayNight
+        windowText = QColor(250, 250, 250);
+        background = QColor(48, 48, 48);
+        light = background.darker(150);
+        mid = background.lighter(130);
+        midLight = mid.darker(110);
+        base = background;
+        disabledBase = background;
+        dark = background.darker(150);
+        darkDisabled = dark.darker(110);
+        text = QColor(250, 250, 250);
+        highlightedText = QColor(250, 250, 250);
+        disabledText = QColor(96, 96, 96);
+        button = QColor(48, 48, 48);
+        shadow = QColor(32, 32, 32);
+        highlight = QColor(102, 178, 204);
+        disabledShadow = shadow.darker(150);
+    }
+
+    m_defaultPalette = QPalette(windowText,background,light,dark,mid,text,base);
     m_defaultPalette.setBrush(QPalette::Midlight, midLight);
     m_defaultPalette.setBrush(QPalette::Button, button);
     m_defaultPalette.setBrush(QPalette::Shadow, shadow);
@@ -330,34 +390,42 @@ QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *an
     m_defaultPalette.setBrush(QPalette::Active, QPalette::Highlight, highlight);
     m_defaultPalette.setBrush(QPalette::Inactive, QPalette::Highlight, highlight);
     m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Highlight, highlight.lighter(150));
-    m_androidStyleData = loadAndroidStyle(&m_defaultPalette);
-    QGuiApplication::setPalette(m_defaultPalette);
-    androidPlatformNativeInterface->m_androidStyle = m_androidStyleData;
 
-    // default in case the style has not set a font
-    m_systemFont = QFont("Roboto"_L1, 14.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi
+    loadAndroidStyle(&m_defaultPalette, m_androidStyleData);
 }
 
 QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const
 {
-    return new QAndroidPlatformMenuBar;
+    auto *menuBar = new QAndroidPlatformMenuBar;
+    qCDebug(lcQpaMenus) << "Created" << menuBar;
+    return menuBar;
 }
 
 QPlatformMenu *QAndroidPlatformTheme::createPlatformMenu() const
 {
-    return new QAndroidPlatformMenu;
+    auto *menu = new QAndroidPlatformMenu;
+    qCDebug(lcQpaMenus) << "Created" << menu;
+    return menu;
 }
 
 QPlatformMenuItem *QAndroidPlatformTheme::createPlatformMenuItem() const
 {
-    return new QAndroidPlatformMenuItem;
+    auto *menuItem = new QAndroidPlatformMenuItem;
+    qCDebug(lcQpaMenus) << "Created" << menuItem;
+    return menuItem;
 }
 
 void QAndroidPlatformTheme::showPlatformMenuBar()
 {
+    qCDebug(lcQpaMenus) << "Showing platform menu bar";
     QtAndroidMenu::openOptionsMenu();
 }
 
+Qt::ColorScheme QAndroidPlatformTheme::colorScheme() const
+{
+    return QAndroidPlatformIntegration::colorScheme();
+}
+
 static inline int paletteType(QPlatformTheme::Palette type)
 {
     switch (type) {
@@ -423,6 +491,11 @@ const QFont *QAndroidPlatformTheme::font(Font type) const
     return 0;
 }
 
+QIconEngine *QAndroidPlatformTheme::createIconEngine(const QString &iconName) const
+{
+    return new QAndroidPlatformIconEngine(iconName);
+}
+
 QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
 {
     switch (hint) {