From 28d0308427aec3809b49799e1c95b26f44cd7493 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 25 Oct 2018 10:18:27 +0200
Subject: [PATCH] More cleanup

---
 res/drawable-xhdpi/chat_file_message.png   | Bin 1532 -> 0 bytes
 res/drawable-xhdpi/fast_scroll_default.png | Bin 326 -> 0 bytes
 res/drawable-xhdpi/fast_scroll_over.png    | Bin 605 -> 0 bytes
 res/drawable/chat_attachment.xml           |   5 -----
 res/drawable/delete_field.xml              |   7 +++++++
 res/drawable/fast_scroll.xml               |   6 ------
 res/drawable/fast_scroll_preview.xml       |   9 --------
 res/layout/contact_edit_row.xml            |   2 +-
 res/values/styles.xml                      |  23 +++------------------
 9 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 res/drawable-xhdpi/chat_file_message.png
 delete mode 100644 res/drawable-xhdpi/fast_scroll_default.png
 delete mode 100644 res/drawable-xhdpi/fast_scroll_over.png
 delete mode 100644 res/drawable/chat_attachment.xml
 create mode 100644 res/drawable/delete_field.xml
 delete mode 100644 res/drawable/fast_scroll.xml
 delete mode 100644 res/drawable/fast_scroll_preview.xml

diff --git a/res/drawable-xhdpi/chat_file_message.png b/res/drawable-xhdpi/chat_file_message.png
deleted file mode 100644
index 624596c76718a635631d7d0c0f2f1309bcca4989..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1532
zcmeAS@N?(olHy`uVBq!ia0vp^B0#Lc!3HG%8Q!`Lq!^2X+?^QKos)S9<Zu>vL>2=T
zUk71ECym(^Kn0PRArU1JzCKpT`MG+DDfvmMdKI|^K-CNkHWgMtW^QUpqC!P(PF}H9
zg{=};g%ywu64qBz04piUwpEJo4N!2-FG^J~)icpEP_pAvP*AWbN=dT{a&d!d2l8x{
zGD=Dctn~HE%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`V
zEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5Ohed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV
z%v7MwAoJ}EZNMr~#Gv-r=z}araty?$U{Rn~?YM08;lXCd<#R|ql7WH6#?!?y#Dn+k
zwA<Ms;UdS*TN(?eC0!1<(!{oUrobwGvCKUJiV`PW4@xT?bZTDf-}{4o$}O?xDc>Ad
z={MO`9%j$v>T1k**C^67y&=~%YNI6ArB%+Uw+^Pv@=5#k+wYv6kJ{XnN6r3uHzKRo
ze_flue(Se6Z&IUsrcImX;O>5W%QaqJ-nH9uw{NPM|5NR={4;}H-Fx@$y&f6;_U&6f
z<He=_Ht<FU2M3!T<L-N$lltuOnwKv#wI`p9;b&oL-?e-9d~v0%PjBA1A>sN*fQK#o
zfy(jrH|!l+^UkJeN94D!aANoM^}XBaqV#p{+_{fmJe{9v#gaBTRqce^<3%Sfz1+fj
zaO201ABB~bm4%JfPOn<MIyx>Ws7UD0wE&GRnp3^z9=XQW`FN^UbIC(9Q)`Bsq8(GN
zZT$D|-{VbJu3w*hc+J9v3%8V{6!m(1Z<@`pU+@j{(sK_3zdd!Bw=#mALG$c<;m#xG
zMIs(5X;MWUcIkdX4lNnw+}^JkOVV%LZ+*PNdG59o2VTg@%Fdl++_E|Ef{TTP#Sex%
z{ag(l*G_9n^>Rs1>kC}OF<m>h<Np-3nLev7%-XbbdfSx(eTFxaXRZxZTiJc!I<Lc}
zQX$35p;hXyo^6>v$Fyk9-@_kFvv2F~`Pg;*@xo`%o-Lg`d9sy`<1Wo5g#tR|YyYlM
zR5y-M5L~nD#CDB8>#w9v@40eScLL)%^;#!kv;CU|maG=|^=8_i{?Buao+Q;cEq>xX
z;qd-nNk24q+~2-YRQb6;mESTyH?hM{leh%Md?)aK;aqup&(@RWI$OSTo?R-!B)0lH
zXLo4?$M;zU3%PW2>QhZ)zKAC!>5Dw{{(pj7a2B(;F1O&mOH-cPt_f)A_Pc8FqvhFt
zUfHINFV~*iD<eGf_l%zl_L#f16x^)(>cq6MuF>Q3{iy#Nr+Xd0keoK})YOF5@bI*&
zSFXI+8~NyEj-Xm<Lq@Mk?djwr%KR6OaYww|Ta)F=xA^{==ZuxnKR$i>v|aFh#@Qd<
zE#L2`_DARD<{o)1<mc_)l3ggb?7t=dP2P~@mAtyMR=J-zEte*}BQ<M_#C93KS0N@E
z*QZXM`gZEJ_3Piu^k3Z`_4!w5%i)LpE8p^Y$jJO>_}y6La`U6@p}5{_$vJ-;U%h&D
z|AvgqPqvFW>sGD$m6wyFBiVhlN=sY&{X*_Ue?$3A`<UKMo;Pn^yo=kF_zz|EPwpOE
z+1S`P``y`#d$%##EcPh;#rei=k<8@DZ7++`%Z%$a52p*%u2t(i{O)o~UZAj+(^;M6
zbCs7m3v_+a+_m20^Y3-*^e)Rpt}4vTeCgI<r`j;Li)RzdYpX^3);HHW&GlZAK6TRc
zrUU+w_tidGJmV;qEpFCxYo7I&ug*SY@fK~z*cG#l%<gXcZLK_&KeFCa>%Erj#OHje
z3>WXe&`Zp}{#3%~VbMjkTRaU0fo~4pJ5kgBQ!LQWLC%@axn$~!q!-Vxe78^LW6<qX
SKYt2TBzwC0xvX<aXaWHCYNF-<

diff --git a/res/drawable-xhdpi/fast_scroll_default.png b/res/drawable-xhdpi/fast_scroll_default.png
deleted file mode 100644
index 947a24d95777dba3044dcb23391f7cb879b38b5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^Hb9)i!3HGFiY~S?Ffj6Zx;TbZ%z1m;n(L5*h}%PZ
zt#x`kSfr<?KID3HWbe-d5h_c&#LA~Uww#cs@SXdxN#d@=x%;!ey=9D2pD{0?s_7-?
zGIYjPhVP!=JpDY|)X!%|T@L5pyrRx=lCRr|)#bXA*DNz_Kb5$PtzJ&A^8ev`lg@Cb
zXKq?*f7A8p=ZcJr!an{6wg<nkTqc!K;CP+?+PzcDW@ItiJ+u8{dUX1hNoMAkw@Dh-
z9+S@Kw@N?qZdH3`q4C@0pDrvycQ4cj_3ZnYXK#{G>-Om20frBQr>mdKI;Vst07y8C
AGXMYp

diff --git a/res/drawable-xhdpi/fast_scroll_over.png b/res/drawable-xhdpi/fast_scroll_over.png
deleted file mode 100644
index 134b728f7c7b7c17400333f4e9c2f47ef768d63f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmeAS@N?(olHy`uVBq!ia0vp^Hb9)i!3HGFiY~S?Ffgfjx;TbZ%y~O!uNSkUh+DrR
z%jva8oYt&85_Cjd;QqnsTRyP51Vwi&?eN&(C3#3lH|<aB*}OZ}g8OUOr>Umw{625y
z&Dd=_Hh--;=w|riHPf};)~g#gSc!!lKlCahLY8}Va$;#)>tp_g*n}zl%NXMrKG*ns
zdapD^NRHumjrhAmGB?yX?SmZlw0vL;n8+1BRWNgb0`C=(9sH}fJNCD0C$!%``7g!#
z_$sEPS^>+$>`R!G*$WwD81)ath8$R75t^`Peh7=NUr6KcBRY@O+z!OKEZ}&k_%uF0
zu~Lca?pb%?;|C-QHmSt(-eCwoP~kaG^23+iM#6%Ja+T}-CdF=>)pj7$&YZLTOu>;!
zdArMRr|iF0bjLV+xysT=RriloX73&!M0i7IO&_M;h!LDy%CY_ubIh8+UvoJgMxOqk
zysJ|uBk$6yS*xdVJhYPcjbXa3d;QAKS*PVHtpqQ2nJbp|n3mS}WzOHZu2QYGc};TL
zVvdu-UoTWC<wgW_S=#RQy5A|Z&Qn@sN|M(Ft*)Gsea!P3ogc9kG2Rifm~rv_L(R<Q
zrhDuAWgfRam>Rrj>fd?id%fG1oO`#fGV9Xh9na)*W0+Q6XqTy<c0Tv)IpclY;tRi|
pv6?#iU)T8aaRIs~Hy0ktzoi%?q<USP2bgRaJYD@<);T3K0RT9b5cB{5

