From 4d7c2592bd907f313d587c3b942a3ec0eb397122 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@eyecreate.org>
Date: Sat, 27 Jun 2020 10:43:47 -0400
Subject: [PATCH] Have android build use material theme and splash. Fix no
 context drawer on mobile.

---
 packaging/android/AndroidManifest.xml     | 2 ++
 packaging/android/res/values/apptheme.xml | 6 ++++++
 src/CMakeLists.txt                        | 2 +-
 src/contents/ui/main.qml                  | 4 ++++
 src/main.cpp                              | 5 +++++
 src/qtquickcontrols2.conf                 | 6 ++++++
 src/resources.qrc                         | 1 +
 7 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 packaging/android/res/values/apptheme.xml
 create mode 100644 src/qtquickcontrols2.conf

diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index d7119f7..557dca6 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -18,6 +18,8 @@
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
                   android:label="Vehicle Voyage"
+                  android:icon="@drawable/logo"
+                  android:theme="@style/AppTheme"
                   android:screenOrientation="unspecified"
                   android:launchMode="singleTop">
             <intent-filter>
diff --git a/packaging/android/res/values/apptheme.xml b/packaging/android/res/values/apptheme.xml
new file mode 100644
index 0000000..1a0b7bb
--- /dev/null
+++ b/packaging/android/res/values/apptheme.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+        <item name="android:windowBackground">@drawable/splash_logo</item>
+    </style>
+</resources> 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e689a18..62decfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ set(vehiclevoyage_SRCS
     
 qt5_add_resources(RESOURCES resources.qrc)
 add_executable(vehiclevoyage ${vehiclevoyage_SRCS} ${RESOURCES})
-target_link_libraries(vehiclevoyage Qt5::Core Qt5::Qml Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Widgets KF5::CoreAddons)
+target_link_libraries(vehiclevoyage Qt5::Core Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::Sql Qt5::Svg Qt5::Widgets KF5::CoreAddons)
 install(TARGETS vehiclevoyage ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Android")
diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml
index 8acd405..82dbe8e 100644
--- a/src/contents/ui/main.qml
+++ b/src/contents/ui/main.qml
@@ -20,6 +20,10 @@ Kirigami.ApplicationWindow {
         ListElement {value: 5; text: qsTr("Serpentine Belt Changed");}
         ListElement {value: -1; text: qsTr("Other");}
     }
+    
+     contextDrawer: Kirigami.ContextDrawer {
+        id: contextDrawer
+    }
 
     Kirigami.PageRouter {
         id: router
diff --git a/src/main.cpp b/src/main.cpp
index afceb07..4d35c91 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@
 #include <QDebug>
 #include <QSqlQuery>
 #include <QQmlContext>
+#include <QtQuickControls2/QQuickStyle>
 #include "db/sqlvehicle.h"
 #include "db/sqlservicerecord.h"
 #include "jsonio.h"
@@ -37,6 +38,10 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     QApplication app(argc, argv);
+    
+#ifdef Q_OS_ANDROID
+    QQuickStyle::setStyle("Material");
+#endif
 
     
     KAboutData aboutData("org.eyecreate.vehiclevoyage", "Vehicle Voyage", "1.0", "Track vehicle service history.",KAboutLicense::GPL_V3);//TODO:i18n
diff --git a/src/qtquickcontrols2.conf b/src/qtquickcontrols2.conf
new file mode 100644
index 0000000..01c5a2e
--- /dev/null
+++ b/src/qtquickcontrols2.conf
@@ -0,0 +1,6 @@
+
+[Material]
+Primary=Indigo
+Accent=Amber
+Theme=System
+
diff --git a/src/resources.qrc b/src/resources.qrc
index 126085f..63a5866 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -3,5 +3,6 @@
         <file alias="main.qml">contents/ui/main.qml</file>
         <file alias="speed.svg">contents/speed.svg</file>
         <file alias="license.svg">contents/license.svg</file>
+        <file>qtquickcontrols2.conf</file>
     </qresource>
 </RCC>
-- 
GitLab