nyancrimew/PlayerAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Code refactor

Browse source
This commit is contained in:
Hemanth S 2020-09-02 20:50:38 +05:30
parent 34b5d01e8d
commit 9da8cb99ce
2 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
View file

@ -197,7 +197,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
fun updateIsFavorite() { fun updateIsFavorite() {
lifecycleScope.launch(IO) { lifecycleScope.launch(IO) {
val playlist: PlaylistEntity = libraryViewModel.favoritePlaylist().first() val playlist: PlaylistEntity? = libraryViewModel.favoritePlaylist().firstOrNull()
if (playlist != null) {
val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId) val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
val isFavorite = libraryViewModel.isFavoriteSong(song).isNotEmpty() val isFavorite = libraryViewModel.isFavoriteSong(song).isNotEmpty()
withContext(Main) { withContext(Main) {
@ -218,6 +219,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
} }
} }
} }
}
private fun updateLyrics() { private fun updateLyrics() {
setLyrics(null) setLyrics(null)

13
app/src/main/res/navigation/main_graph.xml
View file

@ -5,10 +5,6 @@
android:id="@+id/retro_graph" android:id="@+id/retro_graph"
app:startDestination="@id/libraryFragment"> app:startDestination="@id/libraryFragment">
<include app:graph="@navigation/settings_graph" />
<include app:graph="@navigation/library_graph" />
<fragment <fragment
android:id="@+id/genreDetailsFragment" android:id="@+id/genreDetailsFragment"
android:name="code.name.monkey.retromusic.fragments.genres.GenreDetailsFragment" android:name="code.name.monkey.retromusic.fragments.genres.GenreDetailsFragment"
@ -53,14 +49,7 @@
android:id="@+id/libraryFragment" android:id="@+id/libraryFragment"
android:name="code.name.monkey.retromusic.fragments.library.LibraryFragment" android:name="code.name.monkey.retromusic.fragments.library.LibraryFragment"
android:label="" android:label=""
tools:layout="@layout/fragment_library"> 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>
<fragment <fragment
android:id="@+id/detailListFragment" android:id="@+id/detailListFragment"