midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Remove unmaintained preferences page, re-add earlier visited installed themes (only remove themes)

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-12-21 20:57:25 +01:00
parent 4b6769d601
commit 7fe79600fb
6 changed files with 78 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

12
UI/BigComponents/MoreScreen.ts
View file

@ -53,7 +53,7 @@ export default class MoreScreen extends Combine {
icon: string,
title: any,
shortDescription: any
}, customThemeDefinition: string = undefined
}, isCustom: boolean = false
):
BaseUIElement {
if (layout === undefined) {
@ -79,14 +79,12 @@ export default class MoreScreen extends Combine {
}
let linkPrefix = `${path}/${layout.id.toLowerCase()}.html?`
let linkSuffix = ""
if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
linkPrefix = `${path}/theme.html?layout=${layout.id}&`
}
if (customThemeDefinition) {
if (isCustom) {
linkPrefix = `${path}/theme.html?userlayout=${layout.id}&`
linkSuffix = `#${customThemeDefinition}`
}
const linkText = currentLocation?.map(currentLocation => {
@ -97,8 +95,8 @@ export default class MoreScreen extends Combine {
].filter(part => part[1] !== undefined)
.map(part => part[0] + "=" + part[1])
.join("&")
return `${linkPrefix}${params}${linkSuffix}`;
}) ?? new UIEventSource<string>(`${linkPrefix}${linkSuffix}`)
return `${linkPrefix}${params}`;
}) ?? new UIEventSource<string>(`${linkPrefix}`)
return new SubtleButton(layout.icon,
@ -117,7 +115,7 @@ export default class MoreScreen extends Combine {
if (customThemes.length <= 0) {
return undefined;
}
const customThemeButtons = customThemes.map(theme => MoreScreen.createLinkButton(state, theme.layout, theme.definition)?.SetClass(buttonClass))
const customThemeButtons = customThemes.map(theme => MoreScreen.createLinkButton(state, theme, true)?.SetClass(buttonClass))
return new Combine([
Translations.t.general.customThemeIntro.Clone(),
new Combine(customThemeButtons).SetClass(themeListClasses)