diff --git a/src/lib/components/Reader/Reader.svelte b/src/lib/components/Reader/Reader.svelte index 6cff6a0..cfb05bb 100644 --- a/src/lib/components/Reader/Reader.svelte +++ b/src/lib/components/Reader/Reader.svelte @@ -7,7 +7,7 @@ zoomDefault, zoomFitToScreen } from '$lib/panzoom'; - import { progress, settings, updateProgress } from '$lib/settings'; + import { progress, settings, updateProgress, type VolumeSettings } from '$lib/settings'; import { clamp, debounce } from '$lib/util'; import { Input, Popover, Range, Spinner } from 'flowbite-svelte'; import MangaPage from './MangaPage.svelte'; @@ -24,6 +24,7 @@ import { getCharCount } from '$lib/util/count-chars'; // TODO: Refactor this whole mess + export let volumeSettings: VolumeSettings; $: volume = $catalog ?.find((item) => item.id === $pageStore.params.manga) @@ -34,7 +35,8 @@ $: page = $progress?.[volume?.mokuroData.volume_uuid || 0] || 1; $: index = page - 1; $: navAmount = - $settings.singlePageView || ($settings.hasCover && !$settings.singlePageView && index === 0) + volumeSettings.singlePageView || + (volumeSettings.hasCover && !volumeSettings.singlePageView && index === 0) ? 1 : 2; @@ -45,12 +47,12 @@ } function left(_e: any, ingoreTimeOut?: boolean) { - const newPage = $settings.rightToLeft ? page + navAmount : page - navAmount; + const newPage = volumeSettings.rightToLeft ? page + navAmount : page - navAmount; changePage(newPage, ingoreTimeOut); } function right(_e: any, ingoreTimeOut?: boolean) { - const newPage = $settings.rightToLeft ? page - navAmount : page + navAmount; + const newPage = volumeSettings.rightToLeft ? page - navAmount : page + navAmount; changePage(newPage, ingoreTimeOut); } @@ -78,11 +80,11 @@ return false; } - if ($settings.singlePageView || index + 1 >= pages.length) { + if (volumeSettings.singlePageView || index + 1 >= pages.length) { return false; } - if (index === 0 && $settings.hasCover) { + if (index === 0 && volumeSettings.hasCover) { return false; } @@ -96,12 +98,12 @@ $: charDisplay = `${charCount} / ${maxCharCount}`; - let hasCoverSetting = $settings.hasCover; + let hasCoverSetting = volumeSettings.hasCover; $: { - if ($settings.hasCover !== hasCoverSetting) { - hasCoverSetting = $settings.hasCover; - if (page > 1 && !$settings.singlePageView) { + if (volumeSettings.hasCover !== hasCoverSetting) { + hasCoverSetting = volumeSettings.hasCover; + if (page > 1 && !volumeSettings.singlePageView) { page--; } } @@ -229,7 +231,7 @@
changePage($settings.rightToLeft ? pages.length : 1, true)} + on:click={() => changePage(volumeSettings.rightToLeft ? pages.length : 1, true)} class="hover:text-primary-600" size="sm" /> @@ -251,12 +253,12 @@ size="sm" /> changePage($settings.rightToLeft ? 1 : pages.length, true)} + on:click={() => changePage(volumeSettings.rightToLeft ? 1 : pages.length, true)} class="hover:text-primary-600" size="sm" />
-
+
diff --git a/src/lib/components/Settings/Profiles/Profiles.svelte b/src/lib/components/Settings/Profiles/Profiles.svelte index 38382f6..e3bc248 100644 --- a/src/lib/components/Settings/Profiles/Profiles.svelte +++ b/src/lib/components/Settings/Profiles/Profiles.svelte @@ -1,9 +1,10 @@ - + Reader
diff --git a/src/lib/components/Settings/Reader/ReaderToggles.svelte b/src/lib/components/Settings/Reader/ReaderToggles.svelte index 18e072f..4fc5c76 100644 --- a/src/lib/components/Settings/Reader/ReaderToggles.svelte +++ b/src/lib/components/Settings/Reader/ReaderToggles.svelte @@ -3,9 +3,6 @@ import { Toggle } from 'flowbite-svelte'; $: toggles = [ - { key: 'rightToLeft', text: 'Right to left', value: $settings.rightToLeft }, - { key: 'singlePageView', text: 'Single page view', value: $settings.singlePageView }, - { key: 'hasCover', text: 'First page is cover', value: $settings.hasCover }, { key: 'textEditable', text: 'Editable text', value: $settings.textEditable }, { key: 'textBoxBorders', text: 'Text box borders', value: $settings.textBoxBorders }, { key: 'displayOCR', text: 'OCR enabled', value: $settings.displayOCR }, diff --git a/src/lib/components/Settings/Settings.svelte b/src/lib/components/Settings/Settings.svelte index 6b6cefd..ba466f6 100644 --- a/src/lib/components/Settings/Settings.svelte +++ b/src/lib/components/Settings/Settings.svelte @@ -3,12 +3,14 @@ import { UserSettingsSolid } from 'flowbite-svelte-icons'; import { sineIn } from 'svelte/easing'; import { resetSettings } from '$lib/settings'; - import { promptConfirmation } from '$lib/util'; + import { isReader, promptConfirmation } from '$lib/util'; import AnkiConnectSettings from './AnkiConnectSettings.svelte'; import ReaderSettings from './Reader/ReaderSettings.svelte'; import Profiles from './Profiles/Profiles.svelte'; import CatalogSettings from './CatalogSettings.svelte'; import Stats from './Stats.svelte'; + import VolumeDefaults from './Volume/VolumeDefaults.svelte'; + import VolumeSettings from './Volume/VolumeSettings.svelte'; let transitionParams = { x: 320, @@ -44,9 +46,14 @@
+ {#if isReader()} + + {:else} + + {/if} + - diff --git a/src/lib/components/Settings/Stats.svelte b/src/lib/components/Settings/Stats.svelte index d0e340b..5b43ccc 100644 --- a/src/lib/components/Settings/Stats.svelte +++ b/src/lib/components/Settings/Stats.svelte @@ -2,22 +2,28 @@ import { volumes } from '$lib/settings'; import { AccordionItem, P } from 'flowbite-svelte'; - $: completed = Object.values($volumes).reduce((total: number, { completed }) => { - if (completed) { - total++; - } - return total; - }, 0); + $: completed = $volumes + ? Object.values($volumes).reduce((total: number, { completed }) => { + if (completed) { + total++; + } + return total; + }, 0) + : 0; - $: pagesRead = Object.values($volumes).reduce((total: number, { progress }) => { - total += progress; - return total; - }, 0); + $: pagesRead = $volumes + ? Object.values($volumes).reduce((total: number, { progress }) => { + total += progress; + return total; + }, 0) + : 0; - $: charsRead = Object.values($volumes).reduce((total: number, { chars }) => { - total += chars; - return total; - }, 0); + $: charsRead = $volumes + ? Object.values($volumes).reduce((total: number, { chars }) => { + total += chars; + return total; + }, 0) + : 0; diff --git a/src/lib/components/Settings/Volume/VolumeDefaults.svelte b/src/lib/components/Settings/Volume/VolumeDefaults.svelte new file mode 100644 index 0000000..ce3e471 --- /dev/null +++ b/src/lib/components/Settings/Volume/VolumeDefaults.svelte @@ -0,0 +1,26 @@ + + + + Volume defaults +
+ The default settings that are applied when you start a new volume + {#each toggles as { key, text, value }} + updateVolumeDefaults(key, !value)} + >{text} + {/each} +
+
diff --git a/src/lib/components/Settings/Volume/VolumeSettings.svelte b/src/lib/components/Settings/Volume/VolumeSettings.svelte new file mode 100644 index 0000000..0196e69 --- /dev/null +++ b/src/lib/components/Settings/Volume/VolumeSettings.svelte @@ -0,0 +1,29 @@ + + + + Volume settings +
+ These settings only apply to this volume + {#each toggles as { key, text, value }} + updateVolumeSetting($page.params.volume, key, !value)}>{text} + {/each} + +
+
diff --git a/src/lib/components/Settings/VolumeSettings.svelte b/src/lib/components/Settings/VolumeSettings.svelte deleted file mode 100644 index 49abaf2..0000000 --- a/src/lib/components/Settings/VolumeSettings.svelte +++ /dev/null @@ -1,14 +0,0 @@ - - -{#if isReader()} - - Volume settings -
sdafsd
-
sdafsd
-
sdafsd
-
-{/if} diff --git a/src/lib/settings/settings.ts b/src/lib/settings/settings.ts index f0e31e3..f8a22f2 100644 --- a/src/lib/settings/settings.ts +++ b/src/lib/settings/settings.ts @@ -25,26 +25,6 @@ export type ZoomModes = | 'keepZoom' | 'keepZoomStart'; -export type Settings = { - rightToLeft: boolean; - singlePageView: boolean; - textEditable: boolean; - textBoxBorders: boolean; - displayOCR: boolean; - boldFont: boolean; - pageNum: boolean; - charCount: boolean; - hasCover: boolean; - mobile: boolean; - backgroundColor: string; - swipeThreshold: number; - fontSize: FontSize; - zoomDefault: ZoomModes; - ankiConnectSettings: AnkiConnectSettings; -}; - -export type SettingsKey = keyof Settings; - export type AnkiConnectSettings = { enabled: boolean; pictureField: string; @@ -54,12 +34,35 @@ export type AnkiConnectSettings = { grabSentence: boolean; } +export type VolumeDefaults = { + rightToLeft: boolean; + singlePageView: boolean; + hasCover: boolean; +} + +export type Settings = { + textEditable: boolean; + textBoxBorders: boolean; + displayOCR: boolean; + boldFont: boolean; + pageNum: boolean; + charCount: boolean; + mobile: boolean; + backgroundColor: string; + swipeThreshold: number; + fontSize: FontSize; + zoomDefault: ZoomModes; + volumeDefaults: VolumeDefaults; + ankiConnectSettings: AnkiConnectSettings; +}; + +export type SettingsKey = keyof Settings; + export type AnkiSettingsKey = keyof AnkiConnectSettings; +export type VolumeDefaultsKey = keyof VolumeDefaults; + const defaultSettings: Settings = { - rightToLeft: true, - singlePageView: false, - hasCover: false, displayOCR: true, textEditable: false, textBoxBorders: false, @@ -71,6 +74,11 @@ const defaultSettings: Settings = { swipeThreshold: 50, fontSize: 'auto', zoomDefault: 'zoomFitToScreen', + volumeDefaults: { + singlePageView: false, + rightToLeft: true, + hasCover: false + }, ankiConnectSettings: { enabled: false, cropImage: false, @@ -120,7 +128,22 @@ export function updateSetting(key: SettingsKey, value: any) { } }; }); - zoomDefault(); +} + +export function updateVolumeDefaults(key: VolumeDefaultsKey, value: any) { + profiles.update((profiles) => { + return { + ...profiles, + [get(currentProfile)]: { + ...profiles[get(currentProfile)], + volumeDefaults: { + ...profiles[get(currentProfile)].volumeDefaults, + [key]: value + } + } + + }; + }); } export function updateAnkiSetting(key: AnkiSettingsKey, value: any) { diff --git a/src/lib/settings/volume-data.ts b/src/lib/settings/volume-data.ts index c017bb5..3cadbb3 100644 --- a/src/lib/settings/volume-data.ts +++ b/src/lib/settings/volume-data.ts @@ -1,13 +1,16 @@ import { browser } from '$app/environment'; import { derived, get, writable } from 'svelte/store'; import { settings } from './settings'; +import { zoomDefault } from '$lib/panzoom'; -type VolumeSettings = { +export type VolumeSettings = { rightToLeft: boolean; singlePageView: boolean; hasCover: boolean; } +export type VolumeSettingsKey = keyof VolumeSettings; + type Progress = Record | undefined; type VolumeData = { @@ -26,7 +29,7 @@ const initial: Volumes = stored && browser ? JSON.parse(stored) : undefined; export const volumes = writable(initial); export function initializeVolume(volume: string) { - const { hasCover, rightToLeft, singlePageView } = get(settings) + const { hasCover, rightToLeft, singlePageView } = get(settings).volumeDefaults volumes.update((prev) => { return { ...prev, @@ -86,3 +89,31 @@ export const progress = derived(volumes, ($volumes) => { return progress }) + +export const volumeSettings = derived(volumes, ($volumes) => { + const settings: Record = {} + + if ($volumes) { + Object.keys($volumes).forEach((key) => { + settings[key] = $volumes[key].settings + }); + } + + return settings +}) + +export function updateVolumeSetting(volume: string, key: VolumeSettingsKey, value: any) { + volumes.update((prev) => { + return { + ...prev, + [volume]: { + ...prev[volume], + settings: { + ...prev[volume].settings, + [key]: value + } + } + }; + }); + zoomDefault(); +} \ No newline at end of file diff --git a/src/routes/[manga]/[volume]/+page.svelte b/src/routes/[manga]/[volume]/+page.svelte index f2e11e9..74e3048 100644 --- a/src/routes/[manga]/[volume]/+page.svelte +++ b/src/routes/[manga]/[volume]/+page.svelte @@ -1,16 +1,18 @@ - +{#if $volumeSettings[volumeId]} + +{/if}