hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

initial work on mobile stuff

Browse source
This commit is contained in:
Henry Jameson 2024-02-22 01:10:24 +02:00
commit 5e0ba2bcd9
6 changed files with 108 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/services/style_setter/style_setter.js
View file

@ -6,12 +6,12 @@ import { getCssRules } from '../theme_data/css_utils.js'
import { defaultState } from '../../modules/config.js'
export const applyTheme = (input) => {
const { version, theme: inputTheme } = input
console.log({ ...input })
let extraRules
let fonts
if (version === 2) {
if (input.themeType !== 1) {
const t0 = performance.now()
const { rules, theme } = generatePreset(inputTheme)
const { rules, theme } = generatePreset(input)
fonts = rules.fonts
const t1 = performance.now()
console.log('Themes 2 initialization took ' + (t1 - t0) + 'ms')
@ -127,7 +127,7 @@ export const getPreset = (val) => {
.then((themes) => themes[val] ? themes[val] : themes['pleroma-dark'])
.then((theme) => {
const isV1 = Array.isArray(theme)
const data = isV1 ? {} : theme.theme
const data = isV1 ? { themeType: 1 } : theme.theme
if (isV1) {
const bg = hex2rgb(theme[1])
@ -143,7 +143,7 @@ export const getPreset = (val) => {
data.colors = { bg, fg, text, link, cRed, cBlue, cGreen, cOrange }
}
return { theme: data, source: theme.source, version: isV1 ? 1 : 2 }
return { theme: data, source: theme.source }
})
}

9
src/services/theme_data/theme2_to_theme3.js
View file

@ -210,6 +210,9 @@ export const convertTheme2To3 = (data) => {
shadow: originalShadow
}
newRules.push(rule)
if (key === 'topBar') {
newRules.push({ ...rule, component: 'PanelHeader', parent: { component: 'MobileDrawer' } })
}
if (key === 'avatarStatus') {
newRules.push({ ...rule, parent: { component: 'Notification' } })
}
@ -355,8 +358,12 @@ export const convertTheme2To3 = (data) => {
}
}
if (newRule.component === 'Button') {
if (newRule.component === 'Panel') {
return [newRule, { ...newRule, component: 'MobileDrawer' }]
} else if (newRule.component === 'Button') {
return [newRule, { ...newRule, component: 'Tab' }, { ...newRule, component: 'ScrollbarElement' }]
} else if (newRule.component === 'TopBar') {
return [newRule, { ...newRule, parent: { component: 'MobileDrawer' }, component: 'PanelHeader' }]
} else {
return [newRule]
}