mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile UI/login: clean startPage/setupActions from Divelist

Browse source 
setupActions() in StartPage contained a mixture of StartPage
actions and DiveList actions.

Split setupActions to be pure.

However currently StartPage is embedded inside DiveList so the
action onVisibleChanged must be simulated.

Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2019-12-19 11:07:03 +01:00 committed by Dirk Hohndel
parent d1bee58dad
commit 4687de8c82
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
mobile-widgets/qml/DiveList.qml
View file

@ -34,6 +34,18 @@ Kirigami.ScrollablePage {
}
}
}
// this will be: onVisibleChanged: {
function simulateVisibleChanged() {
console.log("---> DiveList changed visibility to " + visible)
if (visible) {
page.actions.main = page.downloadFromDCAction
page.actions.right = page.addDiveAction
page.actions.left = page.filterToggleAction
page.title = qsTr("Dive list")
if (diveListView.count === 0)
showPassiveNotification(qsTr("Please tap the '+' button to add a dive (or download dives from a supported dive computer)"), 3000)
}
}
Component {
id: diveDelegate
@ -389,25 +401,18 @@ Kirigami.ScrollablePage {
credentialStatus === CloudStatus.CS_VERIFIED) ? 0 : 1
visible: opacity > 0
Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } }
function setupActions() {
if (prefs.credentialStatus === CloudStatus.CS_VERIFIED ||
prefs.credentialStatus === CloudStatus.CS_NOCLOUD) {
page.actions.main = page.downloadFromDCAction
page.actions.right = page.addDiveAction
page.actions.left = page.filterToggleAction
page.title = qsTr("Dive list")
if (diveListView.count === 0)
showPassiveNotification(qsTr("Please tap the '+' button to add a dive (or download dives from a supported dive computer)"), 3000)
} else {
onVisibleChanged: {
console.log("---> Startpage changed visibility to " + visible)
if (visible) {
page.actions.main = null
page.actions.right = null
page.actions.left = null
page.title = qsTr("Cloud credentials")
} else {
// This is to be removed when StartPage becomes a proper page
page.simulateVisibleChanged()
}
}
onVisibleChanged: {
setupActions();
}
}
Controls.Label {