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

QML UI: Davide's colors for the blue theme

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-06-24 11:18:18 -07:00
parent 94bc756391
commit e3cd6719c1
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mobile-widgets/qml/DiveList.qml
View file

@ -18,6 +18,7 @@ Kirigami.ScrollablePage {
property int credentialStatus: manager.credentialStatus property int credentialStatus: manager.credentialStatus
property int numDives: diveListView.count property int numDives: diveListView.count
property color textColor: subsurfaceTheme.textColor property color textColor: subsurfaceTheme.textColor
property color secondaryTextColor: subsurfaceTheme.secondaryTextColor
property int horizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1 property int horizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1
supportsRefreshing: true supportsRefreshing: true
@ -114,21 +115,21 @@ Kirigami.ScrollablePage {
text: dive.date + " " + dive.time text: dive.date + " " + dive.time
width: Math.max(locationText.width * 0.45, paintedWidth) // helps vertical alignment throughout listview width: Math.max(locationText.width * 0.45, paintedWidth) // helps vertical alignment throughout listview
font.pointSize: subsurfaceTheme.smallPointSize font.pointSize: subsurfaceTheme.smallPointSize
color: textColor color: secondaryTextColor
} }
// let's try to show the depth / duration very compact // let's try to show the depth / duration very compact
Kirigami.Label { Kirigami.Label {
text: dive.depth + ' / ' + dive.duration text: dive.depth + ' / ' + dive.duration
width: Math.max(Kirigami.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview width: Math.max(Kirigami.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview
font.pointSize: subsurfaceTheme.smallPointSize font.pointSize: subsurfaceTheme.smallPointSize
color: textColor color: secondaryTextColor
} }
} }
Kirigami.Label { Kirigami.Label {
id: numberText id: numberText
text: "#" + dive.number text: "#" + dive.number
font.pointSize: subsurfaceTheme.smallPointSize font.pointSize: subsurfaceTheme.smallPointSize
color: textColor color: secondaryTextColor
anchors { anchors {
right: parent.right right: parent.right
rightMargin: horizontalPadding rightMargin: horizontalPadding

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

@ -318,6 +318,7 @@ Kirigami.ApplicationWindow {
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor
subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor
subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
} }
@ -331,6 +332,7 @@ Kirigami.ApplicationWindow {
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor
subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor
subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
} }
@ -344,6 +346,7 @@ Kirigami.ApplicationWindow {
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor
subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor
subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
} }
@ -362,16 +365,18 @@ Kirigami.ApplicationWindow {
property color lightPrimaryTextColor property color lightPrimaryTextColor
property color backgroundColor property color backgroundColor
property color textColor property color textColor
property color secondaryTextColor
// colors for the blue theme // colors for the blue theme
property color blueDarkerPrimaryColor: "#303F9f" property color blueDarkerPrimaryColor: "#303F9f"
property color blueDarkerPrimaryTextColor: "#ECECEC" property color blueDarkerPrimaryTextColor: "#ECECEC"
property color bluePrimaryColor: "#3F51B5" property color bluePrimaryColor: "#3F51B5"
property color bluePrimaryTextColor: "#ECECEC" property color bluePrimaryTextColor: "#FFFFFF"
property color blueLightPrimaryColor: "#C5CAE9" property color blueLightPrimaryColor: "#C5CAE9"
property color blueLightPrimaryTextColor: "#212121" property color blueLightPrimaryTextColor: "#212121"
property color blueBackgroundColor: "#eff0f1" property color blueBackgroundColor: "#eff0f1"
property color blueTextColor: blueLightPrimaryTextColor property color blueTextColor: blueLightPrimaryTextColor
property color blueSecondaryTextColor: "#757575"
// colors for the pink theme // colors for the pink theme
property color pinkDarkerPrimaryColor: "#FF1493" property color pinkDarkerPrimaryColor: "#FF1493"
@ -382,6 +387,7 @@ Kirigami.ApplicationWindow {
property color pinkLightPrimaryTextColor: "#212121" property color pinkLightPrimaryTextColor: "#212121"
property color pinkBackgroundColor: "#eff0f1" property color pinkBackgroundColor: "#eff0f1"
property color pinkTextColor: pinkLightPrimaryTextColor property color pinkTextColor: pinkLightPrimaryTextColor
property color pinkSecondaryTextColor: "#757575"
// colors for the dark theme // colors for the dark theme
property color darkDarkerPrimaryColor: "#303F9f" property color darkDarkerPrimaryColor: "#303F9f"
@ -392,8 +398,9 @@ Kirigami.ApplicationWindow {
property color darkLightPrimaryTextColor: "#212121" property color darkLightPrimaryTextColor: "#212121"
property color darkBackgroundColor: "#000000" property color darkBackgroundColor: "#000000"
property color darkTextColor: darkPrimaryTextColor 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 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: { Component.onCompleted: {