From 4dfb3cc972de12f3c6eacee0ddd7716a5d28794e Mon Sep 17 00:00:00 2001
From: Soitora <simon.mattila@protonmail.com>
Date: Sat, 12 Jun 2021 15:45:26 +0200
Subject: [PATCH] Improvements to the new library item selectors (#5379)

* Increase card selector radius

* Add themed overlay to library selector
---
 app/src/main/res/color/selector_overlay.xml   |  4 ++++
 .../res/drawable/library_item_selector.xml    |  6 +++---
 .../library_item_selector_overlay.xml         | 21 +++++++++++++++++++
 .../layout/source_comfortable_grid_item.xml   |  1 +
 .../res/layout/source_compact_grid_item.xml   |  1 +
 app/src/main/res/values/dimens.xml            |  1 +
 6 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/color/selector_overlay.xml
 create mode 100644 app/src/main/res/drawable/library_item_selector_overlay.xml

diff --git a/app/src/main/res/color/selector_overlay.xml b/app/src/main/res/color/selector_overlay.xml
new file mode 100644
index 0000000000..69bad1405d
--- /dev/null
+++ b/app/src/main/res/color/selector_overlay.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.2" android:color="?attr/colorAccent" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/library_item_selector.xml b/app/src/main/res/drawable/library_item_selector.xml
index 7de3c91baa..11714e2ee5 100644
--- a/app/src/main/res/drawable/library_item_selector.xml
+++ b/app/src/main/res/drawable/library_item_selector.xml
@@ -10,7 +10,7 @@
                 android:bottom="2dp"
                 android:left="2dp">
                 <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_radius" />
+                    <corners android:radius="@dimen/card_selector_radius" />
                     <solid android:color="?attr/colorLibrarySelectionActive" />
                 </shape>
             </item>
@@ -22,7 +22,7 @@
                 android:bottom="2dp"
                 android:left="2dp">
                 <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_radius" />
+                    <corners android:radius="@dimen/card_selector_radius" />
                     <solid android:color="?attr/colorLibrarySelectionActive" />
                 </shape>
             </item>
@@ -33,7 +33,7 @@
                 android:bottom="2dp"
                 android:left="2dp">
                 <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_radius" />
+                    <corners android:radius="@dimen/card_selector_radius" />
                     <solid android:color="?android:attr/colorBackground" />
                 </shape>
             </item>
diff --git a/app/src/main/res/drawable/library_item_selector_overlay.xml b/app/src/main/res/drawable/library_item_selector_overlay.xml
new file mode 100644
index 0000000000..ac49770e08
--- /dev/null
+++ b/app/src/main/res/drawable/library_item_selector_overlay.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorLibrarySelection">
+    <item>
+        <selector xmlns:android="http://schemas.android.com/apk/res/android">
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <corners android:radius="@dimen/card_selector_radius" />
+                    <solid android:color="@color/selector_overlay" />
+                </shape>
+            </item>
+
+            <item android:state_activated="true">
+                <shape android:shape="rectangle">
+                    <corners android:radius="@dimen/card_selector_radius" />
+                    <solid android:color="@color/selector_overlay" />
+                </shape>
+            </item>
+        </selector>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml
index 409cf083e6..df786db6b9 100644
--- a/app/src/main/res/layout/source_comfortable_grid_item.xml
+++ b/app/src/main/res/layout/source_comfortable_grid_item.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
     android:background="@drawable/library_item_selector"
+    android:foreground="@drawable/library_item_selector_overlay"
     android:padding="4dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/source_compact_grid_item.xml b/app/src/main/res/layout/source_compact_grid_item.xml
index 6cf084dafa..609535dfdf 100644
--- a/app/src/main/res/layout/source_compact_grid_item.xml
+++ b/app/src/main/res/layout/source_compact_grid_item.xml
@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
     android:background="@drawable/library_item_selector"
+    android:foreground="@drawable/library_item_selector_overlay"
     android:padding="4dp">
 
     <FrameLayout
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fc0c8c13a2..e5e98b5eea 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
 
     <dimen name="space_between_cards">4dp</dimen>
     <dimen name="card_radius">4dp</dimen>
+    <dimen name="card_selector_radius">6dp</dimen>
     <dimen name="dialog_radius">8dp</dimen>
 
     <dimen name="fab_size">56dp</dimen>