From 9cdcd0002be497b522244a070effb92fe95f1f45 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 22 Jan 2024 04:08:19 +0100 Subject: [PATCH] Refactoring: remove unused asset, further stripping of Svg.ts --- assets/svg/satellite.svg | 37 -------- scripts/generateIncludedImages.ts | 6 ++ src/UI/Base/LoginButton.svelte | 5 +- .../BigComponents/BackgroundSwitcher.svelte | 88 ------------------- src/UI/BigComponents/Histogram.ts | 16 ++-- .../BigComponents/NoThemeResultButton.svelte | 5 +- src/UI/BigComponents/ShareScreen.svelte | 3 +- src/UI/StylesheetTestGui.svelte | 9 +- 8 files changed, 26 insertions(+), 143 deletions(-) delete mode 100644 assets/svg/satellite.svg delete mode 100644 src/UI/BigComponents/BackgroundSwitcher.svelte diff --git a/assets/svg/satellite.svg b/assets/svg/satellite.svg deleted file mode 100644 index 506a593bfb..0000000000 --- a/assets/svg/satellite.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scripts/generateIncludedImages.ts b/scripts/generateIncludedImages.ts index 32fd3d917b..0521474f87 100644 --- a/scripts/generateIncludedImages.ts +++ b/scripts/generateIncludedImages.ts @@ -65,6 +65,7 @@ function genImages(dryrun = false) { "mapillary_black", "mastodon", "min", + "move", "move-arrows", "move_confirm", "move_not_allowed", @@ -77,8 +78,11 @@ function genImages(dryrun = false) { "plantnet_logo", "plus", "reload", + "resolved", "ring", "robot", + "search_disable", + "share", "SocialImageForeground", "speech_bubble", "speech_bubble_black_outline", @@ -88,8 +92,10 @@ function genImages(dryrun = false) { "star_outline", "teardrop", "teardrop_with_hole_green", + "statistics", "translate", "triangle", + "up", "Upload", "wikidata", "wikimedia-commons-white", diff --git a/src/UI/Base/LoginButton.svelte b/src/UI/Base/LoginButton.svelte index d616195a24..d582684ef9 100644 --- a/src/UI/Base/LoginButton.svelte +++ b/src/UI/Base/LoginButton.svelte @@ -2,15 +2,14 @@ import { OsmConnection } from "../../Logic/Osm/OsmConnection" import Translations from "../i18n/Translations.js" import Tr from "./Tr.svelte" - import ToSvelte from "./ToSvelte.svelte" - import Svg from "../../Svg" + import Login from "../../assets/svg/Login.svelte" export let osmConnection: OsmConnection export let clss: string | undefined = undefined - - -
-
- -
- - -
- diff --git a/src/UI/BigComponents/Histogram.ts b/src/UI/BigComponents/Histogram.ts index 2e8886061e..922aba7466 100644 --- a/src/UI/BigComponents/Histogram.ts +++ b/src/UI/BigComponents/Histogram.ts @@ -5,7 +5,9 @@ import Combine from "../Base/Combine" import { FixedUiElement } from "../Base/FixedUiElement" import { Utils } from "../../Utils" import BaseUIElement from "../BaseUIElement" -import Svg from "../../Svg" +import SvelteUIElement from "../Base/SvelteUIElement" +import Up from "../../assets/svg/Up.svelte" +import Circle from "../../assets/svg/Circle.svelte" export default class Histogram extends VariableUiElement { private static defaultPalette = [ @@ -34,11 +36,11 @@ export default class Histogram extends VariableUiElement { sortMode.map((m) => { switch (m) { case "name": - return Svg.up_svg() + return new SvelteUIElement(Up) case "name-rev": - return Svg.up_svg().SetStyle("transform: rotate(180deg)") + return new SvelteUIElement(Up).SetStyle("transform: rotate(180deg)") default: - return Svg.circle_svg() + return new SvelteUIElement(Circle) } }) ) @@ -56,11 +58,11 @@ export default class Histogram extends VariableUiElement { sortMode.map((m) => { switch (m) { case "count": - return Svg.up_svg() + return new SvelteUIElement(Up) case "count-rev": - return Svg.up_svg().SetStyle("transform: rotate(180deg)") + return new SvelteUIElement(Up).SetStyle("transform: rotate(180deg)") default: - return Svg.circle_svg() + return new SvelteUIElement(Circle) } }) ) diff --git a/src/UI/BigComponents/NoThemeResultButton.svelte b/src/UI/BigComponents/NoThemeResultButton.svelte index 2b83ca1d06..9496532b55 100644 --- a/src/UI/BigComponents/NoThemeResultButton.svelte +++ b/src/UI/BigComponents/NoThemeResultButton.svelte @@ -17,6 +17,7 @@ import ToSvelte from "../Base/ToSvelte.svelte" import Translations from "../i18n/Translations" import Tr from "../Base/Tr.svelte" + import Search_disable from "../../assets/svg/Search_disable.svelte" export let search: UIEventSource @@ -27,8 +28,8 @@
{t.noMatchingThemes.toString()}
diff --git a/src/UI/BigComponents/ShareScreen.svelte b/src/UI/BigComponents/ShareScreen.svelte index 598833800a..eff7d66cc0 100644 --- a/src/UI/BigComponents/ShareScreen.svelte +++ b/src/UI/BigComponents/ShareScreen.svelte @@ -14,6 +14,7 @@ import Svg from "../../Svg" import ToSvelte from "../Base/ToSvelte.svelte" import { DocumentDuplicateIcon } from "@rgossiaux/svelte-heroicons/outline" + import Share from "../../assets/svg/Share.svelte" export let state: ThemeViewState const tr = Translations.t.general.sharescreen @@ -73,7 +74,7 @@
{#if typeof navigator?.share === "function"} {/if} {#if navigator.clipboard !== undefined} diff --git a/src/UI/StylesheetTestGui.svelte b/src/UI/StylesheetTestGui.svelte index 49166fb08a..382ddf09c7 100644 --- a/src/UI/StylesheetTestGui.svelte +++ b/src/UI/StylesheetTestGui.svelte @@ -1,8 +1,7 @@
@@ -23,7 +22,7 @@
Some important information
Thank you! Operation successful
- + Loading...
@@ -92,7 +91,7 @@
Some important information
Thank you! Operation successful
- + Loading...
@@ -134,7 +133,7 @@
Some important information
Thank you! Operation successful
- + Loading...