From 4e9e4beb1ffd7e9e3bfd85ab2082c98191646279 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Wed, 28 Dec 2022 19:27:45 -0700
Subject: [PATCH] ui: fix api 21 issues

Fix obligatory API 21 insanity.
---
 app/src/main/res/drawable-v23/ui_item_ripple.xml    | 6 ++++++
 app/src/main/res/drawable/ic_auxio_24.xml           | 2 +-
 app/src/main/res/drawable/ui_item_ripple.xml        | 1 -
 app/src/main/res/drawable/ui_selection_badge_bg.xml | 6 +++---
 app/src/main/res/layout/dialog_accent.xml           | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable-v23/ui_item_ripple.xml

diff --git a/app/src/main/res/drawable-v23/ui_item_ripple.xml b/app/src/main/res/drawable-v23/ui_item_ripple.xml
new file mode 100644
index 000000000..f8f2d8917
--- /dev/null
+++ b/app/src/main/res/drawable-v23/ui_item_ripple.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?attr/colorSurface" />
+    <item android:drawable="@drawable/sel_item_ripple_bg" />
+    <item android:drawable="?attr/selectableItemBackground" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_auxio_24.xml b/app/src/main/res/drawable/ic_auxio_24.xml
index 6f558124c..c5be73421 100644
--- a/app/src/main/res/drawable/ic_auxio_24.xml
+++ b/app/src/main/res/drawable/ic_auxio_24.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/transparent"
-        android:pathData="M 13,4.0000207 17,8 M 12.999969,4.0004121 V 17.000315 m 0,-0.0002940 -3.0000004,3 -2.9999997,-3 2.9999997,-3 M 7.021336,16.939069"
+        android:pathData="M 13,4.0000207 C 14.333333,5.3333471 15.666667,6.6666736 17,8 M 12.999969,4.0004121 c 0,4.333301 0,8.6666019 0,12.9999029 m 0,0.000294 c -1,1 -2,2 -3.0000004,3 -0.9999999,-1 -1.9999998,-2 -2.9999997,-3 0.9999999,-1 1.9999998,-2 2.9999997,-3"
         android:strokeWidth="2"
         android:strokeColor="@android:color/white"
         android:strokeLineCap="round"
diff --git a/app/src/main/res/drawable/ui_item_ripple.xml b/app/src/main/res/drawable/ui_item_ripple.xml
index f8f2d8917..03fd102f4 100644
--- a/app/src/main/res/drawable/ui_item_ripple.xml
+++ b/app/src/main/res/drawable/ui_item_ripple.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="?attr/colorSurface" />
-    <item android:drawable="@drawable/sel_item_ripple_bg" />
     <item android:drawable="?attr/selectableItemBackground" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ui_selection_badge_bg.xml b/app/src/main/res/drawable/ui_selection_badge_bg.xml
index 5c568b2ff..d6ae300cc 100644
--- a/app/src/main/res/drawable/ui_selection_badge_bg.xml
+++ b/app/src/main/res/drawable/ui_selection_badge_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"
-    android:tint="?attr/colorPrimary">
-
+    android:shape="oval">
+    <solid
+        android:color="?attr/colorPrimary" />
     <size
         android:width="20dp"
         android:height="20dp" />
diff --git a/app/src/main/res/layout/dialog_accent.xml b/app/src/main/res/layout/dialog_accent.xml
index cfbd49d13..f35c0afd1 100644
--- a/app/src/main/res/layout/dialog_accent.xml
+++ b/app/src/main/res/layout/dialog_accent.xml
@@ -7,6 +7,6 @@
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_medium"
-    app:layoutManager=".ui.accent.AccentGridLayoutManager"
+    app:layoutManager="org.oxycblt.auxio.ui.accent.AccentGridLayoutManager"
     tools:itemCount="16"
     tools:listitem="@layout/item_accent" />