kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2026-05-08 16:24:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feat/connect

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2024-03-28 22:59:20 +06:00
commit a4854fca53
1 changed files with 164 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
lib/components/player/player_queue.dart
View File

@ -52,6 +52,9 @@ class PlayerQueue extends HookConsumerWidget {
@override @override
Widget build(BuildContext context, ref) { Widget build(BuildContext context, ref) {
final mediaQuery = MediaQuery.of(context);
final playlistNotifier = ref.watch(ProxyPlaylistNotifier.notifier);
final playlist = ref.watch(ProxyPlaylistNotifier.provider);
final controller = useAutoScrollController(); final controller = useAutoScrollController();
final searchText = useState(''); final searchText = useState('');
@ -105,7 +108,8 @@ class PlayerQueue extends HookConsumerWidget {
return const NotFound(vertical: true); return const NotFound(vertical: true);
} }
return LayoutBuilder(builder: (context, constrains) { return LayoutBuilder(
builder: (context, constrains) {
return ClipRRect( return ClipRRect(
borderRadius: borderRadius, borderRadius: borderRadius,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
@ -132,10 +136,15 @@ class PlayerQueue extends HookConsumerWidget {
searchText.value = ''; searchText.value = '';
} }
}, },
child: Column( child: InterScrollbar(
children: [ controller: controller,
child: CustomScrollView(
controller: controller,
slivers: [
if (!floating) if (!floating)
Container( SliverToBoxAdapter(
child: Center(
child: Container(
height: 5, height: 5,
width: 100, width: 100,
margin: const EdgeInsets.only(bottom: 5, top: 2), margin: const EdgeInsets.only(bottom: 5, top: 2),
@ -144,23 +153,40 @@ class PlayerQueue extends HookConsumerWidget {
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
), ),
Row( ),
crossAxisAlignment: CrossAxisAlignment.center, ),
mainAxisAlignment: MainAxisAlignment.center, SliverAppBar(
children: [ floating: true,
if (constrains.mdAndUp || !isSearching.value) ...[ pinned: false,
const SizedBox(width: 10), snap: false,
Text( backgroundColor: Colors.transparent,
context.l10n.tracks_in_queue(tracks.length), elevation: 0,
automaticallyImplyLeading: !isSearching.value,
title: BackdropFilter(
filter: ImageFilter.blur(
sigmaX: 10,
sigmaY: 10,
),
child: SizedBox(
height: kToolbarHeight,
child: mediaQuery.mdAndUp || !isSearching.value
? Align(
alignment: Alignment.centerLeft,
child: Text(
context.l10n
.tracks_in_queue(tracks.length),
style: TextStyle( style: TextStyle(
color: headlineColor, color: headlineColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 18, fontSize: 18,
), ),
), ),
const Spacer(), )
], : null,
if (constrains.mdAndUp || isSearching.value) ),
),
actions: [
if (mediaQuery.mdAndUp || isSearching.value)
TextField( TextField(
onChanged: (value) { onChanged: (value) {
searchText.value = value; searchText.value = value;
@ -168,7 +194,7 @@ class PlayerQueue extends HookConsumerWidget {
decoration: InputDecoration( decoration: InputDecoration(
hintText: context.l10n.search, hintText: context.l10n.search,
isDense: true, isDense: true,
prefixIcon: constrains.smAndDown prefixIcon: mediaQuery.smAndDown
? IconButton( ? IconButton(
icon: const Icon( icon: const Icon(
Icons.arrow_back_ios_new_outlined, Icons.arrow_back_ios_new_outlined,
@ -185,8 +211,8 @@ class PlayerQueue extends HookConsumerWidget {
: const Icon(SpotubeIcons.filter), : const Icon(SpotubeIcons.filter),
constraints: BoxConstraints( constraints: BoxConstraints(
maxHeight: 40, maxHeight: 40,
maxWidth: constrains.smAndDown maxWidth: mediaQuery.smAndDown
? constrains.maxWidth - 40 ? mediaQuery.size.width - 40
: 300, : 300,
), ),
), ),
@ -198,12 +224,12 @@ class PlayerQueue extends HookConsumerWidget {
isSearching.value = !isSearching.value; isSearching.value = !isSearching.value;
}, },
), ),
if (constrains.mdAndUp || !isSearching.value) ...[ if (mediaQuery.mdAndUp || !isSearching.value) ...[
const SizedBox(width: 10), const SizedBox(width: 10),
FilledButton( FilledButton(
style: FilledButton.styleFrom( style: FilledButton.styleFrom(
backgroundColor: backgroundColor: theme.scaffoldBackgroundColor
theme.scaffoldBackgroundColor.withOpacity(0.5), .withOpacity(0.5),
foregroundColor: foregroundColor:
theme.textTheme.headlineSmall?.color, theme.textTheme.headlineSmall?.color,
), ),
@ -215,7 +241,7 @@ class PlayerQueue extends HookConsumerWidget {
], ],
), ),
onPressed: () { onPressed: () {
onStop(); playlistNotifier.stop();
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
), ),
@ -223,17 +249,12 @@ class PlayerQueue extends HookConsumerWidget {
], ],
], ],
), ),
const SizedBox(height: 10), const SliverGap(10),
if (!isSearching.value && searchText.value.isEmpty) SliverReorderableList(
Flexible(
child: ReorderableListView.builder(
onReorder: (oldIndex, newIndex) { onReorder: (oldIndex, newIndex) {
onReorder(oldIndex, newIndex); playlistNotifier.moveTrack(oldIndex, newIndex);
}, },
scrollController: controller, itemCount: filteredTracks.length,
itemCount: tracks.length + 1,
shrinkWrap: true,
buildDefaultDragHandles: false,
onReorderStart: (index) { onReorderStart: (index) {
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
}, },
@ -241,37 +262,34 @@ class PlayerQueue extends HookConsumerWidget {
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
}, },
itemBuilder: (context, i) { itemBuilder: (context, i) {
if (i == tracks.length) { final track = filteredTracks.elementAt(i);
return AutoScrollTag( return AutoScrollTag(
index: i, key: ValueKey<int>(i),
controller: controller,
key: const ValueKey('end'),
child: const Gap(100),
);
}
final track = tracks.elementAt(i);
return AutoScrollTag(
key: ValueKey(i),
controller: controller, controller: controller,
index: i, index: i,
child: Padding( child: Material(
padding: color: Colors.transparent,
const EdgeInsets.symmetric(horizontal: 8.0),
child: TrackTile( child: TrackTile(
playlist: playlist,
index: i, index: i,
track: track, track: track,
playlist: playlist,
onTap: () async { onTap: () async {
if (playlist.activeTrack?.id == track.id) { if (playlist.activeTrack?.id == track.id) {
return; return;
} }
onJump(track); await playlistNotifier.jumpToTrack(track);
}, },
leadingActions: [ leadingActions: [
ReorderableDragStartListener( if (!isSearching.value &&
searchText.value.isEmpty)
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: ReorderableDragStartListener(
index: i, index: i,
child: const Icon(SpotubeIcons.dragHandle), child: const Icon(
SpotubeIcons.dragHandle,
),
),
), ),
], ],
), ),
@ -279,45 +297,15 @@ class PlayerQueue extends HookConsumerWidget {
); );
}, },
), ),
) const SliverGap(100),
else
Flexible(
child: InterScrollbar(
controller: controller,
child: ListView.builder(
controller: controller,
itemCount: filteredTracks.length + 1,
itemBuilder: (context, i) {
if (i == filteredTracks.length) {
return const Gap(100);
}
final track = filteredTracks.elementAt(i);
return Padding(
padding:
const EdgeInsets.symmetric(horizontal: 8.0),
child: TrackTile(
index: i,
playlist: playlist,
track: track,
onTap: () async {
if (playlist.activeTrack?.id == track.id) {
return;
}
onJump(track);
},
),
);
},
),
),
),
], ],
), ),
), ),
), ),
), ),
),
);
},
); );
});
} }
} }