ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve device adding layouts

Browse Source
This commit is contained in:
Michael Zanetti 2018-10-04 22:37:48 +02:00
parent b779b7329e
commit 703c94f769
2 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app-core/jsonrpc/jsonrpcclient.cpp
View File

@ -303,7 +303,7 @@ void JsonRpcClient::sendRequest(const QVariantMap &request)
{
QVariantMap newRequest = request;
newRequest.insert("token", m_token);
qDebug() << "Sending request" << qUtf8Printable(QJsonDocument::fromVariant(newRequest).toJson());
// qDebug() << "Sending request" << qUtf8Printable(QJsonDocument::fromVariant(newRequest).toJson());
m_connection->sendData(QJsonDocument::fromVariant(newRequest).toJson(QJsonDocument::Compact) + "\n");
}

72
nymea-app/ui/NewDeviceWizard.qml
View File

@ -31,7 +31,6 @@ Page {
property int pairRequestId: 0
property var pairingTransactionId: null
property int addRequestId: 0
property bool addResult: false
}
Connections {
@ -41,7 +40,11 @@ Page {
case "SetupMethodPushButton":
d.pairingTransactionId = params["pairingTransactionId"];
print("response", params["displayMessage"], d.pairingTransactionId)
internalPageStack.push(pairingPage, {text: params["displayMessage"]})
internalPageStack.push(pairingPageComponent, {text: params["displayMessage"]})
break;
case "SetupMethodDisplayPin":
d.pairingTransactionId = params["pairingTransactionId"];
internalPageStack.push(pairingPageComponent, {text: params["displayMessage"], setupMethod: params["setupMethod"]})
break;
default:
print("Setup method", params["setupMethod"], "not handled");
@ -49,13 +52,10 @@ Page {
}
}
onConfirmPairingReply: {
print("result", params["deviceError"])
d.addResult = (params["deviceError"] === "DeviceErrorNoError")
internalPageStack.push(resultsPage)
internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"]})
}
onAddDeviceReply: {
d.addResult = (params["deviceError"] === "DeviceErrorNoError")
internalPageStack.push(resultsPage)
internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"]})
}
}
@ -86,7 +86,6 @@ Page {
}
}
Component {
id: deviceClassesPage
Page {
@ -145,6 +144,7 @@ Page {
}
}
}
Component {
id: discoveryParamsPage
Page {
@ -208,7 +208,6 @@ Page {
}
}
Component {
id: discoveryPage
@ -320,6 +319,7 @@ Page {
id: paramRepeater
model: d.deviceDescriptorId == null ? d.deviceClass.paramTypes : null
delegate: ParamDelegate {
Layout.preferredHeight: 60
Layout.fillWidth: true
paramType: d.deviceClass.paramTypes.get(index)
}
@ -366,25 +366,44 @@ Page {
}
Component {
id: pairingPage
id: pairingPageComponent
Page {
id: pairingPage
property alias text: textLabel.text
property string setupMethod
ColumnLayout {
anchors.centerIn: parent
width: parent.width - app.margins * 2
spacing: app.margins * 2
Label {
Layout.fillWidth: true
wrapMode: Text.WordWrap
font.pixelSize: app.largeFont
text: qsTr("Pairing...")
color: app.accentColor
horizontalAlignment: Text.AlignHCenter
}
Label {
id: textLabel
Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
font.pixelSize: app.largeFont
}
TextField {
id: pinTextField
Layout.fillWidth: true
visible: pairingPage.setupMethod === "SetupMethodDisplayPin"
}
Button {
Layout.fillWidth: true
text: "OK"
onClicked: {
engine.deviceManager.confirmPairing(d.pairingTransactionId, d.deviceDescriptorId);
engine.deviceManager.confirmPairing(d.pairingTransactionId, pinTextField.displayText);
}
}
}
@ -396,19 +415,34 @@ Page {
Page {
id: resultsView
Column {
width: parent.width - 20
property bool success
property string deviceId
readonly property var device: engine.deviceManager.devices.getDevice(deviceId)
ColumnLayout {
width: parent.width - app.margins * 2
anchors.centerIn: parent
spacing: 20
spacing: app.margins * 2
Label {
width: parent.width
Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
text: d.addResult ? "Thing added!" : "Uh oh, something went wrong...";
text: resultsView.success ? qsTr("Thing added!") : qsTr("Uh oh")
font.pixelSize: app.largeFont
color: app.accentColor
}
Label {
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
text: resultsView.success ? qsTr("All done. You can now start using %1.").arg(resultsView.device.name) : qsTr("Something went wrong setting up this thing...");
}
Button {
width: parent.width
text: "Ok"
Layout.fillWidth: true
text: qsTr("Ok")
onClicked: pageStack.pop();
}
}