From 230c79269db951751206625d0411c870c4fc1c06 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 21 Mar 2021 15:44:49 +0100 Subject: [PATCH] Update splash for android too --- .../generic/platformhelpergeneric.cpp | 16 +- .../generic/platformhelpergeneric.h | 9 +- packaging/android/res/drawable/splash.xml | 6 +- .../mipmap-anydpi/nymea_splash_horizontal.xml | 272 ++++++++++++++++++ 4 files changed, 283 insertions(+), 20 deletions(-) create mode 100644 packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml diff --git a/nymea-app/platformintegration/generic/platformhelpergeneric.cpp b/nymea-app/platformintegration/generic/platformhelpergeneric.cpp index b3e11788..6284e033 100644 --- a/nymea-app/platformintegration/generic/platformhelpergeneric.cpp +++ b/nymea-app/platformintegration/generic/platformhelpergeneric.cpp @@ -39,36 +39,36 @@ Q_DECLARE_LOGGING_CATEGORY(dcPlatformIntegration) PlatformHelperGeneric::PlatformHelperGeneric(QObject *parent) : PlatformHelper(parent) { - m_piHelper = new ScreenHelper(this); + m_screenHelper = new ScreenHelper(this); } bool PlatformHelperGeneric::canControlScreen() const { - return m_piHelper->active(); + return m_screenHelper->active(); } int PlatformHelperGeneric::screenTimeout() const { - return m_piHelper->screenTimeout(); + return m_screenHelper->screenTimeout(); } void PlatformHelperGeneric::setScreenTimeout(int timeout) { - if (m_piHelper->screenTimeout() != timeout) { - m_piHelper->setScreenTimeout(timeout); + if (m_screenHelper->screenTimeout() != timeout) { + m_screenHelper->setScreenTimeout(timeout); emit screenTimeoutChanged(); } } int PlatformHelperGeneric::screenBrightness() const { - return m_piHelper->screenBrightness(); + return m_screenHelper->screenBrightness(); } void PlatformHelperGeneric::setScreenBrightness(int percent) { - if (m_piHelper->screenBrightness() != percent) { - m_piHelper->setScreenBrightness(percent); + if (m_screenHelper->screenBrightness() != percent) { + m_screenHelper->setScreenBrightness(percent); emit screenTimeoutChanged(); } } diff --git a/nymea-app/platformintegration/generic/platformhelpergeneric.h b/nymea-app/platformintegration/generic/platformhelpergeneric.h index 7f6f15eb..98e5d3f5 100644 --- a/nymea-app/platformintegration/generic/platformhelpergeneric.h +++ b/nymea-app/platformintegration/generic/platformhelpergeneric.h @@ -35,10 +35,6 @@ #include "platformhelper.h" #include "screenhelper.h" -extern "C" { -#include -} - class PlatformHelperGeneric : public PlatformHelper { Q_OBJECT @@ -51,10 +47,7 @@ public: virtual int screenBrightness() const override; virtual void setScreenBrightness(int percent) override; private: - ScreenHelper *m_piHelper = nullptr; - - ply_event_loop_t *m_plyLoop = nullptr; - ply_boot_client_t *m_plyClient = nullptr; + ScreenHelper *m_screenHelper = nullptr; }; #endif // PLATFORMHELPERGENERIC_H diff --git a/packaging/android/res/drawable/splash.xml b/packaging/android/res/drawable/splash.xml index 4d0cdae0..e155ae71 100644 --- a/packaging/android/res/drawable/splash.xml +++ b/packaging/android/res/drawable/splash.xml @@ -2,11 +2,9 @@ - + - - - diff --git a/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml b/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml new file mode 100644 index 00000000..2f251e9a --- /dev/null +++ b/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +