Merge branch 'room-playlist' of https://github.com/h4h13/RetroMusicPlayer into room-playlist

app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt

@@ -104,7 +104,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             adapter = songAdapter
             layoutManager = linearLayoutManager()
         }
-        repository.historySong().observe(viewLifecycleOwner, Observer {
+        repository.observableHistorySongs().observe(viewLifecycleOwner, Observer {
             val songs = it.map { historyEntity -> historyEntity.toSong() }
             songAdapter.swapDataSet(songs)
         })

app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt

@@ -38,6 +38,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.network.Result
 import code.name.monkey.retromusic.network.model.LastFmAlbum
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.MusicUtil
@@ -83,15 +84,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
             startPostponedEnterTransition()
             showAlbum(it)
         })
-        detailsViewModel.getArtist().observe(viewLifecycleOwner, Observer {
-            loadArtistImage(it)
-        })
-        detailsViewModel.getMoreAlbums().observe(viewLifecycleOwner, Observer {
-            moreAlbums(it)
-        })
-        detailsViewModel.getAlbumInfo().observe(viewLifecycleOwner, Observer {
-            aboutAlbum(it)
-        })
+
         setupRecyclerView()
         artistImage.setOnClickListener {
             requireActivity().findNavController(R.id.fragment_container)
@@ -172,8 +165,23 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         }
         loadAlbumCover(album)
         simpleSongAdapter.swapDataSet(album.songs)
