Refactor song management: move SongBloc to playlists feature and update dependencies

Author: ShokhrukhbekYuldoshev

lib/main.dart

@@ -12,7 +12,7 @@ import 'package:meloplay/src/features/playlists/bloc/playlists/playlists_cubit.d
 import 'package:meloplay/src/features/playlists/bloc/recents/recents_bloc.dart';
 import 'package:meloplay/src/features/config/bloc/scan/scan_cubit.dart';
 import 'package:meloplay/src/features/home/bloc/search/search_bloc.dart';
-import 'package:meloplay/src/features/player/bloc/song/song_bloc.dart';
+import 'package:meloplay/src/features/playlists/bloc/song/song_bloc.dart';
 import 'package:meloplay/src/features/config/bloc/theme/theme_bloc.dart';
 import 'package:meloplay/src/core/di/service_locator.dart';
 import 'package:meloplay/src/core/services/music_player.dart';

lib/src/core/di/service_locator.dart

@@ -9,7 +9,7 @@ import 'package:meloplay/src/features/player/bloc/player/player_bloc.dart';
 import 'package:meloplay/src/features/playlists/bloc/recents/recents_bloc.dart';
 import 'package:meloplay/src/features/config/bloc/scan/scan_cubit.dart';
 import 'package:meloplay/src/features/home/bloc/search/search_bloc.dart';
-import 'package:meloplay/src/features/player/bloc/song/song_bloc.dart';
+import 'package:meloplay/src/features/playlists/bloc/song/song_bloc.dart';
 import 'package:meloplay/src/features/config/bloc/theme/theme_bloc.dart';
 
 import 'package:meloplay/src/features/home/data/repositories/home_repository.dart';
