From 9647b53f78e621296be6fe031979e756bb17a36c Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sun, 3 Jul 2022 15:44:56 -0600
Subject: [PATCH] ui: remove ripple resources

Remove the ripple resources and replace them with their system
counterparts.

This is to remove redundancy in-app and make the widget more consistent
with other android widgets.
---
 .../auxio/playback/system/NotificationComponent.kt       | 1 -
 app/src/main/res/drawable/ui_indicator.xml               | 8 --------
 app/src/main/res/drawable/ui_remote_ripple.xml           | 4 ----
 app/src/main/res/drawable/ui_ripple.xml                  | 9 ---------
 app/src/main/res/values/styles_android.xml               | 2 +-
 app/src/main/res/values/styles_ui.xml                    | 4 ++--
 6 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ui_indicator.xml
 delete mode 100644 app/src/main/res/drawable/ui_remote_ripple.xml
 delete mode 100644 app/src/main/res/drawable/ui_ripple.xml

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 f9d56e520..dce122048 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
@@ -30,7 +30,6 @@ import androidx.media.app.NotificationCompat.MediaStyle
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.util.getSystemServiceSafe
 import org.oxycblt.auxio.util.newBroadcastPendingIntent
diff --git a/app/src/main/res/drawable/ui_indicator.xml b/app/src/main/res/drawable/ui_indicator.xml
deleted file mode 100644
index 9f035ca55..000000000
--- a/app/src/main/res/drawable/ui_indicator.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size
-        android:width="4dp"
-        android:height="4dp" />
-    <solid android:color="?attr/colorPrimary" />
-</shape>
diff --git a/app/src/main/res/drawable/ui_remote_ripple.xml b/app/src/main/res/drawable/ui_remote_ripple.xml
deleted file mode 100644
index 0b98cc5db..000000000
--- a/app/src/main/res/drawable/ui_remote_ripple.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight"
-    android:radius="20dp" />
diff --git a/app/src/main/res/drawable/ui_ripple.xml b/app/src/main/res/drawable/ui_ripple.xml
deleted file mode 100644
index 8871c4670..000000000
--- a/app/src/main/res/drawable/ui_ripple.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-        </shape>
-    </item>
-</ripple>
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 9080d2937..71d3e5951 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -51,7 +51,7 @@
     <!-- A variant of PlaybackButton that plays along with AppWidget restrictions. -->
     <style name="Widget.Auxio.MaterialButton.AppWidget" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:minHeight">@dimen/size_btn</item>
-        <item name="android:background">@drawable/ui_remote_ripple</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
     </style>
 
     <!-- A variant of button that emulates a FAB-ish button that plays along with widget restrictions -->
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 9c3319807..bdb9222c1 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -126,7 +126,7 @@
     <style name="Widget.Auxio.ItemLayout" parent="">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/ui_ripple</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
         <item name="android:padding">@dimen/spacing_medium</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
@@ -215,7 +215,7 @@
     <style name="Widget.Auxio.TextView.Icon.Clickable" parent="Widget.Auxio.TextView.Icon">
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
-        <item name="android:background">@drawable/ui_ripple</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
     <!-- BUTTON STYLES -->