From 11da95ee8f462038978780f90bb8aeba0d9dd3dd Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
Date: Fri, 28 Oct 2016 10:23:36 +0200
Subject: demo: improve UX on smaller screens

Change-Id: I77ea4316d5f64f3e0b7a50ac8ac812dce5af838e
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
---
 examples/qml/basic/main.qml | 165 +++++++++++++++++++++++---------------------
 1 file changed, 88 insertions(+), 77 deletions(-)

diff --git a/examples/qml/basic/main.qml b/examples/qml/basic/main.qml
index b48697e..a8f55c7 100644
--- a/examples/qml/basic/main.qml
+++ b/examples/qml/basic/main.qml
@@ -82,92 +82,103 @@ Window {
         repoCa.text = "<b>TLS CA:</b> " + (config ? config.tlsCaPath : "not set")
     }
 
-    ColumnLayout {
+    Flickable {
         anchors.fill: parent
-        anchors.leftMargin: 10
-        anchors.topMargin: 10
-
-        Label { text: "BOOTED"; Layout.bottomMargin: 14; font.underline: true; }
-        Label { text: "<b>Version:</b> " + OtaClient.bootedVersion }
-        Label { text: "<b>Description:</b> " + OtaClient.bootedDescription }
-        Label { text: "<b>Revision:</b> " + OtaClient.bootedRevision }
-
-        Label { text: "REMOTE"; Layout.bottomMargin: 14; Layout.topMargin: 14; font.underline: true }
-        Label { text: "<b>Version:</b> " + OtaClient.remoteVersion }
-        Label { text: "<b>Description:</b> " + OtaClient.remoteDescription }
-        Label { text: "<b>Revision:</b> " + OtaClient.remoteRevision; Layout.bottomMargin: 10; }
-
-        Label { id: repoUrl; }
-        Label { id: repoGpgVerify; }
-        Label { id: repoClientCert; }
-        Label { id: repoClientKey; }
-        Label { id: repoPermissive; }
-        Label { id: repoCa; }
-
-        Label { text: "ROLLBACK"; Layout.bottomMargin: 14; Layout.topMargin: 14; font.underline: true }
-        Label { text: "<b>Version:</b> " + OtaClient.rollbackVersion }
-        Label { text: "<b>Description:</b> " + OtaClient.rollbackDescription }
-        Label { text: "<b>Revision:</b> " + OtaClient.rollbackRevision }
-
-        RowLayout {
-            Layout.topMargin: 20
-            Layout.bottomMargin: 10
-            Button {
-                id: fetchButton
-                text: "Fetch OTA info"
-                onClicked: {
-                    if (!otaReady())
-                        return;
-                    log("Fetcing OTA info...")
-                    OtaClient.fetchRemoteInfo()
+        contentHeight: topLayout.implicitHeight + topLayout.anchors.bottomMargin * 2
+        flickableDirection: Flickable.VerticalFlick
+        ScrollBar.vertical: ScrollBar { }
+
+        ColumnLayout {
+            id: topLayout
+            anchors.fill: parent
+            anchors.margins: 10
+
+            Label { text: "BOOTED"; Layout.bottomMargin: 14; font.underline: true; }
+            Label { text: "<b>Version:</b> " + OtaClient.bootedVersion }
+            Label { text: "<b>Description:</b> " + OtaClient.bootedDescription }
+            Label { text: "<b>Revision:</b> " + OtaClient.bootedRevision }
+
+            Label { text: "REMOTE"; Layout.bottomMargin: 14; Layout.topMargin: 14; font.underline: true }
+            Label { text: "<b>Version:</b> " + OtaClient.remoteVersion }
+            Label { text: "<b>Description:</b> " + OtaClient.remoteDescription }
+            Label { text: "<b>Revision:</b> " + OtaClient.remoteRevision; Layout.bottomMargin: 10; }
+
+            Label { id: repoUrl; }
+            Label { id: repoGpgVerify; }
+            Label { id: repoClientCert; }
+            Label { id: repoClientKey; }
+            Label { id: repoPermissive; }
+            Label { id: repoCa; }
+
+            Label { text: "ROLLBACK"; Layout.bottomMargin: 14; Layout.topMargin: 14; font.underline: true }
+            Label { text: "<b>Version:</b> " + OtaClient.rollbackVersion }
+            Label { text: "<b>Description:</b> " + OtaClient.rollbackDescription }
+            Label { text: "<b>Revision:</b> " + OtaClient.rollbackRevision }
+
+            RowLayout {
+                Layout.topMargin: 20
+                Layout.bottomMargin: 10
+                Button {
+                    text: "Fetch OTA info"
+                    onClicked: {
+                        if (!otaReady())
+                            return;
+                        log("Fetcing OTA info...")
+                        OtaClient.fetchRemoteInfo()
+                    }
                 }
-            }
-            Button {
-                visible: OtaClient.rollbackAvailable
-                text: "Rollback"
-                onClicked: {
-                    if (!otaReady())
-                        return;
-                    log("Roolback...")
-                    OtaClient.rollback()
+                Button {
+                    visible: OtaClient.rollbackAvailable
+                    text: "Rollback"
+                    onClicked: {
+                        if (!otaReady())
+                            return;
+                        log("Roolback...")
+                        OtaClient.rollback()
+                    }
                 }
-            }
-            Button {
-                visible: OtaClient.updateAvailable
-                text: "Update"
-                onClicked: {
-                    if (!otaReady())
-                        return;
-                    log("Updating...")
-                    OtaClient.update()
+                Button {
+                    visible: OtaClient.updateAvailable
+                    text: "Update"
+                    onClicked: {
+                        if (!otaReady())
+                            return;
+                        log("Updating...")
+                        OtaClient.update()
+                    }
                 }
-            }
-            Button {
-                visible: OtaClient.restartRequired
-                text: "Restart"
-                onClicked: {
-                    if (!otaReady())
-                        return;
-                    log("Restarting (unimplemented) ...")
+                Button {
+                    visible: OtaClient.restartRequired
+                    text: "Restart"
+                    onClicked: {
+                        if (!otaReady())
+                            return;
+                        log("Restarting (unimplemented) ...")
+                    }
                 }
             }
-        }
 
-        Frame {
-            Layout.preferredHeight: 200
-            Layout.preferredWidth: Screen.width * 0.5
-            padding: 2
-            ListView {
-                id: logView
-                anchors.fill: parent
-                anchors.margins: 4
-                clip: true
-                model: ListModel { id: logRecords }
-                delegate: Label { text: record ; color: textcolor }
+            Frame {
+                Layout.preferredHeight: repoUrl.font.pixelSize * 12
+                Layout.preferredWidth: {
+                    Screen.width < 800 ? Screen.width - topLayout.anchors.leftMargin * 2
+                                       : Screen.width * 0.5 > 800 ? 800 : Screen.width * 0.5
+                }
+                padding: 6
+                ListView {
+                    id: logView
+                    anchors.fill: parent
+                    clip: true
+                    model: ListModel { id: logRecords }
+                    delegate: Label {
+                        text: record
+                        color: textcolor
+                        width: parent.width
+                        wrapMode: Text.WordWrap
+                    }
+                }
             }
         }
-
-        Item { Layout.fillHeight: true }
     }
 
     OtaRepositoryConfig {
-- 
cgit v1.2.3