From fdeea2f62630f200ff2688a00378b19a717d4e4b Mon Sep 17 00:00:00 2001
From: sethburkart123 <seth.burkart@hills.adventist.edu.au>
Date: Sun, 8 Sep 2024 21:51:14 +1000
Subject: [PATCH] feat(settings): add custom theme selector

---
 src/old-interface/components/ThemeCover.tsx   |   2 +-
 .../components/ThemeSelector.tsx              |   2 +-
 src/old-interface/hooks/ThemeManagment.ts     |   2 +-
 src/seqta/ui/themes/UpdateThemePreview.ts     |   2 +-
 src/seqta/ui/themes/applyTheme.ts             |   2 +-
 src/seqta/ui/themes/deleteTheme.ts            |   2 +-
 src/seqta/ui/themes/disableTheme.ts           |   2 +-
 src/seqta/ui/themes/enableCurrent.ts          |   2 +-
 src/seqta/ui/themes/getAvailableThemes.ts     |  11 +-
 src/seqta/ui/themes/getTheme.ts               |  22 +-
 src/seqta/ui/themes/removeTheme.ts            |   2 +-
 src/seqta/ui/themes/saveTheme.ts              |   2 +-
 src/seqta/ui/themes/setTheme.ts               |   2 +-
 .../components/themes/ThemeSelector.svelte    | 203 ++++++++++++++++++
 .../pages/settings/theme.svelte               |   2 +
 src/{old-interface => }/types/CustomThemes.ts |   4 +-
 16 files changed, 224 insertions(+), 40 deletions(-)
 create mode 100644 src/svelte-interface/components/themes/ThemeSelector.svelte
 rename src/{old-interface => }/types/CustomThemes.ts (90%)

diff --git a/src/old-interface/components/ThemeCover.tsx b/src/old-interface/components/ThemeCover.tsx
index d6ae88ae..bc6a2c06 100644
--- a/src/old-interface/components/ThemeCover.tsx
+++ b/src/old-interface/components/ThemeCover.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { CustomTheme, DownloadedTheme } from '../types/CustomThemes';
+import { CustomTheme, DownloadedTheme } from '../../types/CustomThemes';
 import browser from 'webextension-polyfill';
 import { ArrowUpOnSquareIcon, PencilIcon } from '@heroicons/react/24/outline';
 import { sendThemeUpdate, setTheme } from '../hooks/ThemeManagment';
