Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

detail: fix crash on multi-artist navigation

Browse source 
Caused by an unimplemented navigation branch in ArtistDetailFragment.
This commit is contained in:
Alexander Capehart 2023-08-17 20:24:17 -06:00
parent 58989f8568
commit d297c10b0a
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
View file

@ -221,8 +221,16 @@ class ArtistDetailFragment :
.navigateSafe(ArtistDetailFragmentDirections.showArtist(show.artist.uid)) .navigateSafe(ArtistDetailFragmentDirections.showArtist(show.artist.uid))
} }
} }
is Show.SongArtistDecision, is Show.SongArtistDecision -> {
is Show.AlbumArtistDecision, logD("Navigating to artist choices for ${show.song}")
findNavController()
.navigateSafe(ArtistDetailFragmentDirections.showArtistChoices(show.song.uid))
}
is Show.AlbumArtistDecision -> {
logD("Navigating to artist choices for ${show.album}")
findNavController()
.navigateSafe(ArtistDetailFragmentDirections.showArtistChoices(show.album.uid))
}
is Show.GenreDetails, is Show.GenreDetails,
is Show.PlaylistDetails -> { is Show.PlaylistDetails -> {
error("Unexpected show command $show") error("Unexpected show command $show")

2
app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
View file

@ -76,7 +76,7 @@ class AddToPlaylistDialog :
// --- VIEWMODEL SETUP --- // --- VIEWMODEL SETUP ---
pickerModel.setSongsToAdd(args.songUids) pickerModel.setSongsToAdd(args.songUids)
collect(musicModel.playlistDecision.flow, ::handleDecision) musicModel.playlistDecision.consume()
collectImmediately(pickerModel.currentSongsToAdd, ::updatePendingSongs) collectImmediately(pickerModel.currentSongsToAdd, ::updatePendingSongs)
collectImmediately(pickerModel.playlistAddChoices, ::updatePlaylistChoices) collectImmediately(pickerModel.playlistAddChoices, ::updatePlaylistChoices)
} }

3
app/src/main/res/navigation/inner.xml
View file

@ -263,6 +263,9 @@
<action <action
android:id="@+id/show_artist" android:id="@+id/show_artist"
app:destination="@id/artist_detail_fragment" /> app:destination="@id/artist_detail_fragment" />
<action
android:id="@+id/show_artist_choices"
app:destination="@id/show_artist_choices_dialog" />
<action <action
android:id="@+id/open_song_menu" android:id="@+id/open_song_menu"
app:destination="@id/song_menu_dialog" /> app:destination="@id/song_menu_dialog" />