From 2270d8f85c5a044abd90a9e1e88592c21a4e7ed2 Mon Sep 17 00:00:00 2001
From: Djuri Baars <dsbaars@users.noreply.github.com>
Date: Thu, 5 Sep 2024 13:10:58 +0200
Subject: [PATCH] Improve multi-currency support

---
 src/routes/+page.svelte    |  3 +-
 src/routes/Settings.svelte | 85 ++++++++++++++++++++++++--------------
 src/routes/Status.svelte   |  4 +-
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 4100d86..9e26acb 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -12,7 +12,8 @@
 	import { uiSettings } from '$lib/uiSettings';
 
 	let settings = writable({
-		fgColor: '0'
+		fgColor: '0',
+		bgColor: '0'
 	});
 
 	// let uiSettings = writable({
diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte
index 78f1fe1..9a6b0f2 100644
--- a/src/routes/Settings.svelte
+++ b/src/routes/Settings.svelte
@@ -22,6 +22,7 @@
 	} from '@sveltestrap/sveltestrap';
 	import EyeIcon from '../icons/EyeIcon.svelte';
 	import EyeSlashIcon from '../icons/EyeSlashIcon.svelte';
+	import { derived } from 'svelte/store';
 
 	export let settings;
 
@@ -160,6 +161,40 @@
 
 	let showPassword = false;
 
+	let textColor = '0';
+	const colorStore = derived(settings, ($settings) => ({
+		fgColor: $settings.fgColor,
+		bgColor: $settings.bgColor
+	}));
+
+	// $: {
+	// 	if ($colorStore) {
+	// 		console.log('Settings model changed:', $colorStore);
+	// 		if ($colorStore.fgColor < $colorStore.bgColor)
+	// 			textColor = "0";
+	// 		else
+	// 			textColor = "1"; // 65535
+	// 	}
+	// }
+
+	colorStore.subscribe(() => {
+		if ($colorStore) {
+			if ($colorStore.fgColor < $colorStore.bgColor) textColor = '0';
+			else textColor = '1'; // 65535
+		}
+	});
+
+	const setTextColor = () => {
+		console.log(textColor);
+		if (textColor == '1') {
+			$settings.fgColor = 65535;
+			$settings.bgColor = 0;
+		} else {
+			$settings.fgColor = 0;
+			$settings.bgColor = 65535;
+		}
+	};
+
 	export let xs = 12;
 	export let sm = xs;
 	export let md = sm;
@@ -176,41 +211,25 @@
 		<CardBody>
 			<Form on:submit={onSave}>
 				<Row>
-					<Label md={6} for="fgColor" size={$uiSettings.inputSize}
+					<Label md={6} for="textColor" size={$uiSettings.inputSize}
 						>{$_('section.settings.textColor', { default: 'Text color' })}</Label
 					>
 					<Col md="6">
 						<Input
 							type="select"
-							bind:value={$settings.fgColor}
+							bind:value={textColor}
 							name="select"
-							id="fgColor"
+							id="textColor"
+							on:change={setTextColor}
 							bsSize={$uiSettings.inputSize}
 							class={$uiSettings.selectClass}
 						>
-							<option value="0">{$_('colors.black')}</option>
-							<option value="65535">{$_('colors.white')}</option>
-						</Input>
-					</Col>
-				</Row>
-				<Row>
-					<Label md={6} for="bgColor" size={$uiSettings.inputSize}
-						>{$_('section.settings.backgroundColor')}</Label
-					>
-					<Col md="6">
-						<Input
-							type="select"
-							bind:value={$settings.bgColor}
-							name="select"
-							id="bgColor"
-							bsSize={$uiSettings.inputSize}
-							class={$uiSettings.selectClass}
-						>
-							<option value="0">{$_('colors.black')}</option>
-							<option value="65535">{$_('colors.white')}</option>
+							<option value="0">{$_('colors.black')} on {$_('colors.white')}</option>
+							<option value="1">{$_('colors.white')} on {$_('colors.black')}</option>
 						</Input>
 					</Col>
 				</Row>
+
 				<Row>
 					<Label md={6} for="timePerScreen" size={$uiSettings.inputSize}
 						>{$_('section.settings.timePerScreen')}</Label
@@ -671,15 +690,17 @@
 							/>
 						</Col>
 					{/if}
-					<Col md="6" xl="12" xxl="6">
-						<Input
-							id="fetchEurPrice"
-							bind:checked={$settings.fetchEurPrice}
-							type="switch"
-							bsSize={$uiSettings.inputSize}
-							label="{$_('section.settings.fetchEuroPrice')} ({$_('restartRequired')})"
-						/>
-					</Col>
+					{#if !$settings.actCurrencies}
+						<Col md="6" xl="12" xxl="6">
+							<Input
+								id="fetchEurPrice"
+								bind:checked={$settings.fetchEurPrice}
+								type="switch"
+								bsSize={$uiSettings.inputSize}
+								label="{$_('section.settings.fetchEuroPrice')} ({$_('restartRequired')})"
+							/>
+						</Col>
+					{/if}
 					<Col md="6" xl="12" xxl="6">
 						<Input
 							id="ownDataSource"
diff --git a/src/routes/Status.svelte b/src/routes/Status.svelte
index 1323d56..081d3fc 100644
--- a/src/routes/Status.svelte
+++ b/src/routes/Status.svelte
@@ -135,7 +135,7 @@
 						{/each}
 					</ButtonGroup>
 				</div>
-				{#if $settings.actCurrencies}
+				{#if $settings.actCurrencies && $settings.ownDataSource}
 					<div class="d-flex justify-content-center d-none d-sm-flex mt-2">
 						<ButtonGroup size="sm">
 							{#each $settings.actCurrencies as c}
@@ -248,7 +248,7 @@
 					{:else}
 						{$_('section.status.wsDataConnection')}:
 						<span>
-							{#if $status.connectionStatus && $status.connectionStatus.price}
+							{#if $status.connectionStatus && $status.connectionStatus.V2}
 								&#9989;
 							{:else}
 								&#10060;