diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index d7119f71692f728ee73b15821898aafdaa5f7f9c..557dca62cebfa2a74f700b463ba19d77e33811d3 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -18,6 +18,8 @@ diff --git a/packaging/android/res/values/apptheme.xml b/packaging/android/res/values/apptheme.xml new file mode 100644 index 0000000000000000000000000000000000000000..1a0b7bbce45ecf7240099d4f735ca4447e72cc47 --- /dev/null +++ b/packaging/android/res/values/apptheme.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e689a18da96dea9c49d1ab11333aec83c33d793b..62decfc7ab4bbdd398ad556f35398ea4cb2c8317 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 8acd4050f9fea8a6ec5fd591969977cd97c085a5..82dbe8ebcde7e85d6e887523677daf0069b56d13 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 afceb07c8a3c78d41f91bbcedbbc6869b58e6b8e..4d35c918bf2696a5b18e493f8ea0cc199a7798f6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #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 0000000000000000000000000000000000000000..01c5a2ec40e0a99bcb9472efba4c6c2f9aacac52 --- /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 126085f5b8803beae744999c9226d2d86b0a40ba..63a586627dc51533d35c25198feb00dc3d460f35 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -3,5 +3,6 @@ contents/ui/main.qml contents/speed.svg contents/license.svg + qtquickcontrols2.conf