From 34eb6a423a51785c54f3c480705c8b86d2316d31 Mon Sep 17 00:00:00 2001 From: seven332 Date: Thu, 18 Oct 2018 13:28:07 +0800 Subject: [PATCH] Use CardView instead of card 9 png drawable --- app/build.gradle | 1 + .../ehviewer/ui/scene/FavoritesScene.java | 2 +- .../ehviewer/ui/scene/GalleryListScene.java | 2 +- .../com/hippo/ehviewer/widget/SearchBar.java | 2 - .../card_grey_no_padding_2dp.9.png | Bin 376 -> 0 bytes .../card_white_no_padding_2dp.9.png | Bin 379 -> 0 bytes .../card_grey_no_padding_2dp.9.png | Bin 249 -> 0 bytes .../card_white_no_padding_2dp.9.png | Bin 246 -> 0 bytes .../card_grey_no_padding_2dp.9.png | Bin 342 -> 0 bytes .../card_white_no_padding_2dp.9.png | Bin 338 -> 0 bytes .../card_grey_no_padding_2dp.9.png | Bin 641 -> 0 bytes .../card_white_no_padding_2dp.9.png | Bin 639 -> 0 bytes .../drawable/card_background_no_padding.xml | 24 -- .../main/res/layout/gallery_detail_header.xml | 53 +++-- app/src/main/res/layout/item_download.xml | 205 +++++++++--------- app/src/main/res/layout/item_gallery_grid.xml | 7 +- app/src/main/res/layout/item_gallery_list.xml | 149 +++++++------ app/src/main/res/layout/scene_favorites.xml | 14 +- .../main/res/layout/scene_gallery_list.xml | 14 +- app/src/main/res/layout/search_category.xml | 6 +- app/src/main/res/layout/widget_search_bar.xml | 2 +- app/src/main/res/values/styles.xml | 13 +- 22 files changed, 255 insertions(+), 239 deletions(-) delete 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_no_padding_2dp.9.png delete 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_no_padding_2dp.9.png delete 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_no_padding_2dp.9.png delete 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_no_padding_2dp.9.png delete mode 100644 app/src/main/res/drawable/card_background_no_padding.xml diff --git a/app/build.gradle b/app/build.gradle index 28e2c7e5b..78226ea7e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,6 +62,7 @@ clean { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "com.android.support:appcompat-v7:$supportLibrary" + implementation "com.android.support:cardview-v7:$supportLibrary" implementation "com.android.support:design:$supportLibrary" implementation 'com.github.amlcurran.showcaseview:library:5.4.3' implementation 'com.github.seven332:android-recaptcha:2bbb3459a8' diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index adfeb0357..87babf0f1 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -279,7 +279,7 @@ public class FavoritesScene extends BaseScene implements mSearchBar.setHelper(this); mSearchBar.setAllowEmptySearch(false); updateSearchBar(); - mSearchBarMover = new SearchBarMover(this, mSearchBar, mRecyclerView); + mSearchBarMover = new SearchBarMover(this, ViewUtils.$$(view, R.id.search_bar_card), mRecyclerView); mFabLayout.setExpanded(false, false); mFabLayout.setAutoCancel(false); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 59fe97e5e..63d4d48e5 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -452,7 +452,7 @@ public final class GalleryListScene extends BaseScene mSearchFab.setOnClickListener(this); - mSearchBarMover = new SearchBarMover(this, mSearchBar, mRecyclerView, mSearchLayout); + mSearchBarMover = new SearchBarMover(this, ViewUtils.$$(view, R.id.search_bar_card), mRecyclerView, mSearchLayout); // Update list url builder onUpdateUrlBuilder(); 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 d9d91f2ef..017841c85 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java @@ -111,8 +111,6 @@ public class SearchBar extends FrameLayout implements View.OnClickListener, } private void init(Context context) { - setBackgroundResource(R.drawable.card_white_no_padding_2dp); - mSearchDatabase = SearchDatabase.getInstance(getContext()); LayoutInflater inflater = LayoutInflater.from(context); 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 deleted file mode 100644 index 42e65c7bdc15af1ec6fff9ff92dc52a67a7994fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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@*O00000fhdEP)!}>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 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 deleted file mode 100644 index 7353a334bf490c282cbfb05e91649238f3dfbd67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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;+(g<&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 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 deleted file mode 100644 index 51888f0db5e28bf5a012ef3bc3816c86d3550e49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 07838d0c283e941bfbe7058c7b1e22c51d49b8cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 0ebb0ddc717a8303c05788979bea0b1ba797f8e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 2c05ddeb3e4bd70901aa31691d8c491c15045600..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/app/src/main/res/drawable/card_background_no_padding.xml b/app/src/main/res/drawable/card_background_no_padding.xml deleted file mode 100644 index c12e115e8..000000000 --- a/app/src/main/res/drawable/card_background_no_padding.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml index 99e9d23cc..20dfa5b64 100644 --- a/app/src/main/res/layout/gallery_detail_header.xml +++ b/app/src/main/res/layout/gallery_detail_header.xml @@ -40,7 +40,7 @@ + android:layout_height="26dp"/> @@ -121,38 +121,43 @@ - + style="@style/CardView.Normal"> - + android:orientation="horizontal"> - + - + - + + + + diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index efb719637..4d69bc288 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -15,120 +15,125 @@ ~ limitations under the License. --> - + style="@style/CardView.Normal"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + diff --git a/app/src/main/res/layout/item_gallery_grid.xml b/app/src/main/res/layout/item_gallery_grid.xml index b2ef9e823..18b8e08a9 100644 --- a/app/src/main/res/layout/item_gallery_grid.xml +++ b/app/src/main/res/layout/item_gallery_grid.xml @@ -15,11 +15,12 @@ ~ limitations under the License. --> - + style="@style/CardView.Normal"> - + diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml index dff879511..d86412db5 100644 --- a/app/src/main/res/layout/item_gallery_list.xml +++ b/app/src/main/res/layout/item_gallery_list.xml @@ -14,88 +14,93 @@ ~ limitations under the License. --> - + style="@style/CardView.Normal"> - + - + - + - + - + - + - + - + - + + + + diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml index f157c49dc..3915a8e4d 100644 --- a/app/src/main/res/layout/scene_favorites.xml +++ b/app/src/main/res/layout/scene_favorites.xml @@ -27,13 +27,21 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - + android:layout_marginTop="@dimen/gallery_search_bar_margin_v" + style="@style/CardView.Normal"> + + + + - + android:layout_marginTop="@dimen/gallery_search_bar_margin_v" + style="@style/CardView.Normal"> + + + + - + style="@style/CardView.Normal"> - + diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml index faa1a51b1..3c5173a63 100644 --- a/app/src/main/res/layout/widget_search_bar.xml +++ b/app/src/main/res/layout/widget_search_bar.xml @@ -41,7 +41,7 @@ android:layout_marginLeft="48dp" android:layout_marginRight="48dp" android:textSize="@dimen/text_little_large" - android:textColor="@color/secondary_text_light" + android:textColor="?android:attr/textColorSecondary" android:singleLine="true" android:maxLines="1"/> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fc3e5c9f4..002724b33 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,7 +41,7 @@ + +