diff options
| -rw-r--r-- | LoginForm.ui.qml | 6 | ||||
| -rw-r--r-- | pages/EmailForm.ui.qml | 14 | ||||
| -rw-r--r-- | pages/Password.qml | 8 | ||||
| -rw-r--r-- | pages/PasswordForm.ui.qml | 15 |
4 files changed, 20 insertions, 23 deletions
diff --git a/LoginForm.ui.qml b/LoginForm.ui.qml index b0c6e0a..4a708e1 100644 --- a/LoginForm.ui.qml +++ b/LoginForm.ui.qml @@ -11,7 +11,7 @@ Rectangle { property alias googleButton: googleButton property alias emailButton: emailButton - Button { + RoundButton { id: googleButton text: qsTr("Continue with Google") font.family: "Google Sans" @@ -24,10 +24,10 @@ Rectangle { anchors.leftMargin: 16 Layout.fillWidth: true highlighted: true - Material.accent: Material.primary + Material.background: Material.primary } - Button { + RoundButton { id: emailButton text: qsTr("Continue with E-Mail") flat: true diff --git a/pages/EmailForm.ui.qml b/pages/EmailForm.ui.qml index d8f570c..b63e103 100644 --- a/pages/EmailForm.ui.qml +++ b/pages/EmailForm.ui.qml @@ -23,21 +23,15 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: 0 - Button { + RoundButton { id: backButton + flat: true anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 8 display: AbstractButton.IconOnly icon.name: "back-icon" icon.source: "/assets/arrow-back-24px.svg" icon.color: "transparent" - - background: Rectangle { - opacity: enabled ? 1.0 : 0.3 - color: backButton.down ? "#ddd" : "#fff" - radius: 6 - } } } Label { @@ -76,7 +70,7 @@ Rectangle { Layout.maximumHeight: 56 } - Button { + RoundButton { id: loginButton text: qsTr("Next") font.family: "Google Sans" @@ -88,7 +82,7 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: 16 highlighted: true - Material.accent: Material.primary + Material.background: Material.primary } } diff --git a/pages/Password.qml b/pages/Password.qml index e1fc168..7cd3d16 100644 --- a/pages/Password.qml +++ b/pages/Password.qml @@ -1,4 +1,12 @@ import QtQuick 2.12 +import id.co.darapsa.kelakon.user 0.1 PasswordForm { + width: stackView.width + height: stackView.height + backButton { + onClicked: { + stackView.pop() + } + } } diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml index c895d72..01d8113 100644 --- a/pages/PasswordForm.ui.qml +++ b/pages/PasswordForm.ui.qml @@ -8,6 +8,7 @@ Rectangle { color: "#fff" border.width: 0 + property alias backButton: backButton property alias passTextField: passTextField property alias createPassButton: createPassButton @@ -22,21 +23,15 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: 0 - Button { + RoundButton { id: backButton + flat: true anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 8 display: AbstractButton.IconOnly icon.name: "back-icon" icon.source: "/assets/arrow-back-24px.svg" icon.color: "transparent" - - background: Rectangle { - opacity: enabled ? 1.0 : 0.3 - color: backButton.down ? "#ddd" : "#fff" - radius: 6 - } } } @@ -77,7 +72,7 @@ Rectangle { echoMode: TextInput.Password } - Button { + RoundButton { id: createPassButton x: 34 y: 278 @@ -91,7 +86,7 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: 16 highlighted: true - Material.accent: Material.primary + Material.background: Material.primary } } |