diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt index 8f700ea9d..944b1db67 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt @@ -16,6 +16,7 @@ package code.name.monkey.retromusic.fragments import android.animation.ValueAnimator import android.content.Context +import android.widget.Toast import androidx.core.animation.doOnEnd import androidx.lifecycle.* import code.name.monkey.retromusic.* @@ -46,7 +47,6 @@ class LibraryViewModel( private val songs = MutableLiveData>() private val artists = MutableLiveData>() private val playlists = MutableLiveData>() - private val legacyPlaylists = MutableLiveData>() private val genres = MutableLiveData>() private val searchResults = MutableLiveData>() private val fabMargin = MutableLiveData(0) @@ -78,8 +78,6 @@ class LibraryViewModel( fun getPlaylists(): LiveData> = playlists - fun getLegacyPlaylist(): LiveData> = legacyPlaylists - fun getGenre(): LiveData> = genres fun getHome(): LiveData> = home @@ -108,12 +106,6 @@ class LibraryViewModel( playlists.postValue(repository.fetchPlaylistWithSongs()) } - private fun fetchLegacyPlaylist() { - viewModelScope.launch(IO) { - legacyPlaylists.postValue(repository.fetchLegacyPlaylist()) - } - } - private suspend fun fetchGenres() { genres.postValue(repository.fetchGenres()) } @@ -249,12 +241,6 @@ class LibraryViewModel( } } - fun deleteTracks(songs: List) = viewModelScope.launch(IO) { - repository.deleteSongs(songs) - fetchPlaylists() - loadLibraryContent() - } - fun recentSongs(): LiveData> = liveData(IO) { emit(repository.recentSongs()) } @@ -348,7 +334,8 @@ class LibraryViewModel( createPlaylist(PlaylistEntity(playlistName = playlistName)) insertSongs(songs.map { it.toSongEntity(playlistId) }) withContext(Main) { - context.showToast(R.string.playlist_created_sucessfully) + context.showToast(context.getString(R.string.playlist_created_sucessfully, + playlistName)) } } else { val playlist = playlists.firstOrNull() @@ -360,7 +347,12 @@ class LibraryViewModel( } forceReload(Playlists) withContext(Main) { - context.showToast(R.string.added_song_count_to_playlist) + context.showToast( + context.getString( + R.string.added_song_count_to_playlist, + songs.size, + playlistName), + Toast.LENGTH_SHORT) } } }