diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-19 14:16:56 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-20 10:51:18 -0800 |
| commit | b3c80c5ae0d518507a14b760a2dc1823a67efb1f (patch) | |
| tree | eaad00dbc72967d3ad46e402694d78c710e4ba0a /mobile-widgets/qml | |
| parent | 34295524334e62518350fdd989e9f9f9a5177790 (diff) | |
| download | subsurface-b3c80c5ae0d518507a14b760a2dc1823a67efb1f.tar.gz | |
mobile/UI: use theme colors for startup text and location warning
This now looks right for the dark theme.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/main.qml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index dbaadc433..c1f8ae9c5 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -20,6 +20,7 @@ Kirigami.ApplicationWindow { // 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: font: Qt.application.font + background: Rectangle { color: subsurfaceTheme.backgroundColor } pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.Breadcrumb 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: qsTr("Background location service active") - color: subsurfaceTheme.primaryTextColor + color: subsurfaceTheme.textColor visible: locationServiceEnabled 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 { id: locationWarning + background: Rectangle { color: subsurfaceTheme.backgroundColor } ColumnLayout { width: locationWarning.width - 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 { Layout.fillWidth: true wrapMode: Text.WrapAtWordBoundaryOrAnywhere + color: subsurfaceTheme.textColor 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 + 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 { Layout.fillWidth: true 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 " + "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 { id: textBlock visible: !initialized + color: subsurfaceTheme.textColor text: qsTr("Subsurface-mobile starting up") font.pointSize: subsurfaceTheme.headingPointSize topPadding: 2 * Kirigami.Units.gridUnit |