Resize app when keyboard appears on android and do not switch to horizontal mode when keyboard appears.

Author: vedderb

android/src/com/vedder/vesc/Utils.java

@@ -87,7 +87,15 @@ public static int topBarHeight(Context ctx) {
     public static int bottomBarHeight(Context ctx) {
         if (Build.VERSION.SDK_INT >= 35) {
             WindowInsets windowInsets = getActivity(ctx).getWindow().getDecorView().getRootWindowInsets();
-            return windowInsets.getInsets(WindowInsets.Type.systemBars()).bottom;
+
+            int hKeyboard = windowInsets.getInsets(WindowInsets.Type.ime()).bottom;
+            int hBars = windowInsets.getInsets(WindowInsets.Type.systemBars()).bottom;
+
+            if (hKeyboard > 0) {
+                return hKeyboard;
+            } else {
+                return hBars;
+            }
         } else {
             return 0;
         }

mobile/DetectBldc.qml

@@ -118,6 +118,7 @@ Item {
             anchors.fill: parent
             clip: true
             contentWidth: parent.width
+
             ColumnLayout {
                 anchors.fill: parent
                 spacing: 0

mobile/DetectFocEncoder.qml

@@ -84,6 +84,7 @@ Item {
             anchors.fill: parent
             clip: true
             contentWidth: parent.width
+
             ColumnLayout {
                 anchors.fill: parent
                 spacing: 0

mobile/DetectFocHall.qml

@@ -89,6 +89,7 @@ Item {
             anchors.fill: parent
             clip: true
             contentWidth: parent.width
+
             ColumnLayout {
                 anchors.fill: parent
                 spacing: 0

mobile/DetectFocParam.qml

@@ -134,6 +134,7 @@ Item {
             anchors.fill: parent
             clip: true
             contentWidth: parent.width
+
             ColumnLayout {
                 anchors.fill: parent
                 spacing: 0

mobile/SetupWizardFoc.qml

@@ -34,6 +34,7 @@ Item {
     property ConfigParams mMcConf: VescIf.mcConfig()
     property Commands mCommands: VescIf.commands()
     property var dialogParent: ApplicationWindow.overlay
+    property bool isHorizontal: width > height
     property var canDevs: []
 
     signal dialogClosed()
@@ -93,7 +94,7 @@ Item {
         id: dialog
         modal: true
         focus: true
-        property bool isHorizontal: width > height
+        property bool isHorizontal: topItem.isHorizontal
         width: parent.width - 10 - notchLeft - notchRight
         height: parent.height - 10
         closePolicy: Popup.NoAutoClose

mobile/StartPage.qml

@@ -389,11 +389,13 @@ Item {
     SetupWizardFoc {
         id: wizardFoc
         dialogParent: mainSwipeView
+        isHorizontal: mainIsHorizontal
     }
 
     SetupWizardInput {
         id: wizardInput
         dialogParent: mainSwipeView
+        isHorizontal: mainIsHorizontal
     }
 
     PairingDialog {
@@ -617,6 +619,7 @@ Item {
             pageIndicatorVisible: false
             swipeOrientation: Qt.Horizontal
             currentPage: tabBar.currentIndex
+            isHorizontal: topItem.isHorizontal
         }
 
         header: Rectangle {

mobile/main.qml

@@ -48,6 +48,7 @@ ApplicationWindow {
     property int notchRight: 0
     property int notchBot: 0
     property int notchTop: 0
+    property bool mainIsHorizontal: appWindow.width > appWindow.height
 
     // https://github.com/ekke/c2gQtWS_x/blob/master/qml/main.qml
     flags: Qt.platform.os === "ios" ? (Qt.Window | Qt.MaximizeUsingFullscreenGeometryHint) : Qt.Window
@@ -66,16 +67,16 @@ ApplicationWindow {
 
     Timer {
         id: oriTimer
-        interval: 100; running: true; repeat: false
+        interval: 100
+        running: true
+        repeat: true
+
         onTriggered: {
             updateNotch()
         }
     }
 
     Screen.orientationUpdateMask: Qt.LandscapeOrientation | Qt.PortraitOrientation
-    Screen.onPrimaryOrientationChanged: {
-        oriTimer.start()
-    }
 
     Component.onCompleted: {
         if (!VescIf.isIntroDone()) {
@@ -301,6 +302,7 @@ ApplicationWindow {
                     anchors.fill: parent
                     anchors.leftMargin: 10
                     anchors.rightMargin: 10
+                    isHorizontal: mainIsHorizontal
 
                     onRequestOpenControls: {
                         controls.openDialog()
@@ -366,6 +368,7 @@ ApplicationWindow {
                         sourceComponent: RtData {
                             anchors.fill: parent
                             updateData: tabBar.currentIndex == (1 + indexOffset()) && rtSwipeView.currentIndex == 0
+                            isHorizontal: mainIsHorizontal
                         }
                     }
                 }
@@ -379,6 +382,7 @@ ApplicationWindow {
                             anchors.fill: parent
                             dialogParent: mainSwipeView
                             updateData: tabBar.currentIndex == (1 + indexOffset()) && rtSwipeView.currentIndex == 1
+                            isHorizontal: mainIsHorizontal
                         }
                     }
                 }
@@ -431,6 +435,7 @@ ApplicationWindow {
 
                         sourceComponent: StatPage {
                             anchors.fill: parent
+                            isHorizontal: mainIsHorizontal
                         }
                     }
                 }
@@ -445,6 +450,7 @@ ApplicationWindow {
                 visible: status == Loader.Ready
                 sourceComponent: BMS {
                     anchors.fill: parent
+                    isHorizontal: mainIsHorizontal
                 }
             }
         }
@@ -607,6 +613,7 @@ ApplicationWindow {
                 dialogParent: mainSwipeView
                 anchors.leftMargin: 10
                 anchors.rightMargin: 10
+                isHorizontal: mainIsHorizontal
             }
         }
     }
@@ -624,6 +631,7 @@ ApplicationWindow {
                 anchors.fill: parent
                 anchors.leftMargin: 10
                 anchors.rightMargin: 10
+                isHorizontal: mainIsHorizontal
             }
         }
     }
@@ -640,6 +648,7 @@ ApplicationWindow {
                 anchors.fill: parent
                 anchors.leftMargin: 10
                 anchors.rightMargin: 10
+                isHorizontal: mainIsHorizontal
             }
         }
     }