update readme banner and Imp. static routes, and player

HemantKArya · Mar 11, 2024 · 1fa613c · 1fa613c
1 parent 2d305c7
commit 1fa613c
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
- ![BloomeeTunes](./assets/icons/Bloomee_Logo_cover.png)
+ ![BloomeeTunes](./assets/icons/new_bloomee_bamnner.png)
 # **Bloomee Music 🌸🎶**
 
 Bloomee is my experimental Flutter project, a music app to learn Flutter for My future projects and designed to bring you ad-free tunes from various sources. Dive into a world of limitless music from platforms like YouTube and Jio Saavn, with more sources blooming soon! 🌼🎵

diff --git a/assets/icons/new_bloomee_bamnner.png b/assets/icons/new_bloomee_bamnner.png
diff --git a/lib/blocs/mediaPlayer/bloomee_player_cubit.dart b/lib/blocs/mediaPlayer/bloomee_player_cubit.dart
@@ -54,9 +54,9 @@ class BloomeePlayerCubit extends Cubit<BloomeePlayerState> {
   @override
   Future<void> close() {
     EasyDebounce.cancelAll();
-    bloomeePlayer.audioPlayer.dispose();
-    bloomeePlayer.currentQueueName.close();
     bloomeePlayer.stop();
+    bloomeePlayer.currentQueueName.close();
+    bloomeePlayer.audioPlayer.dispose();
     return super.close();
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -5,7 +5,9 @@ import 'package:Bloomee/model/MediaPlaylistModel.dart';
 import 'package:Bloomee/model/songModel.dart';
 import 'package:Bloomee/model/youtube_vid_model.dart';
 import 'package:Bloomee/repository/Youtube/youtube_api.dart';
+import 'package:Bloomee/routes_and_consts/global_str_consts.dart';
 import 'package:Bloomee/screens/widgets/snackbar.dart';
+import 'package:Bloomee/services/bloomeePlayer.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:Bloomee/blocs/add_to_playlist/cubit/add_to_playlist_cubit.dart';
@@ -58,14 +60,17 @@ void ProcessIncomingIntent(List<SharedMediaFile> _sharedFiles) {
         if (value != null) {
           YouTubeServices()
               .formatVideo(video: value, quality: "High")
-              .then((value) {
+              .then((value) async {
             if (value != null) {
               MediaItemModel _mIM = fromYtVidSongMap2MediaItem(value);
               MediaPlaylist _tempPlaylist = MediaPlaylist(
                 albumName: "Shared Playlist",
                 mediaItems: [_mIM],
               );
               log(_mIM.title, name: "Shared Files");
+              await bloomeePlayerCubit.bloomeePlayer
+                  .loadPlaylist(_tempPlaylist, doPlay: true);
+              GlobalRoutes.globalRouter.pushNamed(GlobalStrConsts.playerScreen);
             }
           });
         }
@@ -74,13 +79,21 @@ void ProcessIncomingIntent(List<SharedMediaFile> _sharedFiles) {
   }
 }
 
+late BloomeePlayerCubit bloomeePlayerCubit;
+void setupPlayerCubit() {
+  bloomeePlayerCubit = BloomeePlayerCubit();
+}
+
 void main() {
+  WidgetsFlutterBinding.ensureInitialized();
+
   try {
     dotenv.load(fileName: "assets/.env");
   } on Exception catch (e) {
     log("error $e");
     dotenv.load(mergeWith: io.Platform.environment);
   }
+  setupPlayerCubit();
   runApp(const MyApp());
 }
 
@@ -107,6 +120,7 @@ class _MyAppState extends State<MyApp> {
       log(_sharedFiles[0].mimeType.toString(), name: "Shared Files");
       log(_sharedFiles[0].path, name: "Shared Files");
       ProcessIncomingIntent(_sharedFiles);
+
       // Tell the library that we are done processing the intent.
       ReceiveSharingIntent.reset();
     });
@@ -118,15 +132,24 @@ class _MyAppState extends State<MyApp> {
       log(_sharedFiles[0].mimeType.toString(), name: "Shared Files Offline");
       log(_sharedFiles[0].path, name: "Shared Files Offline");
       ProcessIncomingIntent(_sharedFiles);
+      ReceiveSharingIntent.reset();
     });
   }
 
+  @override
+  void dispose() {
+    _intentSub.cancel();
+    bloomeePlayerCubit.bloomeePlayer.audioPlayer.dispose();
+    bloomeePlayerCubit.close();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => BloomeePlayerCubit(),
+          create: (context) => bloomeePlayerCubit,
           lazy: false,
         ),
         BlocProvider(
@@ -169,7 +192,7 @@ class _MyAppState extends State<MyApp> {
             } else {
               return MaterialApp.router(
                 scaffoldMessengerKey: SnackbarService.messengerKey,
-                routerConfig: GlobalRoutes().globalRouter,
+                routerConfig: GlobalRoutes.globalRouter,
               );
             }
           },

diff --git a/lib/routes_and_consts/routes.dart b/lib/routes_and_consts/routes.dart
@@ -14,7 +14,7 @@ import 'package:Bloomee/screens/widgets/global_navbar.dart';
 class GlobalRoutes {
   static final globalRouterKey = GlobalKey<NavigatorState>();
 
-  final globalRouter = GoRouter(
+  static final globalRouter = GoRouter(
     initialLocation: '/${GlobalStrConsts.exploreScreen}',
     navigatorKey: globalRouterKey,
     routes: [

diff --git a/lib/screens/widgets/mini_player_widget.dart b/lib/screens/widgets/mini_player_widget.dart
@@ -190,7 +190,6 @@ class MiniPlayerWidget extends StatelessWidget {
                         onPressed: () => context
                             .read<BloomeePlayerCubit>()
                             .bloomeePlayer
-                            .audioPlayer
                             .stop(),
                         icon: const Icon(
                           Icons.close_rounded,

diff --git a/lib/services/bloomeePlayer.dart b/lib/services/bloomeePlayer.dart
@@ -156,7 +156,7 @@ class BloomeeMusicPlayer extends BaseAudioHandler
   @override
   Future<void> stop() async {
     // log("Called Stop!!");
-    // audioPlayer.stop();
+    audioPlayer.stop();
     super.stop();
   }
 
@@ -177,6 +177,7 @@ class BloomeeMusicPlayer extends BaseAudioHandler
 
   @override
   Future<void> onNotificationDeleted() {
+    audioPlayer.dispose();
     audioPlayer.stop();
     super.stop();