mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35:41 +00:00
feat(seekbar): configurable seekbar styles with animated preview
Add five seekbar styles selectable in Settings → Appearance: Waveform, Line & Dot, Bar, Thick Bar, and Segmented. Each option shows an animated canvas preview using requestAnimationFrame. Style is persisted in authStore (seekbarStyle, default: waveform). Translations added for all 7 languages. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+292
-48
@@ -1,5 +1,6 @@
|
|||||||
import React, { useEffect, useRef, useState } from 'react';
|
import React, { useEffect, useRef, useState } from 'react';
|
||||||
import { usePlayerStore } from '../store/playerStore';
|
import { usePlayerStore } from '../store/playerStore';
|
||||||
|
import { useAuthStore, type SeekbarStyle } from '../store/authStore';
|
||||||
|
|
||||||
function fmt(s: number): string {
|
function fmt(s: number): string {
|
||||||
if (!s || isNaN(s)) return '0:00';
|
if (!s || isNaN(s)) return '0:00';
|
||||||
@@ -7,6 +8,43 @@ function fmt(s: number): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const BAR_COUNT = 500;
|
const BAR_COUNT = 500;
|
||||||
|
const SEG_COUNT = 60;
|
||||||
|
|
||||||
|
// ── color helper ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function getColors() {
|
||||||
|
const s = getComputedStyle(document.documentElement);
|
||||||
|
return {
|
||||||
|
played: s.getPropertyValue('--waveform-played').trim() || s.getPropertyValue('--accent').trim() || '#cba6f7',
|
||||||
|
buffered: s.getPropertyValue('--waveform-buffered').trim() || s.getPropertyValue('--ctp-overlay0').trim() || '#6c7086',
|
||||||
|
unplayed: s.getPropertyValue('--waveform-unplayed').trim() || s.getPropertyValue('--ctp-surface1').trim() || '#313244',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── canvas setup ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function setupCanvas(
|
||||||
|
canvas: HTMLCanvasElement,
|
||||||
|
): { ctx: CanvasRenderingContext2D; w: number; h: number } | null {
|
||||||
|
const ctx = canvas.getContext('2d');
|
||||||
|
if (!ctx) return null;
|
||||||
|
const rect = canvas.getBoundingClientRect();
|
||||||
|
const w = rect.width || canvas.clientWidth;
|
||||||
|
const h = rect.height || canvas.clientHeight;
|
||||||
|
if (w === 0 || h === 0) return null;
|
||||||
|
const dpr = window.devicePixelRatio || 1;
|
||||||
|
const pw = Math.round(w * dpr);
|
||||||
|
const ph = Math.round(h * dpr);
|
||||||
|
if (canvas.width !== pw || canvas.height !== ph) {
|
||||||
|
canvas.width = pw;
|
||||||
|
canvas.height = ph;
|
||||||
|
}
|
||||||
|
ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
|
||||||
|
ctx.clearRect(0, 0, w, h);
|
||||||
|
return { ctx, w, h };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── waveform heights ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
function hashStr(str: string): number {
|
function hashStr(str: string): number {
|
||||||
let h = 0x811c9dc5;
|
let h = 0x811c9dc5;
|
||||||
@@ -17,108 +55,313 @@ function hashStr(str: string): number {
|
|||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
||||||
function makeHeights(trackId: string): Float32Array {
|
export function makeHeights(trackId: string): Float32Array {
|
||||||
let s = hashStr(trackId);
|
let s = hashStr(trackId);
|
||||||
const h = new Float32Array(BAR_COUNT);
|
const h = new Float32Array(BAR_COUNT);
|
||||||
for (let i = 0; i < BAR_COUNT; i++) {
|
for (let i = 0; i < BAR_COUNT; i++) {
|
||||||
s = (Math.imul(s, 1664525) + 1013904223) >>> 0;
|
s = (Math.imul(s, 1664525) + 1013904223) >>> 0;
|
||||||
h[i] = s / 0xffffffff;
|
h[i] = s / 0xffffffff;
|
||||||
}
|
}
|
||||||
// Smooth for an organic look
|
|
||||||
for (let pass = 0; pass < 5; pass++) {
|
for (let pass = 0; pass < 5; pass++) {
|
||||||
for (let i = 1; i < BAR_COUNT - 1; i++) {
|
for (let i = 1; i < BAR_COUNT - 1; i++) {
|
||||||
h[i] = h[i - 1] * 0.25 + h[i] * 0.5 + h[i + 1] * 0.25;
|
h[i] = h[i - 1] * 0.25 + h[i] * 0.5 + h[i + 1] * 0.25;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Normalize to [0.12, 1.0]
|
|
||||||
let max = 0;
|
let max = 0;
|
||||||
for (let i = 0; i < BAR_COUNT; i++) if (h[i] > max) max = h[i];
|
for (let i = 0; i < BAR_COUNT; i++) if (h[i] > max) max = h[i];
|
||||||
if (max > 0) {
|
if (max > 0) for (let i = 0; i < BAR_COUNT; i++) h[i] = 0.12 + (h[i] / max) * 0.88;
|
||||||
for (let i = 0; i < BAR_COUNT; i++) h[i] = 0.12 + (h[i] / max) * 0.88;
|
|
||||||
}
|
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── draw functions ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
function drawWaveform(
|
function drawWaveform(
|
||||||
canvas: HTMLCanvasElement,
|
canvas: HTMLCanvasElement,
|
||||||
heights: Float32Array | null,
|
heights: Float32Array | null,
|
||||||
progress: number,
|
progress: number,
|
||||||
buffered: number,
|
buffered: number,
|
||||||
) {
|
) {
|
||||||
const ctx = canvas.getContext('2d');
|
const r = setupCanvas(canvas);
|
||||||
if (!ctx) return;
|
if (!r) return;
|
||||||
|
const { ctx, w, h } = r;
|
||||||
const rect = canvas.getBoundingClientRect();
|
const { played, buffered: buffCol, unplayed } = getColors();
|
||||||
const w = rect.width || canvas.clientWidth;
|
|
||||||
const h = rect.height || canvas.clientHeight;
|
|
||||||
if (w === 0 || h === 0) return;
|
|
||||||
|
|
||||||
const dpr = window.devicePixelRatio || 1;
|
|
||||||
const pw = Math.round(w * dpr);
|
|
||||||
const ph = Math.round(h * dpr);
|
|
||||||
if (canvas.width !== pw || canvas.height !== ph) {
|
|
||||||
canvas.width = pw;
|
|
||||||
canvas.height = ph;
|
|
||||||
}
|
|
||||||
ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
|
|
||||||
ctx.clearRect(0, 0, w, h);
|
|
||||||
|
|
||||||
const style = getComputedStyle(document.documentElement);
|
|
||||||
const colorAccent = style.getPropertyValue('--waveform-played').trim() || style.getPropertyValue('--accent').trim() || '#cba6f7';
|
|
||||||
const colorBuffered = style.getPropertyValue('--waveform-buffered').trim() || style.getPropertyValue('--ctp-overlay0').trim() || '#6c7086';
|
|
||||||
const colorUnplayed = style.getPropertyValue('--waveform-unplayed').trim() || style.getPropertyValue('--ctp-surface1').trim() || '#313244';
|
|
||||||
|
|
||||||
if (!heights) {
|
if (!heights) {
|
||||||
ctx.globalAlpha = 0.3;
|
ctx.globalAlpha = 0.3;
|
||||||
ctx.fillStyle = colorUnplayed;
|
ctx.fillStyle = unplayed;
|
||||||
ctx.fillRect(0, (h - 2) / 2, w, 2);
|
ctx.fillRect(0, (h - 2) / 2, w, 2);
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use fractional x positions so adjacent bars share exact pixel boundaries — no gaps.
|
|
||||||
const x1Of = (i: number) => (i / BAR_COUNT) * w;
|
const x1Of = (i: number) => (i / BAR_COUNT) * w;
|
||||||
const x2Of = (i: number) => ((i + 1) / BAR_COUNT) * w;
|
const x2Of = (i: number) => ((i + 1) / BAR_COUNT) * w;
|
||||||
|
|
||||||
// Pass 1 — unplayed (dim)
|
|
||||||
ctx.globalAlpha = 0.28;
|
ctx.globalAlpha = 0.28;
|
||||||
ctx.fillStyle = colorUnplayed;
|
ctx.fillStyle = unplayed;
|
||||||
for (let i = 0; i < BAR_COUNT; i++) {
|
for (let i = 0; i < BAR_COUNT; i++) {
|
||||||
if (i / BAR_COUNT < buffered) continue;
|
if (i / BAR_COUNT < buffered) continue;
|
||||||
const barH = Math.max(1, heights[i] * h);
|
const bh = Math.max(1, heights[i] * h);
|
||||||
const x = x1Of(i);
|
const x = x1Of(i);
|
||||||
ctx.fillRect(x, (h - barH) / 2, x2Of(i) - x, barH);
|
ctx.fillRect(x, (h - bh) / 2, x2Of(i) - x, bh);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pass 2 — buffered (slightly brighter)
|
|
||||||
ctx.globalAlpha = 0.45;
|
ctx.globalAlpha = 0.45;
|
||||||
ctx.fillStyle = colorBuffered;
|
ctx.fillStyle = buffCol;
|
||||||
for (let i = 0; i < BAR_COUNT; i++) {
|
for (let i = 0; i < BAR_COUNT; i++) {
|
||||||
const frac = i / BAR_COUNT;
|
const frac = i / BAR_COUNT;
|
||||||
if (frac < progress || frac >= buffered) continue;
|
if (frac < progress || frac >= buffered) continue;
|
||||||
const barH = Math.max(1, heights[i] * h);
|
const bh = Math.max(1, heights[i] * h);
|
||||||
const x = x1Of(i);
|
const x = x1Of(i);
|
||||||
ctx.fillRect(x, (h - barH) / 2, x2Of(i) - x, barH);
|
ctx.fillRect(x, (h - bh) / 2, x2Of(i) - x, bh);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pass 3 — played (accent color + glow)
|
|
||||||
if (progress > 0) {
|
if (progress > 0) {
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
ctx.fillStyle = colorAccent;
|
ctx.fillStyle = played;
|
||||||
ctx.shadowColor = colorAccent;
|
ctx.shadowColor = played;
|
||||||
ctx.shadowBlur = 5;
|
ctx.shadowBlur = 5;
|
||||||
for (let i = 0; i < BAR_COUNT; i++) {
|
for (let i = 0; i < BAR_COUNT; i++) {
|
||||||
if (i / BAR_COUNT >= progress) break;
|
if (i / BAR_COUNT >= progress) break;
|
||||||
const barH = Math.max(1, heights[i] * h);
|
const bh = Math.max(1, heights[i] * h);
|
||||||
const x = x1Of(i);
|
const x = x1Of(i);
|
||||||
ctx.fillRect(x, (h - barH) / 2, x2Of(i) - x, barH);
|
ctx.fillRect(x, (h - bh) / 2, x2Of(i) - x, bh);
|
||||||
}
|
}
|
||||||
ctx.shadowBlur = 0;
|
ctx.shadowBlur = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function drawLineDot(canvas: HTMLCanvasElement, progress: number, buffered: number) {
|
||||||
|
const r = setupCanvas(canvas);
|
||||||
|
if (!r) return;
|
||||||
|
const { ctx, w, h } = r;
|
||||||
|
const { played, buffered: buffCol, unplayed } = getColors();
|
||||||
|
const cy = h / 2;
|
||||||
|
const lh = 2;
|
||||||
|
const dotR = 5;
|
||||||
|
|
||||||
|
ctx.globalAlpha = 0.35;
|
||||||
|
ctx.fillStyle = unplayed;
|
||||||
|
ctx.fillRect(0, cy - lh / 2, w, lh);
|
||||||
|
|
||||||
|
if (buffered > 0) {
|
||||||
|
ctx.globalAlpha = 0.55;
|
||||||
|
ctx.fillStyle = buffCol;
|
||||||
|
ctx.fillRect(0, cy - lh / 2, buffered * w, lh);
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
ctx.fillStyle = played;
|
||||||
|
ctx.fillRect(0, cy - lh / 2, progress * w, lh);
|
||||||
|
|
||||||
|
const dx = Math.max(dotR, Math.min(w - dotR, progress * w));
|
||||||
|
ctx.shadowColor = played;
|
||||||
|
ctx.shadowBlur = 7;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.arc(dx, cy, dotR, 0, Math.PI * 2);
|
||||||
|
ctx.fillStyle = played;
|
||||||
|
ctx.fill();
|
||||||
|
ctx.shadowBlur = 0;
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawBar(canvas: HTMLCanvasElement, progress: number, buffered: number) {
|
||||||
|
const r = setupCanvas(canvas);
|
||||||
|
if (!r) return;
|
||||||
|
const { ctx, w, h } = r;
|
||||||
|
const { played, buffered: buffCol, unplayed } = getColors();
|
||||||
|
const bh = 4;
|
||||||
|
const rad = bh / 2;
|
||||||
|
const y = (h - bh) / 2;
|
||||||
|
|
||||||
|
ctx.globalAlpha = 0.3;
|
||||||
|
ctx.fillStyle = unplayed;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(0, y, w, bh, rad);
|
||||||
|
ctx.fill();
|
||||||
|
|
||||||
|
if (buffered > 0) {
|
||||||
|
ctx.globalAlpha = 0.5;
|
||||||
|
ctx.fillStyle = buffCol;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(0, y, buffered * w, bh, rad);
|
||||||
|
ctx.fill();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (progress > 0) {
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
ctx.fillStyle = played;
|
||||||
|
ctx.shadowColor = played;
|
||||||
|
ctx.shadowBlur = 5;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(0, y, progress * w, bh, rad);
|
||||||
|
ctx.fill();
|
||||||
|
ctx.shadowBlur = 0;
|
||||||
|
}
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawThick(canvas: HTMLCanvasElement, progress: number, buffered: number) {
|
||||||
|
const r = setupCanvas(canvas);
|
||||||
|
if (!r) return;
|
||||||
|
const { ctx, w, h } = r;
|
||||||
|
const { played, buffered: buffCol, unplayed } = getColors();
|
||||||
|
const bh = Math.min(14, h);
|
||||||
|
const rad = bh / 2;
|
||||||
|
const y = (h - bh) / 2;
|
||||||
|
|
||||||
|
ctx.globalAlpha = 0.25;
|
||||||
|
ctx.fillStyle = unplayed;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(0, y, w, bh, rad);
|
||||||
|
ctx.fill();
|
||||||
|
|
||||||
|
if (buffered > 0) {
|
||||||
|
ctx.globalAlpha = 0.45;
|
||||||
|
ctx.fillStyle = buffCol;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(0, y, buffered * w, bh, rad);
|
||||||
|
ctx.fill();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (progress > 0) {
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
ctx.fillStyle = played;
|
||||||
|
ctx.shadowColor = played;
|
||||||
|
ctx.shadowBlur = 10;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(0, y, progress * w, bh, rad);
|
||||||
|
ctx.fill();
|
||||||
|
ctx.shadowBlur = 0;
|
||||||
|
}
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawSegmented(canvas: HTMLCanvasElement, progress: number, buffered: number) {
|
||||||
|
const r = setupCanvas(canvas);
|
||||||
|
if (!r) return;
|
||||||
|
const { ctx, w, h } = r;
|
||||||
|
const { played, buffered: buffCol, unplayed } = getColors();
|
||||||
|
const gap = 2;
|
||||||
|
const segW = (w - gap * (SEG_COUNT - 1)) / SEG_COUNT;
|
||||||
|
const segH = h * 0.65;
|
||||||
|
const y = (h - segH) / 2;
|
||||||
|
const playedIdx = Math.floor(progress * SEG_COUNT);
|
||||||
|
|
||||||
|
for (let i = 0; i < SEG_COUNT; i++) {
|
||||||
|
const frac = i / SEG_COUNT;
|
||||||
|
const x = i * (segW + gap);
|
||||||
|
ctx.shadowBlur = 0;
|
||||||
|
if (frac < progress) {
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
ctx.fillStyle = played;
|
||||||
|
if (i === playedIdx - 1) {
|
||||||
|
ctx.shadowColor = played;
|
||||||
|
ctx.shadowBlur = 5;
|
||||||
|
}
|
||||||
|
} else if (frac < buffered) {
|
||||||
|
ctx.globalAlpha = 0.55;
|
||||||
|
ctx.fillStyle = buffCol;
|
||||||
|
} else {
|
||||||
|
ctx.globalAlpha = 0.28;
|
||||||
|
ctx.fillStyle = unplayed;
|
||||||
|
}
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.roundRect(x, y, Math.max(1, segW), segH, 1);
|
||||||
|
ctx.fill();
|
||||||
|
}
|
||||||
|
ctx.shadowBlur = 0;
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── dispatcher ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
export function drawSeekbar(
|
||||||
|
canvas: HTMLCanvasElement,
|
||||||
|
style: SeekbarStyle,
|
||||||
|
heights: Float32Array | null,
|
||||||
|
progress: number,
|
||||||
|
buffered: number,
|
||||||
|
) {
|
||||||
|
switch (style) {
|
||||||
|
case 'waveform': drawWaveform(canvas, heights, progress, buffered); break;
|
||||||
|
case 'linedot': drawLineDot(canvas, progress, buffered); break;
|
||||||
|
case 'bar': drawBar(canvas, progress, buffered); break;
|
||||||
|
case 'thick': drawThick(canvas, progress, buffered); break;
|
||||||
|
case 'segmented': drawSegmented(canvas, progress, buffered); break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── SeekbarPreview (animated, for Settings) ───────────────────────────────────
|
||||||
|
|
||||||
|
export function SeekbarPreview({
|
||||||
|
style,
|
||||||
|
label,
|
||||||
|
selected,
|
||||||
|
onClick,
|
||||||
|
}: {
|
||||||
|
style: SeekbarStyle;
|
||||||
|
label: string;
|
||||||
|
selected: boolean;
|
||||||
|
onClick: () => void;
|
||||||
|
}) {
|
||||||
|
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||||
|
const rafRef = useRef<number | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const canvas = canvasRef.current;
|
||||||
|
if (!canvas) return;
|
||||||
|
const heights = style === 'waveform' ? makeHeights('seekbar-preview-demo') : null;
|
||||||
|
let t = 0;
|
||||||
|
const tick = () => {
|
||||||
|
t += 0.012;
|
||||||
|
const progress = 0.15 + 0.65 * (0.5 + 0.5 * Math.sin(t));
|
||||||
|
const buffered = Math.min(1, progress + 0.18);
|
||||||
|
drawSeekbar(canvas, style, heights, progress, buffered);
|
||||||
|
rafRef.current = requestAnimationFrame(tick);
|
||||||
|
};
|
||||||
|
rafRef.current = requestAnimationFrame(tick);
|
||||||
|
return () => { if (rafRef.current !== null) cancelAnimationFrame(rafRef.current); };
|
||||||
|
}, [style]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
onClick={onClick}
|
||||||
|
style={{
|
||||||
|
border: `2px solid ${selected ? 'var(--accent)' : 'var(--ctp-surface1)'}`,
|
||||||
|
borderRadius: 8,
|
||||||
|
background: selected
|
||||||
|
? 'color-mix(in srgb, var(--accent) 12%, transparent)'
|
||||||
|
: 'var(--bg-card, var(--ctp-base))',
|
||||||
|
padding: '10px 12px 8px',
|
||||||
|
cursor: 'pointer',
|
||||||
|
width: 130,
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
gap: 6,
|
||||||
|
alignItems: 'stretch',
|
||||||
|
transition: 'border-color 0.15s, background 0.15s',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<canvas
|
||||||
|
ref={canvasRef}
|
||||||
|
style={{ width: '100%', height: 24, display: 'block' }}
|
||||||
|
/>
|
||||||
|
<span style={{
|
||||||
|
fontSize: 11,
|
||||||
|
color: selected ? 'var(--accent)' : 'var(--text-secondary)',
|
||||||
|
textAlign: 'center',
|
||||||
|
fontWeight: selected ? 600 : 400,
|
||||||
|
}}>
|
||||||
|
{label}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── main component ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
trackId: string | undefined;
|
trackId: string | undefined;
|
||||||
}
|
}
|
||||||
@@ -136,6 +379,7 @@ export default function WaveformSeek({ trackId }: Props) {
|
|||||||
const buffered = usePlayerStore(s => s.buffered);
|
const buffered = usePlayerStore(s => s.buffered);
|
||||||
const seek = usePlayerStore(s => s.seek);
|
const seek = usePlayerStore(s => s.seek);
|
||||||
const duration = usePlayerStore(s => s.currentTrack?.duration ?? 0);
|
const duration = usePlayerStore(s => s.currentTrack?.duration ?? 0);
|
||||||
|
const seekbarStyle = useAuthStore(s => s.seekbarStyle);
|
||||||
|
|
||||||
progressRef.current = progress;
|
progressRef.current = progress;
|
||||||
bufferedRef.current = buffered;
|
bufferedRef.current = buffered;
|
||||||
@@ -146,19 +390,19 @@ export default function WaveformSeek({ trackId }: Props) {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (canvasRef.current) {
|
if (canvasRef.current) {
|
||||||
drawWaveform(canvasRef.current, heightsRef.current, progress, buffered);
|
drawSeekbar(canvasRef.current, seekbarStyle, heightsRef.current, progress, buffered);
|
||||||
}
|
}
|
||||||
}, [progress, buffered, trackId]);
|
}, [progress, buffered, trackId, seekbarStyle]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const canvas = canvasRef.current;
|
const canvas = canvasRef.current;
|
||||||
if (!canvas) return;
|
if (!canvas) return;
|
||||||
const ro = new ResizeObserver(() => {
|
const ro = new ResizeObserver(() => {
|
||||||
drawWaveform(canvas, heightsRef.current, progressRef.current, bufferedRef.current);
|
drawSeekbar(canvas, seekbarStyle, heightsRef.current, progressRef.current, bufferedRef.current);
|
||||||
});
|
});
|
||||||
ro.observe(canvas);
|
ro.observe(canvas);
|
||||||
return () => ro.disconnect();
|
return () => ro.disconnect();
|
||||||
}, []);
|
}, [seekbarStyle]);
|
||||||
|
|
||||||
const trackIdRef = useRef(trackId);
|
const trackIdRef = useRef(trackId);
|
||||||
trackIdRef.current = trackId;
|
trackIdRef.current = trackId;
|
||||||
|
|||||||
@@ -543,6 +543,13 @@ export const deTranslation = {
|
|||||||
infiniteQueue: 'Endlose Warteschlange',
|
infiniteQueue: 'Endlose Warteschlange',
|
||||||
infiniteQueueDesc: 'Automatisch Zufallstitel anhängen wenn die Warteschlange leer wird',
|
infiniteQueueDesc: 'Automatisch Zufallstitel anhängen wenn die Warteschlange leer wird',
|
||||||
experimental: 'Experimentell',
|
experimental: 'Experimentell',
|
||||||
|
seekbarStyle: 'Seekbar-Stil',
|
||||||
|
seekbarStyleDesc: 'Aussehen der Wiedergabe-Seekbar auswählen',
|
||||||
|
seekbarWaveform: 'Wellenform',
|
||||||
|
seekbarLinedot: 'Linie & Punkt',
|
||||||
|
seekbarBar: 'Balken',
|
||||||
|
seekbarThick: 'Dicker Balken',
|
||||||
|
seekbarSegmented: 'Segmentiert',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: 'Was ist neu',
|
modalTitle: 'Was ist neu',
|
||||||
|
|||||||
@@ -544,6 +544,13 @@ export const enTranslation = {
|
|||||||
infiniteQueue: 'Infinite Queue',
|
infiniteQueue: 'Infinite Queue',
|
||||||
infiniteQueueDesc: 'Automatically append random tracks when the queue runs out',
|
infiniteQueueDesc: 'Automatically append random tracks when the queue runs out',
|
||||||
experimental: 'Experimental',
|
experimental: 'Experimental',
|
||||||
|
seekbarStyle: 'Seekbar Style',
|
||||||
|
seekbarStyleDesc: 'Choose the look of the player seek bar',
|
||||||
|
seekbarWaveform: 'Waveform',
|
||||||
|
seekbarLinedot: 'Line & Dot',
|
||||||
|
seekbarBar: 'Bar',
|
||||||
|
seekbarThick: 'Thick Bar',
|
||||||
|
seekbarSegmented: 'Segmented',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: "What's New",
|
modalTitle: "What's New",
|
||||||
|
|||||||
@@ -541,6 +541,13 @@ export const frTranslation = {
|
|||||||
infiniteQueue: 'File infinie',
|
infiniteQueue: 'File infinie',
|
||||||
infiniteQueueDesc: 'Ajouter automatiquement des morceaux aléatoires quand la file est épuisée',
|
infiniteQueueDesc: 'Ajouter automatiquement des morceaux aléatoires quand la file est épuisée',
|
||||||
experimental: 'Expérimental',
|
experimental: 'Expérimental',
|
||||||
|
seekbarStyle: 'Style de la barre de lecture',
|
||||||
|
seekbarStyleDesc: 'Choisir l\'apparence de la barre de progression',
|
||||||
|
seekbarWaveform: 'Forme d\'onde',
|
||||||
|
seekbarLinedot: 'Ligne & point',
|
||||||
|
seekbarBar: 'Barre',
|
||||||
|
seekbarThick: 'Barre épaisse',
|
||||||
|
seekbarSegmented: 'Segmentée',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: 'Quoi de neuf',
|
modalTitle: 'Quoi de neuf',
|
||||||
|
|||||||
@@ -540,6 +540,13 @@ export const nbTranslation = {
|
|||||||
preloadEarly: 'Tidlig (etter 5 s avspilling)',
|
preloadEarly: 'Tidlig (etter 5 s avspilling)',
|
||||||
preloadCustom: 'Egendefinert',
|
preloadCustom: 'Egendefinert',
|
||||||
preloadCustomSeconds: 'Sekunder før slutt: {{n}}',
|
preloadCustomSeconds: 'Sekunder før slutt: {{n}}',
|
||||||
|
seekbarStyle: 'Søkefelt-stil',
|
||||||
|
seekbarStyleDesc: 'Velg utseendet på avspillingssøkefeltet',
|
||||||
|
seekbarWaveform: 'Bølgeform',
|
||||||
|
seekbarLinedot: 'Linje & punkt',
|
||||||
|
seekbarBar: 'Linje',
|
||||||
|
seekbarThick: 'Tykk linje',
|
||||||
|
seekbarSegmented: 'Segmentert',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: "Nyheter",
|
modalTitle: "Nyheter",
|
||||||
|
|||||||
@@ -541,6 +541,13 @@ export const nlTranslation = {
|
|||||||
infiniteQueue: 'Oneindige wachtrij',
|
infiniteQueue: 'Oneindige wachtrij',
|
||||||
infiniteQueueDesc: 'Automatisch willekeurige nummers toevoegen als de wachtrij leeg raakt',
|
infiniteQueueDesc: 'Automatisch willekeurige nummers toevoegen als de wachtrij leeg raakt',
|
||||||
experimental: 'Experimenteel',
|
experimental: 'Experimenteel',
|
||||||
|
seekbarStyle: 'Zoekbalkstijl',
|
||||||
|
seekbarStyleDesc: 'Kies het uiterlijk van de afspeelbalk',
|
||||||
|
seekbarWaveform: 'Golfvorm',
|
||||||
|
seekbarLinedot: 'Lijn & punt',
|
||||||
|
seekbarBar: 'Balk',
|
||||||
|
seekbarThick: 'Dikke balk',
|
||||||
|
seekbarSegmented: 'Gesegmenteerd',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: 'Wat is nieuw',
|
modalTitle: 'Wat is nieuw',
|
||||||
|
|||||||
@@ -564,6 +564,13 @@ export const ruTranslation = {
|
|||||||
infiniteQueue: 'Бесконечная очередь',
|
infiniteQueue: 'Бесконечная очередь',
|
||||||
infiniteQueueDesc: 'Подмешивать случайные треки, когда очередь закончится',
|
infiniteQueueDesc: 'Подмешивать случайные треки, когда очередь закончится',
|
||||||
experimental: 'Экспериментально',
|
experimental: 'Экспериментально',
|
||||||
|
seekbarStyle: 'Стиль прогресс-бара',
|
||||||
|
seekbarStyleDesc: 'Выбор внешнего вида полосы воспроизведения',
|
||||||
|
seekbarWaveform: 'Форма волны',
|
||||||
|
seekbarLinedot: 'Линия и точка',
|
||||||
|
seekbarBar: 'Полоса',
|
||||||
|
seekbarThick: 'Толстая полоса',
|
||||||
|
seekbarSegmented: 'Сегменты',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: 'Что нового',
|
modalTitle: 'Что нового',
|
||||||
|
|||||||
@@ -537,6 +537,13 @@ export const zhTranslation = {
|
|||||||
infiniteQueue: '无限队列',
|
infiniteQueue: '无限队列',
|
||||||
infiniteQueueDesc: '队列播完时自动追加随机曲目',
|
infiniteQueueDesc: '队列播完时自动追加随机曲目',
|
||||||
experimental: '实验性',
|
experimental: '实验性',
|
||||||
|
seekbarStyle: '进度条样式',
|
||||||
|
seekbarStyleDesc: '选择播放进度条的外观',
|
||||||
|
seekbarWaveform: '波形',
|
||||||
|
seekbarLinedot: '线条与点',
|
||||||
|
seekbarBar: '条形',
|
||||||
|
seekbarThick: '粗条形',
|
||||||
|
seekbarSegmented: '分段式',
|
||||||
},
|
},
|
||||||
changelog: {
|
changelog: {
|
||||||
modalTitle: '新功能',
|
modalTitle: '新功能',
|
||||||
|
|||||||
+25
-1
@@ -18,7 +18,8 @@ import { lastfmGetToken, lastfmAuthUrl, lastfmGetSession, lastfmGetUserInfo, Las
|
|||||||
import LastfmIcon from '../components/LastfmIcon';
|
import LastfmIcon from '../components/LastfmIcon';
|
||||||
import CustomSelect from '../components/CustomSelect';
|
import CustomSelect from '../components/CustomSelect';
|
||||||
import ThemePicker from '../components/ThemePicker';
|
import ThemePicker from '../components/ThemePicker';
|
||||||
import { useAuthStore, ServerProfile } from '../store/authStore';
|
import { useAuthStore, ServerProfile, type SeekbarStyle } from '../store/authStore';
|
||||||
|
import { SeekbarPreview } from '../components/WaveformSeek';
|
||||||
import { IS_LINUX } from '../utils/platform';
|
import { IS_LINUX } from '../utils/platform';
|
||||||
import { useThemeStore } from '../store/themeStore';
|
import { useThemeStore } from '../store/themeStore';
|
||||||
import { useFontStore, FontId } from '../store/fontStore';
|
import { useFontStore, FontId } from '../store/fontStore';
|
||||||
@@ -1147,6 +1148,29 @@ export default function Settings() {
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section className="settings-section">
|
||||||
|
<div className="settings-section-header">
|
||||||
|
<Sliders size={18} />
|
||||||
|
<h2>{t('settings.seekbarStyle')}</h2>
|
||||||
|
</div>
|
||||||
|
<div className="settings-card">
|
||||||
|
<div style={{ fontSize: 12, color: 'var(--text-muted)', marginBottom: '0.75rem' }}>
|
||||||
|
{t('settings.seekbarStyleDesc')}
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', flexWrap: 'wrap', gap: 10 }}>
|
||||||
|
{(['waveform', 'linedot', 'bar', 'thick', 'segmented'] as SeekbarStyle[]).map(style => (
|
||||||
|
<SeekbarPreview
|
||||||
|
key={style}
|
||||||
|
style={style}
|
||||||
|
label={t(`settings.seekbar${style.charAt(0).toUpperCase() + style.slice(1)}` as any)}
|
||||||
|
selected={auth.seekbarStyle === style}
|
||||||
|
onClick={() => auth.setSeekbarStyle(style)}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
<SidebarCustomizer />
|
<SidebarCustomizer />
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ export interface ServerProfile {
|
|||||||
password: string;
|
password: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type SeekbarStyle = 'waveform' | 'linedot' | 'bar' | 'thick' | 'segmented';
|
||||||
|
|
||||||
interface AuthState {
|
interface AuthState {
|
||||||
// Multi-server
|
// Multi-server
|
||||||
servers: ServerProfile[];
|
servers: ServerProfile[];
|
||||||
@@ -49,6 +51,8 @@ interface AuthState {
|
|||||||
showChangelogOnUpdate: boolean;
|
showChangelogOnUpdate: boolean;
|
||||||
lastSeenChangelogVersion: string;
|
lastSeenChangelogVersion: string;
|
||||||
|
|
||||||
|
seekbarStyle: SeekbarStyle;
|
||||||
|
|
||||||
/** Alpha: native hi-res sample rate output (disabled = safe 44.1 kHz mode) */
|
/** Alpha: native hi-res sample rate output (disabled = safe 44.1 kHz mode) */
|
||||||
enableHiRes: boolean;
|
enableHiRes: boolean;
|
||||||
|
|
||||||
@@ -112,6 +116,7 @@ interface AuthState {
|
|||||||
setShowFullscreenLyrics: (v: boolean) => void;
|
setShowFullscreenLyrics: (v: boolean) => void;
|
||||||
setShowChangelogOnUpdate: (v: boolean) => void;
|
setShowChangelogOnUpdate: (v: boolean) => void;
|
||||||
setLastSeenChangelogVersion: (v: string) => void;
|
setLastSeenChangelogVersion: (v: string) => void;
|
||||||
|
setSeekbarStyle: (v: SeekbarStyle) => void;
|
||||||
setEnableHiRes: (v: boolean) => void;
|
setEnableHiRes: (v: boolean) => void;
|
||||||
setHotCacheEnabled: (v: boolean) => void;
|
setHotCacheEnabled: (v: boolean) => void;
|
||||||
setHotCacheMaxMb: (v: number) => void;
|
setHotCacheMaxMb: (v: number) => void;
|
||||||
@@ -164,6 +169,7 @@ export const useAuthStore = create<AuthState>()(
|
|||||||
showFullscreenLyrics: true,
|
showFullscreenLyrics: true,
|
||||||
showChangelogOnUpdate: true,
|
showChangelogOnUpdate: true,
|
||||||
lastSeenChangelogVersion: '',
|
lastSeenChangelogVersion: '',
|
||||||
|
seekbarStyle: 'waveform',
|
||||||
enableHiRes: false,
|
enableHiRes: false,
|
||||||
hotCacheEnabled: false,
|
hotCacheEnabled: false,
|
||||||
hotCacheMaxMb: 256,
|
hotCacheMaxMb: 256,
|
||||||
@@ -250,6 +256,7 @@ export const useAuthStore = create<AuthState>()(
|
|||||||
setShowChangelogOnUpdate: (v) => set({ showChangelogOnUpdate: v }),
|
setShowChangelogOnUpdate: (v) => set({ showChangelogOnUpdate: v }),
|
||||||
setLastSeenChangelogVersion: (v) => set({ lastSeenChangelogVersion: v }),
|
setLastSeenChangelogVersion: (v) => set({ lastSeenChangelogVersion: v }),
|
||||||
|
|
||||||
|
setSeekbarStyle: (v) => set({ seekbarStyle: v }),
|
||||||
setEnableHiRes: (v) => set({ enableHiRes: v }),
|
setEnableHiRes: (v) => set({ enableHiRes: v }),
|
||||||
setHotCacheEnabled: (v) => set({ hotCacheEnabled: v }),
|
setHotCacheEnabled: (v) => set({ hotCacheEnabled: v }),
|
||||||
setHotCacheMaxMb: (v) => set({ hotCacheMaxMb: v }),
|
setHotCacheMaxMb: (v) => set({ hotCacheMaxMb: v }),
|
||||||
|
|||||||
Reference in New Issue
Block a user