@@ -46,17 +46,17 @@ void init() {
 
   sl.registerFactory(() => ThemeBloc());
 
-  sl.registerFactory(() => HomeBloc(repository: sl<HomeRepository>()));
+  sl.registerFactory(() => HomeBloc(repository: sl()));
 
-  sl.registerFactory(() => PlayerBloc(sl<MusicPlayer>()));
+  sl.registerFactory(() => PlayerBloc(sl()));
 
-  sl.registerFactory(() => SongBloc(repository: sl<SongRepository>()));
+  sl.registerFactory(() => SongBloc(repository: sl()));
 
-  sl.registerFactory(() => FavoritesBloc(repository: sl<SongRepository>()));
+  sl.registerFactory(() => FavoritesBloc(repository: sl()));
 
-  sl.registerFactory(() => RecentsBloc(repository: sl<SongRepository>()));
+  sl.registerFactory(() => RecentsBloc(repository: sl()));
 
-  sl.registerFactory(() => SearchBloc(repository: sl<SearchRepository>()));
+  sl.registerFactory(() => SearchBloc(repository: sl()));
 
   /// -----------------------
   /// CUBITS

lib/src/core/shared/buttons/animated_favorite_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:just_audio_background/just_audio_background.dart';
-import 'package:meloplay/src/features/player/bloc/song/song_bloc.dart';
+import 'package:meloplay/src/features/playlists/bloc/song/song_bloc.dart';
 
 class AnimatedFavoriteButton extends StatefulWidget {
   final bool isFavorite;

lib/src/features/player/bloc/song/song_bloc.dart

@@ -13,7 +13,7 @@ import 'package:meloplay/src/core/shared/buttons/repeat_button.dart';
 import 'package:meloplay/src/core/shared/buttons/shuffle_button.dart';
 import 'package:meloplay/src/core/shared/sleep_timer_dialog.dart';
 import 'package:on_audio_query/on_audio_query.dart';
-import 'package:meloplay/src/features/player/bloc/song/song_bloc.dart';
+import 'package:meloplay/src/features/playlists/bloc/song/song_bloc.dart';
 import 'package:meloplay/src/core/di/service_locator.dart';
 import 'package:meloplay/src/core/services/music_player.dart';
 import 'package:meloplay/src/features/playlists/data/repositories/song_repository.dart';

lib/src/features/player/presentation/player_page.dart

@@ -1,23 +1,31 @@
+// favorites_bloc.dart
 import 'package:bloc/bloc.dart';
 import 'package:flutter/foundation.dart';
 import 'package:meloplay/src/features/playlists/data/repositories/song_repository.dart';
-
 import 'package:on_audio_query/on_audio_query.dart';
 
 part 'favorites_event.dart';
 part 'favorites_state.dart';
 
 class FavoritesBloc extends Bloc<FavoritesEvent, FavoritesState> {
+  final SongRepository _repository;
+
   FavoritesBloc({required SongRepository repository})
-    : super(FavoritesInitial()) {
-    on<FetchFavorites>((event, emit) async {
-      emit(FavoritesLoading());
-      try {
-        final favoriteSongs = await repository.getFavoriteSongs();
-        emit(FavoritesLoaded(favoriteSongs));
-      } catch (e) {
-        emit(FavoritesError(e.toString()));
-      }
-    });
+    : _repository = repository,
+      super(FavoritesInitial()) {
+    on<FetchFavorites>(_onFetchFavorites);
+  }
+
+  Future<void> _onFetchFavorites(
+    FetchFavorites event,
+    Emitter<FavoritesState> emit,
+  ) async {
+    emit(FavoritesLoading());
+    try {
+      final favoriteSongs = await _repository.getFavoriteSongs();
+      emit(FavoritesLoaded(favoriteSongs));
+    } catch (e) {
+      emit(FavoritesError(e.toString()));
+    }
   }
 }

lib/src/features/playlists/bloc/favorites/favorites_bloc.dart

@@ -1,22 +1,31 @@
+// recents_bloc.dart
 import 'package:bloc/bloc.dart';
 import 'package:flutter/foundation.dart';
 import 'package:meloplay/src/features/playlists/data/repositories/song_repository.dart';
-
 import 'package:on_audio_query/on_audio_query.dart';
 
 part 'recents_event.dart';
 part 'recents_state.dart';
 
 class RecentsBloc extends Bloc<RecentsEvent, RecentsState> {
-  RecentsBloc({required SongRepository repository}) : super(RecentsInitial()) {
-    on<FetchRecents>((event, emit) async {
-      emit(RecentsLoading());
-      try {
-        final recentSongs = await repository.getRecentlyPlayedSongs();
-        emit(RecentsLoaded(recentSongs));
-      } catch (e) {
-        emit(RecentsError(e.toString()));
-      }
-    });
+  final SongRepository _repository;
+
+  RecentsBloc({required SongRepository repository})
+    : _repository = repository,
+      super(RecentsInitial()) {
+    on<FetchRecents>(_onFetchRecents);
+  }
+
+  Future<void> _onFetchRecents(
+    FetchRecents event,
+    Emitter<RecentsState> emit,
+  ) async {
+    emit(RecentsLoading());
+    try {
+      final recentSongs = await _repository.getRecentlyPlayedSongs();
+      emit(RecentsLoaded(recentSongs));
+    } catch (e) {
+      emit(RecentsError(e.toString()));
+    }
   }
 }

lib/src/features/playlists/bloc/recents/recents_bloc.dart

@@ -0,0 +1,44 @@
+// song_bloc.dart
+import 'package:bloc/bloc.dart';
+import 'package:flutter/foundation.dart';
+import 'package:meloplay/src/features/playlists/data/repositories/song_repository.dart';
+
+part 'song_event.dart';
+part 'song_state.dart';
+
+class SongBloc extends Bloc<SongEvent, SongState> {
+  final SongRepository _repository;
+
+  SongBloc({required SongRepository repository})
+    : _repository = repository,
+      super(PlayerInitial()) {
+    on<ToggleFavorite>(_onToggleFavorite);
+    on<AddToRecentlyPlayed>(_onAddToRecentlyPlayed);
+  }
+
+  Future<void> _onToggleFavorite(
+    ToggleFavorite event,
+    Emitter<SongState> emit,
+  ) async {
+    emit(ToggleFavoriteInProgress());
+    try {
+      await _repository.toggleFavorite(event.songId);
+      emit(ToggleFavoriteSuccess());
+    } catch (e) {
+      emit(ToggleFavoriteFailure());
+    }
+  }
+
+  Future<void> _onAddToRecentlyPlayed(
+    AddToRecentlyPlayed event,
+    Emitter<SongState> emit,
+  ) async {
+    emit(AddToRecentlyPlayedInProgress());
+    try {
+      await _repository.addToRecentlyPlayed(event.songId);
+      emit(AddToRecentlyPlayedSuccess());
+    } catch (e) {
+      emit(AddToRecentlyPlayedError());
+    }
+  }
+}