Merge pull request gokadzev#191 from Spyy004/master

Re-rendering of user liked songs list & cleaner implementation for liking/disliking song
kittean · Mar 25, 2023 · c3172d1 · c3172d1
2 parents e5e6ac0 + 021446b
commit c3172d1
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 36 deletions.
diff --git a/lib/API/musify.dart b/lib/API/musify.dart
@@ -31,6 +31,9 @@ Map activePlaylist = {
   'list': [],
 };
 
+late final currentLikedSongsLength =
+ValueNotifier<int>(userLikedSongsList.length);
+
 final lyrics = ValueNotifier<String>('null');
 String lastFetchedLyrics = 'null';
 

diff --git a/lib/screens/user_liked_songs_page.dart b/lib/screens/user_liked_songs_page.dart
@@ -116,22 +116,26 @@ class _UserLikedSongsState extends State<UserLikedSongs> {
               ],
             ),
             const Padding(padding: EdgeInsets.only(top: 20)),
-            ListView.builder(
-              shrinkWrap: true,
-              physics: const BouncingScrollPhysics(),
-              addAutomaticKeepAlives: false,
-              addRepaintBoundaries: false,
-              itemCount: userLikedSongsList.length,
-              itemBuilder: (BuildContext context, int index) {
-                return Padding(
-                  padding: const EdgeInsets.only(top: 5, bottom: 5),
-                  child: SongBar(
-                    userLikedSongsList[index],
-                    true,
-                  ),
-                );
-              },
-            )
+            ValueListenableBuilder(
+                valueListenable: currentLikedSongsLength,
+                builder: (_, value, __) {
+                  return ListView.builder(
+                    shrinkWrap: true,
+                    physics: const BouncingScrollPhysics(),
+                    addAutomaticKeepAlives: false,
+                    addRepaintBoundaries: false,
+                    itemCount: userLikedSongsList.length,
+                    itemBuilder: (BuildContext context, int index) {
+                      return Padding(
+                        padding: const EdgeInsets.only(top: 5, bottom: 5),
+                        child: SongBar(
+                          userLikedSongsList[index],
+                          true,
+                        ),
+                      );
+                    },
+                  );
+                })
           ],
         ),
       ),

diff --git a/lib/widgets/song_bar.dart b/lib/widgets/song_bar.dart
@@ -8,9 +8,14 @@ import 'package:musify/style/app_themes.dart';
 
 class SongBar extends StatelessWidget {
   SongBar(this.song, this.clearPlaylist, {super.key});
-
   late final dynamic song;
   late final bool clearPlaylist;
+
+  final likeStatusToIconMapper = {
+    true: FluentIcons.star_24_filled,
+    false: FluentIcons.star_24_regular
+  };
+
   late final songLikeStatus =
       ValueNotifier<bool>(isSongAlreadyLiked(song['ytid']));
 
@@ -99,25 +104,19 @@ class SongBar extends StatelessWidget {
                 ValueListenableBuilder<bool>(
                   valueListenable: songLikeStatus,
                   builder: (_, value, __) {
-                    if (value == true) {
-                      return IconButton(
-                        color: colorScheme.primary,
-                        icon: const Icon(FluentIcons.star_24_filled),
-                        onPressed: () => {
-                          updateLikeStatus(song['ytid'], false),
-                          songLikeStatus.value = false
-                        },
-                      );
-                    } else {
-                      return IconButton(
-                        color: colorScheme.primary,
-                        icon: const Icon(FluentIcons.star_24_regular),
-                        onPressed: () => {
-                          updateLikeStatus(song['ytid'], true),
-                          songLikeStatus.value = true
-                        },
-                      );
-                    }
+                    return IconButton(
+                      onPressed: () => {
+                        songLikeStatus.value = !songLikeStatus.value,
+                        updateLikeStatus(
+                          song['ytid'],
+                          songLikeStatus.value,
+                        ),
+                        currentLikedSongsLength.value = value
+                            ? currentLikedSongsLength.value + 1
+                            : currentLikedSongsLength.value - 1
+                      },
+                      icon: Icon(likeStatusToIconMapper[value]),
+                    );
                   },
                 ),
                 IconButton(