From a591a334ed6fd7f8ed936bf7e7edfcce08de035a Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 10 Jul 2020 00:20:26 +0900 Subject: refactor --- src/client/init.ts | 4 +- src/client/pages/preferences/theme.vue | 2 +- src/client/scripts/theme.ts | 118 +++++++++++++++++++++++++++++++++ src/client/theme.ts | 118 --------------------------------- src/client/themes/lavender.json5 | 18 ----- src/client/themes/lilac.json5 | 18 +++++ 6 files changed, 139 insertions(+), 139 deletions(-) create mode 100644 src/client/scripts/theme.ts delete mode 100644 src/client/theme.ts delete mode 100644 src/client/themes/lavender.json5 create mode 100644 src/client/themes/lilac.json5 (limited to 'src') diff --git a/src/client/init.ts b/src/client/init.ts index a5c310dd6f..21f233cc91 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -18,7 +18,7 @@ import PostFormDialog from './components/post-form-dialog.vue'; import Dialog from './components/dialog.vue'; import Menu from './components/menu.vue'; import { router } from './router'; -import { applyTheme, lightTheme } from './theme'; +import { applyTheme, lightTheme } from './scripts/theme'; import { isDeviceDarkmode } from './scripts/is-device-darkmode'; import createStore from './store'; import { clientDb, get, count } from './db'; @@ -114,7 +114,7 @@ os.init(async () => { }, false); store.watch(state => state.device.darkMode, darkMode => { - import('./theme').then(({ builtinThemes }) => { + import('./scripts/theme').then(({ builtinThemes }) => { const themes = builtinThemes.concat(store.state.device.themes); applyTheme(themes.find(x => x.id === (darkMode ? store.state.device.darkTheme : store.state.device.lightTheme))); }); diff --git a/src/client/pages/preferences/theme.vue b/src/client/pages/preferences/theme.vue index 2111fa2248..246787fa58 100644 --- a/src/client/pages/preferences/theme.vue +++ b/src/client/pages/preferences/theme.vue @@ -87,7 +87,7 @@ import MkButton from '../../components/ui/button.vue'; import MkSelect from '../../components/ui/select.vue'; import MkSwitch from '../../components/ui/switch.vue'; import MkTextarea from '../../components/ui/textarea.vue'; -import { Theme, builtinThemes, applyTheme, validateTheme } from '../../theme'; +import { Theme, builtinThemes, applyTheme, validateTheme } from '../../scripts/theme'; import { selectFile } from '../../scripts/select-file'; import { isDeviceDarkmode } from '../../scripts/is-device-darkmode'; diff --git a/src/client/scripts/theme.ts b/src/client/scripts/theme.ts new file mode 100644 index 0000000000..d458df45f0 --- /dev/null +++ b/src/client/scripts/theme.ts @@ -0,0 +1,118 @@ +import * as tinycolor from 'tinycolor2'; + +export type Theme = { + id: string; + name: string; + author: string; + desc?: string; + base?: 'dark' | 'light'; + props: { [key: string]: string }; +}; + +export const lightTheme: Theme = require('../themes/_light.json5'); +export const darkTheme: Theme = require('../themes/_dark.json5'); + +export const builtinThemes = [ + require('../themes/white.json5'), + require('../themes/black.json5'), + require('../themes/lilac.json5'), + require('../themes/halloween.json5'), + require('../themes/city.json5'), + require('../themes/rainy.json5'), + require('../themes/urban.json5'), + require('../themes/cafe.json5'), + require('../themes/chocolate.json5'), + require('../themes/danboard.json5'), + require('../themes/olive.json5'), + require('../themes/ocean.json5'), +] as Theme[]; + +let timeout = null; + +export function applyTheme(theme: Theme, persist = true) { + if (timeout) clearTimeout(timeout); + + document.documentElement.classList.add('changing-theme'); + + timeout = setTimeout(() => { + document.documentElement.classList.remove('changing-theme'); + }, 1000); + + // Deep copy + const _theme = JSON.parse(JSON.stringify(theme)); + + if (_theme.base) { + const base = [lightTheme, darkTheme].find(x => x.id === _theme.base); + _theme.props = Object.assign({}, base.props, _theme.props); + } + + const props = compile(_theme); + + for (const tag of document.head.children) { + if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') { + tag.setAttribute('content', props['html']); + break; + } + } + + for (const [k, v] of Object.entries(props)) { + document.documentElement.style.setProperty(`--${k}`, v.toString()); + } + + if (persist) { + localStorage.setItem('theme', JSON.stringify(props)); + } +} + +function compile(theme: Theme): Record { + function getColor(val: string): tinycolor.Instance { + // ref (prop) + if (val[0] === '@') { + return getColor(theme.props[val.substr(1)]); + } + + // ref (const) + else if (val[0] === '$') { + return getColor(theme.props[val]); + } + + // func + else if (val[0] === ':') { + const parts = val.split('<'); + const func = parts.shift().substr(1); + const arg = parseFloat(parts.shift()); + const color = getColor(parts.join('<')); + + switch (func) { + case 'darken': return color.darken(arg); + case 'lighten': return color.lighten(arg); + case 'alpha': return color.setAlpha(arg); + } + } + + // other case + return tinycolor(val); + } + + const props = {}; + + for (const [k, v] of Object.entries(theme.props)) { + if (k.startsWith('$')) continue; // ignore const + + props[k] = genValue(getColor(v)); + } + + return props; +} + +function genValue(c: tinycolor.Instance): string { + return c.toRgbString(); +} + +export function validateTheme(theme: Record): boolean { + if (theme.id == null || typeof theme.id !== 'string') return false; + if (theme.name == null || typeof theme.name !== 'string') return false; + if (theme.base == null || !['light', 'dark'].includes(theme.base)) return false; + if (theme.props == null || typeof theme.props !== 'object') return false; + return true; +} diff --git a/src/client/theme.ts b/src/client/theme.ts deleted file mode 100644 index 07981c36ff..0000000000 --- a/src/client/theme.ts +++ /dev/null @@ -1,118 +0,0 @@ -import * as tinycolor from 'tinycolor2'; - -export type Theme = { - id: string; - name: string; - author: string; - desc?: string; - base?: 'dark' | 'light'; - props: { [key: string]: string }; -}; - -export const lightTheme: Theme = require('./themes/_light.json5'); -export const darkTheme: Theme = require('./themes/_dark.json5'); - -export const builtinThemes = [ - require('./themes/white.json5'), - require('./themes/black.json5'), - require('./themes/lavender.json5'), - require('./themes/halloween.json5'), - require('./themes/city.json5'), - require('./themes/rainy.json5'), - require('./themes/urban.json5'), - require('./themes/cafe.json5'), - require('./themes/chocolate.json5'), - require('./themes/danboard.json5'), - require('./themes/olive.json5'), - require('./themes/ocean.json5'), -] as Theme[]; - -let timeout = null; - -export function applyTheme(theme: Theme, persist = true) { - if (timeout) clearTimeout(timeout); - - document.documentElement.classList.add('changing-theme'); - - timeout = setTimeout(() => { - document.documentElement.classList.remove('changing-theme'); - }, 1000); - - // Deep copy - const _theme = JSON.parse(JSON.stringify(theme)); - - if (_theme.base) { - const base = [lightTheme, darkTheme].find(x => x.id === _theme.base); - _theme.props = Object.assign({}, base.props, _theme.props); - } - - const props = compile(_theme); - - for (const tag of document.head.children) { - if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') { - tag.setAttribute('content', props['html']); - break; - } - } - - for (const [k, v] of Object.entries(props)) { - document.documentElement.style.setProperty(`--${k}`, v.toString()); - } - - if (persist) { - localStorage.setItem('theme', JSON.stringify(props)); - } -} - -function compile(theme: Theme): Record { - function getColor(val: string): tinycolor.Instance { - // ref (prop) - if (val[0] === '@') { - return getColor(theme.props[val.substr(1)]); - } - - // ref (const) - else if (val[0] === '$') { - return getColor(theme.props[val]); - } - - // func - else if (val[0] === ':') { - const parts = val.split('<'); - const func = parts.shift().substr(1); - const arg = parseFloat(parts.shift()); - const color = getColor(parts.join('<')); - - switch (func) { - case 'darken': return color.darken(arg); - case 'lighten': return color.lighten(arg); - case 'alpha': return color.setAlpha(arg); - } - } - - // other case - return tinycolor(val); - } - - const props = {}; - - for (const [k, v] of Object.entries(theme.props)) { - if (k.startsWith('$')) continue; // ignore const - - props[k] = genValue(getColor(v)); - } - - return props; -} - -function genValue(c: tinycolor.Instance): string { - return c.toRgbString(); -} - -export function validateTheme(theme: Record): boolean { - if (theme.id == null || typeof theme.id !== 'string') return false; - if (theme.name == null || typeof theme.name !== 'string') return false; - if (theme.base == null || !['light', 'dark'].includes(theme.base)) return false; - if (theme.props == null || typeof theme.props !== 'object') return false; - return true; -} diff --git a/src/client/themes/lavender.json5 b/src/client/themes/lavender.json5 deleted file mode 100644 index faa4093612..0000000000 --- a/src/client/themes/lavender.json5 +++ /dev/null @@ -1,18 +0,0 @@ -{ - id: 'e9c8c01d-9c15-48d0-9b5c-3d00843b5b36', - - name: 'Lavender', - author: 'syuilo', - - base: 'light', - - props: { - accent: 'rgb(206, 147, 191)', - bg: 'rgb(253, 242, 243)', - fg: 'rgb(161, 139, 146)', - renote: '@accent', - link: '@accent', - mention: '@accent', - hashtag: '@accent', - }, -} diff --git a/src/client/themes/lilac.json5 b/src/client/themes/lilac.json5 new file mode 100644 index 0000000000..44e2591512 --- /dev/null +++ b/src/client/themes/lilac.json5 @@ -0,0 +1,18 @@ +{ + id: 'e9c8c01d-9c15-48d0-9b5c-3d00843b5b36', + + name: 'Lilac', + author: 'syuilo', + + base: 'light', + + props: { + accent: 'rgb(206, 147, 191)', + bg: 'rgb(253, 242, 243)', + fg: 'rgb(161, 139, 146)', + renote: '@accent', + link: '@accent', + mention: '@accent', + hashtag: '@accent', + }, +} -- cgit v1.2.3-freya