From 35eb07410d8da358b211f130f0edc696fc4cc488 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Fri, 26 Nov 2021 09:54:59 -0700
Subject: [PATCH] playback: gracefully handle multi-window mode

Add a new layout that handles the edge-case where splitscreen is used
on a sufficently small device. Previously it would result in a squashed
landscape layout, but now it will show a layout that should fit fine in
most situations.
---
 .../oxycblt/auxio/playback/PlaybackBarView.kt |   2 +-
 .../auxio/playback/PlaybackFragment.kt        |   2 +
 .../res/layout-land/fragment_playback.xml     |  34 ++--
 .../layout-w600dp-land/fragment_playback.xml  | 189 ++++++++++++++++++
 4 files changed, 209 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/layout-w600dp-land/fragment_playback.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarView.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarView.kt
index f65aee258..a3e041421 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarView.kt
@@ -22,7 +22,6 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.WindowInsets
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.postDelayed
 import androidx.core.view.updatePadding
 import com.google.android.material.color.MaterialColors
 import org.oxycblt.auxio.R
@@ -89,5 +88,6 @@ class PlaybackBarView @JvmOverloads constructor(
     fun clearCallback() {
         mCallback = null
         binding.callback = null
+        binding.executePendingBindings()
     }
 }
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 5235d69c5..46396e8e2 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
@@ -145,6 +145,8 @@ class PlaybackFragment : Fragment() {
             }
         }
 
+        logD(resources.configuration.smallestScreenWidthDp)
+
         logD("Fragment Created.")
 
         return binding.root
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index c4954313f..726ecc03f 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -31,18 +31,19 @@
             style="@style/Widget.Auxio.Toolbar.Icon.Down"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:title="@string/lbl_playback"
-            app:menu="@menu/menu_playback" />
+            app:menu="@menu/menu_playback"
+            app:title="@string/lbl_playback" />
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/Widget.Auxio.Image.Full"
-            android:layout_margin="@dimen/spacing_mid_large"
+            style="@style/Widget.Auxio.Image.Large"
+            android:layout_marginStart="@dimen/spacing_mid_large"
             android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
+            app:layout_constraintVertical_chainStyle="packed"
             tools:src="@drawable/ic_album" />
 
         <!-- TextView is wrapped in a container so that marquee doesn't break -->
@@ -57,7 +58,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
-            app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
+            app:layout_constraintTop_toTopOf="@+id/playback_cover"
             app:layout_constraintVertical_chainStyle="packed">
 
             <TextView
@@ -96,7 +97,7 @@
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:text="@{song.album.name}"
-            app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -108,13 +109,14 @@
             android:id="@+id/playback_seek_bar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="-16dp"
+            android:layout_marginEnd="-16dp"
             app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/playback_cover"
-            app:layout_constraintTop_toBottomOf="@+id/playback_album" />
+            app:layout_constraintStart_toStartOf="@+id/playback_cover"
+            app:layout_constraintTop_toBottomOf="@+id/playback_cover"
+            app:layout_constraintVertical_chainStyle="packed" />
 
         <ImageButton
             android:id="@+id/playback_loop"
@@ -126,7 +128,6 @@
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
             android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
-            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="@+id/playback_seek_bar"
             app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
 
@@ -153,10 +154,9 @@
             android:src="@drawable/sel_playing_state"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/playback_cover"
+            app:layout_constraintStart_toStartOf="@+id/playback_seek_bar"
             app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar"
-            tools:src="@drawable/ic_pause" />
+            tools:src="@drawable/ic_play" />
 
         <ImageButton
             android:id="@+id/playback_skip_next"
@@ -176,8 +176,8 @@
             style="@style/Widget.Auxio.Button.Unbounded"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_medium"
             android:contentDescription="@string/desc_shuffle"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
             android:src="@drawable/ic_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
