From fe16ffb5bf226b4daabcde5448308774a6e3e2e6 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Wed, 27 Jul 2022 08:48:13 -0600
Subject: [PATCH] queue: temporarily remove navigation

Temporarily remove queue navigation, as it can no longer really fit
with the new transitions.

This will eventually be replaced with a queue bottom sheet, implying
that I can abuse one into working.
---
 CHANGELOG.md                                              | 1 +
 app/src/main/java/org/oxycblt/auxio/MainFragment.kt       | 2 --
 .../org/oxycblt/auxio/playback/PlaybackPanelFragment.kt   | 8 --------
 .../main/java/org/oxycblt/auxio/ui/NavigationViewModel.kt | 2 --
 app/src/main/res/layout/fragment_main.xml                 | 3 ++-
 app/src/main/res/menu/menu_playback.xml                   | 5 -----
 app/src/main/res/navigation/nav_main.xml                  | 3 ---
 7 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99de2d1a2..5c467dac1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ at the cost of longer loading times
 - Added ability to play songs from queue
 
 #### What's Improved
+- Added motion transitions throughout the entire app
 - App now exposes an (immutable) queue.
 
 #### What's Fixed
diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index cbca55393..ac6557bc7 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -102,8 +102,6 @@ class MainFragment : ViewBindingFragment<FragmentMainBinding>() {
                 findNavController().navigate(MainFragmentDirections.actionShowSettings())
             is MainNavigationAction.About ->
                 findNavController().navigate(MainFragmentDirections.actionShowAbout())
-            is MainNavigationAction.Queue ->
-                findNavController().navigate(MainFragmentDirections.actionShowQueue())
             is MainNavigationAction.SongDetails ->
                 findNavController()
                     .navigate(MainFragmentDirections.actionShowDetails(action.song.id))
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
index 40ba5603f..fb04f2c16 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
@@ -55,10 +55,6 @@ class PlaybackPanelFragment :
     private val playbackModel: PlaybackViewModel by androidActivityViewModels()
     private val navModel: NavigationViewModel by activityViewModels()
 
-    private val queueItem: MenuItem by lifecycleObject { binding ->
-        binding.playbackToolbar.menu.findItem(R.id.action_queue)
-    }
-
     override fun onCreateBinding(inflater: LayoutInflater) =
         FragmentPlaybackPanelBinding.inflate(inflater)
 
@@ -125,10 +121,6 @@ class PlaybackPanelFragment :
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.action_queue -> {
-                navModel.mainNavigateTo(MainNavigationAction.Queue)
-                true
-            }
             R.id.action_go_artist -> {
                 playbackModel.song.value?.let { navModel.exploreNavigateTo(it.album.artist) }
                 true
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/NavigationViewModel.kt b/app/src/main/java/org/oxycblt/auxio/ui/NavigationViewModel.kt
index bb367fe38..23585dda3 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/NavigationViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/NavigationViewModel.kt
@@ -91,8 +91,6 @@ sealed class MainNavigationAction {
     object Settings : MainNavigationAction()
     /** Go to the about page. */
     object About : MainNavigationAction()
-    /** Go to the queue. */
-    object Queue : MainNavigationAction()
     /** Show song details. */
     data class SongDetails(val song: Song) : MainNavigationAction()
 }
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 9e1475916..13c92f21a 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
 
     <org.oxycblt.auxio.playback.BottomSheetLayout
         android:id="@+id/bottom_sheet_layout"
diff --git a/app/src/main/res/menu/menu_playback.xml b/app/src/main/res/menu/menu_playback.xml
index 078a3c709..d98429906 100644
--- a/app/src/main/res/menu/menu_playback.xml
+++ b/app/src/main/res/menu/menu_playback.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_queue"
-        android:icon="@drawable/ic_queue_24"
-        android:title="@string/lbl_queue"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_go_artist"
         android:title="@string/lbl_go_artist"
diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml
index 18aa26c42..f93b4827f 100644
--- a/app/src/main/res/navigation/nav_main.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -8,9 +8,6 @@
         android:name="org.oxycblt.auxio.MainFragment"
         android:label="MainFragment"
         tools:layout="@layout/fragment_main">
-        <action
-            android:id="@+id/action_show_queue"
-            app:destination="@id/queue_fragment" />
         <action
             android:id="@+id/action_show_settings"
             app:destination="@id/settings_fragment" />