Skip to content

Commit dbc038d

Browse files
theovilardotheovilardo
authored
Merge pull request #2302 from theovilardo/impl/better-animations-on-song-info-sheet
Impl/better animations on song info sheet
2 parents 3ae6697 + 6c516d4 commit dbc038d

11 files changed

Lines changed: 876 additions & 464 deletions

File tree

‎app/src/main/java/com/theveloper/pixelplay/presentation/components/DailyMixSection.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,12 @@ fun DailyMixSection(
119119
queueName = dailyMixQueueName,
120120
isVoluntaryPlay = false
121121
)
122-
showSongInfoSheet = false
123122
},
124123
onAddToQueue = {
125124
playerViewModel.addSongToQueue(song)
126-
showSongInfoSheet = false
127125
},
128126
onAddNextToQueue = {
129127
playerViewModel.addSongNextToQueue(song)
130-
showSongInfoSheet = false
131128
},
132129
onAddToPlayList = {
133130
showPlaylistBottomSheet = true

‎app/src/main/java/com/theveloper/pixelplay/presentation/components/SongInfoBottomSheet.kt‎

Lines changed: 876 additions & 434 deletions
Large diffs are not rendered by default.

‎app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerOverlaysLayer.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,13 @@ internal fun UnifiedPlayerSongInfoLayer(
216216
contextSongs = currentPlaybackQueueProvider(),
217217
queueName = currentQueueSourceNameProvider()
218218
)
219-
onDismissSongInfo()
220219
},
221220
onAddToQueue = {
222221
playerViewModel.addSongToQueue(liveSong)
223-
onDismissSongInfo()
224222
Toast.makeText(context, context.getString(R.string.toast_added_to_queue), Toast.LENGTH_SHORT).show()
225223
},
226224
onAddNextToQueue = {
227225
playerViewModel.addSongNextToQueue(liveSong)
228-
onDismissSongInfo()
229226
Toast.makeText(context, context.getString(R.string.toast_playing_next), Toast.LENGTH_SHORT).show()
230227
},
231228
onAddToPlayList = {

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/AlbumDetailScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,15 +421,12 @@ fun AlbumDetailScreen(
421421
onDismiss = { showSongInfoBottomSheet = false },
422422
onPlaySong = {
423423
playerViewModel.showAndPlaySong(currentSong)
424-
showSongInfoBottomSheet = false
425424
},
426425
onAddToQueue = {
427426
playerViewModel.addSongToQueue(currentSong)
428-
showSongInfoBottomSheet = false
429427
},
430428
onAddNextToQueue = {
431429
playerViewModel.addSongNextToQueue(currentSong)
432-
showSongInfoBottomSheet = false
433430
},
434431
onAddToPlayList = {
435432
showPlaylistBottomSheet = true;

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/ArtistDetailScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,15 +477,12 @@ fun ArtistDetailScreen(
477477
onDismiss = { showSongInfoBottomSheet = false },
478478
onPlaySong = {
479479
playerViewModel.showAndPlaySong(currentSong)
480-
showSongInfoBottomSheet = false
481480
},
482481
onAddToQueue = {
483482
playerViewModel.addSongToQueue(currentSong)
484-
showSongInfoBottomSheet = false
485483
},
486484
onAddNextToQueue = {
487485
playerViewModel.addSongNextToQueue(currentSong)
488-
showSongInfoBottomSheet = false
489486
},
490487
onAddToPlayList = {
491488
showPlaylistBottomSheet = true

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/DailyMixScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,12 @@ fun DailyMixScreen(
186186
onDismiss = { showSongInfoSheet = false },
187187
onPlaySong = {
188188
playerViewModel.showAndPlaySong(song, dailyMixSongs, dailyMixTitle, isVoluntaryPlay = false)
189-
showSongInfoSheet = false
190189
},
191190
onAddToQueue = {
192191
playerViewModel.addSongToQueue(song)
193-
showSongInfoSheet = false
194192
},
195193
onAddNextToQueue = {
196194
playerViewModel.addSongNextToQueue(song)
197-
showSongInfoSheet = false
198195
},
199196
onAddToPlayList = {
200197
showPlaylistBottomSheet = true;

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/GenreDetailScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,16 +489,13 @@ fun GenreDetailScreen(
489489
onDismiss = { showSongOptionsSheet = null },
490490
onPlaySong = {
491491
playerViewModel.showAndPlaySong(song, uiState.sortedSongs, genreDisplayName)
492-
showSongOptionsSheet = null
493492
},
494493
onAddToQueue = {
495494
playerViewModel.addSongToQueue(song)
496-
showSongOptionsSheet = null
497495
playerViewModel.sendToast(toastAddedToQueue)
498496
},
499497
onAddNextToQueue = {
500498
playerViewModel.addSongNextToQueue(song)
501-
showSongOptionsSheet = null
502499
playerViewModel.sendToast(toastPlayingNext)
503500
},
504501
onAddToPlayList = {

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibraryScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,16 +1867,13 @@ fun LibraryScreen(
18671867
onDismiss = { showSongInfoBottomSheet = false },
18681868
onPlaySong = {
18691869
playerViewModel.showAndPlaySong(currentSong)
1870-
showSongInfoBottomSheet = false
18711870
},
18721871
onAddToQueue = {
18731872
playerViewModel.addSongToQueue(currentSong) // Assumes such a method exists or will be added
1874-
showSongInfoBottomSheet = false
18751873
playerViewModel.sendToast(context.getString(R.string.toast_added_to_queue))
18761874
},
18771875
onAddNextToQueue = {
18781876
playerViewModel.addSongNextToQueue(currentSong)
1879-
showSongInfoBottomSheet = false
18801877
playerViewModel.sendToast(context.getString(R.string.toast_playing_next))
18811878
},
18821879
onAddToPlayList = {

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/PlaylistDetailScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -977,16 +977,13 @@ fun PlaylistDetailScreen(
977977
onDismiss = { showSongInfoBottomSheet = false },
978978
onPlaySong = {
979979
playerViewModel.showAndPlaySong(currentSong)
980-
showSongInfoBottomSheet = false
981980
},
982981
onAddToQueue = {
983982
playerViewModel.addSongToQueue(currentSong) // Assumes such a method exists or will be added
984-
showSongInfoBottomSheet = false
985983
playerViewModel.sendToast(toastAddedToQueue)
986984
},
987985
onAddNextToQueue = {
988986
playerViewModel.addSongNextToQueue(currentSong)
989-
showSongInfoBottomSheet = false
990987
playerViewModel.sendToast(toastPlayingNext)
991988
},
992989
onAddToPlayList = {

‎app/src/main/java/com/theveloper/pixelplay/presentation/screens/RecentlyPlayedScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,15 +288,12 @@ fun RecentlyPlayedScreen(
288288
if (queueSongs.isNotEmpty()) {
289289
playerViewModel.playSongs(queueSongs, song, queueRecentlyPlayed)
290290
}
291-
showSongInfoBottomSheet = false
292291
},
293292
onAddToQueue = {
294293
playerViewModel.addSongToQueue(song)
295-
showSongInfoBottomSheet = false
296294
},
297295
onAddNextToQueue = {
298296
playerViewModel.addSongNextToQueue(song)
299-
showSongInfoBottomSheet = false
300297
},
301298
onAddToPlayList = {
302299
showPlaylistBottomSheet = true

0 commit comments

Comments
 (0)