From b1c9beb3d9432d49bf2f2f25dc79d81425eb6423 Mon Sep 17 00:00:00 2001 From: SethBurkart123 Date: Fri, 20 Oct 2023 06:48:02 +1100 Subject: [PATCH] fix darkmode with color picker --- src/seqta/ui/colors/Manager.js | 8 ++++++-- src/seqta/utils/IndexedDB.js | 31 ------------------------------ src/seqta/utils/StorageListener.js | 1 + 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 src/seqta/utils/IndexedDB.js diff --git a/src/seqta/ui/colors/Manager.js b/src/seqta/ui/colors/Manager.js index 8cc77e41..959358f3 100644 --- a/src/seqta/ui/colors/Manager.js +++ b/src/seqta/ui/colors/Manager.js @@ -13,7 +13,12 @@ let DarkMode = null; export function updateAllColors(storedSetting, newColor = null) { // Determine the color to use const selectedColor = newColor || storedSetting.selectedColor; - DarkMode = storedSetting ? storedSetting.DarkMode : DarkMode; + + DarkMode = (typeof storedSetting?.DarkMode === "boolean") ? storedSetting.DarkMode : DarkMode; + + if (typeof storedSetting === "boolean") { + DarkMode = storedSetting; + } // Common properties, always applied const commonProps = { @@ -24,7 +29,6 @@ export function updateAllColors(storedSetting, newColor = null) { // Mode-based properties, applied if storedSetting is provided let modeProps = {}; - console.log("Darkmode: ", DarkMode); if (DarkMode !== null) { modeProps = DarkMode ? { "--background-primary": "#232323", diff --git a/src/seqta/utils/IndexedDB.js b/src/seqta/utils/IndexedDB.js deleted file mode 100644 index 82fabfe4..00000000 --- a/src/seqta/utils/IndexedDB.js +++ /dev/null @@ -1,31 +0,0 @@ -export const openDB = async () => { - const request = indexedDB.open("MyDatabase", 1); - - request.onupgradeneeded = async (event) => { - const db = event.target.result; - await db.createObjectStore("backgrounds", { keyPath: "id" }); - }; - - return request; -}; - -export const writeData = async (type, data) => { - console.log("Reading Data"); - const db = await openDB(); - console.log("Opened DB"); - - const tx = db.transaction("backgrounds", "readwrite"); - const store = tx.objectStore("backgrounds"); - const request = await store.put({ id: "customBackground", type, data }); - - console.log("Data written successfully"); - - return request.result; -}; - -export const readData = async () => { - const db = await openDB(); - const tx = db.transaction("backgrounds", "readonly"); - const store = tx.objectStore("backgrounds"); - return store.get("customBackground"); -}; \ No newline at end of file diff --git a/src/seqta/utils/StorageListener.js b/src/seqta/utils/StorageListener.js index 507af60a..09d83ee2 100644 --- a/src/seqta/utils/StorageListener.js +++ b/src/seqta/utils/StorageListener.js @@ -32,6 +32,7 @@ export default class StorageListener { if (changes.DarkMode) { this.darkMode = changes.DarkMode.newValue; + console.log(this.darkMode); } if (changes?.customshortcuts?.newValue) {