fix: bug and layout music player

Author: Limzen

lib/screens/common/main_screen.dart

@@ -70,12 +70,12 @@ class _MainScreenState extends State<MainScreen> {
             icon: Icon(Icons.search, color: Colors.white.withOpacity(0.6)),
             label: 'Search',
           ),
-          NavigationDestination(
-            selectedIcon: const Icon(Icons.library_music, color: Colors.white),
-            icon: Icon(Icons.library_music_outlined,
-                color: Colors.white.withOpacity(0.6)),
-            label: 'Library',
-          ),
+          // NavigationDestination(
+          //   selectedIcon: const Icon(Icons.library_music, color: Colors.white),
+          //   icon: Icon(Icons.library_music_outlined,
+          //       color: Colors.white.withOpacity(0.6)),
+          //   label: 'Library',
+          // ),
         ],
       ),
     );

lib/screens/music_detail/music_detail_screen.dart

@@ -13,7 +13,9 @@ import 'package:spotify_clone/widget/music_player.dart';
 
 class MusicDetailScreen extends StatelessWidget {
   static const routeName = '/music_detail';
+
   const MusicDetailScreen({super.key});
+
   @override
   Widget build(BuildContext context) {
     return Consumer<MusicPlayerProvider>(
@@ -62,7 +64,7 @@ class MusicDetailScreen extends StatelessWidget {
                     child: Container(
                       width: double.maxFinite,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(4),
+                        borderRadius: BorderRadius.circular(20),
                         image: DecorationImage(
                           fit: BoxFit.cover,
                           image: NetworkImage(

lib/screens/music_detail/widget/artist_card.dart

@@ -82,7 +82,7 @@ Card artistCard(BuildContext context, Artist? artist) {
                                 ),
                       ),
                       Text(
-                          "${NumberFormat.compact().format(artist?.followers?.total)} followers",
+                          "${NumberFormat.compact().format(artist?.followers?.total ?? 0)} followers",
                           style:
                               Theme.of(context).textTheme.bodyMedium?.copyWith(
                                     color: Colors.white.withOpacity(.6),

lib/screens/playlist/playlist_screen.dart

@@ -1,16 +1,15 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-=======
 import 'package:flutter/widgets.dart';
 import 'package:flutter_sticky_header/flutter_sticky_header.dart';
 import 'package:flutter_sticky_widgets/flutter_sticky_widgets.dart';
->>>>>>> 57aba935741a56bc842eef15829cb9cd7941afc3
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:loading_animation_widget/loading_animation_widget.dart';
+import 'package:provider/provider.dart';
 import 'package:spotify/spotify.dart' hide Image, Offset;
 import 'package:spotify_clone/screens/search_music/widget/search_item_music.dart';
 
+import '../../providers/music_player_provider.dart';
 import '../../services/spotify.dart';
 
 class PlaylistScreen extends StatefulWidget {
@@ -123,7 +122,9 @@ class _PlaylistScreenState extends State<PlaylistScreen> {
                         iconSize: 56,
                         icon: const Icon(Icons.play_circle),
                         onPressed: () {
-                          Navigator.of(context).pop();
+                          Provider.of<MusicPlayerProvider>(context,
+                                  listen: false)
+                              .addFromPlaylist(tracks, 0);
                         },
                       ),
                     ),
@@ -155,12 +156,8 @@ class MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
   MySliverPersistentHeaderDelegate({required this.playlist});
 
   @override
-<<<<<<< HEAD
-  double get minExtent => 60.0;
-
-=======
   double get minExtent => 100.0;
->>>>>>> 57aba935741a56bc842eef15829cb9cd7941afc3
+
   @override
   double get maxExtent => 100.0;
 

lib/widget/music_player.dart

@@ -56,14 +56,10 @@ Column musicPlayer(
             ),
             color: Colors.black.withOpacity(.7),
             style: ButtonStyle(
-<<<<<<< HEAD
               minimumSize: MaterialStateProperty.all(const Size(50, 50)),
-              padding: MaterialStateProperty.all(EdgeInsets.zero),
-=======
               padding: MaterialStateProperty.all(
                 const EdgeInsets.all(15),
               ),
->>>>>>> 57aba935741a56bc842eef15829cb9cd7941afc3
               backgroundColor: MaterialStateProperty.all(Colors.white),
               shape: MaterialStateProperty.all(
                 const CircleBorder(),