Made drag handle less prominent

12 files changed, 25 insertions, 9 deletions

diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index 66febc1d0..e68232663 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -18,15 +18,14 @@
             android:minWidth="4dp">
         <ImageView
                 android:id="@+id/drag_handle"
-                android:layout_width="24dp"
+                android:layout_width="16dp"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/drag_handle_content_description"
-                android:scaleType="center"
+                android:scaleType="fitCenter"
                 android:src="?attr/dragview_background"
-                android:paddingEnd="8dp"
-                android:paddingRight="8dp"
-                android:visibility="gone"
-                tools:src="@drawable/ic_drag_vertical_grey600_48dp"
+                android:paddingEnd="4dp"
+                android:paddingRight="4dp"
+                tools:src="@drawable/ic_drag_darktheme"
                 tools:background="@android:color/holo_green_dark"/>
 
     </LinearLayout>
diff --git a/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png
deleted file mode 100644
index a0b47594b..000000000
--- a/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png
deleted file mode 100644
index a4ce8fa7e..000000000
--- a/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png
deleted file mode 100644
index 7cd66845b..000000000
--- a/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png
deleted file mode 100644
index 3d1fd0fe3..000000000
--- a/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png
deleted file mode 100644
index 83cb91561..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png
deleted file mode 100644
index 4b030e169..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png
deleted file mode 100644
index dc8682716..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png
deleted file mode 100644
index 808186aa9..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png
+++ /dev/null
diff --git a/core/src/main/res/drawable/ic_drag_darktheme.xml b/core/src/main/res/drawable/ic_drag_darktheme.xml
new file mode 100644
index 000000000..b2ef2e5ec
--- /dev/null
+++ b/core/src/main/res/drawable/ic_drag_darktheme.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="30dp"
+    android:viewportWidth="3"
+    android:viewportHeight="4.5">
+  <path
+      android:pathData="M0.74983,0.25011A0.5,0.5 0,0 0,0.25011 0.74983A0.5,0.5 135,0 0,0.74983 1.25005A0.5,0.5 0,0 0,1.25005 0.74983A0.5,0.5 45,0 0,0.74983 0.25011zM2.24999,0.25011A0.5,0.5 0,0 0,1.74976 0.74983A0.5,0.5 0,0 0,2.24999 1.25005A0.5,0.5 0,0 0,2.75022 0.74983A0.5,0.5 0,0 0,2.24999 0.25011zM0.74983,1.74976A0.5,0.5 0,0 0,0.25011 2.24999A0.5,0.5 0,0 0,0.74983 2.75022A0.5,0.5 0,0 0,1.25005 2.24999A0.5,0.5 0,0 0,0.74983 1.74976zM2.24999,1.74976A0.5,0.5 0,0 0,1.74976 2.24999A0.5,0.5 0,0 0,2.24999 2.75022A0.5,0.5 0,0 0,2.75022 2.24999A0.5,0.5 0,0 0,2.24999 1.74976zM0.74983,3.24993A0.5,0.5 0,0 0,0.25011 3.75016A0.5,0.5 45,0 0,0.74983 4.24987A0.5,0.5 45,0 0,1.25005 3.75016A0.5,0.5 0,0 0,0.74983 3.24993zM2.24999,3.24993A0.5,0.5 0,0 0,1.74976 3.75016A0.5,0.5 45,0 0,2.24999 4.24987A0.5,0.5 45,0 0,2.75022 3.75016A0.5,0.5 0,0 0,2.24999 3.24993z"
+      android:fillColor="#a9a9a9"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_drag_lighttheme.xml b/core/src/main/res/drawable/ic_drag_lighttheme.xml
new file mode 100644
index 000000000..42714d5db
--- /dev/null
+++ b/core/src/main/res/drawable/ic_drag_lighttheme.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="30dp"
+    android:viewportWidth="3"
+    android:viewportHeight="4.5">
+  <path
+      android:pathData="M0.74983,0.25011A0.5,0.5 0,0 0,0.25011 0.74983A0.5,0.5 135,0 0,0.74983 1.25005A0.5,0.5 0,0 0,1.25005 0.74983A0.5,0.5 45,0 0,0.74983 0.25011zM2.24999,0.25011A0.5,0.5 0,0 0,1.74976 0.74983A0.5,0.5 0,0 0,2.24999 1.25005A0.5,0.5 0,0 0,2.75022 0.74983A0.5,0.5 0,0 0,2.24999 0.25011zM0.74983,1.74976A0.5,0.5 0,0 0,0.25011 2.24999A0.5,0.5 0,0 0,0.74983 2.75022A0.5,0.5 0,0 0,1.25005 2.24999A0.5,0.5 0,0 0,0.74983 1.74976zM2.24999,1.74976A0.5,0.5 0,0 0,1.74976 2.24999A0.5,0.5 0,0 0,2.24999 2.75022A0.5,0.5 0,0 0,2.75022 2.24999A0.5,0.5 0,0 0,2.24999 1.74976zM0.74983,3.24993A0.5,0.5 0,0 0,0.25011 3.75016A0.5,0.5 45,0 0,0.74983 4.24987A0.5,0.5 45,0 0,1.25005 3.75016A0.5,0.5 0,0 0,0.74983 3.24993zM2.24999,3.24993A0.5,0.5 0,0 0,1.74976 3.75016A0.5,0.5 45,0 0,2.24999 4.24987A0.5,0.5 45,0 0,2.75022 3.75016A0.5,0.5 0,0 0,2.24999 3.24993z"
+      android:fillColor="#9d9d9d"/>
+</vector>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index c880ba5c0..28747df30 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -38,7 +38,7 @@
         <item name="navigation_up">@drawable/navigation_up</item>
         <item name="stat_playlist">@drawable/ic_playlist_black</item>
         <item name="type_video">@drawable/ic_videocam_black_24dp</item>
-        <item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
+        <item name="dragview_background">@drawable/ic_drag_lighttheme</item>
         <item name="drawer_activated_color">@color/highlight_light</item>
         <item name="ic_history">@drawable/ic_history_black</item>
         <item name="ic_folder">@drawable/ic_folder_black</item>
@@ -108,7 +108,7 @@
         <item name="navigation_up">@drawable/navigation_up_dark</item>
         <item name="stat_playlist">@drawable/ic_playlist_white</item>
         <item name="type_video">@drawable/ic_videocam_white_24dp</item>
-        <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="dragview_background">@drawable/ic_drag_darktheme</item>
         <item name="drawer_activated_color">@color/highlight_dark</item>
         <item name="ic_history">@drawable/ic_history_white</item>
         <item name="ic_folder">@drawable/ic_folder_white</item>
@@ -145,7 +145,6 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_black</item>
         <item name="drawer_activated_color">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>