Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code cleanup

Browse source
This commit is contained in:
Omar 2022-03-19 21:51:52 +02:00
parent fce3844ed5
commit 94275e3725
2 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
View file

@ -17,24 +17,19 @@ package code.name.monkey.retromusic.dialogs
import android.app.Dialog
import android.os.Bundle
import android.widget.ArrayAdapter
import android.widget.Toast
import androidx.core.os.bundleOf
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope
import code.name.monkey.retromusic.EXTRA_PLAYLISTS
import code.name.monkey.retromusic.EXTRA_SONG
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.db.PlaylistEntity
import code.name.monkey.retromusic.db.toSongs
import code.name.monkey.retromusic.db.toSongsEntity
import code.name.monkey.retromusic.extensions.colorButtons
import code.name.monkey.retromusic.extensions.extraNotNull
import code.name.monkey.retromusic.extensions.materialDialog
import code.name.monkey.retromusic.fragments.LibraryViewModel
import code.name.monkey.retromusic.fragments.ReloadType.Playlists
import code.name.monkey.retromusic.model.Song
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
class AddToPlaylistDialog : DialogFragment() {
@ -78,21 +73,9 @@ class AddToPlaylistDialog : DialogFragment() {
if (which == 0) {
showCreateDialog(songs)
} else {
lifecycleScope.launch(Dispatchers.IO) {
val playlistName = playlistEntities[which - 1].playlistName
val songEntities = songs.toSongsEntity(playlistEntities[which - 1])
if (songEntities.isNotEmpty()) {
libraryViewModel.insertSongs(songEntities)
libraryViewModel.forceReload(Playlists)
withContext(Dispatchers.Main) {
Toast.makeText(
requireContext(), getString(R.string.added_song_count_to_playlist,
songEntities.size,
playlistEntities[which - 1].playlistName
), Toast.LENGTH_SHORT).show()
}
}
}
libraryViewModel.addToPlaylist(playlistName, songEntities.toSongs())
}
dialog.dismiss()
}

2
app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
View file

@ -378,7 +378,6 @@ class LibraryViewModel(
val playlistId: Long =
createPlaylist(PlaylistEntity(playlistName = playlistName))
insertSongs(songs.map { it.toSongEntity(playlistId) })
forceReload(Playlists)
withContext(Main) {
Toast.makeText(
App.getContext(),
@ -395,6 +394,7 @@ class LibraryViewModel(
})
}
}
forceReload(Playlists)
withContext(Main) {
Toast.makeText(App.getContext(), App.getContext().getString(
R.string.added_song_count_to_playlist,