Skip to content

Condense onboarding pages #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Condense onboarding pages #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ QML_RES_ICONS = \
qml/res/icons/gear.png \
qml/res/icons/info.png \
qml/res/icons/network-dark.png \
qml/res/icons/network-light.png
qml/res/icons/network-light.png

QML_QRC_CPP = qml/qrc_bitcoin.cpp
QML_QRC = qml/bitcoin_qml.qrc
Expand Down Expand Up @@ -340,18 +340,11 @@ QML_RES_QML = \
qml/pages/initerrormessage.qml \
qml/pages/main.qml \
qml/pages/onboarding/onboarding01.qml \
qml/pages/onboarding/onboarding01a.qml \
qml/pages/onboarding/onboarding01b.qml \
qml/pages/onboarding/onboarding01c.qml \
qml/pages/onboarding/onboarding02.qml \
qml/pages/onboarding/onboarding03.qml \
qml/pages/onboarding/onboarding04.qml \
qml/pages/onboarding/onboarding05.qml \
qml/pages/onboarding/onboarding05a.qml \
qml/pages/onboarding/onboarding05b.qml \
qml/pages/onboarding/onboarding06.qml \
qml/pages/onboarding/onboarding06a.qml \
qml/pages/onboarding/onboarding06b.qml
qml/pages/onboarding/onboarding06.qml

BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
if TARGET_WINDOWS
Expand Down
7 changes: 0 additions & 7 deletions src/qml/bitcoin_qml.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,11 @@
<file>pages/initerrormessage.qml</file>
<file>pages/main.qml</file>
<file>pages/onboarding/onboarding01.qml</file>
<file>pages/onboarding/onboarding01a.qml</file>
<file>pages/onboarding/onboarding01b.qml</file>
<file>pages/onboarding/onboarding01c.qml</file>
<file>pages/onboarding/onboarding02.qml</file>
<file>pages/onboarding/onboarding03.qml</file>
<file>pages/onboarding/onboarding04.qml</file>
<file>pages/onboarding/onboarding05.qml</file>
<file>pages/onboarding/onboarding05a.qml</file>
<file>pages/onboarding/onboarding05b.qml</file>
<file>pages/onboarding/onboarding06.qml</file>
<file>pages/onboarding/onboarding06a.qml</file>
<file>pages/onboarding/onboarding06b.qml</file>
</qresource>
<qresource prefix="/icons">
<file alias="arrow-down">res/icons/arrow-down.png</file>
Expand Down
99 changes: 93 additions & 6 deletions src/qml/pages/onboarding/onboarding01.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,101 @@ Page {
anchors.fill: parent
interactive: false
orientation: Qt.Horizontal
Loader {
source:"onboarding01a.qml"
Page {
background: null
clip: true
Layout.fillWidth: true
header: OnboardingNav {
alignLeft: false
navButton: NavButton {
iconSource: "image://images/info"
iconHeight: 24
onClicked: {
introductions.incrementCurrentIndex()
swipeView.inSubPage = true
}
}
}
OnboardingInfo {
width: 600
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
banner: Image {
Layout.fillWidth: true
Layout.alignment: Qt.AlignCenter
source: "image://images/app"
// Bitcoin icon has ~11% padding
sourceSize.width: 112
sourceSize.height: 112
}
bold: true
header: qsTr("Bitcoin Core App")
headerSize: 36
description: qsTr("Be part of the Bitcoin network.")
descriptionSize: 24
subtext: qsTr("100% open-source & open-design")
buttonText: "Start"
}
}
Loader {
source:"onboarding01b.qml"
Page {
background: null
clip: true
Layout.fillWidth: true
header: OnboardingNav {
navButton: NavButton {
iconSource: "image://images/caret-left"
text: "Back"
onClicked: {
introductions.decrementCurrentIndex()
swipeView.inSubPage = false
}
}
}
ColumnLayout {
width: 600
spacing: 0
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
Header {
Layout.fillWidth: true
bold: true
header: "About"
description: qsTr("Bitcoin Core is an open source project.\nIf you find it useful, please contribute.\n\n This is experimental software.")
descriptionMargin: 20
}
AboutOptions {
Layout.topMargin: 30
}
}
}
Loader {
source:"onboarding01c.qml"
Page {
background: null
clip: true
Layout.fillWidth: true
header: OnboardingNav {
navButton: NavButton {
iconSource: "image://images/caret-left"
text: "Back"
onClicked: {
introductions.decrementCurrentIndex()
swipeView.inSubPage = true
}
}
}
ColumnLayout {
width: 600
spacing: 0
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
Header {
Layout.fillWidth: true
bold: true
header: "Developer options"
}
DeveloperOptions {
Layout.topMargin: 30
}
}
}
}
}
49 changes: 0 additions & 49 deletions src/qml/pages/onboarding/onboarding01a.qml
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/qml/pages/onboarding/onboarding01b.qml
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions src/qml/pages/onboarding/onboarding01c.qml
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions src/qml/pages/onboarding/onboarding02.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ Page {
}
}
OnboardingInfo {
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
banner: Image {
source: Theme.image.network
sourceSize.width: 200
sourceSize.height: 200
}
bold: true
header: qsTr("Strengthen bitcoin")
description: qsTr("Bitcoin Core runs a full Bitcoin node which verifies the rules of the network are being followed.\n\nUsers running nodes is what makes bitcoin\nso resilient and trustworthy.")
buttonText: "Next"
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
banner: Image {
source: Theme.image.network
sourceSize.width: 200
sourceSize.height: 200
}
bold: true
header: qsTr("Strengthen bitcoin")
description: qsTr("Bitcoin Core runs a full Bitcoin node which verifies the rules of the network are being followed.\n\nUsers running nodes is what makes bitcoin\nso resilient and trustworthy.")
buttonText: "Next"
}
}
76 changes: 72 additions & 4 deletions src/qml/pages/onboarding/onboarding05.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,79 @@ Page {
anchors.fill: parent
interactive: false
orientation: Qt.Vertical
Loader {
source:"onboarding05a.qml"
Page {
background: null
Layout.fillWidth: true
clip: true
header: OnboardingNav {
navButton: NavButton {
iconSource: "image://images/caret-left"
text: "Back"
onClicked: swipeView.currentIndex -= 1
}
}
ColumnLayout {
width: 600
spacing: 0
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
Header {
Layout.fillWidth: true
bold: true
header: qsTr("Storage")
description: qsTr("Data retrieved from the Bitcoin network is stored\non your device.\n\nYou have 500GB of storage available.")
}
StorageOptions {
Layout.topMargin: 30
Layout.alignment: Qt.AlignCenter
}
TextButton {
Layout.alignment: Qt.AlignCenter
Layout.topMargin: 30
text: "Detailed settings"
textSize: 18
textColor: "#F7931A"
onClicked: {
storages.incrementCurrentIndex()
swipeView.inSubPage = true
}
}
ContinueButton {
Layout.alignment: Qt.AlignCenter
Layout.topMargin: 40
text: "Next"
onClicked: swipeView.incrementCurrentIndex()
}
}
}
Loader {
source:"onboarding05b.qml"
Page {
background: null
Layout.fillWidth: true
clip: true
header: OnboardingNav {
alignLeft: false
navButton: NavButton {
text: "Done"
onClicked: {
storages.decrementCurrentIndex()
swipeView.inSubPage = false
}
}
}
ColumnLayout {
width: 450
spacing: 0
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
Header {
Layout.fillWidth: true
bold: true
header: "Storage settings"
}
StorageSettings {
Layout.topMargin: 30
}
}
}
}
}
Loading