QML UI: use primaryColor instead of darkerPrimaryColor

In most places we wrongly used the darker primary color instead of the primary color.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>

2 files changed, 10 insertions, 9 deletions

diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index b5808259a..59670e618 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -122,7 +122,7 @@ Item {
 				color: "transparent"
 				opacity: 0.6
 				border.width: 1
-				border.color: subsurfaceTheme.darkerPrimaryColor
+				border.color: subsurfaceTheme.primaryColor
 				anchors.fill: parent
 			}
 		}
@@ -179,7 +179,7 @@ Item {
 		}
 
 		Rectangle {
-			color: subsurfaceTheme.darkerPrimaryColor
+			color: subsurfaceTheme.primaryColor
 			height: 1
 			opacity: 0.5
 			Layout.columnSpan: 3
@@ -232,7 +232,7 @@ Item {
 		}
 
 		Rectangle {
-			color: subsurfaceTheme.darkerPrimaryColor
+			color: subsurfaceTheme.primaryColor
 			height: 1
 			opacity: 0.5
 			Layout.columnSpan: 3
@@ -274,7 +274,7 @@ Item {
 		}
 
 		Rectangle {
-			color: subsurfaceTheme.darkerPrimaryColor
+			color: subsurfaceTheme.primaryColor
 			height: 1
 			opacity: 0.5
 			Layout.columnSpan: 3
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 46099d829..2538edda2 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -291,7 +291,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
 
 	function blueTheme() {
 		Material.theme = Material.Light
-		Material.accent = subsurfaceTheme.blueDarkerPrimaryColor
+		Material.accent = subsurfaceTheme.bluePrimaryColor
 		subsurfaceTheme.currentTheme = "Blue"
 		subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.blueDarkerPrimaryColor
 		subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.blueDarkerPrimaryTextColor
@@ -308,7 +308,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
 
 	function pinkTheme() {
 		Material.theme = Material.Light
-		Material.accent = subsurfaceTheme.pinkDarkerPrimaryColor
+		Material.accent = subsurfaceTheme.pinkPrimaryColor
 		subsurfaceTheme.currentTheme = "Pink"
 		subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.pinkDarkerPrimaryColor
 		subsurfaceTheme.darkerPrimaryTextColor = subsurfaceTheme.pinkDarkerPrimaryTextColor
@@ -325,7 +325,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
 
 	function darkTheme() {
 		Material.theme = Material.Dark
-		Material.accent = subsurfaceTheme.darkDarkerPrimaryColor
+		Material.accent = subsurfaceTheme.darkerPrimaryColor
 		subsurfaceTheme.currentTheme = "Dark"
 		subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.darkDarkerPrimaryColor
 		subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.darkDarkerPrimaryTextColor
@@ -398,15 +398,16 @@ if you have network connectivity and want to sync your data to cloud storage."),
 
 		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: {
-			Kirigami.Theme.highlightColor = Qt.binding(function() { return darkerPrimaryColor })
+			Kirigami.Theme.highlightColor = Qt.binding(function() { return primaryColor })
 			Kirigami.Theme.highlightedTextColor = Qt.binding(function() { return darkerPrimaryTextColor })
 			Kirigami.Theme.backgroundColor = Qt.binding(function() { return backgroundColor })
 			Kirigami.Theme.textColor = Qt.binding(function() { return textColor })
-			Kirigami.Theme.buttonHoverColor = Qt.binding(function() { return darkerPrimaryColor })
+			Kirigami.Theme.buttonHoverColor = Qt.binding(function() { return primaryColor })
 			Kirigami.Theme.viewBackgroundColor = Qt.binding(function() { return drawerColor })
 			Kirigami.Theme.viewTextColor = Qt.binding(function() { return textColor })
 			Kirigami.Theme.buttonBackgroundColor = Qt.binding(function() { return drawerColor })
 			Kirigami.Theme.buttonTextColor = Qt.binding(function() { return textColor })
+			Kirigami.Theme.buttonFocusColor = Qt.binding(function() { return "red" })
 
 			// this needs to pick the theme from persistent preference settings
 			var theme = manager.theme