mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
2e91de9d95
It appears that the onCompleted of the StartPage item is triggered before the onCompleted of the rootItem. This is logical as the Startpage is a child of the rootItem. And, yes, this does matter. As the divelist also contains the logic for initial cloud registration (and is the default page shown in a state where the cloud credentials are valid (CS_VERIFIED state)), we need to know the correct credential state at start of the app. The move of this one line of code makes sure of that, in addition to setting the credential state from the preferences. Now, the setupActions function can reference correct credential data. This is further preparation for a better cloud creation process from mobile. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
486 lines
16 KiB
QML
486 lines
16 KiB
QML
// SPDX-License-Identifier: GPL-2.0
|
|
import QtQuick 2.4
|
|
import QtQuick.Controls 2.0
|
|
import QtQuick.Controls.Material 2.1
|
|
import QtQuick.Window 2.2
|
|
import QtQuick.Dialogs 1.2
|
|
import QtQuick.Layouts 1.1
|
|
import QtQuick.Window 2.2
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
import org.kde.kirigami 2.0 as Kirigami
|
|
|
|
Kirigami.ApplicationWindow {
|
|
id: rootItem
|
|
title: qsTr("Subsurface-mobile")
|
|
reachableModeEnabled: false // while it's a good idea, it seems to confuse more than help
|
|
header: Kirigami.ApplicationHeader {
|
|
minimumHeight: 0
|
|
preferredHeight: Math.round(Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1.5))
|
|
maximumHeight: Kirigami.Units.gridUnit * 2
|
|
}
|
|
property alias oldStatus: manager.oldStatus
|
|
property alias notificationText: manager.notificationText
|
|
property alias syncToCloud: manager.syncToCloud
|
|
property alias locationServiceEnabled: manager.locationServiceEnabled
|
|
property alias showPin: manager.showPin
|
|
onNotificationTextChanged: {
|
|
if (notificationText != "") {
|
|
// there's a risk that we have a >5 second gap in update events;
|
|
// still, keep the timeout at 5s to avoid odd unchanging notifications
|
|
showPassiveNotification(notificationText, 5000)
|
|
} else {
|
|
// hiding the notification right away may be a mistake as it hides the last warning / error
|
|
hidePassiveNotification();
|
|
}
|
|
}
|
|
FontMetrics {
|
|
id: fontMetrics
|
|
Component.onCompleted: {
|
|
console.log("Using the following font: " + fontMetrics.font.family)
|
|
}
|
|
|
|
/* this shouldn't be needed anymore
|
|
Component.onCompleted: {
|
|
if (Math.round(rootItem.width / Kirigami.Units.gridUnit) < 20) {
|
|
fontMetrics.font.pointSize = fontMetrics.font.pointSize * 2 / 3
|
|
Kirigami.Theme.defaultFont.pointSize = fontMetrics.font.pointSize
|
|
console.log("Reduce font size for narrow screens: " + fontMetrics.font.pointSize)
|
|
}
|
|
}
|
|
*/
|
|
}
|
|
visible: false
|
|
|
|
// TODO: Verify where the opacity went to.
|
|
// opacity: 0
|
|
|
|
function returnTopPage() {
|
|
for (var i=stackView.depth; i>1; i--) {
|
|
stackView.pop()
|
|
}
|
|
detailsWindow.endEditMode()
|
|
}
|
|
|
|
function scrollToTop() {
|
|
diveList.scrollToTop()
|
|
}
|
|
|
|
function showMap(location) {
|
|
var urlPrefix = "https://www.google.com/maps/place/"
|
|
var locationPair = location + "/@" + location
|
|
var urlSuffix = ",5000m/data=!3m1!1e3!4m2!3m1!1s0x0:0x0"
|
|
Qt.openUrlExternally(urlPrefix + locationPair + urlSuffix)
|
|
|
|
}
|
|
|
|
function startAddDive() {
|
|
detailsWindow.state = "add"
|
|
detailsWindow.dive_id = manager.addDive();
|
|
detailsWindow.number = manager.getNumber(detailsWindow.dive_id)
|
|
detailsWindow.date = manager.getDate(detailsWindow.dive_id)
|
|
detailsWindow.airtemp = ""
|
|
detailsWindow.watertemp = ""
|
|
detailsWindow.buddyModel = manager.buddyInit
|
|
detailsWindow.buddyIndex = -1
|
|
detailsWindow.buddyText = ""
|
|
detailsWindow.depth = ""
|
|
detailsWindow.divemasterModel = manager.divemasterInit
|
|
detailsWindow.divemasterIndex = -1
|
|
detailsWindow.divemasterText = ""
|
|
detailsWindow.notes = ""
|
|
detailsWindow.location = ""
|
|
detailsWindow.gps = ""
|
|
detailsWindow.duration = ""
|
|
detailsWindow.suitModel = manager.suitInit
|
|
detailsWindow.suitIndex = -1
|
|
detailsWindow.suitText = ""
|
|
detailsWindow.cylinderModel = manager.cylinderInit
|
|
detailsWindow.cylinderIndex = -1
|
|
detailsWindow.cylinderText = ""
|
|
detailsWindow.weight = ""
|
|
detailsWindow.gasmix = ""
|
|
detailsWindow.startpressure = ""
|
|
detailsWindow.endpressure = ""
|
|
detailsWindow.gpsCheckbox = false
|
|
stackView.push(detailsWindow)
|
|
}
|
|
|
|
globalDrawer: Kirigami.GlobalDrawer {
|
|
title: qsTr("Subsurface")
|
|
titleIcon: "qrc:/qml/subsurface-mobile-icon.png"
|
|
|
|
bannerImageSource: "dive.jpg"
|
|
|
|
actions: [
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_home.svg"
|
|
text: qsTr("Dive list")
|
|
onTriggered: {
|
|
manager.appendTextToLog("requested dive list with credential status " + manager.credentialStatus)
|
|
if (manager.credentialStatus == QMLManager.CS_UNKNOWN) {
|
|
// the user has asked to change credentials - if the credentials before that
|
|
// were valid, go back to dive list
|
|
if (oldStatus == QMLManager.CS_VERIFIED) {
|
|
manager.credentialStatus = oldStatus
|
|
}
|
|
}
|
|
returnTopPage()
|
|
globalDrawer.close()
|
|
}
|
|
},
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_sync.svg"
|
|
text: qsTr("Dive management")
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_add.svg"
|
|
text: qsTr("Add dive manually")
|
|
enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD
|
|
onTriggered: {
|
|
returnTopPage() // otherwise odd things happen with the page stack
|
|
startAddDive()
|
|
}
|
|
}
|
|
Kirigami.Action {
|
|
iconName: "icons/downloadDC.svg"
|
|
text: qsTr("Download from DC")
|
|
enabled: true
|
|
onTriggered: {
|
|
downloadFromDc.dcImportModel.clearTable()
|
|
stackView.push(downloadFromDc)
|
|
}
|
|
}
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_add_location.svg"
|
|
text: qsTr("Apply GPS Fixes")
|
|
onTriggered: {
|
|
manager.applyGpsData();
|
|
}
|
|
}
|
|
Kirigami.Action {
|
|
iconName: "icons/cloud_sync.svg"
|
|
text: qsTr("Manual sync with cloud")
|
|
enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD
|
|
onTriggered: {
|
|
if (manager.credentialStatus === QMLManager.CS_NOCLOUD) {
|
|
returnTopPage()
|
|
oldStatus = manager.credentialStatus
|
|
manager.startPageText = "Enter valid cloud storage credentials"
|
|
manager.credentialStatus = QMLManager.CS_UNKNOWN
|
|
globalDrawer.close()
|
|
} else {
|
|
globalDrawer.close()
|
|
detailsWindow.endEditMode()
|
|
manager.saveChangesCloud(true);
|
|
globalDrawer.close()
|
|
}
|
|
}
|
|
}
|
|
Kirigami.Action {
|
|
iconName: syncToCloud ? "icons/ic_cloud_off.svg" : "icons/ic_cloud_done.svg"
|
|
text: syncToCloud ? qsTr("Offline mode") : qsTr("Enable auto cloud sync")
|
|
enabled: manager.credentialStatus !== QMLManager.CS_NOCLOUD
|
|
onTriggered: {
|
|
syncToCloud = !syncToCloud
|
|
if (!syncToCloud) {
|
|
showPassiveNotification(qsTr("Turning off automatic sync to cloud causes all data to only be \
|
|
stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' \
|
|
if you have network connectivity and want to sync your data to cloud storage."), 10000)
|
|
}
|
|
}
|
|
}
|
|
},
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_place.svg"
|
|
text: qsTr("GPS")
|
|
visible: (Qt.platform.os !== "ios")
|
|
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_cloud_upload.svg"
|
|
text: qsTr("Upload GPS data")
|
|
onTriggered: {
|
|
manager.sendGpsData();
|
|
}
|
|
}
|
|
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_cloud_download.svg"
|
|
text: qsTr("Download GPS data")
|
|
onTriggered: {
|
|
manager.downloadGpsData();
|
|
}
|
|
}
|
|
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_gps_fixed.svg"
|
|
text: qsTr("Show GPS fixes")
|
|
onTriggered: {
|
|
returnTopPage()
|
|
manager.populateGpsData();
|
|
stackView.push(gpsWindow)
|
|
}
|
|
}
|
|
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_clear.svg"
|
|
text: qsTr("Clear GPS cache")
|
|
onTriggered: {
|
|
manager.clearGpsData();
|
|
}
|
|
}
|
|
|
|
Kirigami.Action {
|
|
iconName: locationServiceEnabled ? "icons/ic_location_off.svg" : "icons/ic_place.svg"
|
|
text: locationServiceEnabled ? qsTr("Disable location service") : qsTr("Run location service")
|
|
onTriggered: {
|
|
locationServiceEnabled = !locationServiceEnabled
|
|
}
|
|
}
|
|
},
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_info_outline.svg"
|
|
text: qsTr("About")
|
|
onTriggered: {
|
|
stackView.push(aboutWindow)
|
|
detailsWindow.endEditMode()
|
|
}
|
|
},
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_settings.svg"
|
|
text: qsTr("Settings")
|
|
onTriggered: {
|
|
stackView.push(settingsWindow)
|
|
detailsWindow.endEditMode()
|
|
}
|
|
},
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_adb.svg"
|
|
text: qsTr("Developer")
|
|
visible: manager.developer
|
|
Kirigami.Action {
|
|
text: qsTr("App log")
|
|
onTriggered: {
|
|
stackView.push(logWindow)
|
|
}
|
|
}
|
|
|
|
Kirigami.Action {
|
|
text: qsTr("Theme information")
|
|
onTriggered: {
|
|
stackView.push(themetest)
|
|
}
|
|
}
|
|
},
|
|
Kirigami.Action {
|
|
iconName: "icons/ic_help_outline.svg"
|
|
text: qsTr("Help")
|
|
onTriggered: {
|
|
Qt.openUrlExternally("https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual/")
|
|
}
|
|
}
|
|
] // end actions
|
|
Kirigami.Icon {
|
|
source: "icons/" + subsurfaceTheme.currentTheme + "_gps.svg"
|
|
enabled: false
|
|
visible: locationServiceEnabled
|
|
}
|
|
|
|
}
|
|
|
|
function blueTheme() {
|
|
Material.theme = Material.Light
|
|
Material.accent = subsurfaceTheme.bluePrimaryColor
|
|
subsurfaceTheme.currentTheme = "Blue"
|
|
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.blueDarkerPrimaryColor
|
|
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.blueDarkerPrimaryTextColor
|
|
subsurfaceTheme.primaryColor = subsurfaceTheme.bluePrimaryColor
|
|
subsurfaceTheme.primaryTextColor = subsurfaceTheme.bluePrimaryTextColor
|
|
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.blueLightPrimaryColor
|
|
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor
|
|
subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor
|
|
subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor
|
|
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor
|
|
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
|
subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor
|
|
}
|
|
|
|
function pinkTheme() {
|
|
Material.theme = Material.Light
|
|
Material.accent = subsurfaceTheme.pinkPrimaryColor
|
|
subsurfaceTheme.currentTheme = "Pink"
|
|
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.pinkDarkerPrimaryColor
|
|
subsurfaceTheme.darkerPrimaryTextColor = subsurfaceTheme.pinkDarkerPrimaryTextColor
|
|
subsurfaceTheme.primaryColor = subsurfaceTheme.pinkPrimaryColor
|
|
subsurfaceTheme.primaryTextColor = subsurfaceTheme.pinkPrimaryTextColor
|
|
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.pinkLightPrimaryColor
|
|
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor
|
|
subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor
|
|
subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor
|
|
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor
|
|
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
|
subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor
|
|
}
|
|
|
|
function darkTheme() {
|
|
Material.theme = Material.Dark
|
|
Material.accent = subsurfaceTheme.darkerPrimaryColor
|
|
subsurfaceTheme.currentTheme = "Dark"
|
|
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.darkDarkerPrimaryColor
|
|
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.darkDarkerPrimaryTextColor
|
|
subsurfaceTheme.primaryColor = subsurfaceTheme.darkPrimaryColor
|
|
subsurfaceTheme.primaryTextColor = subsurfaceTheme.darkPrimaryTextColor
|
|
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.darkLightPrimaryColor
|
|
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor
|
|
subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor
|
|
subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor
|
|
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor
|
|
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
|
subsurfaceTheme.drawerColor = subsurfaceTheme.darkDrawerColor
|
|
}
|
|
|
|
QtObject {
|
|
id: subsurfaceTheme
|
|
property int regularPointSize: fontMetrics.font.pointSize
|
|
property int titlePointSize: Math.round(regularPointSize * 1.5)
|
|
property int smallPointSize: Math.round(regularPointSize * 0.8)
|
|
|
|
// colors currently in use
|
|
property string currentTheme
|
|
property color darkerPrimaryColor
|
|
property color darkerPrimaryTextColor
|
|
property color primaryColor
|
|
property color primaryTextColor
|
|
property color lightPrimaryColor
|
|
property color lightPrimaryTextColor
|
|
property color backgroundColor
|
|
property color textColor
|
|
property color secondaryTextColor
|
|
property color drawerColor
|
|
|
|
// colors for the blue theme
|
|
property color blueDarkerPrimaryColor: "#303F9f"
|
|
property color blueDarkerPrimaryTextColor: "#ECECEC"
|
|
property color bluePrimaryColor: "#3F51B5"
|
|
property color bluePrimaryTextColor: "#FFFFFF"
|
|
property color blueLightPrimaryColor: "#C5CAE9"
|
|
property color blueLightPrimaryTextColor: "#212121"
|
|
property color blueBackgroundColor: "#eff0f1"
|
|
property color blueTextColor: blueLightPrimaryTextColor
|
|
property color blueSecondaryTextColor: "#757575"
|
|
|
|
// colors for the pink theme
|
|
property color pinkDarkerPrimaryColor: "#C2185B"
|
|
property color pinkDarkerPrimaryTextColor: "#ECECEC"
|
|
property color pinkPrimaryColor: "#FF69B4"
|
|
property color pinkPrimaryTextColor: "#212121"
|
|
property color pinkLightPrimaryColor: "#FFDDF4"
|
|
property color pinkLightPrimaryTextColor: "#212121"
|
|
property color pinkBackgroundColor: "#eff0f1"
|
|
property color pinkTextColor: pinkLightPrimaryTextColor
|
|
property color pinkSecondaryTextColor: "#757575"
|
|
|
|
// colors for the dark theme
|
|
property color darkDarkerPrimaryColor: "#303F9f"
|
|
property color darkDarkerPrimaryTextColor: "#ECECEC"
|
|
property color darkPrimaryColor: "#3F51B5"
|
|
property color darkPrimaryTextColor: "#ECECEC"
|
|
property color darkLightPrimaryColor: "#C5CAE9"
|
|
property color darkLightPrimaryTextColor: "#212121"
|
|
property color darkBackgroundColor: "#303030"
|
|
property color darkTextColor: darkPrimaryTextColor
|
|
property color darkSecondaryTextColor: "#757575"
|
|
|
|
property color contrastAccentColor: "#FF5722" // used for delete button
|
|
property color lightDrawerColor: "#FFFFFF"
|
|
property color darkDrawerColor: "#424242"
|
|
|
|
property int columnWidth: Math.round(rootItem.width/(Kirigami.Units.gridUnit*28)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(Kirigami.Units.gridUnit*28))) : rootItem.width
|
|
Component.onCompleted: {
|
|
Kirigami.Theme.highlightColor = Qt.binding(function() { return primaryColor })
|
|
Kirigami.Theme.highlightedTextColor = Qt.binding(function() { return darkerPrimaryTextColor })
|
|
Kirigami.Theme.backgroundColor = Qt.binding(function() { return backgroundColor })
|
|
Kirigami.Theme.textColor = Qt.binding(function() { return textColor })
|
|
Kirigami.Theme.buttonHoverColor = Qt.binding(function() { return primaryColor })
|
|
Kirigami.Theme.viewBackgroundColor = Qt.binding(function() { return drawerColor })
|
|
Kirigami.Theme.viewTextColor = Qt.binding(function() { return textColor })
|
|
Kirigami.Theme.buttonBackgroundColor = Qt.binding(function() { return drawerColor })
|
|
Kirigami.Theme.buttonTextColor = Qt.binding(function() { return textColor })
|
|
Kirigami.Theme.buttonFocusColor = Qt.binding(function() { return "red" })
|
|
|
|
// this needs to pick the theme from persistent preference settings
|
|
var theme = manager.theme
|
|
if (theme == "Blue")
|
|
blueTheme()
|
|
else if (theme == "Pink")
|
|
pinkTheme()
|
|
else
|
|
darkTheme()
|
|
}
|
|
}
|
|
property Item stackView: pageStack
|
|
pageStack.initialPage: DiveList {
|
|
id: diveList
|
|
opacity: 0
|
|
Behavior on opacity {
|
|
NumberAnimation {
|
|
duration: 200
|
|
easing.type: Easing.OutQuad
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
QMLManager {
|
|
id: manager
|
|
}
|
|
|
|
Settings {
|
|
id: settingsWindow
|
|
visible: false
|
|
}
|
|
|
|
About {
|
|
id: aboutWindow
|
|
visible: false
|
|
}
|
|
|
|
DiveDetails {
|
|
id: detailsWindow
|
|
visible: false
|
|
anchors.fill: parent
|
|
}
|
|
|
|
Log {
|
|
id: logWindow
|
|
visible: false
|
|
}
|
|
|
|
GpsList {
|
|
id: gpsWindow
|
|
visible: false
|
|
}
|
|
|
|
DownloadFromDiveComputer {
|
|
id: downloadFromDc
|
|
visible: false
|
|
}
|
|
|
|
ThemeTest {
|
|
id: themetest
|
|
visible: false
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
rootItem.visible = true
|
|
diveList.opacity = 1
|
|
rootItem.opacity = 1
|
|
pageStack.defaultColumnWidth = Kirigami.Units.gridUnit * 28
|
|
}
|
|
/* TODO: Verify where opacity went to.
|
|
Behavior on opacity {
|
|
NumberAnimation {
|
|
duration: 200
|
|
easing.type: Easing.OutQuad
|
|
}
|
|
}
|
|
*/
|
|
}
|