refactor: cleanup

This commit is contained in:
2023-11-15 01:46:23 +01:00
parent c5d9defc9d
commit 561300de64
10 changed files with 33 additions and 69 deletions

View File

@@ -1,13 +1,10 @@
<script lang="ts">
import {deviceLayout, serialPort} from "$lib/serial/connection"
import {serialPort} from "$lib/serial/connection"
import {action} from "$lib/title"
import GenericLayout from "$lib/components/layout/GenericLayout.svelte"
import {getContext} from "svelte"
import type {Writable} from "svelte/store"
import {csvLayoutToJson, isCsvLayout} from "$lib/backup/compat/legacy-layout"
import type {CharaLayoutFile} from "$lib/share/chara-file"
export let layoutOverride: "ONE" | "LITE" | undefined = undefined
import type {VisualLayout} from "$lib/serialization/visual-layout"
$: device = $serialPort?.device ?? "ONE"
const activeLayer = getContext<Writable<number>>("active-layer")
@@ -19,20 +16,10 @@
] as const
const layouts = {
ONE: () => import("$lib/assets/layouts/one.yml"),
LITE: () => import("$lib/assets/layouts/lite.yml"),
X: () => import("$lib/assets/layouts/generic/103-key.yml"),
ONE: () => import("$lib/assets/layouts/one.yml").then(it => it.default as VisualLayout),
LITE: () => import("$lib/assets/layouts/lite.yml").then(it => it.default as VisualLayout),
X: () => import("$lib/assets/layouts/generic/103-key.yml").then(it => it.default as VisualLayout),
}
async function importLayout() {
const file = await fileInput.files?.item(0)?.text()
if (!file) return
const importedLayout = isCsvLayout(file) ? csvLayoutToJson(file) : (JSON.parse(file) as CharaLayoutFile)
if (importedLayout.type === "layout" && importedLayout.charaVersion === 1)
$deviceLayout = importedLayout.layout
}
let fileInput: HTMLInputElement
</script>
<div class="container">
@@ -49,21 +36,12 @@
{/each}
</fieldset>
{#await layouts[layoutOverride || device]() then { default: visualLayout }}
{#await layouts[device]() then visualLayout}
<GenericLayout {visualLayout} />
{/await}
</div>
<style lang="scss">
.controls {
display: grid;
grid-template-columns: 1fr auto 1fr;
align-items: center;
justify-content: center;
width: 100%;
}
.container {
display: flex;
flex-direction: column;

View File

@@ -27,26 +27,9 @@
text-align: center;
}
dialog {
min-width: 300px;
max-width: 512px;
color: var(--md-sys-color-on-background);
background: var(--md-sys-color-background);
border: none;
border-radius: 38px;
box-shadow: 0 0 48px rgba(0 0 0 / 60%);
}
.buttons {
display: flex;
justify-content: flex-end;
width: 100%;
}
dialog::backdrop {
opacity: 0.5;
background: black;
}
</style>

View File

@@ -15,7 +15,6 @@ export async function askForConfirmation(
abortTitle,
},
})
dialog.show()
let resolvePromise: (value: boolean) => void
const resultPromise = new Promise<boolean>(resolve => {