Goatworks/GroovyBox
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Player queue remove, reorder

Browse Source
This commit is contained in:
LittleSheep
2025-12-17 23:07:39 +08:00
parent df03b24360
commit f4b0dd8067
1 changed files with 102 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
lib/ui/screens/player_screen.dart
View File

@@ -1,3 +1,4 @@
import 'dart:math' as math;
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -214,7 +215,9 @@ class _DesktopLayout extends StatelessWidget {
ViewMode.cover => Center( ViewMode.cover => Center(
key: const ValueKey('cover'), key: const ValueKey('cover'),
child: ConstrainedBox( child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 480), constraints: BoxConstraints(
maxWidth: math.min(480, MediaQuery.sizeOf(context).width * 0.4),
),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@@ -252,7 +255,12 @@ class _DesktopLayout extends StatelessWidget {
Expanded( Expanded(
child: Center( child: Center(
child: ConstrainedBox( child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 480), constraints: BoxConstraints(
maxWidth: math.min(
480,
MediaQuery.sizeOf(context).width * 0.4,
),
),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@@ -321,7 +329,12 @@ class _DesktopLayout extends StatelessWidget {
Expanded( Expanded(
child: Center( child: Center(
child: ConstrainedBox( child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 480), constraints: BoxConstraints(
maxWidth: math.min(
480,
MediaQuery.sizeOf(context).width * 0.4,
),
),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@@ -364,7 +377,7 @@ class _DesktopLayout extends StatelessWidget {
top: 0, top: 0,
bottom: 0, bottom: 0,
width: MediaQuery.sizeOf(context).width * 0.5, width: MediaQuery.sizeOf(context).width * 0.5,
child: _QueueView(player: player), child: _QueueView(player: player).padding(right: 64),
), ),
], ],
), ),
@@ -1076,9 +1089,15 @@ class _QueueView extends HookConsumerWidget {
return const Center(child: Text('No tracks in queue')); return const Center(child: Text('No tracks in queue'));
} }
return ListView.builder( return ReorderableListView.builder(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
itemCount: playlist.medias.length, itemCount: playlist.medias.length,
onReorder: (oldIndex, newIndex) {
if (oldIndex < newIndex) {
newIndex -= 1;
}
player.move(oldIndex, newIndex);
},
itemBuilder: (context, index) { itemBuilder: (context, index) {
final media = playlist.medias[index]; final media = playlist.medias[index];
final isCurrent = index == playlist.index; final isCurrent = index == playlist.index;
@@ -1086,53 +1105,88 @@ class _QueueView extends HookConsumerWidget {
final trackAsync = ref.watch(trackByPathProvider(trackPath)); final trackAsync = ref.watch(trackByPathProvider(trackPath));
return trackAsync.when( return trackAsync.when(
loading: () => const SizedBox( loading: () => SizedBox(
key: Key('loading_$index'),
height: 72, height: 72,
child: Center(child: CircularProgressIndicator()), child: const Center(child: CircularProgressIndicator()),
), ),
error: (error, stack) => TrackTile( error: (error, stack) => Dismissible(
track: db.Track( key: Key('queue_item_error_$index'),
id: -1, direction: DismissDirection.endToStart,
path: trackPath, background: Container(
title: Uri.parse(media.uri).pathSegments.last, color: Colors.red,
artist: alignment: Alignment.centerRight,
media.extras?['artist'] as String? ?? padding: const EdgeInsets.only(right: 20),
'Unknown Artist', child: const Icon(Icons.delete, color: Colors.white),
album: media.extras?['album'] as String?, ),
duration: null, onDismissed: (direction) => player.remove(index),
artUri: null, child: TrackTile(
lyrics: null, track: db.Track(
lyricsOffset: 0, id: -1,
addedAt: DateTime.now(), path: trackPath,
title: Uri.parse(media.uri).pathSegments.last,
artist:
media.extras?['artist'] as String? ??
'Unknown Artist',
album: media.extras?['album'] as String?,
duration: null,
artUri: null,
lyrics: null,
lyricsOffset: 0,
addedAt: DateTime.now(),
),
isPlaying: isCurrent,
onTap: () => player.jump(index),
padding: const EdgeInsets.symmetric(horizontal: 16),
), ),
isPlaying: isCurrent,
onTap: () => player.jump(index),
padding: const EdgeInsets.symmetric(horizontal: 16),
), ),
data: (track) => TrackTile( data: (track) => Dismissible(
leading: Text( key: Key('queue_item_$index'),
(index + 1).toString().padLeft(2, '0'), direction: DismissDirection.endToStart,
style: TextStyle(fontSize: 14), background: Container(
).padding(right: 12), color: Colors.red,
track: alignment: Alignment.centerRight,
track ?? padding: const EdgeInsets.only(right: 20),
db.Track( child: const Icon(Icons.delete, color: Colors.white),
id: -1, ),
path: trackPath, onDismissed: (direction) => player.remove(index),
title: Uri.parse(media.uri).pathSegments.last, child: TrackTile(
artist: leading: Row(
media.extras?['artist'] as String? ?? children: [
'Unknown Artist', Icon(
album: media.extras?['album'] as String?, Icons.drag_handle,
duration: null, size: 20,
artUri: null, color: Theme.of(
lyrics: null, context,
lyricsOffset: 0, ).colorScheme.onSurface.withOpacity(0.5),
addedAt: DateTime.now(), ),
), const SizedBox(width: 8),
isPlaying: isCurrent, Text(
onTap: () => player.jump(index), (index + 1).toString().padLeft(2, '0'),
padding: const EdgeInsets.symmetric(horizontal: 16), style: TextStyle(fontSize: 14),
),
],
).padding(right: 4),
track:
track ??
db.Track(
id: -1,
path: trackPath,
title: Uri.parse(media.uri).pathSegments.last,
artist:
media.extras?['artist'] as String? ??
'Unknown Artist',
album: media.extras?['album'] as String?,
duration: null,
artUri: null,
lyrics: null,
lyricsOffset: 0,
addedAt: DateTime.now(),
),
isPlaying: isCurrent,
onTap: () => player.jump(index),
padding: const EdgeInsets.symmetric(horizontal: 16),
),
), ),
); );
}, },