From 0b9c27eaaf2cc529d2f8ce8965ba06ff51664f8b Mon Sep 17 00:00:00 2001 From: meowarex Date: Wed, 13 Aug 2025 21:14:32 +1000 Subject: [PATCH] Cleanup --- plugins/colorama-lyrics-luna/src/Settings.tsx | 20 ++----------------- plugins/colorama-lyrics-luna/src/index.ts | 9 +++------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/plugins/colorama-lyrics-luna/src/Settings.tsx b/plugins/colorama-lyrics-luna/src/Settings.tsx index d6139a1..7692f90 100644 --- a/plugins/colorama-lyrics-luna/src/Settings.tsx +++ b/plugins/colorama-lyrics-luna/src/Settings.tsx @@ -1,5 +1,5 @@ import { ReactiveStore } from "@luna/core"; -import { LunaSettings, LunaNumberSetting, LunaSwitchSetting, LunaTextSetting } from "@luna/ui"; +import { LunaSettings, LunaSwitchSetting } from "@luna/ui"; import React from "react"; export type ColoramaMode = "single" | "gradient-experimental" | "cover" | "cover-gradient"; @@ -38,8 +38,7 @@ export const Settings = () => { const [activeEndpoint, setActiveEndpoint] = React.useState<'single' | 'start' | 'end'>('single'); const AnySwitch = LunaSwitchSetting as unknown as React.ComponentType; - // Helpers for HEX parsing and alpha extraction - const clamp = (n: number, min: number, max: number) => Math.max(min, Math.min(max, n)); + // Helper for HEX normalization const normalizeToRGB = (hex: string, fallback: string = "#FFFFFF"): string => { let v = hex.trim().toLowerCase(); if (!v.startsWith('#')) v = `#${v}`; @@ -61,19 +60,6 @@ export const Settings = () => { if (/^#([0-9a-f]{6})$/.test(v)) return v.toUpperCase(); return fallback; }; - const extractAlphaPercent = (hex: string, fallbackPercent: number = 100): number => { - let v = hex.trim().toLowerCase(); - if (!v.startsWith('#')) v = `#${v}`; - if (/^#([0-9a-f]{4})$/.test(v)) { - const a = v[4]; - return Math.round((parseInt(a + a, 16) / 255) * 100); - } - if (/^#([0-9a-f]{8})$/.test(v)) { - const a = v.slice(1, 3); - return Math.round((parseInt(a, 16) / 255) * 100); - } - return fallbackPercent; - }; const colorPresets = [ "#FFFFFF", "#FF0000", "#00FF00", "#0000FF", "#FFFF00", "#FF00FF", "#00FFFF", @@ -220,8 +206,6 @@ export const Settings = () => { - {/* Rainbow mode removed */} - {/* Modal for picking and managing colors (reused) */} {shouldRender && ( <> diff --git a/plugins/colorama-lyrics-luna/src/index.ts b/plugins/colorama-lyrics-luna/src/index.ts index 0fa3c43..23b82cf 100644 --- a/plugins/colorama-lyrics-luna/src/index.ts +++ b/plugins/colorama-lyrics-luna/src/index.ts @@ -1,4 +1,3 @@ -// NOTE: definition duplicated earlier accidentally; keep this single definition below import { LunaUnload, Tracer } from "@luna/core"; import { StyleTag, PlayState } from "@luna/lib"; import { settings, Settings } from "./Settings"; @@ -10,7 +9,7 @@ export { Settings }; export const unloads = new Set(); -const styleTag = new StyleTag("ColoramaLyrics", unloads, styles); +new StyleTag("ColoramaLyrics", unloads, styles); // Simple dominant color extraction from current cover art async function getCoverArtElement(): Promise { @@ -64,7 +63,7 @@ function getDominantColorsFromImage(img: HTMLImageElement, count: number = 2): s } } -// Utilities to build rgba() from hex + alpha percentage +// build rgba() from hex + alpha percentage function hexToRgb(hex: string): { r: number; g: number; b: number } | null { let v = hex.trim(); if (!v.startsWith('#')) v = `#${v}`; @@ -193,7 +192,7 @@ function observeTrackChanges(): void { setTimeout(() => applyColoramaLyrics(), 200); observeTrackChanges(); -// Ensure compatibility: re-apply after Radiant updates its styles/backgrounds +// for some reason, re-apply after Radiant updates its styles/backgrounds function hookRadiantUpdates(): void { const w = window as any; const wrap = (name: string) => { @@ -217,6 +216,4 @@ function hookRadiantUpdates(): void { setTimeout(() => hookRadiantUpdates(), 0); -// Rainbow mode removed -