diff --git a/mea/main.cpp b/mea/main.cpp index b257ecf1..6dd802fc 100644 --- a/mea/main.cpp +++ b/mea/main.cpp @@ -25,6 +25,10 @@ #include #include +#ifdef Q_OS_ANDROID +#include +#endif + #include "libmea-core.h" #include "stylecontroller.h" @@ -78,5 +82,8 @@ int main(int argc, char *argv[]) engine->load(QUrl(QLatin1String("qrc:/ui/Mea.qml"))); +#ifdef Q_OS_ANDROID + QtAndroid::hideSplashScreen(250); +#endif return application.exec(); } diff --git a/mea/mea.pro b/mea/mea.pro index b8f753fe..790e94d0 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -33,6 +33,8 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) { android { ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android + QT += androidextras + DISTFILES += \ $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \ $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.jar \ diff --git a/mea/ui/ConnectPage.qml b/mea/ui/ConnectPage.qml index d3f1ffa2..296bc55c 100644 --- a/mea/ui/ConnectPage.qml +++ b/mea/ui/ConnectPage.qml @@ -337,26 +337,32 @@ Page { Component { id: connectingPage Page { - ColumnLayout { - anchors.centerIn: parent - width: parent.width - app.margins * 2 - spacing: app.margins + ColumnLayout { + id: columnLayout + anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: app.margins } + spacing: app.margins + BusyIndicator { + anchors.horizontalCenter: parent.horizontalCenter + running: parent.visible + } Label { text: qsTr("Trying to connect...") - wrapMode: Text.WordWrap font.pixelSize: app.largeFont Layout.fillWidth: true + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignHCenter } + } - Button { - text: qsTr("Cancel") - Layout.fillWidth: true - onClicked: { - Engine.connection.disconnect() - pageStack.pop(root); - pageStack.push(discoveryPage); - } + Button { + text: qsTr("Cancel") + anchors { left: parent.left; top: columnLayout.bottom; right: parent.right } + anchors.margins: app.margins + onClicked: { + Engine.connection.disconnect() + pageStack.pop(root); + pageStack.push(discoveryPage); } } } diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index 3bcf725b..169e4f32 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -33,8 +33,8 @@ - - + + diff --git a/packaging/android/appicon-1024x1024.png b/packaging/android/appicon-1024x1024.png new file mode 100644 index 00000000..12415364 Binary files /dev/null and b/packaging/android/appicon-1024x1024.png differ diff --git a/packaging/android/appicon-256x256.png b/packaging/android/appicon-256x256.png new file mode 100644 index 00000000..bf47e160 Binary files /dev/null and b/packaging/android/appicon-256x256.png differ diff --git a/packaging/android/appicon-512x512.png b/packaging/android/appicon-512x512.png new file mode 100644 index 00000000..e75c68d2 Binary files /dev/null and b/packaging/android/appicon-512x512.png differ diff --git a/packaging/android/appicon.svg b/packaging/android/appicon.svg new file mode 100644 index 00000000..fb743ef7 --- /dev/null +++ b/packaging/android/appicon.svg @@ -0,0 +1,609 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/apptheme.xml b/packaging/android/apptheme.xml new file mode 100644 index 00000000..adec2328 --- /dev/null +++ b/packaging/android/apptheme.xml @@ -0,0 +1,6 @@ + + + + diff --git a/packaging/android/res/drawable-hdpi/icon.png b/packaging/android/res/drawable-hdpi/icon.png new file mode 100644 index 00000000..e75c68d2 Binary files /dev/null and b/packaging/android/res/drawable-hdpi/icon.png differ diff --git a/packaging/android/res/drawable-mdpi/icon.png b/packaging/android/res/drawable-mdpi/icon.png index 8aa39bf7..bf47e160 100644 Binary files a/packaging/android/res/drawable-mdpi/icon.png and b/packaging/android/res/drawable-mdpi/icon.png differ diff --git a/packaging/android/res/drawable-mdpi/splash.xml b/packaging/android/res/drawable-mdpi/splash.xml new file mode 100644 index 00000000..611a8f4f --- /dev/null +++ b/packaging/android/res/drawable-mdpi/splash.xml @@ -0,0 +1,12 @@ + + + + + + + + + + +