feat(web,flutter): #401 — now-playing highlight on TrackRow + PlaylistTrackRow
Cross-platform consistency: when a track is currently playing, its row on the album / liked / history / search / playlist detail surfaces gets the same accent-border + bg-lift treatment that QueueTrackRow applies on the queue panel. Closes the inconsistency caught during the #375 DRY audit (the queue row had a "you are here" indicator; other track-row surfaces did not). Web — TrackRow.svelte + PlaylistTrackRow.svelte: isCurrent = player.current?.id === track.id → border-l-2 border-l-accent bg-surface-hover when true. PlaylistTrackRow additionally gates on !isUnavailable so deleted rows never match a phantom playing id. Flutter — TrackRow + _PlaylistTrackRow: TrackRow becomes a ConsumerWidget, watches mediaItemProvider, and wraps its InkWell in a Container whose BoxDecoration carries the fs.iron background + 2px fs.accent left border when current. Title text also shifts to fs.accent and FontWeight.w500. Same pattern for _PlaylistTrackRow. No "Now playing" pill on these surfaces — the player bar already names the track, so the accent band alone reads as enough cue. For #401 / #356 umbrella. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
|
||||||
import '../../models/track.dart';
|
import '../../models/track.dart';
|
||||||
|
import '../../player/player_provider.dart';
|
||||||
import '../../shared/widgets/track_actions/track_actions_button.dart';
|
import '../../shared/widgets/track_actions/track_actions_button.dart';
|
||||||
import '../../theme/theme_extension.dart';
|
import '../../theme/theme_extension.dart';
|
||||||
import 'cached_indicator.dart';
|
import 'cached_indicator.dart';
|
||||||
|
|
||||||
class TrackRow extends StatelessWidget {
|
class TrackRow extends ConsumerWidget {
|
||||||
const TrackRow({
|
const TrackRow({
|
||||||
required this.track,
|
required this.track,
|
||||||
required this.onTap,
|
required this.onTap,
|
||||||
@@ -23,56 +25,75 @@ class TrackRow extends StatelessWidget {
|
|||||||
final bool actions;
|
final bool actions;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final fs = Theme.of(context).extension<FabledSwordTheme>()!;
|
final fs = Theme.of(context).extension<FabledSwordTheme>()!;
|
||||||
final mins = (track.durationSec ~/ 60).toString().padLeft(2, '0');
|
final mins = (track.durationSec ~/ 60).toString().padLeft(2, '0');
|
||||||
final secs = (track.durationSec % 60).toString().padLeft(2, '0');
|
final secs = (track.durationSec % 60).toString().padLeft(2, '0');
|
||||||
return InkWell(
|
// Watch the currently-playing media item so the row's accent
|
||||||
onTap: onTap,
|
// highlight tracks playback state. Matches _QueueRow's visual
|
||||||
child: Padding(
|
// treatment in queue_screen.dart so the "you are here" cue is
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
|
// consistent across album / playlist / queue surfaces.
|
||||||
child: Row(children: [
|
final currentId = ref.watch(mediaItemProvider).value?.id;
|
||||||
if (track.trackNumber != null)
|
final isCurrent = currentId != null && currentId == track.id;
|
||||||
SizedBox(
|
return Container(
|
||||||
width: 22,
|
decoration: BoxDecoration(
|
||||||
child: Text(
|
color: isCurrent ? fs.iron : null,
|
||||||
track.trackNumber.toString(),
|
border: isCurrent
|
||||||
style: TextStyle(color: fs.ash, fontSize: 13),
|
? Border(left: BorderSide(color: fs.accent, width: 2))
|
||||||
),
|
: null,
|
||||||
),
|
),
|
||||||
Expanded(
|
child: InkWell(
|
||||||
child: Column(
|
onTap: onTap,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
child: Padding(
|
||||||
mainAxisSize: MainAxisSize.min,
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
|
||||||
children: [
|
child: Row(children: [
|
||||||
Text(
|
if (track.trackNumber != null)
|
||||||
track.title,
|
SizedBox(
|
||||||
maxLines: 1,
|
width: 22,
|
||||||
overflow: TextOverflow.ellipsis,
|
child: Text(
|
||||||
style: TextStyle(color: fs.parchment, fontSize: 14),
|
track.trackNumber.toString(),
|
||||||
|
style: TextStyle(color: fs.ash, fontSize: 13),
|
||||||
),
|
),
|
||||||
// Skip the artist line entirely when empty so the row
|
),
|
||||||
// height collapses to a single line of title — keeps
|
Expanded(
|
||||||
// dense album views from looking padded.
|
child: Column(
|
||||||
if (track.artistName.isNotEmpty)
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
Text(
|
Text(
|
||||||
track.artistName,
|
track.title,
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: TextStyle(color: fs.ash, fontSize: 12),
|
style: TextStyle(
|
||||||
|
color: isCurrent ? fs.accent : fs.parchment,
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight:
|
||||||
|
isCurrent ? FontWeight.w500 : FontWeight.w400,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
// Skip the artist line entirely when empty so the row
|
||||||
|
// height collapses to a single line of title — keeps
|
||||||
|
// dense album views from looking padded.
|
||||||
|
if (track.artistName.isNotEmpty)
|
||||||
|
Text(
|
||||||
|
track.artistName,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: fs.ash, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
CachedIndicator(trackId: track.id),
|
||||||
CachedIndicator(trackId: track.id),
|
Text('$mins:$secs', style: TextStyle(color: fs.ash, fontSize: 12)),
|
||||||
Text('$mins:$secs', style: TextStyle(color: fs.ash, fontSize: 12)),
|
if (trailing != null)
|
||||||
if (trailing != null)
|
Padding(
|
||||||
Padding(
|
padding: const EdgeInsets.only(left: 8),
|
||||||
padding: const EdgeInsets.only(left: 8),
|
child: trailing!,
|
||||||
child: trailing!,
|
),
|
||||||
),
|
if (actions) TrackActionsButton(track: track),
|
||||||
if (actions) TrackActionsButton(track: track),
|
]),
|
||||||
]),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -233,51 +233,69 @@ class _Header extends ConsumerWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _PlaylistTrackRow extends StatelessWidget {
|
class _PlaylistTrackRow extends ConsumerWidget {
|
||||||
const _PlaylistTrackRow({required this.row, required this.onTap});
|
const _PlaylistTrackRow({required this.row, required this.onTap});
|
||||||
final PlaylistTrack row;
|
final PlaylistTrack row;
|
||||||
final VoidCallback? onTap;
|
final VoidCallback? onTap;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final fs = Theme.of(context).extension<FabledSwordTheme>()!;
|
final fs = Theme.of(context).extension<FabledSwordTheme>()!;
|
||||||
final mins = (row.durationSec ~/ 60).toString().padLeft(2, '0');
|
final mins = (row.durationSec ~/ 60).toString().padLeft(2, '0');
|
||||||
final secs = (row.durationSec % 60).toString().padLeft(2, '0');
|
final secs = (row.durationSec % 60).toString().padLeft(2, '0');
|
||||||
final color = row.isAvailable ? fs.parchment : fs.ash;
|
// "Now playing" highlight — matches _QueueRow and TrackRow so the
|
||||||
return InkWell(
|
// user sees which playlist row is current without reading the
|
||||||
onTap: onTap,
|
// player bar. Unavailable rows never match.
|
||||||
child: Padding(
|
final currentId = ref.watch(mediaItemProvider).value?.id;
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
|
final isCurrent = row.isAvailable &&
|
||||||
child: Row(children: [
|
currentId != null &&
|
||||||
Expanded(
|
currentId == row.trackId;
|
||||||
child: Column(
|
final baseColor = row.isAvailable ? fs.parchment : fs.ash;
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
final titleColor = isCurrent ? fs.accent : baseColor;
|
||||||
children: [
|
return Container(
|
||||||
Text(
|
decoration: BoxDecoration(
|
||||||
row.title,
|
color: isCurrent ? fs.iron : null,
|
||||||
maxLines: 1,
|
border: isCurrent
|
||||||
overflow: TextOverflow.ellipsis,
|
? Border(left: BorderSide(color: fs.accent, width: 2))
|
||||||
style: TextStyle(
|
: null,
|
||||||
color: color,
|
),
|
||||||
fontSize: 14,
|
child: InkWell(
|
||||||
decoration: row.isAvailable
|
onTap: onTap,
|
||||||
? null
|
child: Padding(
|
||||||
: TextDecoration.lineThrough,
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
|
||||||
|
child: Row(children: [
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
row.title,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(
|
||||||
|
color: titleColor,
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight:
|
||||||
|
isCurrent ? FontWeight.w500 : FontWeight.w400,
|
||||||
|
decoration: row.isAvailable
|
||||||
|
? null
|
||||||
|
: TextDecoration.lineThrough,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
Text(
|
||||||
Text(
|
'${row.artistName} · ${row.albumTitle}',
|
||||||
'${row.artistName} · ${row.albumTitle}',
|
maxLines: 1,
|
||||||
maxLines: 1,
|
overflow: TextOverflow.ellipsis,
|
||||||
overflow: TextOverflow.ellipsis,
|
style: TextStyle(color: fs.ash, fontSize: 12),
|
||||||
style: TextStyle(color: fs.ash, fontSize: 12),
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
),
|
Text('$mins:$secs', style: TextStyle(color: fs.ash, fontSize: 12)),
|
||||||
Text('$mins:$secs', style: TextStyle(color: fs.ash, fontSize: 12)),
|
if (row.trackId != null)
|
||||||
if (row.trackId != null)
|
TrackActionsButton(track: _toTrackRef(row)),
|
||||||
TrackActionsButton(track: _toTrackRef(row)),
|
]),
|
||||||
]),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
import TrackMenu from './TrackMenu.svelte';
|
import TrackMenu from './TrackMenu.svelte';
|
||||||
import type { PlaylistTrack } from '$lib/api/types';
|
import type { PlaylistTrack } from '$lib/api/types';
|
||||||
import { playlistTrackToRef } from '$lib/playlists/playlistTrackToRef';
|
import { playlistTrackToRef } from '$lib/playlists/playlistTrackToRef';
|
||||||
|
import { player } from '$lib/player/store.svelte';
|
||||||
import { offsetToDelta } from './queue-row-math';
|
import { offsetToDelta } from './queue-row-math';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
@@ -50,12 +51,20 @@
|
|||||||
// the dragEnd handler skips by returning before onMove fires; visually
|
// the dragEnd handler skips by returning before onMove fires; visually
|
||||||
// the user never sees the row move.
|
// the user never sees the row move.
|
||||||
const canDrag = $derived(isOwner && !isUnavailable);
|
const canDrag = $derived(isOwner && !isUnavailable);
|
||||||
|
|
||||||
|
// "Now playing" highlight: matches QueueTrackRow's treatment so the
|
||||||
|
// user can see which row is current without reading the player bar.
|
||||||
|
// Unavailable rows (trackId === null) never match.
|
||||||
|
const isCurrent = $derived(
|
||||||
|
!isUnavailable && player.current?.id === row.track_id,
|
||||||
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
role="listitem"
|
role="listitem"
|
||||||
class="flex items-center gap-3 px-3 py-2 text-sm transition-colors hover:bg-surface-hover
|
class="flex items-center gap-3 px-3 py-2 text-sm transition-colors hover:bg-surface-hover
|
||||||
{isUnavailable ? 'text-text-muted' : 'text-text-primary'}"
|
{isUnavailable ? 'text-text-muted' : 'text-text-primary'}
|
||||||
|
{isCurrent ? 'border-l-2 border-l-accent bg-surface-hover' : ''}"
|
||||||
use:draggable={{
|
use:draggable={{
|
||||||
axis: 'y',
|
axis: 'y',
|
||||||
bounds: 'parent',
|
bounds: 'parent',
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { TrackRef } from '$lib/api/types';
|
import type { TrackRef } from '$lib/api/types';
|
||||||
import { formatDuration } from '$lib/media/duration';
|
import { formatDuration } from '$lib/media/duration';
|
||||||
import { playQueue, enqueueTrack, playRadio } from '$lib/player/store.svelte';
|
import { player, playQueue, enqueueTrack, playRadio } from '$lib/player/store.svelte';
|
||||||
import { Plus } from 'lucide-svelte';
|
import { Plus } from 'lucide-svelte';
|
||||||
import LikeButton from './LikeButton.svelte';
|
import LikeButton from './LikeButton.svelte';
|
||||||
import TrackMenu from './TrackMenu.svelte';
|
import TrackMenu from './TrackMenu.svelte';
|
||||||
@@ -16,6 +16,13 @@
|
|||||||
|
|
||||||
const track = $derived(tracks[index]);
|
const track = $derived(tracks[index]);
|
||||||
|
|
||||||
|
// Mirrors QueueTrackRow's "now playing" treatment so the user sees
|
||||||
|
// which row in the album / liked / history / search view is currently
|
||||||
|
// playing without having to read the player bar. Only the accent
|
||||||
|
// border + bg lift — no "Now playing" pill, since the player bar
|
||||||
|
// already names the track.
|
||||||
|
const isCurrent = $derived(player.current?.id === track.id);
|
||||||
|
|
||||||
function activate() {
|
function activate() {
|
||||||
if (onPlay) onPlay(tracks, index);
|
if (onPlay) onPlay(tracks, index);
|
||||||
else playQueue(tracks, index);
|
else playQueue(tracks, index);
|
||||||
@@ -49,7 +56,7 @@
|
|||||||
aria-label={track.title}
|
aria-label={track.title}
|
||||||
onclick={onRowClick}
|
onclick={onRowClick}
|
||||||
onkeydown={onRowKey}
|
onkeydown={onRowKey}
|
||||||
class="grid w-full cursor-pointer grid-cols-[32px_1fr_auto_auto_auto_auto_auto] items-center gap-4 px-3 py-2 text-left text-sm odd:bg-surface/50 hover:bg-surface focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
|
class="grid w-full cursor-pointer grid-cols-[32px_1fr_auto_auto_auto_auto_auto] items-center gap-4 px-3 py-2 text-left text-sm odd:bg-surface/50 hover:bg-surface focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent {isCurrent ? 'border-l-2 border-l-accent bg-surface-hover' : ''}"
|
||||||
>
|
>
|
||||||
<span class="text-right tabular-nums text-text-secondary">
|
<span class="text-right tabular-nums text-text-secondary">
|
||||||
{track.track_number ?? '—'}
|
{track.track_number ?? '—'}
|
||||||
|
|||||||
Reference in New Issue
Block a user