kD}mpb2uch?V@(cbx1MHBmlvi~
zy|OGSBMV9k|M83n{WrxXQE~gH!g^2`m{ScR?dqkNPtMcvE*|+G6Oz_Mh8Q1&%>3@~b;AZLw9cowaL_GephiiT{^FQXt3j
zP9B!sX4#`~!6_d~ON_=3TC4C}Tr_q2@({wFa;f#2__i8IT+~V%e5z;?1aX%UN~6FY
z(fK!1evim~TB?}A4ra>J`t{cO4=B5mZU}fc^a=v=1lVVZ+&H~ADK;8mH!NYp8*aB*
zeyL)*PHSj{z&{QEl42i%RAKlJxe-GtAC?VB?!{~`MbZKI?y9COb8t(;Sh>3@6j*%^GU~B8*C`e|V
zUfMfW^qWxDzj^`E8$ag&!T(DMDa!wng;*tIsPmJK#~%3|fYj;_A?gS&)`_epe_39%X`Nf&EpQE8Al=#PSxA
zmXuNlMIT}N
z{_^YyrW^!ec5zZ)S0l1ZI4&!%z~B>H7u)fqNB6>Bukn
z9p(S{Z(TiCHtwlc?V1D&?h}qkI;nZw(ATl`FDnh?#)Yq<%t32c|yaY5g?mhBrwp~o#21%fKPQ&>?zav{Rl&D-8e9{
zRnW95`DiYoBI9JK3Y3_vTy~k7$zR@N0Jkq#n(kCXybaAmQZ}MANDu1PA;b(W^Mcj7
zARX^%(dl!vie4!z2m7G4yPoBk!P)|C4!OHVt%U3I5%+F7hsf}I$-7(mkE+8;0&pf<
zIsy%;XY$-+P&=|^%>{bm4T$C*966d+oAr1SC|&Wt%xd`D8>?9|K5Yj+!_TtW+S2qF
z7AB(C*|G<&qJR8C^>Ku^TKqz&-8QJ`dGDKagUmvLDKvParS20g
z%QZb<>imYC=*ZGO1?=2l@Q%>@AlBPb6Od2n+CdWuDvd4Agb$_`d};CvSVgF+oU+Y>J*t
z1f*qfU-+o-l5DS9wtV4kkq1kQXNgep(?iwlO)`kFYaAP71$KI60Ib?-gx%X}%fs*|
zeN)BS$7f>0!3#&I4p8`Iu(2IC8%p{b5@_Y?G>pfMzh)&YTHezmLEmty=}iLKE1-`X
zYG`4mmP;I{Db67HLNix|e$O8tfiJN`qx5P}{1rCb9quW4rY-^bh?W1pq|+`k!yZB6aHIj%H$aL1fzOsGTOT%GF`
zuK~^j`ks(ImK=@e;>;nJYgRQ{9YM~o1|E7h%wMRTtE{>W%+FtOMkW$RETS{3%m=4e_Rr5M9WO778`5lry1{&^B&%5J
zXd-i(kqT}p?9bPf#zgGiTj4jm#TAQA%%Al)GiLw9!%XY>Bgd!F}s
z&gHp1H+%NQ-fOSDp0(Hd#pnAQAi<8GjN#u<`!>~7+(LFLK|n{g6}fl4H}ms}TihW-
zj{n*1{#SR7tR<;xpU=3k>t$4&iIBXN%~QddQuWA3$8E{EBeS=FkhvRQ3Tq#bPSZW_
zw|=WH
zWk|6O%fTdeQR0Q=l{xC-qw_fFr7NrI2k}MD8~?zf2eVi!C`VbqjvM=OXeh14QX=qb
z+V-B%tp@JXCU
zt+rSJkL1Na37^VCO<_BUv>vo>H4oxC)4IEi~Io4IxG~f)~48-R2e_5(R`Dn$LIc6l{fYy
zREm%j>VsB((!+A-%*Ac+_=|nYgOEer;^kX3MLPrXgShM(tHkyDh6_6;m)})kVh#s2
zvrYa&w{rlJw%FA?;Ordgiz>;JsW+I%y4gi|^8J`|)15zcM*f_t@#o3zDHsTQcQRf1
zX#@y`lZv{EM|iDPN$;hJtey>wq*tZJLH86y{GIEr28eoywfmA^uKibURYTnv5k!g~
zsnR~$aiOK}Leqqn!rsE2l{cEbI+^#23EfdxfVUp%)^u3D#l3!0#+89LNbMuo6g2>W
zow|hHjHSAA8Jf@dt*I%R#k*hoH2g|BgmQ-z;F=TB3DR73bxGh^UJVPzC5t3}Isc|Q
z!MbF5jglP(>=M5_4{SqXsWk1@hTrE5&)27mjk}+HZ8rHg=^W{Q5q|wa`9t@ZidL=z
z(EyFf1UbXkq2<*D7{8x7zHyCi3);g#aMOz{ZycEB8q9hwP1x~ky7b^3g}qoLQE;E%
z@*Ga&!9naTX<5ng(XK!^MzabN93%fphgKxjTY@p}KkWuN?`;?d7S5~}JHeWTthm`U
z#qt&J3@Bimmix8YvJ=5)9HxI!gOE{&`MYPlyybQXFIT?lDRh&v>E|ifVxNxFs|f#}
z*r@w}))akQwvc!c0F&9N9RJ<#cZ|+Ja%TN}M0Z{G#ZWDBdh#u7V&e1yx
zL1lYt35WnRGb7<#so*QXODt8&J%`|E!8*y6vCf5e^~%#5JvVImYLy5zXuSb>$6!9Q
zeATU8L)q@wsQO@#At#CiH|i0*pKwig;LXepb@JayrnP9ZaD`Qygd-{+fVuH`cpRK7
zDBWd+{hN3I$D+ZY#92eLlG!BhnUPDw(d|AD&&XoZ#-gsv#RP&Z2zFi&8#njR|Ez1I
zEO-UJ0xd<3Rp>H8muV`7t(ao5!~ajSi!00&mr6O;om_cObn*s&_|!5civ29Iu(r)R
zKA${Z$S@pp-CvV2{Brd!bgz45$<5VL-Fz6xX9gXnes-t2
z;`p>(;6-J}Bc>uACOIUba@7pEe54E{+SDTFJ_?KptK2uh79lNrasa@?@z4@}gOf7j
z3m=Z~!L{8CM{+O9WUe&{C
zk9aGGbNzAgHMJg&Zy&GASDuEOEffce9ygG+{7{|jLT{@Wqu}?+8dF(0lq@jIYS3lA
zP7MqL={%h@=e-jh%I};Y6(xizVxF5X{{cV;w!6l0!
zC|w=yf-Z|4s;|&AHSJG5tgrU-PInnK`F-HTr0a~lGPE=Og%bOOp=JXbZzWM$b#EIP
z<*icH+0bdRs)KHa4*Mb6PKyPXF?(m0%OnGAS%t9!>0WniXh_G>p}m6)?aofz`jgz9
z7YgQocf`DBUaW|3ZT3gYYuNmU;-^ZN?vlkdIhBvRibhd^6}
zZ=D=;BKF|sm)}MrjK{AQ7ggQEX3jrgk{->2^xis&#SD~3TDhj@XHSsH^=q;7aD>H#
zZ^s`!yTrq3Vvz9!5X&FTa@bWPQeIiJ}t$an+RZ
zN*j8g&@VQ~w>XVrogVEe;?n(i<$5zeFSolhrb@0+%eFeYHm$*l?#(SQ2VY>WU$jNJ
zJf1s|ev0M2}1!p%bgvH@nSGD{w(`fh$X1#x!4={H+2?7}`)Nad8KL`Wv
zB#e(*mI^Dj1D&{B$A-p~uEy<|&U~X(`zghz?xGVBE!N#0qcSIvBaC9p;^k9x|5IXA
zFTPKMvWzR6RtLRNJ$_}?&!Z_?Te(Q!256|55(;R$-G;=^S!-}qHa?DP=?@LL7tI5i
zU5ggZbAewdN#EVMe;Q?L?WzC-9^CsK+Ug|x$En?Etoz~-HXu#+Ynfr%a7gkoyzkIa
z+vp(XQvI6~F{^zrjPzLJ8JwBdy4-B5j)%K^>*Nvt@uE!X0=aUU7TvdNQQ9A?~v{wL<>V6i=m5HGpCvSlY0Hm_jy81`~dTh
zMuCT*3vr!@$}CsIKhb2D1emnKqi~y*@OUT%E+G!w9|tKji1{91g*^sx+Xk@p;|3C6
zs)^M8NTs{jbes2%%pFSqU>b9|Jt=$#i2j@USA4BMh%7DTUZP6NuX)heegUk<1^dt`
zGLS5bz-oe}$J)SY5O*$vaPh^S1%R6Lni%7^UA3#H=hGINwtE7Ew?i!>{NwD8Odtmx
zvxmf<`yEJOvG5V!e(t9##@k&WovW6c8SxczJ#}0rm=^L02Of=+_MkrXM;e9bJXgd~
z2*o7F+RMj;K;oQuo?L0p@?54V3V_m|yPm0i1%1(9C~bUSI*pLtEAJ%9T;CNesP|ZJgT-%hoH1
zK;|HGzciw{`Nt8b>5Ts^d3@9AruJ+ncxXQiPQQPcULtH2jugE4!YC%EE6<5Iw}V`S
zUoS_;jsQtBML-2-vQN*b_jo^+%s~CQ_srXal)$jcv+!osM)JBPGGY&vwF{QH>m}O5
z^8q~Lc)4_uZdBMK#5@t|i44&|NYV<$haU6%!3|hYVdLr_C%fVn80ti}%18c2(&(K6
z$3*!8H*m$n$-*nyDWys^!KI7qq2w*98c&_`RskKpIdML7X92264=5>+FC=
zS_R|fAkJMuwfj%?bSO4%nbwNbV(I>XFeKOh7W`F`_O#9&_E&86K>xRQ15Lo~HXuc1
z3jGeG-=9VR^34MnW}JtB!kW6~_6lZVberTYI|FH?$ARq&_8k-E0Q}VYc_|D~Xhd<8
zC590cpSw9O6fUv)Kuq+ocdy8L&Nyo`!@?FeNJSoy+y*`crc7%_adDJZrhpA%M$+A{
zPFLR?1`o2dx6O%=PZ-J_M_)}|S)eT){$_Jo+1jaMsCg;ug}s5$*qzcgq4hx=onQR1v3zpcQFDZ+yCB&QYfxEw&|Ob1E!U|Kjc`i;Y65VjSi;Lk>H>PY
zS6IRc+qtJd#keKtK}}=fjk5+GL8UzCtYcq9T1MStf7AyRP|^z{CsO@Uhmd)^141Lj
ziPjBa6B$s?YpBGwAkL?Zr2qYG*Tl{M7obxA4YdN)L&NJX!wxI}Gs;U%*A(we4XeXA
zHxADM`%eu&_nWT&2<=^EMwq|SJD;gNm>s#{X92B~q|bW+?Dp`03v{yczqR|?-ctAU
zA1G>4p_JU!7OW7w
zzrmzau>o3(@Wvik(pAL_%B5xRCQ7y-q-|um{#zD+?%qR_ykTb*`M7~!$Bw8>P6_+P
zM+oP);x5h{URIPtjVUU<=ODi>$A1V4Cvz&riAZnZ;Q{($w)!u51qp@`I|3ypPlDqC#^UG0XbmlRB6El9XG?`
zfTCF1we(wol~MdE{W82nK);wT+DB@MS=sIZdfbyg>i-<6w^p&&gYj-ROIWKijypt-
z@~>JsJ@8k7v=5)pbrqilxBeJR5}xJ0Dfe?07FoAzeB%v5I8(tY+SgOt)IV|Dd=gG`
zp$_l;o8t>q*c+7krF);2Nau$$DXo5(q2jHtmm7wxZAj4J+SmJIoZ|g2p98T>A22*6
zmzHuEw;-)Ws%ABI8<-+w+J&`1c>%aN)`kL--)*{(BBFCSaKF~J$g>ra5Jd+
z8{{q4_p*<#PtYEN^D(3FvqV6cjpET5xL2GC4ww64Zu-tCL{9<7>*by@!N=kRFKWW>
z^_M9iBaV$JjGM2h1++KSO**g28d>=HfzKHc7Zn^-)KwODbKoFObsk;%+SR;I(!iWRYPcQ6j|dF0{4vEly6m1bT=;ULEH(Qm^FKbkdO1{h^y;Ya_h52#?R
z(!hOv>XkV>$Gdk%7aiR^-I$Fxj}j8zJ)-Mg`3XqXveDN#k&1PI*H7Z
z)y?6Qm{#i*O*1eh+IIz2@4;}09fp8kQ`7l`K7zg{hUoiYlgm=1U<#Q;xY21i17Eph3S`IG(X*u%?R6H2cRg0I2k5gX%f^j-c4
zR&Pgop|zOV{8i_Psil&4_!Lxd{P)YIrt0~M+~2O{;B|l2&5=<}c={s2)c2pbvIGhy
z2w%r2%<0j9kQ{4zdIY$UKhB=>!mPw{C%Gh=Hs{!7`~B$rAHv8
zm83PA1ari+pX*>qT3shB6v0{zEv4@_OT_SbsNlgLdO718k{uwF`@+l;PQF{J9!K-+
zsSls;3&;w7+Or26n~YNoJkJx9u@0+7Gt5|k7}+eJo-DWQb923l<}@o>F8fPSBTej=
zS6;~XvwSmRj(0>STd+;noETUOpOE#)b(JePH~M)yLpKOdNu=i256Ax6PQwnUTzyUJ
z@+SU0wTDRy41(TjMSqyV&eLzqC9E=y(ii&ZOYVN=+^QMuw{bkynrX00&!tb!Hr(|q0v-C!)wmRigC!YE#M$9{3MSiKW;aDf`W0Q?gNh73RK$n;nMR#1}AWshw&S9Tu{`N4u|#E3esk
z5~%3pwL(W(+e?CdF3Q6_SHb7puwYKDjur`fSb}3Mm!fDpuL>Cl`urYweVQ%f#NDC@
zr&1{U<@IQ0caoXuja$t-Q0(wC%37z6_TDNPYTL&iOB{0jEOoghztZh7k=a-d8a|)Y
zHlZ9V&f>3&a52~oHeL;ml{2qoZY<|A%hs_sH$tSTnW#8b8~)w0_rXfAJo3rix3FiV
zu;+hmYdaS9X|u7C4B6i+j-f*`rTQSf4m+4VZk;qRVyloRO;5h;3gQZoZwvd(mhfZ?
zpWP@{=w8MkgwCpP-M8+|NMp~})K(g+36|+aCOCIXwUWQO5Z2i~nMNb3u9o|9%wL`Q
zRo&Oif|fu_p=Er;0k)oyaX9$Gx>VCFaeC%#47(-(7xd|)QoyzXSM*Vr#T>=FNeUgz
zdw(|&`|$W2UhjJ{<<=r4Q15#&RZ4N!4qa9J6$`X~`Lv9sLvXy|f=GA>H1GRr(yXGk
zM!Ww7V~xe2>G7JM45Vka>S|@7RMNv`N%>-b6|wi?tHTiZU+q8eXzeK2b@3G{X!Uq?
zktKBrT_1$B0PPDGdQfg~|43XaCp3KG7@)85!@6K*+W9@*4#c+FZNe4)s%Qu}GQ7|lxL
zBk?(dVcy5j=<*!d*dN^w&<`prRANDm9xmTjcbgZ5Vte9Q3Tj8_fzL7NJDNcwRsXq{
zafws&0^?=0B)MzJf_W_xb9V4$zSZpNrTQ8CEIpi8!g+h{`l7Wzpg*KPqCfgk)V`uD
z)K%Fgr0=uc>0d||RugKNI#7sIsQaJ>33;HftTQX?)iN}Tf5KNWw1BrQCqm#HZkSv?
z#y4J$LiVQ}ZwZ~Rc9;Q6G;3_-%yv-MAjn9qO`Clq$&mA%!si2W>a`8oxAE31r=hcl
z7IT&tTl+X3j-R#A;@<6}e(Xl5mDKWoe52)~d}BbHZU%HzYW+K(jD(RHrv`#
zUALVdyKuQExY#r-ML4F!rlh9iq!gjAaadks!+F$V^`E0i1?5rL^7zU)Hxie!>U-y-
zemN8?T_HV(i`N7mE=S5<*+=Oh{iB6ZY7fEd0$LJUYFZ}RqAkejp)SUJSa0UDQ-x@%
zJm&lr&_&~}+PvXdLsq;n8eh42>-D~GF4W7Xhx&)-P1+t~ZZhd7hSAYI)pv&0^6Zi3
z(iYKM%OyrAm#4yBIx24b3{%nZv!l2JbADF2)U&_2cb>M73U26`TQ(ZF7EO&si{r4o
z!G@Q;QqFjqr1{(n7>J9fzK$)4l)f$VaPgU09_8NZdGms@?jz{0EV&ew1{SOw@+2@J_PH2_2*{e03&$@zX`K_tv=H@ha;+7?{(F
z-4#7%^4T(x8|wGOxkX%hwFncq67RMH*`80eb6#5Mbkw}8qtu6si@yY4ImjCrG;ror
z(@hlNc`m}PoZq5R&*F)4>TNn|H2c`_Ozj;g#iSiM;3BS~~|7}+V
zbjPnI>Gc;b!Ew)}m&Kbw_OjS;dm%{CTb+kiD@MhN+-lne5ol7k5?BAn)%J+_i*m`|?lV<`k@^xM3F&*Y?B-nxj?P{VEF(Z{FeRi(C(%2pVp?
z*rNv>uH^UglUBd4s>OD(_r0`l#G3nx3sUFq2{z9&)pg|O#J^|wLGyT;+`7Cr7rfHP
zKd%ccEXZVGPVPrX94kNAP3tIXtDCU)NA!l$*n7-qeZ38V$+GLT_QDMI^W)_r?W-om
zuT9?sgfES0EBcq^c5OZ#{XKh!4Y$ln%$yN(jwiuW$d1QTN1z%px9JUazDC%js{+X=~%b_utmnHofMKl5@;>3I?#$#
zAQae-pyv<71@YS{*ZJdo17bZV5_zd&tfm>iNbaEZxTJ_&v)QrNb73|)Mu
zG6Z56JdUw!-p&;u9qUFr7wBa_k&?2s*;RC#0E`^qrN2hvg0j9#h;avKGpnVmbL)nt
zuDm+KXJAv{vQn_Ju?n{;_FSUCXQTps3pG%BnWoMt2qvpwALCk66S$W|N#&JltSCe-
z$Wr?+>KD*wwvCn1?BY1n)i1dwK8Q30H|R&uTt-N_B#AYGWmVubv{%@N`-G|30z~Wy
ztUqc(WeVhLpSn)n!`O#ONbTlzlai+B?5p_l%k%lxBHl3A02fkDRxZXQr6vT<$Z6Bt
z$HX$*h<>xr;rlI#wlV(M-TJ98g3o>i>$40tymLstqU~r{Enc6yuXgkhDJj7#?TE*c
zU4H0Q_qRQ={d@bcxYBhn0~P3PijPTAXUX^WZ8`07qiC9!W_Yg^6iiHHKKl!-YD^_9
zOiN}1Bcn7(JN~djE|;ZDEd~11)Y=kxT+ps*eUy$rkBjh%@GIGHr6!@G#(~ODAc*=i
zvEZ?47i1M8Wja$%)~3*6ZSJ^pW#V8K#8%${x!4&MHq|5aIY>_m8&qI+W2g`Vrqqtn
zWTLHwytj9ZP2(`+#xCX|rW8#q=+;cCwfzGvh9Y{|W4Y+&{Ff|1aOD@3@_AK1l-
z_});M=Ok2_h7LIh^x)-
z8*LLJ*pua)n5KBvX=GJ<`|aDFT!&tV!J5>XaaA%2f*O${PQHO9`G^3tPi9<8Y0368
zK0O;(+ptDUhz!Gqr;c#qtNhCPsL|gK@RPW7Ej!%RKj%;$$%>td;)znAFR*yQR3M{=
z%Y84S>lSsi6KxU*j;KwKzRFIL88QaRi>^2UoBIQTTf0o-cv|FK@3T!UJ2s17Cc5TI
z=NH<{jR$!9E5Oj~F_0(WqDF&O7nBciS~U
zxjMm8Z-t|8}TTz=eJ77I9w
zHk{Y0e|RinXxpPT64Q8epJP9%?^22S5TzKU8uc+sJE}n#ZQPM9F=^2e_|nC1;|(^b
z_m@ZIQVhS?bAm3Jit=K8S5mK7yyD)!ohRNSa8V_@xjfux;Z@!$B{C@SanS
zmd65*FVj~WPWac&!HC`R3`Ize&!?N-%Si}b5Zy?7Mc(Q&>h1DPKCcd}rsHfZ&^?93
zyqCR7@&OmFdSWP@1k$md6pb(&_Py^2Gem{hC^xdV%XR$gDvHx4K|-da0y6eRsZ)N%
zq2di-B6jf|5nR9ZOg@fxmG`xb%DXMORlZfYjl}5R2w&Qt2p(5?m)WDCZdQdik1w^4
z`8Ui*27Y9Ggz(F6-fNb{2EF}W>Qo@i(tg;T>nt6w(Pov0_P(-{6O_}<*B0&3G4qf~
z{lD7O;v))Xp#lMax$+hp1cLip0H+Sb1i+CHcpXrav;c4_5{wHR@rHoIJn*Id|BL_M
cM*~BTzwyVB`&q9f&=%-}jMCfE*G6Ce7wigkasU7T
literal 0
HcmV?d00001
diff --git a/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt b/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt
index e76464f16..f5e78da43 100644
--- a/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt
+++ b/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt
@@ -2,9 +2,7 @@ package io.legato.kazusa.help
import android.content.ComponentName
import android.content.pm.PackageManager
-import android.os.Build
import io.legato.kazusa.R
-import io.legato.kazusa.ui.welcome.*
import io.legato.kazusa.utils.toastOnUi
import splitties.init.appCtx
@@ -15,6 +13,7 @@ import splitties.init.appCtx
object LauncherIconHelp {
private val packageManager: PackageManager = appCtx.packageManager
private val componentNames = arrayListOf(
+ ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher0"),
ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher1"),
ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher2"),
ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher3"),
@@ -31,10 +30,6 @@ object LauncherIconHelp {
fun changeIcon(icon: String?) {
if (icon.isNullOrEmpty()) return
- if (Build.VERSION.SDK_INT < 26) {
- appCtx.toastOnUi(R.string.change_icon_error)
- return
- }
try {
// 首先禁用主Activity的启动器intent
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt
index 9e31e61c4..0a8e33867 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt
@@ -18,6 +18,7 @@ import io.legato.kazusa.lib.dialogs.alert
import io.legato.kazusa.utils.getCompatColor
import io.legato.kazusa.utils.gone
import io.legato.kazusa.utils.invisible
+import io.legato.kazusa.utils.themeColor
import io.legato.kazusa.utils.visible
import splitties.init.appCtx
import splitties.views.onLongClick
@@ -62,8 +63,10 @@ class ChangeBookSourceAdapter(
tvRespondTime.text = context.getString(R.string.respondTime, item.respondTime)
if (callBack.oldBookUrl == item.bookUrl) {
ivChecked.visible()
+ root.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainerHighest))
} else {
ivChecked.invisible()
+ root.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainerLow))
}
} else {
for (i in payloads.indices) {
@@ -74,8 +77,10 @@ class ChangeBookSourceAdapter(
"latest" -> tvLast.text = item.getDisplayLastChapterTitle()
"upCurSource" -> if (callBack.oldBookUrl == item.bookUrl) {
ivChecked.visible()
+ root.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
} else {
ivChecked.invisible()
+ root.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainerLow))
}
}
}
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
index 452429978..4cf47f99e 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
@@ -2,6 +2,7 @@ package io.legato.kazusa.ui.book.changesource
//import io.legado.app.lib.theme.getPrimaryTextColor
//import io.legado.app.lib.theme.primaryColor
+import android.annotation.SuppressLint
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
@@ -41,6 +42,7 @@ import io.legato.kazusa.utils.observeEvent
import io.legato.kazusa.utils.startActivity
import io.legato.kazusa.utils.transaction
import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
+import io.legato.kazusa.utils.visible
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
@@ -205,9 +207,11 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
}
}
+ @SuppressLint("SetTextI18n")
private fun initLiveData() {
viewModel.searchStateData.observe(viewLifecycleOwner) {
binding.refreshProgressBar.isVisible = it
+
if (it) {
startStopMenuItem?.let { item ->
item.setIcon(R.drawable.ic_stop_black_24dp)
@@ -226,7 +230,7 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
viewModel.searchDataFlow.conflate().collect {
adapter.setItems(it)
- binding.loadingIndicator.isVisible = it.isEmpty()
+ binding.tvEmptyMsg.isVisible = it.isEmpty()
binding.recyclerView.isVisible = it.isNotEmpty()
delay(1000)
@@ -239,15 +243,16 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
viewModel.changeSourceProgress
.drop(1)
.collect { (count, name) ->
- binding.tvDur.text =
- getString(
- R.string.change_source_progress,
- adapter.itemCount,
- count,
- viewModel.totalSourceCount,
- name
- )
- delay(500)
+ val total = viewModel.totalSourceCount
+ val progress = if (total > 0) (count * 100 / total) else 0
+
+ binding.refreshProgressBar.isIndeterminate = false
+ binding.refreshProgressBar.progress = progress
+ binding.llInfo.visible()
+
+ binding.tvProgress.text = "$count / $total"
+ binding.tvResult.text =
+ getString(R.string.change_source_progress, adapter.itemCount)
}
}
}
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt
index f5b52e635..82aba7449 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt
@@ -549,6 +549,8 @@ class ReadMangaActivity : VMBaseActivity(AppConfig.mangaFooterConfig).getOrNull()
?: MangaFooterConfig()
+ var initialWebtoonSidePadding: Int = 0
+ var initialScrollMode: Int = MangaScrollMode.PAGE_RIGHT_TO_LEFT
+
var callback: Callback? = null
private val binding by viewBinding(DialogMangaFooterSettingBinding::bind)
@@ -32,6 +36,56 @@ class MangaFooterSettingDialog :
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
+ binding.chipGroupScrollMode.removeAllViews()
+
+ MangaScrollMode.ALL.forEach { mode ->
+ binding.chipGroupScrollMode.addView(Chip(requireContext()).apply {
+ text = MangaScrollMode.labelOf(mode)
+ isCheckable = true
+ isChecked = (mode == initialScrollMode)
+
+ setOnClickListener {
+ callback?.onScrollModeChanged(mode)
+ }
+ })
+ }
+
+ binding.scvPadding.apply {
+ valueFormat = { "$it %" }
+ progress = initialWebtoonSidePadding
+ onChanged = { newValue ->
+ callback?.upSidePadding(newValue)
+ }
+ }
+
+ binding.checkboxDisableClickScroll.apply {
+ isChecked = AppConfig.disableClickScroll
+ setOnCheckedChangeListener { _, isChecked ->
+ callback?.onClickScrollDisabledChanged(isChecked)
+ }
+ }
+
+ binding.checkboxDisableMangaScale.apply {
+ isChecked = AppConfig.disableMangaScale
+ setOnCheckedChangeListener { _, isChecked ->
+ callback?.onMangaScaleDisabledChanged(isChecked)
+ }
+ }
+
+ binding.checkboxHideMangaTitle.apply {
+ isChecked = AppConfig.hideMangaTitle
+ setOnCheckedChangeListener { _, isChecked ->
+ callback?.onHideMangaTitleChanged(isChecked)
+ }
+ }
+
+ binding.checkboxVolumeKeyPage.apply {
+ isChecked = AppConfig.MangaVolumeKeyPage
+ setOnCheckedChangeListener { _, isChecked ->
+ callback?.onVolumeKeyPageChanged(isChecked)
+ }
+ }
+
binding.cbChapterLabel.run {
isChecked = !config.hideChapterLabel
setOnCheckedChangeListener { _, isChecked ->
@@ -187,6 +241,12 @@ class MangaFooterSettingDialog :
fun onAutoPageSpeedChanged(speed: Int)
fun showColorFilterConfig()
fun showClickConfig()
+ fun onScrollModeChanged(mode: Int)
+ fun upSidePadding(padding: Int)
+ fun onClickScrollDisabledChanged(disabled: Boolean)
+ fun onMangaScaleDisabledChanged(disabled: Boolean)
+ fun onHideMangaTitleChanged(hide: Boolean)
+ fun onVolumeKeyPageChanged(enable: Boolean)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt
index 433b9d134..f395e8261 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt
@@ -2,7 +2,6 @@ package io.legato.kazusa.ui.book.manga.config
import android.os.Bundle
import android.view.View
-import com.google.android.material.chip.Chip
import io.legato.kazusa.R
import io.legato.kazusa.base.BaseBottomSheetDialogFragment
import io.legato.kazusa.databinding.DialogMangaScrollModeBinding
@@ -14,8 +13,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
private val binding by viewBinding(DialogMangaScrollModeBinding::bind)
var initialAutoPageEnabled: Boolean = false
- var initialWebtoonSidePadding: Int = 0
- var initialScrollMode: Int = MangaScrollMode.PAGE_RIGHT_TO_LEFT
var callback: Callback? = null
@@ -24,20 +21,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
}
private fun initView() {
- binding.chipGroupScrollMode.removeAllViews()
-
- MangaScrollMode.ALL.forEach { mode ->
- binding.chipGroupScrollMode.addView(Chip(requireContext()).apply {
- text = MangaScrollMode.labelOf(mode)
- isCheckable = true
- isChecked = (mode == initialScrollMode)
-
- setOnClickListener {
- callback?.onScrollModeChanged(mode)
- binding.chipAutoPage.isChecked = false
- }
- })
- }
binding.chipAutoPage.run {
isChecked = initialAutoPageEnabled
@@ -47,42 +30,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
}
}
- binding.checkboxDisableClickScroll.apply {
- isChecked = AppConfig.disableClickScroll
- setOnCheckedChangeListener { _, isChecked ->
- callback?.onClickScrollDisabledChanged(isChecked)
- }
- }
-
- binding.checkboxDisableMangaScale.apply {
- isChecked = AppConfig.disableMangaScale
- setOnCheckedChangeListener { _, isChecked ->
- callback?.onMangaScaleDisabledChanged(isChecked)
- }
- }
-
- binding.checkboxHideMangaTitle.apply {
- isChecked = AppConfig.hideMangaTitle
- setOnCheckedChangeListener { _, isChecked ->
- callback?.onHideMangaTitleChanged(isChecked)
- }
- }
-
- binding.checkboxVolumeKeyPage.apply {
- isChecked = AppConfig.MangaVolumeKeyPage
- setOnCheckedChangeListener { _, isChecked ->
- callback?.onVolumeKeyPageChanged(isChecked)
- }
- }
-
- binding.scvPadding.apply {
- valueFormat = { "$it %" }
- progress = initialWebtoonSidePadding
- onChanged = { newValue ->
- callback?.upSidePadding(newValue)
- }
- }
-
initAutoPageSpeed(initialAutoPageEnabled)
}
@@ -101,12 +48,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
interface Callback {
fun onAutoPageToggle(enable: Boolean)
fun onAutoPageSpeedChanged(speed: Int)
- fun onScrollModeChanged(mode: Int)
- fun onClickScrollDisabledChanged(disabled: Boolean)
- fun onMangaScaleDisabledChanged(disabled: Boolean)
- fun upSidePadding(padding: Int)
- fun onHideMangaTitleChanged(hide: Boolean)
- fun onVolumeKeyPageChanged(enable: Boolean)
}
}
diff --git a/app/src/main/res/anim/popup_enter.xml b/app/src/main/res/anim/popup_enter.xml
index f218d4b8e..fe46fbe53 100644
--- a/app/src/main/res/anim/popup_enter.xml
+++ b/app/src/main/res/anim/popup_enter.xml
@@ -1,10 +1,6 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..6c9f32f27
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 74e82bedb..b765f1c66 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -45,20 +45,15 @@
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-
-
-
+ app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/cd_about" />
+ android:textStyle="bold"
+ tools:ignore="SmallSp" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/cd_ver" />
+ app:layout_constraintTop_toBottomOf="@id/tv_detail">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:orientation="vertical"
+ android:visibility="gone">
+
+
+
+
+
-
+
+ android:paddingBottom="8dp">
+ android:paddingBottom="8dp">
-
+
@@ -71,6 +70,7 @@
android:id="@+id/cp_epaper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:checkable="true"
android:layout_marginEnd="8dp"
android:text="@string/manga_epaper" />
@@ -78,9 +78,9 @@
android:id="@+id/cp_enableGray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:checkable="true"
android:text="灰度" />
-
+ android:paddingBottom="8dp">
+ android:paddingBottom="8dp">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -95,6 +135,7 @@
android:layout_height="wrap_content"
android:layout_marginVertical="8dp"
app:cardBackgroundColor="?attr/colorSurfaceVariant"
+ android:layout_marginHorizontal="16dp"
app:cardCornerRadius="8dp"
app:strokeWidth="0dp">
@@ -107,7 +148,8 @@
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="16dp">
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="16dp">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/app/src/main/res/layout/dialog_manga_scroll_mode.xml b/app/src/main/res/layout/dialog_manga_scroll_mode.xml
index 0fa4be1d8..52b8b081d 100644
--- a/app/src/main/res/layout/dialog_manga_scroll_mode.xml
+++ b/app/src/main/res/layout/dialog_manga_scroll_mode.xml
@@ -24,7 +24,7 @@
android:id="@+id/bottom_sheet_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="漫画设置"
+ android:text="自动阅读"
android:textSize="18sp"
android:textStyle="bold" />
@@ -36,30 +36,6 @@
android:orientation="vertical"
android:paddingHorizontal="16dp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/dialog_read_book_style.xml b/app/src/main/res/layout/dialog_read_book_style.xml
index ed11908dc..1b8a8226f 100644
--- a/app/src/main/res/layout/dialog_read_book_style.xml
+++ b/app/src/main/res/layout/dialog_read_book_style.xml
@@ -63,7 +63,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/dialog_read_padding.xml b/app/src/main/res/layout/dialog_read_padding.xml
index f9f4551ab..4b6ae2343 100644
--- a/app/src/main/res/layout/dialog_read_padding.xml
+++ b/app/src/main/res/layout/dialog_read_padding.xml
@@ -15,15 +15,13 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
- android:paddingVertical="16dp"
+ android:paddingBottom="16dp"
android:paddingHorizontal="16dp">
-
+
@@ -10,15 +9,13 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
- android:paddingVertical="8dp"
+ android:paddingBottom="8dp"
android:paddingHorizontal="16dp">
-
+
-
+
+ android:paddingBottom="16dp">
-
+
+ android:background="@android:color/transparent"
+ android:foreground="?attr/selectableItemBackground"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="8dp">
-
-
-
+
+ android:layout_marginStart="16dp"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:textColor="?attr/colorSecondary"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toStartOf="@id/tv_author"
+ app:layout_constraintStart_toEndOf="@id/iv_good"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="latest chapter name" />
+
+
+
+
+
+
+
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="8dp"
+ android:textSize="12sp"
+ app:layout_constraintEnd_toStartOf="@id/tv_respond_time"
+ app:layout_constraintStart_toEndOf="@id/iv_good"
+ app:layout_constraintTop_toBottomOf="@id/tv_origin"
+ tools:text="word count" />
+
+ tools:text="respond time" />
+
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 09132acdd..ac94b34f5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,5 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..ac94b34f5
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher0.xml b/app/src/main/res/mipmap-anydpi-v26/launcher0.xml
new file mode 100644
index 000000000..09132acdd
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher0.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index fee3a447a701b418320b17c5ca601972aefe901a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2364
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
Mwosc|s~fm~0opUvdH?_b
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..392a17588335da77f4939de7e73cc7b48ebb895a
GIT binary patch
literal 1720
zcmV;p21of)Nk&Gn1^@t8MM6+kP&iDa1^@srN5ByPHHU(>Z5Wq7>|F>EF#)z&qEWv>
zp5(07$AMdz}<$pv7S!5e})W3
zX27Rl3bvqi9x4`~cdh7Y+2cJ9Y8HVUNs=Nds;R1X)nI-f;}hQ~!p*91EOtT=0I+PF
zZ&VJkowL#YJ8&CGk(^~de1z26+8oJAZ>qbir)ts4D;;IzU21#AR8>RK#V>$G!b8Os
z!9aQMv8SUX2Ck!%M5R%(F?eC`4HXx*X?TOZsGyjbX9~f)1Qt#Lf=Xh!Mj^Nr0MJmz
zY`b3f2WhkI%}wrXD}A-Y$hOj2QUl3XJZ_H|b|L+DDyxzO2@RgId7asSuINL*D6n2k=
zUfp&y4tkG9Z{T6mTIDj3mtl2ucaI0JHX#B63);(V$=(9^$@y2eWm7=y0XbMKsf@Z#
z;jSL1Y@Pj*NEVZUy;YsLcPo8b7|Rt%EwI|_1L0dX<6LxeKtuNen3y;3
zFjDS~NY$c#wHtB^SZ^T%(6e4V!bs`Ud;?rAFnlKnqKDHCW^TU+m!JPTz|g!)DW!YZ
z)6B(H2Z}${Hlplq-AXCFJya$p0f9TN-+zD(3v+3)2O2+>%mjd;c@v~tcj2ipTh&Xc
z^pe;F(Xb+sOH!~=XK(?oG<(QES{cm6+XLuxYO|1-}-ft+BR9t5V6^!=55)0MH47j=N2%gcMvVl4Q^vDu;g!W_8w4;1OPp
zRfLr0n^Fl??1Rmvle}5iHd2(e-GXlmg*;JL;O`(ru&>yh=-^QR=vOZ9*;t`D
z3w||N)Oetn>Oz*kf5nO6DH~*_2bLs0cjkWL%J2V7b7`Rmnmm>(0G6|uX~Lh5QbpAS
zt9pI;me?ce3wn7_=!VM8vZ?uf2Ga6iH$MEk17I!(=Qtk+%I%F1sw<`mpp6Wxx^_>v
z6$e)SKUj`e!*(1%7nD#zmXRAq5Z&Epi-E7@q3W;W
z4p2|t4ji6pSgy=GtgxETL-GGS1HvAEhY;3Tifc{J5@_%-?4U@Ur)PxGkT6#+A3AlcD`a6koO3p(j*p&=d
zz>mo_1$S9OEf&1vtx!!d8Hkp$I!0y41Ic&`mexkN2Vyag1h(KlOQ{wpZu9&6?f=?F
z=4>ovKoCLuc(84L1CS_20(xaf%TqW3LPb8O9W1*FR&TYDS!>+?8j$;xR&Y_v1OC@B
zW45%{&w`thoh3M-t^fWy;PijG9sa@=FXlY-U3fC<5KvD#%gf-X%?%)Oct3xKEuPI~
zSm;{rF23~712kk~4(@7xLXq?5>38=Tbo7>Qu3a$Ik-u(fq!bDgcsLVWR_Q8U|L;m@
zBvkHb#x4&4wXRBVoXYBCNgs^%Bgu+phYXt2T2ao5*6+;rYbqks%J8l_P`F=v*R8|i
ObJqLE?*;qE={5!5a7xVp
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..60b5554e8e493ad161fda7bc009db85e51e1fbc4
GIT binary patch
literal 3492
zcmV;V4O{Y3Nk>4FCXFMM6+kP&iDG4FCWyN5Byf6^DYhZKRk#?Cl;15itQ>V=*iH
zpOz-NrtAKnBFU-bn30D}GgC>M
z*&3OdoiTI945RX<7DF2&_nGZu=9A<|l3iQL+jZXiinUm4a7W_^4uIp3BS}&ui;Cs$
zo|($bV`hGl0w+O|Y}2;l-DlgjZQHhO+qR})+txRy@NC;S=Qad4k`zgi)r`A)*YpHR
z|NkG7oQGFkUFhnu&DgeW+g{tYZS!$d{r}a~4clVh2zJN|eK%XJ`?
zIubV?&SXDd`eE1$Bb{<;Ek)9Z{ogY$_cjA{DdH^Bgh(^oXT%CM&NpZH_tbNDEfp9z@*0p(_(kmgl4}
zI{p-nl@gMb`M(_521xHmYOL(ZlrLP6pAu}@)9+DtV3V;_IUXl%4aj|8SkvdXi
z<&E$3Chp(eT{wyB-`llMSKyja-Xg4JqtL_g;9$$1`^6w9~>u=7%GyU>@6x`@pL(3emx1b9Hb>TmZhm
zU&i&LlGpV&DTU6tn`B-+iU7FE?DPS5{YriHQl#W@H9oWq^Fn22Dh5zI_q^_!0pu**
z(${(BG_zG_*$j$S6N<-V)J`m98n#f!ybC}n9u+$vIZvhbPAQ%MTy=Z|4OpS-1%>3u
z%kq%s6;6-mOT`mF{L_0K9}gFC81`MyLkW*B0Qb#-{|3?YMR}Y&Lm5bsHuIG4?gK#F
zMd77fJJbpXfK|+crlnSpZ??eIVA{xSobXowC?BAG!?bTj4+7XD`r{oi2vxlx>0#K+
zPs$U*)VefHPNWGw7m1+)FQ%0VG>Hl2--0B)d)a=j&afq;@MP*?&UT26(}E1%?a?Po94
zUnGSZE0zYem=JOy46T_BLF~i;k<2Flw)A48XpW5N+)0lY0LuEp^~R?2ArMBDY#mM3
z@Q>EW_43sVC|b3lLwOD+TL4O;FM0Cm&@m~L|%b{sSQ2y}8F<_*(uFFes(4Bbbb`
z32XiYDCM(eQ)|c5HOqvxNE}j
z)JPFlG+p$E73}BsrQBEyYfP%tQcJ
zi#7X*h)*wr?KF~%u~&p>U79xx(Rdo0H6>w0$Yj9<3}?M!;|q1zat7IHCK*ODba?;?
z-IKg~CeYYZEK78haFCLZ7{~7_|t)TB@;Bw*K%HvvYPYzkzY-$z*%lCAfiaFho%!z{5<
z=D>?}*b$BT4%pPl5LW1Dhkz%6B4E|>FF`Y5^><5e$4Mz1=7RN2UkkA^Fj1X`#=LG%
z;;#SV=|2I7QdkCB0_NDIeu#YY0#GhOmJZ^YmM~83o#-f2yeoxR0hp+Kh^#j;cRv(L&0|>Z}bEZcvDL0Rd<1(kv`c)>innA1wAD-$
zPJ~K&$5srufojUWU$lY|>qVCi@kft{s0ipgK-ritfCUZm@9zLIt{+{ppdGSFsl%3)
zp46KIfd62>jqMNTt2WSjTVYatd@)QcKJJA{?aMXJGT)nXESVappJIFvhM0v%G4?3=
z{|D{sHNa|~b*s^dSAg@tr2`snMgiPnBELQWpm;`4=fYbG=
zS#tYU4D1p4^8wR5X{O3pMvsQyrKS=@>b;0=1VVn@tKvL9J(oH{=saOGC%Js%)NxtLmOB>c>(g&
z(F4;*qc^HPXPJQK(z9Fu#jhv(Tecn@cp}-`Ubm{N%*`LLHjQTtS#SKPty^Y`D|u6}
z6UY>9SvCqdCsTD|WWSS*qjyrc=Qv{s$GmWTF#uepPL8{>p&flp(M{s`LnH*of`a@&E$
z+yxT0Qi(OWd-);<*9Qp0xolfpj~=qiEVO
zGG=Ckg^VQGNQ<=jA8I7=uJ*~yGztpRPFn}>3*JmPyVe#w1d`RDpL5MC@eG+dS2)zU
zDS3R>HLq2J!5_QZcZjNya1w|Ts14mzUy|>Pf<(k&45tiPZz52i{))3#AJrNxwINKP
z(8|^^t7$Hpv6)Cn&Xm;|pOP&~Yzt$Fua+^|ipW72qD^|$C~qvYr$oUfzv
z{moed
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index eb89d0cbf1cc17d95633aa11c96b53f7dbdcdb42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1599
zcmV-F2Eh4=P);M1%Qc_ami3<<{2LL_|c~+}z^g;?mO6>+9>_;NaTY+DJ%9_4W18(9l0WKj-J?-rnBi
zgnm}*x1-oQd08t^YHNS@9*!~+1cOU-%wCcLqkLE?(WXc&WVYMUS3|4lau)P
z`0efOYin!%&B*%t`ttPk|KQyJ*wX*Qy=Z7?VPRqa>*$V;j(~uGaBy&9Vq)?3_y4@I
zn3$Q6kdS?SeS3R*WMpJWOiZq>uBWG`o12@Bjg5wehDJ$9LPA3S{QADWzPY)%wY9ad
zu&}GEtN*g8p`oFko}QMLmV<+XcXxMlb8~HNZChJgR#sL;OHF7>N&dgM{-U7$tDpa#
zo0XN7?um%}go6BfdwP0$|6gHPSXfk4R8LM#V?;#%{`~y>{POko{O#-a+}ior)cMrU
z`@_Ecx2~zFtE8l)qobqxr=Xyqpr4-UXld?bW!qw7>|R^ESyq-+Q%lH$n*aa+A9PYq
zQvmV)^6$fT8x#8W(S?M3c4GPY&d$Z1l9Fz2YHAr3gJ)su000BdNklaI3`
znH3j(1VMd)AbV?TC=7B{VgZ<8)}w*?FdWnFdY^qs_7e!XEFK~pGQn~%y}afUeA}R$
z?oDS>SVBm}DvZZtxbJB|Fu_t_&R@g|ji`LP`$Po$5F`T>MG}2jjYI@!3ScgId_kmM
z6p;A@9z{ru`-Z}aD>xp$QY5f8P)1#um=f%k*$%x5-ZGSq#UIB9+<4Feqh_XvkaXaWli?CbE!f>I~=1VOL>QdS~19EnC4fc$pH
z1tM(o#Z-~AI)gL-p)H`?S6NFag*zx|$`ZlhR#8nL;wx+%h)~IeZ4jyL6ovZ{L_?uM
zZ9pVidR9qSoaj$0l(io?*`g(gIDO)JElchcM~<_gT+UVr%%HT=$BYh1KN|af@#421
zpD%v-Wd*pT_=rY}G}GNLKW-&2hc7?5H2mrE`4^`w07<5ws%`CZ5-MF{p1vHu^zhR2
zv(K#omm(L&9`ul&f|5zLkXK)yoW1<){Mlzes{qkLwP>FlVf}NQ_JX-rr&-3w$3;;r
z6|iui813oq%I7=o<+}>0VqbWa(m#I%$3;Gu%|w&;+FIVXG$;PLF(>TuNQVDp}xPUlXi+W~
zu$O@U;VrGw|M6}$FoxtU4@m=hZXWe(pz)?T)>=a{cQESAfXX55Ee|QcK<$8OwT5I3
z=71FjFwZ<8m+%>^U
xpl8jr$$`0xfRR}Xmn|`dWC`ZXn?DP%{01B&t`uIdwo3p2002ovPDHLkV1hduQ>6d^
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7705342aa728c3b2d3db0877cddd54b7c3d24a87
GIT binary patch
literal 1150
zcmV-^1cCcfNk&F?1ONb6MM6+kP&iC#1ONapFTe``)yUfZ$&j6|*R!*8rdP+YZQHhO
z+qSN3Tbpl@ET;EdC6^T(yTUoKwW%2O9Kg1tK~AFzIGm>#hIj@(F6B*);wso@cBPTZ8_R!JE^8P#UOm`VGCUuLGzC(;GR
zcc+hMAqR1e;<^C5d!1o?JL!fL_&|nG?|X4x#B~W*)HWkJLN2W`-keY(fOd}6wsZTY
z8~9#KuI96{GHuYSZQrB}?Gyp-8E^C@5-vlg4`*?TVEl(h<6(K~c38LegIxs+l=}Te
z1>Yx^(NyU>kh5j
zXW7;t4*+`C|59YUkT^zYI2!hwHfY^`)3(uYfI{Py)VvgO0Q2wv1FiYNQV$q6^6v*i
z2{MQ(+@jPw9th|>-Q$w4YdW8T6M~Hjh6fNYI?a
zbvT_w8rBuCNy5pkhK7881^hD0oAo+~N*5?_esz$sGI7P3{K2Wl7zvZPsvX(cxE;ni
zlplNtv-YXMsm6+e-i<9j&j91gS#t|QAI?x?<&SDsIEgVu>hW5tA)qZ4h$9~~
zh;z)hWX6rSEHERd5DS^RS<>b5iK)wSxq9uIavu{#*HO2VF4D#ZUN7dxthXM
zj;#zeGV?1!TpGOq$hc9tOfO`J%h|nKf;gd|a9+M*=2)Sm3rKKIMyg!$#WBLL7mIk3
zNverZ1#MVViD^yAFvs&1?ZXB~J!qAWr4O|I4^k2RU`<&~7L{Xb<|MA7wKxU-CjF>5
z?y2plAnHbD8xF0gBx*|4PHel92|5z_%Bj{Bn3^V%I;vjRTzZvpw~a3c+9|F`-tY+4
z&8Q+8OmGQ&Fo38tEKVUA@|%iGO?`oj6CwkQ?@nPJJ`K#wGbu04Zy5m5uGJEEvXEm2KSSJ=ALgs7tLT>TFe8*k25wCZK$dW$P+mkrQ@cXvj@qg`zbBpq+@#*xztnGf{6vbtMhsAkW(Wfu$6v@pC=>-|l
QX57f6NzX63W8VO0158*ni~s-t
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7cb0ae7a257e7efaa0235479cac56024a5765798
GIT binary patch
literal 2392
zcmV-e38(f_Nk&Fc2><|BMM6+kP&iCP2><{uFTe{BHHU(<4Vcxx?L7$*F#+-bA1k-k
zwnc7!Gek@gGqadkJF`3g_$YL$I^4Q6pxq8WS0LA7y6P*qKvD
zs(>=XZz_PIF-I!Em~#ghIi!eVrmeu4&-qPNP{>RLIHCd^jVa^`6hnw4NwJ--?do|x
zm_+dV06CH*MY5_`rkbkE>Sa3m-S-qYII?Yj#$0MfCWO{6=XH7!uV
ztZ4wUZQG`!ec!qFp={f>(T+brt!I?FsaAZGuRah207x2(n|ZSXJ)}WbU@I6%+s40;
zO~ARm5eIG~DUz#unfKrikRSxuF~E%lej;c{bS83ekaoZc8`4jXBn+QQj-RKfhk6-uN^%k)
z(H<{Hjk5a1r&Rr-9ej9-9XrIkguSfC7>+ei5#2Pbw+DpR7lhv*2>(CG>wnsMeP9wQ
z7-JFX(nLbe1rUUqY$4uHdRr^yZN-POclUQsJGCBW8o
z9DwR^vIDDz`G}Chh0wPEh}x0|mZ5h$^z1c&9aqf9goi9^J;{MSX2J2Rp0~3Q4zxaE&v=h6kq;PD+o2C3c_?Vm^#l}n&I0K
z)wa&|qiit1Hq|n
zB-IieOEiFz554|Qh-+qm9k{C;=Hw$v=~xt7G6EcMsmpBB73`@&sdWsHT?2@eYAse%
z+{d(BO+`u#K=zE6lp3=BlQg2nwW=Z)h}_g@OyCEko+WNXNsN{&2|gBSxsr++Yj7KL
z6A#4?Ow^EFG(X(mBg2D07-4)
zSVZeMAo(*GJGU}7z({xo!{f7&c&I^7EsYp2cMTZ3H^{!By#KK%SUW3~w_6|`sr`aa
z5zQxr(6bQJ{~2Hg>QOAd1>~eoH$;ZOr)`Arl$EJqHk3vJqu?2624eYN_-GvBQ)bmK
zL47zo+5hwy3hIpzue)0S
ztTtD&PocVs-Z9tJ{O%t$YJ+%
zJ%mZs;SBFN9%mN_EY~>CTVx=%FV@2yilVAB0z7~~(6F^BMZ)6?f_B8A
zQ{)}uycDGry3rmup)evbpkxPuEc!c@~^L*l&pe#y|k2_t8gB2iy?vb6ySChev6
zy`p!RT7NY|*kuNOk9BadWc<~oV(iXXi#bRoJ
z5dZ<9Sf3~w^O<^}AJPegv8X&s$3zTP6p5Hi#tcz5L%Ocpguu$7#`BaIeD)RbDMlqF
z1k~c*-2c&PUh|&V(%HX!1U%`PU@QT1eGw?m0Ankvajpdt2_UEARROoW!~J*4VM^Pa~HetxTk+zX#E-}NlAngk1X#OIvqKPFnw
zjam9bAn-U4(6FdI?RQlArc;A+Oq*-MTx(+2f)vb%?@{=wLju~s!TcX!)}djjztikX
zm?8lSZ>fvNx5d-vt{jVRUgCR7)xWI&Z5kevE&ojb7nA`@(IQoLz>t4&!y4@zi*JlY
zWhEIHb+>pBmPX-`3&+BnIXb~@EKG>sfv6N!3T#w{#v~x}OSDo2C9;lpmC#XZ<|J|a33SCckdyu;UU%YmWx?@Ul%_1UF$
zYr!8MKZ^pGqpVCUF60`0K8()QsM>hk?b1}JZiuG)6du#
zGJ@;fBW?n={;0S=iIsG(`IwMvKU)@(|04^x>>Rh35^MkTL&X!YbL(F`iQNd;2PD>R
zGs*Eo)julG8hwS=H)iGK%{pz}-tit4W{zd2h7xe-mI?Y~b|YZpox_M=f8zQ0gdUpI
zc@*MLkHqK!t=Fq0AQ)21T~=61Vbfse$6ht`WLzD4p4|>hDr&mR8L}wRo_o9jzXAff
z1YA85y%9Be3K{$LRKqXE@YG_Db?77Dwk3yyUF3EnU{ZvYNAparA?Be)J>KquOa*qi
zEhZmBti!DPSGwhbz3^NDVgkkloU5>iX_bA4zqt{Xlth`7CAtu*+f&OdYofwZk|Uo-
z6L85tn!D1mKNmLvt^5NSCBds4%dpDbhOg~;E8{@^47ce52jQ79AjokaC7@0~b6?k^
K?i^=k!jk}w$9RAM
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index c3f019f981e8cffb2a8882e194795825edaf1ea0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3246
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
K*~QpDClUi&6CoY|
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..72e6f7ea965db638d89267d2040e9db4ce884db8
GIT binary patch
literal 4700
zcmV-i5~J->Nk&Fg5&!^KMM6+kP&iCS5&!@%U%(d-6$gU0Z4>i{z3rzE5ff0EO{nax
zOH-lyt;5rb%iNshpVt2Wh9u|ZRdrQ&RrT1O2}ZHG=2f)z?p18tHU?|tb=3KvbE-SI
zwr!ggXY*8S+qP}nePY|TQL$}1nX41q21H4cOk2H2JLleK+qP}nwr$&2Km8hl002o`
zWp=kBsR$OjvswQkNRr&P=~bXi2tFqOgnvNW+4e+|^Pem;Gcz+&4>osKd3i4&*OAN1
zb=6e6s%!QFyx38enZwLvwL+sX_e$YpR+DXolRpfjQH9T#nVFfSb0h9sV(c0w)WSWYf0d?qeI*wr!iw
zwr$(CZQJJ8wQbwx-lri*lH9i0J;Xf(Nd~~+7YsM-5rEdxAR+@n3t%K7hBriP{?lV2
zrom7w78!27uh3Fp1ZZBbxUy#@VZ(vavcF}!{i@S{$qSICghb{e6w8?UKrrR!Wi5A2
zB=c^$b)Td^B;zR~z+F^e%KVxtbVRI~PdKIo9vG;)2t
z|CB{?AIVTCXV8d<7n7X1?Aa%)KKW4CLdp3&2>Mr(H-b>`W4wKxCn26@_AbC(U!Eyg}Z)YrKXzdin
zpG9+ACPhkPssIA)?eZ#xsFCbCg?;Y@i!pQ`kZ|
z|3FJmpVH?ArI@;!xja5QP7dMg6GHzWqpth%PD&Bg+}cQ&7E064R2H!*LFXkBlPMXs
z*Mi$FwHR=tw6QrZPx0$DDVg?uX?+`hbszn21f?m(Zc14!$gq&)Bpq&Q3X&%m@!>WN
zX8lFfWJqs?{_A8LiCHYDfkGsG*9^WJPZs{P=|P@8`9>eL3t#oK6Bt2^qbwUaKhRR$
zR;k4SX-Nq`pGl4w&<>w|??*}@8_EmIB{`In+>;**7SW$d*Spcu2+l4kzCI=)4!;h+
z`sE$x#rkNmUQ)6Rm8);3`DBuhm;CZbQa$3!ZBy^CpO>)a`|DijExnx?r#<;aw5@lRcEvGbafzv
zkn=N*pcGQ!`!fMCs8bG92l;s&WpaZVb<31}bs?%O+%hX
zgHq1KkJkjk9?r^jO{VK`5Ax5B!~XvStnRfPh;7iHV4vo)n2sI>LPT;I%88`r#n0CS
zQg_zg6Qdzvc$j7WHKgvYu)YH~CV$9tRbhjig)||g=^#BQxkUKYpjzkeS8$}Ot4!{3
z>MEn)NIxbhacVUOTZE8AN(t$!lOm*^X>6;!Hzzm==O;@m4)yizS#0+cB&E7IQ|
zsmQO=uda)jMjOXlMr3NIr9Nk`6apG?{d~n6p?>$$tynX<5P8_yBXdYko>Lt?UTMWT
z`NyE^(zJ(Kx19L)m`K6V9y{xmlLf{&C{%oXv^ZelA(?t5?bK1K9AP%_7GS$-*H64L@CiPHddK}JsG(CTTd911v#2Iir
z)|KgnNGrR@EwE1nx_MF$6qtw9G)QXft{U6FWyAvHDZ*1tR?7H!d3rH*l3%x1TyV}?
z(WUGnr=TE*G!E7}+CCUmhvkv(3@=WAZMy`OLyex=EiNR#Huaq7wo6*kCgzEOU