diff --git a/app/src/main/res/layout-w600dp-land/fragment_playback.xml b/app/src/main/res/layout-w600dp-land/fragment_playback.xml
new file mode 100644
index 000000000..5dc6578e0
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-land/fragment_playback.xml
@@ -0,0 +1,189 @@
+<?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.PlaybackFragment">
+
+    <data>
+
+        <variable
+            name="song"
+            type="org.oxycblt.auxio.music.Song" />
+
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
+
+        <variable
+            name="detailModel"
+            type="org.oxycblt.auxio.detail.DetailViewModel" />
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/playback_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playback_toolbar"
+            style="@style/Widget.Auxio.Toolbar.Icon.Down"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="@string/lbl_playback"
+            app:menu="@menu/menu_playback" />
+
+        <ImageView
+            android:id="@+id/playback_cover"
+            style="@style/Widget.Auxio.Image.Full"
+            android:layout_margin="@dimen/spacing_mid_large"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
+            app:albumArt="@{song}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
+            tools:src="@drawable/ic_album" />
+
+        <!-- TextView is wrapped in a container so that marquee doesn't break -->
+
+        <FrameLayout
+            android:id="@+id/playback_song_container"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_mid_large"
+            android:layout_marginEnd="@dimen/spacing_mid_large"
+            app:layout_constraintBottom_toTopOf="@+id/playback_artist"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playback_cover"
+            app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
+            app:layout_constraintVertical_chainStyle="packed">
+
+            <TextView
+                android:id="@+id/playback_song"
+                style="@style/Widget.Auxio.TextView.Primary"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
+                android:text="@{song.name}"
+                tools:text="Song Name" />
+
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/playback_artist"
+            style="@style/Widget.Auxio.TextView.Secondary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_mid_large"
+            android:layout_marginEnd="@dimen/spacing_mid_large"
+            android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
+            android:text="@{song.album.artist.resolvedName}"
+            app:layout_constraintBottom_toTopOf="@+id/playback_album"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playback_cover"
+            app:layout_constraintTop_toBottomOf="@+id/playback_song_container"
+            tools:text="Artist Name" />
+
+        <TextView
+            android:id="@+id/playback_album"
+            style="@style/Widget.Auxio.TextView.Secondary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_mid_large"
+            android:layout_marginEnd="@dimen/spacing_mid_large"
+            android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
+            android:text="@{song.album.name}"
+            app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playback_cover"
+            app:layout_constraintTop_toBottomOf="@+id/playback_artist"
+            tools:text="Album Name" />
+
+
+        <org.oxycblt.auxio.playback.PlaybackSeekBar
+            android:id="@+id/playback_seek_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playback_cover"
+            app:layout_constraintTop_toBottomOf="@+id/playback_album" />
+
+        <ImageButton
+            android:id="@+id/playback_loop"
+            style="@style/Widget.Auxio.Button.Unbounded"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_medium"
+            android:contentDescription="@string/desc_change_loop"
+            android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
+            android:src="@drawable/ic_loop"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@+id/playback_seek_bar"
+            app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
+
+        <ImageButton
+            android:id="@+id/playback_skip_prev"
+            style="@style/Widget.Auxio.Button.Unbounded"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/desc_skip_prev"
+            android:onClick="@{() -> playbackModel.skipPrev()}"
+            android:src="@drawable/ic_skip_prev"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
+            app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
+            app:layout_constraintStart_toEndOf="@+id/playback_loop"
+            app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/playback_play_pause"
+            style="@style/Widget.Auxio.FloatingActionButton.PlayPause"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/desc_play_pause"
+            android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
+            android:src="@drawable/sel_playing_state"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playback_cover"
+            app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar"
+            tools:src="@drawable/ic_pause" />
+
+        <ImageButton
+            android:id="@+id/playback_skip_next"
+            style="@style/Widget.Auxio.Button.Unbounded"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/desc_skip_next"
+            android:onClick="@{() -> playbackModel.skipNext()}"
+            android:src="@drawable/ic_skip_next"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
+            app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
+            app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
+            app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
+
+        <ImageButton
+            android:id="@+id/playback_shuffle"
+            style="@style/Widget.Auxio.Button.Unbounded"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/spacing_medium"
+            android:contentDescription="@string/desc_shuffle"
+            android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
+            android:src="@drawable/ic_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
+            app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
+            app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
+            app:tint="@color/sel_accented" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file