aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Betouni <ABetouni@luxoft.com>2019-10-23 18:23:47 +0300
committerGrigorii Zimin <gzimin@luxoft.com>2020-01-13 11:06:51 +0000
commit88c1d70ca626be6420160c6218e07867541ae8e3 (patch)
tree9718f28bdd37cd57b67b6b2674bc16f7f6e3003c
parentf3587276673fea6f73c157049dde37c18c028e33 (diff)
[instrument cluster] Adding dark theme assets
Added dial and background assets for dark theme Change-Id: I52bdd241f72853b65d972b2138df3028e1038201 Reviewed-by: Grigorii Zimin <gzimin@luxoft.com>
-rw-r--r--apps/com.theqtcompany.cluster/assets/cluster-fullscreen-overlay-dark.png4
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-cruise-circle-dark.png3
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-energy-areas-dark.png4
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-inner-circle-dark.png3
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-outer-circle-bg-dark.png3
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-outer-circle-edge-dark.png3
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-outer-circle-shadow-dark.png3
-rw-r--r--apps/com.theqtcompany.cluster/assets/dial-small-bg-dark.png4
-rw-r--r--apps/com.theqtcompany.cluster/panels/DialFramePanel.qml13
-rw-r--r--apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml2
10 files changed, 29 insertions, 13 deletions
diff --git a/apps/com.theqtcompany.cluster/assets/cluster-fullscreen-overlay-dark.png b/apps/com.theqtcompany.cluster/assets/cluster-fullscreen-overlay-dark.png
index 1f1ef1ac..dc872884 100644
--- a/apps/com.theqtcompany.cluster/assets/cluster-fullscreen-overlay-dark.png
+++ b/apps/com.theqtcompany.cluster/assets/cluster-fullscreen-overlay-dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cc9980b87056fe13ca543286057b2ad6d2e1bb725fab14ab07407f3038d16f63
-size 286448
+oid sha256:afc47f74c2e83dbc368afa5196a6a2bb4f7e1c487c22b7319098125402d3bc7c
+size 637688
diff --git a/apps/com.theqtcompany.cluster/assets/dial-cruise-circle-dark.png b/apps/com.theqtcompany.cluster/assets/dial-cruise-circle-dark.png
new file mode 100644
index 00000000..666a2d16
--- /dev/null
+++ b/apps/com.theqtcompany.cluster/assets/dial-cruise-circle-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ea1a9114157fe04fbdbd8ec282dbfe1749b6073f9d23984fd97e6fc2632b09a
+size 23522
diff --git a/apps/com.theqtcompany.cluster/assets/dial-energy-areas-dark.png b/apps/com.theqtcompany.cluster/assets/dial-energy-areas-dark.png
index c39ad542..140eb561 100644
--- a/apps/com.theqtcompany.cluster/assets/dial-energy-areas-dark.png
+++ b/apps/com.theqtcompany.cluster/assets/dial-energy-areas-dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5211fbc968b1460255fec1855113fc7027fc3adb92809a218c47e7348f1687de
-size 4250
+oid sha256:4d6d1058563a66f89ef8fbc56f8d2229ac384a43236e690b882bcbcbd8f149c0
+size 3863
diff --git a/apps/com.theqtcompany.cluster/assets/dial-inner-circle-dark.png b/apps/com.theqtcompany.cluster/assets/dial-inner-circle-dark.png
new file mode 100644
index 00000000..3915f235
--- /dev/null
+++ b/apps/com.theqtcompany.cluster/assets/dial-inner-circle-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:204ae33c90f0b48818ef3a114b545620d5f37ea2b7bd80f342bcff24dd739653
+size 37876
diff --git a/apps/com.theqtcompany.cluster/assets/dial-outer-circle-bg-dark.png b/apps/com.theqtcompany.cluster/assets/dial-outer-circle-bg-dark.png
new file mode 100644
index 00000000..47b84b0d
--- /dev/null
+++ b/apps/com.theqtcompany.cluster/assets/dial-outer-circle-bg-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6b16d9242689c3d55e186e3ae96b54006a84751beca831003c1a66d508e7cdd
+size 81652
diff --git a/apps/com.theqtcompany.cluster/assets/dial-outer-circle-edge-dark.png b/apps/com.theqtcompany.cluster/assets/dial-outer-circle-edge-dark.png
new file mode 100644
index 00000000..6b4fc965
--- /dev/null
+++ b/apps/com.theqtcompany.cluster/assets/dial-outer-circle-edge-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a1eb4c69d511bcb45628d680a0a1d1dee059051e2d0b1a26ceb7f4ff289470b
+size 15969
diff --git a/apps/com.theqtcompany.cluster/assets/dial-outer-circle-shadow-dark.png b/apps/com.theqtcompany.cluster/assets/dial-outer-circle-shadow-dark.png
new file mode 100644
index 00000000..b8d6a64a
--- /dev/null
+++ b/apps/com.theqtcompany.cluster/assets/dial-outer-circle-shadow-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:371c5fdd7eff0d1349a3889447d86b6ce61132bf313732b259efd081eba9dbbf
+size 50285
diff --git a/apps/com.theqtcompany.cluster/assets/dial-small-bg-dark.png b/apps/com.theqtcompany.cluster/assets/dial-small-bg-dark.png
index dd772cd7..09bc2892 100644
--- a/apps/com.theqtcompany.cluster/assets/dial-small-bg-dark.png
+++ b/apps/com.theqtcompany.cluster/assets/dial-small-bg-dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:61d5e986dde18f236f45db9882301b6418d6a81387b749f485c0206c2dee8d0e
-size 19836
+oid sha256:661ee028af773a58dcff3f732032e3a03aca8fbf4ad852c2a80ed80d032a737b
+size 19398
diff --git a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
index 391caf0b..d50bd5f8 100644
--- a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
@@ -88,7 +88,8 @@ Item {
PropertyChanges { target: outBg; opacity: 1; width: Sizes.dp(520) }
PropertyChanges { target: outSmallBg; opacity: 0; width: Sizes.dp(560) }
PropertyChanges { target: outEdge; opacity: 1; width: Sizes.dp(520) }
- PropertyChanges { target: outShadow; opacity: 1; width: Sizes.dp(560) }
+ //TODO breaks dark graphic size, either replace asset or delete this
+ //PropertyChanges { target: outShadow; opacity: 1; width: Sizes.dp(580) }
},
State {
name: "navi"
@@ -203,7 +204,7 @@ Item {
height: width
anchors.centerIn: parent
visible: true
- source: Utils.localAsset("dial-outer-circle-bg")
+ source: Utils.localAsset("dial-outer-circle-bg", Style.theme)
}
Image {
@@ -213,17 +214,17 @@ Item {
anchors.centerIn: parent
z: 1
visible: true
- source: Utils.localAsset("dial-outer-circle-edge")
+ source: Utils.localAsset("dial-outer-circle-edge", Style.theme)
}
Image {
id: outShadow
- width: Sizes.dp(560)
+ width: Sizes.dp(sourceSize.width)
height: width
anchors.centerIn: parent
z: 1
visible: true
- source: Utils.localAsset("dial-outer-circle-shadow")
+ source: Utils.localAsset("dial-outer-circle-shadow", Style.theme)
}
Shape {
@@ -334,7 +335,7 @@ Item {
height: width
anchors.centerIn: parent
visible: true
- source: Utils.localAsset("dial-inner-circle")
+ source: Utils.localAsset("dial-inner-circle", Style.theme)
}
Image {
diff --git a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
index 75b3998a..f81d13ab 100644
--- a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
@@ -322,7 +322,7 @@ Item {
width: Sizes.dp(330)
height: width
anchors.centerIn: parent
- source: Utils.localAsset("dial-cruise-circle")
+ source: Utils.localAsset("dial-cruise-circle", Style.theme)
}
}