From 8e56459f8be0995f106b18f1033751227c4ce7fc Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sun, 12 Jun 2022 09:34:23 -0600 Subject: [PATCH] ui: fix auxio icon on api 21 Remove scientific notation from the auxio icon, allowing me to reintroduce it to the notification icon. API 21 does not support scientific notation in vector drawables, so we need to remove them from the icon for it to not crash the system ui. --- .../auxio/playback/system/NotificationComponent.kt | 2 +- .../java/org/oxycblt/auxio/ui/DialogRecyclerView.kt | 10 ++-------- app/src/main/res/drawable/ic_auxio.xml | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt index ce5416265..335799017 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt @@ -64,7 +64,7 @@ class NotificationComponent( notificationManager.createNotificationChannel(channel) } - setSmallIcon(R.drawable.ic_song) + setSmallIcon(R.drawable.ic_auxio) setCategory(NotificationCompat.CATEGORY_SERVICE) setShowWhen(false) setSilent(true) diff --git a/app/src/main/java/org/oxycblt/auxio/ui/DialogRecyclerView.kt b/app/src/main/java/org/oxycblt/auxio/ui/DialogRecyclerView.kt index 42a8d5ea3..451e4230a 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/DialogRecyclerView.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/DialogRecyclerView.kt @@ -28,11 +28,10 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.divider.MaterialDivider import org.oxycblt.auxio.R import org.oxycblt.auxio.util.getDimenSizeSafe -import org.oxycblt.auxio.util.logD /** - * A RecyclerView that enables something resembling the android:scrollIndicators attribute. - * Only used in dialogs. + * A RecyclerView that enables something resembling the android:scrollIndicators attribute. Only + * used in dialogs. * @author OxygenCobalt */ class DialogRecyclerView @@ -59,11 +58,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr super.onScrolled(recyclerView, dx, dy) val manager = recyclerView.layoutManager as LinearLayoutManager - logD("top invisible: ${manager.findFirstCompletelyVisibleItemPosition() < 1}") - // logD( - // "bottom invisible: - // ${manager.findLastCompletelyVisibleItemPosition() < (manager.itemCount - - // 1)}") topDivider.isInvisible = manager.findFirstCompletelyVisibleItemPosition() < 1 bottomDivider.isInvisible = manager.findLastCompletelyVisibleItemPosition() == (manager.itemCount - 1) diff --git a/app/src/main/res/drawable/ic_auxio.xml b/app/src/main/res/drawable/ic_auxio.xml index d986fad3a..ddbd3d5e0 100644 --- a/app/src/main/res/drawable/ic_auxio.xml +++ b/app/src/main/res/drawable/ic_auxio.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M 11.999922,3.0000008 V 13.000215 H 11.536969 10.05922 8.463326 l -2.462917,2.463012 v 1.521871 C 6.000391,16.990198 6,16.995198 6,17.000298 c 0,0.0051 0.0004090,0.01011 0.0004090,0.0152 v 1.521487 l 2.462917,2.463014 h 3.073643 l 2.46292,-2.463014 v -1.521487 c 0.0000190,-0.005 0.0003720,-0.0101 0.0003720,-0.0152 V 7.0002786 H 18 V 3.0003858 Z" />