From fd5cd5ebf06d76216557463e6a42c5681b748ba1 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 20 Jun 2017 16:21:47 -0700
Subject: QML UI: DiveList: playing with different colors

Make the accent color much lighter, don't have a solid bar on the left
for dives that are part of a trip.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 mobile-widgets/qml/DiveDetailsView.qml |  2 +-
 mobile-widgets/qml/DiveList.qml        | 26 ++++++++++----------------
 mobile-widgets/qml/main.qml            |  3 +--
 3 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'mobile-widgets')

diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index ffa7f5c47..2847fb831 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -70,7 +70,7 @@ Item {
 			Kirigami.Label {
 				id: buttonText
 				text: qsTr("Map it")
-				color: subsurfaceTheme.darkBackgroundColor
+				color: subsurfaceTheme.accentTextColor
 				anchors {
 					horizontalCenter: parent.horizontalCenter
 					verticalCenter: parent.verticalCenter
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index 7829e0aec..a2cb70651 100644
--- a/mobile-widgets/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
@@ -52,12 +52,17 @@ Kirigami.ScrollablePage {
 			Item {
 				Rectangle {
 					id: leftBarDive
-					height: diveListEntry.height + Kirigami.Units.smallSpacing
-					width: dive.tripMeta == "" ? 0 : Kirigami.Units.gridUnit * 1
+					width: dive.tripMeta == "" ? 0 : Kirigami.Units.gridUnit
+					height: Kirigami.Units.gridUnit
 					color: subsurfaceTheme.accentColor
+					antialiasing: true
+					radius: Kirigami.Units.smallSpacing * 2
 					anchors {
 						left: parent.left
 						top: parent.top
+						topMargin: Kirigami.Units.gridUnit
+						bottomMargin: Kirigami.Units.gridUnit
+						leftMargin: Kirigami.Units.smallSpacing * 2
 					}
 				}
 				Item {
@@ -157,26 +162,15 @@ Kirigami.ScrollablePage {
 		Item {
 			width: page.width - Kirigami.Units.gridUnit
 			height: childrenRect.height - Kirigami.Units.smallSpacing
-			Rectangle {
-				id: leftBar
-				width: Kirigami.Units.gridUnit * 1
-				color: subsurfaceTheme.accentColor
-				visible: section != ""
-				anchors {
-					left: parent.left
-					top: headingBackground.top
-					bottom: headingBackground.bottom
-				}
-			}
 			Rectangle {
 				id: headingBackground
 				height: section == "" ? 0 : Kirigami.Units.gridUnit * 2.5
 				anchors {
-					left: leftBar.right
+					left: parent.left
 					right: parent.right
 					rightMargin: Kirigami.Units.gridUnit * -2
 				}
-				color: subsurfaceTheme.darkBackgroundColor
+				color: subsurfaceTheme.accentColor
 				visible: section != ""
 				Kirigami.Label {
 					id: sectionText
@@ -199,7 +193,7 @@ Kirigami.ScrollablePage {
 						top: parent.top
 						left: parent.left
 						topMargin: Math.max(2, Kirigami.Units.gridUnit / 2)
-						leftMargin: horizontalPadding
+						leftMargin: horizontalPadding * 2
 						right: parent.right
 					}
 					color: textColor
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 6e64a1d2f..13cc3eadd 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -311,11 +311,10 @@ Kirigami.ApplicationWindow {
 		id: subsurfaceTheme
 		property int titlePointSize: Math.round(fontMetrics.font.pointSize * 1.5)
 		property int smallPointSize: Math.round(fontMetrics.font.pointSize * 0.8)
-		property color accentColor: "#2d5b9a"
+		property color accentColor: "#40C0FF" // "#2d5b9a"
 		property color shadedColor: "#132744"
 		property color accentTextColor: "#ececec"
 		property color diveListTextColor: "#000000" // the Kirigami theme text color is too light
-		property color darkBackgroundColor: "#eeeeee"
 		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
 	}
 
-- 
cgit v1.2.3-70-g09d2