diff options
-rw-r--r-- | GetStarted.qml | 6 | ||||
-rw-r--r-- | GetStartedForm.ui.qml | 26 | ||||
-rw-r--r-- | Onboarding.qml | 2 | ||||
-rw-r--r-- | OnboardingForm.ui.qml | 34 | ||||
-rw-r--r-- | main.qml | 7 |
5 files changed, 66 insertions, 9 deletions
diff --git a/GetStarted.qml b/GetStarted.qml new file mode 100644 index 0000000..b4744dd --- /dev/null +++ b/GetStarted.qml @@ -0,0 +1,6 @@ +import QtQuick 2.15 + +GetStartedForm { + objectName: "getstarted" + backButton.onClicked: pageView.pop() +} diff --git a/GetStartedForm.ui.qml b/GetStartedForm.ui.qml new file mode 100644 index 0000000..7cff151 --- /dev/null +++ b/GetStartedForm.ui.qml @@ -0,0 +1,26 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.12 + +Page { + id: pageView + property alias backButton: backButton + header: ToolBar { + background: Rectangle { + color: "#FAFFFFFF" + } + RowLayout { + ToolButton { + id: backButton + highlighted: true + } + } + } +} + +/*##^## +Designer { + D{i:0;autoSize:true;height:480;width:640} +} +##^##*/ + diff --git a/Onboarding.qml b/Onboarding.qml index c850b17..4bcf381 100644 --- a/Onboarding.qml +++ b/Onboarding.qml @@ -1,4 +1,4 @@ -import QtQuick 2.4 +import QtQuick 2.15 OnboardingForm { objectName: "onboarding" diff --git a/OnboardingForm.ui.qml b/OnboardingForm.ui.qml index 2b90394..536424c 100644 --- a/OnboardingForm.ui.qml +++ b/OnboardingForm.ui.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.12 import QtQuick.Controls.Material 2.3 StackView { @@ -8,10 +8,12 @@ StackView { property alias onboardingImage: onboardingImage property alias onboardingText1: onboardingText1 property alias onboardingText2: onboardingText2 + property alias disclaimerText: disclaimerText property alias startButton: startButton - initialItem: Page { + Page { id: page + anchors.fill: parent title: qsTr("Onboarding") ToolBar { @@ -72,8 +74,8 @@ StackView { anchors.left: parent.left anchors.leftMargin: 16 font.pointSize: 24 - font.family: "Work Sans" - font.weight: Font.Bold + font.family: "Roboto Mono" + font.weight: Font.Black } Text { @@ -88,7 +90,7 @@ StackView { anchors.left: parent.left anchors.leftMargin: 16 font.pointSize: 16 - font.family: "WorkSans" + font.family: "Roboto" font.weight: Font.Normal } @@ -101,10 +103,28 @@ StackView { anchors.rightMargin: 8 anchors.left: parent.left anchors.leftMargin: 8 - anchors.bottom: parent.bottom + anchors.bottom: disclaimerText.top + font.weight: Font.Medium anchors.bottomMargin: 16 font.capitalization: Font.MixedCase - font.family: "Work Sans" + font.family: "Roboto Mono" + } + Text { + id: disclaimerText + color: "#99000000" + text: qsTr("disclaimer text") + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap + font.weight: Font.Normal + font.pointSize: 10 + font.family: "Roboto Mono" + anchors.rightMargin: 24 + anchors.leftMargin: 24 + anchors.bottomMargin: 16 } } } @@ -1,17 +1,22 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.12 ApplicationWindow { id: window width: 360 height: 640 visible: true + title: { + text: qsTr("namatoko seller") + } OnboardingForm { id: pageView anchors.fill: parent + startButton.onClicked: pageView.push("GetStarted.qml") onboardingText1.text: qsTr("Everything you need to sell online.") onboardingText2.text: qsTr("Set up your store in minutes and bring your brand to life") + disclaimerText.text: qsTr("By tapping 'Get started' and using this app, you're agreeing to our terms of service and privacy policy") } } |