From 2747e048c5df08295dc4c16904cf325640397872 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Fri, 4 Sep 2015 21:35:50 +0200
Subject: [PATCH] further cleanup

---
 .../drawable-mdpi/collections_collection.png  | Bin 1604 -> 0 bytes
 .../ic_menu_add_field_holo_light.png          | Bin 1354 -> 0 bytes
 .../ic_menu_remove_field_holo_light.png       | Bin 703 -> 0 bytes
 .../Resources/drawable-xhdpi/ic_cross.png     | Bin 0 -> 457 bytes
 .../Resources/layout/file_selection.xml       |  19 +-----------------
 .../Resources/layout/group.xml                |   2 +-
 .../Resources/values/styles_material.xml      |   2 --
 src/keepass2android/keepass2android.csproj    |  10 +++++----
 8 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 src/keepass2android/Resources/drawable-mdpi/collections_collection.png
 delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_menu_add_field_holo_light.png
 delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_menu_remove_field_holo_light.png
 create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_cross.png

diff --git a/src/keepass2android/Resources/drawable-mdpi/collections_collection.png b/src/keepass2android/Resources/drawable-mdpi/collections_collection.png
deleted file mode 100644
index d1324014d0df9390f1cbe97a5afd4201471f5cbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1604
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Gsgb#ptGS!0lYxt&p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaT(5-zPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$j9
z!D${;ZwgMgn7iWCs}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=VCq$*h-wfoYqk
zi(^Q|tv9oL{Y4xF+S1Er@$c=pD4{H6`0Atp?@gEFJue&gKR76VbiQKDj*8O5j@MlR
zL|i!!hIVlL*tq#|bkJNMvy>P2*8BK|tNWLU&rtkaQW_qb{#fVqq6zM6m_i!30vNR%
zSXVHJE?{yJ4_JSF{e!1WGg#)zy`SEYpRo50|Gf;8fBR?MIsfcHZGq&Uw;%UCPGHt)
zsO1z4cwLqMtL4y3wF;F~&L^xX%nj50xa69PFR}1sO=##&unS=fJH%`tyQ;y=f`49%
zmck>SPXcGAL^eo1+G}0&fBA!_6aG(^O@5$U5y-|^rg?{HySvH4^n;%hIXr$%5$*SI
zc(i*>?_;}-++}V*6!!LUZm`T?EV-<@;S7`3Ra?pSoA;mpns=-;Z^k7f^9t69UgwKB
zqGT>E=Q5B9ivIIcatC)E=iCpT=RCUCF=YhbWOIMOwu9xHmmH((#E<N28p`!rC+tn=
zwV&LexsX5qcz$1l?RBpSt9D-h^Dj>RIZLX9*{tm`-ig2NhTk(-X2GO#{-4D8y4#@)
zu@|0fDQBM}IEN{j?|<n1v=j5*PHZSV$dqBUe@=+XRjy0%-TI4u{hIaR!}8~UMCKOw
zMQYzLD66=<U~7Ho2eypOk(a;QJh0t=?$dqGxc}@AdRI5R`(v+d^Y>y=9e3Ri4vQy$
z><@3Pci+&^a(RBS@sz@|HpjE;o0Oei9j@>1^Y7flB9T{f>D?j6gkOuVe80I}*01uJ
z^23MoKgC^p`P9bY*FpC)v&%nkVOqFK`Qfp2;}FKS^!>7n7^MHL)-x>%O|PF_JyU^I
zCFa!oHjM*q|7T^-j&NnP?>=>Z759P<@%=LU7l*hqhWy)Cr2E7t{Kb=rcmC9T@DvYR
z_bmVUgjxU07CnBfpU<d$$L!l@*ONvr4yTv*UtE7`6)5Sz(@}%NaeGEKhNhOsc@h@k
Q??L6dr>mdKI;Vst054N##{d8T

diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_menu_add_field_holo_light.png b/src/keepass2android/Resources/drawable-mdpi/ic_menu_add_field_holo_light.png
deleted file mode 100644
index 4a4990c0948a72fc60d3ddfac567c7d2bdf0909b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1354
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3BcL7py-ArXh)UXSkxDHUP=aDH$39A9zc>{f+S
zF;nG)PI7Q_ui+^%4pcH|YC6!~qmtA#@6Ez0&L|^|YR!(SSBhFbr`UhTr?o74={#fi
z)qN~W({8WZY5e_P)sFJC^tALc?bl2H@bY~B_s;Tp^}oO8EbY&&|No~eO>L#mrE4pj
zC)o4MlXh?}(V51z^MKd6=_gW*54#w1`KPq*E7rNtyt&ROuHg8kmyU}vj~+kavTp0a
zuj{rgxbgF3;P1CZ4jN^<oLnw<oG*=kA84*ws<8U!72`7hTZTWLGe|uO?zTy9R`|4d
zuU+|_^*b&ktzJ{OQeo5S!)>Z}6&7V4;jcKWYVjs>_uO^d8XC_c-y5DTJhb=TTQ<Q`
z(fv19pK`N(=bHX>rifHbCEM2<uQ-c+cbtDcSMd>Fp7)ZxFPk<AGMBCJaxpT^{J8q0
zi%_UFk3`_NNufa}c??%PnJ`oP?bY`)wzi!O%D%Lxr*ql&NvmAHMP!|jy5E_)*34(C
z!h^`aem8R>JhxgT7*4Z%)NopW_t}<E)x&1iEAMY+{k}!di$yy3P#OEwD^Yu_ZVPo!
zEk50Sch;olZOM~+op#Tj#h^9ekz!5K@)f={am|O8Oyli1;U_OXCo@<ygH_{B!QR;)
zYhtHw+tMAi*eqiE?72IR@^<V#vS8AFUJc1j*4I;?Wm!gSuimcMS=upMH$#`vbj^|9
z$3CrD=c6TXn(J+{ORxUU%R>7r<M&T(ozllJF`+Nj;tEHynW|HWAlqioV_x&#wQo2h
z^LWuoi>=H$7upqBv^KVSu@>f>5$*W0c)1YQyv=T12lyBI&zIlDc)<0PMdY5d-&T5u
za$kS4bZ1U~z?&4kf*Yl)9*CTJ_Iu&%?jm&)`KccL5j)o=O_lbS^o?hB+RIqV#9@)^
zbn;Kq^PbyNyDg5K+i}c$)w_>-=N)?&vCv*T`H+6px#Hcd>T?W^KT<leQeV2Ur~BH>
zTlp>~H&m8z6xsWk+_`<Usn9((uTn7Ok=p^GnUSwp^;f3!9y!5v@2N#rjTN_7*0<>N
z-nisN&r;T0sh#&fT{m87W!(0pdc~z1qr6?)%0s?J_b=JHsw8ge9jkX6B3{|1+yx4+
zuW4ZyJ)XtoGDFF3`JFEQn#MKN8&8*3GOo@QEn+vD=pGdnvh>}J2aKz^&!zloo7}bM
zX|7FXYm~Ih*%cS7er9y6k9?@P=dEtwZ_5{VjKptdPt0HQwbuKz&lj#^QleV<Gr8Xu
zPF374Iq#N{wXbO9<@<}T8<tz@h?yQco^~!`LgYJM@1DrloA)rCw+US$H2-GOp&<F2
zY12Xkv^~4xJ#{?JZaUjOZN`SBdi!d(mR_h0dpdK{k6Vn)&!jgT%v7$M&e@z8A0e93
zRQc{p*YC4sm+s#CGr2iD_=C{OI_oI6<N3Ww>r{0YKUVJh-+FN)r;->;`HDY>59f2c
zeEzY|XFkiy`LdSFKknsR^p)w-a`EIkyXV{<(kJ#8w!UKcyj`#H`St$^e;J?Z%-)^z
z`NAz=QKMSo8c~vxSdwa$T$Bo=7>o=I4Rj5SbPWtc49%^K4XsQ}bPX)53=9m)emq9e
zkei>9nO2EggQK=XJWzuq$cEtjw370~qErUQl>DSr1<%~X^wgl##FWaylc_d9MGT&<
KelF{r5}E*QQf6-e

diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_menu_remove_field_holo_light.png b/src/keepass2android/Resources/drawable-mdpi/ic_menu_remove_field_holo_light.png
deleted file mode 100644
index b31359f7ef2e34b32cadcad2d41ace589f74487f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 703
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3Cn$30yfLn02powh&dkb^+`e(w^t%9brwB@$D%
z2fQq33!h*fyhNy$RoiPW<JM)HRGS(%GngED`&V<#8MB$5-|Ftax%+fGcj}bDwp+DV
zV{DbCF*vt3Xj_YkX?)?DXHa-Ldeh>!s)x`1zV$5nvTFQ^Z|fiQ=oKGx$ynL-{_Mp$
z#YcO@gP-v!bY8gf;*;atITKqn-uz|FO*5%@G&f^WECcVJ&z^I8+FE|7)_c0O%Jnyt
zg&8O^9-YCe8El;7UFS8`j(N&|Nev}8p+gGwr|-U+V0$jXX_KIVl8|TI;=Ni0iie)`
zGN>y##4$t&YPrO*L<m^9++#9OFp^4<xv2Pgs`;)=!)w#SHZD1;Dp~Dtj?vb>GMlwk
z%S2Gw=+&9X4d+ey_m#<gJpORSf)CfXy)a0hKVwetY+g2oGM%-jc+bx<Q2pw9<ld*%
z-IeFHcjh!RGF-eg1w;kb?c5i5ufxLQ-|;tl1Pdqp@wfisb|mqWbNc=dxiiJQg#{UP
zh4nH{PfK%H@}$T4*fj05kQd(5wzXQM`AJ!ATk=KXMBh*DiIa<x<)W87G=Db1TufuO
z;`*~O_36?^QwuMq&AFOjo>IOoH>dDad)oBCWA(lI>y3ltu4^<z0pnM-#5JNMC9x#c
zD!C{XNHG{07#ivtSn3)Wg&3MynV4Idn(G>vTNxP4onp5hMMG|WN@iLmx&|{VV^fHR
zpx<Acff^)1HU#IVm6RtIr7}3C<R_&nc;+Uirv{}arc@T5Otk?jV(@hJb6Mw<&;$U0
CbQ50y

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_cross.png b/src/keepass2android/Resources/drawable-xhdpi/ic_cross.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2a6af7aeebb216596ebbb9a70de22ca79def9d5
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-yr1P>T7byqGT0004KNkl<ZXx{CZF>V4e5JjmdX%L)&
z4v7dv#0gUDO*jXqfSLoaRGfh$Bxj%vQT);v$*jU+d&j$uGGC%(cyByj&C=^>G#ZUY
z^WOptfRSLm5in>Aehh4Y9WW87H?g%gz_=~=TlP&PEd1Wqx+Ilw;4j=KN}>W!Qi&S)
zD2WH~X(WI?u&#j*l6V5|O00ptl*B7=<#~<*@BnAvO?r$9TR2(*C_UkeR2SJ-;%=M*
zJ71)Jlm<y;1s@?%0*9>ND-u2zJ3sh{lgJNVK%#s21`_$e-(rk;0gU}TiUGcXS#IwK
zzK=?gEjEQf8F2@Wf3frVoP+>;w-TOXa|OP#8mG|RCUybry7QmF-1*Kz;(emk&P%Q0
zS-^KL0c=CZrlywfIPD|_R=`PWxA8cM6R?sVqapAS+xdW#cn5~5E^_rG8f}%ooP>Pm
zYa~QgVn-r9yz`?|U@2H{2~72We~m_?(S+s)s3r+Wc4w0j00000NkvXXu0mjfR6e$K

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/layout/file_selection.xml b/src/keepass2android/Resources/layout/file_selection.xml
index b5268ed8..a9b052dd 100644
--- a/src/keepass2android/Resources/layout/file_selection.xml
+++ b/src/keepass2android/Resources/layout/file_selection.xml
@@ -52,21 +52,4 @@
           android:layout_weight="1"
         />
   
-</LinearLayout>
-<!-- <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="12dip">
-    <TextView
-        android:id="@+id/file_listtop"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/listSeparatorTextViewStyle"
-        android:text="@string/open_recent" />
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/file_listtop" />
-</RelativeLayout>-->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/group.xml b/src/keepass2android/Resources/layout/group.xml
index a9e7adce..a1038658 100644
--- a/src/keepass2android/Resources/layout/group.xml
+++ b/src/keepass2android/Resources/layout/group.xml
@@ -61,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom|right"
                 android:visibility="gone"
-                android:src="@android:drawable/ic_menu_close_clear_cancel" />
+                android:src="@drawable/ic_cross" />
     
     <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fabAddNew"
diff --git a/src/keepass2android/Resources/values/styles_material.xml b/src/keepass2android/Resources/values/styles_material.xml
index d2046b36..fb1b6644 100644
--- a/src/keepass2android/Resources/values/styles_material.xml
+++ b/src/keepass2android/Resources/values/styles_material.xml
@@ -108,8 +108,6 @@
 
    <item name="CancelDrawable">@android:drawable/ic_menu_close_clear_cancel</item>
 
-    <item name="OpenFileDrawable">@drawable/collections_collection</item>
-    <item name="ic_menu_add_field">@drawable/ic_menu_add_field_holo_light</item>
     <item name="ic_launcher_folder_small">@drawable/ic_launcher_folder_small</item>
     <item name="ic_action_search_drawable">@drawable/ic_action_search</item>
     <item name="NavigationAcceptDrawable">@drawable/navigation_accept</item>
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index cde73920..d7fccc52 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -358,7 +358,9 @@
       <SubType>Designer</SubType>
     </AndroidResource>
     <AndroidResource Include="Resources\layout\set_password.xml" />
-    <AndroidResource Include="Resources\menu\entry.xml" />
+    <AndroidResource Include="Resources\menu\entry.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\menu\entry_edit.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
@@ -437,10 +439,7 @@
     <AndroidResource Include="Resources\values-uk\strings.xml" />
     <AndroidResource Include="Resources\values-zh-rCN\strings.xml" />
     <AndroidResource Include="Resources\values-zh-rTW\strings.xml" />
-    <AndroidResource Include="Resources\drawable-mdpi\ic_menu_add_field_holo_light.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\ic_menu_remove_field_holo_light.png" />
     <AndroidResource Include="Resources\layout\InViewButton.xml" />
-    <AndroidResource Include="Resources\drawable-mdpi\collections_collection.png" />
     <AndroidResource Include="Resources\layout\entry_view_test.xml" />
     <AndroidResource Include="Resources\layout\entry_extrastring_title.xml" />
     <AndroidResource Include="Resources\layout\entry_extrastring_value.xml" />
@@ -1050,4 +1049,7 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_action_eye_open.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_cross.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file