From c19680c1f72aab00e5c730bd785cf1b95fe7f496 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Mon, 16 Nov 2020 21:34:59 -0700
Subject: [PATCH] Temporarily remove playback nav

Remove the ability to navigate to the parent album from CompactPlaybackFragment for now, as it was causing issues.
---
 .../auxio/detail/ArtistDetailFragment.kt      |  6 ++
 .../oxycblt/auxio/library/LibraryFragment.kt  | 13 ----
 .../auxio/playback/CompactPlaybackFragment.kt | 15 +---
 .../auxio/playback/PlaybackViewModel.kt       | 12 +--
 .../main/res/layout/fragment_album_detail.xml |  1 +
 app/src/main/res/navigation/nav_main.xml      | 73 -------------------
 6 files changed, 12 insertions(+), 108 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
index 1addcf673..d15000328 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@@ -106,4 +106,10 @@ class ArtistDetailFragment : DetailFragment() {
 
         return binding.root
     }
+
+    override fun onResume() {
+        super.onResume()
+
+        detailModel.updateNavigationStatus(false)
+    }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
index a1b00305b..362532668 100644
--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
@@ -15,7 +15,6 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.transition.Fade
 import androidx.transition.TransitionManager
-import org.oxycblt.auxio.MainFragmentDirections
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentLibraryBinding
 import org.oxycblt.auxio.library.adapters.LibraryAdapter
@@ -157,18 +156,6 @@ class LibraryFragment : Fragment(), SearchView.OnQueryTextListener {
             }
         }
 
-        playbackModel.navToPlayingSong.observe(viewLifecycleOwner) {
-            if (it) {
-                findNavController().navigate(
-                    MainFragmentDirections.actionShowAlbum(
-                        playbackModel.song.value!!.album.id, true
-                    )
-                )
-
-                playbackModel.doneWithNavToPlayingSong()
-            }
-        }
-
         Log.d(this::class.simpleName, "Fragment created.")
 
         return binding.root
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt
index b62e770d6..1ce42197a 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt
@@ -49,17 +49,10 @@ class CompactPlaybackFragment : Fragment() {
         binding.song = MusicStore.getInstance().songs[0]
         binding.playbackModel = playbackModel
 
-        binding.root.apply {
-            setOnClickListener {
-                findNavController().navigate(
-                    MainFragmentDirections.actionGoToPlayback()
-                )
-            }
-
-            setOnLongClickListener {
-                playbackModel.navigateToPlayingSong()
-                true
-            }
+        binding.root.setOnClickListener {
+            findNavController().navigate(
+                MainFragmentDirections.actionGoToPlayback()
+            )
         }
 
         // --- VIEWMODEL SETUP ---
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
index 2596e5084..b00f29393 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
@@ -19,6 +19,7 @@ import org.oxycblt.auxio.playback.state.PlaybackStateManager
 
 /**
  * The ViewModel that provides a UI-Focused frontend for [PlaybackStateManager].
+ * TODO: Implement navigation to playing album/artist
  * @author OxygenCobalt
  */
 class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback {
@@ -59,9 +60,6 @@ class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback {
     private val mIsSeeking = MutableLiveData(false)
     val isSeeking: LiveData<Boolean> get() = mIsSeeking
 
-    private val mNavToPlayingSong = MutableLiveData(false)
-    val navToPlayingSong: LiveData<Boolean> get() = mNavToPlayingSong
-
     val formattedPosition = Transformations.map(mPosition) {
         it.toDuration()
     }
@@ -265,14 +263,6 @@ class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback {
         mIsSeeking.value = value
     }
 
-    fun navigateToPlayingSong() {
-        mNavToPlayingSong.value = true
-    }
-
-    fun doneWithNavToPlayingSong() {
-        mNavToPlayingSong.value = false
-    }
-
     // --- OVERRIDES ---
 
     override fun onCleared() {
diff --git a/app/src/main/res/layout/fragment_album_detail.xml b/app/src/main/res/layout/fragment_album_detail.xml
index 98577e32c..0c5a1b523 100644
--- a/app/src/main/res/layout/fragment_album_detail.xml
+++ b/app/src/main/res/layout/fragment_album_detail.xml
@@ -86,6 +86,7 @@
                     android:layout_marginStart="@dimen/margin_medium"
                     android:clickable="true"
                     android:focusable="true"
+                    android:background="@drawable/ui_ripple"
                     android:onClick="@{() -> detailModel.doNavToParent()}"
                     android:text="@{album.artist.name}"
                     android:textAppearance="?android:attr/textAppearanceListItem"
diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml
index 838653968..40d5a0d83 100644
--- a/app/src/main/res/navigation/nav_main.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -25,27 +25,6 @@
         android:name="org.oxycblt.auxio.MainFragment"
         android:label="MainFragment"
         tools:layout="@layout/fragment_main">
-        <action
-            android:id="@+id/action_show_artist"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:destination="@id/artist_detail_fragment" />
-        <action
-            android:id="@+id/action_show_album"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:destination="@id/album_detail_fragment" />
-        <action
-            android:id="@+id/action_show_genre"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:destination="@id/genre_detail_fragment" />
         <action
             android:id="@+id/action_return_to_loading"
             app:destination="@id/loading_fragment"
@@ -59,58 +38,6 @@
             app:popEnterAnim="@anim/anim_stationary"
             app:popExitAnim="@anim/anim_nav_slide_down" />
     </fragment>
-    <fragment
-        android:id="@+id/artist_detail_fragment"
-        android:name="org.oxycblt.auxio.detail.ArtistDetailFragment"
-        android:label="ArtistDetailFragment"
-        tools:layout="@layout/fragment_artist_detail">
-        <argument
-            android:name="artistId"
-            app:argType="long" />
-        <action
-            android:id="@+id/action_show_album"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:destination="@id/album_detail_fragment"
-            app:launchSingleTop="true" />
-    </fragment>
-    <fragment
-        android:id="@+id/album_detail_fragment"
-        android:name="org.oxycblt.auxio.detail.AlbumDetailFragment"
-        android:label="AlbumDetailFragment"
-        tools:layout="@layout/fragment_album_detail">
-        <argument
-            android:name="albumId"
-            app:argType="long" />
-        <argument
-            android:name="enableParentNav"
-            app:argType="boolean" />
-        <action
-            android:id="@+id/action_show_parent_artist"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:destination="@id/artist_detail_fragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/genre_detail_fragment"
-        android:name="org.oxycblt.auxio.detail.GenreDetailFragment"
-        android:label="GenreDetailFragment"
-        tools:layout="@layout/fragment_genre_detail">
-        <action
-            android:id="@+id/action_show_artist"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:destination="@id/artist_detail_fragment" />
-        <argument
-            android:name="genreId"
-            app:argType="long" />
-    </fragment>
     <fragment
         android:id="@+id/playback_fragment"
         android:name="org.oxycblt.auxio.playback.PlaybackFragment"