From 71316cc47478de1f15f80b6881e65ab630dc5522 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 7 Apr 2020 21:23:01 +0200
Subject: [PATCH] Made drag handle less prominent

---
 app/src/main/res/layout/feeditemlist_item.xml     |  11 +++++------
 .../ic_drag_vertical_grey600_48dp.9.png           | Bin 289 -> 0 bytes
 .../ic_drag_vertical_white_48dp.9.png             | Bin 265 -> 0 bytes
 .../ic_drag_vertical_grey600_48dp.9.png           | Bin 202 -> 0 bytes
 .../ic_drag_vertical_white_48dp.9.png             | Bin 191 -> 0 bytes
 .../ic_drag_vertical_grey600_48dp.9.png           | Bin 379 -> 0 bytes
 .../ic_drag_vertical_white_48dp.9.png             | Bin 349 -> 0 bytes
 .../ic_drag_vertical_grey600_48dp.9.png           | Bin 593 -> 0 bytes
 .../ic_drag_vertical_white_48dp.9.png             | Bin 544 -> 0 bytes
 core/src/main/res/drawable/ic_drag_darktheme.xml  |   9 +++++++++
 core/src/main/res/drawable/ic_drag_lighttheme.xml |   9 +++++++++
 core/src/main/res/values/styles.xml               |   5 ++---
 12 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png
 create mode 100644 core/src/main/res/drawable/ic_drag_darktheme.xml
 create mode 100644 core/src/main/res/drawable/ic_drag_lighttheme.xml

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 a0b47594b46b7f9b5d35409f36a1252744128848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qUU<4VhEy=Vy?Idbpo75CkG4zO
zL?&dtXjCivcG^(=h0Cu6?B^cL;A3E6IPmV>|FgVj_#Za@%6hi`%(Jd-seD`_8UYI&
z8h42W=&N-v$yGDDwpOR=$(Q*HO1z)VzPQ%i??2}$pR&`bzfQcgcRaZx#ttYcZ(n<<
z21v=iIQ{kUr-pqszkX|EGXYK7)&Fks?-zDJ17%&qmu{ZZ6?Cm+{>th3lT533<p(VK
z^{pg6P)~o&OS{SMr_H`I>)qst@7GrE7K*-Fn>k5skN;oo1wZZ`|8BSM`^UZd4gb>|
k8ktzZ?wd9<+ANDvM@nPuA9>MYpr08$UHx3vIVCg!0O!btP5=M^

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 a4ce8fa7eb52c3cee1c986738b1f3f1e2272ea59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qE_k{)hEy=Vow;4~kb?lLeh{yg
z!&L|V3%yHTvwUT=b?D&^J#;*;Y5VV#G`-&!PrQ2@_e1+v#@oOQDW_L_9*V6ZK|tcl
za*e<%ZrM}4;!ez6;wAZ1duRU@w`1R?-f_>;P5$ci?%$6t@uKbGd#~JzdvSYb^AvWE
z*k+NSD|T7(Tl;Ud1C7XBak7rrDZ}rr^l1sx<==Eu&dd(}oh4aXoE5LSILq&?x9R1^
zm6zPE+NGZQ;a>^V`=yqxR=!p~-5BPC5dJ0KRwQb_VNiH*=xm19*WW<DF?hQAxvX<a
GXaWFzFmNgW

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 7cd66845bd3fe010658afdf6acfb49674efbec65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=0wlMXIamRyiJmTwAr*|t3k3eC^C+Im;Qhxh
z=Iy2{xi#gA&?AS=@|Tk@9X~qnMa`<HpkF(_*bCS>J?FRe?y_w>W~cS_z=PmC&P0Q(
zlNolBXQuT$n;huv#p_i*^_|xB<+*k{+59$zXUz7$*T7rr8|;0`$g6((KRxfog?5?(
z8qejwc~)$(lU(cXwwrJ9w4NxVEY2AV3{w~wekCcj-QDtw1L!ygPgg&ebxsLQ095iz
Aw*UYD

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 3d1fd0fe3f148fefa747cf8ce2d35335a4147f08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=0wlMXIamRyHcuDFkP61P)3-7@8H%`WX3SxV
zPAFC|-o$pP{$&Ewn-4*cX65gE9=6`9u+aXHv|+(Q$4RF=R3<*rm6$l$aL3yJnkPRj
z*<Siqh1n?R*Y&TnCoy;|stpqC{MM;bGBesL@%u@s^G0uk?mfEMGWE=jXtl=goVihF
q;}7lfFPZ=1wL+)LBng&2Yi0@dj6D_62NZ!WV(@hJb6Mw<&;$VA#!9~c

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 83cb915619d98d969866f8b55bfac78db6c9738b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmeAS@N?(olHy`uVBq!ia0vp^Ng&L@0wfvNoNEP=PM$7~Ar*{oZ>fhkC-Sr<Zez-i
zihcj~E8Fo8`_wz%e7G0BX`_Y7>Fl=Te384srQ1(h<}1BFb@}hz{oKWCKDF$sTlFH8
z?cpMa1_nkZ77hUgFyjb|_UvoQe^-24nffb#zVssghmohx)}37TJHNc+g0gP;SI7Tv
z<pkwzo%emeE64EhTK#VKBbnbPY`b5-+qot6%Tn7Xlb8O={r+39dcpf&dB3N<+F#qm
z@tqZH!3p6foS#@Kn`|8CDfoZr<pm3h<wko2ZMu8N>w-;S#AIV#^WS?mh#C8fY`v3t
z^7t8Hep}~zN6!e?+dBU{c1GCT);X^2jPS0Trcd^(IDT$<`zpKkNcc_8IqEsiLY`c&
zYm%Ee0)QS#sBQYnc}+cHKA7?E4mZMsV4wcjDIU#tk6U#6)Z+e=>i#Eyfy&_N>gTe~
HDWM4ff0CjP

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 4b030e169132c2e4e2d95bbe100ede46665c23b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmeAS@N?(olHy`uVBq!ia0vp^Ng&L@0wfvNoNEP=DxNNmAr*{oZ>fi|Bnr4DZfcS(
zd4130J%jrVu0(YYBe8Zh-KGa8B#){Z?^kxdYWaPt&R5^M<;z~nALc*n{Nj|HONW4>
zk`st@YT*!6a_RVSGGOzGpNH36*t4C#Yr(UQ>oURnxA%8OEIIS1`uB{E;!|_>Za?2(
zQJXI>ywPdq&hOt01$mF}c{btI-`XqvH!9D`rS-k~`}e%^AvdsjH`Lz<f8+e!QhUfQ
zasCJCXt3agvl_<y#(weF><kZRt&dDrNS{Ar*_o7cb{qX?-knqXXqu6^<?kbAsb)pr
zIuosSE<Srp{g@@=gO-g)YMT^qwM%}Hj&^ARI{DD=mhYVJh3~2F@voTw;rw2uCKre&
hV7{?wd2+dwKfJEuZ?wCE7%<ovJYD@<);T3K0RSDNmk9s>

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 dc8682716d84f8275ce7bcc607a80a43145e5b5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^lR%h*1xT_KMYA$6FiCj2IEGX(zP)WeN!U?@?ZLrS
z-*~E-Y+@Lba(EQyef`^}blLSo`a#!692Juv+VXU5OPjf_SL*uLzjIIR^-tUS>$U0s
z%w6^s%U;g<sw}JGF+stxiG_2L1CS5`@>oCwNXQc`9+d0xNnhz~@1>eMz2%pS&7VDU
zW7Uh7zH}*PmwfDdpJ{2{ar>B-?7aBu#NLh1-InUbvj)xT&#Sn_4QAds%`02(6}yjX
z$rm&8lB(!epG1|9zGj*(f8_SstR*}Duotd89sWsFL9KbA`s1}gEoY~noWZkCMr=n-
z>i=my+qa27@~fJC@7UXKhbpogPyaVmX@s~^ffMY?OS@m*{gUUpxICEU1(0zsugZMy
z?0dfNmz4{n_-o11nco7cGpqP?&zkh!)1CayWlzlChmT#Y?wM3=kM9g)vwy8`{`bY*
zY2S~2KX~E3-n)ytzY3Xe7QM*p>Y)G8#QIC}-e~=gmfc@G-(T~#Imh?+#O<}ycg(8&
z9RpN2sqEPGgBRk%x4pi5ZHcY8{k5Jyi*1*eOB=~{yRTNZ_i_K4cXQ6IOL88cFK_;T
zMeP5BFhQu}gn-^Txo>u@`R}}Mci-%eJh1V7+WoV)&+eOj4~Rj+%<8Bf#u`(Zv-0jf
bHnC@{X8f2N#;B$YOezeXu6{1-oD!M<*<lQf

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 808186aa93ea7813b1eb6359513e53a76ae41587..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^lR%h*1xT_KMYA$6Fh2KmaSW+oe0$q;(iBIAwuf%Z
zzwuNv$*f~Alse2<&~3p}C#Li3JI9Wc9f#Wwdt7(x{c7`me%Y6h-ny$#?RD!v{ERvE
zNppgNV-pLfkctO{oS*<=7k7Y!pb`@l{(dw%wK3-W=kw>k%A8&C^(WtiO*5AEn5S%f
z3S=6c3R)&@lvTQqe@XJn(j`}a+D*t?a&2qa^WP3t)1uBt&3!NV(sT9axV+-eMb@*T
z+<^j5wGT{q*|sLPbl-ga$<9wtCvN_{_m58GY~`KP(&x`#Z8>S{*>nFH;r4@_H{nfQ
znfdPM%Wv}97<SLTd-n9%cWLFDci+7GCJ))=6BJSvcNabTyjh!j>5aQuPaWi*y7O<|
zFS7e~h~?auep5T&<lX+HczN%6vE8>LcFu{K&cm4eG%oAz#@)SB%~yWC_0BBp-I8m$
z`r9`a*=;>{^X{=z$M&2qdB5r2JF`H(r^&~D&u}i=K68`)_Rou>Z)TUTo@RP;V)Fd?
zZzC@s<d1;|7%=d@-@Q{_eE)2%`S-gq2MR$9eIWBq-n-p9-#^<Iebf^c@W`4xK!Pe@
k66onA=Z|iF6Ku!G?Wl89FlE~>V9Yaky85}Sb4q9e0JeMjg8%>k

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>