From 3c4465a680dc1e7c4128beb0946bb25fd56a63da Mon Sep 17 00:00:00 2001
From: consti10 <geierconstantinabc@gmail.com>
Date: Tue, 20 Feb 2024 00:42:49 +0100
Subject: [PATCH 1/4] android fix - sidebar and advanced menu back / open
 button conflict

---
 qml/ui/HUDOverlayGrid.qml                                 | 4 ++++
 .../openhd_settings/ChooseResolutionDialoque.qml          | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml
index 0146b033e..77be32dd9 100644
--- a/qml/ui/HUDOverlayGrid.qml
+++ b/qml/ui/HUDOverlayGrid.qml
@@ -247,6 +247,10 @@ Item {
         anchors.leftMargin: 8
         anchors.top: parent.top
         anchors.topMargin: 0
+        // If the sidebar is activated, do not show the (button/image) that opens the advanced menu
+        // since on devices with a funky ratio (e.g. extra wide, like most modern android phones)
+        // the back button of the sidebar and this button conflict
+        visible: !sidebar.m_extra_is_visible
 
         MouseArea {
             id: settingsButtonMouseArea
diff --git a/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml b/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
index 5b23704fb..a23bbbe5c 100644
--- a/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
+++ b/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
@@ -27,16 +27,10 @@ Card {
     property bool argh_is_changing_model:false;
     ListModel{
         id: resolutions_model
-        //ListElement {title: "0x0@0   (AUTO)"; value: "0x0@0"}
-        //ListElement {title: "480p@30fps  (4:3)"; value: "640x480@30"}
+        // NOTE: elements are overridden when we know the camera
         ListElement {title: "480p@60fps  (4:3)"; value: "640x480@60"}
-        //ListElement {title: "480p@60fps  (16:9)"; value: "848x480@60"}
-        //ListElement {title: "720p@49fps  (16:9)"; value: "1280x720@49"}
-        //ListElement {title: "720p@60fps  (4:3)"; value: "960x720@60"}
         ListElement {title: "720p@60fps  (16:9)"; value: "1280x720@60"}
         ListElement {title: "1080p@30fps (16:9)"; value: "1920x1080@30"}
-        //ListElement {title: "1080p@30fps (4:3)"; value: "1440x1080@30"}
-        //ListElement {title: "1080p@49fps (4:3)"; value: "1440x1080@49"}
     }
 
     function close(){

From 2b496874b8c24f0d3f95d0bedb3ff3e050947785 Mon Sep 17 00:00:00 2001
From: consti10 <geierconstantinabc@gmail.com>
Date: Tue, 20 Feb 2024 00:55:24 +0100
Subject: [PATCH 2/4] android - we can already increase the version code

---
 android/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 92fb361ba..12bed522d 100644
--- a/android/AndroidManifest.xml
+++ b/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="v15" android:versionCode="15" android:installLocation="auto">
+<manifest package="com.openhd.openhd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v16" android:versionCode="16" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

From 7b44437d179ceba0f1ee807d205e838f6c0207b4 Mon Sep 17 00:00:00 2001
From: consti10 <geierconstantinabc@gmail.com>
Date: Wed, 21 Feb 2024 10:35:43 +0100
Subject: [PATCH 3/4] update camera.hpp

---
 app/telemetry/models/openhd_core/camera.hpp | 31 +++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/telemetry/models/openhd_core/camera.hpp b/app/telemetry/models/openhd_core/camera.hpp
index fd0603c21..6c07fb19d 100644
--- a/app/telemetry/models/openhd_core/camera.hpp
+++ b/app/telemetry/models/openhd_core/camera.hpp
@@ -223,45 +223,47 @@ struct XCamera {
       return {ResolutionFramerate{640, 480, 30}};
     } else if (requires_rpi_libcamera_pipeline()) {
       std::vector<ResolutionFramerate> ret;
-      if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX462 ||
-        camera_type==X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX462_LOWLIGHT_MINI){
+      if (camera_type == X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX462 ||
+          camera_type ==
+              X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX462_LOWLIGHT_MINI) {
         ret.push_back(ResolutionFramerate{640, 480, 60});
         ret.push_back(ResolutionFramerate{896, 504, 60});
         ret.push_back(ResolutionFramerate{1280, 720, 60});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }else if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX477M ||
-                 camera_type==X_CAM_TYPE_RPI_LIBCAMERA_RPIF_HQ_IMX477) {
+      } else if (camera_type == X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX477M ||
+                 camera_type == X_CAM_TYPE_RPI_LIBCAMERA_RPIF_HQ_IMX477) {
         ret.push_back(ResolutionFramerate{640, 480, 50});
         ret.push_back(ResolutionFramerate{896, 504, 50});
         ret.push_back(ResolutionFramerate{1280, 720, 50});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }else if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_RPIF_V2_IMX219){
+      } else if (camera_type == X_CAM_TYPE_RPI_LIBCAMERA_RPIF_V2_IMX219) {
         ret.push_back(ResolutionFramerate{640, 480, 47});
         ret.push_back(ResolutionFramerate{896, 504, 47});
         ret.push_back(ResolutionFramerate{1280, 720, 47});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }else if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_SKYVISIONPRO_IMX519){
+      } else if (camera_type ==
+                 X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_SKYVISIONPRO_IMX519) {
         ret.push_back(ResolutionFramerate{640, 480, 60});
         ret.push_back(ResolutionFramerate{896, 504, 60});
         ret.push_back(ResolutionFramerate{1280, 720, 60});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }else if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_SKYMASTERHDR_IMX708 ||
-                 camera_type==X_CAM_TYPE_RPI_LIBCAMERA_RPIF_V3_IMX708){
+      } else if (camera_type ==
+                     X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_SKYMASTERHDR_IMX708 ||
+                 camera_type == X_CAM_TYPE_RPI_LIBCAMERA_RPIF_V3_IMX708) {
         ret.push_back(ResolutionFramerate{640, 480, 60});
         ret.push_back(ResolutionFramerate{896, 504, 60});
         ret.push_back(ResolutionFramerate{1280, 720, 60});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }else if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX327) {
+      } else if (camera_type == X_CAM_TYPE_RPI_LIBCAMERA_ARDUCAM_IMX327) {
         ret.push_back(ResolutionFramerate{640, 480, 60});
         ret.push_back(ResolutionFramerate{896, 504, 60});
         ret.push_back(ResolutionFramerate{1280, 720, 60});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }else if(camera_type==X_CAM_TYPE_RPI_LIBCAMERA_RPIF_V1_OV5647){
+      } else if (camera_type == X_CAM_TYPE_RPI_LIBCAMERA_RPIF_V1_OV5647) {
         ret.push_back(ResolutionFramerate{1280, 720, 30});
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
-      }
-      else{
-        std::cerr<<"Not yet mapped:"<<camera_type<<std::endl;
+      } else {
+        std::cerr << "Not yet mapped:" << camera_type << std::endl;
         ret.push_back(ResolutionFramerate{1920, 1080, 30});
       }
       return ret;
