From 52dd271c07a39f8934778d288ce221bed765dc17 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Mon, 6 Dec 2021 14:18:06 -0500
Subject: [PATCH 1/2] Use variables for default colors in boolean
 interface/display

Fixes #10333
---
 app/src/displays/boolean/boolean.vue   |  4 ++--
 app/src/displays/boolean/index.ts      |  6 ------
 app/src/interfaces/boolean/boolean.vue |  4 ++--
 app/src/interfaces/boolean/index.ts    | 14 ++++----------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/src/displays/boolean/boolean.vue b/app/src/displays/boolean/boolean.vue
index 1fe94d0306d59..a46211b24df4e 100644
--- a/app/src/displays/boolean/boolean.vue
+++ b/app/src/displays/boolean/boolean.vue
@@ -35,11 +35,11 @@ export default defineComponent({
 		},
 		colorOn: {
 			type: String,
-			default: '#00C897',
+			default: 'var(--primary)',
 		},
 		colorOff: {
 			type: String,
-			default: '#B0BEC5',
+			default: 'var(--foreground-subdued)',
 		},
 	},
 	setup(props) {
diff --git a/app/src/displays/boolean/index.ts b/app/src/displays/boolean/index.ts
index ccf5ec2e3fea5..1cbca41cf21f6 100644
--- a/app/src/displays/boolean/index.ts
+++ b/app/src/displays/boolean/index.ts
@@ -65,9 +65,6 @@ export default defineDisplay({
 				interface: 'select-color',
 				width: 'half',
 			},
-			schema: {
-				default_value: '#00C897',
-			},
 		},
 		{
 			field: 'colorOff',
@@ -77,9 +74,6 @@ export default defineDisplay({
 				interface: 'select-color',
 				width: 'half',
 			},
-			schema: {
-				default_value: '#B0BEC5',
-			},
 		},
 	],
 });
diff --git a/app/src/interfaces/boolean/boolean.vue b/app/src/interfaces/boolean/boolean.vue
index 1e5c22e053e9b..4bd1456d6b446 100644
--- a/app/src/interfaces/boolean/boolean.vue
+++ b/app/src/interfaces/boolean/boolean.vue
@@ -43,11 +43,11 @@ export default defineComponent({
 		},
 		colorOn: {
 			type: String,
-			default: '#00C897',
+			default: 'var(--primary)',
 		},
 		colorOff: {
 			type: String,
-			default: '#B0BEC5',
+			default: 'var(--foreground-subdued)',
 		},
 	},
 	emits: ['input'],
diff --git a/app/src/interfaces/boolean/index.ts b/app/src/interfaces/boolean/index.ts
index dc89ed6d6af45..03a463d14f841 100644
--- a/app/src/interfaces/boolean/index.ts
+++ b/app/src/interfaces/boolean/index.ts
@@ -37,26 +37,20 @@ export default defineInterface({
 		},
 		{
 			field: 'colorOn',
-			name: '$t:interfaces.boolean.color_on',
+			name: '$t:displays.boolean.color_on',
 			type: 'string',
 			meta: {
-				width: 'half',
 				interface: 'select-color',
-			},
-			schema: {
-				default_value: '#00C897',
+				width: 'half',
 			},
 		},
 		{
 			field: 'colorOff',
-			name: '$t:interfaces.boolean.color_off',
+			name: '$t:displays.boolean.color_off',
 			type: 'string',
 			meta: {
-				width: 'half',
 				interface: 'select-color',
-			},
-			schema: {
-				default_value: '#B0BEC5',
+				width: 'half',
 			},
 		},
 		{

From d7f75e56cfbbdb0f37f8606b0b0569569df99396 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Mon, 6 Dec 2021 14:19:10 -0500
Subject: [PATCH 2/2] Fix translations name

---
 app/src/interfaces/boolean/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/interfaces/boolean/index.ts b/app/src/interfaces/boolean/index.ts
index 03a463d14f841..a532e1e97dc95 100644
--- a/app/src/interfaces/boolean/index.ts
+++ b/app/src/interfaces/boolean/index.ts
@@ -37,7 +37,7 @@ export default defineInterface({
 		},
 		{
 			field: 'colorOn',
-			name: '$t:displays.boolean.color_on',
+			name: '$t:interfaces.boolean.color_on',
 			type: 'string',
 			meta: {
 				interface: 'select-color',
@@ -46,7 +46,7 @@ export default defineInterface({
 		},
 		{
 			field: 'colorOff',
-			name: '$t:displays.boolean.color_off',
+			name: '$t:interfaces.boolean.color_off',
 			type: 'string',
 			meta: {
 				interface: 'select-color',