Compare commits
3 Commits
master
...
locationSe
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37f12453a5 | ||
|
|
a77ae75d6a | ||
|
|
e1f2d49361 |
@ -1,3 +1,4 @@
|
||||
- mobile: add location service warning as required by Google Play
|
||||
- desktop: allow adding dives to arbitrary trips
|
||||
- core: improve merging of cylinder pressures [#2884]
|
||||
- desktop: respect page-up, page-down, home and end keys for selection change [#2957]
|
||||
|
||||
@ -423,6 +423,10 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
||||
onTriggered: {
|
||||
globalDrawer.close();
|
||||
locationServiceEnabled = !locationServiceEnabled
|
||||
if (locationServiceEnabled) {
|
||||
locationWarning.open()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -600,10 +604,19 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
||||
*/
|
||||
}
|
||||
] // end actions
|
||||
Image {
|
||||
fillMode: Image.PreserveAspectFit
|
||||
source: "qrc:///icons/" + (subsurfaceTheme.currentTheme !== "" ? subsurfaceTheme.currentTheme : "Blue") + "_gps.svg"
|
||||
visible: locationServiceEnabled
|
||||
Row {
|
||||
spacing: Kirigami.Units.smallSpacing
|
||||
Image {
|
||||
id: ls_logo
|
||||
fillMode: Image.PreserveAspectFit
|
||||
source: "qrc:///icons/" + (subsurfaceTheme.currentTheme !== "" ? subsurfaceTheme.currentTheme : "Blue") + "_gps.svg"
|
||||
visible: locationServiceEnabled
|
||||
}
|
||||
Text {
|
||||
text: qsTr("Background location service active")
|
||||
visible: locationServiceEnabled
|
||||
anchors.verticalCenter: ls_logo.verticalCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -757,6 +770,40 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
||||
}
|
||||
}
|
||||
|
||||
Kirigami.OverlaySheet {
|
||||
id: locationWarning
|
||||
ColumnLayout {
|
||||
width: locationWarning.width - Kirigami.Units.gridUnit
|
||||
spacing: Kirigami.Units.gridUnit
|
||||
TemplateTitle {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
title: qsTr("Location Service Enabled")
|
||||
}
|
||||
Text {
|
||||
Layout.fillWidth: true
|
||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||
text: qsTr("This service collects location data to enable you to track the GPS coordinates of your dives. " +
|
||||
"This will attempt to continue to collect location data, even if the app is closed or your phone screen locked.")
|
||||
}
|
||||
Text {
|
||||
Layout.fillWidth: true
|
||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||
text: qsTr("The location data are not used in way, except when you apply the location data to the dives in your dive list on this device.")
|
||||
}
|
||||
Text {
|
||||
Layout.fillWidth: true
|
||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||
text: qsTr("By default, the location data are never transferred to the cloud or to any other service. However, in order to allow debugging " +
|
||||
"of location data related issues, you can explicitly enable storing those location data in the cloud by enabling the corresponding option in the advanced settings.")
|
||||
}
|
||||
TemplateButton {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
text: qsTr("Understood")
|
||||
onClicked: { locationWarning.close() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
id: textBlock
|
||||
visible: !initialized
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user