From 85eb4cad6c5cd086bda9f422cc27b2fcfb0cee4b Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Thu, 4 Aug 2022 10:16:26 -0600 Subject: [PATCH] playback: use height for playback layouts Leverage min heights for the playback layouts instead of the land modifier. This prevents an issue where some split-screen displays won't use the correct "compact" layout. --- CHANGELOG.md | 1 + .../java/org/oxycblt/auxio/MainActivity.kt | 2 - .../java/org/oxycblt/auxio/MainFragment.kt | 2 +- .../java/org/oxycblt/auxio/util/LogUtil.kt | 12 +++-- .../fragment_playback_panel.xml | 50 ++++++------------- .../fragment_playback_panel.xml | 2 +- .../res/layout/fragment_playback_panel.xml | 50 +++++++++++++------ 7 files changed, 61 insertions(+), 58 deletions(-) rename app/src/main/res/{layout-land => layout-h600dp}/fragment_playback_panel.xml (83%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 247d36034..53d3f4ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ at the cost of longer loading times - Playing song is now shown in queue [#92] - Added ability to play songs from queue [#92] - Added ability to see previous songs in queue + - Added dual-pane view of queue and playback on landscape and tablets - Added Last Added sorting - Search now takes sort tags and file names in account [#184] - Added option to clear playback state in settings diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index c6165759c..37619f679 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -44,8 +44,6 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat * * TODO: Add multi-select * - * TODO: Separate playback views by height - * * TODO: Find better way to handler recycler divider visibility * * @author OxygenCobalt diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index 2c6c2db88..b984004e5 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -86,7 +86,7 @@ class MainFragment : } } else { // Dual-pane mode, color/pad the queue sheet manually. Note that we do not round - // corners, as the queue sheet cannot be dragged. + // corners, as the queue sheet cannot be dragged in dual-pane mode. binding.queueSheet.apply { background = MaterialShapeDrawable.createWithElevationOverlay(context).apply { diff --git a/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt index 9693df59c..5b7ed3a52 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt @@ -84,17 +84,21 @@ private val Any.autoTag: String * * JUNE 1989 TIANAMEN SQUARE PROTESTS AND MASSACRE 六四事件 * - * UYGHUR GENOCIDE 新疆种族灭绝指控 - * - * XINJIANG INTERMENT CAMPS 新疆再教育營 - * * KASHMIR INDEPENDENCE MOVEMENT * * WOMEN'S RIGHTS IN THE ISLAMIC REPUBLIC OF IRAN حقوق زنان در ایران * + * FREE TIBET 西藏自由 + * + * 1971 BANGLADESHI GENOCIDE BY PAKISTAN + * * 2022 RUSSIAN INVASION OF UKRAINE Вторжение России на Украину * + * UYGHUR GENOCIDE/XINJIANG INTERNMENT CAMPS 新疆种族灭绝指控/新疆再教育營 + * * KURDISTAN WORKERS PARTY KÜRDISTAN İŞÇI PARTISI (PKK) + * + * TORTURE AND ASSASSINATION OF JAMAL KHASHOGGI مقتل جمال خاشقجي */ private fun basedCopyleftNotice() { if (BuildConfig.APPLICATION_ID != "org.oxycblt.auxio" && diff --git a/app/src/main/res/layout-land/fragment_playback_panel.xml b/app/src/main/res/layout-h600dp/fragment_playback_panel.xml similarity index 83% rename from app/src/main/res/layout-land/fragment_playback_panel.xml rename to app/src/main/res/layout-h600dp/fragment_playback_panel.xml index e35cf1c17..0ae0c32a1 100644 --- a/app/src/main/res/layout-land/fragment_playback_panel.xml +++ b/app/src/main/res/layout-h600dp/fragment_playback_panel.xml @@ -19,64 +19,48 @@ - - - - - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintVertical_chainStyle="packed" + tools:text="Song Name" /> @@ -96,7 +80,6 @@ android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="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 edab0cd45..c8294ba47 100644 --- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml +++ b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml @@ -1,5 +1,4 @@ - - + + + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/playback_cover" + app:layout_constraintTop_toTopOf="@+id/playback_cover" + app:layout_constraintVertical_chainStyle="packed"> + + + + @@ -80,6 +96,7 @@ android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> +