From bb9c842154a6bbb546d8c40b91d0c7d92cb035a4 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Thu, 11 Aug 2022 12:28:00 -0600
Subject: [PATCH] playback: add song menu option to names

Re-add the song menu option to the title section of the playback view.

This is again, due to the addition of the equalizer button, but also to
make this menu easier to reach.
---
 .../auxio/playback/PlaybackPanelFragment.kt   | 17 +++++-----
 .../layout-h600dp/fragment_playback_panel.xml | 32 +++++++++++++------
 .../fragment_playback_panel.xml               |  3 +-
 .../res/layout/fragment_playback_panel.xml    |  2 +-
 app/src/main/res/layout/fragment_settings.xml |  4 ++-
 app/src/main/res/layout/item_queue_song.xml   |  6 ++--
 .../res/menu/menu_playback_song_actions.xml   | 12 +++++++
 7 files changed, 51 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/menu/menu_playback_song_actions.xml

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 2afe92070..34f7f9b2b 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
@@ -27,16 +27,13 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentPlaybackPanelBinding
 import org.oxycblt.auxio.music.MusicParent
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.ui.MainNavigationAction
-import org.oxycblt.auxio.ui.NavigationViewModel
-import org.oxycblt.auxio.ui.fragment.ViewBindingFragment
-import org.oxycblt.auxio.util.androidActivityViewModels
+import org.oxycblt.auxio.ui.fragment.MenuFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.showToast
 import org.oxycblt.auxio.util.systemBarInsetsCompat
@@ -49,13 +46,11 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat
  * TODO: Make seek thumb grow when selected
  */
 class PlaybackPanelFragment :
-    ViewBindingFragment<FragmentPlaybackPanelBinding>(),
+    MenuFragment<FragmentPlaybackPanelBinding>(),
     StyledSeekBar.Callback,
     Toolbar.OnMenuItemClickListener {
-    private val playbackModel: PlaybackViewModel by androidActivityViewModels()
-    private val navModel: NavigationViewModel by activityViewModels()
 
-    // AudioEffect expects you to use startActivityForResult with the panel intent. Use
+    // AudioEffect expects you to use startActivityFoResult with the panel intent. Use
     // the contract analogue for this since there is no built-in contract for AudioEffect.
     private val activityLauncher by lifecycleObject {
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -97,6 +92,12 @@ class PlaybackPanelFragment :
             playbackModel.song.value?.let { navModel.exploreNavigateTo(it.album) }
         }
 
+        binding.playbackSongMenu?.setOnClickListener { view ->
+            playbackModel.song.value?.let { song ->
+                musicMenu(view, R.menu.menu_playback_song_actions, song)
+            }
+        }
+
         binding.playbackSeekBar.callback = this
 
         binding.playbackRepeat.setOnClickListener { playbackModel.incrementRepeatMode() }
diff --git a/app/src/main/res/layout-h600dp/fragment_playback_panel.xml b/app/src/main/res/layout-h600dp/fragment_playback_panel.xml
index 0ae0c32a1..bc34a3071 100644
--- a/app/src/main/res/layout-h600dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-h600dp/fragment_playback_panel.xml
@@ -24,17 +24,17 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
 
     <TextView
         android:id="@+id/playback_song"
         style="@style/Widget.Auxio.TextView.Primary"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_artist"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/playback_song_menu"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Song Name" />
@@ -42,27 +42,39 @@
     <TextView
         android:id="@+id/playback_artist"
         style="@style/Widget.Auxio.TextView.Secondary"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_album"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/playback_song_menu"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Artist Name" />
 
     <TextView
         android:id="@+id/playback_album"
         style="@style/Widget.Auxio.TextView.Secondary"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/playback_song_menu"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Album Name" />
 
+    <Button
+        android:id="@+id/playback_song_menu"
+        style="@style/Widget.Auxio.Button.Icon.Small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_more_24"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
+        app:layout_constraintBottom_toBottomOf="@+id/playback_album"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/playback_song" />
+
+
     <org.oxycblt.auxio.playback.StyledSeekBar
         android:id="@+id/playback_seek_bar"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
index c8294ba47..673c5d0bc 100644
--- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
@@ -24,8 +24,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
-        app:layout_constraintVertical_bias="0.565"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
 
     <TextView
         android:id="@+id/playback_song"
diff --git a/app/src/main/res/layout/fragment_playback_panel.xml b/app/src/main/res/layout/fragment_playback_panel.xml
index e35cf1c17..c46d2b61b 100644
--- a/app/src/main/res/layout/fragment_playback_panel.xml
+++ b/app/src/main/res/layout/fragment_playback_panel.xml
@@ -25,7 +25,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
 
     <!-- TextView is wrapped in a container so that marquee doesn't break -->
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 80cd8861f..c0dd1f0c2 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:transitionGroup="true"
     android:background="?attr/colorSurface"
     android:orientation="vertical">
@@ -28,6 +29,7 @@
         android:name="org.oxycblt.auxio.settings.SettingsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        tools:layout="@android:layout/preference_category" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_queue_song.xml b/app/src/main/res/layout/item_queue_song.xml
index 898f36715..5886cbe05 100644
--- a/app/src/main/res/layout/item_queue_song.xml
+++ b/app/src/main/res/layout/item_queue_song.xml
@@ -47,7 +47,7 @@
                 style="@style/Widget.Auxio.TextView.Item.Primary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_mid_medium"
                 android:textColor="@color/sel_toggleable_primary"
                 app:layout_constraintBottom_toTopOf="@+id/song_info"
                 app:layout_constraintEnd_toStartOf="@+id/song_drag_handle"
@@ -61,7 +61,7 @@
                 style="@style/Widget.Auxio.TextView.Item.Secondary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_mid_medium"
                 android:textColor="@color/sel_toggleable_secondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/song_drag_handle"
@@ -74,7 +74,7 @@
                 style="@style/Widget.Auxio.Button.Icon.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/spacing_small"
+                android:layout_marginEnd="@dimen/spacing_mid_medium"
                 android:contentDescription="@string/desc_queue_handle"
                 app:icon="@drawable/ic_handle_24"
                 app:layout_constraintBottom_toBottomOf="@+id/song_album_cover"
diff --git a/app/src/main/res/menu/menu_playback_song_actions.xml b/app/src/main/res/menu/menu_playback_song_actions.xml
new file mode 100644
index 000000000..e9ba0a9bb
--- /dev/null
+++ b/app/src/main/res/menu/menu_playback_song_actions.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_go_artist"
+        android:title="@string/lbl_go_artist" />
+    <item
+        android:id="@+id/action_go_album"
+        android:title="@string/lbl_go_album" />
+    <item
+        android:id="@+id/action_song_detail"
+        android:title="@string/lbl_song_detail" />
+</menu>
\ No newline at end of file