@@ -371,7 +373,8 @@ static std::string get_verbose_string_of_resolution(
              resolution_framerate.height_px == 1440) {
     ss << "2K 16:9";
   } else {
-    ss << resolution_framerate.width_px << "x" << resolution_framerate.height_px;
+    ss << resolution_framerate.width_px << "x"
+       << resolution_framerate.height_px;
   }
   ss << "\n" << resolution_framerate.fps << "fps";
   return ss.str();

From a452a5a74670da9124b0719063496a1c1785a79c Mon Sep 17 00:00:00 2001
From: consti10 <geierconstantinabc@gmail.com>
Date: Fri, 23 Feb 2024 10:33:06 +0100
Subject: [PATCH 4/4] fix status panel in sidebar (was filled with dummy)

---
 qml/qml.qrc                     |   1 +
 qml/ui/sidebar/InfoElement2.qml |  36 ++++++
 qml/ui/sidebar/Panel7Status.qml | 197 +++-----------------------------
 3 files changed, 56 insertions(+), 178 deletions(-)
 create mode 100644 qml/ui/sidebar/InfoElement2.qml

diff --git a/qml/qml.qrc b/qml/qml.qrc
index e759ccf17..9f0d80a71 100644
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -304,5 +304,6 @@
         <file>ui/elements/NewSwitch.qml</file>
         <file>ui/elements/NewSpinBox.qml</file>
         <file>ui/elements/NewSlider.qml</file>
+        <file>ui/sidebar/InfoElement2.qml</file>
     </qresource>
 </RCC>
