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

Fix text in darkmode on mobile app.

Browse source 
Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com>
This commit is contained in:
Paul Buxton 2019-10-05 02:21:56 +01:00 • committed by Dirk Hohndel
parent d82e008b4c
commit 65ec16e59d
5 changed files with 107 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -161,6 +161,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Date:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtDate;
@ -168,11 +169,13 @@ Item {
onEditingFinished: {
focus = false
}
color: subsurfaceTheme.textColor
}
Controls.Label {
Layout.alignment: Qt.AlignRight
text: qsTr("Location:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
id: locationBox
@ -196,10 +199,12 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Coordinates:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtGps
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -210,6 +215,7 @@ Item {
text: qsTr("Use current\nGPS location:")
visible: manager.locationServiceAvailable
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
SsrfCheckBox {
id: checkboxGPS
@ -230,10 +236,12 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Depth:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtDepth
Layout.fillWidth: true
color: subsurfaceTheme.textColor
validator: RegExpValidator { regExp: /[^-]*/ }
onEditingFinished: {
focus = false
@ -243,10 +251,12 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Duration:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtDuration
Layout.fillWidth: true
color: subsurfaceTheme.textColor
validator: RegExpValidator { regExp: /[^-]*/ }
onEditingFinished: {
focus = false
@ -257,10 +267,12 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Air Temp:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtAirTemp
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -270,10 +282,12 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Water Temp:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtWaterTemp
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -283,6 +297,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Suit:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
id: suitBox
@ -304,6 +319,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Buddy:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
id: buddyBox
@ -324,6 +340,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Divemaster:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
id: divemasterBox
@ -344,11 +361,13 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Weight:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtWeight
readOnly: text === "cannot edit multiple weight systems"
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -359,6 +378,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder1:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
id: cylinderBox0
@ -373,11 +393,13 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtGasMix0
text: usedGas[0] != null ? usedGas[0] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: {
focus = false
@ -388,11 +410,13 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtStartPressure0
text: startpressure[0] != null ? startpressure[0] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -402,11 +426,13 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
id: txtEndPressure0
text: endpressure[0] != null ? endpressure[0] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -417,6 +443,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder2:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
visible: usedCyl[1] != null ? true : false
@ -433,12 +460,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[1] != null ? true : false
id: txtGasMix1
text: usedGas[1] != null ? usedGas[1] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: {
focus = false
@ -449,6 +478,7 @@ Item {
visible: usedCyl[1] != null ? true : false
Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:")
color: subsurfaceTheme.textColor
font.pointSize: subsurfaceTheme.smallPointSize
}
Controls.TextField {
@ -456,6 +486,7 @@ Item {
id: txtStartPressure1
text: startpressure[1] != null ? startpressure[1] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -465,6 +496,7 @@ Item {
visible: usedCyl[1] != null ? true : false
Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:")
color: subsurfaceTheme.textColor
font.pointSize: subsurfaceTheme.smallPointSize
}
Controls.TextField {
@ -472,6 +504,7 @@ Item {
id: txtEndPressure1
text: endpressure[1] != null ? endpressure[1] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -481,6 +514,7 @@ Item {
visible: usedCyl[2] != null ? true : false
Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder3:")
color: subsurfaceTheme.textColor
font.pointSize: subsurfaceTheme.smallPointSize
}
Controls.ComboBox {
@ -499,12 +533,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[2] != null ? true : false
id: txtGasMix2
text: usedGas[2] != null ? usedGas[2] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: {
focus = false
@ -516,12 +552,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[2] != null ? true : false
id: txtStartPressure2
text: startpressure[2] != null ? startpressure[2] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -532,12 +570,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[2] != null ? true : false
id: txtEndPressure2
text: endpressure[2] != null ? endpressure[2] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -548,6 +588,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder4:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
visible: usedCyl[3] != null ? true : false
@ -565,6 +606,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[3] != null ? true : false
@ -572,6 +614,7 @@ Item {
text: usedGas[3] != null ? usedGas[3] : null
Layout.fillWidth: true
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -582,12 +625,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[3] != null ? true : false
id: txtStartPressure3
text: startpressure[3] != null ? startpressure[3] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -598,12 +643,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[3] != null ? true : false
id: txtEndPressure3
text: endpressure[3] != null ? endpressure[3] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -614,6 +661,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder5:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
visible: usedCyl[4] != null ? true : false
@ -631,12 +679,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[4] != null ? true : false
id: txtGasMix4
text: usedGas[4] != null ? usedGas[4] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: {
focus = false
@ -648,12 +698,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[4] != null ? true : false
id: txtStartPressure4
text: startpressure[4] != null ? startpressure[4] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -664,12 +716,14 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextField {
visible: usedCyl[4] != null ? true : false
id: txtEndPressure4
text: endpressure[4] != null ? endpressure[4] : null
Layout.fillWidth: true
color: subsurfaceTheme.textColor
onEditingFinished: {
focus = false
}
@ -679,6 +733,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Rating:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.SpinBox {
id: ratingPicker
@ -692,6 +747,7 @@ Item {
Layout.alignment: Qt.AlignRight
text: qsTr("Visibility:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.SpinBox {
id: visibilityPicker
@ -706,6 +762,7 @@ Item {
Layout.alignment: Qt.AlignLeft
text: qsTr("Notes:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
}
Controls.TextArea {
Layout.columnSpan: 2

32
mobile-widgets/qml/DiveDetailsView.qml
View file

@ -20,7 +20,7 @@ Item {
height: divePlate.implicitHeight + bottomLayout.implicitHeight + Kirigami.Units.iconSizes.large
Rectangle {
z: 99
color: Kirigami.Theme.textColor
color: subsurfaceTheme.textColor
opacity: 0.3
width: Kirigami.Units.smallSpacing/4
anchors {
@ -40,7 +40,7 @@ Item {
font.weight: Font.Bold
font.pointSize: subsurfaceTheme.titlePointSize
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
color: Kirigami.Theme.textColor
color: subsurfaceTheme.textColor
anchors {
left: parent.left
top: parent.top
@ -118,30 +118,35 @@ Item {
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: ratingText.verticalCenter
source: (dive.rating >= 1) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: ratingText.verticalCenter
source: (dive.rating >= 2) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: ratingText.verticalCenter
source: (dive.rating >= 3) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: ratingText.verticalCenter
source: (dive.rating >= 4) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: ratingText.verticalCenter
source: (dive.rating === 5) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
}
Row {
@ -161,30 +166,35 @@ Item {
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: visibilityText.verticalCenter
source: (dive.visibility >= 1) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: visibilityText.verticalCenter
source: (dive.visibility >= 2) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: visibilityText.verticalCenter
source: (dive.visibility >= 3) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: visibilityText.verticalCenter
source: (dive.visibility >= 4) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
Kirigami.Icon {
width: height
height: subsurfaceTheme.regularPointSize
anchors.verticalCenter: visibilityText.verticalCenter
source: (dive.visibility === 5) ? ":/icons/ic_star.svg" : ":/icons/ic_star_border.svg"
color: subsurfaceTheme.textColor
}
}
@ -235,18 +245,21 @@ Item {
opacity: 0.6
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
color: subsurfaceTheme.textColor
}
Controls.Label {
text: qsTr("Air Temp:")
opacity: 0.6
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col2Width
color: subsurfaceTheme.textColor
}
Controls.Label {
text: qsTr("Water Temp:")
opacity: 0.6
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col3Width
color: subsurfaceTheme.textColor
}
// second row
@ -256,18 +269,21 @@ Item {
text: dive.suit
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
color: subsurfaceTheme.textColor
}
Controls.Label {
id: txtAirTemp
text: dive.airTemp
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col2Width
color: subsurfaceTheme.textColor
}
Controls.Label {
id: txtWaterTemp
text: dive.waterTemp
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col3Width
color: subsurfaceTheme.textColor
}
Rectangle {
@ -286,6 +302,7 @@ Item {
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
Layout.bottomMargin: 0
color: subsurfaceTheme.textColor
}
Controls.Label {
text: qsTr("Weight:")
@ -293,6 +310,7 @@ Item {
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col2Width
Layout.bottomMargin: 0
color: subsurfaceTheme.textColor
}
Controls.Label {
text: qsTr("SAC:")
@ -300,6 +318,7 @@ Item {
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col3Width
Layout.bottomMargin: 0
color: subsurfaceTheme.textColor
}
// fourth row
@ -309,18 +328,21 @@ Item {
text: dive.getCylinder.join(', ')
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
color: subsurfaceTheme.textColor
}
Controls.Label {
id: txtWeight
text: dive.sumWeight
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col2Width
color: subsurfaceTheme.textColor
}
Controls.Label {
id: txtSAC
text: dive.sac
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col3Width
color: subsurfaceTheme.textColor
}
Rectangle {
@ -339,6 +361,7 @@ Item {
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
Layout.bottomMargin: 0
color: subsurfaceTheme.textColor
}
Controls.Label {
text: qsTr("Buddy:")
@ -347,6 +370,7 @@ Item {
Layout.columnSpan: 2
Layout.maximumWidth: detailsView.col2Width + detailsView.col3Width
Layout.bottomMargin: 0
color: subsurfaceTheme.textColor
}
// sixth row
@ -356,6 +380,7 @@ Item {
text: dive.divemaster
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
color: subsurfaceTheme.textColor
}
Controls.Label {
id: txtBuddy
@ -363,6 +388,7 @@ Item {
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.columnSpan: 2
Layout.maximumWidth: detailsView.col2Width + detailsView.col3Width
color: subsurfaceTheme.textColor
}
Rectangle {
@ -380,6 +406,7 @@ Item {
text: qsTr("Notes")
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.columnSpan: 3
color: subsurfaceTheme.textColor
}
Controls.Label {
@ -389,6 +416,7 @@ Item {
Layout.columnSpan: 3
Layout.fillWidth: true
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
color: subsurfaceTheme.textColor
}
Item {
Layout.columnSpan: 3

2
mobile-widgets/qml/Log.qml
View file

@ -27,7 +27,7 @@ Kirigami.ScrollablePage {
delegate : Text {
width: logWindow.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
color: Kirigami.Theme.textColor
color: subsurfaceTheme.textColor
text : message
font.pointSize: subsurfaceTheme.smallPointSize
leftPadding: Kirigami.Units.gridUnit / 2

17
mobile-widgets/qml/Settings.qml
View file

@ -42,11 +42,13 @@ Kirigami.ScrollablePage {
text: qsTr("Email")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.15
color: subsurfaceTheme.textColor
}
Controls.Label {
text: prefs.credentialStatus === CloudStatus.CS_NOCLOUD ? qsTr("Not applicable") : prefs.cloudUserName
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.60
color: subsurfaceTheme.textColor
}
SsrfButton {
id: changeCloudSettings
@ -61,12 +63,14 @@ Kirigami.ScrollablePage {
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.15
Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
color: subsurfaceTheme.textColor
}
Controls.Label {
text: describe[prefs.credentialStatus]
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.60
Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
color: subsurfaceTheme.textColor
}
}
@ -149,6 +153,7 @@ Kirigami.ScrollablePage {
font.pointSize: subsurfaceTheme.regularPointSize
rightPadding: Kirigami.Units.gridUnit
Layout.preferredWidth: gridWidth * 0.15
color: subsurfaceTheme.textColor
}
Row {
Layout.preferredWidth: gridWidth * 0.6
@ -316,6 +321,7 @@ Kirigami.ScrollablePage {
text: qsTr("Distance threshold (meters)")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
Controls.TextField {
@ -323,6 +329,7 @@ Kirigami.ScrollablePage {
text: PrefLocationService.distance_threshold
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.25
color: subsurfaceTheme.textColor
onEditingFinished: {
PrefLocationService.distance_threshold = distanceThreshold.text
}
@ -332,6 +339,7 @@ Kirigami.ScrollablePage {
text: qsTr("Time threshold (minutes)")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
Controls.TextField {
@ -339,6 +347,7 @@ Kirigami.ScrollablePage {
text: PrefLocationService.time_threshold / 60
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.25
color: subsurfaceTheme.textColor
onEditingFinished: {
PrefLocationService.time_threshold = timeThreshold.text * 60
}
@ -369,6 +378,7 @@ Kirigami.ScrollablePage {
Controls.Label {
text: qsTr("Cylinder:")
font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.textColor
}
Controls.ComboBox {
id: defaultCylinderBox
@ -404,6 +414,7 @@ Kirigami.ScrollablePage {
text: qsTr("Forget remembered dive computers")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfButton {
id: forgetDCButton
@ -442,6 +453,7 @@ Kirigami.ScrollablePage {
text: qsTr("Use Imperial Units")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfSwitch {
id: imperialButton
@ -458,6 +470,7 @@ Kirigami.ScrollablePage {
text: qsTr("Use Metric Units")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfSwitch {
id: metricButtton
@ -495,6 +508,7 @@ Kirigami.ScrollablePage {
text: qsTr("Include notes in full text filtering")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfSwitch {
@ -510,6 +524,7 @@ Kirigami.ScrollablePage {
text: qsTr("Match filter case sensitive")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfSwitch {
@ -547,6 +562,7 @@ Kirigami.ScrollablePage {
text: qsTr("Show all bluetooth devices \neven if not recognized as dive computers")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfSwitch {
id: nonDCButton
@ -582,6 +598,7 @@ Kirigami.ScrollablePage {
text: qsTr("Display Developer menu")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
}
SsrfSwitch {
id: developerButton

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

@ -449,7 +449,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
function darkTheme() {
Material.theme = Material.Dark
Material.accent = subsurfaceTheme.darkerPrimaryColor
Material.accent = subsurfaceTheme.darkPrimaryColor
subsurfaceTheme.currentTheme = "Dark"
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.darkDarkerPrimaryColor
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.darkDarkerPrimaryTextColor
@ -547,7 +547,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
property color darkPrimaryColor: "#3F51B5"
property color darkPrimaryTextColor: "#ECECEC"
property color darkLightPrimaryColor: "#C5CAE9"
property color darkLightPrimaryTextColor: "#212121"
property color darkLightPrimaryTextColor: "#ECECEC"
property color darkBackgroundColor: "#303030"
property color darkTextColor: darkPrimaryTextColor
property color darkSecondaryTextColor: "#757575"