From c9e84d0d39284b7f15c04a302e0cf7102784b081 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sat, 21 Aug 2021 13:27:39 -0600
Subject: [PATCH] playback: unify compact views

Move the progress bar to the bottom of CompactPlaybackFragment in both
orientations. Doesn't look the nicest right now, but will be when the
new home fragment is created.
---
 .../main/java/org/oxycblt/auxio/AuxioUtils.kt |  1 -
 .../auxio/playback/queue/QueueDragCallback.kt |  5 ++
 .../java/org/oxycblt/auxio/widgets/Forms.kt   |  2 -
 .../layout-land/fragment_compact_playback.xml | 84 -------------------
 .../res/layout/fragment_compact_playback.xml  | 27 +++---
 5 files changed, 19 insertions(+), 100 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/fragment_compact_playback.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioUtils.kt b/app/src/main/java/org/oxycblt/auxio/AuxioUtils.kt
index 1bf82d042..b963b38b5 100644
--- a/app/src/main/java/org/oxycblt/auxio/AuxioUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioUtils.kt
@@ -27,7 +27,6 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
-import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Looper
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
index fa7853057..2a2093997 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
@@ -30,6 +30,11 @@ import kotlin.math.sign
  * The Drag callback used by the queue recyclerview. Delivers updates to [PlaybackViewModel]
  * and [QueueAdapter] simultaneously.
  * @author OxygenCobalt
+ * TODO: Its possible to apply some elevation to the item views when they are picked up,
+ *  however you need to keep track of the viewholder in the item touch helper and reset
+ *  it when done. Theoretically this also means you can do the material drawer thing where
+ *  the bottom of the recyclerview a darker color but is only shown when an item is moved.
+ *  Maybe.
  */
 class QueueDragCallback(private val playbackModel: PlaybackViewModel) : ItemTouchHelper.Callback() {
     private lateinit var queueAdapter: QueueAdapter
diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
index 5e47eaa43..e004b6d8a 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
@@ -19,7 +19,6 @@
 package org.oxycblt.auxio.widgets
 
 import android.content.Context
-import android.util.Log
 import android.widget.RemoteViews
 import androidx.annotation.LayoutRes
 import org.oxycblt.auxio.R
@@ -128,7 +127,6 @@ fun createFullWidget(context: Context, state: WidgetState): RemoteViews {
         else -> R.drawable.ic_shuffle
     }
 
-
     val loopRes = when (state.loopMode) {
         LoopMode.NONE -> R.drawable.ic_loop
         LoopMode.ALL -> R.drawable.ic_loop_tinted
diff --git a/app/src/main/res/layout-land/fragment_compact_playback.xml b/app/src/main/res/layout-land/fragment_compact_playback.xml
deleted file mode 100644
index d2ef2e9d8..000000000
--- a/app/src/main/res/layout-land/fragment_compact_playback.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".playback.CompactPlaybackFragment">
-
-    <data>
-
-        <variable
-            name="song"
-            type="org.oxycblt.auxio.music.Song" />
-
-        <variable
-            name="playbackModel"
-            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/playback_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:animateLayoutChanges="true"
-        android:background="@drawable/ui_background_ripple"
-        android:clickable="true"
-        android:focusable="true">
-
-        <ImageView
-            android:id="@+id/playback_cover"
-            style="@style/Widget.ImageView.Compact"
-            android:layout_margin="@dimen/spacing_small"
-            android:contentDescription="@{@string/desc_album_cover(song.name)}"
-            app:albumArt="@{song}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_song" />
-
-        <TextView
-            android:id="@+id/playback_song"
-            style="@style/Widget.TextView.Compact.Primary"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_small"
-            android:text="@{song.name}"
-            app:layout_constraintBottom_toTopOf="@+id/playback_info"
-            app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
-            app:layout_constraintStart_toEndOf="@+id/playback_cover"
-            app:layout_constraintTop_toTopOf="@+id/playback_cover"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="Song Name" />
-
-        <TextView
-            android:id="@+id/playback_info"
-            style="@style/Widget.TextView.Compact.Secondary"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_small"
-            android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
-            app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
-            app:layout_constraintStart_toEndOf="@+id/playback_cover"
-            app:layout_constraintTop_toBottomOf="@+id/playback_song"
-            tools:text="Artist Name / Album Name" />
-
-        <ImageButton
-            android:id="@+id/playback_play_pause"
-            style="@style/Widget.Button.Unbounded"
-            android:src="@drawable/ic_playing_state"
-            android:layout_margin="@dimen/spacing_small"
-            android:contentDescription="@string/desc_play_pause"
-            android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ProgressBar
-            android:id="@+id/playback_progress"
-            style="@style/Widget.ProgressBar.Compact"
-            android:progress="@{playbackModel.positionAsProgress}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:progress="70" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index 46f4c3354..d98ab34b6 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -24,23 +24,15 @@
         android:clickable="true"
         android:focusable="true">
 
-        <ProgressBar
-            android:id="@+id/playback_progress"
-            style="@style/Widget.ProgressBar.Compact"
-            android:progress="@{playbackModel.positionAsProgress}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:progress="70" />
-
         <ImageView
             android:id="@+id/playback_cover"
             style="@style/Widget.ImageView.Compact"
             android:layout_margin="@dimen/spacing_small"
             android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/playback_progress"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/playback_progress"
+            app:layout_constraintTop_toTopOf="parent"
             tools:src="@drawable/ic_song" />
 
         <TextView
@@ -52,7 +44,7 @@
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/playback_cover"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Song Name" />
 
@@ -62,7 +54,7 @@
             android:layout_marginStart="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
             app:layout_constraintTop_toBottomOf="@+id/playback_song"
@@ -71,13 +63,22 @@
         <ImageButton
             android:id="@+id/playback_play_pause"
             style="@style/Widget.Button.Unbounded"
+            android:src="@drawable/ic_playing_state"
             android:layout_margin="@dimen/spacing_small"
             android:contentDescription="@string/desc_play_pause"
-            android:src="@drawable/ic_playing_state"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ProgressBar
+            android:id="@+id/playback_progress"
+            style="@style/Widget.ProgressBar.Compact"
+            android:progress="@{playbackModel.positionAsProgress}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:progress="70" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file