diff options
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/DiveList.qml | 7 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 6a511cec7..27ab28cb2 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -18,6 +18,7 @@ Kirigami.ScrollablePage { property int credentialStatus: manager.credentialStatus property int numDives: diveListView.count property color textColor: subsurfaceTheme.textColor + property color secondaryTextColor: subsurfaceTheme.secondaryTextColor property int horizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1 supportsRefreshing: true @@ -114,21 +115,21 @@ Kirigami.ScrollablePage { text: dive.date + " " + dive.time width: Math.max(locationText.width * 0.45, paintedWidth) // helps vertical alignment throughout listview font.pointSize: subsurfaceTheme.smallPointSize - color: textColor + color: secondaryTextColor } // let's try to show the depth / duration very compact Kirigami.Label { text: dive.depth + ' / ' + dive.duration width: Math.max(Kirigami.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview font.pointSize: subsurfaceTheme.smallPointSize - color: textColor + color: secondaryTextColor } } Kirigami.Label { id: numberText text: "#" + dive.number font.pointSize: subsurfaceTheme.smallPointSize - color: textColor + color: secondaryTextColor anchors { right: parent.right rightMargin: horizontalPadding diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index f4ea7aa79..644d62e17 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -318,6 +318,7 @@ Kirigami.ApplicationWindow { subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor + subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) } @@ -331,6 +332,7 @@ Kirigami.ApplicationWindow { subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor + subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) } @@ -344,6 +346,7 @@ Kirigami.ApplicationWindow { subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor + subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) } @@ -362,16 +365,18 @@ Kirigami.ApplicationWindow { property color lightPrimaryTextColor property color backgroundColor property color textColor + property color secondaryTextColor // colors for the blue theme property color blueDarkerPrimaryColor: "#303F9f" property color blueDarkerPrimaryTextColor: "#ECECEC" property color bluePrimaryColor: "#3F51B5" - property color bluePrimaryTextColor: "#ECECEC" + 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: "#FF1493" @@ -382,6 +387,7 @@ Kirigami.ApplicationWindow { 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" @@ -392,8 +398,9 @@ Kirigami.ApplicationWindow { property color darkLightPrimaryTextColor: "#212121" property color darkBackgroundColor: "#000000" property color darkTextColor: darkPrimaryTextColor + property color darkSecondaryTextColor: "#757575" - property color contrastAccentColor: "#FF9800" // used for delete button + property color contrastAccentColor: "#FF5722" // used for delete button 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: { |