diff --git a/src/components/button.style.js b/src/components/button.style.js index 248da8bbd..747cfd5eb 100644 --- a/src/components/button.style.js +++ b/src/components/button.style.js @@ -89,6 +89,13 @@ export default { shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'] } }, + { + state: ['toggled', 'disabled'], + directives: { + background: '$blend(--inheritedBackground 0.25 --parent)', + shadow: ['--buttonPressedBevel'] + } + }, { state: ['disabled'], directives: { diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js index b4b401574..711b1961b 100644 --- a/src/components/settings_modal/tabs/appearance_tab.js +++ b/src/components/settings_modal/tabs/appearance_tab.js @@ -16,6 +16,7 @@ import { getCssRules, getScopedVersion } from 'src/services/theme_data/css_utils.js' +import { deserialize } from 'src/services/theme_data/iss_deserializer.js' import SharedComputedObject from '../helpers/shared_computed_object.js' import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue' @@ -35,10 +36,12 @@ const AppearanceTab = { return { availableStyles: [], bundledPalettes: [], + compilationCache: {}, fileImporter: newImporter({ accept: '.json, .piss', validator: this.importValidator, onImport: this.onImport, + parser: this.importParser, onImportFailure: this.onImportFailure }), palettesKeys: [ @@ -82,6 +85,8 @@ const AppearanceTab = { PaletteEditor }, mounted () { + this.$store.dispatch('getThemeData') + const updateIndex = (resource) => { const capitalizedResource = resource[0].toUpperCase() + resource.slice(1) const currentIndex = this.$store.state.instance[`${resource}sIndex`] @@ -100,6 +105,13 @@ const AppearanceTab = { }) } + updateIndex('style').then(styles => { + styles.forEach(([key, stylePromise]) => stylePromise.then(data => { + const meta = data.find(x => x.component === '@meta') + this.availableStyles.push({ key, data, name: meta.directives.name, version: 'v3' }) + })) + }) + updateIndex('theme').then(themes => { themes.forEach(([key, themePromise]) => themePromise.then(data => { this.availableStyles.push({ key, data, name: data.name, version: 'v2' }) @@ -164,14 +176,18 @@ const AppearanceTab = { ] }, stylePalettes () { - if (!this.mergedConfig.styleCustomData) return - const meta = this.mergedConfig.styleCustomData - .find(x => x.component === '@meta') - const result = this.mergedConfig.styleCustomData - .filter(x => x.component.startsWith('@palette')) + const ruleset = this.$store.state.interface.styleDataUsed || [] + console.log( + 'ASR', + this.$store.state.interface.paletteDataUsed, + this.$store.state.interface.styleDataUsed + ) + if (!ruleset && ruleset.length === 0) return + const meta = ruleset.find(x => x.component === '@meta') + const result = ruleset.filter(x => x.component.startsWith('@palette')) .map(x => { + const { variant, directives } = x const { - variant, bg, fg, text, @@ -182,10 +198,10 @@ const AppearanceTab = { cGreen, cOrange, wallpaper - } = x + } = directives const result = { - name: `${meta.name}: ${variant}`, + name: `${meta.directives.name || this.$t('settings.style.themes3.palette.imported')}: ${variant}`, bg, fg, text, @@ -238,12 +254,12 @@ const AppearanceTab = { return themeVersion }, isCustomThemeUsed () { - const { theme } = this.mergedConfig - return theme === 'custom' + const { customTheme, customThemeSource } = this.mergedConfig + return customTheme != null || customThemeSource != null }, isCustomStyleUsed (name) { - const { style } = this.mergedConfig - return style === 'custom' + const { styleCustomData } = this.mergedConfig + return styleCustomData != null }, ...SharedComputedObject() }, @@ -263,21 +279,33 @@ const AppearanceTab = { importFile () { this.fileImporter.importData() }, + importParser (file, filename) { + if (filename.endsWith('.json')) { + return JSON.parse(file) + } else if (filename.endsWith('.piss')) { + return deserialize(file) + } + }, onImport (parsed, filename) { if (filename.endsWith('.json')) { this.$store.dispatch('setThemeCustom', parsed.source || parsed.theme) - this.$store.dispatch('applyTheme') + } else if (filename.endsWith('.piss')) { + this.$store.dispatch('setStyleCustom', parsed) } - - // this.loadTheme(parsed, 'file', forceSource) }, onImportFailure (result) { + console.error('Failure importing theme:', result) this.$store.dispatch('pushGlobalNotice', { messageKey: 'settings.invalid_theme_imported', level: 'error' }) }, importValidator (parsed, filename) { if (filename.endsWith('.json')) { const version = parsed._pleroma_theme_version return version >= 1 || version <= 2 + } else if (filename.endsWith('.piss')) { + if (!Array.isArray(parsed)) return false + if (parsed.length < 1) return false + if (parsed.find(x => x.component === '@meta') == null) return false + return true } }, isThemeActive (key) { @@ -293,7 +321,7 @@ const AppearanceTab = { return key === palette }, setStyle (name) { - this.$store.dispatch('setTheme', name) + this.$store.dispatch('setStyle', name) }, setTheme (name) { this.$store.dispatch('setTheme', name) @@ -309,18 +337,30 @@ const AppearanceTab = { resetTheming (name) { this.$store.dispatch('setStyle', 'stock') }, - previewTheme (key, input) { + previewTheme (key, version, input) { let theme3 - if (input) { - const style = normalizeThemeData(input) - const theme2 = convertTheme2To3(style) - theme3 = init({ - inputRuleset: theme2, - ultimateBackgroundColor: '#000000', - liteMode: true, - debug: true, - onlyNormalState: true - }) + if (this.compilationCache[key]) { + theme3 = this.compilationCache[key] + } else if (input) { + if (version === 'v2') { + const style = normalizeThemeData(input) + const theme2 = convertTheme2To3(style) + theme3 = init({ + inputRuleset: theme2, + ultimateBackgroundColor: '#000000', + liteMode: true, + debug: true, + onlyNormalState: true + }) + } else if (version === 'v3') { + theme3 = init({ + inputRuleset: input, + ultimateBackgroundColor: '#000000', + liteMode: true, + debug: true, + onlyNormalState: true + }) + } } else { theme3 = init({ inputRuleset: [], @@ -331,6 +371,10 @@ const AppearanceTab = { }) } + if (!this.compilationCache[key]) { + this.compilationCache[key] = theme3 + } + return getScopedVersion( getCssRules(theme3.eager), '#theme-preview-' + key diff --git a/src/components/settings_modal/tabs/appearance_tab.vue b/src/components/settings_modal/tabs/appearance_tab.vue index 6ec84eb28..547b72c07 100644 --- a/src/components/settings_modal/tabs/appearance_tab.vue +++ b/src/components/settings_modal/tabs/appearance_tab.vue @@ -18,7 +18,7 @@ @@ -30,7 +30,7 @@ +