CalvinBackup/SpotiFLAC-Mobile
1
0
Fork 0
mirror of https://github.com/zarzet/SpotiFLAC-Mobile.git synced 2026-08-14 23:20:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: add Favorite Artists collection

Browse Source 
- Add CollectionArtistEntry model with toJson/fromJson and artistCollectionKey helper
- Create favorite_artists table in SQLite with DB migration v1→v2
- Implement toggleFavoriteArtist/removeFavoriteArtist in LibraryCollectionsNotifier
- Add FavoriteArtistsScreen with list view, empty state, and artist navigation
- Add heart toggle button on ArtistScreen header (reactive via Riverpod selector)
- Integrate favorite artists folder in queue_tab collection grid/list views
- Add 8 new localization strings across all 13 locale files
This commit is contained in:
zarzet
2026-05-02 00:50:02 +07:00
parent 148e5c1231
commit 64dbf4441c
21 changed files with 1112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/providers/library_collections_provider.dart
+188
View File
@@ -19,6 +19,28 @@ String trackCollectionKey(Track track) {
return '$source:${track.id}';
}
String _stripCollectionResourcePrefix(String value) {
final colonIndex = value.indexOf(':');
if (colonIndex <= 0 || colonIndex == value.length - 1) {
return value.trim();
}
return value.substring(colonIndex + 1).trim();
}
String artistCollectionKey({
required String artistId,
required String? providerId,
}) {
final trimmedArtistId = artistId.trim();
final trimmedProviderId = providerId?.trim();
final source = trimmedProviderId != null && trimmedProviderId.isNotEmpty
? trimmedProviderId.toLowerCase()
: (trimmedArtistId.contains(':')
? trimmedArtistId.split(':').first.toLowerCase()
: 'builtin');
return '$source:${_stripCollectionResourcePrefix(trimmedArtistId)}';
}
class CollectionTrackEntry {
final String key;
final Track track;
@@ -46,6 +68,49 @@ class CollectionTrackEntry {
}
}
class CollectionArtistEntry {
final String key;
final String artistId;
final String? providerId;
final String name;
final String? imageUrl;
final DateTime addedAt;
const CollectionArtistEntry({
required this.key,
required this.artistId,
required this.providerId,
required this.name,
this.imageUrl,
required this.addedAt,
});
Map<String, dynamic> toJson() => {
'key': key,
'artistId': artistId,
'providerId': providerId,
'name': name,
'imageUrl': imageUrl,
'addedAt': addedAt.toIso8601String(),
};
factory CollectionArtistEntry.fromJson(Map<String, dynamic> json) {
final artistId = json['artistId'] as String;
final providerId = json['providerId'] as String?;
final addedAtRaw = json['addedAt'] as String?;
return CollectionArtistEntry(
key:
json['key'] as String? ??
artistCollectionKey(artistId: artistId, providerId: providerId),
artistId: artistId,
providerId: providerId,
name: json['name'] as String? ?? '',
imageUrl: json['imageUrl'] as String?,
addedAt: DateTime.tryParse(addedAtRaw ?? '') ?? DateTime.now(),
);
}
}
class UserPlaylistCollection {
final String id;
final String name;
@@ -180,9 +245,11 @@ class LibraryCollectionsState {
final List<CollectionTrackEntry> wishlist;
final List<CollectionTrackEntry> loved;
final List<UserPlaylistCollection> playlists;
final List<CollectionArtistEntry> favoriteArtists;
final bool isLoaded;
final Set<String> _wishlistKeys;
final Set<String> _lovedKeys;
final Set<String> _favoriteArtistKeys;
final Map<String, UserPlaylistCollection> _playlistsById;
final Set<String> _allPlaylistTrackKeys;
@@ -190,14 +257,19 @@ class LibraryCollectionsState {
this.wishlist = const [],
this.loved = const [],
this.playlists = const [],
this.favoriteArtists = const [],
this.isLoaded = false,
Set<String>? wishlistKeys,
Set<String>? lovedKeys,
Set<String>? favoriteArtistKeys,
Map<String, UserPlaylistCollection>? playlistsById,
Set<String>? allPlaylistTrackKeys,
}) : _wishlistKeys =
wishlistKeys ?? wishlist.map((entry) => entry.key).toSet(),
_lovedKeys = lovedKeys ?? loved.map((entry) => entry.key).toSet(),
_favoriteArtistKeys =
favoriteArtistKeys ??
favoriteArtists.map((entry) => entry.key).toSet(),
_playlistsById =
playlistsById ??
Map.fromEntries(
@@ -209,6 +281,7 @@ class LibraryCollectionsState {
int get wishlistCount => wishlist.length;
int get lovedCount => loved.length;
int get playlistCount => playlists.length;
int get favoriteArtistCount => favoriteArtists.length;
bool isInWishlist(Track track) {
final key = trackCollectionKey(track);
@@ -228,6 +301,18 @@ class LibraryCollectionsState {
return _lovedKeys.contains(trackKey);
}
bool isFavoriteArtist({
required String artistId,
required String? providerId,
}) {
final key = artistCollectionKey(artistId: artistId, providerId: providerId);
return _favoriteArtistKeys.contains(key);
}
bool containsFavoriteArtistKey(String artistKey) {
return _favoriteArtistKeys.contains(artistKey);
}
UserPlaylistCollection? playlistById(String playlistId) {
return _playlistsById[playlistId];
}
@@ -248,22 +333,30 @@ class LibraryCollectionsState {
List<CollectionTrackEntry>? wishlist,
List<CollectionTrackEntry>? loved,
List<UserPlaylistCollection>? playlists,
List<CollectionArtistEntry>? favoriteArtists,
bool? isLoaded,
}) {
final nextWishlist = wishlist ?? this.wishlist;
final nextLoved = loved ?? this.loved;
final nextPlaylists = playlists ?? this.playlists;
final nextFavoriteArtists = favoriteArtists ?? this.favoriteArtists;
final keepWishlistIndex = identical(nextWishlist, this.wishlist);
final keepLovedIndex = identical(nextLoved, this.loved);
final keepPlaylistIndex = identical(nextPlaylists, this.playlists);
final keepFavoriteArtistIndex = identical(
nextFavoriteArtists,
this.favoriteArtists,
);
return LibraryCollectionsState(
wishlist: nextWishlist,
loved: nextLoved,
playlists: nextPlaylists,
favoriteArtists: nextFavoriteArtists,
isLoaded: isLoaded ?? this.isLoaded,
wishlistKeys: keepWishlistIndex ? _wishlistKeys : null,
lovedKeys: keepLovedIndex ? _lovedKeys : null,
favoriteArtistKeys: keepFavoriteArtistIndex ? _favoriteArtistKeys : null,
playlistsById: keepPlaylistIndex ? _playlistsById : null,
allPlaylistTrackKeys: keepPlaylistIndex ? _allPlaylistTrackKeys : null,
);
@@ -273,12 +366,14 @@ class LibraryCollectionsState {
'wishlist': wishlist.map((e) => e.toJson()).toList(),
'loved': loved.map((e) => e.toJson()).toList(),
'playlists': playlists.map((e) => e.toJson()).toList(),
'favoriteArtists': favoriteArtists.map((e) => e.toJson()).toList(),
};
factory LibraryCollectionsState.fromJson(Map<String, dynamic> json) {
final wishlistRaw = (json['wishlist'] as List?) ?? const [];
final lovedRaw = (json['loved'] as List?) ?? const [];
final playlistsRaw = (json['playlists'] as List?) ?? const [];
final favoriteArtistsRaw = (json['favoriteArtists'] as List?) ?? const [];
return LibraryCollectionsState(
wishlist: wishlistRaw
@@ -300,6 +395,12 @@ class LibraryCollectionsState {
UserPlaylistCollection.fromJson(Map<String, dynamic>.from(e)),
)
.toList(growable: false),
favoriteArtists: favoriteArtistsRaw
.whereType<Map<Object?, Object?>>()
.map(
(e) => CollectionArtistEntry.fromJson(Map<String, dynamic>.from(e)),
)
.toList(growable: false),
isLoaded: true,
);
}
@@ -360,6 +461,14 @@ class LibraryCollectionsNotifier extends Notifier<LibraryCollectionsState> {
}
}
final favoriteArtists = <CollectionArtistEntry>[];
for (final row in snapshot.favoriteArtistRows) {
final parsed = _parseArtistEntryRow(row);
if (parsed != null) {
favoriteArtists.add(parsed);
}
}
final tracksByPlaylist = <String, List<CollectionTrackEntry>>{};
for (final row in snapshot.playlistTrackRows) {
final playlistId = row['playlist_id'] as String?;
@@ -396,6 +505,7 @@ class LibraryCollectionsNotifier extends Notifier<LibraryCollectionsState> {
wishlist: wishlist,
loved: loved,
playlists: playlists,
favoriteArtists: favoriteArtists,
isLoaded: true,
);
} catch (_) {
@@ -430,6 +540,31 @@ class LibraryCollectionsNotifier extends Notifier<LibraryCollectionsState> {
}
}
CollectionArtistEntry? _parseArtistEntryRow(Map<String, dynamic> row) {
final key = row['artist_key'] as String?;
final artistJson = row['artist_json'] as String?;
if (key == null ||
key.isEmpty ||
artistJson == null ||
artistJson.isEmpty) {
return null;
}
try {
final decoded = jsonDecode(artistJson);
if (decoded is! Map) return null;
final map = Map<String, dynamic>.from(decoded);
final addedAtRaw = row['added_at'] as String?;
return CollectionArtistEntry.fromJson({
...map,
'key': key,
'addedAt': map['addedAt'] ?? addedAtRaw,
});
} catch (_) {
return null;
}
}
bool _replacePlaylistById(
String playlistId,
UserPlaylistCollection Function(UserPlaylistCollection playlist) update,
@@ -503,6 +638,59 @@ class LibraryCollectionsNotifier extends Notifier<LibraryCollectionsState> {
return true;
}
Future<bool> toggleFavoriteArtist({
required String artistId,
required String? providerId,
required String name,
String? imageUrl,
}) async {
await _ensureLoaded();
final key = artistCollectionKey(artistId: artistId, providerId: providerId);
final sourceSeparator = key.indexOf(':');
final source = sourceSeparator > 0 ? key.substring(0, sourceSeparator) : '';
final trimmedProviderId = providerId?.trim();
final effectiveProviderId =
trimmedProviderId != null && trimmedProviderId.isNotEmpty
? trimmedProviderId
: (source.isNotEmpty && source != 'builtin' ? source : null);
if (state.containsFavoriteArtistKey(key)) {
await _db.deleteFavoriteArtistEntry(key);
final updated = state.favoriteArtists
.where((entry) => entry.key != key)
.toList(growable: false);
state = state.copyWith(favoriteArtists: updated);
return false;
}
final entry = CollectionArtistEntry(
key: key,
artistId: _stripCollectionResourcePrefix(artistId),
providerId: effectiveProviderId,
name: name,
imageUrl: imageUrl,
addedAt: DateTime.now(),
);
await _db.upsertFavoriteArtistEntry(
artistKey: key,
artistJson: jsonEncode(entry.toJson()),
addedAt: entry.addedAt.toIso8601String(),
);
final updated = [entry, ...state.favoriteArtists];
state = state.copyWith(favoriteArtists: updated);
return true;
}
Future<void> removeFavoriteArtist(String artistKey) async {
await _ensureLoaded();
if (!state.containsFavoriteArtistKey(artistKey)) return;
await _db.deleteFavoriteArtistEntry(artistKey);
final updated = state.favoriteArtists
.where((entry) => entry.key != artistKey)
.toList(growable: false);
state = state.copyWith(favoriteArtists: updated);
}
Future<void> removeFromWishlist(String trackKey) async {
await _ensureLoaded();
if (!state.containsWishlistKey(trackKey)) return;