Skip to content

Commit a9e0db4

Browse files
committed
chore: update timer style schema
also update config and commandline metadata
1 parent be73085 commit a9e0db4

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

frontend/src/html/pages/settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,8 @@
864864
<button data-config-value="bar">bar</button>
865865
<button data-config-value="text">text</button>
866866
<button data-config-value="mini">mini</button>
867-
<button data-config-value="flash text">flash text</button>
868-
<button data-config-value="flash mini">flash mini</button>
867+
<button data-config-value="flash_text">flash text</button>
868+
<button data-config-value="flash_mini">flash mini</button>
869869
</div>
870870
</div>
871871
<div class="section" data-config-name="liveSpeedStyle">

frontend/src/ts/commandline/commandline-metadata.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,10 @@ export const commandlineConfigMetadata: CommandlineConfigMetadataObject = {
513513
alias: "wpm",
514514
},
515515
timerStyle: {
516-
display: "Live progress style...",
517-
subgroup: { options: "fromSchema" },
516+
subgroup: {
517+
options: "fromSchema",
518+
display: (value) => value.replaceAll(/_/g, " "),
519+
},
518520
alias: "timer",
519521
},
520522
timerColor: {

frontend/src/ts/config-metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ export const configMetadata: ConfigMetadataObject = {
463463
// appearance
464464
timerStyle: {
465465
icon: "fa-chart-pie",
466-
displayString: "timer style",
466+
displayString: "live progress style",
467467
changeRequiresRestart: false,
468468
},
469469
liveSpeedStyle: {

frontend/src/ts/test/timer-progress.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ export function show(): void {
3636
textEl.classList.remove("hidden");
3737
},
3838
});
39-
} else if (Config.timerStyle === "flash mini") {
39+
} else if (Config.timerStyle === "flash_mini") {
4040
animate(miniEl, {
4141
opacity: [0, 1],
4242
duration: applyReducedMotion(125),
4343
onBegin: () => {
4444
miniEl.classList.remove("hidden");
4545
},
4646
});
47-
} else if (Config.timerStyle === "flash text") {
47+
} else if (Config.timerStyle === "flash_text") {
4848
animate(textEl, {
4949
opacity: [0, 1],
5050
duration: applyReducedMotion(125),
@@ -140,7 +140,7 @@ export function update(): void {
140140
if (textEl !== null) {
141141
textEl.innerHTML = "<div>" + displayTime + "</div>";
142142
}
143-
} else if (Config.timerStyle === "flash mini") {
143+
} else if (Config.timerStyle === "flash_mini") {
144144
let displayTime = DateTime.secondsToString(maxtime - time);
145145
if (maxtime === 0) {
146146
displayTime = DateTime.secondsToString(time);
@@ -153,7 +153,7 @@ export function update(): void {
153153
}
154154
miniEl.innerHTML = "<div>" + displayTime + "</div>";
155155
}
156-
} else if (Config.timerStyle === "flash text") {
156+
} else if (Config.timerStyle === "flash_text") {
157157
let displayTime = DateTime.secondsToString(maxtime - time);
158158
if (maxtime === 0) {
159159
displayTime = DateTime.secondsToString(time);
@@ -203,13 +203,13 @@ export function update(): void {
203203
} else {
204204
textEl.innerHTML = `<div>${getCurrentCount()}/${outof}</div>`;
205205
}
206-
} else if (Config.timerStyle === "flash mini") {
206+
} else if (Config.timerStyle === "flash_mini") {
207207
if (outof === 0) {
208208
miniEl.innerHTML = `${TestInput.input.getHistory().length}`;
209209
} else {
210210
miniEl.innerHTML = `${getCurrentCount()}/${outof}`;
211211
}
212-
} else if (Config.timerStyle === "flash text") {
212+
} else if (Config.timerStyle === "flash_text") {
213213
if (outof === 0) {
214214
textEl.innerHTML = `<div>${TestInput.input.getHistory().length}</div>`;
215215
} else {
@@ -225,9 +225,9 @@ export function update(): void {
225225
} else if (Config.mode === "zen") {
226226
if (Config.timerStyle === "text") {
227227
textEl.innerHTML = `<div>${TestInput.input.getHistory().length}</div>`;
228-
} else if (Config.timerStyle === "flash mini") {
228+
} else if (Config.timerStyle === "flash_mini") {
229229
miniEl.innerHTML = `${TestInput.input.getHistory().length}`;
230-
} else if (Config.timerStyle === "flash text") {
230+
} else if (Config.timerStyle === "flash_text") {
231231
textEl.innerHTML = `<div>${TestInput.input.getHistory().length}</div>`;
232232
} else {
233233
miniEl.innerHTML = `${TestInput.input.getHistory().length}`;

packages/schemas/src/configs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ export const TimerStyleSchema = z.enum([
5959
"bar",
6060
"text",
6161
"mini",
62-
"flash text",
63-
"flash mini",
62+
"flash_text",
63+
"flash_mini",
6464
]);
6565
export type TimerStyle = z.infer<typeof TimerStyleSchema>;
6666

0 commit comments

Comments
 (0)