diff --git a/res/drawable/chat_attachment.xml b/res/drawable/chat_attachment.xml
deleted file mode 100644
index faf13b811..000000000
--- a/res/drawable/chat_attachment.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorA"/>
-    <size android:width="120dp" android:height="120dp"/>
-</shape>
diff --git a/res/drawable/delete_field.xml b/res/drawable/delete_field.xml
new file mode 100644
index 000000000..17252aad3
--- /dev/null
+++ b/res/drawable/delete_field.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true"
+		  android:drawable="@drawable/delete_field_over" />
+	<item
+		android:drawable="@drawable/delete_field_default" />
+</selector>
diff --git a/res/drawable/fast_scroll.xml b/res/drawable/fast_scroll.xml
deleted file mode 100644
index 438a7ad42..000000000
--- a/res/drawable/fast_scroll.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/fast_scroll_over" />
-    <item android:drawable="@drawable/fast_scroll_default" />
-</selector>
-
diff --git a/res/drawable/fast_scroll_preview.xml b/res/drawable/fast_scroll_preview.xml
deleted file mode 100644
index cdf8aeccb..000000000
--- a/res/drawable/fast_scroll_preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-	    <shape android:shape="rectangle">
-	        <size android:width="70dp" android:height="70dp"/>
-	        <solid android:color="@color/colorA" />
-	    </shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 27a1334ee..0a9486ac5 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -19,7 +19,7 @@
 
 		<ImageView
 			android:id="@+id/delete_field"
-			android:src="@drawable/delete_field_default"
+			android:src="@drawable/delete_field"
 			android:contentDescription="@string/content_description_add"
 			android:layout_gravity="center"
 			android:layout_width="30dp"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index df3ca0266..40c8cfa9f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,25 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-	<style name="Default" parent="android:Theme.Holo.Light">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
-
-
-
-	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-
-	</style>
-	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
+	<style name="Default" parent="android:Theme.Holo.Light"/>
+	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar"/>
+	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar"/>
 
 	<style name="font1" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorA</item>