kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-12-05 23:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 99283ae8f4 into 3209c75144

Browse Source
This commit is contained in:
Rahul Sahani 2025-11-09 10:57:07 +00:00 committed by GitHub
commit 937899547a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 224 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
.history
.svn/
# IntelliJ related
*.iml
*.ipr

54
lib/components/track_tile/track_tile.dart
View File

@ -39,6 +39,7 @@ class TrackTile extends HookConsumerWidget {
final int? index;
final SpotubeTrackObject track;
final bool selected;
final bool selectionMode;
final ValueChanged<bool?>? onChanged;
final Future<void> Function()? onTap;
final VoidCallback? onLongPress;
@ -53,6 +54,7 @@ class TrackTile extends HookConsumerWidget {
this.index,
required this.track,
this.selected = false,
this.selectionMode = false,
required this.playlist,
this.onTap,
this.onLongPress,
@ -81,6 +83,12 @@ class TrackTile extends HookConsumerWidget {
[track.album.images],
);
// Treat either explicit selectionMode or presence of onChanged as selection
// context. Some lists enable selection by providing `onChanged` without
// toggling a dedicated `selectionMode` flag (e.g. playlists), so we must
// disable inner navigation in both cases.
final effectiveSelection = selectionMode || onChanged != null;
return LayoutBuilder(builder: (context, constrains) {
return Listener(
onPointerDown: (event) {
@ -222,7 +230,9 @@ class TrackTile extends HookConsumerWidget {
children: [
Expanded(
flex: 6,
child: switch (track) {
child: AbsorbPointer(
absorbing: selectionMode,
child: switch (track) {
SpotubeLocalTrackObject() => Text(
track.name,
maxLines: 1,
@ -232,15 +242,17 @@ class TrackTile extends HookConsumerWidget {
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: Button(
style: ButtonVariance.link.copyWith(
padding: (context, states, value) =>
EdgeInsets.zero,
),
onPressed: () {
context
.navigateTo(TrackRoute(trackId: track.id));
},
child: Button(
style: ButtonVariance.link.copyWith(
padding: (context, states, value) =>
EdgeInsets.zero,
),
onPressed: effectiveSelection
? null
: () {
context
.navigateTo(TrackRoute(trackId: track.id));
},
child: Text(
track.name,
maxLines: 1,
@ -251,6 +263,7 @@ class TrackTile extends HookConsumerWidget {
],
),
},
),
),
if (constrains.mdAndUp) ...[
const SizedBox(width: 8),
@ -281,20 +294,25 @@ class TrackTile extends HookConsumerWidget {
),
subtitle: Align(
alignment: Alignment.centerLeft,
child: track is SpotubeLocalTrackObject
child: track is SpotubeLocalTrackObject
? Text(
track.artists.asString(),
)
: ClipRect(
child: ConstrainedBox(
constraints: const BoxConstraints(maxHeight: 40),
child: ArtistLink(
artists: track.artists,
onOverflowArtistClick: () {
context.navigateTo(
TrackRoute(trackId: track.id),
);
},
child: AbsorbPointer(
absorbing: effectiveSelection,
child: ArtistLink(
artists: track.artists,
onOverflowArtistClick: effectiveSelection
? () {}
: () {
context.navigateTo(
TrackRoute(trackId: track.id),
);
},
),
),
),
),

224
lib/modules/player/player_queue.dart
View File

@ -2,6 +2,7 @@ import 'package:auto_size_text/auto_size_text.dart';
import 'package:collection/collection.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter/material.dart' show showModalBottomSheet, ListTile, SafeArea, Column, Navigator;
import 'package:fuzzywuzzy/fuzzywuzzy.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -12,6 +13,7 @@ import 'package:spotube/components/button/back_button.dart';
import 'package:spotube/components/fallbacks/not_found.dart';
import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
import 'package:spotube/components/track_tile/track_tile.dart';
import 'package:spotube/components/dialogs/playlist_add_track_dialog.dart';
import 'package:spotube/extensions/constrains.dart';
import 'package:spotube/extensions/context.dart';
import 'package:spotube/hooks/controllers/use_auto_scroll_controller.dart';
@ -55,9 +57,12 @@ class PlayerQueue extends HookConsumerWidget {
final controller = useAutoScrollController();
final searchText = useState('');
final selectionMode = useState(false);
final selectedTrackIds = useState(<String>{});
final isSearching = useState(false);
final tracks = playlist.tracks;
final tracks = playlist.tracks;
final filteredTracks = useMemoized(
() {
@ -132,50 +137,156 @@ class PlayerQueue extends HookConsumerWidget {
child: searchBar,
)
else
AppBar(
trailingGap: 0,
backgroundColor: Colors.transparent,
surfaceBlur: 0,
surfaceOpacity: 0,
title: mediaQuery.mdAndUp || !isSearching.value
? SizedBox(
selectionMode.value
? AppBar(
backgroundColor: Colors.transparent,
surfaceBlur: 0,
surfaceOpacity: 0,
leading: [
IconButton.ghost(
icon: const Icon(SpotubeIcons.close),
onPressed: () {
selectedTrackIds.value = {};
selectionMode.value = false;
},
)
],
title: SizedBox(
height: 30,
child: AutoSizeText(
context.l10n.tracks_in_queue(tracks.length),
'${selectedTrackIds.value.length} selected',
maxLines: 1,
),
)
: null,
trailing: [
if (mediaQuery.mdAndUp)
searchBar
else
IconButton.ghost(
icon: const Icon(SpotubeIcons.filter),
onPressed: () {
isSearching.value = !isSearching.value;
},
),
if (!isSearching.value) ...[
const SizedBox(width: 10),
Tooltip(
tooltip: TooltipContainer(
child: Text(context.l10n.clear_all))
.call,
child: IconButton.outline(
icon: const Icon(SpotubeIcons.playlistRemove),
onPressed: () {
onStop();
closeDrawer(context);
},
),
trailing: [
IconButton.ghost(
icon: const Icon(SpotubeIcons.moreHorizontal),
onPressed: () async {
await showModalBottomSheet<void>(
context: context,
builder: (context) {
return SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ListTile(
leading: const Icon(
SpotubeIcons.selectionCheck),
title: Text(
context.l10n.select_all),
onTap: () {
selectedTrackIds.value =
filteredTracks
.map((t) => t.id)
.toSet();
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(
SpotubeIcons.playlistAdd),
title: Text(
context.l10n.add_to_playlist),
onTap: () async {
final selected = filteredTracks
.where((t) => selectedTrackIds
.value
.contains(t.id))
.toList();
Navigator.pop(context);
if (selected.isEmpty) return;
final res = await showDialog<
bool?>(
context: context,
builder: (context) =>
PlaylistAddTrackDialog(
tracks: selected,
openFromPlaylist: null,
),
);
if (res == true) {
selectedTrackIds.value = {};
selectionMode.value = false;
}
},
),
ListTile(
leading:
const Icon(SpotubeIcons.trash),
title: Text(
context.l10n.remove_from_queue),
onTap: () async {
final ids = selectedTrackIds
.value
.toList();
Navigator.pop(context);
if (ids.isEmpty) return;
await Future.wait(ids
.map((id) => onRemove(id)));
selectedTrackIds.value = {};
selectionMode.value = false;
},
),
ListTile(
leading: const Icon(
SpotubeIcons.close),
title: Text(context.l10n.cancel),
onTap: () {
Navigator.pop(context);
},
),
],
),
);
},
);
},
),
],
)
: AppBar(
trailingGap: 0,
backgroundColor: Colors.transparent,
surfaceBlur: 0,
surfaceOpacity: 0,
title: mediaQuery.mdAndUp || !isSearching.value
? SizedBox(
height: 30,
child: AutoSizeText(
context.l10n.tracks_in_queue(tracks.length),
maxLines: 1,
),
)
: null,
trailing: [
if (mediaQuery.mdAndUp) searchBar
else
IconButton.ghost(
icon: const Icon(SpotubeIcons.filter),
onPressed: () {
isSearching.value = !isSearching.value;
},
),
if (!isSearching.value) ...[
const SizedBox(width: 10),
Tooltip(
tooltip: TooltipContainer(
child: Text(context.l10n.clear_all))
.call,
child: IconButton.outline(
icon: const Icon(SpotubeIcons.playlistRemove),
onPressed: () {
onStop();
closeDrawer(context);
},
),
),
const Gap(5),
if (mediaQuery.smAndDown)
const BackButton(icon: SpotubeIcons.angleDown),
],
],
),
const Gap(5),
if (mediaQuery.smAndDown)
const BackButton(icon: SpotubeIcons.angleDown),
],
],
),
const Divider(),
Expanded(
child: InterScrollbar(
@ -195,6 +306,20 @@ class PlayerQueue extends HookConsumerWidget {
},
itemBuilder: (context, i) {
final track = filteredTracks.elementAt(i);
void toggleSelection(String id) {
final s = {...selectedTrackIds.value};
if (s.contains(id)) {
s.remove(id);
} else {
s.add(id);
}
selectedTrackIds.value = s;
if (selectedTrackIds.value.isEmpty) {
selectionMode.value = false;
}
}
return AutoScrollTag(
key: ValueKey<int>(i),
controller: controller,
@ -203,15 +328,34 @@ class PlayerQueue extends HookConsumerWidget {
playlist: playlist,
index: i,
track: track,
selectionMode: selectionMode.value,
selected:
selectedTrackIds.value.contains(track.id),
onChanged: selectionMode.value
? (_) => toggleSelection(track.id)
: null,
onTap: () async {
if (selectionMode.value) {
toggleSelection(track.id);
return;
}
if (playlist.activeTrack?.id == track.id) {
return;
}
await onJump(track);
},
onLongPress: () {
if (!selectionMode.value) {
selectionMode.value = true;
selectedTrackIds.value = {track.id};
} else {
toggleSelection(track.id);
}
},
leadingActions: [
if (!isSearching.value &&
searchText.value.isEmpty)
searchText.value.isEmpty &&
!selectionMode.value)
Padding(
padding:
const EdgeInsets.only(left: 8.0),

2
lib/pages/settings/blacklist.dart
View File

@ -64,7 +64,7 @@ class BlackListPage extends HookConsumerWidget {
child: TextField(
onChanged: (value) => searchText.value = value,
placeholder: Text(context.l10n.search),
leading: const Icon(SpotubeIcons.search),
// prefixIcon: const Icon(SpotubeIcons.search),
),
),
InterScrollbar(

1
lib/services/metadata/metadata.dart
View File

@ -50,6 +50,7 @@ class MetadataPlugin {
sharedPreferences,
config.slug,
),
createYoutubeEngine: () => throw UnimplementedError(),
onNavigatorPush: (route) {
return rootNavigatorKey.currentContext?.router
.pushWidget(Builder(builder: (context) {

8
linux/flutter/generated_plugin_registrant.cc
View File

@ -12,13 +12,11 @@
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
#include <flutter_timezone/flutter_timezone_plugin.h>
#include <gtk/gtk_plugin.h>
#include <irondash_engine_context/irondash_engine_context_plugin.h>
#include <local_notifier/local_notifier_plugin.h>
#include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
#include <open_file_linux/open_file_linux_plugin.h>
#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
#include <super_native_extensions/super_native_extensions_plugin.h>
#include <system_theme/system_theme_plugin.h>
#include <tray_manager/tray_manager_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
@ -43,9 +41,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) gtk_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
gtk_plugin_register_with_registrar(gtk_registrar);
g_autoptr(FlPluginRegistrar) irondash_engine_context_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "IrondashEngineContextPlugin");
irondash_engine_context_plugin_register_with_registrar(irondash_engine_context_registrar);
g_autoptr(FlPluginRegistrar) local_notifier_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "LocalNotifierPlugin");
local_notifier_plugin_register_with_registrar(local_notifier_registrar);
@ -61,9 +56,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
g_autoptr(FlPluginRegistrar) super_native_extensions_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "SuperNativeExtensionsPlugin");
super_native_extensions_plugin_register_with_registrar(super_native_extensions_registrar);
g_autoptr(FlPluginRegistrar) system_theme_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "SystemThemePlugin");
system_theme_plugin_register_with_registrar(system_theme_registrar);

2
linux/flutter/generated_plugins.cmake
View File

@ -9,13 +9,11 @@ list(APPEND FLUTTER_PLUGIN_LIST
flutter_secure_storage_linux
flutter_timezone
gtk
irondash_engine_context
local_notifier
media_kit_libs_linux
open_file_linux
screen_retriever_linux
sqlite3_flutter_libs
super_native_extensions
system_theme
tray_manager
url_launcher_linux

4
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@ -18,7 +18,6 @@ import flutter_inappwebview_macos
import flutter_new_pipe_extractor
import flutter_secure_storage_macos
import flutter_timezone
import irondash_engine_context
import local_notifier
import media_kit_libs_macos_audio
import open_file_mac
@ -28,7 +27,6 @@ import screen_retriever_macos
import shared_preferences_foundation
import sqflite_darwin
import sqlite3_flutter_libs
import super_native_extensions
import system_theme
import tray_manager
import url_launcher_macos
@ -48,7 +46,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FlutterNewPipeExtractorPlugin.register(with: registry.registrar(forPlugin: "FlutterNewPipeExtractorPlugin"))
FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin"))
IrondashEngineContextPlugin.register(with: registry.registrar(forPlugin: "IrondashEngineContextPlugin"))
LocalNotifierPlugin.register(with: registry.registrar(forPlugin: "LocalNotifierPlugin"))
MediaKitLibsMacosAudioPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosAudioPlugin"))
OpenFilePlugin.register(with: registry.registrar(forPlugin: "OpenFilePlugin"))
@ -58,7 +55,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
SuperNativeExtensionsPlugin.register(with: registry.registrar(forPlugin: "SuperNativeExtensionsPlugin"))
SystemThemePlugin.register(with: registry.registrar(forPlugin: "SystemThemePlugin"))
TrayManagerPlugin.register(with: registry.registrar(forPlugin: "TrayManagerPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))

2
pubspec.lock
View File

@ -2863,4 +2863,4 @@ packages:
version: "1.0.0"
sdks:
dart: ">=3.9.0 <4.0.0"
flutter: ">=3.35.1"
flutter: ">=3.35.1"

6
windows/flutter/generated_plugin_registrant.cc
View File

@ -15,13 +15,11 @@
#include <flutter_new_pipe_extractor/flutter_new_pipe_extractor_plugin_c_api.h>
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
#include <flutter_timezone/flutter_timezone_plugin_c_api.h>
#include <irondash_engine_context/irondash_engine_context_plugin_c_api.h>
#include <local_notifier/local_notifier_plugin.h>
#include <media_kit_libs_windows_audio/media_kit_libs_windows_audio_plugin_c_api.h>
#include <permission_handler_windows/permission_handler_windows_plugin.h>
#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
#include <super_native_extensions/super_native_extensions_plugin_c_api.h>
#include <system_theme/system_theme_plugin.h>
#include <tray_manager/tray_manager_plugin.h>
#include <url_launcher_windows/url_launcher_windows.h>
@ -46,8 +44,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
FlutterTimezonePluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FlutterTimezonePluginCApi"));
IrondashEngineContextPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("IrondashEngineContextPluginCApi"));
LocalNotifierPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("LocalNotifierPlugin"));
MediaKitLibsWindowsAudioPluginCApiRegisterWithRegistrar(
@ -58,8 +54,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
Sqlite3FlutterLibsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
SuperNativeExtensionsPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("SuperNativeExtensionsPluginCApi"));
SystemThemePluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("SystemThemePlugin"));
TrayManagerPluginRegisterWithRegistrar(

2
windows/flutter/generated_plugins.cmake
View File

@ -12,13 +12,11 @@ list(APPEND FLUTTER_PLUGIN_LIST
flutter_new_pipe_extractor
flutter_secure_storage_windows
flutter_timezone
irondash_engine_context
local_notifier
media_kit_libs_windows_audio
permission_handler_windows
screen_retriever_windows
sqlite3_flutter_libs
super_native_extensions
system_theme
tray_manager
url_launcher_windows