From 351ec66798bfcb5fc4d56e70b50640e9f0fa55a9 Mon Sep 17 00:00:00 2001 From: Floens Date: Sat, 9 May 2015 23:34:02 +0200 Subject: [PATCH] Add play button to videos --- .../floens/chan/ui/view/MultiImageView.java | 27 +++++++++++++----- .../ic_play_circle_outline_white_48dp.png | Bin 0 -> 1176 bytes .../ic_play_circle_outline_white_48dp.png | Bin 0 -> 817 bytes .../ic_play_circle_outline_white_48dp.png | Bin 0 -> 1594 bytes .../ic_play_circle_outline_white_48dp.png | Bin 0 -> 2430 bytes .../ic_play_circle_outline_white_48dp.png | Bin 0 -> 3303 bytes 6 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java index 9e7ae5ca..aa26bf96 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java @@ -25,6 +25,7 @@ import android.net.Uri; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; +import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.MediaController; @@ -56,6 +57,8 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener private static final String TAG = "MultiImageView"; + private ImageView playView; + private PostImage postImage; private Callback callback; @@ -87,11 +90,18 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener private void init() { setOnClickListener(this); + + playView = new ImageView(getContext()); + playView.setVisibility(View.GONE); + playView.setImageResource(R.drawable.ic_play_circle_outline_white_48dp); + addView(playView, new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.CENTER)); } public void bindPostImage(PostImage postImage, Callback callback) { this.postImage = postImage; this.callback = callback; + + playView.setVisibility(postImage.type == PostImage.Type.MOVIE ? View.VISIBLE : View.GONE); } public PostImage getPostImage() { @@ -210,7 +220,7 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener image.setImage(ImageSource.uri(file.getAbsolutePath())); image.setOnClickListener(MultiImageView.this); - addView(image, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); + addView(image, 0, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); image.setCallback(new CustomScaleImageView.Callback() { @Override @@ -329,7 +339,7 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener videoView.setZOrderOnTop(true); videoView.setMediaController(new MediaController(getContext())); - addView(videoView, new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, Gravity.CENTER)); + addView(videoView, 0, new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, Gravity.CENTER)); videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { @Override @@ -423,15 +433,18 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener // Remove all other views boolean alreadyAttached = false; for (int i = getChildCount() - 1; i >= 0; i--) { - if (getChildAt(i) != view) { - removeViewAt(i); - } else { - alreadyAttached = true; + View child = getChildAt(i); + if (child != playView) { + if (child != view) { + removeViewAt(i); + } else { + alreadyAttached = true; + } } } if (!alreadyAttached) { - addView(view, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); + addView(view, 0, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); } } diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9d10dc5175ac521a1fbd321d6e551855dcbe901b GIT binary patch literal 1176 zcmV;J1ZVq+P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00a<8L_t(&-tC&rYg0=Uz*Fi=)HJP>#ERR}jk||m_(2uF z0^K}#UAT<@fR-rI(mz3{g|=X!*tDovb)&S1pb)iK%A>gITRmF4dVYjdTnILbKNnJ& znVXqAbMGiFGIx9CMC`J~A+$TW+rQKd$WDr+n<%^+vk z{wskxxX3&;OlyPZ6xsRnfsQlB7i`yOX6gQUKqq)Xlr_&W|3JIBL!5PsT|R-%@`1SP zJ-vQ_QjBYU;tjXyBTpyoBuUavCwcmq;jL!JD9N}$t(5C1t}@Dg z<#-uT`9DR{mM7IEUI+Fsk&6n{8o;S>#S&)oX<>-Z0i;Y6pj5zE|M6#}(|0c`il!%e zU(&0&rYLz}dasbDjX6czh%3-pMZpBkv6AK%CKZi;y8!K0&YcM_nS4??mpbf$W)x#J zdjV=@R?>UJ7U+cH${BCfPMhN1-F84Pq(C=C)*ff1eNwIP%m(PV^bS{y>OXSM8EIJ3 ze>5CuPCAv%#~{FzV|AF}jpUypKpoOwS`1PCef{fby30}tmoo!hlu~Hg3J6EjwMc3A zf*ELDDi#u!K(3|}v%pgmP+BV8_d5Z(nC_6U>l54bKzXVBN;m@9o34q9uBLmr(u1Anw&;zXrVx2L7!cEsDNUrLE zs)AU1OdzxAvVvSi4hg16t`+}da_j52V zJ06UacBx|~B2dXHb=(tn^y`7n2x4y|CD%fPzU9&jryjC!mr; zfhKmG%I1nubhdSe61Lz}=D!zy<$PF?FE&puSph9O7Ww_sy)PSf4HB=ruS5D>uBQ6l zb$TcK!u{}jS-0dFLm?N%f)h-F1S69E!!}pxdFkG?*XvdKpmgsm+uiMtN$;>io401e z4qgeGzjDO39dk=Un)TF<*}_AmrnK%4?UDi$u6w{~VoGT(=UiHPy~-(kJ$6fPTG9BI zYtwT~Q7{|Bmv$(|f?@YAY?8-{k`?wv!Z|3pGQcDLh|)OEuoReo4LdgYS{Vt<*Zwi3 zq_EM#Qk{{@<*<3hj~5z{PUTIUY@Fdsh9`B3uyw9+h$cfs9cEmK)JV3y;fY)31ZQWK?7wFMOoE_YZ0rQn9^H3_<5V)IX zk#Nev=C8jo`B5GO=3n|%<9@va>ia{292a=Xh7sixWzL%e-1nyz+c?btB^Fqv!Uh{u qSY?4p`Z>wg#>XfPpa#(I3iJ&=WE4W@TUez40000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00OB=L_t(o!|j;OP7_fS$1AiY1vjS6G^p?ZCIn(qQXa%a z76e0R`U0AkJ^(0N3~7P}R}gH%#*p|HhGyIdl|XO)+O?m+pwYA~ne7S<8+EO-U zFJN13&4&Vlq$(Cr!1;0KKCK{Fnv3VQ zw2GXr*&PSga^J6n5~cifMxhLvaqo z=VkcGF3ygawZ+7_IanJY*%pPKq|F00000NkvXXu0mjfT}Nhj literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3e2e2b810dec696b6d2944f8394b3e0c23d56ea4 GIT binary patch literal 1594 zcmV-A2F3Y_P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00pv1L_t(|+U=XmPt;cw$A4uK!^|+)q{t&7joQJAY&7gl zY`SUDOjR_KYG`okKj4E5k5Sabtwwi59c0=@qn+T^1->?h)TYZJp)DW=Uj#)EX%NA$ z3qq;)+~54}bD+uG-}*d0^Ev0Og3F4Jq71KgKYF zdCX%5W9Y|SbfFCql&wsFB1F-NA&9I2B(WF4l>$(J2)gkPWY;v(*nxuO1t>-wkD#-L z(S*?Q00hyFS1_?&B7s1z0UGfHCf5iWatE*;cVJ`nU~Mh{4q^(n)+8G30{HQZKrp0{ zKs`320)F`5gC7;xf;~8fG#-1(ccRc1Kso-%V)#Ao<1oUWTB>jqy;%`{L#Yjb4OuqK zS2!c!`o|b&G3lyr2w#{6sKIj=W8+9D?&QU2$ApX4r>Hgwu))Rsd34}2t)s967xCT& zA#4hu!X19#w!w z&I@g_>b?U9tsJWjDgZ%F!h9tsh5E0Y{3;+1aGbO62Xg{Y%&DzgWC4mXPNHAz*!oGm zy88F|ihKz#P$UNsC%-|5pmCrNo3s&<#QqT(03S&n#)Wg9g^t6IngDA^uKJMQ!QhKW z2!BG@^y1PDrBlR*I&pw*lJAG40dzxYHF*cuL;;FOo9c{&;g6eFI-zuq@!}2do$>^u zq*x3q0_cU(MxtxC7(gc@c3;XYUFxCqfYEe841hgG4r>CahZ4J)|0x1cPRxh30aQb2 z6VbB98z4gR5XT6BS|~kZbZqwqXk$du#sE}8iQUkfy#Z3nN0>K&d?=k@q?6tN_ZX3S z!vJ!j#BS-gy#e|ekdWJ0Nyz}{iW8Ie840Wul~ z*)4B?E=J^-VStoWDshsLzO>xQTuf5i4Msy;KAnDS3?QSBPCxhROi+1*QtnA`oFyOIP^GN?BoDRDC}Ol-&HZz%&9A!@GY1fZMPedJyjW>eI_IaOP% zyMLTx^?TJ(gC5Rg+&-)B|G*hFxT!uXv6eH}Hj7=>+^@$wVs8SU>x|p*<|Ssa-_o!D zPHs*@Y~blKcf_*QLhSPfo;*(pWCvfXT@ZjtoWg3wg!wc{*_K)f8%>WM zhw(7W)cHAlDOqiucXb{Z5c~CIhri2QKIf$=&$vJyT7za%>$0D2iMUsCFTIeH=CbP< zx^V(g)S?mr_~1hjm8eA&Cvn4d0{g$W@vCHfl8@X2Szf*Fnvnk^ips~gj*}yqSU0mL z4dwtAGSv~I&JSnHIBftp2%r@&j5t4rxb!`c0f2?ks3Tc6SCKV@LwduU`iVdR>TnHj zq+OrFReZzmG~^awF`#zi0{#+my&oOesU9?T0G1NJ?Px|4x6y}DOk)mnn8qmja0{0Z sN1bNwWE~*qPaYr-kO#;Esv5BJ=fIV_^7NB{r;07*qoM6N<$f}fYl*#H0l literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2bcdf4f84b243d8ff1510b1be71c625b16516564 GIT binary patch literal 2430 zcmV-^34!*BP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00{O;L_t(|+U=eFZ&uYEz;B7s?(#~Yw(TKR|(T(uDn^E8vj2cTNE^Dlg~Av#z*mH`!L zpaRSvL%qV*qA&J!Hus%Ebjcq~motNB(-&C9fLx6=j1J-oqXt-i0& zkQSgut^N5hue%rvZaDU}Gpwb-nlu2d*242H_j%oI&*Ob9L=B+xi(+q8zS zH4N?1kbo9w49#ydC79oDDqR}G_54tPX2njm7ikXe>u%vv?4&;<1fa^;W#QlLS09Go z_3;?ZK1;s3POe7WrlNlouI&jg;)uV}wg*I)Snbf2%Vd_!rC_ z8t_-<20+xP(0+v*Ks^d~SY!bRhWKRwL?4R!A8`SwR^g|+&k_(2z|?-C@O>__2ee%j z{<@Xg*P4G*>k!{zn=PPfF+1#%r7QlwbH)6cS`Al3KjSTSfLcZNZI()3-~5`|Ht{{y z+X4DW3_B042DA@TdsXOdkP0(E4~j2P=NXV6Q(G$b zwb%^MW-x6Z@Ey9MCc`Gqo%*Aa|x##<`@^jx4O%+=t>EkULX5Do9_O9MDUG zsI4gha${<3g6u8H0qqn-ZA=Z23sZYukh~)~pu>Ww`V;}#o7$?RdwN+^pCD>s%7E-l zO>!U~OAbg{1zlc$;5yp zUt%#cfJ{uSDEbx0DWInG0A=6A`qMQrX^_4(BY;Y257OD5=9|)==KD;e+1>&5XJeuG zK}NS4B`;fz_mTs8Gr9jZz-G0{vey^fZB}2*oV%mnfxF{1ckT|!VfJxKfJ#mrWX{nPjjKV&0;P9=0 zfx{+ea3Uf)-3AUfi_7w25J3HoL(k<5xD7qm+15E&0V+99UU(Rdb$+c7Rmu+Z_Sw_g>7h-TWQmg)df=L(OvlsN}sIYQCZz zYJoiQek%kjhgl z7Gf&B&}M*SZ`^3$c3S4}OjllQvP)Nveup!a=SBAh8FKZXiONA?kRP}Q6!DzW$+cfq zbrtxTAQoVbwrBKZC5tM3qU`o}&XTL_o}zL%fbJxby<}b2h_w#iA*#s0*Q3TWkZhBk zwEM;wSNr~y$D)Zb#sxo1CNa4R?J)}UrZ}TbR}Rf!a2!H%C2r=k7$v@RmW`iu-4l0b z*{8|xCo@rG2B%^axx}-<@jRzo76P2$j^uJpJuLCpsO?jqXyABDdN5X>bNtvuwy8>w z#r|J#Ch57U#tx163neb|h?#VoY(Jgz*ZD6q29qtyMk3>l=MbJ z^CNcsxflgbq2EsPDoYLbY~?&eo5l?Y|2eT+kAN;d_ZhKE$LrfS?52fznw!P~_tQ$J znEoU$3-7RhJ2xZ3&9NI0$pDVh#`CPAmN`tJiXug-n8F-tS;Y&yMvvjWWo>S5^>sIF zHpcAqL$-mWThb7KB5Gp%MWI@^W!8WGs|W zwEK_ghH+@!!g>yA?fv!IFz>RC?}gAkq*HVn&Ae@Rt?acWU?=NB-r^D7wO+wuHnAu6 zF0kthmiDlTMd7cfX2j= wBgg^efO0@Npd3&RCmvZvtysWu}M5nE(I)07*qoM6N<$f~hl&jQ{`u literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7ae6a020ce584f9a7a5b6d8b6a553c3fd21f39 GIT binary patch literal 3303 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 S>C%(`1L)&Su*F)0kpBZNJ?+Z? literal 0 HcmV?d00001