diff --git a/qml/ui/sidebar/InfoElement2.qml b/qml/ui/sidebar/InfoElement2.qml
new file mode 100644
index 000000000..4f07e9e32
--- /dev/null
+++ b/qml/ui/sidebar/InfoElement2.qml
@@ -0,0 +1,36 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.12
+import QtGraphicalEffects 1.12
+import QtQuick.Shapes 1.0
+import QtQuick.Controls.Material 2.0
+
+import Qt.labs.settings 1.0
+
+import OpenHD 1.0
+
+import "../elements"
+
+RowLayout {
+    property string override_text_left: "TODO"
+    property string override_text_right: "TODO"
+
+    Text {
+        width: 150
+        text: override_text_left
+        font.pixelSize: 14
+        font.bold: true
+        font.family: "AvantGarde-Medium"
+        color: "#ffffff"
+        smooth: true
+    }
+
+    Text {
+        text: override_text_right
+        font.pixelSize: 14
+        font.family: "AvantGarde-Medium"
+        color: "#ffffff"
+        smooth: true
+
+    }
+}
diff --git a/qml/ui/sidebar/Panel7Status.qml b/qml/ui/sidebar/Panel7Status.qml
index 1d9f7d499..2c53c3b1c 100644
--- a/qml/ui/sidebar/Panel7Status.qml
+++ b/qml/ui/sidebar/Panel7Status.qml
@@ -16,188 +16,29 @@ SideBarBasePanel{
 
     Column {
         anchors.top: parent.top
-        anchors.topMargin: secondaryUiHeight/8
-        spacing: 5
-
-        RowLayout {
-            Text {
-                text: "Status:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                text: "Connected"
-                font.pixelSize: 14
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-
-            }
-        }
-        RowLayout {
-            Text {
-                text: "Screen:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                text: applicationWindow.width + "x" + applicationWindow.height
-                font.pixelSize: 14
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-
-            }
-        }
-
-        RowLayout {
-            Text {
-                text: "Frequency:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                text: _ohdSystemGround.curr_channel_mhz + "Mhz"
-                font.pixelSize: 14
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-
-            }
-        }
-        RowLayout {
-            Text {
-                text: "Wifi-Adapter:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                id: wifiMessage
-                property int wifiCode: _ohdSystemAir.ohd_wifi_type
-
-                function wifiName(code) {
-                    switch (code) {
-                    case 11: return "Asus AC56";
-                    case 12: return "8812AU CUSTOM";
-                    case 21: return "88XXBU";
-                    default: return "unknown";
-                    }
+        anchors.topMargin: secondaryUiHeight/8 + 20
+        anchors.leftMargin: 10
+        spacing: 10
+
+        InfoElement2{
+            override_text_left: "Connection:"
+            override_text_right: {
+                if(_ohdSystemAir.is_alive && _ohdSystemGround.is_alive){
+                    return "Connected";
                 }
-
-                text: wifiName(wifiCode) + "("+_ohdSystemAir.ohd_wifi_type+")"
-                Layout.leftMargin: 12
-            }
-        }
-        RowLayout {
-            Text {
-                text: "Format:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                text: "1080p 60fps"
-                font.pixelSize: 14
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-
-            }
-        }
-        RowLayout {
-            Text {
-                text: "Version:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                text: "Todo"
-                font.pixelSize: 14
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-
-            }
-        }
-        RowLayout {
-            Text {
-                text: "Hardware Air:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                id: platformMessage
-                property int platformCode: _ohdSystemAir.ohd_platform_type
-
-                function platformName(code) {
-                    switch (code) {
-                    case 0: return "unknown";
-                    case 10: return "X20";
-                    case 20: return "x86";
-                    case 30: return "rpi";
-                    case 31: return "rpi 4";
-                    case 32: return "rpi 3";
-                    case 33: return "rpi 2";
-                    case 34: return "rpi 1";
-                    case 35: return "rpi 0";
-                    case 40: return "rock";
-                    case 41: return "rk3566";
-                    case 42: return "rock5a";
-                    case 43: return "rock5b";
-                    default: return "unknown";
-                    }
+                if(_ohdSystemAir.is_alive){
+                    return "AIR only";
                 }
-
-                text: platformName(platformCode) + "("+_ohdSystemAir.ohd_platform_type+")"
-                Layout.leftMargin: 12
-            }
-        }
-        RowLayout {
-            Text {
-                text: "Hardware Ground:"
-                font.pixelSize: 14
-                font.bold: true
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-            }
-
-            Text {
-                text: "Todo"
-                font.pixelSize: 14
-                font.family: "AvantGarde-Medium"
-                color: "#ffffff"
-                smooth: true
-
+                if(_ohdSystemGround.is_alive){
+                    return "GND only"
+                }
+                return "NOT CONNECTED";
             }
         }
+        /*InfoElement2{
+            override_text_left: "TODO"
+            override_text_right:"TODO"
+        }*/
 
         Button {
             id: button