From 049b279e1f3b9b5fdff2a4ed0082b242b3a1b2c5 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sat, 8 Jan 2022 09:26:26 -0700
Subject: [PATCH] playback: add playing from indicator to fragment

Add the "Playing From" indicator that used be on the queue to the
main playback view.
---
 app/src/main/java/org/oxycblt/auxio/music/Models.kt           | 2 +-
 .../main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt  | 4 ++++
 app/src/main/res/layout-land/fragment_playback.xml            | 1 +
 app/src/main/res/layout-sw600dp-land/fragment_playback.xml    | 1 +
 app/src/main/res/layout-sw600dp/fragment_playback.xml         | 1 +
 app/src/main/res/layout-w600dp-land/fragment_playback.xml     | 1 +
 app/src/main/res/layout/fragment_playback.xml                 | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/music/Models.kt b/app/src/main/java/org/oxycblt/auxio/music/Models.kt
index 4a439e83b..8bc99ad77 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Models.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Models.kt
@@ -84,7 +84,7 @@ data class Song(
     val album: Album get() = requireNotNull(mAlbum)
 
     val seconds: Long get() = duration / 1000
-    val formattedDuration: String get() = (duration / 1000).toDuration(false)
+    val formattedDuration: String get() = seconds.toDuration(false)
 
     override val hash: Long get() {
         var result = name.hashCode().toLong()
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
index 528b7848e..0be138126 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
@@ -111,6 +111,10 @@ class PlaybackFragment : Fragment() {
             }
         }
 
+        playbackModel.parent.observe(viewLifecycleOwner) { parent ->
+            binding.playbackToolbar.subtitle = parent?.name ?: getString(R.string.lbl_all_songs)
+        }
+
         playbackModel.isShuffling.observe(viewLifecycleOwner) { isShuffling ->
             binding.playbackShuffle.isActivated = isShuffling
         }
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index 687c4334a..f3cab4da1 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -32,6 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_playback"
+            tools:subtitle="@string/lbl_all_songs"
             app:title="@string/lbl_playback" />
 
         <ImageView
diff --git a/app/src/main/res/layout-sw600dp-land/fragment_playback.xml b/app/src/main/res/layout-sw600dp-land/fragment_playback.xml
index ef33f4349..43fc04319 100644
--- a/app/src/main/res/layout-sw600dp-land/fragment_playback.xml
+++ b/app/src/main/res/layout-sw600dp-land/fragment_playback.xml
@@ -31,6 +31,7 @@
             style="@style/Widget.Auxio.Toolbar.Icon.Down"
             app:layout_constraintStart_toStartOf="parent"
             app:title="@string/lbl_playback"
+            tools:subtitle="@string/lbl_all_songs"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_playback" />
 
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback.xml b/app/src/main/res/layout-sw600dp/fragment_playback.xml
index 9e9546fef..0c0c76468 100644
--- a/app/src/main/res/layout-sw600dp/fragment_playback.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback.xml
@@ -32,6 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:title="@string/lbl_playback"
+            tools:subtitle="@string/lbl_all_songs"
             app:menu="@menu/menu_playback" />
 
         <ImageView
diff --git a/app/src/main/res/layout-w600dp-land/fragment_playback.xml b/app/src/main/res/layout-w600dp-land/fragment_playback.xml
index 5dc6578e0..e39d2aa24 100644
--- a/app/src/main/res/layout-w600dp-land/fragment_playback.xml
+++ b/app/src/main/res/layout-w600dp-land/fragment_playback.xml
@@ -32,6 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:title="@string/lbl_playback"
+            tools:subtitle="@string/lbl_all_songs"
             app:menu="@menu/menu_playback" />
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 015b35bc5..7f09ff6a2 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -31,6 +31,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:title="@string/lbl_playback"
+            tools:subtitle="@string/lbl_all_songs"
             app:menu="@menu/menu_playback" />
 
         <ImageView