Revert "detail: fix up navigation"

This reverts commit bfdccd3ba5.
This commit is contained in:
Alexander Capehart 2025-02-21 11:31:09 -07:00
parent bfdccd3ba5
commit 6589cd44eb
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
5 changed files with 5 additions and 12 deletions

View file

@ -106,7 +106,7 @@ class AlbumDetailFragment : DetailFragment<Album, Song>() {
private fun updateAlbum(album: Album?) {
if (album == null) {
L.d("No album to show, navigating away")
exit()
findNavController().navigateUp()
return
}

View file

@ -113,7 +113,7 @@ class ArtistDetailFragment : DetailFragment<Artist, Music>() {
private fun updateArtist(artist: Artist?) {
if (artist == null) {
L.d("No artist to show, navigating away")
exit()
findNavController().navigateUp()
return
}
val binding = requireBinding()

View file

@ -22,7 +22,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import androidx.fragment.app.activityViewModels
import androidx.navigation.findNavController
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.GridLayoutManager
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.transition.MaterialSharedAxis
@ -130,11 +129,4 @@ abstract class DetailFragment<P : MusicParent, C : Music> :
}
abstract fun onOpenParentMenu()
protected fun exit() {
// For some insane and absurd reason we wont actually navigate away in detail views
// until this is called twice.
findNavController().navigateUp()
findNavController().navigateUp()
}
}

View file

@ -112,7 +112,7 @@ class GenreDetailFragment : DetailFragment<Genre, Music>() {
private fun updateGenre(genre: Genre?) {
if (genre == null) {
L.d("No genre to show, navigating away")
exit()
findNavController().navigateUp()
return
}
val binding = requireBinding()

View file

@ -184,7 +184,8 @@ class PlaylistDetailFragment :
private fun updatePlaylist(playlist: Playlist?, editedPlaylist: List<Song>?) {
if (playlist == null) {
exit()
// Playlist we were showing no longer exists.
findNavController().navigateUp()
return
}
val binding = requireBinding()