From f6a712032e4ef314a7dbd13c68c16c82829ac5bb Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 27 Aug 2022 19:06:37 -0600
Subject: [PATCH] ui: fix more lollipop insanity

Again and again and again
---
 app/src/main/java/org/oxycblt/auxio/MainFragment.kt         | 6 ------
 app/src/main/res/drawable/ic_auxio_24.xml                   | 4 ++--
 .../fragment_playback_panel.xml                             | 0
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename app/src/main/res/{layout-h600dp => layout-h400dp}/fragment_playback_panel.xml (100%)

diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 5c8e40666..1b2be3d98 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -348,12 +348,6 @@ class MainFragment :
 
             val exploreNavController = binding.exploreNavHost.findNavController()
 
-            logD(
-                playbackSheetBehavior.state == NeoBottomSheetBehavior.STATE_EXPANDED ||
-                    queueSheetBehavior?.state == NeoBottomSheetBehavior.STATE_EXPANDED ||
-                    exploreNavController.currentDestination?.id !=
-                        exploreNavController.graph.startDestinationId)
-
             isEnabled =
                 playbackSheetBehavior.state == NeoBottomSheetBehavior.STATE_EXPANDED ||
                     queueSheetBehavior?.state == NeoBottomSheetBehavior.STATE_EXPANDED ||
diff --git a/app/src/main/res/drawable/ic_auxio_24.xml b/app/src/main/res/drawable/ic_auxio_24.xml
index 265cfb334..0532d4289 100644
--- a/app/src/main/res/drawable/ic_auxio_24.xml
+++ b/app/src/main/res/drawable/ic_auxio_24.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="m 11.999924,3.3968505 v 9.2064905 a 0.39687604,0.39687604 0 0 1 -0.396876,0.396876 H 10.456092 8.860194 A 0.95811763,0.95811763 0 0 0 8.18269,13.280856 L 6.281022,15.182595 A 0.95816942,0.95816942 0 0 0 6.000394,15.86011 v 0.728126 C 5.999982,17.0003 5.999982,17.0003 5.999982,17.0003 c 4.12e-4,0.01519 4.12e-4,0.01519 4.12e-4,0.01519 v 1.124613 a 0.95817044,0.95817044 0 0 0 0.280628,0.677515 L 8.18269,20.719361 A 0.95811658,0.95811658 0 0 0 8.860194,21 h 2.279899 a 0.95811752,0.95811752 0 0 0 0.677504,-0.280639 l 1.901671,-1.901743 a 0.9581695,0.9581695 0 0 0 0.280628,-0.677515 v -0.72774 C 14.000268,17.0003 14.000268,17.0003 14.000268,17.0003 V 7.3971395 a 0.39687604,0.39687604 0 0 1 0.396876,-0.396876 h 3.205998 a 0.39687604,0.39687604 0 0 0 0.396876,-0.396876 V 3.3972355 A 0.3969015,0.3969015 0 0 0 17.603142,3.0003345 L 12.3968,3.0000005 a 0.39685057,0.39685057 0 0 0 -0.396876,0.39685 z" />
-</vector>
+        android:pathData="m 11.999924,3.3968505 v 9.2064905 a 0.39687604,0.39687604 0 0 1 -0.396876,0.396876 H 10.456092 8.860194 A 0.95811763,0.95811763 0 0 0 8.18269,13.280856 L 6.281022,15.182595 A 0.95816942,0.95816942 0 0 0 6.000394,15.86011 v 0.728126 C 5.999982,17.0003 5.999982,17.0003 5.999982,17.0003 c 0.0004120,0.01519 0.0004120,0.01519 0.0004120,0.01519 v 1.124613 a 0.95817044,0.95817044 0 0 0 0.280628,0.677515 L 8.18269,20.719361 A 0.95811658,0.95811658 0 0 0 8.860194,21 h 2.279899 a 0.95811752,0.95811752 0 0 0 0.677504,-0.280639 l 1.901671,-1.901743 a 0.9581695,0.9581695 0 0 0 0.280628,-0.677515 v -0.72774 C 14.000268,17.0003 14.000268,17.0003 14.000268,17.0003 V 7.3971395 a 0.39687604,0.39687604 0 0 1 0.396876,-0.396876 h 3.205998 a 0.39687604,0.39687604 0 0 0 0.396876,-0.396876 V 3.3972355 A 0.3969015,0.3969015 0 0 0 17.603142,3.0003345 L 12.3968,3.0000005 a 0.39685057,0.39685057 0 0 0 -0.396876,0.39685 z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-h600dp/fragment_playback_panel.xml b/app/src/main/res/layout-h400dp/fragment_playback_panel.xml
similarity index 100%
rename from app/src/main/res/layout-h600dp/fragment_playback_panel.xml
rename to app/src/main/res/layout-h400dp/fragment_playback_panel.xml