From 4596e6e82ccdd0cee2927f7528daf1fe620371a1 Mon Sep 17 00:00:00 2001 From: =logicgupta59 Date: Wed, 9 Mar 2022 09:44:48 +0530 Subject: [PATCH 1/4] init --- .../name/monkey/retromusic/fragments/LibraryViewModel.kt | 7 +++++++ 1 file changed, 7 insertions(+) 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 b462da4aa..6aad38135 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 @@ -363,6 +363,13 @@ class LibraryViewModel( createPlaylist(PlaylistEntity(playlistName = playlistName)) insertSongs(songs.map { it.toSongEntity(playlistId) }) forceReload(Playlists) + withContext(Main){ + Toast.makeText( + App.getContext(), + "Added ${songs.size} song(s) to $playlistName", + Toast.LENGTH_SHORT + ).show() + } } else { val playlist = playlists.firstOrNull() if (playlist != null) { From 7f3d803ac945a4b8a0dd14ef3d5f07c7ce9dbaf4 Mon Sep 17 00:00:00 2001 From: =logicgupta59 Date: Wed, 9 Mar 2022 09:45:55 +0530 Subject: [PATCH 2/4] done for issue #1283 --- .../code/name/monkey/retromusic/fragments/LibraryViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6aad38135..575037806 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 @@ -363,7 +363,7 @@ class LibraryViewModel( createPlaylist(PlaylistEntity(playlistName = playlistName)) insertSongs(songs.map { it.toSongEntity(playlistId) }) forceReload(Playlists) - withContext(Main){ + withContext(Main) { Toast.makeText( App.getContext(), "Added ${songs.size} song(s) to $playlistName", From 16e765d150be1bacda7ef2f9de07c59787573894 Mon Sep 17 00:00:00 2001 From: =logicgupta59 Date: Wed, 9 Mar 2022 22:45:09 +0530 Subject: [PATCH 3/4] code cleanup --- .../retromusic/fragments/LibraryViewModel.kt | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) 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 575037806..a38223105 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 @@ -363,13 +363,6 @@ class LibraryViewModel( createPlaylist(PlaylistEntity(playlistName = playlistName)) insertSongs(songs.map { it.toSongEntity(playlistId) }) forceReload(Playlists) - withContext(Main) { - Toast.makeText( - App.getContext(), - "Added ${songs.size} song(s) to $playlistName", - Toast.LENGTH_SHORT - ).show() - } } else { val playlist = playlists.firstOrNull() if (playlist != null) { @@ -377,21 +370,31 @@ class LibraryViewModel( it.toSongEntity(playListId = playlist.playListId) }) } - withContext(Main) { - Toast.makeText( - App.getContext(), - "Playlist already exists", - Toast.LENGTH_SHORT - ).show() - if (songs.isNotEmpty()) { + } + withContext(Main) { + when { + playlists.isEmpty() -> { Toast.makeText( App.getContext(), - "Adding songs to $playlistName", + "$playlistName created successfully", + Toast.LENGTH_SHORT + ).show() + } + checkPlaylistExists(playlistName).isNotEmpty() -> { + Toast.makeText( + App.getContext(), + "Playlist already exists", + Toast.LENGTH_SHORT + ).show() + } + playlists.isNotEmpty() -> { + Toast.makeText( + App.getContext(), + "Added ${songs.size} song(s) to $playlistName", Toast.LENGTH_SHORT ).show() } } - } } } From 4aed5b81fe09136dded4dbc5056a8615f9acfc7b Mon Sep 17 00:00:00 2001 From: =logicgupta59 Date: Wed, 9 Mar 2022 22:51:47 +0530 Subject: [PATCH 4/4] code cleanup complete --- .../monkey/retromusic/fragments/LibraryViewModel.kt | 11 ++++++++--- app/src/main/res/values/strings.xml | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) 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 a38223105..f5fe9076c 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 @@ -376,21 +376,26 @@ class LibraryViewModel( playlists.isEmpty() -> { Toast.makeText( App.getContext(), - "$playlistName created successfully", + App.getContext() + .getString(R.string.playlist_created_sucessfully, playlistName), Toast.LENGTH_SHORT ).show() } checkPlaylistExists(playlistName).isNotEmpty() -> { Toast.makeText( App.getContext(), - "Playlist already exists", + App.getContext().getString(R.string.playList_already_exits), Toast.LENGTH_SHORT ).show() } playlists.isNotEmpty() -> { Toast.makeText( App.getContext(), - "Added ${songs.size} song(s) to $playlistName", + App.getContext().getString( + R.string.added_song_count_to_playlist, + songs.size, + playlistName + ), Toast.LENGTH_SHORT ).show() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a9224574..a43a1181e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -544,4 +544,7 @@ You will be forwarded to the issue tracker website. Your account data is only used for authentication. Share Crash Report + %s created successfully + Playlist already exists + Added %d song(s) to %s