feat(library): browse the Library by genre

Adds a Genres page to the Material Library tabs, the Mornye Library
overview and the desktop sidebar. Each genre shows its song count and
a square cover from one of its songs, and opens the existing Library
mix screen with the genre's songs, Play and Shuffle.

Reusing that screen keeps the shared header, track rows and desktop
table, so a genre's songs behave like the other song lists.
This commit is contained in:
zarzet committed 2026-11-16 17:09:18 +07:00
1 parent 85c3159e60
commit 0408eeec25
9 files changed
+652 -89

No files matched your search

+8
View File
@@ -680,6 +680,14 @@
"@libraryFoldersLoadFailed": {
"description": "Shown when the Folders view fails to load"
},
"libraryGenres": "Genres",
"@libraryGenres": {
"description": "Library view that groups downloaded and scanned songs by their genre tag"
},
"libraryGenresEmpty": "Genres appear here once your downloaded or scanned songs have a genre tag.",
"@libraryGenresEmpty": {
"description": "Shown in the Genres view when no Library song has a genre"
},
"settingsTitle": "Settings",
"@settingsTitle": {
"description": "Settings screen title"
+2
View File
@@ -8549,6 +8549,8 @@
"libraryFoldersEmptyMessage": "Unduh lagu atau tambahkan folder musik di setelan Koleksi Lokal untuk menjelajahinya per folder.",
"libraryFolderMissing": "Folder ini tidak ada lagi di Koleksi",
"libraryFoldersLoadFailed": "Tidak dapat membaca folder",
"libraryGenres": "Genre",
"libraryGenresEmpty": "Genre muncul di sini setelah lagu yang kamu unduh atau pindai memiliki tag genre.",
"linkDesktopSettingsTitle": "Mornye di ponsel",
"linkDesktopSettingsSubtitle": "Putar Library dan kendalikan pemutaran dari ponsel",
"linkDesktopEnableTitle": "Bagikan ke Mornye di ponsel",
+85 -30
View File
@@ -9,6 +9,8 @@ import 'package:mornye/l10n/l10n.dart';
import 'package:mornye/models/library_database_models.dart'
show LocalLibraryItem;
import 'package:mornye/models/unified_library_item.dart';
import 'package:mornye/providers/library_browse_provider.dart';
import 'package:mornye/providers/library_genres_provider.dart';
import 'package:mornye/providers/library_mixes_provider.dart';
import 'package:mornye/providers/music_player_provider.dart';
import 'package:mornye/services/batch_track_actions.dart';
@@ -22,12 +24,14 @@ import 'package:mornye/utils/adaptive_layout.dart';
import 'package:mornye/utils/desktop_platform.dart';
import 'package:mornye/utils/file_access.dart';
import 'package:mornye/widgets/album_detail_header.dart';
import 'package:mornye/widgets/animation_utils.dart';
import 'package:mornye/widgets/collection_scaffold.dart';
import 'package:mornye/widgets/desktop/context_menu.dart';
import 'package:mornye/widgets/desktop/desktop_selection.dart';
import 'package:mornye/widgets/desktop/detail_header.dart';
import 'package:mornye/widgets/desktop/library_track_menu.dart';
import 'package:mornye/widgets/desktop/track_table.dart';
import 'package:mornye/widgets/expressive_button.dart';
import 'package:mornye/widgets/library_mix_cover.dart';
import 'package:mornye/widgets/library_selection_playback_actions.dart';
import 'package:mornye/widgets/library_track_selection_bar.dart';
@@ -93,11 +97,20 @@ String libraryMixSubtitle(AppLocalizations l10n, LibraryMix mix) =>
};
/// A mix of the Library's own songs: its cover, Play, Shuffle, Save as
/// playlist and its songs in play order.
/// playlist and its songs in play order. [LibraryMixScreen.genre] shows the
/// songs of one Library genre the same way, under the genre's name.
class LibraryMixScreen extends ConsumerStatefulWidget {
const LibraryMixScreen({super.key, required this.view});
const LibraryMixScreen({super.key, required LibraryMixView this.view})
: genre = null;
final LibraryMixView view;
/// The songs of [genre], by title.
const LibraryMixScreen.genre({
super.key,
required LibraryBrowseEntry this.genre,
}) : view = null;
final LibraryMixView? view;
final LibraryBrowseEntry? genre;
@override
ConsumerState<LibraryMixScreen> createState() => _LibraryMixScreenState();
@@ -107,8 +120,12 @@ class _LibraryMixScreenState extends ConsumerState<LibraryMixScreen>
with
SelectionModeMixin<LibraryMixScreen>,
CollapsingHeaderScrollMixin<LibraryMixScreen> {
/// The mix's songs, less those deleted from this page.
late List<UnifiedLibraryItem> _items = widget.view.items;
/// The songs, less those deleted from this page.
late List<UnifiedLibraryItem> _items = widget.view?.items ?? const [];
/// A genre's songs as they load; null for a mix.
AsyncValue<List<UnifiedLibraryItem>>? _genreSongs;
List<UnifiedLibraryItem>? _loadedGenreSongs;
List<UnifiedLibraryItem> get _selectedItems => [
for (final item in _items)
@@ -125,8 +142,21 @@ class _LibraryMixScreenState extends ConsumerState<LibraryMixScreen>
return null;
}
String _title(AppLocalizations l10n) =>
widget.genre?.name ?? libraryMixTitle(l10n, widget.view!.mix);
@override
Widget build(BuildContext context) {
if (widget.genre case final genre?) {
final songs = ref.watch(libraryGenreSongsProvider(genre.key));
_genreSongs = songs;
// A new read replaces the list; songs deleted here stay out until then.
if (songs.value case final items?
when !identical(items, _loadedGenreSongs)) {
_loadedGenreSongs = items;
_items = items;
}
}
if (context.isMornye) {
return MornyeArtistSurface(
imageSource: _paletteSource,
@@ -154,7 +184,26 @@ class _LibraryMixScreenState extends ConsumerState<LibraryMixScreen>
onExitSelectionMode: exitSelectionMode,
appBar: _buildHeader(context),
slivers: [
if (isDesktopPlatform)
if (_genreSongs case final songs? when !songs.hasValue)
songs.hasError
? SliverToBoxAdapter(
child: Center(
child: ExpressiveButton(
text: true,
icon: const Icon(Icons.refresh),
onPressed: () => ref.invalidate(
libraryGenreSongsProvider(widget.genre!.key),
),
child: Text(context.l10n.dialogRetry),
),
),
)
: SliverToBoxAdapter(
child: TrackListSkeleton(
itemCount: min(widget.genre!.trackCount, 8),
),
)
else if (isDesktopPlatform)
_buildDesktopTable(context, ids)
else
_buildTrackList(context),
@@ -259,9 +308,13 @@ class _LibraryMixScreenState extends ConsumerState<LibraryMixScreen>
Widget _buildHeader(BuildContext context) {
final l10n = context.l10n;
final mix = widget.view.mix;
final mix = widget.view?.mix;
final colorScheme = Theme.of(context).colorScheme;
final title = libraryMixTitle(l10n, mix);
final title = _title(l10n);
// A genre counts its songs from the list until they load.
final count = _loadedGenreSongs == null && widget.genre != null
? widget.genre!.trackCount
: _items.length;
final minutes =
_items.fold<int>(
0,
@@ -281,30 +334,32 @@ class _LibraryMixScreenState extends ConsumerState<LibraryMixScreen>
coverBuilder: (context, coverSize) =>
LibraryMixCover(items: _items, size: coverSize),
// Built inside the header, so desktop reads its artwork scheme.
subtitle: Builder(
builder: (header) => Text(
libraryMixSubtitle(l10n, mix),
style: isDesktopPlatform
? desktopDetailSubtitleStyle(header)
: TextStyle(
color: context.isMornye
? colorScheme.primary
: HeaderPalette.of(header).onSurfaceVariant,
fontSize: context.tokens.headerSubtitleSize,
fontWeight: context.isMornye
? FontWeight.w400
: FontWeight.w600,
),
textAlign: TextAlign.center,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
subtitle: mix == null
? null
: Builder(
builder: (header) => Text(
libraryMixSubtitle(l10n, mix),
style: isDesktopPlatform
? desktopDetailSubtitleStyle(header)
: TextStyle(
color: context.isMornye
? colorScheme.primary
: HeaderPalette.of(header).onSurfaceVariant,
fontSize: context.tokens.headerSubtitleSize,
fontWeight: context.isMornye
? FontWeight.w400
: FontWeight.w600,
),
textAlign: TextAlign.center,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
meta: HeaderMetaRow(
items: [
HeaderMetaItem(l10n.tracksCount(_items.length)),
HeaderMetaItem(l10n.tracksCount(count)),
if (minutes > 0) HeaderMetaItem('$minutes min'),
HeaderMetaItem(l10n.homeMixUpdatedDaily),
if (mix != null) HeaderMetaItem(l10n.homeMixUpdatedDaily),
],
),
// Phones save from the toolbar; the desktop header has its own "+".
@@ -519,6 +574,6 @@ class _LibraryMixScreenState extends ConsumerState<LibraryMixScreen>
Navigator.of(context, rootNavigator: true).context,
ref,
[for (final item in _items) item.toTrack()],
playlistNamePrefill: libraryMixTitle(context.l10n, widget.view.mix),
playlistNamePrefill: _title(context.l10n),
);
}
+11
View File
@@ -817,6 +817,11 @@ class _MainShellState extends ConsumerState<MainShell>
icon: CupertinoIcons.music_note,
label: l10n.searchSongs,
),
DesktopSidebarLink(
id: 'genres',
icon: CupertinoIcons.guitars,
label: l10n.libraryGenres,
),
DesktopSidebarLink(
id: 'folders',
icon: CupertinoIcons.folder,
@@ -856,6 +861,12 @@ class _MainShellState extends ConsumerState<MainShell>
),
),
'songs' => const Scaffold(body: QueueTab(librarySection: 'all')),
'genres' => Scaffold(
body: MornyeLibraryScreen(
page: MornyeLibraryPage.genres,
onOpenSection: (_) {},
),
),
'folders' => const LibraryDirectoryScreen(),
'downloads' => const Scaffold(
body: QueueTab(librarySection: 'downloads'),
+62 -18
View File
@@ -6,9 +6,11 @@ import 'package:mornye/controllers/clickable_metadata.dart';
import 'package:mornye/l10n/l10n.dart';
import 'package:mornye/providers/download_queue_provider.dart';
import 'package:mornye/providers/library_browse_provider.dart';
import 'package:mornye/providers/library_genres_provider.dart';
import 'package:mornye/providers/settings_provider.dart';
import 'package:mornye/screens/downloaded_album_screen.dart';
import 'package:mornye/screens/library_directory_screen.dart';
import 'package:mornye/screens/library_mix_screen.dart';
import 'package:mornye/screens/listening_rewind_screen.dart';
import 'package:mornye/screens/local_album_screen.dart';
import 'package:mornye/services/album_completeness.dart';
@@ -32,7 +34,7 @@ import 'package:mornye/widgets/local_library_artwork_builder.dart';
import 'package:mornye/widgets/library_search_results.dart';
import 'package:mornye/widgets/sliver_layout_info_builder.dart';
enum MornyeLibraryPage { overview, albums, artists }
enum MornyeLibraryPage { overview, albums, artists, genres }
class MornyeLibraryScreen extends ConsumerStatefulWidget {
const MornyeLibraryScreen({
@@ -64,6 +66,7 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
bool get _overview => widget.page == MornyeLibraryPage.overview;
bool get _artists => widget.page == MornyeLibraryPage.artists;
bool get _genres => widget.page == MornyeLibraryPage.genres;
LibraryBrowseRequest get _request => (
artists: _artists,
artist: widget.artist,
@@ -78,12 +81,14 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
super.initState();
_sort = _overview
? 'latest'
: _artists
: _artists || _genres
? 'a-z'
: ref.read(settingsProvider).libraryAlbumSortMode;
_scroll.addListener(() {
// Genres arrive in one read.
if (_scroll.position.extentAfter < 500 &&
!_loading &&
!_genres &&
!(_overview && _query.isNotEmpty)) {
unawaited(
ref.read(libraryBrowseProvider(_request).notifier).loadMore(),
@@ -124,6 +129,23 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
);
}
/// The Library's genres whose name holds the search text.
LibraryBrowseState _genreRows(List<LibraryBrowseEntry> genres) {
final query = LibraryDatabase.normalizeLookupText(_query);
return LibraryBrowseState(
query.isEmpty
? genres
: [
for (final genre in genres)
if (LibraryDatabase.normalizeLookupText(
genre.name,
).contains(query))
genre,
],
hasMore: false,
);
}
Future<void> _openAlbum(LibraryBrowseEntry entry) async {
if (entry.source != 'local') {
await pushPage<void>(
@@ -331,15 +353,22 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
final listInset = wideListInset(context);
final result = searchingLibrary
? const AsyncData(LibraryBrowseState([], hasMore: false))
: _genres
? ref.watch(libraryGenresProvider).whenData(_genreRows)
: ref.watch(libraryBrowseProvider(_request));
_loading = result.isLoading || (result.value?.isLoadingMore ?? false);
if (result.hasValue) _rows = result.requireValue.entries;
void reload() => _genres
? ref.invalidate(libraryGenresProvider)
: ref.invalidate(libraryBrowseProvider(_request));
final title =
widget.artist ??
(_overview
? context.l10n.navLibrary
: _artists
? context.l10n.searchArtists
: _genres
? context.l10n.libraryGenres
: context.l10n.searchAlbums);
final actions = <Widget>[
if (_overview) const OpenAudioButton(),
@@ -367,7 +396,7 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
);
},
)
else if (!_artists) ...[
else if (!_artists && !_genres) ...[
Builder(
builder: (buttonContext) => IconButton(
tooltip: context.l10n.searchSortTitle,
@@ -390,8 +419,10 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
return AppRefreshIndicator(
onRefresh: () async {
if (searchingLibrary) return;
ref.invalidate(libraryBrowseProvider(_request));
await ref.read(libraryBrowseProvider(_request).future);
reload();
await (_genres
? ref.read(libraryGenresProvider.future)
: ref.read(libraryBrowseProvider(_request).future));
},
child: CustomScrollView(
controller: _scroll,
@@ -483,6 +514,11 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
context.l10n.searchSongs,
() => widget.onOpenSection('all'),
),
(
Icons.category_outlined,
context.l10n.libraryGenres,
() => _openPage(MornyeLibraryPage.genres),
),
(
Icons.folder_outlined,
context.l10n.libraryFolders,
@@ -573,14 +609,23 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
),
),
if (_rows.isNotEmpty)
if (_artists)
if (_artists || _genres)
SliverList.builder(
itemCount: _rows.length,
itemBuilder: (context, index) {
final entry = _rows[index];
void open() => _openPage(
MornyeLibraryPage.albums,
artist: entry.artist,
void open() => _genres
? pushPage<void>(
context,
(_) => LibraryMixScreen.genre(genre: entry),
)
: _openPage(
MornyeLibraryPage.albums,
artist: entry.artist,
);
final artwork = SizedBox.square(
dimension: 56,
child: _LibraryBrowseArtwork(entry: entry),
);
return Column(
children: [
@@ -603,13 +648,13 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
horizontal: 24 + listInset,
vertical: 8,
),
leading: ClipOval(
child: SizedBox.square(
dimension: 56,
child: _LibraryBrowseArtwork(entry: entry),
),
),
title: Text(entry.artist),
leading: _genres
? ClipRRect(
borderRadius: BorderRadius.circular(8),
child: artwork,
)
: ClipOval(child: artwork),
title: Text(_genres ? entry.name : entry.artist),
subtitle: Text(
context.l10n.queueTrackCount(entry.trackCount),
),
@@ -666,8 +711,7 @@ class _MornyeLibraryScreenState extends ConsumerState<MornyeLibraryScreen> {
SliverToBoxAdapter(
child: Center(
child: TextButton.icon(
onPressed: () =>
ref.invalidate(libraryBrowseProvider(_request)),
onPressed: reload,
icon: const Icon(Icons.refresh),
label: Text(context.l10n.dialogRetry),
),
+12 -4
View File
@@ -53,6 +53,7 @@ import 'package:material_3_expressive/material_3_expressive.dart'
M3EButtonSize,
M3EButtonStyle;
import 'package:mornye/providers/library_browse_provider.dart';
import 'package:mornye/providers/library_genres_provider.dart';
import 'package:mornye/providers/library_counts_provider.dart';
import 'package:mornye/providers/library_search_provider.dart';
import 'package:mornye/services/platform_bridge.dart';
@@ -90,6 +91,7 @@ import 'package:mornye/screens/favorite_artists_screen.dart';
import 'package:mornye/screens/downloaded_album_screen.dart';
import 'package:mornye/widgets/cached_cover_image.dart';
import 'package:mornye/screens/library_tracks_folder_screen.dart';
import 'package:mornye/screens/library_mix_screen.dart';
import 'package:mornye/screens/local_album_screen.dart';
import 'package:mornye/screens/mornye_library_screen.dart';
import 'package:mornye/controllers/clickable_metadata.dart';
@@ -177,12 +179,13 @@ class _QueueTabState extends ConsumerState<QueueTab> {
PageController? _filterPageController;
/// Pages of the Library pager: Songs, Albums, Artists, Playlists and
/// Folders. Singles share the Albums page behind [_albumsShowSingles].
/// Pages of the Library pager: Songs, Albums, Artists, Genres, Playlists
/// and Folders. Singles share the Albums page behind [_albumsShowSingles].
final List<String> _filterModes = [
'all',
'albums',
'artists',
'genres',
'playlists',
'folders',
];
@@ -830,10 +833,11 @@ class _QueueTabState extends ConsumerState<QueueTab> {
}
final activePageRequest = pageRequest(historyFilterMode);
// The Artists and Folders pages browse their own queries.
// The Artists, Genres and Folders pages browse their own queries.
final activePageValue =
searchingLibrary ||
historyFilterMode == 'artists' ||
historyFilterMode == 'genres' ||
historyFilterMode == 'folders'
? const AsyncData(_QueueLibraryPageData())
: ref.watch(_queueLibraryPageProvider(activePageRequest));
@@ -906,7 +910,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
final currentTotalCount = switch (historyFilterMode) {
'albums' => queueCounts.albumCount,
'singles' => queueCounts.singleTrackCount,
'playlists' || 'artists' || 'folders' => 0,
'playlists' || 'artists' || 'genres' || 'folders' => 0,
_ => queueCounts.allTrackCount,
};
final hasMoreLibrary = currentLoadedCount < currentTotalCount;
@@ -1053,6 +1057,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
// Artist totals need a full scan; the tab shows
// none rather than a guess.
(context.l10n.searchArtists, null),
(context.l10n.libraryGenres, null),
(
context.l10n.searchPlaylists,
_getVisibleCollectionEntries(
@@ -1113,6 +1118,9 @@ class _QueueTabState extends ConsumerState<QueueTab> {
if (_filterModes[index] == 'artists') {
return _buildArtistsPage(context, colorScheme);
}
if (_filterModes[index] == 'genres') {
return _buildGenresPage(context, colorScheme);
}
if (_filterModes[index] == 'folders') {
return const LibraryDirectoryView(showHeader: false);
}
+124 -36
View File
@@ -449,17 +449,7 @@ extension _QueueTabSections on _QueueTabState {
builder: (context, ref, _) {
final state = ref.watch(libraryBrowseProvider(request));
final entries = state.value?.entries ?? const <LibraryBrowseEntry>[];
final sections = <_LibrarySection>[];
for (var i = 0; i < entries.length; i++) {
final label = _sectionInitial(entries[i].artist);
if (sections.isEmpty || sections.last.label != label) {
if (sections.isNotEmpty) {
final last = sections.removeLast();
sections.add(_LibrarySection(last.label, last.start, i));
}
sections.add(_LibrarySection(label, i, entries.length));
}
}
final sections = _initialSections(entries);
void openArtist(String artist) => pushPage<void>(
context,
(_) => Scaffold(
@@ -507,7 +497,7 @@ extension _QueueTabSections on _QueueTabState {
sections: sections,
rowBuilder: (index, section) {
final entry = entries[index];
return _ArtistRow(
return _BrowseRow(
key: ValueKey('artist_${entry.key}'),
entry: entry,
first: index == section.start,
@@ -553,6 +543,96 @@ extension _QueueTabSections on _QueueTabState {
},
);
}
/// Genres across downloaded and scanned music, by name under pinned
/// letter headers. Tapping one opens its songs.
Widget _buildGenresPage(BuildContext context, ColorScheme colorScheme) {
return Consumer(
builder: (context, ref, _) {
final state = ref.watch(libraryGenresProvider);
final entries = state.value ?? const <LibraryBrowseEntry>[];
final sections = _initialSections(entries);
final content = CustomScrollView(
slivers: [
if (state.isLoading && entries.isEmpty)
const SliverFillRemaining(
hasScrollBody: false,
child: Center(child: AppLoadingIndicator()),
)
else if (entries.isEmpty)
SliverFillRemaining(
hasScrollBody: false,
child: Center(
child: Padding(
padding: const EdgeInsets.all(32),
child: Text(
context.l10n.libraryGenresEmpty,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: colorScheme.onSurfaceVariant,
),
),
),
),
)
else
SliverPadding(
padding: EdgeInsets.fromLTRB(
wideListInset(context),
8,
wideListInset(context),
0,
),
sliver: _LibrarySectionList(
sections: sections,
rowBuilder: (index, section) {
final entry = entries[index];
return _BrowseRow(
key: ValueKey('genre_${entry.key}'),
entry: entry,
artist: false,
first: index == section.start,
last: index == section.end - 1,
onTap: () => pushPage<void>(
context,
(_) => LibraryMixScreen.genre(genre: entry),
),
);
},
),
),
const NavBarSliverSpacer(),
],
);
return LibraryFastScroller(
topPadding: MediaQuery.paddingOf(context).top + kToolbarHeight,
bottomPadding: context.navBarBottomInset,
labelAt: (fraction) => entries.isEmpty
? null
: _sectionInitial(
entries[(fraction * (entries.length - 1)).round()].name,
),
child: content,
);
},
);
}
}
/// Letter sections over [entries], which come sorted by name.
List<_LibrarySection> _initialSections(List<LibraryBrowseEntry> entries) {
final sections = <_LibrarySection>[];
for (var i = 0; i < entries.length; i++) {
final label = _sectionInitial(entries[i].name);
if (sections.isEmpty || sections.last.label != label) {
if (sections.isNotEmpty) {
final last = sections.removeLast();
sections.add(_LibrarySection(last.label, last.start, i));
}
sections.add(_LibrarySection(label, i, entries.length));
}
}
return sections;
}
class _LibrarySectionList extends StatelessWidget {
@@ -636,24 +716,45 @@ class _LibrarySectionHeader extends StatelessWidget {
}
}
class _ArtistRow extends StatelessWidget {
const _ArtistRow({
/// A row of the Artists or Genres page: the artist's shaped avatar or the
/// genre's square cover, its name and its song count.
class _BrowseRow extends StatelessWidget {
const _BrowseRow({
super.key,
required this.entry,
required this.first,
required this.last,
required this.onTap,
this.artist = true,
});
final LibraryBrowseEntry entry;
final bool first;
final bool last;
final VoidCallback onTap;
final bool artist;
@override
Widget build(BuildContext context) {
final colors = Theme.of(context).colorScheme;
final cover = entry.cover;
final artwork = SizedBox.square(
dimension: 52,
child: cover == null || cover.isEmpty
? ColoredBox(
color: colors.surfaceContainerHighest,
child: AppIcon(
artist ? Icons.person : Icons.category_outlined,
color: colors.onSurfaceVariant,
),
)
: PlayerArtwork(
artUri: cover,
colorScheme: colors,
cacheWidth: (52 * MediaQuery.devicePixelRatioOf(context)).ceil(),
iconSize: 24,
),
);
return Padding(
padding: EdgeInsets.fromLTRB(16, first ? 0 : 1, 16, last ? 4 : 1),
child: Material(
@@ -666,35 +767,22 @@ class _ArtistRow extends StatelessWidget {
padding: const EdgeInsets.all(12),
child: Row(
children: [
AppShapeClip(
kind: AppShapes.artist,
child: SizedBox.square(
dimension: 52,
child: cover == null || cover.isEmpty
? ColoredBox(
color: colors.surfaceContainerHighest,
child: AppIcon(
Icons.person,
color: colors.onSurfaceVariant,
),
)
: PlayerArtwork(
artUri: cover,
colorScheme: colors,
cacheWidth:
(52 * MediaQuery.devicePixelRatioOf(context))
.ceil(),
iconSize: 24,
),
if (artist)
AppShapeClip(kind: AppShapes.artist, child: artwork)
else
ClipRRect(
borderRadius: BorderRadius.circular(
context.tokens.radiusThumb,
),
child: artwork,
),
),
const SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
entry.artist,
entry.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+241
View File
@@ -0,0 +1,241 @@
import 'package:material_ui/material_ui.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mornye/l10n/app_localizations.dart';
import 'package:mornye/models/library_database_models.dart';
import 'package:mornye/models/settings.dart';
import 'package:mornye/models/unified_library_item.dart';
import 'package:mornye/providers/download_queue_provider.dart';
import 'package:mornye/providers/library_browse_provider.dart';
import 'package:mornye/providers/library_genres_provider.dart';
import 'package:mornye/providers/music_player_provider.dart';
import 'package:mornye/providers/settings_provider.dart';
import 'package:mornye/screens/library_mix_screen.dart';
import 'package:mornye/screens/mornye_library_screen.dart';
import 'package:mornye/services/playable_media.dart' show PlayableMedia;
import 'package:mornye/theme/app_theme.dart';
import 'package:mornye/theme/mornye_theme.dart';
import 'package:mornye/utils/desktop_platform.dart';
import 'package:mornye/widgets/desktop/track_table.dart';
import 'package:mornye/widgets/track_card.dart';
import 'support/fixed_settings.dart';
import 'support/tooltip_finder.dart';
const _rock = LibraryBrowseEntry(
source: '',
key: 'rock',
name: 'Rock',
artist: '',
samplePath: '',
trackCount: 3,
);
const _jazz = LibraryBrowseEntry(
source: '',
key: 'jazz',
name: 'Jazz',
artist: '',
samplePath: '',
trackCount: 1,
);
UnifiedLibraryItem _song(String id) => UnifiedLibraryItem.fromLocalLibrary(
LocalLibraryItem(
id: id,
trackName: 'Song $id',
artistName: 'Artist $id',
albumName: 'Album $id',
// Network songs need no file on disk to play.
filePath: 'network://example/$id.flac',
scannedAt: DateTime(2026, 11, 16),
duration: 200,
),
);
final _songs = {
'rock': [_song('r1'), _song('r2'), _song('r3')],
'jazz': [_song('j1')],
};
class _History extends DownloadHistoryNotifier {
@override
DownloadHistoryState build() => DownloadHistoryState();
}
class _Player implements MusicPlayerController {
final queues = <List<String>>[];
final starts = <int>[];
final shuffles = <bool>[];
@override
Future<void> playAll(
List<PlayableMedia> items, {
int initialIndex = 0,
}) async {
queues.add([for (final media in items) media.source]);
starts.add(initialIndex);
}
@override
Future<void> setShuffle(bool enabled) async => shuffles.add(enabled);
@override
dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
}
Future<_Player> _pump(
WidgetTester tester,
Widget home, {
required bool mornye,
bool desktop = false,
List<LibraryBrowseEntry> genres = const [_rock, _jazz],
}) async {
debugDesktopPlatformOverride = desktop;
addTearDown(() => debugDesktopPlatformOverride = null);
tester.view.physicalSize = desktop
? const Size(1280, 900)
: const Size(390, 844);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.reset);
final player = _Player();
await tester.pumpWidget(
ProviderScope(
overrides: [
settingsProvider.overrideWith(
() => FixedSettingsNotifier(
const AppSettings(listeningStatisticsEnabled: false),
),
),
downloadHistoryProvider.overrideWith(_History.new),
libraryBrowsePageLoaderProvider.overrideWithValue(
(_) async => const LibraryBrowsePage([]),
),
libraryGenresProvider.overrideWith((ref) async => genres),
libraryGenreSongsProvider.overrideWith(
(ref, genre) async => _songs[genre] ?? const [],
),
musicPlayerControllerProvider.overrideWithValue(player),
],
child: MaterialApp(
theme: mornye ? MornyeTheme.build(Brightness.dark) : AppTheme.dark(),
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
home: home,
),
),
);
await tester.pump();
await tester.pump();
return player;
}
Future<void> _settle(WidgetTester tester) async {
for (var i = 0; i < 12; i++) {
await tester.pump(const Duration(milliseconds: 100));
}
}
void main() {
for (final desktop in [false, true]) {
testWidgets('the Mornye Library lists genres and opens one '
'(desktop: $desktop)', (tester) async {
await _pump(
tester,
Scaffold(body: MornyeLibraryScreen(onOpenSection: (_) {})),
mornye: true,
desktop: desktop,
);
final row = find.widgetWithText(ListTile, 'Genres');
expect(row, findsOneWidget);
await tester.tap(row);
await _settle(tester);
expect(find.text('Rock'), findsOneWidget);
expect(find.text('3 tracks'), findsOneWidget);
expect(find.text('Jazz'), findsOneWidget);
// The page keeps the order the query sorts them in.
expect(
tester.getTopLeft(find.text('Rock')).dy,
lessThan(tester.getTopLeft(find.text('Jazz')).dy),
);
await tester.tap(find.text('Jazz'));
await _settle(tester);
expect(find.byType(LibraryMixScreen), findsOneWidget);
expect(find.text('Song j1'), findsOneWidget);
expect(find.text('Song r1'), findsNothing);
expect(tester.takeException(), isNull);
});
}
testWidgets('the Mornye Genres page explains an empty Library', (
tester,
) async {
await _pump(
tester,
Scaffold(
body: MornyeLibraryScreen(
page: MornyeLibraryPage.genres,
onOpenSection: (_) {},
),
),
mornye: true,
genres: const [],
);
await _settle(tester);
expect(find.text('Your music will appear here'), findsOneWidget);
expect(tester.takeException(), isNull);
});
for (final desktop in [false, true]) {
for (final mornye in [false, true]) {
testWidgets('a genre lists exactly its songs, and Play and Shuffle '
'queue them (desktop: $desktop, Mornye: $mornye)', (tester) async {
final player = await _pump(
tester,
const LibraryMixScreen.genre(genre: _rock),
mornye: mornye,
desktop: desktop,
);
await _settle(tester);
expect(find.text('Rock'), findsWidgets);
expect(find.text('3 tracks'), findsOneWidget);
// A genre is not a mix: no artists line or daily refresh.
expect(find.text('Updated daily'), findsNothing);
for (final id in ['r1', 'r2', 'r3']) {
expect(find.text('Song $id'), findsOneWidget);
}
expect(find.text('Song j1'), findsNothing);
if (desktop) {
expect(find.byType(SliverTrackTable), findsOneWidget);
} else {
expect(find.byType(TrackCard), findsNWidgets(3));
}
await tester.tap(find.text('Play'));
await _settle(tester);
const queue = [
'network://example/r1.flac',
'network://example/r2.flac',
'network://example/r3.flac',
];
expect(player.queues.single, queue);
expect(player.starts.single, 0);
expect(player.shuffles, [false]);
// The Mornye phone header labels its Shuffle button.
await tester.tap(
mornye && !desktop
? find.text('Shuffle')
: findByTooltip('Shuffle').hitTestable().first,
);
await _settle(tester);
expect(player.queues.last, queue);
expect(player.shuffles.last, isTrue);
expect(tester.takeException(), isNull);
});
}
}
}
+107 -1
View File
@@ -12,11 +12,14 @@ import 'package:mornye/models/settings.dart';
import 'package:mornye/models/track.dart';
import 'package:mornye/providers/download_queue_provider.dart';
import 'package:mornye/models/unified_library_item.dart';
import 'package:mornye/providers/library_browse_provider.dart';
import 'package:mornye/providers/library_collections_provider.dart';
import 'package:mornye/providers/library_genres_provider.dart';
import 'package:mornye/providers/library_search_provider.dart';
import 'package:mornye/providers/local_library_provider.dart';
import 'package:mornye/providers/playback_provider.dart';
import 'package:mornye/providers/settings_provider.dart';
import 'package:mornye/screens/library_mix_screen.dart';
import 'package:mornye/screens/library_tracks_folder_screen.dart';
import 'package:mornye/screens/queue_tab.dart';
import 'package:mornye/services/history_database.dart';
@@ -32,6 +35,7 @@ import 'package:mornye/widgets/library_directory_view.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:sqflite/sqflite.dart';
import 'support/page_back.dart';
import 'support/tooltip_finder.dart';
class _Settings extends SettingsNotifier {
@@ -187,10 +191,11 @@ void main() {
bool withQueueItem = true,
String? librarySection,
List<Override> overrides = const [],
Size size = const Size(1280, 900),
}) async {
final preferences = await SharedPreferences.getInstance();
debugDesktopPlatformOverride = desktop;
tester.view.physicalSize = const Size(1280, 900);
tester.view.physicalSize = size;
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.reset);
final queue = DownloadQueueLookup.fromItems([
@@ -689,6 +694,107 @@ void main() {
expect(container.read(settingsProvider).historyFilterMode, 'folders');
});
testWidgets('the Genres tab lists genres and opens one; six tabs scroll at '
'phone width', (tester) async {
const genre = LibraryBrowseEntry(
source: '',
key: 'rock',
name: 'Rock',
artist: '',
samplePath: '',
trackCount: 2,
);
await pumpLibrary(
tester,
size: const Size(390, 844),
overrides: [
libraryGenresProvider.overrideWith((ref) async => const [genre]),
libraryGenreSongsProvider.overrideWith(
(ref, key) async => [
for (final id in ['a', 'b'])
UnifiedLibraryItem.fromLocalLibrary(
LocalLibraryItem(
id: id,
trackName: 'Rock song $id',
artistName: 'Artist',
albumName: 'Album',
filePath: '/music/$id.flac',
scannedAt: DateTime(2026, 11, 16),
),
),
],
),
],
);
final l10n = l10nOf(tester);
final tabs = find.byType(TabBar);
expect(tester.widget<TabBar>(tabs).isScrollable, isTrue);
expect(
find.descendant(of: tabs, matching: find.byType(Tab)),
findsNWidgets(6),
);
final genresTab = find.descendant(
of: tabs,
matching: find.text(l10n.libraryGenres),
);
await tester.ensureVisible(genresTab);
await tester.pump();
await tester.tap(genresTab);
for (var i = 0; i < 20; i++) {
await tester.pump(const Duration(milliseconds: 50));
}
final container = ProviderScope.containerOf(
tester.element(find.byType(QueueTab)),
);
expect(container.read(settingsProvider).historyFilterMode, 'genres');
expect(find.text('Rock'), findsOneWidget);
expect(find.text(l10n.tracksCount(2)), findsOneWidget);
await tester.tap(find.text('Rock'));
for (var i = 0; i < 20; i++) {
await tester.pump(const Duration(milliseconds: 50));
}
expect(find.byType(LibraryMixScreen), findsOneWidget);
expect(find.text('Rock song a'), findsOneWidget);
expect(find.text('Rock song b'), findsOneWidget);
await pageBack(tester);
for (var i = 0; i < 20; i++) {
await tester.pump(const Duration(milliseconds: 50));
}
// The last tab is still reachable at phone width.
final foldersTab = find.descendant(
of: tabs,
matching: find.text(l10n.libraryFolders),
);
await tester.ensureVisible(foldersTab);
await tester.pump();
await tester.tap(foldersTab);
for (var i = 0; i < 20; i++) {
await tester.pump(const Duration(milliseconds: 50));
}
expect(find.byType(LibraryDirectoryView), findsOneWidget);
expect(tester.takeException(), isNull);
});
testWidgets('the Genres tab explains an empty Library', (tester) async {
await pumpLibrary(tester);
final l10n = l10nOf(tester);
await tester.tap(
find.descendant(
of: find.byType(TabBar),
matching: find.text(l10n.libraryGenres),
),
);
for (var i = 0; i < 20; i++) {
await tester.pump(const Duration(milliseconds: 50));
}
// The mocked database has no songs.
expect(find.text(l10n.libraryGenresEmpty), findsOneWidget);
expect(tester.takeException(), isNull);
});
testWidgets('the pager leaves sideways swipes to song rows while they '
'swipe to queue', (tester) async {
await pumpLibrary(tester);