From cf93f7478e6ba3cb4f1b2bd6926a25efe5eefb31 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 27 Jun 2022 15:55:10 +0800 Subject: [PATCH] Add progress layout and img error check --- app/build.gradle | 1 + .../fongmi/bear/ui/activity/HomeActivity.java | 6 +++++- .../main/java/com/fongmi/bear/utils/Utils.java | 3 ++- .../main/res/drawable-hdpi/ic_img_error.png | Bin 0 -> 912 bytes .../main/res/drawable-hdpi/ic_img_loading.png | Bin 0 -> 657 bytes .../main/res/drawable-mdpi/ic_img_error.png | Bin 0 -> 761 bytes .../main/res/drawable-mdpi/ic_img_loading.png | Bin 0 -> 636 bytes .../main/res/drawable-xhdpi/ic_img_error.png | Bin 0 -> 1544 bytes .../main/res/drawable-xhdpi/ic_img_loading.png | Bin 0 -> 1152 bytes .../main/res/drawable-xxhdpi/ic_img_error.png | Bin 0 -> 2074 bytes .../res/drawable-xxhdpi/ic_img_loading.png | Bin 0 -> 1574 bytes .../main/res/drawable-xxxhdpi/ic_img_error.png | Bin 0 -> 2725 bytes .../res/drawable-xxxhdpi/ic_img_loading.png | Bin 0 -> 2188 bytes app/src/main/res/layout/activity_home.xml | 17 ++++++++++++----- settings.gradle | 2 ++ 15 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_img_error.png create mode 100644 app/src/main/res/drawable-hdpi/ic_img_loading.png create mode 100644 app/src/main/res/drawable-mdpi/ic_img_error.png create mode 100644 app/src/main/res/drawable-mdpi/ic_img_loading.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_img_error.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_img_loading.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_img_error.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_img_loading.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_img_error.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_img_loading.png diff --git a/app/build.gradle b/app/build.gradle index 6229faf8f..2e624d8ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.room:room-runtime:2.4.2' + implementation 'com.github.androidprogresslayout:library:2.0.2@aar' implementation 'com.github.bumptech.glide:glide:4.13.2' implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.exoplayer:exoplayer:2.18.0' diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java index 8aa753ae2..dd1de8fb2 100644 --- a/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java @@ -61,10 +61,14 @@ public class HomeActivity extends BaseActivity { private void setViewModel() { mSiteViewModel = new ViewModelProvider(this).get(SiteViewModel.class); - mSiteViewModel.mResult.observe(this, result -> mVodAdapter.addAll(result.getList())); + mSiteViewModel.mResult.observe(this, result -> { + mVodAdapter.addAll(result.getList()); + mBinding.updateLayout.showContent(); + }); } private void homeContent() { + mBinding.updateLayout.showProgress(); mSiteViewModel.homeContent(ApiConfig.get().getHome().getKey()); } diff --git a/app/src/main/java/com/fongmi/bear/utils/Utils.java b/app/src/main/java/com/fongmi/bear/utils/Utils.java index 1e047082a..03ef3a51f 100644 --- a/app/src/main/java/com/fongmi/bear/utils/Utils.java +++ b/app/src/main/java/com/fongmi/bear/utils/Utils.java @@ -13,6 +13,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.fongmi.bear.App; +import com.fongmi.bear.R; import com.google.android.exoplayer2.util.Util; public class Utils { @@ -62,7 +63,7 @@ public class Utils { } public static void loadImage(String url, ImageView view) { - Glide.with(App.get()).load(url).transform(new CenterCrop(), new RoundedCorners(ResUtil.dp2px(8))).into(view); + Glide.with(App.get()).load(url).placeholder(R.drawable.ic_img_loading).error(R.drawable.ic_img_error).transform(new CenterCrop(), new RoundedCorners(ResUtil.dp2px(8))).into(view); } public static boolean hasPIP() { diff --git a/app/src/main/res/drawable-hdpi/ic_img_error.png b/app/src/main/res/drawable-hdpi/ic_img_error.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd7f8b61efbf82077ce7dbbea7f4f6e43171abc GIT binary patch literal 912 zcmV;B18@9^P)`(}4$cV^wd{I@R2dtbKyzIktE8MCsova+(W zva+&@qi_Uwu?kf!fV(2~VG}y^6_0S#3;8ns1`2$Oh;2kBI9%7xGOqb?JAn@BPXB8Bs;(H727)Tljy29g zTWFoo$fAHRSi?s=L>4@T&#B`Rd+@@4S&5X&4;o1TWLlHbj<;g-J#*c7=a>$W^T5qJ6r zk`i%qWb-s0g*_@{?=|h4G=r+3ZyPZW{aKJY=b18vZ^CA?h9T3?_XVjvEP^h)^X!q= zF=!V0v@rFwux6BeTl*!XOhR+K6eKQV8=3B=)I?JDE`MPcmtHIrNq^!X`RVN*Zgvb( zUga+&G-KF{IY+{I>=&jRlAiy@4MH=91ag?c3V zzsRALEFvg>{{dRbB4qiC0Gimgk+%q0{)}%SAj9rCuklrOQ98gOfN6bv_unDq!AsHVJQ$8aCX}ycwG5KDMZ^H2>~^?qTyR z87Nve{~g8tbPv1Z>P0H-l9^3aouVvK2oxzId+4=DMD{Rbktohw`iZUg_YCodF6utf zjRN`saqV2Z?Xk$-xT;4VI~;H5qW*1v_+#-Pa174`XR~@9LiGtt-t6pm#q@4MIv=~w^CVl1(>GGkK{*hfz7+vN!Bs6Cq<_T4Upein6$0=IT@z4~s z>9GUs(4$Q;@!#p+7>}5xf3EU3xjj*p3(XAs!jBiPuI(d|;{x^sWWHXPx$`IA*m8 z^pOR9Y?<^iKMkXvCA!kw;lMcR#QH=M1^qt!oaQE99gkA?>qWOLlefhYm-y&>9@%BO zPIS)au$~q=L&_I>{nc|t+?TJ2hR%>;t-mqRS;oxBYWEFfb7utB-`MCZBd0}|ZD5-& zE%M;b2&}&dXs>3y<>-u{`fCL3)foZx*9>~C^6MC}{u)5DFxFcnq5f(|2X=;6{nd=- zZg6LK)L*UWN}b_Re-+U@;w@Wj@s4}ZJHuIjmC!8lYjEGp^XQ%7sJ{wmmPfwuMfA?F z)?YAMAPejWonfiJK(v8;jvc8pjP)0UwvYjq&pP8UHhgLnjhi+`dRNx_zN&MJrm-idM9u75)F9%cP~HjP56m?#t+vq|qxPI$zH^$&x$y ry7`UV#rxZ)Mx)VaG#ZUYGr9Z*jLZL^jW6TD00000NkvXXu0mjfgcVFb literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_img_error.png b/app/src/main/res/drawable-mdpi/ic_img_error.png new file mode 100644 index 0000000000000000000000000000000000000000..6fd325f0e077f7d8b3f68f0bfdfc0ec893a20839 GIT binary patch literal 761 zcmVWt*)H>0CV_R^h z@*%2q><0k6#w}a38Qpp#$asXFMGt^Z85{usEQv9CFd|oSQO2UBu*pFZ*!>O(CJl zJEfK!Tuid01;}%5lg15KLq}Ik*vc<9LH4hbT5@oifSHs|oW&ZNX_l+~U-h-yHoD0b zb~;8ilXxnfI8!LF*`zK@wcEknEqH9PYpt!=u-Y}vv6*o$)%Ck~H(6xP+SP9@kM(nW zVbbfx-PHajQ?PeEkY<^1Vc}2ZGHjK0#YDYw8I*BdOne5%(5`E}0fPcBh*#1@P6P$c zHFkqk2WRzHbsPu^+@Pb?!3{dP24-N6UX{V~fjL^f?y}w04Pa1{4v00000NkvXXu0mjfrdwbQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_img_loading.png b/app/src/main/res/drawable-mdpi/ic_img_loading.png new file mode 100644 index 0000000000000000000000000000000000000000..e5cbfa38da8056318840879d81a83b6b009c591b GIT binary patch literal 636 zcmV-?0)zdDP)lobR91!0*el(0)6;V~~k5gj@hc&cNkgor@;4-}$<2ofPtY=pTe zNQWTmP>|prB7%^JzyiG#+S6fYr=8uI*_oYoNcf)9&b!~sZ@&4S=iOn!%F4=W+e*D! z(7KwbbuFm3%rg%55X-cuu)iOiG^+qDPGK|^EVMIP`q1hWx&e5@L=&Oc8E{E1cn1KV z%ybi7G|YfYavyc-YOQ;pyEw%@KAPo!3$C+cUE>Qc$@5@dH5w_#YWe2+ISC7xSaYo!wK38Y*M}5Sn zcC=<6SGeiv$!m8~@b~&P<+xw9BFD5$GVpv&WsTP!Y!{EI-QOj~lY*D3D!0tf3T%cv z2YoxobTt9kh>I2IP41Y#;hb5 znP!eTpG!Gd z%Ls>g#Y6MkJC~WEFV>xo>4TYyIKY+FS7+=mX^&^!-3Hz+f0d$D_eVlm3hZ|-&Qkb` zj^O2>XdSP6#>!Hla+ldMI--|@qSYA+uEDzK7+wyDmbcq$t{xw32|Z6+3@`gfOTpk1 zA#KTJ5>Kua-ZCxNf-N{ccq=vHmKR)14P5*`{(Ld346?{ZQ=uCyGFZY|Sy@?aNBsfF WqHI~EXm|Vo00009ecpQz_>HOC&cytDER*$7$!q57;>g4 zCj#9)sU*lRIOFKIeN!r*#!dLXEi1=r8T;1o#r#*~{5B=K_{yf8WDzXKRtJ zU*vIkrTWj3OXs8f6Q-!n^4nrIa|QB}7!RMlz|D8LsMIY!X0OCul`X+__cttZwEi2t zXRYMQ{RR_@zbVdQU|`Piba4#HxcBx}WVEoM2-|~Q-CYmzTwRauQqX7$Tbh?4%DVAg zmuuH;5!R_%M@1dABMMeN5w|v4>OaZTsCb6+4uhSG=RSG*^M$A1OwPM=mkSzgXynaF zV3xjdfbF0DL;n5qh1VOpp5JTgsF3{V_KoX3(&zqtG2S`9Ene`0#+Q#9z8*fmXSt+Q z9dG-|glWxx|9*3vq}Lb6x6ijkCAa@LzvPbDFFbF_#q#{QTlvw&(emEqyrLZp(%)qt zD>Ii{>GPdQeY&Zwk=LgG!|5+`#m(=3ebMIr{%*lNDbMWI^~b%f&za6G=)3hwNb2Eg z&8+#`Lb}VgY>!=+y|;ly{rqV^m%J@8nsFsBdAR=c*oA!hB)T?u>FTJ!2j(V!Joi2F ze6>l2>CT)*4{zw-Y&!n(bkO935AEMD*7}{;JE^>j9Ur>o zxhCFl&X3)DcHysv0y96G!`t?8>{`XVmC^p{@6Plazgzy^sc@*!|HxJCaLMyo)4`dx zf40x(%Uj&zosbyF`0bUuVAFj`0qapLqJ+qNY-X+uP@r*@f>7ZL+^Db~IcxJg{;0-hJyzesrdo2erJ_(z>D- zENT`Xvg7Sqt(ZVD-v2zVZ1wi^`T|mS_V1qFU+oK z_Z1BdsMz&1f$v1`ssEKv78HEl$*WYJvG;dFjQ1arsrD6TBYz)19Lyf8>%Me>^vduy z+u)G82VGZ>dh%DL=&~!kNecYgpsnRSIqR1ygj;!dO7`hW&(n+?w>7o=XB2XFK2fzb zQF!xm(WfTM>67O2e_3pI=(+|?NY zH+WZzd^jaKDRN>_B0n$Z>?xWLW|V}v+;Mh3q{by-#EKgc1#gTEa&%_& zFdlYmKB=OUV^d-IMo&U+PWxR}=jMgw2QMTfT&gfI$TX3t*)Pc5rq;{mJo#AD!}79; z2?duT3@kELD#X5DC`_ohBqMWenn~ob1HHEA5Rc_Wy*y&q}hM{9!xgS8uv>nESce%NI=n-IYye53rd*GepGWAKby!eP?HeHbekR O1qM%7KbLh*2~7Y7{k`@8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_img_loading.png b/app/src/main/res/drawable-xhdpi/ic_img_loading.png new file mode 100644 index 0000000000000000000000000000000000000000..7e3d947d1ff8f49b508db0a6e8a4a94e2074a178 GIT binary patch literal 1152 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9ecpQz-Sua6XN=Rm;#_TY3H-*0}K;^ z7NnH~`2`1*@hLvzWqG46e@)P9vi_HkJLfH8-J5<@;MIrEdW(JkS$-EQuY9g_PqNDV z&+LO;eV;_@A8hpF&a@F0uMoLeeSgPKld0?(X44sDLWC^-+RgXhf0UW?bbQj`V~k9O z`y3W-59@icIW*CDhbIFA(-cn^$B>MBZ*ToJmv$6k|1hO$tBc28DHV~m?xG9jI5RJ9 z@rZ~$qWyK=|Ns6gluw*Xe!kIoW@%q_z3}AUCq3Vlr+=T*`G<3*5(6`j!2vL_UTEL$ zJ&vYpXP;gjEOl<$#MWEqCw(}mxGAWeoyDeI=c)|fZr^PW)Wn;wPuv=HJmLAr?e|wF zz76MLZ{Du0pLgA8=MF}L1B!>D_pke2m#&s`__@7Y@qBBm&7A8+S5KewX_IXQ^X?mK z-`!{u?>wDz^ZV_%8S<_#yPFg%%G&lEklz?xw}0&)>z{AWaM<|1)!7*wcKq!6^W4jN z4$OaPt9$-c#luL0JO;VsoMp;AZS(hVPYVC_L67;~g5Q>|IY$G$q~%f$Fo*2^$FgzB z`Z)1(#t*VL-7c6F^?6;maNN8l5A%u^{5P_Tz0Q7irQNb9we1~gh0p%RELV$JWL5To zElNbI^2S@mU!v!CGV5|oJ+#&8R^Rt%VIC9v5Ut(8*-gSp#~g~Cmu``FUwywUCopM2 z<-(xd%!S^^`R!Bks=~4sSS}3OceC35;;;3sRi?@{9Ro2~iSAVas%aP`@xlpnq^dsAU9$@xu^ErqDNH&; zDa1*l*f6qm!N-8kghO9XoMP^6_hJZsw>O5v>O#bd9|nhOCq4F9-WC)y<7L literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_img_error.png b/app/src/main/res/drawable-xxhdpi/ic_img_error.png new file mode 100644 index 0000000000000000000000000000000000000000..cb954a44d1d2a2e88099b3ffa6421232328d093a GIT binary patch literal 2074 zcmeHHZ8Q@K7~W#c5K<HabYg1G#OvGYrV>C4G?vMMkU!8M*-S<52^Zt6D=RMDl_o~Msf-Q2+C;58<|HbysT&pPcp+ywWLq|r+&uM>tHCdQ^ z#oyJggxXL%b%0%zfxCTvcF3cOKDhQNg`oHp>{b)Cru5z^uIHQRejE8_&i?8FGo;ku z!m#<4nGP*o0a5>*PNlQbyDoo)tVQ))*oo~-PN9YX;6Brbm~ zJ2UQE$A`3OlAdccZJ*Ckp?g>D4F&V^ejdIUrk8cr{p+G*?n3^JdQf`-=12P7T?)82_Bhl9G#0Cagv}i9}bc|$jQfk4U?qB zg~^H8^+V`+esl0THVNI#&rYb1__#cN(X%wCK_g-9Cw-ymVw;vq^^Nk(U$d}9Z|Ftb z+T?Wy9Z7V@cVDR2jeAdU3+?qD=F7cB+VRaY=2IhaUx@W(3A#zIZw~;sloRthqemDK zo)0LZ?*Iw|-#&*c*wr6kt17s6Hoz5wg%evwkecz4QyuX@Roi4ivDx8&4_*$L7jRVd zLMP!5MM5+!*BRQNq>Y7%o^AGiq@l2v`ov%paRtii5#D%)tccp&AJM_V(^tnesX9Yc zX|+&@aJCH>Ahw$Dt&lIq8Rx0E52Wo_=z!&fFRPM78>`d^PsN5ms0oyPzEn2Fb_#dH zHn@yCHFnNmXOi;x9nMmX+Fa0BJG~pjre=T@`v7%AM|fFaU;<%DfjMQ)H?%L9b&!iLLApaQ{DX~=5(OLNe|~kj$Q_Is zm@ruZ=Uq@$W?q^Cr5;-T4JZj>t(fZ8ul4k2r7m8R{vP1j4a z{azH3FCu298!EWWz3^5W$2a~G5bWp<;Hyj~*N=5gtIA<3XJ;UBN-is z=~ycUUw>y+%{@mH+7vWrugovp5O*Zc4Rcfu9Uc%xB{FaIe#=*(O&odAD~J7Mj?RR( zo3VCsFH%wi9A8cmr@sF>TGmqeIileKJWuLT6i2o;aPnL6IuUP(Pd>XwkI{;c0$UjH zHl>=P9>F68HyB{tw2lRsXPs(^+Sn=)6a{b9v4H49sw^mE@$|wb3~7@tPcawoE1m!- zd_;l+F|D|$zDYQQ7nHIQl?}Tu2&K}AxTv1>I=r(fmZ$;V7KR`+My=Yj9?XjkXRSpQ zz|=l5t=Oo3BtnZvPEk9 zp@bGY!#axmY-3EQ4M$Kydl7?zZWSw_Y*JXuVh&?QWrF-sp#<`Ha2NSPU sNW^#c%m?ypE+v)WHdp@|ly6FHGFA(bjv8XBUq8Ur<Gbbki zS*0aGe!)|->eEtwn(R}%u(QEv_q*RyY?ikKNIxhQyyj!|=fkhPJbCAPcUcQCzxY^U ze0vY)L$(ZdmXo(Ci^HG4Qf*uI?~}oSc*ZBqAzOm?+pa9XalLG5$II@ndx1fj9Fq(` zH$GAjztj3Stn+OTlhb0mP*&$9lfT@oU@-V!c8Y<4`JbnYV@SoVw|8ELUpA0nE9fbI z#VWd|yJ>@=LtsJE0_M3ZoOg2U=skHs)1$SQbKU>_6*kA$W=}Hn72Z@l@B8apd+aT4 zUsikT8NHTuHE+g(Mm8xdM3nfhpnINv)@)a+HtmXhxOlVb@dH{8QM(oK zdEuYMX0THLGh~ecmP2*~^%q zwlH7#cE@Ykmi_Uka^Bz4ZIX+PStoD)vwE%Qh4*H6$_?+|m+1F9zs$xw{(jEpi!a5u zL?8RU?c$5bU%l@>FZjFPr^mk5bg}qc?~4~#CftABss5ku|CS#f@>RJlrps?sytx1S zb@Q)}hn;U-Xnr&E0{i`IvFkW9lEQ^=$t5gSe{455ncH`D*Zi*wepgQRoBuy%&-$M& z*JGnD+$r7n`_Hlcd(yw$yWF_%wDbNa-)eoVpXSCeS2ec#eY*AU&9ZsH7aIHuroXm~ zU0!G4_bRY|pRkZ@^15wz_pOwvZEm*{;OJ|!FMZ}w-yu2ifdIFi<`=Q`zs**s&fC92 zLgB}f3)?HsK0ngrtn%ZD-sAH()=q!ibWl;CrpVmq@tbqqi@@v`7gwK&zHIvN0f$`8 zq{$6_*Hje5l`NRp=f5dg?eV@!HKc%r*Y0I!?$m3ai)K}Qh${~;vH$U8xwe2*+M zSu=|!)_9g~)49I;k4>E8QozEs&tuwAHtA)t%-7wrg$@d8{8$v(;Pbuy%o%kd_L*zF zGp`xSF5>6Bd2o5|O7r&|;>JHp7Jk=jt57)2W#^l*@WBUOJKGl#H^iA=99+(7d+mA4 z+Cvi;TF?1#wbKS`g5zFEVRKyY?y`zNinaj+37~T=6P-;{GL(6C8x! z7r3?_bmX)vG+D?S9wH%g?}4zJ@UIG>;6qNkK$FDYbWNVVXAgv3guhixJMVv(G%g1fKn z0e6quK{l1#zH^@(XGc0P^O{`1MpRwY-FeZ^J1;ZDR62I)qUfU8>rQPrnRcu#BQ4){ z`r3;Z)$%`Wk4j$nRyXhdg)SM&v#R5w{hh5!tx46-V6(? aXJ9#Rsx0GnUJ6(gF?hQAxvXf;2-97|4xxt^07_&f{HY*4lgj^RQ>{ZyshQ4TZE721$be0D!Q) zos}#1Wd2?Pyxd(dL+UXA07Rgi+^sqPP~&3$L&^T{uo_ANLb&NBN4g^2FwqT8j&>J< z$RWOkudm0nm)vrXP0`zlw0+hxA>J?c)^hQp*UFq{QsT=ygSblwho;N;%7Ap9ZmACI z+lK6dL*>T%Gjar>Apmh!9_{>O_0RVLMteu+ZL~MW4lm@{i;Nd}P(hk&Iu@rB7>egJ zUrkBIJwnx%`5y?R@bUKQ@8;*|Zi9av`*H8wNmkXFrJu)>mA>C)s(=1N^kb=OJzXYi zUCReMz+Wf()w{LpT@P^Ugz&KR7m3Lci1{e=R1`8^*scoz;CHdNvUHD~Sf1KJhy_aW zhc;`PRNjTu>s42(+LuyZ1d`M=73(`U6@hOQ5oNkMqz_s;BXBTDM8uV%EG~Ei$7wJU z%bAL!#+Br!=FaV%jR`un7T88Ar_q+1bpA*zJ54Q z_@H&*GaDFSw?Us!0#>v^lxeM*N{OGKK&FJoL#q!SyA471nr z=zN&C_W}p}BM{S``en{c??#^sGvr>=F*})R>DaG3D=SgzjXkskXwLlUtelr^Bek@f zgN&=aJFX2|r1LAUYnTv!X#t*Drtqqz}5_F_bEl@o2__;}L4j zjEi!UDsscF;3!JcF_Ca=!;6&72&GQx0bkFHy+HZf0}WPUr6P;MpbF zU!eIZp1#PT2v1VelnH4ihv9Z@I*%Ed<4lj?~=zJkqUBHnAmCjHh?5fnjQ z*3+{9!uM=ZAX6>+Cx??ZKeRPuP)A~GSQboy$Sl{1wgtfHk zX7e`Ju)Gwp!}mTOQRIOfBMXn0-_~8km-QQBv#+iJ2!k3hFZy(Hz9~5SxgnO03V!%N zITYtJ78iX*1Ycia6c0CVD_n}7HNWLC@gx?X0@-{OUI*OT)Qvtu`0YkrH~s{OXgP8s zc%Vv3b@USBBG16)TGyl+gow(@b_=Z`Q$&Tjm$+fj$b=5Kwk?i~b5X<7a4~)-snyR38AA`J!{FFY)N=B;&x(LrFq_3`j z@bY!rch42vdBFOnm-xoEAnCc61}r<13#1Y%wk2h6rVLiQeot*~Hv;OgMQ{aXSYlYB zb%_c!N<`Ly=#tPWpnp76lF)rHXgo1hT1xWNXfK&b=;q^t>YM095@`tpL?#q08bUg-Odvn$YISLuoerDM&p7o!HXagbvY6VQ?|_q94oZC~qh1_tUgjWTj)$5=Kc@ zv%u6pvF>yokxY=RO)2-6c6utIs%hN^xK;NpNAG4EJ}n3XA|HgP6fi*K3^^ygH*mm; zU2`sWOa*YmcG5Aj2?neV)28jfYnpmVR-9oazVX2@b(-U@*@=&j@*|Jac#FYH%ZuTv zG!I{e8qC=hhtlAeTkd3E2Kl;#$P|h4vng+mRa~bVys+^t2^qPX2;@Mk=9nA;6^*Fk wTZuDGRA|Ym?q5~;bmVV#t^am7+09*reIGT)KB)FIcTfP>TO+Ni;C_k!22WBxKmY&$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png b/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png new file mode 100644 index 0000000000000000000000000000000000000000..04af817a7aba4c89bab19e11e2fa971fd9d9ed96 GIT binary patch literal 2188 zcmd^ASx^&(7R^F{B8wLF6+(1?VvKB()({A*fDs{K2_*s{iAupr)Bu`<1~d^7l_y%m zQd71{2$g+WloWy_0t&KdrDX|Q5JFudiEJTaLUG2KzK{3u-tT*N=ALus&fJ-MKJK|! z!tq!$6KfLy0ALn;Ffek1)gRIryn&zOT9pF;z^?GnsG#-#r`XW`KPfj;P|e-YR(K{7 zPk8g9qxgh$EH@pOPdXz zN4#BfRWG_cF-a!1DB+*K^mBh-85q7zrv0*De?<^lXAF7#bQ5iL4V6FF4er`32tY9Q zl>h(`d2pbA6ifDILPyyeWMibRaSA!~`|h9NW{!t;)INRIxW8*5LpJMq(Nl#-I`1AZ z=m@xRG^OBTNW`4Vj6Ism9x2hz4=DS`)mpu2ubA>E)2CNC{~aAQ@;SipGb#u89|8`* zuBj|o0ws^c9Bk;@=8YVImL+WO>uUG5X3;LiAiwY>NCqqV_*S}LQx_Mv+{6=PgHlmv zEkDE_M9+&s5w-I4#EHH%smGdxm@e0Zf4plx3rU)Cy@6**9_7YoHy^fYJah|}(4(klEe zNBui-UU{u}s6>lP6KO|@TD_sBB^vziqy+u|)_;3jy8 zYq6j)Nh+$SUFu9K6Y|<^MyA}4+la7du$}PfUp#*xudnEa`#|iZi)&JBKz-`$Of`c| z{ghQqkARO`bz}Dtg&G*jNC|_}v`?~QX6oi;V3O#hDT|+at%CjC{Z8rm_jxy7AtBdTcioq*o(9d4IV@QZK=)_JYNst*11=vs{%Ce5&jK2XmRYCv0#?Lq@J{ zR_Tv}SQcACF=Ov4uCYOBg8(%qP<<-WPxXAKVDa8LwY}Y{^A%1Z0^<;h>a!nMKgRo%R}}ERRreF^#;Zx*&eQWh^}aU1xLQWD4h8vP_f&l*nL4{^ zm>G)m!y>BC3}@!$LZ*s;o0AugPvNj#jiZOFoXR_j2u{$qV}s*&C*(#;_l`G%EPD~w zXb1EOUlq5F^vh$8c^v*Nr$jFwUfsN2(0!nN0@JWXNwZ+>41;Bqqss#d2_$M2GlzmH zd6|-LbVihV)l59}D6WQ5H#1Xe8Q_<*v57P}=@y149CAe|OI8BoY{tHyz1)k4R?Eaq zYh86X9FBc&+>WG9KJv`osY)dMu^w2%LSm!vhTKXJpM;;|C_d0b&evdmEMCY_fcb|v zDDL|Q(*-b*_F=&QVW32E^x3UeS5D#KJOg8 zuEj`y@7mdE9|q7dI-j+&>0o zU_JqFBK;HPt4UC4M{)gpu&1avpL?C=LeV!v`hl>+_-e`N_SogL(r<>KPyH1FW2K(F zm{vNVZU|K#Tjqqb9(Mq({!E=wZdlVFmLxLX zL~=?^F!z7%32CBu^kl_P5@4FRyM|3+9>H1hdV*6~^9i#TvecW9*4tH#jLvl7v4umD z`c*`wbqe?8EprI9Xdx=PKr{f1kH<$+i&nPAW{Y$PVY1#4ZngKfI9sx~cd36S^(KJV z_VrO`V0;ArH>s`o^>eR5%$@pfdHCdd7evTjh>+U0CAZ`1tidfbmjmFO6`$?NrY|_Q zS?5JI4sP>5UxJJw|MmR;HiCa!HTKB!uTdv`ajv7rE-8`#)P)?h{0LOqVM9+G@=?() zff=bQ+!~*s?wgRBEJ(8#-mtIKtXul;W7!=ka(A-@U}{28=|xxbjFq9+Wizl6Mkh5% z$#I^%<(30th;cj=9iHiH=rO%UZzdMM4uwO9TW*jM+jJj#v_{~6VXDCT#rK + android:layout_height="match_parent" + android:fillViewport="true"> - + android:layout_height="match_parent" + android:layout_marginTop="16dp"> + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c4de59805..78efc1335 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() + jcenter() google() } } @@ -9,6 +10,7 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() + jcenter() google() } }