diff --git a/src/old-interface/components/ThemeSelector.tsx b/src/old-interface/components/ThemeSelector.tsx
index 75328881..b56f03e7 100644
--- a/src/old-interface/components/ThemeSelector.tsx
+++ b/src/old-interface/components/ThemeSelector.tsx
@@ -3,7 +3,7 @@ import { deleteTheme, disableTheme, getDownloadedThemes, listThemes, sendThemeUp
 import { DeleteDownloadedTheme } from '../pages/Store';
 import { ThemeCover } from './ThemeCover';
 import browser from 'webextension-polyfill';
-import { CustomTheme, DownloadedTheme } from '../types/CustomThemes';
+import { CustomTheme, DownloadedTheme } from '../../types/CustomThemes';
 import { useSettingsContext } from '../SettingsContext';
 import { SettingsState } from '../types/AppProps';
 import { InstallTheme } from '../../seqta/ui/themes/downloadTheme';
diff --git a/src/old-interface/hooks/ThemeManagment.ts b/src/old-interface/hooks/ThemeManagment.ts
index 74d56183..f87319f9 100644
--- a/src/old-interface/hooks/ThemeManagment.ts
+++ b/src/old-interface/hooks/ThemeManagment.ts
@@ -1,5 +1,5 @@
 import browser from 'webextension-polyfill'
-import { CustomTheme, DownloadedTheme, ThemeList } from '../types/CustomThemes';
+import { CustomTheme, DownloadedTheme, ThemeList } from '../../types/CustomThemes';
 import localforage from 'localforage';
 
 export const setTheme = async (themeID: string) => {
diff --git a/src/seqta/ui/themes/UpdateThemePreview.ts b/src/seqta/ui/themes/UpdateThemePreview.ts
index 26002f75..08f1e23c 100644
--- a/src/seqta/ui/themes/UpdateThemePreview.ts
+++ b/src/seqta/ui/themes/UpdateThemePreview.ts
@@ -1,4 +1,4 @@
-import type { CustomThemeBase64 } from '@/old-interface/types/CustomThemes';
+import type { CustomThemeBase64 } from '@/types/CustomThemes';
 import { applyCustomCSS, imageData, removeImageFromDocument, UpdateImageData } from './Themes';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
 
diff --git a/src/seqta/ui/themes/applyTheme.ts b/src/seqta/ui/themes/applyTheme.ts
index 9851c8fd..04f75bb1 100644
--- a/src/seqta/ui/themes/applyTheme.ts
+++ b/src/seqta/ui/themes/applyTheme.ts
@@ -1,4 +1,4 @@
-import type { CustomImage, CustomTheme } from '@/old-interface/types/CustomThemes';
+import type { CustomImage, CustomTheme } from '@/types/CustomThemes';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
 import { applyCustomCSS } from './Themes';
 
diff --git a/src/seqta/ui/themes/deleteTheme.ts b/src/seqta/ui/themes/deleteTheme.ts
index 03451eaf..1ced7a77 100644
--- a/src/seqta/ui/themes/deleteTheme.ts
+++ b/src/seqta/ui/themes/deleteTheme.ts
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import type { CustomTheme } from '@/old-interface/types/CustomThemes';
+import type { CustomTheme } from '@/types/CustomThemes';
 import { removeTheme } from './removeTheme';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
 
diff --git a/src/seqta/ui/themes/disableTheme.ts b/src/seqta/ui/themes/disableTheme.ts
index f45d5fc0..4876c201 100644
--- a/src/seqta/ui/themes/disableTheme.ts
+++ b/src/seqta/ui/themes/disableTheme.ts
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import type { CustomTheme } from '@/old-interface/types/CustomThemes';
+import type { CustomTheme } from '@/types/CustomThemes';
 import { removeTheme } from './removeTheme';
 import { Mutex } from '@/seqta/utils/mutex';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
diff --git a/src/seqta/ui/themes/enableCurrent.ts b/src/seqta/ui/themes/enableCurrent.ts
index 94a05076..6a6a0374 100644
--- a/src/seqta/ui/themes/enableCurrent.ts
+++ b/src/seqta/ui/themes/enableCurrent.ts
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import type { CustomTheme } from '@/old-interface/types/CustomThemes';
+import type { CustomTheme } from '@/types/CustomThemes';
 import { applyTheme } from './applyTheme';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
 
diff --git a/src/seqta/ui/themes/getAvailableThemes.ts b/src/seqta/ui/themes/getAvailableThemes.ts
index 0d86f2f0..e2d1d464 100644
--- a/src/seqta/ui/themes/getAvailableThemes.ts
+++ b/src/seqta/ui/themes/getAvailableThemes.ts
@@ -1,20 +1,15 @@
 import localforage from 'localforage';
-import type { CustomTheme, ThemeList } from '@/old-interface/types/CustomThemes';
-import { blobToBase64 } from '@/seqta/utils/blobToBase64';
+import type { CustomTheme, ThemeList } from '@/types/CustomThemes';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
 
-export const getAvailableThemes = async (): Promise<ThemeList | {}> => {
+export const getAvailableThemes = async (): Promise<ThemeList> => {
   try {
     const themeIds = await localforage.getItem('customThemes') as string[] | null;
     if (themeIds) {
       const themes = await Promise.all(
         themeIds.map(async (id) => {
           const theme = await localforage.getItem(id) as CustomTheme;
-          const { CustomImages, ...themeWithoutImages } = theme;
-          return {
-            ...themeWithoutImages,
-            coverImage: theme.coverImage ? await blobToBase64(theme.coverImage as Blob) : '',
-          };
+          return theme;
         })
       );
 
diff --git a/src/seqta/ui/themes/getTheme.ts b/src/seqta/ui/themes/getTheme.ts
index 36b3cd7e..762010bd 100644
--- a/src/seqta/ui/themes/getTheme.ts
+++ b/src/seqta/ui/themes/getTheme.ts
@@ -1,28 +1,12 @@
 import localforage from 'localforage';
-import type { CustomImageBase64, CustomTheme, CustomThemeBase64 } from '@/old-interface/types/CustomThemes';
-import { blobToBase64 } from '@/seqta/utils/blobToBase64'; 
+import type { CustomTheme } from '@/types/CustomThemes';
 
 
-export const getTheme = async (themeId: string): Promise<CustomThemeBase64 | null> => {
+export const getTheme = async (themeId: string): Promise<CustomTheme | null> => {
   try {
     const theme = await localforage.getItem(themeId) as CustomTheme;
 
-    const CustomImages: CustomImageBase64[] = await Promise.all(
-      theme.CustomImages.map(async (image) => {
-        const base64 = await blobToBase64(image.blob);
-        return {
-          id: image.id,
-          variableName: image.variableName,
-          url: base64,
-        };
-      })
-    );
-
-    return {
-      ...theme,
-      coverImage: theme.coverImage ? await blobToBase64(theme.coverImage as Blob) : null,
-      CustomImages,
-    };
+    return theme;
   } catch (error) {
     console.error('Error getting theme:', error);
     return null;
diff --git a/src/seqta/ui/themes/removeTheme.ts b/src/seqta/ui/themes/removeTheme.ts
index a78cebce..ef3a1e37 100644
--- a/src/seqta/ui/themes/removeTheme.ts
+++ b/src/seqta/ui/themes/removeTheme.ts
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import type { CustomTheme } from '@/old-interface/types/CustomThemes';
+import type { CustomTheme } from '@/types/CustomThemes';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
 
 export const removeTheme = async (theme: CustomTheme) => {
diff --git a/src/seqta/ui/themes/saveTheme.ts b/src/seqta/ui/themes/saveTheme.ts
index 5be6bc3e..c1a272ae 100644
--- a/src/seqta/ui/themes/saveTheme.ts
+++ b/src/seqta/ui/themes/saveTheme.ts
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import type { CustomTheme, CustomThemeBase64 } from '@/old-interface/types/CustomThemes';
+import type { CustomTheme, CustomThemeBase64 } from '@/types/CustomThemes';
 import { disableTheme } from './disableTheme';
 
 
diff --git a/src/seqta/ui/themes/setTheme.ts b/src/seqta/ui/themes/setTheme.ts
index 5e414b39..6e560cea 100644
--- a/src/seqta/ui/themes/setTheme.ts
+++ b/src/seqta/ui/themes/setTheme.ts
@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import type { CustomTheme } from '@/old-interface/types/CustomThemes';
+import type { CustomTheme } from '@/types/CustomThemes';
 import { applyTheme } from './applyTheme';
 import { removeTheme } from './removeTheme';
 import { settingsState } from '@/seqta/utils/listeners/SettingsState';
diff --git a/src/svelte-interface/components/themes/ThemeSelector.svelte b/src/svelte-interface/components/themes/ThemeSelector.svelte
new file mode 100644
index 00000000..c72a9f7f
--- /dev/null
+++ b/src/svelte-interface/components/themes/ThemeSelector.svelte
@@ -0,0 +1,203 @@
+<script lang="ts">
+  import type { CustomTheme, ThemeList } from '@/types/CustomThemes'
+  import { getAvailableThemes } from '@/seqta/ui/themes/getAvailableThemes'
+  import { onMount } from 'svelte'
+  import { OpenThemeCreator } from '@/seqta/ui/ThemeCreator'
+  import shareTheme from '@/seqta/ui/themes/shareTheme'
+  import { InstallTheme } from '@/seqta/ui/themes/downloadTheme'
+  import { disableTheme } from '@/seqta/ui/themes/disableTheme'
+  import { setTheme } from '@/seqta/ui/themes/setTheme'
+  import { deleteTheme } from '@/seqta/ui/themes/deleteTheme'
+
+  let themes = $state<ThemeList | null>(null);
+  let { isEditMode } = $props<{ isEditMode: boolean }>();
+  let isDragging = $state(false);
+  let tempTheme = $state(null);
+
+  const handleThemeClick = async (theme: CustomTheme) => {
+    if (isEditMode) return;
+    if (theme.id === themes?.selectedTheme) {
+      await disableTheme();
+      themes.selectedTheme = '';
+    } else {
+      await setTheme(theme.id);
+      if (!themes) return;
+      themes.selectedTheme = theme.id;
+    }
+  }
+
+  const handleThemeDelete = async (themeId: string) => {
+    try {
+      await deleteTheme(themeId);
+      if (!themes) return;
+      
+      themes.themes = themes.themes.filter(theme => theme.id !== themeId);
+      if (themeId === themes.selectedTheme) {
+        themes.selectedTheme = '';
+        await disableTheme();
+      }
+    } catch (error) {
+      console.error('Error deleting theme:', error);
+    }
+  }
+
+  const handleShareTheme = async (theme: CustomTheme) => {
+    try {
+      await shareTheme(theme.id);
+    } catch (error) {
+      console.error('Error sharing theme:', error);
+    }
+  }
+
+  const handleDragOver = (e: DragEvent) => {
+    e.preventDefault();
+    isDragging = true;
+  }
+
+  const handleDragLeave = () => {
+    isDragging = false;
+  }
+
+  const handleDrop = async (e: DragEvent) => {
+    e.preventDefault();
+    isDragging = false;
+    const file = e.dataTransfer?.files[0];
+    if (!file) return;
+
+    const reader = new FileReader();
+    reader.onload = async (event: ProgressEvent<FileReader>) => {
+      try {
+        const result = JSON.parse(event.target?.result as string);
+        tempTheme = result;
+        await InstallTheme(result);
+        await fetchThemes();
+        tempTheme = null;
+      } catch (error) {
+        alert('Error parsing file. Please upload a valid JSON theme file.');
+        tempTheme = null;
+      }
+    };
+    reader.readAsText(file);
+  }
+
+  const fetchThemes = async () => {
+    themes = await getAvailableThemes();
+  }
+
+  onMount(async () => {
+    await fetchThemes();
+  })
+</script>
+
+<div
+  class="w-full my-3"
+  role="list"
+  tabindex="-1"
+  ondragover={handleDragOver}
+  ondragleave={handleDragLeave}
+  ondrop={handleDrop}
+>
+  <div class="{isDragging ? 'opacity-100' : 'opacity-0'} transition pointer-events-none absolute w-full p-2 z-50">
+    <div class="sticky w-full h-64 bg-white shadow-xl dark:bg-zinc-900 top-5 dark:text-white rounded-xl outline-dashed outline-4 outline-zinc-200 dark:outline-zinc-700">
+      <div class="flex items-center justify-center h-full">
+        <div class="flex flex-col items-center justify-center">
+          <svg height="48" width="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+            <g fill="currentColor">
+              <path d="M44,31a1,1,0,0,0-1,1v8a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V32a1,1,0,0,0-2,0v8a5.006,5.006,0,0,0,5,5H40a5.006,5.006,0,0,0,5-5V32A1,1,0,0,0,44,31Z" fill="currentColor"/>
+              <path d="M23.2,33.6a1,1,0,0,0,1.6,0l9-12A1,1,0,0,0,33,20H26V5a2,2,0,0,0-4,0V20H15a1,1,0,0,0-.8,1.6Z" fill="currentColor"/>
+            </g>
+          </svg>
+          <span class="text-lg">Import Theme</span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <h2 class="pb-2 text-lg font-bold">Themes</h2>
+  <div class="flex flex-col gap-2 px-1">
+    {#if themes}
+      {#each themes.themes as theme (theme.id)}
+        <button
+          class="relative group w-full aspect-theme flex justify-center items-center rounded-xl transition ring dark:ring-white ring-zinc-300 {theme.id === themes.selectedTheme ? 'dark:ring-2 ring-4' : 'ring-0'}"
+          onclick={() => handleThemeClick(theme)}
+        >
+          {#if isEditMode}
+            <div
+              class="absolute z-20 flex w-6 h-6 p-2 text-white transition-all rounded-full opacity-0 top-1 right-2 dark:bg-red-600 place-items-center group-hover:opacity-100 group-hover:top-2"
+              onclick={(event) => { event.stopPropagation(); handleThemeDelete(theme.id) }}
+              onkeydown={(event) => { if (event.key === 'Enter' || event.key === ' ') handleThemeDelete(theme.id) }}
+              role="button"
+              tabindex="-1"
+            >
+              <div class="w-4 h-0.5 bg-white"></div>
+            </div>
+          {/if}
+          
+          {#if !isEditMode}
+            <div
+              class="absolute z-20 flex w-8 h-8 p-2 text-white transition-all rounded-full delay-[20ms] opacity-0 top-1/4 right-2 bg-black/50 place-items-center group-hover:opacity-100 group-hover:top-1/2 -translate-y-1/2"
+              onclick={(event) => { event.stopPropagation(); OpenThemeCreator(theme.id) }}
+              onkeydown={(event) => { if (event.key === 'Enter' || event.key === ' ') OpenThemeCreator(theme.id) }}
+              role="button"
+              tabindex="-1"
+            >
+              <span class="text-lg font-IconFamily">&#xeaa5;</span>
+            </div>
+
+            <div
+              class="absolute z-20 flex w-8 h-8 p-2 text-center transition-all -translate-y-1/2 rounded-full opacity-0 text-white/80 top-1/4 right-12 bg-black/50 place-items-center group-hover:opacity-100 group-hover:top-1/2"
+              onclick={(event) => { event.stopPropagation(); handleShareTheme(theme) }}
+              onkeydown={(event) => { if (event.key === 'Enter' || event.key === ' ') handleShareTheme(theme) }}
+              role="button"
+              tabindex="-1"
+            >
+              <span class="text-lg font-IconFamily">&#xecb3;</span>
+            </div>
+          {/if}
+
+          <div class="relative top-0 z-10 flex justify-center w-full h-full overflow-hidden transition dark:text-white rounded-xl group place-items-center bg-zinc-100 dark:bg-zinc-900">
+            {#if theme.coverImage}
+              <img
+                src={typeof theme.coverImage === 'string' ? theme.coverImage : URL.createObjectURL(theme.coverImage)}
+                alt={theme.name}
+                class="absolute inset-0 z-0 object-cover w-full h-full pointer-events-none"
+              />
+            {/if}
+            {#if !theme.hideThemeName}
+              <div class="z-10 {theme.coverImage ? 'text-white' : ''}">{theme.name}</div>
+            {/if}
+          </div>
+        </button>
+      {/each}
+    {/if}
+
+    {#if tempTheme}
+      <div class="flex justify-center w-full bg-gray-200 rounded-xl dark:bg-zinc-700/50 place-items-center aspect-theme animate-pulse">
+        <svg class="w-5 h-5 text-white animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+          <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+          <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+        </svg>
+      </div>
+    {/if}
+
+    {#if themes && themes.themes.length > 0}
+      <div id="divider" class="w-full h-[1px] my-2 bg-zinc-100 dark:bg-zinc-600"></div>
+    {/if}
+
+    <a
+      href={''}
+      target="_blank"
+      class="flex items-center justify-center w-full transition aspect-theme rounded-xl bg-zinc-100 dark:bg-zinc-900 dark:text-white"
+    >
+      <span class="text-xl font-IconFamily">&#xecc5;</span>
+      <span class="ml-2">Theme Store</span>
+    </a>
+
+    <button
+      onclick={() => OpenThemeCreator}
+      class="flex items-center justify-center w-full transition aspect-theme rounded-xl bg-zinc-100 dark:bg-zinc-900 dark:text-white"
+    >
+      <span class="text-xl font-IconFamily">&#xec60;</span>
+      <span class="ml-2">Create your own</span>
+    </button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/svelte-interface/pages/settings/theme.svelte b/src/svelte-interface/pages/settings/theme.svelte
index 37cf35cf..93d5fcba 100644
--- a/src/svelte-interface/pages/settings/theme.svelte
+++ b/src/svelte-interface/pages/settings/theme.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import BackgroundSelector from "@/svelte-interface/components/themes/BackgroundSelector.svelte"
+  import ThemeSelector from "@/svelte-interface/components/themes/ThemeSelector.svelte"
   
   // backgrounds
   let selectedBackground = $state<string | null>(null);
@@ -16,4 +17,5 @@
     { clearTheme ? 'Clear Theme' : 'Select Theme' }
   </button>
   <BackgroundSelector isEditMode={editMode} bind:selectedBackground={selectedBackground} bind:selectNoBackground={selectNoBackground} />
+  <ThemeSelector isEditMode={editMode} />
 </div>
\ No newline at end of file
diff --git a/src/old-interface/types/CustomThemes.ts b/src/types/CustomThemes.ts
similarity index 90%
rename from src/old-interface/types/CustomThemes.ts
rename to src/types/CustomThemes.ts
index 2191019d..a7c508a7 100644
--- a/src/old-interface/types/CustomThemes.ts
+++ b/src/types/CustomThemes.ts
@@ -7,7 +7,7 @@ export type CustomTheme = {
   allowBackgrounds: boolean;
   CustomCSS: string;
   CustomImages: CustomImage[];
-  coverImage: Blob | string | null;
+  coverImage: Blob | null;
   isEditable: boolean;
   hideThemeName: boolean;
   webURL?: string;
@@ -37,6 +37,6 @@ export type CustomThemeBase64 = Omit<CustomTheme, 'CustomImages'> & {
 }
 
 export type ThemeList = {
-  themes: Omit<CustomTheme, 'CustomImages'>[];
+  themes: CustomTheme[];
   selectedTheme: string;
 }
\ No newline at end of file