diff --git a/.gitmodules b/.gitmodules
index 615642cb..1c0b1d97 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,11 @@
[submodule "QtZeroConf"]
path = QtZeroConf
- url = https://github.com/jbagg/QtZeroConf.git
+ url = https://github.com/nymea/QtZeroConf.git
+ branch = main
[submodule "nymea-remoteproxy"]
path = nymea-remoteproxy
url = https://github.com/guh/nymea-remoteproxy.git
+ branch = master
[submodule "android_openssl"]
path = 3rdParty/android/android_openssl
url = https://github.com/KDAB/android_openssl.git
diff --git a/QtZeroConf b/QtZeroConf
index 4a2e1975..d2a2c5c7 160000
--- a/QtZeroConf
+++ b/QtZeroConf
@@ -1 +1 @@
-Subproject commit 4a2e197517dd5a0c7fc18c257182d48cfe82a088
+Subproject commit d2a2c5c70a75ac26e31085c8d3ce2578426b14aa
diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index 9249d9b0..c63b9c14 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])
application.setWindowIcon(QIcon(QString(":/styles/%1/logo.svg").arg(styleController.currentStyle())));
- engine->load(QUrl(QLatin1String("qrc:/ui/Nymea.qml")));
+ engine->load(QUrl(QLatin1String("qrc:/ui/utils/TestMain.qml")));
return application.exec();
}
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index d3555355..1259c42f 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -110,7 +110,6 @@ android {
DISTFILES += \
$$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
$$ANDROID_PACKAGE_SOURCE_DIR/google-services.json \
- $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.jar \
$$ANDROID_PACKAGE_SOURCE_DIR/gradlew \
$$ANDROID_PACKAGE_SOURCE_DIR/res/values/libs.xml \
$$ANDROID_PACKAGE_SOURCE_DIR/res/values/styles.xml \
diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index 5160a7d2..0215a567 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -324,5 +324,6 @@
ui/shaders/coloricon.frag.qsb
ui/shaders/brightnesscircle.frag.qsb
ui/shaders/colorizedimage.frag.qsb
+ ui/utils/TestMain.qml
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index e37084a5..5d8222a0 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -35,6 +35,7 @@ import QtQuick.Layouts
import QtCore
import Qt.labs.folderlistmodel
import QtQuick.Window
+
import Nymea
import NymeaApp.Utils
diff --git a/nymea-app/ui/utils/TestMain.qml b/nymea-app/ui/utils/TestMain.qml
new file mode 100644
index 00000000..4d1f2cee
--- /dev/null
+++ b/nymea-app/ui/utils/TestMain.qml
@@ -0,0 +1,51 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* Copyright 2013 - 2020, nymea GmbH
+* Contact: contact@nymea.io
+*
+* This file is part of nymea.
+* This project including source code and documentation is protected by
+* copyright law, and remains the property of nymea GmbH. All rights, including
+* reproduction, publication, editing and translation, are reserved. The use of
+* this project is subject to the terms of a license agreement to be concluded
+* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
+* under https://nymea.io/license
+*
+* GNU General Public License Usage
+* Alternatively, this project may be redistributed and/or modified under the
+* terms of the GNU General Public License as published by the Free Software
+* Foundation, GNU version 3. This project is distributed in the hope that it
+* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+* Public License for more details.
+*
+* You should have received a copy of the GNU General Public License along with
+* this project. If not, see .
+*
+* For any further details and any questions please contact us under
+* contact@nymea.io or see our FAQ/Licensing Information on
+* https://nymea.io/license/faq
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+import QtQuick.Controls.Material
+import QtQuick.Controls
+import QtQuick
+import QtQuick.Layouts
+import QtCore
+import Qt.labs.folderlistmodel
+import QtQuick.Window
+
+import Nymea
+import NymeaApp.Utils
+
+ApplicationWindow {
+ id: app
+ visible: true
+
+ Label {
+ anchors.centerIn: parent
+ text: "Yeah..well"
+ }
+
+}
diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index 09d70201..2335cb1a 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -4,28 +4,8 @@
android:versionName="1.0"
android:installLocation="auto">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+