From 9cc991fc6d38306bcd670c8113154e6d2d6cbc2b Mon Sep 17 00:00:00 2001 From: Jarol Rodriguez Date: Wed, 7 Dec 2022 03:13:38 -0500 Subject: [PATCH 1/4] qml: give onboarding views descriptive names --- src/Makefile.qt.include | 12 ++++++------ src/qml/bitcoin_qml.qrc | 12 ++++++------ src/qml/pages/main.qml | 12 ++++++------ .../{onboarding03.qml => OnboardingBlockclock.qml} | 0 .../{onboarding06.qml => OnboardingConnection.qml} | 0 .../{onboarding01.qml => OnboardingCover.qml} | 0 ...{onboarding05.qml => OnboardingStorageAmount.qml} | 0 ...nboarding04.qml => OnboardingStorageLocation.qml} | 0 .../{onboarding02.qml => OnboardingStrengthen.qml} | 0 9 files changed, 18 insertions(+), 18 deletions(-) rename src/qml/pages/onboarding/{onboarding03.qml => OnboardingBlockclock.qml} (100%) rename src/qml/pages/onboarding/{onboarding06.qml => OnboardingConnection.qml} (100%) rename src/qml/pages/onboarding/{onboarding01.qml => OnboardingCover.qml} (100%) rename src/qml/pages/onboarding/{onboarding05.qml => OnboardingStorageAmount.qml} (100%) rename src/qml/pages/onboarding/{onboarding04.qml => OnboardingStorageLocation.qml} (100%) rename src/qml/pages/onboarding/{onboarding02.qml => OnboardingStrengthen.qml} (100%) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 9a320d4840..14b56ca3bf 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -344,12 +344,12 @@ QML_RES_QML = \ qml/controls/Wizard.qml \ qml/pages/initerrormessage.qml \ qml/pages/main.qml \ - qml/pages/onboarding/onboarding01.qml \ - qml/pages/onboarding/onboarding02.qml \ - qml/pages/onboarding/onboarding03.qml \ - qml/pages/onboarding/onboarding04.qml \ - qml/pages/onboarding/onboarding05.qml \ - qml/pages/onboarding/onboarding06.qml \ + qml/pages/onboarding/OnboardingBlockclock.qml \ + qml/pages/onboarding/OnboardingConnection.qml \ + qml/pages/onboarding/OnboardingCover.qml \ + qml/pages/onboarding/OnboardingStorageAmount.qml \ + qml/pages/onboarding/OnboardingStorageLocation.qml \ + qml/pages/onboarding/OnboardingStrengthen.qml \ qml/pages/settings/SettingsAbout.qml \ qml/pages/settings/SettingsConnection.qml \ qml/pages/settings/SettingsDeveloper.qml \ diff --git a/src/qml/bitcoin_qml.qrc b/src/qml/bitcoin_qml.qrc index 18e4b39ad0..931e7c33b2 100644 --- a/src/qml/bitcoin_qml.qrc +++ b/src/qml/bitcoin_qml.qrc @@ -27,12 +27,12 @@ controls/Wizard.qml pages/initerrormessage.qml pages/main.qml - pages/onboarding/onboarding01.qml - pages/onboarding/onboarding02.qml - pages/onboarding/onboarding03.qml - pages/onboarding/onboarding04.qml - pages/onboarding/onboarding05.qml - pages/onboarding/onboarding06.qml + pages/onboarding/OnboardingBlockclock.qml + pages/onboarding/OnboardingConnection.qml + pages/onboarding/OnboardingCover.qml + pages/onboarding/OnboardingStorageAmount.qml + pages/onboarding/OnboardingStorageLocation.qml + pages/onboarding/OnboardingStrengthen.qml pages/settings/SettingsAbout.qml pages/settings/SettingsConnection.qml pages/settings/SettingsDeveloper.qml diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml index 30e244decc..2ecf7ed3bb 100644 --- a/src/qml/pages/main.qml +++ b/src/qml/pages/main.qml @@ -26,12 +26,12 @@ ApplicationWindow { id: onboardingWizard anchors.fill: parent views: [ - "onboarding/onboarding01.qml", - "onboarding/onboarding02.qml", - "onboarding/onboarding03.qml", - "onboarding/onboarding04.qml", - "onboarding/onboarding05.qml", - "onboarding/onboarding06.qml", + "onboarding/OnboardingCover.qml", + "onboarding/OnboardingStrengthen.qml", + "onboarding/OnboardingBlockclock.qml", + "onboarding/OnboardingStorageLocation.qml", + "onboarding/OnboardingStorageAmount.qml", + "onboarding/OnboardingConnection.qml" ] onFinishedChanged: main.push(node) } diff --git a/src/qml/pages/onboarding/onboarding03.qml b/src/qml/pages/onboarding/OnboardingBlockclock.qml similarity index 100% rename from src/qml/pages/onboarding/onboarding03.qml rename to src/qml/pages/onboarding/OnboardingBlockclock.qml diff --git a/src/qml/pages/onboarding/onboarding06.qml b/src/qml/pages/onboarding/OnboardingConnection.qml similarity index 100% rename from src/qml/pages/onboarding/onboarding06.qml rename to src/qml/pages/onboarding/OnboardingConnection.qml diff --git a/src/qml/pages/onboarding/onboarding01.qml b/src/qml/pages/onboarding/OnboardingCover.qml similarity index 100% rename from src/qml/pages/onboarding/onboarding01.qml rename to src/qml/pages/onboarding/OnboardingCover.qml diff --git a/src/qml/pages/onboarding/onboarding05.qml b/src/qml/pages/onboarding/OnboardingStorageAmount.qml similarity index 100% rename from src/qml/pages/onboarding/onboarding05.qml rename to src/qml/pages/onboarding/OnboardingStorageAmount.qml diff --git a/src/qml/pages/onboarding/onboarding04.qml b/src/qml/pages/onboarding/OnboardingStorageLocation.qml similarity index 100% rename from src/qml/pages/onboarding/onboarding04.qml rename to src/qml/pages/onboarding/OnboardingStorageLocation.qml diff --git a/src/qml/pages/onboarding/onboarding02.qml b/src/qml/pages/onboarding/OnboardingStrengthen.qml similarity index 100% rename from src/qml/pages/onboarding/onboarding02.qml rename to src/qml/pages/onboarding/OnboardingStrengthen.qml From 5120735a5057a6d09853d726182e84cc280b4cc4 Mon Sep 17 00:00:00 2001 From: Jarol Rodriguez Date: Wed, 7 Dec 2022 03:34:22 -0500 Subject: [PATCH 2/4] qml: remove unused inSubPage bool This is not used at all. This is a remnant from a time where the idea was to have the navbar encapsulated within the Wizard control, and this bool would dictate what navbutton to display. We have since moved to each page provides its navbar and its navbuttons. --- src/qml/components/AboutOptions.qml | 1 - src/qml/controls/Wizard.qml | 1 - src/qml/pages/onboarding/OnboardingConnection.qml | 2 -- src/qml/pages/onboarding/OnboardingCover.qml | 3 --- src/qml/pages/onboarding/OnboardingStorageAmount.qml | 2 -- 5 files changed, 9 deletions(-) diff --git a/src/qml/components/AboutOptions.qml b/src/qml/components/AboutOptions.qml index e952156771..5408d68e51 100644 --- a/src/qml/components/AboutOptions.qml +++ b/src/qml/components/AboutOptions.qml @@ -57,7 +57,6 @@ ColumnLayout { background: null onClicked: { introductions.incrementCurrentIndex() - swipeView.inSubPage = true } } } diff --git a/src/qml/controls/Wizard.qml b/src/qml/controls/Wizard.qml index 34bfdc1ab7..fbe5994474 100644 --- a/src/qml/controls/Wizard.qml +++ b/src/qml/controls/Wizard.qml @@ -13,7 +13,6 @@ Page { background: null SwipeView { id: swipeView - property bool inSubPage: false property bool finished: false anchors.fill: parent interactive: false diff --git a/src/qml/pages/onboarding/OnboardingConnection.qml b/src/qml/pages/onboarding/OnboardingConnection.qml index b9fd76b8b1..7fb4997efb 100644 --- a/src/qml/pages/onboarding/OnboardingConnection.qml +++ b/src/qml/pages/onboarding/OnboardingConnection.qml @@ -42,7 +42,6 @@ Page { textColor: Theme.color.orange onClicked: { connections.incrementCurrentIndex() - swipeView.inSubPage = true } } lastPage: true @@ -53,7 +52,6 @@ Page { text: qsTr("Done") onClicked: { connections.decrementCurrentIndex() - swipeView.inSubPage = false } } } diff --git a/src/qml/pages/onboarding/OnboardingCover.qml b/src/qml/pages/onboarding/OnboardingCover.qml index 4831875171..759638f97e 100644 --- a/src/qml/pages/onboarding/OnboardingCover.qml +++ b/src/qml/pages/onboarding/OnboardingCover.qml @@ -23,7 +23,6 @@ Page { iconHeight: 24 onClicked: { introductions.incrementCurrentIndex() - swipeView.inSubPage = true } } bannerItem: Image { @@ -50,7 +49,6 @@ Page { text: qsTr("Back") onClicked: { introductions.decrementCurrentIndex() - swipeView.inSubPage = false } } } @@ -60,7 +58,6 @@ Page { text: qsTr("Back") onClicked: { introductions.decrementCurrentIndex() - swipeView.inSubPage = true } } } diff --git a/src/qml/pages/onboarding/OnboardingStorageAmount.qml b/src/qml/pages/onboarding/OnboardingStorageAmount.qml index 9a633a584e..f105104cc2 100644 --- a/src/qml/pages/onboarding/OnboardingStorageAmount.qml +++ b/src/qml/pages/onboarding/OnboardingStorageAmount.qml @@ -44,7 +44,6 @@ Page { textColor: "#F7931A" onClicked: { storages.incrementCurrentIndex() - swipeView.inSubPage = true } } } @@ -55,7 +54,6 @@ Page { text: qsTr("Done") onClicked: { storages.decrementCurrentIndex() - swipeView.inSubPage = false } } } From 8619e50f73959313559d8e58cd06d076d2960b03 Mon Sep 17 00:00:00 2001 From: Jarol Rodriguez Date: Wed, 7 Dec 2022 03:46:49 -0500 Subject: [PATCH 3/4] qml: do not load onboarding pages from url --- src/qml/pages/main.qml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml index 2ecf7ed3bb..008782cf0a 100644 --- a/src/qml/pages/main.qml +++ b/src/qml/pages/main.qml @@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import "../components" import "../controls" +import "./onboarding" ApplicationWindow { id: appWindow @@ -22,19 +23,25 @@ ApplicationWindow { anchors.fill: parent } - Wizard { + Component { id: onboardingWizard - anchors.fill: parent - views: [ - "onboarding/OnboardingCover.qml", - "onboarding/OnboardingStrengthen.qml", - "onboarding/OnboardingBlockclock.qml", - "onboarding/OnboardingStorageLocation.qml", - "onboarding/OnboardingStorageAmount.qml", - "onboarding/OnboardingConnection.qml" - ] - onFinishedChanged: main.push(node) + SwipeView { + id: swipeView + property bool finished: false + anchors.fill: parent + interactive: false + + OnboardingCover {} + OnboardingStrengthen {} + OnboardingBlockclock {} + OnboardingStorageLocation {} + OnboardingStorageAmount {} + OnboardingConnection {} + + onFinishedChanged: main.push(node) + } } + Component { id: node Page { From 6c29ddf761f0a498d27b47770dfa55ab0f0998f8 Mon Sep 17 00:00:00 2001 From: Jarol Rodriguez Date: Tue, 13 Dec 2022 14:12:05 -0500 Subject: [PATCH 4/4] qml: remove wizard control This is no longer providing any value and is not needed. --- src/Makefile.qt.include | 1 - src/qml/bitcoin_qml.qrc | 1 - src/qml/controls/Wizard.qml | 26 -------------------------- 3 files changed, 28 deletions(-) delete mode 100644 src/qml/controls/Wizard.qml diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 14b56ca3bf..c32b022ee8 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -341,7 +341,6 @@ QML_RES_QML = \ qml/controls/TextButton.qml \ qml/controls/Theme.qml \ qml/controls/ValueInput.qml \ - qml/controls/Wizard.qml \ qml/pages/initerrormessage.qml \ qml/pages/main.qml \ qml/pages/onboarding/OnboardingBlockclock.qml \ diff --git a/src/qml/bitcoin_qml.qrc b/src/qml/bitcoin_qml.qrc index 931e7c33b2..28e716d544 100644 --- a/src/qml/bitcoin_qml.qrc +++ b/src/qml/bitcoin_qml.qrc @@ -24,7 +24,6 @@ controls/TextButton.qml controls/Theme.qml controls/ValueInput.qml - controls/Wizard.qml pages/initerrormessage.qml pages/main.qml pages/onboarding/OnboardingBlockclock.qml diff --git a/src/qml/controls/Wizard.qml b/src/qml/controls/Wizard.qml deleted file mode 100644 index fbe5994474..0000000000 --- a/src/qml/controls/Wizard.qml +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2022 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 - -Page { - id: root - property var views - property alias finished: swipeView.finished - background: null - SwipeView { - id: swipeView - property bool finished: false - anchors.fill: parent - interactive: false - Repeater { - model: views.length - Loader { - source: "../pages/" + views[index] - } - } - } -}