From 8170c9280b57c8da5d1d6045e16d5ac14bc5220d Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 30 Dec 2019 18:44:05 -0500
Subject: Enhance voice configuration

Various tweaks to the new voice configuration support:
- Moved "Version" choice on the main menu back down to the last
  choice, since it's less likely to be used.
- Pull in qt-qrcode library's quickitem support and use it to
  display a QR code when Alexa authorization is required.
- Reworked layout of voice configuration dialog to tighten up
  spacing and make more room for the QR code.
- Tweaked voice configuration dialog logic to only show the login
  prompting when in not-authorized state. Ideally, a deauth button
  would be shown in the authorized state, but the voiceagent API
  currently does not enable that AFAICT.
- Replace voiceagent ID with vendor in voiceagent configuration
  dialog, as the ID is more of an internal thing that's not useful
  to users.
- Tweaked some text colors in voiceagent configuration dialog for
  better consistency with the other settings pages.
- Switched voiceagent configuration dialog positioning to center
  it on-screen, as that seems more consistent with the look of
  the other settings pages.
- Made the previous two changes to the wired settings configuration
  dialog as well for consistency.
- Updated the voice settings icon with a microphone icon to match
  the default icon shown for the homescreen PTT button.
- Updated the wired settings icon with a more typical network icon
  to avoid confusion.

Bug-AGL: SPEC-2981

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I75560e3cab393e6efdfb1310f266e5b6bb0534d6
---
 app/voice/Voice.qml | 53 ++---------------------------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

(limited to 'app/voice/Voice.qml')

diff --git a/app/voice/Voice.qml b/app/voice/Voice.qml
index b316132..4de43b6 100644
--- a/app/voice/Voice.qml
+++ b/app/voice/Voice.qml
@@ -27,62 +27,12 @@ SettingPage {
     title: 'Voice'
     readonly property bool isVoice: true
 
-    Rectangle {
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.top
-        anchors.margins: 80
-        width: 110
-        color: "#222"
-        border.color: "white"
-
-        Button {
-            id: buttonScan
-            anchors.centerIn: parent
-            anchors.margins: 10
-            text: enabled? "SCAN" : "PROCESSING"
-            visible: true
-            enabled: true
-
-            Timer {
-               id: scanAnimationTimer
-                interval: 3000
-                running: false
-                repeat: false
-                onTriggered: {
-                    buttonScan.enabled = true
-                }
-            }
-            MouseArea {
-                anchors.fill: parent
-
-                onClicked: {
-                    voice.scan()
-                    buttonScan.enabled = false
-                    scanAnimationTimer.start()
-                }
-            }
-        }
-    }
-
     Component {
         id: voiceAgent
         MouseArea {
             height: 120
             width: ListView.view.width
             Column {
-	        anchors.left: parent.left
-		anchors.leftMargin: 5
-		id: agentId
-		Label {
-		    id: agentIdText
-		    text: id
-                    color: '#66FF99'
-                    font.pixelSize: 38
-                    font.bold: active === "active"
-                }
-            }
-            Column {
-                anchors.left: agentId.right
                 anchors.leftMargin: 100
                 id: agentName
                 Label {
@@ -112,10 +62,11 @@ SettingPage {
                        maxpwidth: 744
                        maxpheight: 744
                        xpos: (parent.width - maxpwidth)/2
-                       ypos: (parent.height - maxpheight)
+                       ypos: (parent.height - maxpheight)/2
                        thisAgentName: name
                        thisAgentId: id
 		       thisAgentWuW: wuw
+		       thisAgentVendor: vendor
 		       thisAgentAuthState: authstate
                        thisAgentConnState: connstate
                        thisAgentDialogState: dialogstate
-- 
cgit 1.2.3-korg