This repository has been archived by the owner on Jul 22, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #206 from DylanVanAssche/develop
Bump to V4.8-0
- Loading branch information
Showing
23 changed files
with
647 additions
and
137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * This file is part of Sailfinder. | ||
| * | ||
| * Sailfinder is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Sailfinder is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Sailfinder. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import QtQuick 2.0 | ||
| import Sailfish.Silica 1.0 | ||
|
|
||
| Page { | ||
| id: loginPhone | ||
|
|
||
| Connections { | ||
| target: api | ||
| onRequestCodeChanged: pageStack.replace(Qt.resolvedUrl("../pages/ValidatePhone.qml")) | ||
| } | ||
|
|
||
| SilicaFlickable { | ||
| anchors.fill: parent | ||
| contentHeight: column.height + Theme.paddingLarge | ||
| contentWidth: parent.width | ||
|
|
||
| VerticalScrollDecorator {} | ||
|
|
||
| Column { | ||
| id: column | ||
| width: parent.width - Theme.paddingLarge | ||
| spacing: Theme.paddingLarge | ||
|
|
||
| PageHeader { | ||
| //% "Log in with phone number" | ||
| title: qsTrId("sailfinder-login-phone") | ||
| } | ||
|
|
||
| Label { | ||
| //% "Please enter your phone number in international format (with country code)" | ||
| text: qsTrId("sailfinder-enter-phone") | ||
| wrapMode: Text.Wrap | ||
| width: parent.width | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| } | ||
|
|
||
| TextField { | ||
| id: phone | ||
| width: parent.width | ||
| inputMethodHints: Qt.ImhDialableCharactersOnly | ||
| //% "Phone number" | ||
| label: qsTrId("sailfinder-phone-number") | ||
| placeholderText: label | ||
| placeholderColor: Theme.highlightColor | ||
| color: Theme.highlightColor | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| EnterKey.iconSource: "image://theme/icon-m-enter-close" | ||
| EnterKey.onClicked: focus = false | ||
| } | ||
|
|
||
| Button { | ||
| //% "Send SMS code" | ||
| text: qsTrId("sailfinder-send-sms") | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| onClicked: api.authSendSMS(phone.text) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * This file is part of Sailfinder. | ||
| * | ||
| * Sailfinder is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Sailfinder is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Sailfinder. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import QtQuick 2.0 | ||
| import Sailfish.Silica 1.0 | ||
|
|
||
| Page { | ||
| id: validatePhone | ||
|
|
||
| Connections { | ||
| target: api | ||
| onAuthenticatedChanged: { | ||
| if(api.authenticated) { | ||
| console.debug("Tinder token successfully retrieved") | ||
| pageStack.clear() | ||
| pageStack.push(Qt.resolvedUrl("../pages/MainPage.qml")) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| SilicaFlickable { | ||
| anchors.fill: parent | ||
| contentHeight: column.height + Theme.paddingLarge | ||
| contentWidth: parent.width | ||
|
|
||
| VerticalScrollDecorator {} | ||
|
|
||
| Column { | ||
| id: column | ||
| width: parent.width - Theme.paddingLarge | ||
| spacing: Theme.paddingLarge | ||
|
|
||
| PageHeader { | ||
| //% "Log in with phone number" | ||
| title: qsTrId("sailfinder-login-phone") | ||
| } | ||
|
|
||
| Label { | ||
| //% "Please enter verification code" | ||
| text: qsTrId("sailfinder-enter-sms-code") | ||
| wrapMode: Text.Wrap | ||
| width: parent.width | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| } | ||
|
|
||
| TextField { | ||
| id: code | ||
| width: parent.width | ||
| inputMethodHints: Qt.ImhDialableCharactersOnly | ||
| //% "SMS code" | ||
| label: qsTrId("sailfinder-sms-code") | ||
| placeholderText: label | ||
| placeholderColor: Theme.highlightColor | ||
| color: Theme.highlightColor | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| EnterKey.iconSource: "image://theme/icon-m-enter-close" | ||
| EnterKey.onClicked: focus = false | ||
| } | ||
|
|
||
| Button { | ||
| //% "Log in" | ||
| text: qsTrId("sailfinder-log-in") | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| onClicked: api.authVerifySMS(code.text) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.