mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/UI: use theme colors for startup text and location warning

Browse source 
This now looks right for the dark theme.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-12-19 14:16:56 -08:00
parent 3429552433
commit b3c80c5ae0
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mobile-widgets/qml/main.qml
View file

@ -20,6 +20,7 @@ Kirigami.ApplicationWindow {
// the documentation claims that the ApplicationWindow should pick up the font set on // the documentation claims that the ApplicationWindow should pick up the font set on
// the C++ side. But as a matter of fact, it doesn't, unless you add this line: // the C++ side. But as a matter of fact, it doesn't, unless you add this line:
font: Qt.application.font font: Qt.application.font
background: Rectangle { color: subsurfaceTheme.backgroundColor }
pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.Breadcrumb pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.Breadcrumb
pageStack.globalToolBar.showNavigationButtons: (Kirigami.ApplicationHeaderStyle.ShowBackButton | Kirigami.ApplicationHeaderStyle.ShowForwardButton) pageStack.globalToolBar.showNavigationButtons: (Kirigami.ApplicationHeaderStyle.ShowBackButton | Kirigami.ApplicationHeaderStyle.ShowForwardButton)
@ -614,7 +615,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
} }
Text { Text {
text: qsTr("Background location service active") text: qsTr("Background location service active")
color: subsurfaceTheme.primaryTextColor color: subsurfaceTheme.textColor
visible: locationServiceEnabled visible: locationServiceEnabled
anchors.verticalCenter: ls_logo.verticalCenter anchors.verticalCenter: ls_logo.verticalCenter
} }
@ -773,6 +774,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
Kirigami.OverlaySheet { Kirigami.OverlaySheet {
id: locationWarning id: locationWarning
background: Rectangle { color: subsurfaceTheme.backgroundColor }
ColumnLayout { ColumnLayout {
width: locationWarning.width - Kirigami.Units.gridUnit width: locationWarning.width - Kirigami.Units.gridUnit
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.gridUnit
@ -783,17 +785,20 @@ if you have network connectivity and want to sync your data to cloud storage."),
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
color: subsurfaceTheme.textColor
text: qsTr("This service collects location data to enable you to track the GPS coordinates of your dives. " + 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.") "This will attempt to continue to collect location data, even if the app is closed or your phone screen locked.")
} }
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
color: subsurfaceTheme.textColor
text: qsTr("The location data are not used in any way, except when you apply the location data to the dives in your dive list on this device.") text: qsTr("The location data are not used in any way, except when you apply the location data to the dives in your dive list on this device.")
} }
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
color: subsurfaceTheme.textColor
text: qsTr("By default, the location data are never transferred to the cloud or to any other service. However, in order to allow debugging " + 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.") "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.")
} }
@ -808,6 +813,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
Label { Label {
id: textBlock id: textBlock
visible: !initialized visible: !initialized
color: subsurfaceTheme.textColor
text: qsTr("Subsurface-mobile starting up") text: qsTr("Subsurface-mobile starting up")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
topPadding: 2 * Kirigami.Units.gridUnit topPadding: 2 * Kirigami.Units.gridUnit