-        detailsViewModel.loadArtist(album.artistId)
-        detailsViewModel.loadAlbumInfo(album)
+        detailsViewModel.getArtist(album.artistId).observe(viewLifecycleOwner, Observer {
+            loadArtistImage(it)
+        })
+
+        detailsViewModel.getAlbumInfo(album).observe(viewLifecycleOwner, Observer { result ->
+            when (result) {
+                is Result.Loading -> {
+                    println("Loading")
+                }
+                is Result.Error -> {
+                    println("Error")
+                }
+                is Result.Success -> {
+                    aboutAlbum(result.data)
+                }
+            }
+        })
     }
 
     private fun moreAlbums(albums: List<Album>) {
@@ -214,6 +222,9 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     }
 
     private fun loadArtistImage(artist: Artist) {
+        detailsViewModel.getMoreAlbums(artist).observe(viewLifecycleOwner, Observer {
+            moreAlbums(it)
+        })
         ArtistGlideRequest.Builder.from(Glide.with(requireContext()), artist)
             .forceDownload(PreferenceUtil.isAllowedToDownloadMetadata())
             .generatePalette(requireContext())

app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt

@@ -1,70 +1,44 @@
 package code.name.monkey.retromusic.fragments.albums
 
-import androidx.lifecycle.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.liveData
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.network.Result
 import code.name.monkey.retromusic.network.model.LastFmAlbum
 import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 
 class AlbumDetailsViewModel(
     private val realRepository: RealRepository,
     private val albumId: Int
 ) : ViewModel(), MusicServiceEventListener {
 
-    private val _album = MutableLiveData<Album>()
-    private val _artist = MutableLiveData<Artist>()
-    private val _lastFmAlbum = MutableLiveData<LastFmAlbum>()
-    private val _moreAlbums = MutableLiveData<List<Album>>()
-
     fun getAlbum(): LiveData<Album> = liveData(IO) {
         val album = realRepository.albumByIdAsync(albumId)
         emit(album)
     }
 
-    fun getArtist(): LiveData<Artist> = _artist
-    fun getAlbumInfo(): LiveData<LastFmAlbum> = _lastFmAlbum
-    fun getMoreAlbums(): LiveData<List<Album>> = _moreAlbums
-
-    init {
-        loadAlbumDetails()
-    }
-
-    fun getAlbum2() = liveData(context = viewModelScope.coroutineContext + IO) {
-        val album = realRepository.albumByIdAsync(albumId)
-        emit(album)
-    }
-
-    private fun loadAlbumDetails() = viewModelScope.launch(IO) {
-        val album = loadAlbumAsync.await() ?: throw NullPointerException("Album couldn't found")
-        _album.postValue(album)
-    }
-
-    fun loadAlbumInfo(album: Album) = viewModelScope.launch(IO) {
-        val lastFmAlbum = realRepository.albumInfo(album.artistName ?: "-", album.title ?: "-")
-        _lastFmAlbum.postValue(lastFmAlbum)
-    }
-
-    fun loadArtist(artistId: Int) = viewModelScope.launch(IO) {
+    fun getArtist(artistId: Int): LiveData<Artist> = liveData(IO) {
         val artist = realRepository.artistById(artistId)
-        _artist.postValue(artist)
-
-        artist.albums?.filter { item -> item.id != albumId }?.let { albums ->
-            if (albums.isNotEmpty()) _moreAlbums.postValue(albums)
-        }
+        emit(artist)
     }
 
-    private val loadAlbumAsync: Deferred<Album?>
-        get() = viewModelScope.async(IO) {
-            realRepository.albumByIdAsync(albumId)
+    fun getAlbumInfo(album: Album): LiveData<Result<LastFmAlbum>> = liveData {
+        emit(Result.Loading)
+        emit( realRepository.albumInfo(album.artistName ?: "-", album.title ?: "-"))
+    }
+
+    fun getMoreAlbums(artist: Artist): LiveData<List<Album>> = liveData(IO) {
+        artist.albums?.filter { item -> item.id != albumId }?.let { albums ->
+            if (albums.isNotEmpty()) emit(albums)
         }
+    }
 
     override fun onMediaStoreChanged() {
-        loadAlbumDetails()
+
     }
 
     override fun onServiceConnected() {}

app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt

@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
@@ -32,6 +33,7 @@ import code.name.monkey.retromusic.glide.ArtistGlideRequest
 import code.name.monkey.retromusic.glide.SingleColorTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.network.Result
 import code.name.monkey.retromusic.network.model.LastFmArtist
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.CustomArtistImageUtil
@@ -77,9 +79,7 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
             showArtist(it)
             startPostponedEnterTransition()
         })
-        detailsViewModel.getArtistInfo().observe(viewLifecycleOwner, Observer {
-            artistInfo(it)
-        })
+
 
         playAction.apply {
             setOnClickListener { MusicPlayerRemote.openQueue(artist.songs, 0, true) }
@@ -140,6 +140,7 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
         albumTitle.text = albumText
         songAdapter.swapDataSet(artist.songs.sortedBy { it.trackNumber })
         artist.albums?.let { albumAdapter.swapDataSet(it) }
+
     }
 
     private fun loadBiography(
@@ -148,7 +149,14 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
     ) {
         biography = null
         this.lang = lang
-        detailsViewModel.loadBiography(name, lang, null)
+        detailsViewModel.getArtistInfo(name, lang, null)
+            .observe(viewLifecycleOwner, Observer { result ->
+                when (result) {
+                    is Result.Loading -> println("Loading")
+                    is Result.Error -> println("Error")
+                    is Result.Success -> artistInfo(result.data)
+                }
+            })
     }
 
     private fun artistInfo(lastFmArtist: LastFmArtist?) {
@@ -201,7 +209,7 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
     override fun onAlbumClick(albumId: Int, view: View) {
         findNavController().navigate(
             R.id.albumDetailsFragment,
-            bundleOf("extra_album_id" to albumId),
+            bundleOf(EXTRA_ALBUM_ID to albumId),
             null,
             FragmentNavigatorExtras(
                 view to getString(R.string.transition_album_art)

app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt

@@ -1,51 +1,37 @@
 package code.name.monkey.retromusic.fragments.artists
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.liveData
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
 import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.network.Result
 import code.name.monkey.retromusic.network.model.LastFmArtist
 import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.Dispatchers.IO
 
 class ArtistDetailsViewModel(
     private val realRepository: RealRepository,
     private val artistId: Int
 ) : ViewModel(), MusicServiceEventListener {
 
-    private val loadArtistDetailsAsync: Deferred<Artist?>
-        get() = viewModelScope.async(Dispatchers.IO) {
-            realRepository.artistById(artistId)
-        }
-
-    private val _artist = MutableLiveData<Artist>()
-    private val _lastFmArtist = MutableLiveData<LastFmArtist>()
-
-    fun getArtist(): LiveData<Artist> = _artist
-    fun getArtistInfo(): LiveData<LastFmArtist> = _lastFmArtist
-
-    init {
-        loadArtistDetails()
+    fun getArtist(): LiveData<Artist> = liveData(IO) {
+        val artist = realRepository.artistById(artistId)
+        emit(artist)
     }
 
-    private fun loadArtistDetails() = viewModelScope.launch {
-        val artist =
-            loadArtistDetailsAsync.await() ?: throw NullPointerException("Album couldn't found")
-        _artist.postValue(artist)
-    }
-
-    fun loadBiography(name: String, lang: String?, cache: String?) = viewModelScope.launch {
+    fun getArtistInfo(
+        name: String,
+        lang: String?,
+        cache: String?
+    ): LiveData<Result<LastFmArtist>> = liveData(IO) {
+        emit(Result.Loading)
         val info = realRepository.artistInfo(name, lang, cache)
-        _lastFmArtist.postValue(info)
+        emit(info)
     }
 
     override fun onMediaStoreChanged() {
-        loadArtistDetails()
+        getArtist()
     }
 
     override fun onServiceConnected() {}

app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchViewModel.kt

@@ -6,9 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import code.name.monkey.retromusic.repository.RealRepository
 import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class SearchViewModel(private val realRepository: RealRepository) : ViewModel() {
     private val results = MutableLiveData<MutableList<Any>>()
@@ -17,6 +15,6 @@ class SearchViewModel(private val realRepository: RealRepository) : ViewModel()
 
     fun search(query: String?) = viewModelScope.launch(IO) {
         val result = realRepository.search(query)
-        withContext(Main) { results.postValue(result) }
+        results.value = result
     }
 }