Merge pull request #546 from OpenHD/2.3-evo-consti-dev

android release

Author: Consti10

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.openhd.openhd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v4" android:versionCode="4" android:installLocation="auto">
+<manifest package="com.openhd.openhd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v5" android:versionCode="5" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
@@ -82,6 +82,8 @@
             <meta-data android:name="android.app.splash_screen_sticky" android:value="true"/>
             <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splashscreen"/>
             <meta-data android:name="android.app.splash_screen_sticky" android:value="true"/>
+            <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splashscreen"/>
+            <meta-data android:name="android.app.splash_screen_sticky" android:value="true"/>
         </activity>
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
     </application>

qml/qml.qrc

@@ -1,33 +1,33 @@
 <RCC>
-    <qresource prefix="/translations" lang="en">
+    <qresource lang="en" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_en.qm</file>
         <file>resources/cursors/arrow_512_green.png</file>
         <file>resources/cursors/arrow_512_transparent.png</file>
         <file>resources/cursors/arrow_512_white.png</file>
         <file>resources/cursors/hand_white.png</file>
     </qresource>
-    <qresource prefix="/translations" lang="de">
+    <qresource lang="de" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_de.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="ru">
+    <qresource lang="ru" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_ru.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="es">
+    <qresource lang="es" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_es.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="fr">
+    <qresource lang="fr" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_fr.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="nl">
+    <qresource lang="nl" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_nl.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="ro">
+    <qresource lang="ro" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_ro.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="it">
+    <qresource lang="it" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_it.qm</file>
     </qresource>
-    <qresource prefix="/translations" lang="zh">
+    <qresource lang="zh" prefix="/translations">
         <file alias="QOpenHD.qm">../translations/QOpenHD_zh.qm</file>
     </qresource>
     <qresource prefix="/">
@@ -235,5 +235,6 @@
         <file>resources/cursors/arrow_512_green.png</file>
         <file>resources/cursors/arrow_512_white.png</file>
         <file>resources/cursors/hand_white.png</file>
+        <file>ui/configpopup/ConnectPanel.qml</file>
     </qresource>
 </RCC>

qml/ui/configpopup/ConnectPanel.qml

@@ -0,0 +1,55 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Dialogs 1.0
+import QtQuick.Controls.Material 2.12
+
+import Qt.labs.settings 1.0
+
+import OpenHD 1.0
+
+import "../../ui" as Ui
+import "../elements"
+
+// This panel is only for users that run QOpenHD on an external device,e.g. android not on the ground station itself
+Item {
+    Layout.fillHeight: true
+    Layout.fillWidth: true
+
+    property int rowHeight: 64
+    property int elementHeight: 48
+    property int elementComboBoxWidth: 300
+
+    // Tab bar for selecting items in stack layout
+    TabBar {
+        id: selectItemInStackLayoutBar
+        width: parent.width
+        TabButton {
+            text: qsTr("USB Tether")
+        }
+        TabButton {
+            text: qsTr("Ethernet / USB to Ethernet")
+        }
+    }
+
+    // placed right below the top bar
+    StackLayout {
+        width: parent.width
+        height: parent.height-selectItemInStackLayoutBar.height
+        anchors.top: selectItemInStackLayoutBar.bottom
+        anchors.left: selectItemInStackLayoutBar.left
+        anchors.bottom: parent.bottom
+        currentIndex: selectItemInStackLayoutBar.currentIndex
+
+        Pane {
+            TextArea{
+                text: "Connect your phone via high quality USB cable to your ground station and enable USB Tethering on your phone."
+            }
+        }
+        Pane {
+            TextArea{
+                text: "TODO"
+            }
+        }
+    }
+}