Multiple changes for android (#62)

* Add android status/nav bar color, relayout settings page, fix banner, change mic icon * fix as per review
MycroftAI · Jul 17, 2020 · f57e0c6 · f57e0c6
1 parent 19c364f
commit f57e0c6
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 24 deletions.
diff --git a/application/HintsDelegate.qml b/application/HintsDelegate.qml
@@ -93,4 +93,4 @@ Kirigami.AbstractCard {
             }
         }
     }
-}
+}
diff --git a/application/SettingsPage.qml b/application/SettingsPage.qml
@@ -26,38 +26,104 @@ Kirigami.ScrollablePage {
     title: "Settings"
     objectName: "Settings"
 
-
     ColumnLayout {
         id: settingsLayout
-        anchors.fill: parent
-        Layout.fillWidth: true
         width: parent.width
+        implicitHeight: childrenRect.height
+        spacing: Kirigami.Units.largeSpacing
 
-        Controls.Label {
-            id: websocketLabel 
-            text: "<h1>Websocket Address</h1> Example: <tt>ws://192.168.1.1</tt>"
+        Kirigami.Heading {
+            id: websocketLabel
+            level: 2
+            font.bold: true
+            color: Kirigami.Theme.textColor;
+            Layout.fillWidth: true
+            text: "Websocket Address"
         }
 
-        Controls.TextField {
-            id: webSocketAddressField
-            width: parent.width
+        Controls.Label {
+            id: exampleLabel
+            text: "Example: <tt>ws://192.168.1.1</tt>"
             Layout.fillWidth: true
-            Layout.columnSpan: 2
-            Component.onCompleted:{
-                webSocketAddressField.text = Mycroft.GlobalSettings.webSocketAddress
-            }
         }
-
-        Controls.Button{
-            id: applySettings
+
+        Controls.Control{ 
             Layout.fillWidth: true
-            Layout.preferredHeight: Kirigami.Units.gridUnit * 2
-            text: "Apply"
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            leftPadding: Kirigami.Units.largeSpacing
+            rightPadding: Kirigami.Units.largeSpacing
 
-            onClicked:{ 
-                Mycroft.GlobalSettings.webSocketAddress = webSocketAddressField.text
-                Mycroft.MycroftController.reconnect()
+            background: Rectangle {
+                Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                color: Kirigami.Theme.backgroundColor
+                radius: 5
             }
+
+            contentItem: Controls.TextField {
+                id: webSocketAddressField
+
+                Component.onCompleted:{
+                    webSocketAddressField.text = Mycroft.GlobalSettings.webSocketAddress
+                }
+            }
+        }
+
+        RowLayout {
+           Layout.fillWidth: true
+           Layout.preferredHeight: Kirigami.Units.gridUnit * 4
+
+           Controls.Button {
+                id: applySettings
+                Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                Layout.fillWidth: true
+                Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+                text: "Apply"
+
+                onClicked:{ 
+                    Mycroft.GlobalSettings.webSocketAddress = webSocketAddressField.text
+                    Mycroft.MycroftController.reconnect()
+                }
+            }
+
+           Controls.Button{
+                id: reverSettings
+                Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                Layout.fillWidth: true
+                Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+                text: "Revert"
+
+                onClicked: {
+                    webSocketAddressField.text = "ws://0.0.0.0"
+                    Mycroft.GlobalSettings.webSocketAddress = webSocketAddressField.text
+                    Mycroft.MycroftController.reconnect()
+                }
+            }
+        }
+
+        Item {
+            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
+        }
+
+        Kirigami.Heading {
+            level: 2
+            text: "About Application"
+            font.bold: true
+            Layout.fillWidth: true
+            color: Kirigami.Theme.textColor
+        }
+
+        Controls.Label {
+            id: mycroftAndroidAppVersionLabel
+            text: "Application Version: 0.80"
+            Layout.fillWidth: true
+            color: Kirigami.Theme.textColor;
+        }
+
+        Controls.Label {
+            id: mycroftGuiVersionLabel
+            text: "GUI Version: 1.0"
+            Layout.fillWidth: true
+            color: Kirigami.Theme.textColor;
         }
     }
 }
diff --git a/application/banner.png b/application/banner.png
diff --git a/application/main.cpp b/application/main.cpp
@@ -27,6 +27,9 @@
 
 #ifdef Q_OS_ANDROID
 #include <QGuiApplication>
+#include <QtAndroid>
+#define FLAG_TRANSLUCENT_STATUS 0x04000000
+#define FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS 0x80000000
 #else
 #include <QApplication>
 #include <KDBusService>
@@ -120,5 +123,15 @@ int main(int argc, char *argv[])
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
+#ifdef Q_OS_ANDROID
+    QtAndroid::runOnAndroidThread([=]() {
+        QAndroidJniObject window = QtAndroid::androidActivity().callObjectMethod("getWindow", "()Landroid/view/Window;");
+        window.callMethod<void>("addFlags", "(I)V", FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        window.callMethod<void>("clearFlags", "(I)V", FLAG_TRANSLUCENT_STATUS);
+        window.callMethod<void>("setStatusBarColor", "(I)V", QColor("#31363b").rgba());
+        window.callMethod<void>("setNavigationBarColor", "(I)V", QColor("#31363b").rgba());
+    });
+#endif
+
     return app.exec();
 }
diff --git a/application/main.qml b/application/main.qml
@@ -305,8 +305,18 @@ Kirigami.ApplicationWindow {
                         }
                     }
                 }
-                Button {
-                    text: "Speak" // TODO generic microphone icon
+
+                ToolButton {
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                    Layout.preferredWidth: handleAnchor.width
+                    Layout.fillHeight: true
+                    Layout.rightMargin: Kirigami.Units.smallSpacing
+
+                    contentItem: Kirigami.Icon {
+                        anchors.centerIn: parent
+                        source: "audio-input-microphone"
+                    }
+
                     onClicked:  {
                         if(applicationSettings.usesRemoteSTT){
                             audioRecorder.open()
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,4 +93,4 @@ Kirigami.AbstractCard { @@
                 }
             }
         }
-    }
+    }