From d8cdc8142446e5db6a2f70c1afc1f742e28b7633 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Tue, 7 Dec 2021 00:04:53 +0100
Subject: [PATCH] Increase touch area of drag handler. Also use new tintable
color for drag drawable
---
ultrasonic/src/main/res/drawable/ic_drag_vertical.xml | 10 ++++++++++
.../src/main/res/drawable/ic_drag_vertical_dark.xml | 8 --------
.../src/main/res/drawable/ic_drag_vertical_light.xml | 8 --------
ultrasonic/src/main/res/layout/list_item_track.xml | 4 ++--
ultrasonic/src/main/res/values/themes.xml | 3 ---
5 files changed, 12 insertions(+), 21 deletions(-)
create mode 100644 ultrasonic/src/main/res/drawable/ic_drag_vertical.xml
delete mode 100644 ultrasonic/src/main/res/drawable/ic_drag_vertical_dark.xml
delete mode 100644 ultrasonic/src/main/res/drawable/ic_drag_vertical_light.xml
diff --git a/ultrasonic/src/main/res/drawable/ic_drag_vertical.xml b/ultrasonic/src/main/res/drawable/ic_drag_vertical.xml
new file mode 100644
index 00000000..5aa2d20c
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/ic_drag_vertical.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="?attr/colorControlNormal"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#000"
+ android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
+</vector>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/drawable/ic_drag_vertical_dark.xml b/ultrasonic/src/main/res/drawable/ic_drag_vertical_dark.xml
deleted file mode 100644
index 8dcc63e5..00000000
--- a/ultrasonic/src/main/res/drawable/ic_drag_vertical_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/drag_vertical.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="#FFF" android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
-</vector>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/drawable/ic_drag_vertical_light.xml b/ultrasonic/src/main/res/drawable/ic_drag_vertical_light.xml
deleted file mode 100644
index 7fdf1d55..00000000
--- a/ultrasonic/src/main/res/drawable/ic_drag_vertical_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/drag_vertical.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="#000" android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
-</vector>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/list_item_track.xml b/ultrasonic/src/main/res/layout/list_item_track.xml
index 1ac6d686..16322ac7 100644
--- a/ultrasonic/src/main/res/layout/list_item_track.xml
+++ b/ultrasonic/src/main/res/layout/list_item_track.xml
@@ -15,8 +15,8 @@
a:gravity="center_vertical"
a:importantForAccessibility="no"
a:paddingStart="5dip"
- a:paddingEnd="0dip"
- a:src="?attr/drag_vertical" />
+ a:paddingEnd="6dip"
+ a:src="@drawable/ic_drag_vertical" />
<CheckedTextView
a:id="@+id/song_check"
diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml
index 42a75fd3..126c3df0 100644
--- a/ultrasonic/src/main/res/values/themes.xml
+++ b/ultrasonic/src/main/res/values/themes.xml
@@ -57,7 +57,6 @@
<item name="filepicker_subdirectory_up">@drawable/ic_subdirectory_up_dark</item>
<item name="filepicker_sd_card">@drawable/ic_sd_storage_dark</item>
<item name="drag_queue">@drawable/ic_drag_queue_dark</item>
- <item name="drag_vertical">@drawable/ic_drag_vertical_dark</item>
<item name="more_vert">@drawable/ic_more_vert_dark</item>
<item name="list_selector_holo">@drawable/list_selector_holo_dark</item>
<item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
@@ -122,7 +121,6 @@
<item name="filepicker_subdirectory_up">@drawable/ic_subdirectory_up_dark</item>
<item name="filepicker_sd_card">@drawable/ic_sd_storage_dark</item>
<item name="drag_queue">@drawable/ic_drag_queue_dark</item>
- <item name="drag_vertical">@drawable/ic_drag_vertical_dark</item>
<item name="more_vert">@drawable/ic_more_vert_dark</item>
<item name="list_selector_holo">@drawable/list_selector_holo_dark</item>
<item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
@@ -186,7 +184,6 @@
<item name="filepicker_subdirectory_up">@drawable/ic_subdirectory_up_light</item>
<item name="filepicker_sd_card">@drawable/ic_sd_storage_light</item>
<item name="drag_queue">@drawable/ic_drag_queue_light</item>
- <item name="drag_vertical">@drawable/ic_drag_vertical_light</item>
<item name="more_vert">@drawable/ic_more_vert_light</item>
<item name="list_selector_holo">@drawable/list_selector_holo_light</item>
<item name="list_selector_holo_selected">@drawable/list_selector_holo_light_selected</item>