From e998f805747d62455de3c31f0557e333d60253c9 Mon Sep 17 00:00:00 2001 From: seven332 Date: Fri, 1 Apr 2016 02:03:32 +0800 Subject: [PATCH] Use no padding card --- .../java/com/hippo/ehviewer/widget/SearchBar.java | 2 +- .../main/res/drawable-hdpi/card_grey_2dp.9.png | Bin 375 -> 0 bytes .../drawable-hdpi/card_grey_no_padding_2dp.9.png | Bin 0 -> 376 bytes .../main/res/drawable-hdpi/card_white_2dp.9.png | Bin 380 -> 0 bytes .../drawable-hdpi/card_white_no_padding_2dp.9.png | Bin 0 -> 379 bytes .../main/res/drawable-mdpi/card_grey_2dp.9.png | Bin 250 -> 0 bytes .../drawable-mdpi/card_grey_no_padding_2dp.9.png | Bin 0 -> 249 bytes .../main/res/drawable-mdpi/card_white_2dp.9.png | Bin 247 -> 0 bytes .../drawable-mdpi/card_white_no_padding_2dp.9.png | Bin 0 -> 246 bytes .../main/res/drawable-xhdpi/card_grey_2dp.9.png | Bin 342 -> 0 bytes .../drawable-xhdpi/card_grey_no_padding_2dp.9.png | Bin 0 -> 342 bytes .../main/res/drawable-xhdpi/card_white_2dp.9.png | Bin 343 -> 0 bytes .../card_white_no_padding_2dp.9.png | Bin 0 -> 338 bytes .../main/res/drawable-xxhdpi/card_grey_2dp.9.png | Bin 643 -> 0 bytes .../card_grey_no_padding_2dp.9.png | Bin 0 -> 641 bytes .../main/res/drawable-xxhdpi/card_white_2dp.9.png | Bin 636 -> 0 bytes .../card_white_no_padding_2dp.9.png | Bin 0 -> 639 bytes ...kground.xml => card_background_no_padding.xml} | 4 ++-- app/src/main/res/layout/activity_dir_picker.xml | 5 ++--- app/src/main/res/layout/gallery_detail_header.xml | 2 +- app/src/main/res/layout/item_download.xml | 2 +- app/src/main/res/layout/item_gallery_list.xml | 2 +- app/src/main/res/layout/search_category.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/styles.xml | 8 -------- 25 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/card_grey_2dp.9.png create mode 100644 app/src/main/res/drawable-hdpi/card_grey_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-hdpi/card_white_2dp.9.png create mode 100644 app/src/main/res/drawable-hdpi/card_white_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-mdpi/card_grey_2dp.9.png create mode 100644 app/src/main/res/drawable-mdpi/card_grey_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-mdpi/card_white_2dp.9.png create mode 100644 app/src/main/res/drawable-mdpi/card_white_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/card_grey_2dp.9.png create mode 100644 app/src/main/res/drawable-xhdpi/card_grey_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/card_white_2dp.9.png create mode 100644 app/src/main/res/drawable-xhdpi/card_white_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/card_grey_2dp.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/card_grey_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/card_white_2dp.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png rename app/src/main/res/drawable/{card_background.xml => card_background_no_padding.xml} (88%) diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java index 7db72c2b3..ad2914984 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java @@ -111,7 +111,7 @@ public class SearchBar extends FrameLayout implements View.OnClickListener, } private void init(Context context) { - setBackgroundResource(R.drawable.card_white_2dp); + setBackgroundResource(R.drawable.card_white_no_padding_2dp); mSearchDatabase = SearchDatabase.getInstance(getContext()); diff --git a/app/src/main/res/drawable-hdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-hdpi/card_grey_2dp.9.png deleted file mode 100644 index dbb819aa3a32e048a948435b29ece571f79b483c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmV--0f_#IP)lngpBOWTeqtuGW&5}L?2#(NsEJWf z!ZZlAVRVc@blEC6N`(nAv4?RMBU?;4h42s+XyKA3OOAXXIkKd2u>=RH+^C7yJ^%IQ ze?Kn2-gM9LFy+Pvu6#SMPu3%+GQ8BQ|aFhroui9j=F;J&e5$cfRbUEde z9F9eLnsF;f0qP~wFOHR`j}sPICG3yuQi zA8a}fIOm2tN<7R`;*J~6IS4dexYbEh;E*Fu0y*N40_nI`-(i5+X;|BCFpXxtO#`Y7 V8XX;UD5U@Z002ovPDHLkV1gc7rThQ@ diff --git a/app/src/main/res/drawable-hdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-hdpi/card_grey_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..42e65c7bdc15af1ec6fff9ff92dc52a67a7994fb GIT binary patch literal 376 zcmV-;0f+vHP)`Ya0xYO)PaWx`8_mG1P_k?sRajKVifn#A~C!;un1)#)G4&Ihn9poPfW{uXj!FT zoErVWtBh0Qe~vm5kGI?5pnPeyQUpLYxFCr37&z__d{Oe1kE*t({;qRbruU`@>5F W&Key)F7@*O0000}|TmM&!Gg1u=edj|% z3sV^y7?@bn!^FT?!x9xt5E~a4PkOkx*jShgE>Qs;d}1U>l9C=t62$Ov1P)Oh1DjxY z`{&JQYy5dLyd}WKKwqbtfIi9JZ$~@h_gj+q0&7c(j)hB{i_zYA)hCXNg}$JgpdLxC z_fxJ(;t8rTT2P08H1`MSJ!t}*b!y-cA{IzXQUbD;Hg;)QOQM#|2l?0fhdEP)!}>56W=2L zbF+unA=;)Gf4fgjR&QFHEaPXjMzJkH{~TjWyglxRZ;!iLLTSYL@a1VYe0iD=b&Y6je+o3{(r3s>$&fx>8Wc#O zwm*iUBSD@DH5xRPG^kM_PeM0z#!)9oj3g;Cx}-=FBdCnJ`32@;%bK~xRE_d>H8{j4 Z4FH~#H6^67$M*mL002ovPDHLkV1m<%qb&dc literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-mdpi/card_grey_2dp.9.png deleted file mode 100644 index 14dbd13b1cd6869809a0c528968333ff49baa637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmVVe1RZ?R-VUqF*jrM3oITWjG0hcIq#?$|>>)lG)ua0KSL@(rCFK4FCWD07*qoM6N<$g4Xn5 AOaK4? diff --git a/app/src/main/res/drawable-mdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-mdpi/card_grey_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7353a334bf490c282cbfb05e91649238f3dfbd67 GIT binary patch literal 249 zcmVObOyPT98e}m03HH_ zk^(xcAcM{TCCE`?HHu$39l~$~=+emA>aA1NR>%-AB}NVHCD;l;2wNs>a|Q$C*jvFp zlR$tWN}R3WnMpW+yj*^+aIu0HCL!D(f%s?e`;!sN)6_cF)Y9^Z1;+(JnHnj923`gyE}P%w!-2ffCfu36Ay=SMtJ-MO-GDWq!GJkZ zgA*0X7*uM=fsYVTt06n5hLr(SIq=F%UP+n3<3?@3=6nuPc}I|P!*h0^0Uy)5;FKGK zgls?)A(nT+B{yab(o~ia#9dHuV?zB1#IM0OA7=b|iu@WY^8WRVUpNFdIN;Rkft?t? x@ct8WIK`676;)u#E^R*H2S3GUzu8zHH)k3?65`dyKe_+_002ovPDHLkV1oTYWq$ww diff --git a/app/src/main/res/drawable-mdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-mdpi/card_white_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4b41cb22fb2cb56dbad74a01602a20aa79401362 GIT binary patch literal 246 zcmVg<&F?zH97}S!{xXO9&yno zP{-%G3tsWjTd=M&IssxA6a?tVKLYu0@Y}&m>B-VHmZi(|^a)4sz$@>4d97DsO!)i> wi8*pbaI1^p%8__{!k>PM?|rkOOw+y13b~#V;#_t_r2qf`07*qoM6N<$f+q`ZegFUf literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_grey_2dp.9.png deleted file mode 100644 index 48fcc74262c1b6865b08f5e80eca2ff7f5441030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmV-c0jd6pP)wKTYgFOa#16mG(HPN_*sW3W^nP$B7kh zd$EX5knjtS diff --git a/app/src/main/res/drawable-xhdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_grey_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..51888f0db5e28bf5a012ef3bc3816c86d3550e49 GIT binary patch literal 342 zcmV-c0jd6pP)K@tvyTl%OxSSYMQ~xm#AkHIF&!3sY(pZ5Ah8V}7IY-VUQQeBRzF^&{c;+L zkpe@52_N$QJR%Tsf6gBIFrgtj*60iqYjombI&5r1v2-XxiEY@>F}s)xiS*F1w2*Ky zyO;qF0dhmfaw32S1H_n{8OskH%ZFoPsxOxsp@@AP;dsCi_EAJQCL&(jP)H+({D2(NP>`Y5_B3PD|87n{ ow#@$;ucJzn3I++bg9$4H0K=Y(m>+PnH~;_u07*qoM6N<$f);U%g#Z8m literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/card_white_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_white_2dp.9.png deleted file mode 100644 index cadeb96860a3fa824750519ed1556ad8d6baa6a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmV-d0jU0oP)E8fzdn!s&_;6s3eZLG6`+n&ca}i<_`ftDyEt?48Vxloptym0&{J^oi zD8!gv%tL|y{x?|K8Z>HB;e@11005imyI8<%b0+`*002ovPDHLkV1knWm*4;Z diff --git a/app/src/main/res/drawable-xhdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_white_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..07838d0c283e941bfbe7058c7b1e22c51d49b8cf GIT binary patch literal 338 zcmV-Y0j>UtP)}>M3@c{R{k)oq7j+jr&9BqpI5}`zy)Nvv!a=> zm;v*HmB9R9VDPb@5gRUi1POe&u<;QcaLj~*5c80T5=hJ=gaZ?4v5U>8%Q$78E-yB< z7%4CYY=n@<+i`|D-WF1XuwfuM_IQ;g_IUMQ%!G@1s5s*YCFbG6#Nc8+B07*qoM6N<$g3t7k1^@s6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_grey_2dp.9.png deleted file mode 100644 index 71173615cc30de41b01cfdf398659a07b084bf05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 643 zcmV-}0(||6P)kq+5Nhv!%Zkar9!Lm7Y>o)aEC z*kjC=qG?tYg(~sw-<5mYR(=WtS_xg zyQk~)n~^vsFHc-oFTpfGK2BM}2)^7~x|m|s@8bj4nnCr>bjbx+_~|ttU*u!#(VtQP zJ@V8$Rt518fGUt#NQJcx6uY{2kzk5QqG^EH76M7ApwkQ%0xYVnO#pVMe*ja>U`7u* zpbBIbOYlPiu$Kh?;s_-xxt0fQ<$)*!SX}!q0oaHB0!%3nN0vdd)gxr^Z33__gX$4V z(jqCgQ!o#f)V@go_M<=1z!EA>2>z9%7L?UeU=B`c3q1I39?XMe_&j}lU{}WDvfq1- z(tn3*WjzlmVi^jN;8W=bd&*q3XE_wD-xD*AsZ=l@NcuY8SK$^e>v^%;)}0@42J zo0}QVsGtW*)6BF4Xl_W6n8Qn%R5_&J_R|BRZ%A99$8UMCX*3!(895_S^dH=#|L`SA dQwNkQ0svT5cp*gl5={UA002ovPDHLkV1k(!9oPT> diff --git a/app/src/main/res/drawable-xxhdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_grey_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0ebb0ddc717a8303c05788979bea0b1ba797f8e7 GIT binary patch literal 641 zcmV-{0)G98P)ZSxg(1#XnvrLFpK{GSz59B)-rLtbd)nRA=coFg z@7MVrLm_J!ikrx=wSnp@Rh?iXXfShxJu!1KfkvDHCjctW+6NlRm?l%W08;9)1XMg| z=p-Dzl zqh2 z2lmcRQ?3b|KwcQPx(oq)0+Zt;SOA~xYQ6xu>c^3Ot0b`MooT}+(0%_xK0fIfyY_)c zV1OXGW2=Jn5D?`6aN(AeBX@P_2oD|rpV$adtpKeUbO~%yQc?iyg5LysF&OfoMU(@e zX(jl!0N5SB@e6=YY*-6GQ-cm%0-Kh+E&%q#F9JRI8jLhpmgWm|&15o%py}N6+&c{Vxx((+) zPvQso{+4#L^MM~v4&9LBi@&bJit~AnG5WG+>b43Nlz*at?E_~XGFxTjzMfvR_A$Wy zM9II2#IEeRWM#XFJj!7oFCW;w`#n+F|4TucYT8njYScUdgz&2$w(SLA{{==6jfW#RB b(lrABlVEruR`HKW00000NkvXXu0mjf;xHh1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/card_white_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_white_2dp.9.png deleted file mode 100644 index 11834386bea20e3f2ec31b964cf0031a13cd0f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 636 zcmV-?0)zdDP)z=;S97xPL%o@&t4rUh|%r5N_3`l>BR2H%bW@(Ri@JPdc z^AZC@RgcB`^RE-9RtOxBWK%r?WC`AE+)IqlZj3F48FG7F~;5UM)0x)X^U8JHa zClvTJ1lU-Cztl<^*=#WY9j!pb5KPF&A;6~a3&E6DIC2E$mB1K*k3xXW2-NRTkph%h zO2Kk4DIbOao5N3kU=k7`!C#6rf-0<;Z zez&^jh+yFR1GVOw8(_(SOY1B+#@r)we=7zpe#3(1P87iAwi9={mHlzquiM8@y$xXQ zL~-3jWEVD^J-udMPbgyVPp{p${5ewo`=ylg25koC?}1v11DUQq;l4mZOkI6`Fhkid zm_dpe%vc2Z0V!tMgGUV{O_I>?GlK{_Ahkcnw-4H%HYpP`QPwB-Y)xN!2_gU2Nq+z? WICvoi7tQ|w0000H59D? diff --git a/app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2c05ddeb3e4bd70901aa31691d8c491c15045600 GIT binary patch literal 639 zcmV-_0)YLAP)oxa?i{u7|g8@cID% z^?s~(ghbR5(l8NaYk~4BS)O1mD402kB@J^TfkGw2F@RKA=|F8%Xrzb$%F;0nlx9#s zPoZZSL79*tU(uieu>e?~Tn{e(cGa$%FcxnSvAo(}IWm@o~p!wS+^U z2T#9ab&wtcqEZ2*Ax*wP(k1G_fdjxLHb77*KwE)n1g6WEF~ElSL!hHT-wfJBr2@$K z2R@4dHo+hK2H+CwR|3$|9*8soGvt#PU^DzC(9s@_pcJ(9BMiaEF~H^_s2^bfDIg(g z!D+0rmftBY{|CPotOg+SdGfDWdC76XSG$Y(^Td9D z->)einH>1xV9C5BzWB@PEMJ}ls1Wn7KA2`kWpvOZ z%Gk`v@&~zwlv2%6OAVw{DZ}>DgKus~%fH939N^#4XxL-~jYQFZaF71OmneY583NKZ Z0|045cp+MDOCbON002ovPDHLkV1n!pAf^BS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/card_background.xml b/app/src/main/res/drawable/card_background_no_padding.xml similarity index 88% rename from app/src/main/res/drawable/card_background.xml rename to app/src/main/res/drawable/card_background_no_padding.xml index 5537b2d90..c12e115e8 100644 --- a/app/src/main/res/drawable/card_background.xml +++ b/app/src/main/res/drawable/card_background_no_padding.xml @@ -18,7 +18,7 @@ - - + + diff --git a/app/src/main/res/layout/activity_dir_picker.xml b/app/src/main/res/layout/activity_dir_picker.xml index 1809549d9..7ac7024eb 100644 --- a/app/src/main/res/layout/activity_dir_picker.xml +++ b/app/src/main/res/layout/activity_dir_picker.xml @@ -40,12 +40,11 @@ + android:textColor="?attr/colorPrimary"/> diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml index c85b298cd..99e9d23cc 100644 --- a/app/src/main/res/layout/gallery_detail_header.xml +++ b/app/src/main/res/layout/gallery_detail_header.xml @@ -128,7 +128,7 @@ android:layout_marginLeft="@dimen/keyline_margin" android:layout_marginRight="@dimen/keyline_margin" android:orientation="horizontal" - android:background="@drawable/card_white_2dp"> + android:background="@drawable/card_white_no_padding_2dp"> + android:background="@drawable/card_background_no_padding"> + android:background="@drawable/card_background_no_padding"> + android:background="@drawable/card_white_no_padding_2dp"> 4dp 4dp 4dp - 77dp + 72dp 80dp 320dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d3a851e58..fc3e5c9f4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,14 +39,6 @@ 76dp - - -