From 9da8cb99cec71d037ae5c3aa217207bcf12359c8 Mon Sep 17 00:00:00 2001
From: Hemanth S <hemanths@live.com>
Date: Wed, 2 Sep 2020 20:50:38 +0530
Subject: [PATCH] Code refactor

---
 .../fragments/base/AbsPlayerFragment.kt       | 36 ++++++++++---------
 app/src/main/res/navigation/main_graph.xml    | 13 +------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index 1aa7dc14..55405bd9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -197,23 +197,25 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
 
     fun updateIsFavorite() {
         lifecycleScope.launch(IO) {
-            val playlist: PlaylistEntity = libraryViewModel.favoritePlaylist().first()
-            val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
-            val isFavorite = libraryViewModel.isFavoriteSong(song).isNotEmpty()
-            withContext(Main) {
-                val icon =
-                    if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-                val drawable =
-                    RetroUtil.getTintedVectorDrawable(
-                        requireContext(),
-                        icon,
-                        toolbarIconColor()
-                    )
-                if (playerToolbar() != null) {
-                    playerToolbar()?.menu?.findItem(R.id.action_toggle_favorite)
-                        ?.setIcon(drawable)?.title =
-                        if (isFavorite) getString(R.string.action_remove_from_favorites)
-                        else getString(R.string.action_add_to_favorites)
+            val playlist: PlaylistEntity? = libraryViewModel.favoritePlaylist().firstOrNull()
+            if (playlist != null) {
+                val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
+                val isFavorite = libraryViewModel.isFavoriteSong(song).isNotEmpty()
+                withContext(Main) {
+                    val icon =
+                        if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
+                    val drawable =
+                        RetroUtil.getTintedVectorDrawable(
+                            requireContext(),
+                            icon,
+                            toolbarIconColor()
+                        )
+                    if (playerToolbar() != null) {
+                        playerToolbar()?.menu?.findItem(R.id.action_toggle_favorite)
+                            ?.setIcon(drawable)?.title =
+                            if (isFavorite) getString(R.string.action_remove_from_favorites)
+                            else getString(R.string.action_add_to_favorites)
+                    }
                 }
             }
         }
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
index c3d3f444..009217c2 100644
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@@ -5,10 +5,6 @@
     android:id="@+id/retro_graph"
     app:startDestination="@id/libraryFragment">
 
-    <include app:graph="@navigation/settings_graph" />
-
-    <include app:graph="@navigation/library_graph" />
-
     <fragment
         android:id="@+id/genreDetailsFragment"
         android:name="code.name.monkey.retromusic.fragments.genres.GenreDetailsFragment"
@@ -53,14 +49,7 @@
         android:id="@+id/libraryFragment"
         android:name="code.name.monkey.retromusic.fragments.library.LibraryFragment"
         android:label=""
-        tools:layout="@layout/fragment_library">
-        <action
-            android:id="@+id/action_main_to_library"
-            app:destination="@id/library_graph" />
-        <action
-            android:id="@+id/action_main_to_settings"
-            app:destination="@id/settings_graph" />
-    </fragment>
+        tools:layout="@layout/fragment_library" />
 
     <fragment
         android:id="@+id/detailListFragment"