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

Revert "detail: fix up navigation"

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
View file

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

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

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

8
app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
View file

@ -22,7 +22,6 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.navigation.findNavController import androidx.navigation.findNavController
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.transition.MaterialSharedAxis import com.google.android.material.transition.MaterialSharedAxis
@ -130,11 +129,4 @@ abstract class DetailFragment<P : MusicParent, C : Music> :
} }
abstract fun onOpenParentMenu() 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()
}
} }

2
app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
View file

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

3
app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt
View file

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