From ff0063dc3be23f790f1b7ecd6e8536ad9c971376 Mon Sep 17 00:00:00 2001 From: harutiro Date: Tue, 7 Jan 2025 21:30:52 +0900 Subject: [PATCH 001/108] =?UTF-8?q?fix:=20gradle=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++- gradlew | 44 ++++++++++++++++------- gradlew.bat | 37 ++++++++++--------- settings.gradle | 1 - 5 files changed, 55 insertions(+), 31 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..2c3521197d7c4586c843d1d3e9090525f1898cde 100644 GIT binary patch literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 59536 zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^ zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~ ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u z=ASkePDZA-X8)rp%D;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5 z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5 zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59e zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!) zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl z(o?YlOI=jl(`L9^ z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d* zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP zWOeX5G;9(m@?GOG7g;e74i_|SmE?`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB z?2iK-u(DC_T1};KaUT@3nP~LEcENT^UgPvp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)na-5x1#OsVE#m*+k84Y^+UMeSAa zbrVZHU=mFwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7~-6hl;*-*}2Xz;J#a8Wn;_B5=m zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{ z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*#1!6}5K<*xDPJ{wv4& zM$17DFd~L*Te3A%yD;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0> z@x>;EzyBv>AI-~{D6l6{ST=em*U( z(r$nuXY-#CCi^8Z2#v#UXOt`dbYN1z5jzNF2 z411?w)whZrfA20;nl&C1Gi+gk<`JSm+{|*2o<< zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto& zR`c~ClHpE~4Z=uKa5S(-?M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F>k6k zz21?d+dw7b&i*>Kv5L(LH-?J%@WnqT7j#qZ9B>|Zl+=> z^U-pV@1y_ptHo4hl^cPRWewbLQ#g6XYQ@EkiP z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It z0CBpUcMA*QvsPy)#lr!lIdCi@1k4V2m!NH)%Px(vu-r(Q)HYc!p zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMiNP_o*lvx*q%_odv49Dsv$NV;6J z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB8zyvh*xhHKE``99>y#TdD z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4 z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@ zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp zOH4qlEOW4OMUc)_m)fMR_rl^pCfXc{$fQbI*E&mV77}kRF z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf! zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr# zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-PyuqGn3^M^Rz%WT{e?OI^svARX&SAdU77V(C~ zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<%z*+!*<e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4 z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!dchdkRiHbXW1FMrIIBwjsai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^# z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5ShD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@ zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&5#YbXkl`q?<*XtsqD z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-} z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;RN zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0 zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7z|=ALF5SNGkrtPG@Y~niUQV2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHpyznGG4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc? zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9ZybFY%jdnA)PeHvtBe- zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>( z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7 zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe zq!K%{e-rT5jX19`(bP23LUN4+_zh2KD~EAYzhpEO3MUG8@}uBHH@4J zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V%|; zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7 z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa z@w;^c|K3da#$TB0P3;MPlF7RuQeXT$ zS<<|C0OF(k)>fr&wOB=gP8!Qm>F41u;3esv7_0l%QHt(~+n; zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90jH@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`? zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb zpe^BChDK>sc-WLKl<6 zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re* zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK| zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#* zBP=a{)K#CwIY%p} zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!OY{eB24%xY7ml@|M7I(Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{ zv9@%7*#RI9;fv;Yii5CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0 zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^CfoY`?|#x9)-*yjv#lo&zP=uI`M?J zbzC<^3x7GfXA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_ zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W* z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L z@w67!DqVf7D%7XtXX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k= zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb zv(n3+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L65B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR z>U+KQekVGon)Yi<93(d!(yw1h3&X0N(PxN2{%vn}cnV?rYw z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpAi-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_ znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$ z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7sBDOA)$VThRCI0_+2=( zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;hg0Umh#c;hU3RhCUX=8aR>rmd` z7Orw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y( zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF& zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K| z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3 zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$I{Z^Hsj@D=E{MnnL+TbC@HEU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG zlP>XLMj2!VF^0k#ole7`-c~*~+_T5ls?x4)ah(j8vo_ zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@ z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j z1v&%a;OSKc8EIrodmIiw$lOES2hzGDcjjB`kEDfJe{r}yE6`eZL zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3 z03s0-sSlwbvgi&_R8s={6<~M^pGvBNjKOa>tWenzS8s zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+ zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2 zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_ z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE& z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{ zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3 z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_$r-2{$d~0g2oLETx9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f# zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)>gpS~1rNEh z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-pqZ1t|?cnaVOd;1(h9 z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al zvLo7Xte=C{aIt*otJD}BUq)|_pdR>{zBMT< z(^1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb- z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4` z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@ zM2NVLDxZ@GIv7*gzl1 zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U} zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl@O!Ak;(o*m!pZqe9 z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&q zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I> z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe= z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65 z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM z`Ub{+J3dMD!)mzC8b(2tZtokKW5pAwHa?NFiso~# z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3 z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4 z7ib0UOPqN40X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl})G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0 zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3 z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_ zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{ z0QQ(8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!IgDTVqt31wX#n+@!a_A0ZQkA zCJ2@M_4Gb5MfCrm5UPggeyh)8 zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgDs4swy5&8RAHZ~$)hrTF4W zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(35$ zWa07ON$`OMBOHgCmfO(9RFc<)?$x)N}Jd2A(<*Ll7+4jrRt9w zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8 z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+; zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+ zmcZ6?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50; zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?MM`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$ zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8 zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN zv98?fqqTUH8r8C7v(cx#BQ5P9W>- zmW93;eH6T`vuJ~rqtIBg%A6>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB zK_7G3!n7PL>d!kj){HQE zE8(%J%dWLh1_k%gVXTZt zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i( zZcTT@2`9(Mecptm@{3A_Y(X`w9K0EwtPq~O!16bq{7c0f7#(3wn-^)h zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7 zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH zqgcqW>Gm?6oV#AldDPKVRcEyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT zBbj@*SY;o2^_h*>R0e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot zmb)sZaly_P%BeX_9 zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}> z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e! z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-Nj$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR= z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@a? z%({Gn14b4-a|#uY^=@iiKH+k?~~wTj5K1A&hU z2^9-HTC)7zpoWK|$JXaBL6C z#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#yEFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={( zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|FAcx?r4$N z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd-(+9>G7*Nt%T zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6 zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8 ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5 z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%* zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9 zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ( zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;? zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?S|P z5|6b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0 zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S z7l(riiCwgghC=Lm5hWGf5NdGp#01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd z*6+-QXJ*&Kvk9ht0f0*rO_|FMBALen{j7T1l%=Q>gf#kma zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3 zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3< zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+Ln1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7 zcMcD$Hsjko3`-{bn)jPL6E9Ds{WskMrivsUu5apD z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90KT!JXUhYS`ZgX3jnu@Ja^seA*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S z6NE`3z!IS^$s7m}PCwQutVQ#~w+V z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_) zvE|L(L1jP@F%gOGtnlXtIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd>XI3-O?Wp z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm znsNt@Q&N{TLrmsoKFw0&_M9$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(- zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x z0$!q7iFu zZ`tryM70qBI6JWWTF9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye} zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*H9=l=D3r!GLM?UV zOxa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D zzDp3c9yEbGCY$U<8biJ_gB*`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu$$-C=*|X?R0~hu z8`J6TdgflslhrmDZq1f?GXF7*ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC z)ff9Yk?wZ}dZ-^)?cbb9Fw#EjqQ8jxF4G3=L?Ra zg_)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{ zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4 zeBs>KR)izRG1gRVL;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)CWNn9pCtBE}+`Jelk4{>S)M)`Ll=!~gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux} z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~ z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$ zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw% zGz)~?B4}u0CzOf@l^um}HZzbaIwPmb<)< zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$ zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_` zfnHQPANx z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@ zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+cU@DbR^_SXY`MC7HOsCN z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$NkI!0E;Y z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X? z6vV3*m~IBHTy*^E!<0nA(tCOJW2G4DsH7)BxLV8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-D zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}SjL=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-# zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN*zw9N+_=odt<$_H_8dbo;0=42wcAETPCVGUr~v(`Uai zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3 zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xfVqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6 zImRCr?(iyu_4W_6AWo3*vxTPUw@vPwy@E0`(>1Qi=%>5eSIrp^`` zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6 z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|ITJ}JDg@o8y>(rF9mXk5M z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j! zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(XuAYtTsYy-dz+w=$ir)VJpe!_$ z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~ z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3aPp z;o)|L6Rk569KGxFLUPx@!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1 z4=jk@7EEj`u(jy$HnzE33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5 zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|moUBAV_^f$hpaUuyQeY3da^ zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl z-OylnqOpLg}or7_VNwRg2za3VBK6FUfFX{|TD z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t zE%t!J0 zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9 z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$ zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_muEFI}U_4$phjvYgleK~`Fo`;GiC07&Hq1F<%p;9Q;tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%&p~D=K#KpfoJ@ zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXzjYaM{8$s&wEx@aVkQ6M{E2 zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7am^_F!Lz>;~{VrIO$;!#30XRhE1QqO_~#+Ux;B_D{Nk=grn z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw z*T#a=+WcTwL78exTgBn|iNE3#EsOorO z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8# z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4 z0DIL&vsJ1_s%<@y%U*-eX z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8# zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK} zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{JohU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~- zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$) z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$ z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)2r9W<> zT5L8BB^er3zxKt1v(y&OYk!^aoQisqU zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i z8lWr4g5nctBHtigX%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB>u&aUQl+7GiY2|dAEg@%Al3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3 zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI z_(gk!k+0%CG)%!WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7 z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_ z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrHFcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^% zmrkc4o6rvBI;Q8rj4*=AZacy*n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K& z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0 zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dWB7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG ztIHpY8F5xBP{mtQidqNRoz= z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$# zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G zFj6bV{`Y6)YoKgqnir2&+sl+i6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+= zYO=&t#5oSKB^pYhNdzPgH~aEGW2=ec1O#s-KG z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn< zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ| zJ5Wlj+4q~($hbtuY zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l~ zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5& znWoHlA-(z@3n0=l{E)R-p8sB9XkV zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g= zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8 zCRvMB^{GO@j=cHfmy}_pCGbP%xb{pNN>? z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0 zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jnTT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)Us)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP# zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|Uivj5u!xk0 z_^-N9r9o;(rFDt~q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL^d!r z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94 zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?w}{>8>$3236T-VMh@B zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG` zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h9sF@U20DHSB3~WMa zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR zE%B`Vi&m8f3T~&myTEK28BDWCVzfWir1I?03;pX))|kY5ClO^+bae z*7E?g=3g7EiisYOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU= zE*OY%QY58fW#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW>Z z`)>V2XC?NJT26mL^@ zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZupzM77m^=9 z&(a?-LxIq}*nvv)y?27lZ{j zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{`4 zU#kYOv{#A&gGPwT+$Ud}AXlK3K7hYzo$(fBSFjrP{QQ zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G! z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4 zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms| zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X zucyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~ z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^ zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF! z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJisifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8 z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~ zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h?Y8rS1S&-G+m$FNMP?(8N`MZP zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!by?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|) z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c zfs`aw?II0e(h=|7o&T+hq&m$; zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h) zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+K@61f}0e z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$Je1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`THd>2 zsWfU$9=p;yLyJyM^t zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2 zO?n3DEzpT+EoSV-%OdvZvNF+pDd-ZVZ&d8 zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op% z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc& zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{8r?;q3_kpZZ${?|( z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K> zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8 z6Mkf>2)WunY2eU@C-Uj-A zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK`` z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg z191aWoR^rDX#@iSq0n z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$ zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh z)lMbA69y7*5ufET>P*gXQrxsW+ zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBXQI2|g}FGJfJ+ zY-*2hB?o{TVL;Wt_ek;AP5PBqfDR4@Z->_182W z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24 z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU* zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)cEZ%vge965AS_am#DK#pjPRr-!^za8>`kksCAUj(Xr*1NW5~e zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%# zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0bD@_vGAr*NcFoMW;@r?@LUhRI zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V> zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g zJGpKk%%Sdc5xBa$Q^_I~(F97eqDO7AN3EN0u)PNBAb+n+ zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$N4yr^^o$ON8d{PQ=!O zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35va%4v>gc zEX-@h8esj=a4szW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1* znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP> zrp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{ zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx zK%p23>M&=KTCgR!Ee8c?DAO2_R?B zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw- z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8 z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*( ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEX zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_ zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm zZi-noqS!^Ftb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@ zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn` zEgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@ zK^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf z9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^&X%=?`6lCy~?`&WSWt z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRHZphp zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{eSyybt)m<=zXoA^RALYG-2t zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhRmh=)R0bg~ zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+ zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai< z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF# zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg% zbOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi zPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wB zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P;=!y-AjFrERh%8la!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2 zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJSBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-} z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU? zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R% zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=Es(9&S@K@)ZjA{lj3ea7_MBP zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5 zI7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw z`P+tft^E2B$domKT@|nNW`EHwyj>&}K;eDpe z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA zv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$ z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3 z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6< znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_ z%7SUeH6=TrXt3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9ATD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j( ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|HQ`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^ zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K! z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^vq@Q_SRl|V z#lU<~n67$mT)NvHh`%als+G-)x1`Y%4Bp*6Un5Ri9h=_Db zA-AdP!f>f0m@~>7X#uBM?diI@)Egjuz@jXKvm zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#> z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|rlC1EA<1#`iuyNO z(=;irt{_&K=i4)^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf zL#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84 z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d zbzar4Fz&RSR(-|s!Z6+za&Z zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<815<5sOHQdeax9_!PyM&;{P zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L% z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+WXyYu*y3?px*=8MAK@EA+jRX8{CG?GI-< z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*qVE*y0`7J>l2wCmW zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw z4)>7caf^Ki_KJ^Zx2JUb z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ zC(JupLfFp8y43%PMj2}T|VS@%LVp>hv4Y!RPMF?pp8U_$xCJ)S zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR& zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk zwDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){} zGr}Exom_qDO{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6 zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj zKYug($r*Q#W9`p%Bf{bi6;IY0v`pB^^qu)gbg9QHQ7 zWBj(a1YSu)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>kYJC z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8iVx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY zSmfi)F`m94zL8>#zu;8|{aBui@RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm){>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(Xekg*ix@r|ymDw*{*s0?dlVys2e)z62u1 z+k3esbJE=-P5S$&KdFp+2H7_2e=}OKDrf( z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9 z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>Kwe zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L0JV9f3g{-RK!A?vBUA}${YF(vO4)@`6f1 z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi! zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0& QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da1db5f..09523c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 213904f..5541150 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - jcenter() // Warning: this repository is going to shut down soon } } rootProject.name = "Android Engineer CodeCheck" From 84ff21d067a6363a7da461a885c911d30e9ef810 Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 19:06:43 +0900 Subject: [PATCH 002/108] =?UTF-8?q?update:=20agp=E3=81=AE=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=82=92=E8=A1=8C?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9d87c3e..7567c9f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" From 05c1ad04a5282dcd65192bf534aa87bde4e9fa61 Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 22:29:54 +0900 Subject: [PATCH 003/108] =?UTF-8?q?add:=20=E3=83=97=E3=83=AB=E3=83=AA?= =?UTF-8?q?=E3=82=AF=E3=81=AE=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=AE=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..cce09f1 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,27 @@ +## 概要 + +このセクションでは、このPRの目的と概要を簡潔に説明してください。 + +## 関連Issue + +このセクションでは、このPRが関連するIssueやタスクをリンクしてください。以下のように記述します。 + +- 関連Issue: #123 + +## 変更点 + +このセクションでは、具体的な変更点や修正箇所を箇条書きでリストアップしてください。 + +- 変更点1 +- 変更点2 +- 変更点3 + +## テスト + +このセクションでは、このPRに関連するテストケースやテスト方法を記載してください。 + +- テストケース1 +- テストケース2 +- テストケース3 + + From 389b530483e040454839e6f5593b9f640a0161af Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 20:08:58 +0900 Subject: [PATCH 004/108] =?UTF-8?q?add:=20ktlint=E3=81=AE=E5=B0=8E?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 ++ app/build.gradle | 1 + 2 files changed, 3 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c91f60f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,2 @@ +[*.{kt,kts}] +ktlint_standard_package-name = disabled diff --git a/app/build.gradle b/app/build.gradle index aabd8f0..987109c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,7 @@ plugins { id 'kotlin-kapt' id 'kotlin-parcelize' id 'androidx.navigation.safeargs.kotlin' + id("org.jlleitschuh.gradle.ktlint") version "12.1.2" } android { From 963f38f8193a9b19ed641e5f31df8c7118697a97 Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 20:12:46 +0900 Subject: [PATCH 005/108] =?UTF-8?q?ref:=20ktlint=E3=81=AB=E3=82=88?= =?UTF-8?q?=E3=82=8B=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=83=88=E3=82=92?= =?UTF-8?q?=E8=A1=8C=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/ExampleInstrumentedTest.kt | 8 +- .../yumemi/android/code_check/OneFragment.kt | 130 ++++++++++-------- .../yumemi/android/code_check/OneViewModel.kt | 97 ++++++------- .../{topActivity.kt => TopActivity.kt} | 3 +- .../yumemi/android/code_check/TwoFragment.kt | 20 +-- app/src/main/res/navigation/nav_graph.xml | 2 +- .../android/code_check/ExampleUnitTest.kt | 5 +- 7 files changed, 141 insertions(+), 124 deletions(-) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{topActivity.kt => TopActivity.kt} (92%) diff --git a/app/src/androidTest/kotlin/jp/co/yumemi/android/code_check/ExampleInstrumentedTest.kt b/app/src/androidTest/kotlin/jp/co/yumemi/android/code_check/ExampleInstrumentedTest.kt index eb56878..d9f2dd9 100644 --- a/app/src/androidTest/kotlin/jp/co/yumemi/android/code_check/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/kotlin/jp/co/yumemi/android/code_check/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package jp.co.yumemi.android.code_check -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -21,4 +19,4 @@ class ExampleInstrumentedTest { val appContext = InstrumentationRegistry.getInstrumentation().targetContext assertEquals("jp.co.yumemi.android.codecheck", appContext.packageName) } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt index 5f6dc72..e2eb56d 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt @@ -11,34 +11,42 @@ import android.view.inputmethod.EditorInfo import android.widget.TextView import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import androidx.recyclerview.widget.* +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView import jp.co.yumemi.android.code_check.databinding.FragmentOneBinding -class OneFragment: Fragment(R.layout.fragment_one){ - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) - { +class OneFragment : Fragment(R.layout.fragment_one) { + override fun onViewCreated( + view: View, + savedInstanceState: Bundle?, + ) { super.onViewCreated(view, savedInstanceState) - val _binding= FragmentOneBinding.bind(view) + val binding = FragmentOneBinding.bind(view) - val _viewModel= OneViewModel(context!!) + val viewModel = OneViewModel(context!!) - val _layoutManager= LinearLayoutManager(context!!) - val _dividerItemDecoration= - DividerItemDecoration(context!!, _layoutManager.orientation) - val _adapter= CustomAdapter(object : CustomAdapter.OnItemClickListener{ - override fun itemClick(item: item){ - gotoRepositoryFragment(item) - } - }) + val layoutManager = LinearLayoutManager(context!!) + val dividerItemDecoration = + DividerItemDecoration(context!!, layoutManager.orientation) + val adapter = + CustomAdapter( + object : CustomAdapter.OnItemClickListener { + override fun itemClick(repositoryItem: RepositoryItem) { + gotoRepositoryFragment(repositoryItem) + } + }, + ) - _binding.searchInputText - .setOnEditorActionListener{ editText, action, _ -> - if (action== EditorInfo.IME_ACTION_SEARCH){ + binding.searchInputText + .setOnEditorActionListener { editText, action, _ -> + if (action == EditorInfo.IME_ACTION_SEARCH) { editText.text.toString().let { - _viewModel.searchResults(it).apply{ - _adapter.submitList(this) + viewModel.searchResults(it).apply { + adapter.submitList(this) } } return@setOnEditorActionListener true @@ -46,59 +54,67 @@ class OneFragment: Fragment(R.layout.fragment_one){ return@setOnEditorActionListener false } - _binding.recyclerView.also{ - it.layoutManager= _layoutManager - it.addItemDecoration(_dividerItemDecoration) - it.adapter= _adapter + binding.recyclerView.also { + it.layoutManager = layoutManager + it.addItemDecoration(dividerItemDecoration) + it.adapter = adapter } } - fun gotoRepositoryFragment(item: item) - { - val _action= OneFragmentDirections - .actionRepositoriesFragmentToRepositoryFragment(item= item) - findNavController().navigate(_action) + fun gotoRepositoryFragment(repositoryItem: RepositoryItem) { + val action = + OneFragmentDirections + .actionRepositoriesFragmentToRepositoryFragment(item = repositoryItem) + findNavController().navigate(action) } } -val diff_util= object: DiffUtil.ItemCallback(){ - override fun areItemsTheSame(oldItem: item, newItem: item): Boolean - { - return oldItem.name== newItem.name - } +val diff_util = + object : DiffUtil.ItemCallback() { + override fun areItemsTheSame( + oldRepositoryItem: RepositoryItem, + newRepositoryItem: RepositoryItem, + ): Boolean { + return oldRepositoryItem.name == newRepositoryItem.name + } - override fun areContentsTheSame(oldItem: item, newItem: item): Boolean - { - return oldItem== newItem + override fun areContentsTheSame( + oldRepositoryItem: RepositoryItem, + newRepositoryItem: RepositoryItem, + ): Boolean { + return oldRepositoryItem == newRepositoryItem + } } -} - class CustomAdapter( private val itemClickListener: OnItemClickListener, -) : ListAdapter(diff_util){ +) : ListAdapter(diff_util) { + class ViewHolder(view: View) : RecyclerView.ViewHolder(view) - class ViewHolder(view: View): RecyclerView.ViewHolder(view) - - interface OnItemClickListener{ - fun itemClick(item: item) + interface OnItemClickListener { + fun itemClick(repositoryItem: RepositoryItem) } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder - { - val _view= LayoutInflater.from(parent.context) - .inflate(R.layout.layout_item, parent, false) - return ViewHolder(_view) + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int, + ): ViewHolder { + val view = + LayoutInflater.from(parent.context) + .inflate(R.layout.layout_item, parent, false) + return ViewHolder(view) } - override fun onBindViewHolder(holder: ViewHolder, position: Int) - { - val _item= getItem(position) - (holder.itemView.findViewById(R.id.repositoryNameView) as TextView).text= - _item.name + override fun onBindViewHolder( + holder: ViewHolder, + position: Int, + ) { + val item = getItem(position) + (holder.itemView.findViewById(R.id.repositoryNameView) as TextView).text = + item.name - holder.itemView.setOnClickListener{ - itemClickListener.itemClick(_item) - } + holder.itemView.setOnClickListener { + itemClickListener.itemClick(item) + } } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt index 402b065..3d6941e 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt @@ -6,77 +6,80 @@ package jp.co.yumemi.android.code_check import android.content.Context import android.os.Parcelable import androidx.lifecycle.ViewModel -import io.ktor.client.* -import io.ktor.client.call.* -import io.ktor.client.engine.android.* -import io.ktor.client.request.* -import io.ktor.client.statement.* +import io.ktor.client.HttpClient +import io.ktor.client.call.receive +import io.ktor.client.engine.android.Android +import io.ktor.client.request.get +import io.ktor.client.request.header +import io.ktor.client.request.parameter +import io.ktor.client.statement.HttpResponse import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking import kotlinx.parcelize.Parcelize import org.json.JSONObject -import java.util.* +import java.util.Date /** * TwoFragment で使う */ class OneViewModel( - val context: Context + val context: Context, ) : ViewModel() { - // 検索結果 - fun searchResults(inputText: String): List = runBlocking { - val client = HttpClient(Android) + fun searchResults(inputText: String): List = + runBlocking { + val client = HttpClient(Android) - return@runBlocking GlobalScope.async { - val response: HttpResponse = client?.get("https://api.github.com/search/repositories") { - header("Accept", "application/vnd.github.v3+json") - parameter("q", inputText) - } + return@runBlocking GlobalScope.async { + val response: HttpResponse = + client?.get("https://api.github.com/search/repositories") { + header("Accept", "application/vnd.github.v3+json") + parameter("q", inputText) + } - val jsonBody = JSONObject(response.receive()) + val jsonBody = JSONObject(response.receive()) - val jsonItems = jsonBody.optJSONArray("items")!! + val jsonItems = jsonBody.optJSONArray("items")!! - val items = mutableListOf() + val repositoryItems = mutableListOf() - /** - * アイテムの個数分ループする - */ - for (i in 0 until jsonItems.length()) { - val jsonItem = jsonItems.optJSONObject(i)!! - val name = jsonItem.optString("full_name") - val ownerIconUrl = jsonItem.optJSONObject("owner")!!.optString("avatar_url") - val language = jsonItem.optString("language") - val stargazersCount = jsonItem.optLong("stargazers_count") - val watchersCount = jsonItem.optLong("watchers_count") - val forksCount = jsonItem.optLong("forks_conut") - val openIssuesCount = jsonItem.optLong("open_issues_count") + /** + * アイテムの個数分ループする + */ + for (i in 0 until jsonItems.length()) { + val jsonItem = jsonItems.optJSONObject(i)!! + val name = jsonItem.optString("full_name") + val ownerIconUrl = jsonItem.optJSONObject("owner")!!.optString("avatar_url") + val language = jsonItem.optString("language") + val stargazersCount = jsonItem.optLong("stargazers_count") + val watchersCount = jsonItem.optLong("watchers_count") + val forksCount = jsonItem.optLong("forks_conut") + val openIssuesCount = jsonItem.optLong("open_issues_count") - items.add( - item( - name = name, - ownerIconUrl = ownerIconUrl, - language = context.getString(R.string.written_language, language), - stargazersCount = stargazersCount, - watchersCount = watchersCount, - forksCount = forksCount, - openIssuesCount = openIssuesCount + repositoryItems.add( + RepositoryItem( + name = name, + ownerIconUrl = ownerIconUrl, + language = context.getString(R.string.written_language, language), + stargazersCount = stargazersCount, + watchersCount = watchersCount, + forksCount = forksCount, + openIssuesCount = openIssuesCount, + ), ) - ) - } + } - lastSearchDate = Date() + lastSearchDate = Date() - return@async items.toList() - }.await() - } + return@async repositoryItems.toList() + }.await() + } } @Parcelize -data class item( +data class RepositoryItem( val name: String, val ownerIconUrl: String, val language: String, @@ -84,4 +87,4 @@ data class item( val watchersCount: Long, val forksCount: Long, val openIssuesCount: Long, -) : Parcelable \ No newline at end of file +) : Parcelable diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/topActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt similarity index 92% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/topActivity.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt index e15957c..83cd1a4 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/topActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt @@ -4,10 +4,9 @@ package jp.co.yumemi.android.code_check import androidx.appcompat.app.AppCompatActivity -import java.util.* +import java.util.Date class TopActivity : AppCompatActivity(R.layout.activity_top) { - companion object { lateinit var lastSearchDate: Date } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt index 8720eb5..086b6ca 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt @@ -13,13 +13,15 @@ import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate import jp.co.yumemi.android.code_check.databinding.FragmentTwoBinding class TwoFragment : Fragment(R.layout.fragment_two) { - private val args: TwoFragmentArgs by navArgs() private var binding: FragmentTwoBinding? = null private val _binding get() = binding!! - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + override fun onViewCreated( + view: View, + savedInstanceState: Bundle?, + ) { super.onViewCreated(view, savedInstanceState) Log.d("検索した日時", lastSearchDate.toString()) @@ -28,12 +30,12 @@ class TwoFragment : Fragment(R.layout.fragment_two) { var item = args.item - _binding.ownerIconView.load(item.ownerIconUrl); - _binding.nameView.text = item.name; - _binding.languageView.text = item.language; - _binding.starsView.text = "${item.stargazersCount} stars"; - _binding.watchersView.text = "${item.watchersCount} watchers"; - _binding.forksView.text = "${item.forksCount} forks"; - _binding.openIssuesView.text = "${item.openIssuesCount} open issues"; + _binding.ownerIconView.load(item.ownerIconUrl) + _binding.nameView.text = item.name + _binding.languageView.text = item.language + _binding.starsView.text = "${item.stargazersCount} stars" + _binding.watchersView.text = "${item.watchersCount} watchers" + _binding.forksView.text = "${item.forksCount} forks" + _binding.openIssuesView.text = "${item.openIssuesCount} open issues" } } diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 57a016e..7c1cc16 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -22,7 +22,7 @@ tools:layout="@layout/fragment_two"> + app:argType="jp.co.yumemi.android.code_check.RepositoryItem" /> diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt index 63201e4..b435cbc 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package jp.co.yumemi.android.code_check +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). * @@ -14,4 +13,4 @@ class ExampleUnitTest { fun addition_isCorrect() { assertEquals(4, 2 + 2) } -} \ No newline at end of file +} From 776a16c2873d808fdc39a0316d04cc2f9b6c33e4 Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 20:28:07 +0900 Subject: [PATCH 006/108] =?UTF-8?q?ref:=20Fragment=E3=81=AE=E5=90=8D?= =?UTF-8?q?=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{TwoFragment.kt => RepositoryDetailFragment.kt} | 10 +++++----- .../{OneFragment.kt => RepositorySearchFragment.kt} | 10 +++++----- .../{OneViewModel.kt => RepositorySearchViewModel.kt} | 2 +- ...fragment_two.xml => fragment_repository_detail.xml} | 0 ...fragment_one.xml => fragment_repository_search.xml} | 0 app/src/main/res/navigation/nav_graph.xml | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{TwoFragment.kt => RepositoryDetailFragment.kt} (75%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{OneFragment.kt => RepositorySearchFragment.kt} (91%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{OneViewModel.kt => RepositorySearchViewModel.kt} (98%) rename app/src/main/res/layout/{fragment_two.xml => fragment_repository_detail.xml} (100%) rename app/src/main/res/layout/{fragment_one.xml => fragment_repository_search.xml} (100%) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt similarity index 75% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index 086b6ca..f391c84 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TwoFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -10,12 +10,12 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.navArgs import coil.load import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate -import jp.co.yumemi.android.code_check.databinding.FragmentTwoBinding +import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding -class TwoFragment : Fragment(R.layout.fragment_two) { - private val args: TwoFragmentArgs by navArgs() +class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { + private val args: RepositoryDetailFragmentArgs by navArgs() - private var binding: FragmentTwoBinding? = null + private var binding: FragmentRepositoryDetailBinding? = null private val _binding get() = binding!! override fun onViewCreated( @@ -26,7 +26,7 @@ class TwoFragment : Fragment(R.layout.fragment_two) { Log.d("検索した日時", lastSearchDate.toString()) - binding = FragmentTwoBinding.bind(view) + binding = FragmentRepositoryDetailBinding.bind(view) var item = args.item diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt similarity index 91% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index e2eb56d..b32c5ca 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -16,18 +16,18 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import jp.co.yumemi.android.code_check.databinding.FragmentOneBinding +import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding -class OneFragment : Fragment(R.layout.fragment_one) { +class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { override fun onViewCreated( view: View, savedInstanceState: Bundle?, ) { super.onViewCreated(view, savedInstanceState) - val binding = FragmentOneBinding.bind(view) + val binding = FragmentRepositorySearchBinding.bind(view) - val viewModel = OneViewModel(context!!) + val viewModel = RepositorySearchViewModel(context!!) val layoutManager = LinearLayoutManager(context!!) val dividerItemDecoration = @@ -63,7 +63,7 @@ class OneFragment : Fragment(R.layout.fragment_one) { fun gotoRepositoryFragment(repositoryItem: RepositoryItem) { val action = - OneFragmentDirections + RepositorySearchFragmentDirections .actionRepositoriesFragmentToRepositoryFragment(item = repositoryItem) findNavController().navigate(action) } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt similarity index 98% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 3d6941e..c452b06 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/OneViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -24,7 +24,7 @@ import java.util.Date /** * TwoFragment で使う */ -class OneViewModel( +class RepositorySearchViewModel( val context: Context, ) : ViewModel() { // 検索結果 diff --git a/app/src/main/res/layout/fragment_two.xml b/app/src/main/res/layout/fragment_repository_detail.xml similarity index 100% rename from app/src/main/res/layout/fragment_two.xml rename to app/src/main/res/layout/fragment_repository_detail.xml diff --git a/app/src/main/res/layout/fragment_one.xml b/app/src/main/res/layout/fragment_repository_search.xml similarity index 100% rename from app/src/main/res/layout/fragment_one.xml rename to app/src/main/res/layout/fragment_repository_search.xml diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 7c1cc16..01e13df 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,9 +7,9 @@ + tools:layout="@layout/fragment_repository_search"> @@ -17,9 +17,9 @@ + tools:layout="@layout/fragment_repository_detail"> From 9599806154e4600674517d486358634d785824dd Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 20:28:51 +0900 Subject: [PATCH 007/108] =?UTF-8?q?ref:=20setText=E3=81=A7=E9=80=A3?= =?UTF-8?q?=E7=B5=90=E3=81=97=E3=81=A6=E3=81=AF=E8=A1=8C=E3=81=91=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yumemi/android/code_check/RepositoryDetailFragment.kt | 8 ++++---- app/src/main/res/values/strings.xml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index f391c84..b657d79 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -33,9 +33,9 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { _binding.ownerIconView.load(item.ownerIconUrl) _binding.nameView.text = item.name _binding.languageView.text = item.language - _binding.starsView.text = "${item.stargazersCount} stars" - _binding.watchersView.text = "${item.watchersCount} watchers" - _binding.forksView.text = "${item.forksCount} forks" - _binding.openIssuesView.text = "${item.openIssuesCount} open issues" + _binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) + _binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) + _binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) + _binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 33dbeae..b820fba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,4 +2,8 @@ Android Engineer CodeCheck GitHub のリポジトリを検索できるよー Written in %s + "%1$d stars" + "%1$d watchers" + "%1$d forks" + "%1$d open issues" \ No newline at end of file From bb4ce77324b4500c67267aa059c2664da3c77ccc Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 20:58:28 +0900 Subject: [PATCH 008/108] =?UTF-8?q?add:=20PR=E3=82=92=E5=87=BA=E3=81=99?= =?UTF-8?q?=E6=99=82=E3=81=ABlint=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E6=8C=87?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check_workflow.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/check_workflow.yaml diff --git a/.github/workflows/check_workflow.yaml b/.github/workflows/check_workflow.yaml new file mode 100644 index 0000000..265d3fb --- /dev/null +++ b/.github/workflows/check_workflow.yaml @@ -0,0 +1,16 @@ +name: Run Gradle on PRs +on: pull_request +jobs: + gradle: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Change Permission + run: chmod +x ./gradlew + + - name: Execute Gradle check + run: ./gradlew ktlintCheck From 4dbbc4e987c70766c9bca3b5b9d7a05a144e4d6c Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 21:47:16 +0900 Subject: [PATCH 009/108] =?UTF-8?q?ref:=20=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=88=86=E5=89=B2=E3=81=A8=E3=83=A1=E3=82=BD?= =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AE=E5=88=86=E5=89=B2=E3=82=92=E8=A1=8C?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/code_check/RepositoryItem.kt | 15 ++ .../RepositoryListRecyclerViewAdapter.kt | 61 ++++++++ .../code_check/RepositorySearchFragment.kt | 143 +++++++----------- .../code_check/RepositorySearchViewModel.kt | 121 +++++++-------- 4 files changed, 191 insertions(+), 149 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt new file mode 100644 index 0000000..fd37b26 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt @@ -0,0 +1,15 @@ +package jp.co.yumemi.android.code_check + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +data class RepositoryItem( + val name: String, + val ownerIconUrl: String, + val language: String, + val stargazersCount: Long, + val watchersCount: Long, + val forksCount: Long, + val openIssuesCount: Long, +) : Parcelable diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt new file mode 100644 index 0000000..6d74fa8 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package jp.co.yumemi.android.code_check + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView + +/** + * DiffUtilの実装 + */ +private val diffUtilCallback = + object : DiffUtil.ItemCallback() { + override fun areItemsTheSame( + oldItem: RepositoryItem, + newItem: RepositoryItem, + ): Boolean { + return oldItem.name == newItem.name + } + + override fun areContentsTheSame( + oldItem: RepositoryItem, + newItem: RepositoryItem, + ): Boolean { + return oldItem == newItem + } + } + +/** + * RecyclerView Adapter + */ +class RepositoryListRecyclerViewAdapter( + private val itemClickListener: OnItemClickListener, +) : ListAdapter(diffUtilCallback) { + class ViewHolder(view: View) : RecyclerView.ViewHolder(view) + + interface OnItemClickListener { + fun itemClick(repositoryItem: RepositoryItem) + } + + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int, + ): ViewHolder { + val view = + LayoutInflater.from(parent.context) + .inflate(R.layout.layout_item, parent, false) + return ViewHolder(view) + } + + override fun onBindViewHolder( + holder: ViewHolder, + position: Int, + ) { + val item = getItem(position) + holder.itemView.findViewById(R.id.repositoryNameView).text = item.name + holder.itemView.setOnClickListener { itemClickListener.itemClick(item) } + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index b32c5ca..93f7e28 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -4,117 +4,90 @@ package jp.co.yumemi.android.code_check import android.os.Bundle -import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup import android.view.inputmethod.EditorInfo -import android.widget.TextView import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController -import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding +import kotlinx.coroutines.launch class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { + private lateinit var binding: FragmentRepositorySearchBinding + private lateinit var viewModel: RepositorySearchViewModel + private val adapter = + RepositoryListRecyclerViewAdapter( + object : RepositoryListRecyclerViewAdapter.OnItemClickListener { + override fun itemClick(repositoryItem: RepositoryItem) { + navigateToRepositoryFragment(repositoryItem) + } + }, + ) + override fun onViewCreated( view: View, savedInstanceState: Bundle?, ) { super.onViewCreated(view, savedInstanceState) + binding = FragmentRepositorySearchBinding.bind(view) + viewModel = RepositorySearchViewModel(requireContext()) // ViewModelの呼び出し方は後日変更する - val binding = FragmentRepositorySearchBinding.bind(view) + setupRecyclerView() + setupSearchInput() + } - val viewModel = RepositorySearchViewModel(context!!) + /** + * RecyclerViewの初期化 + */ + private fun setupRecyclerView() { + val layoutManager = LinearLayoutManager(requireContext()) + val dividerItemDecoration = DividerItemDecoration(requireContext(), layoutManager.orientation) - val layoutManager = LinearLayoutManager(context!!) - val dividerItemDecoration = - DividerItemDecoration(context!!, layoutManager.orientation) - val adapter = - CustomAdapter( - object : CustomAdapter.OnItemClickListener { - override fun itemClick(repositoryItem: RepositoryItem) { - gotoRepositoryFragment(repositoryItem) - } - }, - ) + binding.recyclerView.apply { + this.layoutManager = layoutManager + addItemDecoration(dividerItemDecoration) + adapter = this@RepositorySearchFragment.adapter + } + } - binding.searchInputText - .setOnEditorActionListener { editText, action, _ -> - if (action == EditorInfo.IME_ACTION_SEARCH) { - editText.text.toString().let { - viewModel.searchResults(it).apply { - adapter.submitList(this) - } - } - return@setOnEditorActionListener true - } - return@setOnEditorActionListener false + /** + * 検索入力のセットアップ + */ + private fun setupSearchInput() { + binding.searchInputText.setOnEditorActionListener { editText, action, _ -> + if (action == EditorInfo.IME_ACTION_SEARCH) { + val query = editText.text.toString() + performSearch(query) + true + } else { + false } + } + } - binding.recyclerView.also { - it.layoutManager = layoutManager - it.addItemDecoration(dividerItemDecoration) - it.adapter = adapter + /** + * 検索処理の実行 + */ + private fun performSearch(query: String) { + lifecycleScope.launch { + try { + val results = viewModel.fetchSearchResults(query) + adapter.submitList(results) + } catch (e: Exception) { + // エラー処理を追加（例: ログの表示やUIへの通知） + } } } - fun gotoRepositoryFragment(repositoryItem: RepositoryItem) { + /** + * リポジトリ詳細画面への遷移 + */ + private fun navigateToRepositoryFragment(repositoryItem: RepositoryItem) { val action = RepositorySearchFragmentDirections .actionRepositoriesFragmentToRepositoryFragment(item = repositoryItem) findNavController().navigate(action) } } - -val diff_util = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldRepositoryItem: RepositoryItem, - newRepositoryItem: RepositoryItem, - ): Boolean { - return oldRepositoryItem.name == newRepositoryItem.name - } - - override fun areContentsTheSame( - oldRepositoryItem: RepositoryItem, - newRepositoryItem: RepositoryItem, - ): Boolean { - return oldRepositoryItem == newRepositoryItem - } - } - -class CustomAdapter( - private val itemClickListener: OnItemClickListener, -) : ListAdapter(diff_util) { - class ViewHolder(view: View) : RecyclerView.ViewHolder(view) - - interface OnItemClickListener { - fun itemClick(repositoryItem: RepositoryItem) - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int, - ): ViewHolder { - val view = - LayoutInflater.from(parent.context) - .inflate(R.layout.layout_item, parent, false) - return ViewHolder(view) - } - - override fun onBindViewHolder( - holder: ViewHolder, - position: Int, - ) { - val item = getItem(position) - (holder.itemView.findViewById(R.id.repositoryNameView) as TextView).text = - item.name - - holder.itemView.setOnClickListener { - itemClickListener.itemClick(item) - } - } -} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index c452b06..970b9bd 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,90 +1,83 @@ -/* - * Copyright © 2021 YUMEMI Inc. All rights reserved. - */ package jp.co.yumemi.android.code_check import android.content.Context -import android.os.Parcelable import androidx.lifecycle.ViewModel import io.ktor.client.HttpClient -import io.ktor.client.call.receive import io.ktor.client.engine.android.Android import io.ktor.client.request.get import io.ktor.client.request.header import io.ktor.client.request.parameter import io.ktor.client.statement.HttpResponse +import io.ktor.client.statement.readText import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.async -import kotlinx.coroutines.runBlocking -import kotlinx.parcelize.Parcelize +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.json.JSONArray import org.json.JSONObject import java.util.Date /** - * TwoFragment で使う + * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ class RepositorySearchViewModel( - val context: Context, + private val context: Context, ) : ViewModel() { - // 検索結果 - fun searchResults(inputText: String): List = - runBlocking { - val client = HttpClient(Android) - - return@runBlocking GlobalScope.async { - val response: HttpResponse = - client?.get("https://api.github.com/search/repositories") { - header("Accept", "application/vnd.github.v3+json") - parameter("q", inputText) - } + /** + * GitHub APIを利用して検索結果を取得します。 + * + * @param inputText 検索クエリ + * @return RepositoryItemのリスト + */ + suspend fun fetchSearchResults(inputText: String): List { + val client = HttpClient(Android) - val jsonBody = JSONObject(response.receive()) - - val jsonItems = jsonBody.optJSONArray("items")!! + return withContext(Dispatchers.IO) { + // APIリクエストを送信 + val response: HttpResponse = + client.get("https://api.github.com/search/repositories") { + header("Accept", "application/vnd.github.v3+json") + parameter("q", inputText) + } - val repositoryItems = mutableListOf() + // レスポンスをJSONとしてパース + val jsonBody = JSONObject(response.readText()) + val jsonItems = jsonBody.optJSONArray("items") ?: return@withContext emptyList() - /** - * アイテムの個数分ループする - */ - for (i in 0 until jsonItems.length()) { - val jsonItem = jsonItems.optJSONObject(i)!! - val name = jsonItem.optString("full_name") - val ownerIconUrl = jsonItem.optJSONObject("owner")!!.optString("avatar_url") - val language = jsonItem.optString("language") - val stargazersCount = jsonItem.optLong("stargazers_count") - val watchersCount = jsonItem.optLong("watchers_count") - val forksCount = jsonItem.optLong("forks_conut") - val openIssuesCount = jsonItem.optLong("open_issues_count") + // JSON配列をリストに変換 + parseRepositoryItems(jsonItems) + } + } - repositoryItems.add( - RepositoryItem( - name = name, - ownerIconUrl = ownerIconUrl, - language = context.getString(R.string.written_language, language), - stargazersCount = stargazersCount, - watchersCount = watchersCount, - forksCount = forksCount, - openIssuesCount = openIssuesCount, - ), - ) - } + /** + * JSON配列をRepositoryItemのリストに変換します。 + * + * @param jsonItems JSON配列 + * @return RepositoryItemのリスト + */ + private fun parseRepositoryItems(jsonItems: JSONArray): List { + return (0 until jsonItems.length()).mapNotNull { index -> + val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null - lastSearchDate = Date() + val name = jsonItem.optString("full_name") + val ownerIconUrl = jsonItem.optJSONObject("owner")?.optString("avatar_url") ?: "" + val language = jsonItem.optString("language") + val stargazersCount = jsonItem.optLong("stargazers_count") + val watchersCount = jsonItem.optLong("watchers_count") + val forksCount = jsonItem.optLong("forks_count") + val openIssuesCount = jsonItem.optLong("open_issues_count") - return@async repositoryItems.toList() - }.await() + RepositoryItem( + name = name, + ownerIconUrl = ownerIconUrl, + language = context.getString(R.string.written_language, language), + stargazersCount = stargazersCount, + watchersCount = watchersCount, + forksCount = forksCount, + openIssuesCount = openIssuesCount, + ) + }.also { + // 最終検索日時を更新 + lastSearchDate = Date() } + } } - -@Parcelize -data class RepositoryItem( - val name: String, - val ownerIconUrl: String, - val language: String, - val stargazersCount: Long, - val watchersCount: Long, - val forksCount: Long, - val openIssuesCount: Long, -) : Parcelable From 3dbef593c45530656ff54feacc5890b31b459025 Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 21:56:41 +0900 Subject: [PATCH 010/108] =?UTF-8?q?add:=20Readme=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E8=A8=98=E8=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8f9577..20eed08 100644 --- a/README.md +++ b/README.md @@ -12,16 +12,33 @@ ### 環境 -- IDE：Android Studio Flamingo | 2022.2.1 Patch 2 +- IDE：Android Studio Ladybug | 2024.2.1 Patch 3 - Kotlin：1.6.21 - Java：17 -- Gradle：8.0 +- Gradle：8.9 - minSdk：23 - targetSdk：31 ※ ライブラリの利用はオープンソースのものに限ります。 ※ 環境は適宜更新してください。 +### linterについて + +このプロジェクトはktlintを用いて静的コード解析を行なっている。 + +ルールとして、パッケージ名に"_"を使うのは許可するものとしている。 +理由としては、コーディングテストのパッケージ名が変わってしまうとアプリとして別物となってしまい、 +リファクタリングの趣旨としてそぐわないと判断したため + +コードは以下の二つがある適宜PRを出す前にチェックをすること。 +```bash +# 自動でフォーマットをかける + ./gradlew ktlintFormat + +# コードのルール違反をチェックする +./gradlew ktlintCheck +``` + ### 動作 1. 何かしらのキーワードを入力 From dd27cefcb2893d888c9a04243a70c927adf9632b Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 22:50:33 +0900 Subject: [PATCH 011/108] =?UTF-8?q?update:=20GitHubActions=E3=81=AEcheckou?= =?UTF-8?q?t=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=92=E4=B8=8A=E3=81=92=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check_workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_workflow.yaml b/.github/workflows/check_workflow.yaml index 265d3fb..ede563e 100644 --- a/.github/workflows/check_workflow.yaml +++ b/.github/workflows/check_workflow.yaml @@ -4,7 +4,7 @@ jobs: gradle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Gradle uses: gradle/gradle-build-action@v2 From 2f8a0506004271335049bb3b744df3abc2b7538b Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 23:01:17 +0900 Subject: [PATCH 012/108] =?UTF-8?q?fix:=20=E3=83=90=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E3=81=AE=E3=83=A1=E3=83=A2?= =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=AF=E3=81=AE=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=80=A7=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yumemi/android/code_check/RepositoryDetailFragment.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index b657d79..14a12ac 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -38,4 +38,9 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { _binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) _binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) } + + override fun onDestroyView() { + super.onDestroyView() + binding = null + } } From 3a4d3b0dec28b3475b2a35fc28eec2b48eef9cb5 Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 23:09:17 +0900 Subject: [PATCH 013/108] =?UTF-8?q?fix:=20HttpClient=E3=81=AE=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=82=92=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/code_check/RepositorySearchViewModel.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 970b9bd..9002faf 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -22,6 +22,13 @@ import java.util.Date class RepositorySearchViewModel( private val context: Context, ) : ViewModel() { + private val client = HttpClient(Android) + + override fun onCleared() { + super.onCleared() + client.close() + } + /** * GitHub APIを利用して検索結果を取得します。 * @@ -29,8 +36,6 @@ class RepositorySearchViewModel( * @return RepositoryItemのリスト */ suspend fun fetchSearchResults(inputText: String): List { - val client = HttpClient(Android) - return withContext(Dispatchers.IO) { // APIリクエストを送信 val response: HttpResponse = From d12b86b9afd3f28d35381d6fd3495b07af44230f Mon Sep 17 00:00:00 2001 From: harutiro Date: Wed, 8 Jan 2025 23:43:57 +0900 Subject: [PATCH 014/108] =?UTF-8?q?fix:=20lateinit=20=E3=82=92=E3=82=84?= =?UTF-8?q?=E3=82=81=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=82=92=E3=81=97=E3=81=9F=E3=80=82=E3=81=BE=E3=81=9F=E3=80=81?= =?UTF-8?q?ViewModel=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97=E6=96=B9?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchFragment.kt | 19 +++++++++++++------ .../code_check/RepositorySearchViewModel.kt | 9 +++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index 93f7e28..e687d5b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -7,16 +7,23 @@ import android.os.Bundle import android.view.View import android.view.inputmethod.EditorInfo import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager +import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding import kotlinx.coroutines.launch class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { - private lateinit var binding: FragmentRepositorySearchBinding - private lateinit var viewModel: RepositorySearchViewModel + + private var binding: FragmentRepositorySearchBinding? = null + private val _binding get() = binding!! + + private var viewModel: RepositorySearchViewModel? = null + private val _viewModel get() = viewModel!! + private val adapter = RepositoryListRecyclerViewAdapter( object : RepositoryListRecyclerViewAdapter.OnItemClickListener { @@ -32,7 +39,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { ) { super.onViewCreated(view, savedInstanceState) binding = FragmentRepositorySearchBinding.bind(view) - viewModel = RepositorySearchViewModel(requireContext()) // ViewModelの呼び出し方は後日変更する + viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] setupRecyclerView() setupSearchInput() @@ -45,7 +52,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { val layoutManager = LinearLayoutManager(requireContext()) val dividerItemDecoration = DividerItemDecoration(requireContext(), layoutManager.orientation) - binding.recyclerView.apply { + _binding.recyclerView.apply { this.layoutManager = layoutManager addItemDecoration(dividerItemDecoration) adapter = this@RepositorySearchFragment.adapter @@ -56,7 +63,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { * 検索入力のセットアップ */ private fun setupSearchInput() { - binding.searchInputText.setOnEditorActionListener { editText, action, _ -> + _binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { val query = editText.text.toString() performSearch(query) @@ -73,7 +80,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun performSearch(query: String) { lifecycleScope.launch { try { - val results = viewModel.fetchSearchResults(query) + val results = _viewModel.fetchSearchResults(query) adapter.submitList(results) } catch (e: Exception) { // エラー処理を追加（例: ログの表示やUIへの通知） diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 9002faf..4482b58 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,6 +1,8 @@ package jp.co.yumemi.android.code_check +import android.app.Application import android.content.Context +import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.ViewModel import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android @@ -19,9 +21,8 @@ import java.util.Date /** * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ -class RepositorySearchViewModel( - private val context: Context, -) : ViewModel() { +class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { + private val client = HttpClient(Android) override fun onCleared() { @@ -74,7 +75,7 @@ class RepositorySearchViewModel( RepositoryItem( name = name, ownerIconUrl = ownerIconUrl, - language = context.getString(R.string.written_language, language), + language = getApplication().getString(R.string.written_language, language), stargazersCount = stargazersCount, watchersCount = watchersCount, forksCount = forksCount, From a85c5872068069ebbe39fdd3a570d0b4c96450ed Mon Sep 17 00:00:00 2001 From: harutiro Date: Thu, 9 Jan 2025 00:05:25 +0900 Subject: [PATCH 015/108] =?UTF-8?q?fix:=20null=E3=81=AB=E3=81=BE=E3=81=A4?= =?UTF-8?q?=E3=82=8F=E3=82=8B=E5=AE=89=E5=85=A8=E6=80=A7=E3=82=92=E7=89=B9?= =?UTF-8?q?=E3=81=AB=E8=80=83=E3=81=88=E3=81=A6=E8=A1=8C=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositoryDetailFragment.kt | 27 +++++++------- .../RepositoryListRecyclerViewAdapter.kt | 22 ++++++++++-- .../code_check/RepositorySearchFragment.kt | 36 ++++++++++--------- .../code_check/RepositorySearchViewModel.kt | 21 ++++++----- 4 files changed, 63 insertions(+), 43 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index 14a12ac..eb4c47d 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -15,8 +15,8 @@ import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBindi class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { private val args: RepositoryDetailFragmentArgs by navArgs() - private var binding: FragmentRepositoryDetailBinding? = null - private val _binding get() = binding!! + private var _binding: FragmentRepositoryDetailBinding? = null + private val binding get() = _binding ?: throw IllegalStateException("Binding is null") override fun onViewCreated( view: View, @@ -26,21 +26,24 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { Log.d("検索した日時", lastSearchDate.toString()) - binding = FragmentRepositoryDetailBinding.bind(view) + _binding = FragmentRepositoryDetailBinding.bind(view) - var item = args.item + val item = args.item + bindViews(item) + } - _binding.ownerIconView.load(item.ownerIconUrl) - _binding.nameView.text = item.name - _binding.languageView.text = item.language - _binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) - _binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) - _binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) - _binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) + private fun bindViews(item: RepositoryItem) { + binding.ownerIconView.load(item.ownerIconUrl) + binding.nameView.text = item.name + binding.languageView.text = item.language + binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) + binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) + binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) + binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) } override fun onDestroyView() { super.onDestroyView() - binding = null + _binding = null } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt index 6d74fa8..c4a9d43 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt @@ -34,7 +34,20 @@ private val diffUtilCallback = class RepositoryListRecyclerViewAdapter( private val itemClickListener: OnItemClickListener, ) : ListAdapter(diffUtilCallback) { - class ViewHolder(view: View) : RecyclerView.ViewHolder(view) + class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { + private val repositoryNameView: TextView? = view.findViewById(R.id.repositoryNameView) + + /** + * ビューにデータをバインド + */ + fun bind( + item: RepositoryItem, + clickListener: OnItemClickListener, + ) { + repositoryNameView?.text = item.name + itemView.setOnClickListener { clickListener.itemClick(item) } + } + } interface OnItemClickListener { fun itemClick(repositoryItem: RepositoryItem) @@ -55,7 +68,10 @@ class RepositoryListRecyclerViewAdapter( position: Int, ) { val item = getItem(position) - holder.itemView.findViewById(R.id.repositoryNameView).text = item.name - holder.itemView.setOnClickListener { itemClickListener.itemClick(item) } + if (item != null) { + holder.bind(item, itemClickListener) + } else { + // アイテムがnullの場合の処理（必要なら追加） + } } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index e687d5b..dfd9ed5 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -1,6 +1,3 @@ -/* - * Copyright © 2021 YUMEMI Inc. All rights reserved. - */ package jp.co.yumemi.android.code_check import android.os.Bundle @@ -12,19 +9,16 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding import kotlinx.coroutines.launch class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { + private var _binding: FragmentRepositorySearchBinding? = null + private val binding get() = _binding ?: throw IllegalStateException("Binding is null") - private var binding: FragmentRepositorySearchBinding? = null - private val _binding get() = binding!! + private lateinit var viewModel: RepositorySearchViewModel - private var viewModel: RepositorySearchViewModel? = null - private val _viewModel get() = viewModel!! - - private val adapter = + private val adapter by lazy { RepositoryListRecyclerViewAdapter( object : RepositoryListRecyclerViewAdapter.OnItemClickListener { override fun itemClick(repositoryItem: RepositoryItem) { @@ -32,19 +26,25 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } }, ) + } override fun onViewCreated( view: View, savedInstanceState: Bundle?, ) { super.onViewCreated(view, savedInstanceState) - binding = FragmentRepositorySearchBinding.bind(view) + _binding = FragmentRepositorySearchBinding.bind(view) viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] setupRecyclerView() setupSearchInput() } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + /** * RecyclerViewの初期化 */ @@ -52,7 +52,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { val layoutManager = LinearLayoutManager(requireContext()) val dividerItemDecoration = DividerItemDecoration(requireContext(), layoutManager.orientation) - _binding.recyclerView.apply { + binding.recyclerView.apply { this.layoutManager = layoutManager addItemDecoration(dividerItemDecoration) adapter = this@RepositorySearchFragment.adapter @@ -63,10 +63,12 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { * 検索入力のセットアップ */ private fun setupSearchInput() { - _binding.searchInputText.setOnEditorActionListener { editText, action, _ -> + binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { - val query = editText.text.toString() - performSearch(query) + val query = editText.text.toString().trim() + if (query.isNotEmpty()) { + performSearch(query) + } true } else { false @@ -80,10 +82,10 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun performSearch(query: String) { lifecycleScope.launch { try { - val results = _viewModel.fetchSearchResults(query) + val results = viewModel.fetchSearchResults(query) adapter.submitList(results) } catch (e: Exception) { - // エラー処理を追加（例: ログの表示やUIへの通知） + // エラー処理を実装 (例: ユーザー通知) } } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 4482b58..2189350 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,9 +1,7 @@ package jp.co.yumemi.android.code_check import android.app.Application -import android.content.Context import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.ViewModel import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android import io.ktor.client.request.get @@ -22,8 +20,7 @@ import java.util.Date * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { - - private val client = HttpClient(Android) + private val client by lazy { HttpClient(Android) } override fun onCleared() { super.onCleared() @@ -61,21 +58,23 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app * @return RepositoryItemのリスト */ private fun parseRepositoryItems(jsonItems: JSONArray): List { + val applicationContext = getApplication().applicationContext + return (0 until jsonItems.length()).mapNotNull { index -> val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null - val name = jsonItem.optString("full_name") + val name = jsonItem.optString("full_name", "Unknown") val ownerIconUrl = jsonItem.optJSONObject("owner")?.optString("avatar_url") ?: "" - val language = jsonItem.optString("language") - val stargazersCount = jsonItem.optLong("stargazers_count") - val watchersCount = jsonItem.optLong("watchers_count") - val forksCount = jsonItem.optLong("forks_count") - val openIssuesCount = jsonItem.optLong("open_issues_count") + val language = jsonItem.optString("language", "Unknown") + val stargazersCount = jsonItem.optLong("stargazers_count", 0) + val watchersCount = jsonItem.optLong("watchers_count", 0) + val forksCount = jsonItem.optLong("forks_count", 0) + val openIssuesCount = jsonItem.optLong("open_issues_count", 0) RepositoryItem( name = name, ownerIconUrl = ownerIconUrl, - language = getApplication().getString(R.string.written_language, language), + language = applicationContext.getString(R.string.written_language, language), stargazersCount = stargazersCount, watchersCount = watchersCount, forksCount = forksCount, From c6010ef0222fcc5381bdf85261c35cf9548f1f30 Mon Sep 17 00:00:00 2001 From: harutiro Date: Thu, 9 Jan 2025 00:15:21 +0900 Subject: [PATCH 016/108] =?UTF-8?q?fix:=20=E4=B8=8D=E8=A6=81=E3=81=AAnull?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositoryListRecyclerViewAdapter.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt index c4a9d43..ef587e4 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt @@ -67,11 +67,6 @@ class RepositoryListRecyclerViewAdapter( holder: ViewHolder, position: Int, ) { - val item = getItem(position) - if (item != null) { - holder.bind(item, itemClickListener) - } else { - // アイテムがnullの場合の処理（必要なら追加） - } + holder.bind(getItem(position), itemClickListener) } } From 62db3961697483c1693af04819244329d953c0f7 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 01:33:28 +0900 Subject: [PATCH 017/108] =?UTF-8?q?ref:=20=20binding=E3=82=92=E3=83=A1?= =?UTF-8?q?=E3=83=A2=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=AF=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchFragment.kt | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index 93f7e28..0cd9319 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -4,9 +4,11 @@ package jp.co.yumemi.android.code_check import android.os.Bundle +import android.util.Log import android.view.View import android.view.inputmethod.EditorInfo import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration @@ -15,7 +17,9 @@ import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBindi import kotlinx.coroutines.launch class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { - private lateinit var binding: FragmentRepositorySearchBinding + private var _binding: FragmentRepositorySearchBinding? = null + private val binding get() = _binding ?: throw IllegalStateException("Binding is null") + private lateinit var viewModel: RepositorySearchViewModel private val adapter = RepositoryListRecyclerViewAdapter( @@ -31,13 +35,19 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { savedInstanceState: Bundle?, ) { super.onViewCreated(view, savedInstanceState) - binding = FragmentRepositorySearchBinding.bind(view) - viewModel = RepositorySearchViewModel(requireContext()) // ViewModelの呼び出し方は後日変更する + _binding = FragmentRepositorySearchBinding.bind(view) + viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] setupRecyclerView() setupSearchInput() } + override fun onDestroyView() { + super.onDestroyView() + binding.recyclerView.adapter = null + _binding = null + } + /** * RecyclerViewの初期化 */ @@ -81,6 +91,18 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } } + private fun viewErrorText( + message: String + ) { + binding.errorTextView.isEnabled = true + binding.errorTextView.text = message + } + + private fun hideErrorText() { + binding.errorTextView.isEnabled = false + binding.errorTextView.text = "" + } + /** * リポジトリ詳細画面への遷移 */ From 8ded310008449cff3535d4b259f7dc62fc719613 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 01:34:41 +0900 Subject: [PATCH 018/108] =?UTF-8?q?ref:=20=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchFragment.kt | 16 ++++++++++++---- .../res/layout/fragment_repository_search.xml | 12 +++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index 0cd9319..b4ba00a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -21,7 +21,8 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private val binding get() = _binding ?: throw IllegalStateException("Binding is null") private lateinit var viewModel: RepositorySearchViewModel - private val adapter = + + private val adapter by lazy { RepositoryListRecyclerViewAdapter( object : RepositoryListRecyclerViewAdapter.OnItemClickListener { override fun itemClick(repositoryItem: RepositoryItem) { @@ -29,6 +30,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } }, ) + } override fun onViewCreated( view: View, @@ -40,6 +42,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { setupRecyclerView() setupSearchInput() + hideErrorText() } override fun onDestroyView() { @@ -68,8 +71,10 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun setupSearchInput() { binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { - val query = editText.text.toString() - performSearch(query) + val query = editText.text.toString().trim() + if (query.isNotEmpty()) { + performSearch(query) + } true } else { false @@ -83,10 +88,13 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun performSearch(query: String) { lifecycleScope.launch { try { + hideErrorText() val results = viewModel.fetchSearchResults(query) adapter.submitList(results) } catch (e: Exception) { - // エラー処理を追加（例: ログの表示やUIへの通知） + Log.e("RepositorySearchFragment", "Search failed: $e") + // ユーザー通知 + viewErrorText("検索を行えませんでした。") } } } diff --git a/app/src/main/res/layout/fragment_repository_search.xml b/app/src/main/res/layout/fragment_repository_search.xml index 0f60d37..346ef5d 100644 --- a/app/src/main/res/layout/fragment_repository_search.xml +++ b/app/src/main/res/layout/fragment_repository_search.xml @@ -55,6 +55,16 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/searchBar" /> + app:layout_constraintTop_toBottomOf="@+id/error_text_view" /> + + \ No newline at end of file From 2574a2a76c3832b929071915152a545bac037ccd Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 01:42:55 +0900 Subject: [PATCH 019/108] =?UTF-8?q?ref:=20http=20client=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchViewModel.kt | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 9002faf..99443a1 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,6 +1,7 @@ package jp.co.yumemi.android.code_check import android.content.Context +import android.util.Log import androidx.lifecycle.ViewModel import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android @@ -13,6 +14,7 @@ import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.json.JSONArray +import org.json.JSONException import org.json.JSONObject import java.util.Date @@ -22,7 +24,12 @@ import java.util.Date class RepositorySearchViewModel( private val context: Context, ) : ViewModel() { - private val client = HttpClient(Android) + private val client = HttpClient(Android) { + engine { + connectTimeout = 10_000 + socketTimeout = 10_000 + } + } override fun onCleared() { super.onCleared() @@ -38,18 +45,25 @@ class RepositorySearchViewModel( suspend fun fetchSearchResults(inputText: String): List { return withContext(Dispatchers.IO) { // APIリクエストを送信 - val response: HttpResponse = - client.get("https://api.github.com/search/repositories") { + try { + val response: HttpResponse = client.get("https://api.github.com/search/repositories") { header("Accept", "application/vnd.github.v3+json") parameter("q", inputText) } - // レスポンスをJSONとしてパース - val jsonBody = JSONObject(response.readText()) - val jsonItems = jsonBody.optJSONArray("items") ?: return@withContext emptyList() + // レスポンスをJSONとしてパース + val jsonBody = JSONObject(response.readText()) + val jsonItems = jsonBody.optJSONArray("items") ?: return@withContext emptyList() - // JSON配列をリストに変換 - parseRepositoryItems(jsonItems) + // JSON配列をリストに変換 + parseRepositoryItems(jsonItems) + } catch (e: JSONException) { + Log.e("RepositorySearchViewModel", "JSON parsing error: $e") + emptyList() + } catch (e: Exception) { + Log.e("RepositorySearchViewModel", "Network request failed: $e") + emptyList() + } } } From 8e49b53e2c799af7b097e1c87e748553b0c1d17e Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 01:55:32 +0900 Subject: [PATCH 020/108] =?UTF-8?q?ref:=20viewModel=E3=81=A7=E3=81=AEConte?= =?UTF-8?q?xt=E3=81=AE=E4=BD=BF=E7=94=A8=E6=96=B9=E6=B3=95=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchFragment.kt | 5 ++++- .../code_check/RepositorySearchViewModel.kt | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index b4ba00a..da97d36 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -38,7 +38,10 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { ) { super.onViewCreated(view, savedInstanceState) _binding = FragmentRepositorySearchBinding.bind(view) - viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] + viewModel = ViewModelProvider( + this, + ViewModelProvider.AndroidViewModelFactory(requireActivity().application) + )[RepositorySearchViewModel::class.java] setupRecyclerView() setupSearchInput() diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 99443a1..abc4ff5 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,8 +1,8 @@ package jp.co.yumemi.android.code_check -import android.content.Context +import android.app.Application import android.util.Log -import androidx.lifecycle.ViewModel +import androidx.lifecycle.AndroidViewModel import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android import io.ktor.client.request.get @@ -10,20 +10,18 @@ import io.ktor.client.request.header import io.ktor.client.request.parameter import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.readText -import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.json.JSONArray import org.json.JSONException import org.json.JSONObject -import java.util.Date /** * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ -class RepositorySearchViewModel( - private val context: Context, -) : ViewModel() { +class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { + private val appContext = application + private val client = HttpClient(Android) { engine { connectTimeout = 10_000 @@ -73,7 +71,9 @@ class RepositorySearchViewModel( * @param jsonItems JSON配列 * @return RepositoryItemのリスト */ - private fun parseRepositoryItems(jsonItems: JSONArray): List { + private fun parseRepositoryItems( + jsonItems: JSONArray, + ): List { return (0 until jsonItems.length()).mapNotNull { index -> val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null @@ -88,7 +88,7 @@ class RepositorySearchViewModel( RepositoryItem( name = name, ownerIconUrl = ownerIconUrl, - language = context.getString(R.string.written_language, language), + language = if (language.isNullOrEmpty()) "Unknown" else appContext.getString(R.string.written_language, language), stargazersCount = stargazersCount, watchersCount = watchersCount, forksCount = forksCount, From a4e18126c60dda7fdb7583173031893509f13add Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 01:55:59 +0900 Subject: [PATCH 021/108] =?UTF-8?q?ref:=20lastSearchDate=E3=82=92Log?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=8B=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=AE=E3=81=A7=E3=80=81=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositoryDetailFragment.kt | 25 ++++++++----------- .../code_check/RepositorySearchViewModel.kt | 3 --- .../yumemi/android/code_check/TopActivity.kt | 5 +--- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index 14a12ac..7ba3c31 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -9,14 +9,13 @@ import android.view.View import androidx.fragment.app.Fragment import androidx.navigation.fragment.navArgs import coil.load -import jp.co.yumemi.android.code_check.TopActivity.Companion.lastSearchDate import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { private val args: RepositoryDetailFragmentArgs by navArgs() - private var binding: FragmentRepositoryDetailBinding? = null - private val _binding get() = binding!! + private var _binding: FragmentRepositoryDetailBinding? = null + private val binding get() = _binding!! override fun onViewCreated( view: View, @@ -24,23 +23,21 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { ) { super.onViewCreated(view, savedInstanceState) - Log.d("検索した日時", lastSearchDate.toString()) - - binding = FragmentRepositoryDetailBinding.bind(view) + _binding = FragmentRepositoryDetailBinding.bind(view) var item = args.item - _binding.ownerIconView.load(item.ownerIconUrl) - _binding.nameView.text = item.name - _binding.languageView.text = item.language - _binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) - _binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) - _binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) - _binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) + binding.ownerIconView.load(item.ownerIconUrl) + binding.nameView.text = item.name + binding.languageView.text = item.language + binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) + binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) + binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) + binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) } override fun onDestroyView() { super.onDestroyView() - binding = null + _binding = null } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index abc4ff5..5e098e5 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -94,9 +94,6 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app forksCount = forksCount, openIssuesCount = openIssuesCount, ) - }.also { - // 最終検索日時を更新 - lastSearchDate = Date() } } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt index 83cd1a4..48a67ec 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt @@ -4,10 +4,7 @@ package jp.co.yumemi.android.code_check import androidx.appcompat.app.AppCompatActivity -import java.util.Date class TopActivity : AppCompatActivity(R.layout.activity_top) { - companion object { - lateinit var lastSearchDate: Date - } + } From 02ec6eeb67b351b62b47e4e92d1ed42842a652dc Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 02:20:46 +0900 Subject: [PATCH 022/108] =?UTF-8?q?ref:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=E6=96=B9=E6=B3=95=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchFragment.kt | 28 ++++++++++--------- .../code_check/RepositorySearchViewModel.kt | 10 +++++-- .../res/layout/fragment_repository_search.xml | 10 ------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index da97d36..00186dd 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -3,6 +3,7 @@ */ package jp.co.yumemi.android.code_check +import android.app.AlertDialog import android.os.Bundle import android.util.Log import android.view.View @@ -43,9 +44,15 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { ViewModelProvider.AndroidViewModelFactory(requireActivity().application) )[RepositorySearchViewModel::class.java] + // エラーメッセージを監視 + viewModel.errorMessage.observe(viewLifecycleOwner) { error -> + error?.let { + showErrorDialog(it) // 必要に応じてダイアログやToastを表示 + } + } + setupRecyclerView() setupSearchInput() - hideErrorText() } override fun onDestroyView() { @@ -91,27 +98,22 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun performSearch(query: String) { lifecycleScope.launch { try { - hideErrorText() val results = viewModel.fetchSearchResults(query) adapter.submitList(results) } catch (e: Exception) { Log.e("RepositorySearchFragment", "Search failed: $e") // ユーザー通知 - viewErrorText("検索を行えませんでした。") + showErrorDialog("検索に失敗しました。") } } } - private fun viewErrorText( - message: String - ) { - binding.errorTextView.isEnabled = true - binding.errorTextView.text = message - } - - private fun hideErrorText() { - binding.errorTextView.isEnabled = false - binding.errorTextView.text = "" + private fun showErrorDialog(message: String) { + AlertDialog.Builder(requireContext()) + .setTitle("エラー") + .setMessage(message) + .setPositiveButton("OK", null) + .show() } /** diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 5e098e5..1e20ea2 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,8 +1,9 @@ package jp.co.yumemi.android.code_check import android.app.Application -import android.util.Log import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android import io.ktor.client.request.get @@ -22,6 +23,9 @@ import org.json.JSONObject class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { private val appContext = application + private val _errorMessage = MutableLiveData() + val errorMessage: LiveData get() = _errorMessage + private val client = HttpClient(Android) { engine { connectTimeout = 10_000 @@ -56,10 +60,10 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app // JSON配列をリストに変換 parseRepositoryItems(jsonItems) } catch (e: JSONException) { - Log.e("RepositorySearchViewModel", "JSON parsing error: $e") + _errorMessage.postValue("正しいJsonの形でデータが整形できませんでした。") emptyList() } catch (e: Exception) { - Log.e("RepositorySearchViewModel", "Network request failed: $e") + _errorMessage.postValue("ネットワークに接続できませんでした。再度お試しください。") emptyList() } } diff --git a/app/src/main/res/layout/fragment_repository_search.xml b/app/src/main/res/layout/fragment_repository_search.xml index 346ef5d..4e4c6ef 100644 --- a/app/src/main/res/layout/fragment_repository_search.xml +++ b/app/src/main/res/layout/fragment_repository_search.xml @@ -55,16 +55,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/error_text_view" /> - - \ No newline at end of file From 928a0ad15afa385228bbef273ad96a5cea4569f8 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 02:20:59 +0900 Subject: [PATCH 023/108] =?UTF-8?q?ref:=20var=20=E3=82=92val=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yumemi/android/code_check/RepositoryDetailFragment.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index 7ba3c31..8950157 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -4,7 +4,6 @@ package jp.co.yumemi.android.code_check import android.os.Bundle -import android.util.Log import android.view.View import androidx.fragment.app.Fragment import androidx.navigation.fragment.navArgs @@ -25,7 +24,7 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { _binding = FragmentRepositoryDetailBinding.bind(view) - var item = args.item + val item = args.item binding.ownerIconView.load(item.ownerIconUrl) binding.nameView.text = item.name From ea36a0b67dae7901e162624d829aac55b77db345 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 02:36:30 +0900 Subject: [PATCH 024/108] =?UTF-8?q?ref:=20=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=81=AE?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchFragment.kt | 9 +++---- .../code_check/RepositorySearchViewModel.kt | 24 +++++++++---------- .../yumemi/android/code_check/TopActivity.kt | 4 +--- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index 00186dd..b31aa99 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -39,10 +39,11 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { ) { super.onViewCreated(view, savedInstanceState) _binding = FragmentRepositorySearchBinding.bind(view) - viewModel = ViewModelProvider( - this, - ViewModelProvider.AndroidViewModelFactory(requireActivity().application) - )[RepositorySearchViewModel::class.java] + viewModel = + ViewModelProvider( + this, + ViewModelProvider.AndroidViewModelFactory(requireActivity().application), + )[RepositorySearchViewModel::class.java] // エラーメッセージを監視 viewModel.errorMessage.observe(viewLifecycleOwner) { error -> diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index eef12b7..779f1dc 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -26,12 +26,13 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage - private val client = HttpClient(Android) { - engine { - connectTimeout = 10_000 - socketTimeout = 10_000 + private val client = + HttpClient(Android) { + engine { + connectTimeout = 10_000 + socketTimeout = 10_000 + } } - } override fun onCleared() { super.onCleared() @@ -48,10 +49,11 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app return withContext(Dispatchers.IO) { // APIリクエストを送信 try { - val response: HttpResponse = client.get("https://api.github.com/search/repositories") { - header("Accept", "application/vnd.github.v3+json") - parameter("q", inputText) - } + val response: HttpResponse = + client.get("https://api.github.com/search/repositories") { + header("Accept", "application/vnd.github.v3+json") + parameter("q", inputText) + } // レスポンスをJSONとしてパース val jsonBody = JSONObject(response.readText()) @@ -75,9 +77,7 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app * @param jsonItems JSON配列 * @return RepositoryItemのリスト */ - private fun parseRepositoryItems( - jsonItems: JSONArray, - ): List { + private fun parseRepositoryItems(jsonItems: JSONArray): List { return (0 until jsonItems.length()).mapNotNull { index -> val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt index 48a67ec..d6cc54e 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt @@ -5,6 +5,4 @@ package jp.co.yumemi.android.code_check import androidx.appcompat.app.AppCompatActivity -class TopActivity : AppCompatActivity(R.layout.activity_top) { - -} +class TopActivity : AppCompatActivity(R.layout.activity_top) From 3426eb3f10a3cf628d5b17b2477f14e3c2687244 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 02:44:34 +0900 Subject: [PATCH 025/108] =?UTF-8?q?fix:=20binging=E3=82=92=E3=81=9D?= =?UTF-8?q?=E3=81=AE=E3=81=BE=E3=81=BE!!=E3=81=A7=E3=82=84=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index 85c4f0c..b2f0f93 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -14,7 +14,7 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { private val args: RepositoryDetailFragmentArgs by navArgs() private var _binding: FragmentRepositoryDetailBinding? = null - private val binding get() = _binding!! + private val binding get() = _binding ?: throw IllegalStateException("Binding is null") override fun onViewCreated( view: View, From d5388624dc7ae6811fefeccbd8ae8d2ed7b475fb Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 02:46:43 +0900 Subject: [PATCH 026/108] =?UTF-8?q?fix:=20Log=E3=81=8C=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=97=E3=81=8D=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yumemi/android/code_check/RepositorySearchViewModel.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 779f1dc..04b3967 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,6 +1,7 @@ package jp.co.yumemi.android.code_check import android.app.Application +import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -26,6 +27,10 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage + companion object { + private const val TAG = "RepositorySearchVM" + } + private val client = HttpClient(Android) { engine { @@ -62,9 +67,11 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app // JSON配列をリストに変換 parseRepositoryItems(jsonItems) } catch (e: JSONException) { + Log.e(TAG, "JSON解析エラー", e) _errorMessage.postValue("正しいJsonの形でデータが整形できませんでした。") emptyList() } catch (e: Exception) { + Log.e(TAG, "ネットワークエラー", e) _errorMessage.postValue("ネットワークに接続できませんでした。再度お試しください。") emptyList() } From cd5e7d945766aecd4197601f81313a14856a22cc Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 03:14:29 +0900 Subject: [PATCH 027/108] =?UTF-8?q?ref:=20=E6=A4=9C=E7=B4=A2=E3=81=AEFragm?= =?UTF-8?q?ent=E3=82=92ViewModel=E3=81=AB=E5=86=99=E3=81=97=E3=81=A6?= =?UTF-8?q?=E8=A1=8C=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yumemi/android/code_check/DialogHelper.kt | 14 ++++ .../code_check/RepositorySearchFragment.kt | 82 +++++-------------- .../code_check/RepositorySearchViewModel.kt | 16 ++++ 3 files changed, 51 insertions(+), 61 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt new file mode 100644 index 0000000..fd71ce0 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt @@ -0,0 +1,14 @@ +package jp.co.yumemi.android.code_check + +import android.app.AlertDialog +import android.content.Context + +object DialogHelper { + fun showErrorDialog(context: Context, message: String) { + AlertDialog.Builder(context) + .setTitle("エラー") + .setMessage(message) + .setPositiveButton("OK", null) + .show() + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index b31aa99..eafc324 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -19,47 +19,36 @@ import kotlinx.coroutines.launch class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private var _binding: FragmentRepositorySearchBinding? = null - private val binding get() = _binding ?: throw IllegalStateException("Binding is null") - + private val binding get() = _binding!! private lateinit var viewModel: RepositorySearchViewModel private val adapter by lazy { RepositoryListRecyclerViewAdapter( object : RepositoryListRecyclerViewAdapter.OnItemClickListener { override fun itemClick(repositoryItem: RepositoryItem) { - navigateToRepositoryFragment(repositoryItem) + onItemClick(repositoryItem) } - }, + } ) } - override fun onViewCreated( - view: View, - savedInstanceState: Bundle?, - ) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentRepositorySearchBinding.bind(view) - viewModel = - ViewModelProvider( - this, - ViewModelProvider.AndroidViewModelFactory(requireActivity().application), - )[RepositorySearchViewModel::class.java] - - // エラーメッセージを監視 - viewModel.errorMessage.observe(viewLifecycleOwner) { error -> - error?.let { - showErrorDialog(it) // 必要に応じてダイアログやToastを表示 - } - } + viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] + observeViewModel() setupRecyclerView() setupSearchInput() } - override fun onDestroyView() { - super.onDestroyView() - binding.recyclerView.adapter = null - _binding = null + private fun observeViewModel() { + viewModel.searchResults.observe(viewLifecycleOwner) { + adapter.submitList(it) + } + viewModel.errorMessage.observe(viewLifecycleOwner) { + it?.let { DialogHelper.showErrorDialog(requireContext(), it) } + } } /** @@ -76,16 +65,10 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } } - /** - * 検索入力のセットアップ - */ private fun setupSearchInput() { binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { - val query = editText.text.toString().trim() - if (query.isNotEmpty()) { - performSearch(query) - } + viewModel.searchRepositories(editText.text.toString().trim()) true } else { false @@ -93,37 +76,14 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } } - /** - * 検索処理の実行 - */ - private fun performSearch(query: String) { - lifecycleScope.launch { - try { - val results = viewModel.fetchSearchResults(query) - adapter.submitList(results) - } catch (e: Exception) { - Log.e("RepositorySearchFragment", "Search failed: $e") - // ユーザー通知 - showErrorDialog("検索に失敗しました。") - } - } - } - - private fun showErrorDialog(message: String) { - AlertDialog.Builder(requireContext()) - .setTitle("エラー") - .setMessage(message) - .setPositiveButton("OK", null) - .show() + private fun onItemClick(item: RepositoryItem) { + val action = RepositorySearchFragmentDirections + .actionRepositoriesFragmentToRepositoryFragment(item = item) + findNavController().navigate(action) } - /** - * リポジトリ詳細画面への遷移 - */ - private fun navigateToRepositoryFragment(repositoryItem: RepositoryItem) { - val action = - RepositorySearchFragmentDirections - .actionRepositoriesFragmentToRepositoryFragment(item = repositoryItem) - findNavController().navigate(action) + override fun onDestroyView() { + super.onDestroyView() + _binding = null } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 04b3967..8eaf5d1 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -5,6 +5,7 @@ import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.viewModelScope import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android import io.ktor.client.request.get @@ -13,6 +14,7 @@ import io.ktor.client.request.parameter import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.readText import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.json.JSONArray import org.json.JSONException @@ -27,6 +29,9 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage + private val _searchResults = MutableLiveData>() + val searchResults: LiveData> get() = _searchResults + companion object { private const val TAG = "RepositorySearchVM" } @@ -107,4 +112,15 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app ) } } + + fun searchRepositories(query: String) { + viewModelScope.launch { + try { + val results = fetchSearchResults(query) + _searchResults.postValue(results) + } catch (e: Exception) { + _errorMessage.postValue("検索に失敗しました。") + } + } + } } From 92315dc6f97d55fda5f50e072cc08211e586efcf Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 03:20:38 +0900 Subject: [PATCH 028/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yumemi/android/code_check/DialogHelper.kt | 7 +++++-- .../code_check/RepositorySearchFragment.kt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt index fd71ce0..332118f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt @@ -4,11 +4,14 @@ import android.app.AlertDialog import android.content.Context object DialogHelper { - fun showErrorDialog(context: Context, message: String) { + fun showErrorDialog( + context: Context, + message: String, + ) { AlertDialog.Builder(context) .setTitle("エラー") .setMessage(message) .setPositiveButton("OK", null) .show() } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index eafc324..36cc45d 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -3,19 +3,15 @@ */ package jp.co.yumemi.android.code_check -import android.app.AlertDialog import android.os.Bundle -import android.util.Log import android.view.View import android.view.inputmethod.EditorInfo import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding -import kotlinx.coroutines.launch class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private var _binding: FragmentRepositorySearchBinding? = null @@ -28,11 +24,14 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { override fun itemClick(repositoryItem: RepositoryItem) { onItemClick(repositoryItem) } - } + }, ) } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + override fun onViewCreated( + view: View, + savedInstanceState: Bundle?, + ) { super.onViewCreated(view, savedInstanceState) _binding = FragmentRepositorySearchBinding.bind(view) viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] @@ -77,8 +76,9 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } private fun onItemClick(item: RepositoryItem) { - val action = RepositorySearchFragmentDirections - .actionRepositoriesFragmentToRepositoryFragment(item = item) + val action = + RepositorySearchFragmentDirections + .actionRepositoriesFragmentToRepositoryFragment(item = item) findNavController().navigate(action) } From 7e3e7d9073d206dce071a79ab6a6566cce4fec48 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 03:24:00 +0900 Subject: [PATCH 029/108] =?UTF-8?q?fix:=20binding=E3=82=92=E5=BC=B7?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E3=81=ABnull=E3=82=92=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E5=A4=89?= =?UTF-8?q?=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/co/yumemi/android/code_check/RepositorySearchFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index 36cc45d..cbbf6fb 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -15,7 +15,7 @@ import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBindi class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private var _binding: FragmentRepositorySearchBinding? = null - private val binding get() = _binding!! + private val binding get() = _binding ?: throw IllegalStateException("Binding is null") private lateinit var viewModel: RepositorySearchViewModel private val adapter by lazy { From efcb8596f6d35a651aaf4e2a66eb37e6c4a2013f Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 03:25:44 +0900 Subject: [PATCH 030/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E6=8F=A1=E3=82=8A=E3=81=A4=E3=81=B6=E3=81=97=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yumemi/android/code_check/RepositorySearchViewModel.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 8eaf5d1..34b8b62 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -114,11 +114,16 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app } fun searchRepositories(query: String) { + if (query.isBlank()) { + _errorMessage.postValue("検索キーワードを入力してください。") + return + } viewModelScope.launch { try { val results = fetchSearchResults(query) _searchResults.postValue(results) } catch (e: Exception) { + Log.e(TAG, "検索処理でエラーが発生しました", e) _errorMessage.postValue("検索に失敗しました。") } } From 58d17ef92824edaada05b0bceb2d4f5c24c46095 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 03:53:53 +0900 Subject: [PATCH 031/108] =?UTF-8?q?ref=20:=20ViewModel=E3=81=A7=E8=A8=98?= =?UTF-8?q?=E8=BF=B0=E3=81=97=E3=81=A6=E3=81=84=E3=81=9FHTTP=E5=91=A8?= =?UTF-8?q?=E3=82=8A=E3=81=AE=E8=A8=98=E8=BF=B0=E3=82=92=E5=88=A5=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E3=81=AB=E8=BB=A2=E8=A8=98=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/code_check/NetworkRepository.kt | 58 ++++++++++ .../code_check/RepositoryDetailFragment.kt | 2 +- .../code_check/RepositorySearchViewModel.kt | 107 ++---------------- 3 files changed, 71 insertions(+), 96 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt new file mode 100644 index 0000000..0ac0c28 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt @@ -0,0 +1,58 @@ +package jp.co.yumemi.android.code_check + +import io.ktor.client.HttpClient +import io.ktor.client.request.get +import io.ktor.client.request.header +import io.ktor.client.request.parameter +import io.ktor.client.statement.HttpResponse +import io.ktor.client.statement.readText +import org.json.JSONArray +import org.json.JSONException +import org.json.JSONObject + +class NetworkRepository(private val client: HttpClient) { + suspend fun fetchSearchResults(inputText: String): List { + try { + val response: HttpResponse = + client.get("https://api.github.com/search/repositories") { + header("Accept", "application/vnd.github.v3+json") + parameter("q", inputText) + } + + val jsonBody = JSONObject(response.readText()) + val jsonItems = jsonBody.optJSONArray("items") ?: return emptyList() + + return parseRepositoryItems(jsonItems) + } catch (e: JSONException) { + throw NetworkException("JSON解析エラー") + } catch (e: Exception) { + throw NetworkException("ネットワークエラー") + } + } + + private fun parseRepositoryItems(jsonItems: JSONArray): List { + return (0 until jsonItems.length()).mapNotNull { index -> + val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null + + val name = jsonItem.optString("full_name", "Unknown") + val ownerIconUrl = jsonItem.optJSONObject("owner")?.optString("avatar_url") ?: "" + val language = jsonItem.optString("language", "Unknown") + val stargazersCount = jsonItem.optLong("stargazers_count", 0) + val watchersCount = jsonItem.optLong("watchers_count", 0) + val forksCount = jsonItem.optLong("forks_count", 0) + val openIssuesCount = jsonItem.optLong("open_issues_count", 0) + + RepositoryItem( + name = name, + ownerIconUrl = ownerIconUrl, + language = language, + stargazersCount = stargazersCount, + watchersCount = watchersCount, + forksCount = forksCount, + openIssuesCount = openIssuesCount, + ) + } + } +} + +class NetworkException(message: String) : Exception(message) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt index b2f0f93..aee80a0 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt @@ -31,7 +31,7 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { private fun bindViews(item: RepositoryItem) { binding.ownerIconView.load(item.ownerIconUrl) binding.nameView.text = item.name - binding.languageView.text = item.language + binding.languageView.text = resources.getString(R.string.written_language, item.language) binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index 34b8b62..a8e2190 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,7 +1,6 @@ package jp.co.yumemi.android.code_check import android.app.Application -import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -9,22 +8,22 @@ import androidx.lifecycle.viewModelScope import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android import io.ktor.client.request.get -import io.ktor.client.request.header -import io.ktor.client.request.parameter -import io.ktor.client.statement.HttpResponse -import io.ktor.client.statement.readText -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import org.json.JSONArray -import org.json.JSONException -import org.json.JSONObject /** * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { private val appContext = application + private val networkRepository = + NetworkRepository( + HttpClient(Android) { + engine { + connectTimeout = 10_000 + socketTimeout = 10_000 + } + }, + ) private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage @@ -32,87 +31,6 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app private val _searchResults = MutableLiveData>() val searchResults: LiveData> get() = _searchResults - companion object { - private const val TAG = "RepositorySearchVM" - } - - private val client = - HttpClient(Android) { - engine { - connectTimeout = 10_000 - socketTimeout = 10_000 - } - } - - override fun onCleared() { - super.onCleared() - client.close() - } - - /** - * GitHub APIを利用して検索結果を取得します。 - * - * @param inputText 検索クエリ - * @return RepositoryItemのリスト - */ - suspend fun fetchSearchResults(inputText: String): List { - return withContext(Dispatchers.IO) { - // APIリクエストを送信 - try { - val response: HttpResponse = - client.get("https://api.github.com/search/repositories") { - header("Accept", "application/vnd.github.v3+json") - parameter("q", inputText) - } - - // レスポンスをJSONとしてパース - val jsonBody = JSONObject(response.readText()) - val jsonItems = jsonBody.optJSONArray("items") ?: return@withContext emptyList() - - // JSON配列をリストに変換 - parseRepositoryItems(jsonItems) - } catch (e: JSONException) { - Log.e(TAG, "JSON解析エラー", e) - _errorMessage.postValue("正しいJsonの形でデータが整形できませんでした。") - emptyList() - } catch (e: Exception) { - Log.e(TAG, "ネットワークエラー", e) - _errorMessage.postValue("ネットワークに接続できませんでした。再度お試しください。") - emptyList() - } - } - } - - /** - * JSON配列をRepositoryItemのリストに変換します。 - * - * @param jsonItems JSON配列 - * @return RepositoryItemのリスト - */ - private fun parseRepositoryItems(jsonItems: JSONArray): List { - return (0 until jsonItems.length()).mapNotNull { index -> - val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null - - val name = jsonItem.optString("full_name", "Unknown") - val ownerIconUrl = jsonItem.optJSONObject("owner")?.optString("avatar_url") ?: "" - val language = jsonItem.optString("language", "Unknown") - val stargazersCount = jsonItem.optLong("stargazers_count", 0) - val watchersCount = jsonItem.optLong("watchers_count", 0) - val forksCount = jsonItem.optLong("forks_count", 0) - val openIssuesCount = jsonItem.optLong("open_issues_count", 0) - - RepositoryItem( - name = name, - ownerIconUrl = ownerIconUrl, - language = if (language.isNullOrEmpty()) "Unknown" else appContext.getString(R.string.written_language, language), - stargazersCount = stargazersCount, - watchersCount = watchersCount, - forksCount = forksCount, - openIssuesCount = openIssuesCount, - ) - } - } - fun searchRepositories(query: String) { if (query.isBlank()) { _errorMessage.postValue("検索キーワードを入力してください。") @@ -120,11 +38,10 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app } viewModelScope.launch { try { - val results = fetchSearchResults(query) + val results = networkRepository.fetchSearchResults(query) _searchResults.postValue(results) - } catch (e: Exception) { - Log.e(TAG, "検索処理でエラーが発生しました", e) - _errorMessage.postValue("検索に失敗しました。") + } catch (e: NetworkException) { + _errorMessage.postValue(e.message) } } } From 009bc1bb8ae01651aad8b4f49ecc0d9919fda4dc Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 04:05:35 +0900 Subject: [PATCH 032/108] =?UTF-8?q?ref=20:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E5=88=86=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yumemi/android/code_check/RepositorySearchFragment.kt | 7 ++++--- .../yumemi/android/code_check/RepositorySearchViewModel.kt | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt index cbbf6fb..7cb77e9 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt @@ -50,9 +50,6 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } } - /** - * RecyclerViewの初期化 - */ private fun setupRecyclerView() { val layoutManager = LinearLayoutManager(requireContext()) val dividerItemDecoration = DividerItemDecoration(requireContext(), layoutManager.orientation) @@ -75,6 +72,10 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { } } + /** + * リポジトリ検索結果のクリックイベント + * リサイクラービューでアイテムが押された時に動作を行います。 + */ private fun onItemClick(item: RepositoryItem) { val action = RepositorySearchFragmentDirections diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index a8e2190..d3a0203 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -31,6 +31,10 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app private val _searchResults = MutableLiveData>() val searchResults: LiveData> get() = _searchResults + /** + * GitHubのレポジトリ検索を行う + * @param query 検索キーワード + */ fun searchRepositories(query: String) { if (query.isBlank()) { _errorMessage.postValue("検索キーワードを入力してください。") From 5e4abc5b369d3d52e8b9a733ec70865a5dd3741b Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 04:21:28 +0900 Subject: [PATCH 033/108] =?UTF-8?q?fix:=20HttpClient=E3=81=AE=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=95=E3=82=B5=E3=82=A4=E3=82=AF=E3=83=AB=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/co/yumemi/android/code_check/NetworkRepository.kt | 4 ++++ .../yumemi/android/code_check/RepositorySearchViewModel.kt | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt index 0ac0c28..c423c3e 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt @@ -53,6 +53,10 @@ class NetworkRepository(private val client: HttpClient) { ) } } + + fun close() { + client.close() + } } class NetworkException(message: String) : Exception(message) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index d3a0203..d634e43 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -49,4 +49,9 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app } } } + + override fun onCleared() { + super.onCleared() + networkRepository.close() + } } From 99c5793bb66fb7a4c0ddadf296052580ceb60fe7 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 04:22:23 +0900 Subject: [PATCH 034/108] =?UTF-8?q?fix:=20=E4=BE=8B=E5=A4=96=E3=81=AE?= =?UTF-8?q?=E5=86=8D=E3=82=B9=E3=83=AD=E3=83=BC=E6=99=82=E3=81=AB=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=82=92=E4=BF=9D=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/co/yumemi/android/code_check/NetworkRepository.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt index c423c3e..280901a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt @@ -24,9 +24,9 @@ class NetworkRepository(private val client: HttpClient) { return parseRepositoryItems(jsonItems) } catch (e: JSONException) { - throw NetworkException("JSON解析エラー") + throw NetworkException("JSON解析エラー", e) } catch (e: Exception) { - throw NetworkException("ネットワークエラー") + throw NetworkException("ネットワークエラー", e) } } @@ -59,4 +59,4 @@ class NetworkRepository(private val client: HttpClient) { } } -class NetworkException(message: String) : Exception(message) +class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file From 7239bc9dd2b3ee78c29ed1eae8a8e157a589255a Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 04:23:18 +0900 Subject: [PATCH 035/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt index 280901a..1d28c22 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt @@ -59,4 +59,4 @@ class NetworkRepository(private val client: HttpClient) { } } -class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file +class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) From 55999f34cc73321433b1777cd43fb730b8793c83 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:15:21 +0900 Subject: [PATCH 036/108] =?UTF-8?q?add:=20gradle=E3=81=A7retrofit=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++++++ build.gradle | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 987109c..fb3f0c1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,4 +62,10 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + // Retrofit + implementation("com.squareup.retrofit2:converter-moshi:2.9.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") + implementation("com.squareup.retrofit2:retrofit:2.11.0") + implementation("com.squareup.moshi:moshi-kotlin:1.14.0") } diff --git a/build.gradle b/build.gradle index 7567c9f..46b0b50 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.7.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" // NOTE: Do not place your application dependencies here; they belong From 9bca6cea93206e5050bb21091dd067b66781340c Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:17:36 +0900 Subject: [PATCH 037/108] =?UTF-8?q?add:=20retrofit=E3=81=A7=E3=83=AC?= =?UTF-8?q?=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=E3=82=92=E6=A4=9C=E7=B4=A2?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/code_check/NetworkRepository.kt | 62 ------------------- .../code_check/RepositorySearchViewModel.kt | 5 +- .../github/api/GitHubRepositoryApi.kt | 7 +++ .../GitHubRepositoryApiBuilderInterface.kt | 13 ++++ .../github/api/GitHubRepositoryApiImpl.kt | 43 +++++++++++++ .../github/entity/GitHubRepositoryEntity.kt | 21 +++++++ .../github/reposiotory/NetworkRepository.kt | 39 ++++++++++++ 7 files changed, 127 insertions(+), 63 deletions(-) delete mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubRepositoryEntity.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt deleted file mode 100644 index 1d28c22..0000000 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/NetworkRepository.kt +++ /dev/null @@ -1,62 +0,0 @@ -package jp.co.yumemi.android.code_check - -import io.ktor.client.HttpClient -import io.ktor.client.request.get -import io.ktor.client.request.header -import io.ktor.client.request.parameter -import io.ktor.client.statement.HttpResponse -import io.ktor.client.statement.readText -import org.json.JSONArray -import org.json.JSONException -import org.json.JSONObject - -class NetworkRepository(private val client: HttpClient) { - suspend fun fetchSearchResults(inputText: String): List { - try { - val response: HttpResponse = - client.get("https://api.github.com/search/repositories") { - header("Accept", "application/vnd.github.v3+json") - parameter("q", inputText) - } - - val jsonBody = JSONObject(response.readText()) - val jsonItems = jsonBody.optJSONArray("items") ?: return emptyList() - - return parseRepositoryItems(jsonItems) - } catch (e: JSONException) { - throw NetworkException("JSON解析エラー", e) - } catch (e: Exception) { - throw NetworkException("ネットワークエラー", e) - } - } - - private fun parseRepositoryItems(jsonItems: JSONArray): List { - return (0 until jsonItems.length()).mapNotNull { index -> - val jsonItem = jsonItems.optJSONObject(index) ?: return@mapNotNull null - - val name = jsonItem.optString("full_name", "Unknown") - val ownerIconUrl = jsonItem.optJSONObject("owner")?.optString("avatar_url") ?: "" - val language = jsonItem.optString("language", "Unknown") - val stargazersCount = jsonItem.optLong("stargazers_count", 0) - val watchersCount = jsonItem.optLong("watchers_count", 0) - val forksCount = jsonItem.optLong("forks_count", 0) - val openIssuesCount = jsonItem.optLong("open_issues_count", 0) - - RepositoryItem( - name = name, - ownerIconUrl = ownerIconUrl, - language = language, - stargazersCount = stargazersCount, - watchersCount = watchersCount, - forksCount = forksCount, - openIssuesCount = openIssuesCount, - ) - } - } - - fun close() { - client.close() - } -} - -class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index d634e43..cfe4542 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -1,13 +1,15 @@ package jp.co.yumemi.android.code_check import android.app.Application +import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android -import io.ktor.client.request.get +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkRepository import kotlinx.coroutines.launch /** @@ -45,6 +47,7 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app val results = networkRepository.fetchSearchResults(query) _searchResults.postValue(results) } catch (e: NetworkException) { + Log.e("NetworkException", e.message, e) _errorMessage.postValue(e.message) } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt new file mode 100644 index 0000000..4066a49 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt @@ -0,0 +1,7 @@ +package jp.co.yumemi.android.code_check.features.github.api + +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList + +interface GitHubRepositoryApi { + suspend fun getRepository(searchWord: String): RepositoryList +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt new file mode 100644 index 0000000..a63ec4f --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt @@ -0,0 +1,13 @@ +package jp.co.yumemi.android.code_check.features.github.api + +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Query + +interface GitHubRepositoryApiBuilderInterface { + @GET("/search/repositories") + suspend fun getRepository( + @Query("q") searchWord: String, + ): Response +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt new file mode 100644 index 0000000..6ce37ae --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt @@ -0,0 +1,43 @@ +package jp.co.yumemi.android.code_check.features.github.api + +import com.squareup.moshi.Moshi +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory + +class GitHubRepositoryApiImpl : GitHubRepositoryApi { + override suspend fun getRepository(searchWord: String): RepositoryList { + val logging = HttpLoggingInterceptor() + logging.level = HttpLoggingInterceptor.Level.BODY + + val client = + OkHttpClient.Builder() + .addInterceptor(logging) + .build() + + val moshi = + Moshi.Builder() + .add(KotlinJsonAdapterFactory()) + .build() + + val weatherService = + Retrofit.Builder() + .baseUrl("https://api.github.com") + .client(client) + .addConverterFactory(MoshiConverterFactory.create(moshi)) + .build() + .create(GitHubRepositoryApiBuilderInterface::class.java) + + val response = weatherService.getRepository(searchWord) + + return if (response.isSuccessful && response.body() != null) { + response.body() ?: RepositoryList(emptyList()) + } else { + // TODO: エラーを返す + RepositoryList(emptyList()) + } + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubRepositoryEntity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubRepositoryEntity.kt new file mode 100644 index 0000000..09453d6 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubRepositoryEntity.kt @@ -0,0 +1,21 @@ +package jp.co.yumemi.android.code_check.features.github.entity + +import com.squareup.moshi.Json + +data class RepositoryList( + val items: List, +) + +data class RepositoryItem( + val name: String, + val owner: RepositoryOwner, + val language: String?, + @Json(name = "stargazers_count") val stargazersCount: Long, + @Json(name = "watchers_count") val watchersCount: Long, + @Json(name = "forks_count") val forksCount: Long, + @Json(name = "open_issues_count") val openIssuesCount: Long, +) + +data class RepositoryOwner( + @Json(name = "avatar_url") val avatarUrl: String, +) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt new file mode 100644 index 0000000..4048f43 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -0,0 +1,39 @@ +package jp.co.yumemi.android.code_check.features.github.reposiotory + +import io.ktor.client.HttpClient +import jp.co.yumemi.android.code_check.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApi +import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApiImpl +import org.json.JSONException + +class NetworkRepository(private val client: HttpClient) { + val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl() + + suspend fun fetchSearchResults(inputText: String): List { + try { + val repositoryList = gitHubRepositoryApi.getRepository(inputText) + val items = repositoryList.items + return items.map { item -> + RepositoryItem( + name = item.name, + ownerIconUrl = item.owner.avatarUrl, + language = item.language ?: "none", + stargazersCount = item.stargazersCount, + watchersCount = item.watchersCount, + forksCount = item.forksCount, + openIssuesCount = item.openIssuesCount, + ) + } + } catch (e: JSONException) { + throw NetworkException("JSON解析エラー", e) + } catch (e: Exception) { + throw NetworkException("ネットワークエラー", e) + } + } + + fun close() { + client.close() + } +} + +class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) From b1fae6543947c4b122b9e8f65441846fe87f7d86 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:20:51 +0900 Subject: [PATCH 038/108] =?UTF-8?q?fix:=20=E5=89=8D=E5=9B=9E=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=A7=E8=A6=81=E3=82=89=E3=81=AA=E3=81=8B?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/RepositorySearchViewModel.kt | 15 +-------------- .../github/reposiotory/NetworkRepository.kt | 6 +----- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index cfe4542..d66572b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -17,15 +17,7 @@ import kotlinx.coroutines.launch */ class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { private val appContext = application - private val networkRepository = - NetworkRepository( - HttpClient(Android) { - engine { - connectTimeout = 10_000 - socketTimeout = 10_000 - } - }, - ) + private val networkRepository = NetworkRepository() private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage @@ -52,9 +44,4 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app } } } - - override fun onCleared() { - super.onCleared() - networkRepository.close() - } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index 4048f43..159dee8 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -6,7 +6,7 @@ import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApi import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApiImpl import org.json.JSONException -class NetworkRepository(private val client: HttpClient) { +class NetworkRepository { val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl() suspend fun fetchSearchResults(inputText: String): List { @@ -30,10 +30,6 @@ class NetworkRepository(private val client: HttpClient) { throw NetworkException("ネットワークエラー", e) } } - - fun close() { - client.close() - } } class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) From 07d8d1ff3afdc18bd4f9d7adfc911a952f2aa5ea Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:23:13 +0900 Subject: [PATCH 039/108] =?UTF-8?q?fix:=20=E6=A4=9C=E7=B4=A2=E3=81=AE?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E5=87=BA=E3=81=9F=E3=82=89throw=E3=82=92=E8=BF=94=E3=81=99?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/features/github/api/GitHubRepositoryApiImpl.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt index 6ce37ae..8a9347d 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt @@ -36,8 +36,7 @@ class GitHubRepositoryApiImpl : GitHubRepositoryApi { return if (response.isSuccessful && response.body() != null) { response.body() ?: RepositoryList(emptyList()) } else { - // TODO: エラーを返す - RepositoryList(emptyList()) + throw Exception("検索を行うことができませんでした。再度試してください") } } } From e7f1f91bb53e393f4a679b8a8738bd3b9ac3ee0b Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:25:52 +0900 Subject: [PATCH 040/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yumemi/android/code_check/RepositorySearchViewModel.kt | 2 -- .../code_check/features/github/reposiotory/NetworkRepository.kt | 1 - 2 files changed, 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt index d66572b..6794412 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt @@ -6,8 +6,6 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.ktor.client.HttpClient -import io.ktor.client.engine.android.Android import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkRepository import kotlinx.coroutines.launch diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index 159dee8..6c6b1b0 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -1,6 +1,5 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory -import io.ktor.client.HttpClient import jp.co.yumemi.android.code_check.RepositoryItem import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApi import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApiImpl From ffe3e8b7ba092c59c3f98acdafa1a27018a643eb Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:38:47 +0900 Subject: [PATCH 041/108] =?UTF-8?q?fix:=20=E3=82=82=E3=81=97=E3=82=AA?= =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=AE=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E5=87=BA=E3=81=99=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 + .../code_check/RepositorySearchViewModel.kt | 11 +++- .../github/reposiotory/NetworkRepository.kt | 51 ++++++++++++++----- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 188ab2a..85fb0a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + { + data class Success(val data: T) : NetworkResult() + + data class Error(val exception: NetworkException) : NetworkResult() +} + class NetworkRepository { val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl() - suspend fun fetchSearchResults(inputText: String): List { - try { + suspend fun fetchSearchResults( + inputText: String, + context: Context, + ): NetworkResult> { + if (!isNetworkAvailable(context)) { + return NetworkResult.Error(NetworkException("オフライン")) + } + return try { val repositoryList = gitHubRepositoryApi.getRepository(inputText) val items = repositoryList.items - return items.map { item -> - RepositoryItem( - name = item.name, - ownerIconUrl = item.owner.avatarUrl, - language = item.language ?: "none", - stargazersCount = item.stargazersCount, - watchersCount = item.watchersCount, - forksCount = item.forksCount, - openIssuesCount = item.openIssuesCount, - ) - } + NetworkResult.Success( + items.map { item -> + RepositoryItem( + name = item.name, + ownerIconUrl = item.owner.avatarUrl, + language = item.language ?: "none", + stargazersCount = item.stargazersCount, + watchersCount = item.watchersCount, + forksCount = item.forksCount, + openIssuesCount = item.openIssuesCount, + ) + }, + ) } catch (e: JSONException) { throw NetworkException("JSON解析エラー", e) } catch (e: Exception) { throw NetworkException("ネットワークエラー", e) } } + + private fun isNetworkAvailable(context: Context): Boolean { + val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + + val network = connectivityManager.activeNetwork ?: return false + val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false + return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } } class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) From cdf40ce8a03e8df3428f5b1d259b7212b7414e25 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:40:29 +0900 Subject: [PATCH 042/108] =?UTF-8?q?fix:=20=E4=BE=9D=E5=AD=98=E6=80=A7?= =?UTF-8?q?=E3=81=AE=E6=B3=A8=E5=85=A5=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/github/reposiotory/NetworkRepository.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index f5b12d3..5293f73 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -14,8 +14,9 @@ sealed class NetworkResult { data class Error(val exception: NetworkException) : NetworkResult() } -class NetworkRepository { - val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl() +class NetworkRepository( + private val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl(), +) { suspend fun fetchSearchResults( inputText: String, From a04603ea9c01a907f6c3cf266a0dc31ebcbc436e Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:46:49 +0900 Subject: [PATCH 043/108] =?UTF-8?q?fix:=20=E6=9C=AC=E7=95=AA=E7=92=B0?= =?UTF-8?q?=E5=A2=83=E3=81=A7=E3=81=AE=E3=83=AD=E3=82=B0=E3=83=AC=E3=83=99?= =?UTF-8?q?=E3=83=AB=E3=82=92=E9=81=A9=E5=88=87=E3=81=AB=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + .../features/github/api/GitHubRepositoryApiImpl.kt | 8 +++++++- .../features/github/reposiotory/NetworkRepository.kt | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fb3f0c1..fcdcbb0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,6 +36,7 @@ android { } buildFeatures { viewBinding true + buildConfig true } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt index 8a9347d..53fee0b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt @@ -2,6 +2,7 @@ package jp.co.yumemi.android.code_check.features.github.api import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import jp.co.yumemi.android.code_check.BuildConfig import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor @@ -11,7 +12,12 @@ import retrofit2.converter.moshi.MoshiConverterFactory class GitHubRepositoryApiImpl : GitHubRepositoryApi { override suspend fun getRepository(searchWord: String): RepositoryList { val logging = HttpLoggingInterceptor() - logging.level = HttpLoggingInterceptor.Level.BODY + logging.level = + if (BuildConfig.DEBUG) { + HttpLoggingInterceptor.Level.BODY + } else { + HttpLoggingInterceptor.Level.NONE + } val client = OkHttpClient.Builder() diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index 5293f73..8ea1fd6 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -17,7 +17,6 @@ sealed class NetworkResult { class NetworkRepository( private val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl(), ) { - suspend fun fetchSearchResults( inputText: String, context: Context, From 26ac779d995707a11f2002adfd0dd9a3200263c1 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:50:17 +0900 Subject: [PATCH 044/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=AE?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/github/api/GitHubRepositoryApiImpl.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt index 53fee0b..1e4b4cc 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt @@ -4,6 +4,7 @@ import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import jp.co.yumemi.android.code_check.BuildConfig import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit @@ -39,10 +40,14 @@ class GitHubRepositoryApiImpl : GitHubRepositoryApi { val response = weatherService.getRepository(searchWord) - return if (response.isSuccessful && response.body() != null) { - response.body() ?: RepositoryList(emptyList()) - } else { - throw Exception("検索を行うことができませんでした。再度試してください") + if (!response.isSuccessful) { + throw when (response.code()) { + 404 -> NetworkException("リポジトリが見つかりませんでした") + 403 -> NetworkException("APIレート制限に達しました") + 500 -> NetworkException("サーバーエラーが発生しました") + else -> NetworkException("エラーが発生しました: ${response.code()}") + } } + return response.body() ?: throw NetworkException("レスポンスが空でした") } } From 9f7ee97d675a33745cfb0293947c65d17caae801 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:53:13 +0900 Subject: [PATCH 045/108] =?UTF-8?q?fix:=20=E3=82=AF=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=88=E3=82=A4=E3=83=B3=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=82=92=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB?= =?UTF-8?q?=E3=83=88=E3=83=B3=E5=8C=96=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/api/GitHubRepositoryApiImpl.kt | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt index 1e4b4cc..37f8a19 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt @@ -11,18 +11,19 @@ import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory class GitHubRepositoryApiImpl : GitHubRepositoryApi { - override suspend fun getRepository(searchWord: String): RepositoryList { - val logging = HttpLoggingInterceptor() - logging.level = - if (BuildConfig.DEBUG) { - HttpLoggingInterceptor.Level.BODY - } else { - HttpLoggingInterceptor.Level.NONE - } - + companion object { val client = OkHttpClient.Builder() - .addInterceptor(logging) + .addInterceptor( + HttpLoggingInterceptor().apply { + level = + if (BuildConfig.DEBUG) { + HttpLoggingInterceptor.Level.BODY + } else { + HttpLoggingInterceptor.Level.NONE + } + }, + ) .build() val moshi = @@ -37,7 +38,9 @@ class GitHubRepositoryApiImpl : GitHubRepositoryApi { .addConverterFactory(MoshiConverterFactory.create(moshi)) .build() .create(GitHubRepositoryApiBuilderInterface::class.java) + } + override suspend fun getRepository(searchWord: String): RepositoryList { val response = weatherService.getRepository(searchWord) if (!response.isSuccessful) { From fad1c21b0771d29874de42cd3f13cdf2939540a3 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 05:59:46 +0900 Subject: [PATCH 046/108] =?UTF-8?q?fix:=20=E5=A4=89=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/features/github/api/GitHubRepositoryApiImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt index 37f8a19..bf8f356 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt @@ -31,7 +31,7 @@ class GitHubRepositoryApiImpl : GitHubRepositoryApi { .add(KotlinJsonAdapterFactory()) .build() - val weatherService = + val githubService = Retrofit.Builder() .baseUrl("https://api.github.com") .client(client) @@ -41,7 +41,7 @@ class GitHubRepositoryApiImpl : GitHubRepositoryApi { } override suspend fun getRepository(searchWord: String): RepositoryList { - val response = weatherService.getRepository(searchWord) + val response = githubService.getRepository(searchWord) if (!response.isSuccessful) { throw when (response.code()) { From 934e1c057c1009583585463284fb9570a644e9cf Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 06:05:31 +0900 Subject: [PATCH 047/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=82=92?= =?UTF-8?q?=E3=82=88=E3=82=8A=E9=A0=91=E5=9B=BA=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/reposiotory/NetworkRepository.kt | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index 8ea1fd6..41b7457 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -17,33 +17,29 @@ sealed class NetworkResult { class NetworkRepository( private val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl(), ) { - suspend fun fetchSearchResults( - inputText: String, - context: Context, - ): NetworkResult> { + suspend fun fetchSearchResults(inputText: String, context: Context): NetworkResult> { if (!isNetworkAvailable(context)) { - return NetworkResult.Error(NetworkException("オフライン")) + return NetworkResult.Error(NetworkException("オフライン状態です")) } + return try { val repositoryList = gitHubRepositoryApi.getRepository(inputText) - val items = repositoryList.items - NetworkResult.Success( - items.map { item -> - RepositoryItem( - name = item.name, - ownerIconUrl = item.owner.avatarUrl, - language = item.language ?: "none", - stargazersCount = item.stargazersCount, - watchersCount = item.watchersCount, - forksCount = item.forksCount, - openIssuesCount = item.openIssuesCount, - ) - }, - ) + val items = repositoryList.items.map { item -> + RepositoryItem( + name = item.name, + ownerIconUrl = item.owner.avatarUrl, + language = item.language ?: "none", + stargazersCount = item.stargazersCount, + watchersCount = item.watchersCount, + forksCount = item.forksCount, + openIssuesCount = item.openIssuesCount, + ) + } + NetworkResult.Success(items) } catch (e: JSONException) { - throw NetworkException("JSON解析エラー", e) + NetworkResult.Error(NetworkException("JSONパースエラー", e)) } catch (e: Exception) { - throw NetworkException("ネットワークエラー", e) + NetworkResult.Error(NetworkException("ネットワークエラー", e)) } } From e9e81e1baf77a461ab0c65016ff9027e4505dbfc Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 06:08:17 +0900 Subject: [PATCH 048/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/reposiotory/NetworkRepository.kt | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index 41b7457..7014dcc 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -17,24 +17,28 @@ sealed class NetworkResult { class NetworkRepository( private val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl(), ) { - suspend fun fetchSearchResults(inputText: String, context: Context): NetworkResult> { + suspend fun fetchSearchResults( + inputText: String, + context: Context, + ): NetworkResult> { if (!isNetworkAvailable(context)) { return NetworkResult.Error(NetworkException("オフライン状態です")) } return try { val repositoryList = gitHubRepositoryApi.getRepository(inputText) - val items = repositoryList.items.map { item -> - RepositoryItem( - name = item.name, - ownerIconUrl = item.owner.avatarUrl, - language = item.language ?: "none", - stargazersCount = item.stargazersCount, - watchersCount = item.watchersCount, - forksCount = item.forksCount, - openIssuesCount = item.openIssuesCount, - ) - } + val items = + repositoryList.items.map { item -> + RepositoryItem( + name = item.name, + ownerIconUrl = item.owner.avatarUrl, + language = item.language ?: "none", + stargazersCount = item.stargazersCount, + watchersCount = item.watchersCount, + forksCount = item.forksCount, + openIssuesCount = item.openIssuesCount, + ) + } NetworkResult.Success(items) } catch (e: JSONException) { NetworkResult.Error(NetworkException("JSONパースエラー", e)) From e29900a9c1d485af37dc80c902a1cb39d5934161 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 06:16:00 +0900 Subject: [PATCH 049/108] =?UTF-8?q?update:=20gradle=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 32 ++++++++++++++++---------------- build.gradle | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fcdcbb0..a231a02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,12 +9,12 @@ plugins { android { namespace 'jp.co.yumemi.android.code_check' - compileSdk 31 + compileSdk 35 defaultConfig { applicationId "jp.co.yumemi.android.codecheck" minSdk 23 - targetSdk 31 + targetSdk 35 versionCode 1 versionName "1.0" @@ -42,27 +42,27 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.6.0' - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.1' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.core:core-ktx:1.15.0' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' + implementation 'androidx.recyclerview:recyclerview:1.4.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7' - implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' - implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' + implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.8.5' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1' implementation 'io.ktor:ktor-client-android:1.6.4' - implementation 'io.coil-kt:coil:1.3.2' + implementation 'io.coil-kt:coil:2.7.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' // Retrofit implementation("com.squareup.retrofit2:converter-moshi:2.9.0") diff --git a/build.gradle b/build.gradle index 46b0b50..300b7d5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From cf93a8653c27cb15a51439d4884f0826195b04c6 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 06:25:55 +0900 Subject: [PATCH 050/108] =?UTF-8?q?update:=20kotlin=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 300b7d5..27c3380 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.7.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5" // NOTE: Do not place your application dependencies here; they belong From 50a8b152ecc55dae02a932ec3d0b938971377f5d Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 07:18:45 +0900 Subject: [PATCH 051/108] =?UTF-8?q?update:=20jvm=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- app/build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 20eed08..91740b7 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ ### 環境 - IDE：Android Studio Ladybug | 2024.2.1 Patch 3 -- Kotlin：1.6.21 +- Kotlin： 2.0.0 - Java：17 - Gradle：8.9 - minSdk：23 -- targetSdk：31 +- targetSdk：35 ※ ライブラリの利用はオープンソースのものに限ります。 ※ 環境は適宜更新してください。 diff --git a/app/build.gradle b/app/build.gradle index a231a02..1d1e3f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,11 +28,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '17' } buildFeatures { viewBinding true From 07ee020e3d8790f7988a2075dea9c34c2d0dc150 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 07:57:39 +0900 Subject: [PATCH 052/108] =?UTF-8?q?ref:=20=E3=83=87=E3=82=A3=E3=83=AC?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=AA=E6=A7=8B=E6=88=90=E3=82=92feature?= =?UTF-8?q?=20=E3=83=95=E3=82=A1=E3=83=BC=E3=82=B9=E3=83=88=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/{ => core/entity}/RepositoryItem.kt | 2 +- .../presenter/detail}/RepositoryDetailFragment.kt | 4 +++- .../search}/RepositoryListRecyclerViewAdapter.kt | 7 +++++-- .../presenter/search}/RepositorySearchFragment.kt | 13 +++++++------ .../presenter/search}/RepositorySearchViewModel.kt | 5 +++-- .../code_check/{ => core/utils}/DialogHelper.kt | 2 +- .../github/reposiotory/NetworkRepository.kt | 2 +- app/src/main/res/navigation/nav_graph.xml | 6 +++--- 8 files changed, 24 insertions(+), 17 deletions(-) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{ => core/entity}/RepositoryItem.kt (85%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{ => core/presenter/detail}/RepositoryDetailFragment.kt (90%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{ => core/presenter/search}/RepositoryListRecyclerViewAdapter.kt (92%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{ => core/presenter/search}/RepositorySearchFragment.kt (89%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{ => core/presenter/search}/RepositorySearchViewModel.kt (93%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{ => core/utils}/DialogHelper.kt (87%) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt similarity index 85% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt index fd37b26..1136dce 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt @@ -1,4 +1,4 @@ -package jp.co.yumemi.android.code_check +package jp.co.yumemi.android.code_check.core.entity import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt similarity index 90% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt index aee80a0..f15eb98 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt @@ -1,13 +1,15 @@ /* * Copyright © 2021 YUMEMI Inc. All rights reserved. */ -package jp.co.yumemi.android.code_check +package jp.co.yumemi.android.code_check.core.presenter.detail import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import androidx.navigation.fragment.navArgs import coil.load +import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt similarity index 92% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt index ef587e4..2fbb405 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryListRecyclerViewAdapter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package jp.co.yumemi.android.code_check +package jp.co.yumemi.android.code_check.core.presenter.search import android.view.LayoutInflater import android.view.View @@ -7,6 +7,9 @@ import android.widget.TextView import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView +import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem + /** * DiffUtilの実装 @@ -69,4 +72,4 @@ class RepositoryListRecyclerViewAdapter( ) { holder.bind(getItem(position), itemClickListener) } -} +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt similarity index 89% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index 7cb77e9..6220f96 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -1,7 +1,4 @@ -/* - * Copyright © 2021 YUMEMI Inc. All rights reserved. - */ -package jp.co.yumemi.android.code_check +package jp.co.yumemi.android.code_check.core.presenter.search import android.os.Bundle import android.view.View @@ -11,6 +8,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager +import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.utils.DialogHelper import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { @@ -52,7 +52,8 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun setupRecyclerView() { val layoutManager = LinearLayoutManager(requireContext()) - val dividerItemDecoration = DividerItemDecoration(requireContext(), layoutManager.orientation) + val dividerItemDecoration = + DividerItemDecoration(requireContext(), layoutManager.orientation) binding.recyclerView.apply { this.layoutManager = layoutManager @@ -87,4 +88,4 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { super.onDestroyView() _binding = null } -} +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt similarity index 93% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 5f764f1..87be99f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -1,4 +1,4 @@ -package jp.co.yumemi.android.code_check +package jp.co.yumemi.android.code_check.core.presenter.search import android.app.Application import android.util.Log @@ -6,6 +6,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkResult @@ -49,4 +50,4 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app } } } -} +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/utils/DialogHelper.kt similarity index 87% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/utils/DialogHelper.kt index 332118f..5798c1b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DialogHelper.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/utils/DialogHelper.kt @@ -1,4 +1,4 @@ -package jp.co.yumemi.android.code_check +package jp.co.yumemi.android.code_check.core.utils import android.app.AlertDialog import android.content.Context diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt index 7014dcc..5a6f7b9 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt @@ -3,7 +3,7 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory import android.content.Context import android.net.ConnectivityManager import android.net.NetworkCapabilities -import jp.co.yumemi.android.code_check.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApi import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApiImpl import org.json.JSONException diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 01e13df..ea34d7b 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,7 @@ + app:argType="jp.co.yumemi.android.code_check.core.entity.RepositoryItem" /> From b13dd79dd604767f05ea01e81730d2e65bae75f9 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 08:07:21 +0900 Subject: [PATCH 053/108] =?UTF-8?q?ref:=20=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E5=90=8D=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/{GitHubRepositoryApi.kt => GitHubServiceApi.kt} | 2 +- ...lderInterface.kt => GitHubServiceApiBuilderInterface.kt} | 2 +- .../{GitHubRepositoryApiImpl.kt => GitHubServiceApiImpl.kt} | 4 ++-- .../{GitHubRepositoryEntity.kt => GitHubServiceEntity.kt} | 0 .../{NetworkRepository.kt => GitHubServiceRepository.kt} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/{GitHubRepositoryApi.kt => GitHubServiceApi.kt} (86%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/{GitHubRepositoryApiBuilderInterface.kt => GitHubServiceApiBuilderInterface.kt} (88%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/{GitHubRepositoryApiImpl.kt => GitHubServiceApiImpl.kt} (94%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/{GitHubRepositoryEntity.kt => GitHubServiceEntity.kt} (100%) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/{NetworkRepository.kt => GitHubServiceRepository.kt} (95%) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt similarity index 86% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt index 4066a49..8a51f27 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApi.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt @@ -2,6 +2,6 @@ package jp.co.yumemi.android.code_check.features.github.api import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList -interface GitHubRepositoryApi { +interface GitHubServiceApi { suspend fun getRepository(searchWord: String): RepositoryList } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt similarity index 88% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt index a63ec4f..fcc38eb 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiBuilderInterface.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt @@ -5,7 +5,7 @@ import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Query -interface GitHubRepositoryApiBuilderInterface { +interface GitHubServiceApiBuilderInterface { @GET("/search/repositories") suspend fun getRepository( @Query("q") searchWord: String, diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt similarity index 94% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt index bf8f356..e1997e0 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubRepositoryApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt @@ -10,7 +10,7 @@ import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory -class GitHubRepositoryApiImpl : GitHubRepositoryApi { +class GitHubServiceApiImpl : GitHubServiceApi { companion object { val client = OkHttpClient.Builder() @@ -37,7 +37,7 @@ class GitHubRepositoryApiImpl : GitHubRepositoryApi { .client(client) .addConverterFactory(MoshiConverterFactory.create(moshi)) .build() - .create(GitHubRepositoryApiBuilderInterface::class.java) + .create(GitHubServiceApiBuilderInterface::class.java) } override suspend fun getRepository(searchWord: String): RepositoryList { diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubRepositoryEntity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubServiceEntity.kt similarity index 100% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubRepositoryEntity.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubServiceEntity.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt similarity index 95% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt index 5a6f7b9..319ba2e 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/NetworkRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt @@ -4,8 +4,8 @@ import android.content.Context import android.net.ConnectivityManager import android.net.NetworkCapabilities import jp.co.yumemi.android.code_check.core.entity.RepositoryItem -import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApi -import jp.co.yumemi.android.code_check.features.github.api.GitHubRepositoryApiImpl +import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi +import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApiImpl import org.json.JSONException sealed class NetworkResult { @@ -15,7 +15,7 @@ sealed class NetworkResult { } class NetworkRepository( - private val gitHubRepositoryApi: GitHubRepositoryApi = GitHubRepositoryApiImpl(), + private val gitHubRepositoryApi: GitHubServiceApi = GitHubServiceApiImpl(), ) { suspend fun fetchSearchResults( inputText: String, From 0d5270247ef9f07d3c41ecd51b5dc20d3d0dab2d Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 08:43:12 +0900 Subject: [PATCH 054/108] =?UTF-8?q?ref:=20=E3=81=96=E3=81=A3=E3=81=8F?= =?UTF-8?q?=E3=82=8AUsecase=E3=81=A8Repository=E3=82=92=E5=88=86=E3=81=91?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/RepositorySearchViewModel.kt | 6 ++-- .../reposiotory/GitHubServiceRepository.kt | 25 ++--------------- .../github/usecase/GitHubServiceUsecase.kt | 28 +++++++++++++++++++ .../features/github/utils/NetworkResult.kt | 9 ++++++ 4 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 87be99f..08e220f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -8,8 +8,8 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException -import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkRepository -import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkResult +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.launch /** @@ -17,7 +17,7 @@ import kotlinx.coroutines.launch */ class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { private val appContext = application - private val networkRepository = NetworkRepository() + private val networkRepository = GitHubServiceUsecase() private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt index 319ba2e..ed8899a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt @@ -1,30 +1,17 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory -import android.content.Context -import android.net.ConnectivityManager -import android.net.NetworkCapabilities import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApiImpl +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import org.json.JSONException -sealed class NetworkResult { - data class Success(val data: T) : NetworkResult() - - data class Error(val exception: NetworkException) : NetworkResult() -} - -class NetworkRepository( +class GitHubServiceRepository( private val gitHubRepositoryApi: GitHubServiceApi = GitHubServiceApiImpl(), ) { suspend fun fetchSearchResults( inputText: String, - context: Context, ): NetworkResult> { - if (!isNetworkAvailable(context)) { - return NetworkResult.Error(NetworkException("オフライン状態です")) - } - return try { val repositoryList = gitHubRepositoryApi.getRepository(inputText) val items = @@ -46,14 +33,6 @@ class NetworkRepository( NetworkResult.Error(NetworkException("ネットワークエラー", e)) } } - - private fun isNetworkAvailable(context: Context): Boolean { - val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - - val network = connectivityManager.activeNetwork ?: return false - val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false - return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - } } class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt new file mode 100644 index 0000000..120b16e --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt @@ -0,0 +1,28 @@ +package jp.co.yumemi.android.code_check.features.github.usecase + +import android.content.Context +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult + +class GitHubServiceUsecase( + private val repository: GitHubServiceRepository = GitHubServiceRepository() +) { + suspend fun fetchSearchResults(inputText: String, context: Context): NetworkResult> { + if (!isNetworkAvailable(context)) { + throw NetworkException("オフライン状態です") + } + return repository.fetchSearchResults(inputText) + } + + private fun isNetworkAvailable(context: Context): Boolean { + val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + + val network = connectivityManager.activeNetwork ?: return false + val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false + return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt new file mode 100644 index 0000000..fefd6f7 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt @@ -0,0 +1,9 @@ +package jp.co.yumemi.android.code_check.features.github.utils + +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException + +sealed class NetworkResult { + data class Success(val data: T) : NetworkResult() + + data class Error(val exception: NetworkException) : NetworkResult() +} \ No newline at end of file From 63c9ca5ddc05ed25f7674640034fb5bdf33da4a3 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 08:50:24 +0900 Subject: [PATCH 055/108] =?UTF-8?q?add:=20hilt=E3=81=AE=E5=B0=8E=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 13 ++++++++++--- build.gradle | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1d1e3f1..b668b5b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,6 +5,7 @@ plugins { id 'kotlin-parcelize' id 'androidx.navigation.safeargs.kotlin' id("org.jlleitschuh.gradle.ktlint") version "12.1.2" + id 'com.google.dagger.hilt.android' } android { @@ -28,11 +29,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '17' + jvmTarget = '1.8' } buildFeatures { viewBinding true @@ -63,6 +64,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + implementation "com.google.dagger:hilt-android:2.51.1" + kapt "com.google.dagger:hilt-compiler:2.51.1" // Retrofit implementation("com.squareup.retrofit2:converter-moshi:2.9.0") @@ -70,3 +73,7 @@ dependencies { implementation("com.squareup.retrofit2:retrofit:2.11.0") implementation("com.squareup.moshi:moshi-kotlin:1.14.0") } + +kapt { + correctErrorTypes true +} diff --git a/build.gradle b/build.gradle index 27c3380..2d534d6 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5" + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.51.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 828615550b43414a3a7209bc2ffda7bc97c34320 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 10:27:30 +0900 Subject: [PATCH 056/108] =?UTF-8?q?add:=20hilt=E3=81=AE=E5=B0=8E=E5=85=A5?= =?UTF-8?q?=E3=81=97=E3=81=A6=E4=BE=9D=E5=AD=98=E6=80=A7=E3=81=AE=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 3 +- .../code_check/CodeCheckApplication.kt | 7 ++++ .../android/code_check/CodeCheckModule.kt | 38 +++++++++++++++++++ .../yumemi/android/code_check/TopActivity.kt | 2 + .../detail/RepositoryDetailFragment.kt | 2 + .../RepositoryListRecyclerViewAdapter.kt | 3 +- .../search/RepositorySearchFragment.kt | 12 ++++-- .../search/RepositorySearchViewModel.kt | 18 ++++++--- .../reposiotory/GitHubServiceRepository.kt | 34 +---------------- .../GitHubServiceRepositoryImpl.kt | 38 +++++++++++++++++++ .../github/usecase/GitHubServiceUsecase.kt | 26 +++---------- .../usecase/GitHubServiceUsecaseImpl.kt | 34 +++++++++++++++++ .../features/github/utils/NetworkResult.kt | 2 +- build.gradle | 4 +- 15 files changed, 156 insertions(+), 71 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckApplication.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckModule.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt diff --git a/app/build.gradle b/app/build.gradle index b668b5b..abdc496 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,8 +64,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' - implementation "com.google.dagger:hilt-android:2.51.1" - kapt "com.google.dagger:hilt-compiler:2.51.1" + implementation "com.google.dagger:hilt-android:2.55" + kapt "com.google.dagger:hilt-compiler:2.55" // Retrofit implementation("com.squareup.retrofit2:converter-moshi:2.9.0") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 85fb0a2..2e1287a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.AndroidEngineerCodeCheck" - android:fullBackupContent="@xml/backup_descriptor"> + android:fullBackupContent="@xml/backup_descriptor" + android:name=".CodeCheckApplication"> diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckApplication.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckApplication.kt new file mode 100644 index 0000000..39efc83 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckApplication.kt @@ -0,0 +1,7 @@ +package jp.co.yumemi.android.code_check + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class CodeCheckApplication : Application() diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckModule.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckModule.kt new file mode 100644 index 0000000..486fcf9 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckModule.kt @@ -0,0 +1,38 @@ +package jp.co.yumemi.android.code_check + +import dagger.Binds +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi +import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApiImpl +import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository +import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepositoryImpl +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +abstract class GitHubUsecaseModule { + @Singleton + @Binds + abstract fun provideGitHubServiceUsecase(impl: GitHubServiceUsecaseImpl): GitHubServiceUsecase +} + +@Module +@InstallIn(SingletonComponent::class) +abstract class GitHubRepositoryModule { + @Singleton + @Binds + abstract fun provideGitHubServiceRepository(impl: GitHubServiceRepositoryImpl): GitHubServiceRepository + + companion object { + @Provides + @Singleton + fun provideGitHubServiceApi(): GitHubServiceApi { + return GitHubServiceApiImpl() + } + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt index d6cc54e..926636a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt @@ -4,5 +4,7 @@ package jp.co.yumemi.android.code_check import androidx.appcompat.app.AppCompatActivity +import dagger.hilt.android.AndroidEntryPoint +@AndroidEntryPoint class TopActivity : AppCompatActivity(R.layout.activity_top) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt index f15eb98..614ee71 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt @@ -8,10 +8,12 @@ import android.view.View import androidx.fragment.app.Fragment import androidx.navigation.fragment.navArgs import coil.load +import dagger.hilt.android.AndroidEntryPoint import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding +@AndroidEntryPoint class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { private val args: RepositoryDetailFragmentArgs by navArgs() diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt index 2fbb405..f0d1656 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt @@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryItem - /** * DiffUtilの実装 */ @@ -72,4 +71,4 @@ class RepositoryListRecyclerViewAdapter( ) { holder.bind(getItem(position), itemClickListener) } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index 6220f96..e8c89b3 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -4,19 +4,22 @@ import android.os.Bundle import android.view.View import android.view.inputmethod.EditorInfo import androidx.fragment.app.Fragment +import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager +import dagger.hilt.android.AndroidEntryPoint import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.core.utils.DialogHelper import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding +@AndroidEntryPoint class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private var _binding: FragmentRepositorySearchBinding? = null private val binding get() = _binding ?: throw IllegalStateException("Binding is null") - private lateinit var viewModel: RepositorySearchViewModel + private val viewModel: RepositorySearchViewModel by viewModels() private val adapter by lazy { RepositoryListRecyclerViewAdapter( @@ -34,7 +37,8 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { ) { super.onViewCreated(view, savedInstanceState) _binding = FragmentRepositorySearchBinding.bind(view) - viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] +// viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] + observeViewModel() setupRecyclerView() @@ -65,7 +69,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun setupSearchInput() { binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { - viewModel.searchRepositories(editText.text.toString().trim()) + viewModel.searchRepositories(editText.text.toString().trim(),requireContext()) true } else { false @@ -88,4 +92,4 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { super.onDestroyView() _binding = null } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 08e220f..337c591 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -1,23 +1,29 @@ package jp.co.yumemi.android.code_check.core.presenter.search import android.app.Application +import android.content.Context import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.launch /** * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ -class RepositorySearchViewModel(application: Application) : AndroidViewModel(application) { - private val appContext = application - private val networkRepository = GitHubServiceUsecase() +@HiltViewModel +class RepositorySearchViewModel @Inject constructor( + private val networkRepository: GitHubServiceUsecaseImpl +) : ViewModel() { private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage @@ -29,14 +35,14 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app * GitHubのレポジトリ検索を行う * @param query 検索キーワード */ - fun searchRepositories(query: String) { + fun searchRepositories(query: String,context : Context) { if (query.isBlank()) { _errorMessage.postValue("検索キーワードを入力してください。") return } viewModelScope.launch { try { - val results = networkRepository.fetchSearchResults(query, appContext) + val results = networkRepository.fetchSearchResults(query, context) if (results is NetworkResult.Error) { _errorMessage.postValue(results.exception.message) return@launch @@ -50,4 +56,4 @@ class RepositorySearchViewModel(application: Application) : AndroidViewModel(app } } } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt index ed8899a..0ccedef 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt @@ -1,38 +1,8 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory import jp.co.yumemi.android.code_check.core.entity.RepositoryItem -import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi -import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApiImpl import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult -import org.json.JSONException -class GitHubServiceRepository( - private val gitHubRepositoryApi: GitHubServiceApi = GitHubServiceApiImpl(), -) { - suspend fun fetchSearchResults( - inputText: String, - ): NetworkResult> { - return try { - val repositoryList = gitHubRepositoryApi.getRepository(inputText) - val items = - repositoryList.items.map { item -> - RepositoryItem( - name = item.name, - ownerIconUrl = item.owner.avatarUrl, - language = item.language ?: "none", - stargazersCount = item.stargazersCount, - watchersCount = item.watchersCount, - forksCount = item.forksCount, - openIssuesCount = item.openIssuesCount, - ) - } - NetworkResult.Success(items) - } catch (e: JSONException) { - NetworkResult.Error(NetworkException("JSONパースエラー", e)) - } catch (e: Exception) { - NetworkResult.Error(NetworkException("ネットワークエラー", e)) - } - } +interface GitHubServiceRepository { + suspend fun fetchSearchResults(inputText: String): NetworkResult> } - -class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt new file mode 100644 index 0000000..09c358a --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt @@ -0,0 +1,38 @@ +package jp.co.yumemi.android.code_check.features.github.reposiotory + +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import org.json.JSONException +import javax.inject.Inject + +class GitHubServiceRepositoryImpl + @Inject + constructor( + private val gitHubRepositoryApi: GitHubServiceApi, + ) : GitHubServiceRepository { + override suspend fun fetchSearchResults(inputText: String): NetworkResult> { + return try { + val repositoryList = gitHubRepositoryApi.getRepository(inputText) + val items = + repositoryList.items.map { item -> + RepositoryItem( + name = item.name, + ownerIconUrl = item.owner.avatarUrl, + language = item.language ?: "none", + stargazersCount = item.stargazersCount, + watchersCount = item.watchersCount, + forksCount = item.forksCount, + openIssuesCount = item.openIssuesCount, + ) + } + NetworkResult.Success(items) + } catch (e: JSONException) { + NetworkResult.Error(NetworkException("JSONパースエラー", e)) + } catch (e: Exception) { + NetworkResult.Error(NetworkException("ネットワークエラー", e)) + } + } + } + +class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt index 120b16e..c6a0760 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt @@ -1,28 +1,12 @@ package jp.co.yumemi.android.code_check.features.github.usecase import android.content.Context -import android.net.ConnectivityManager -import android.net.NetworkCapabilities import jp.co.yumemi.android.code_check.core.entity.RepositoryItem -import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository -import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult -class GitHubServiceUsecase( - private val repository: GitHubServiceRepository = GitHubServiceRepository() -) { - suspend fun fetchSearchResults(inputText: String, context: Context): NetworkResult> { - if (!isNetworkAvailable(context)) { - throw NetworkException("オフライン状態です") - } - return repository.fetchSearchResults(inputText) - } - - private fun isNetworkAvailable(context: Context): Boolean { - val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - - val network = connectivityManager.activeNetwork ?: return false - val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false - return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - } +interface GitHubServiceUsecase { + suspend fun fetchSearchResults( + inputText: String, + context: Context, + ): NetworkResult> } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt new file mode 100644 index 0000000..5853681 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt @@ -0,0 +1,34 @@ +package jp.co.yumemi.android.code_check.features.github.usecase + +import android.content.Context +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import javax.inject.Inject + +class GitHubServiceUsecaseImpl + @Inject + constructor( + private val repository: GitHubServiceRepository, + ) : GitHubServiceUsecase { + override suspend fun fetchSearchResults( + inputText: String, + context: Context, + ): NetworkResult> { + if (!isNetworkAvailable(context)) { + throw NetworkException("オフライン状態です") + } + return repository.fetchSearchResults(inputText) + } + + private fun isNetworkAvailable(context: Context): Boolean { + val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + + val network = connectivityManager.activeNetwork ?: return false + val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false + return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } + } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt index fefd6f7..04c1a31 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt @@ -6,4 +6,4 @@ sealed class NetworkResult { data class Success(val data: T) : NetworkResult() data class Error(val exception: NetworkException) : NetworkResult() -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 2d534d6..67879fa 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.7.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5" - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.51.1' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.55' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 4d6da5b4d78d9b9a62af399b6ba1cdbfaa274d45 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 10:44:17 +0900 Subject: [PATCH 057/108] =?UTF-8?q?ref:=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/RepositorySearchFragment.kt | 4 +- .../search/RepositorySearchViewModel.kt | 69 ++++++++++--------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index e8c89b3..fd3d492 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -5,7 +5,6 @@ import android.view.View import android.view.inputmethod.EditorInfo import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels -import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager @@ -39,7 +38,6 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { _binding = FragmentRepositorySearchBinding.bind(view) // viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] - observeViewModel() setupRecyclerView() setupSearchInput() @@ -69,7 +67,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun setupSearchInput() { binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { - viewModel.searchRepositories(editText.text.toString().trim(),requireContext()) + viewModel.searchRepositories(editText.text.toString().trim(), requireContext()) true } else { false diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 337c591..5ccd576 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -1,59 +1,60 @@ package jp.co.yumemi.android.code_check.core.presenter.search -import android.app.Application import android.content.Context import android.util.Log -import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException -import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.launch +import javax.inject.Inject /** * RepositorySearchFragmentで利用するリポジトリ検索用のViewModel */ @HiltViewModel -class RepositorySearchViewModel @Inject constructor( - private val networkRepository: GitHubServiceUsecaseImpl -) : ViewModel() { - - private val _errorMessage = MutableLiveData() - val errorMessage: LiveData get() = _errorMessage +class RepositorySearchViewModel + @Inject + constructor( + private val networkRepository: GitHubServiceUsecaseImpl, + ) : ViewModel() { + private val _errorMessage = MutableLiveData() + val errorMessage: LiveData get() = _errorMessage - private val _searchResults = MutableLiveData>() - val searchResults: LiveData> get() = _searchResults + private val _searchResults = MutableLiveData>() + val searchResults: LiveData> get() = _searchResults - /** - * GitHubのレポジトリ検索を行う - * @param query 検索キーワード - */ - fun searchRepositories(query: String,context : Context) { - if (query.isBlank()) { - _errorMessage.postValue("検索キーワードを入力してください。") - return - } - viewModelScope.launch { - try { - val results = networkRepository.fetchSearchResults(query, context) - if (results is NetworkResult.Error) { - _errorMessage.postValue(results.exception.message) - return@launch - } - if (results is NetworkResult.Success) { - _searchResults.postValue(results.data) + /** + * GitHubのレポジトリ検索を行う + * @param query 検索キーワード + */ + fun searchRepositories( + query: String, + context: Context, + ) { + if (query.isBlank()) { + _errorMessage.postValue("検索キーワードを入力してください。") + return + } + viewModelScope.launch { + try { + val results = networkRepository.fetchSearchResults(query, context) + if (results is NetworkResult.Error) { + _errorMessage.postValue(results.exception.message) + return@launch + } + if (results is NetworkResult.Success) { + _searchResults.postValue(results.data) + } + } catch (e: NetworkException) { + Log.e("NetworkException", e.message, e) + _errorMessage.postValue(e.message) } - } catch (e: NetworkException) { - Log.e("NetworkException", e.message, e) - _errorMessage.postValue(e.message) } } } -} From a25aefd8e2065f0f45815eb05c66e10f83704e01 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 10:45:22 +0900 Subject: [PATCH 058/108] =?UTF-8?q?update:=20readme=E3=81=AEkotlin?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 91740b7..46637ed 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ### 環境 - IDE：Android Studio Ladybug | 2024.2.1 Patch 3 -- Kotlin： 2.0.0 +- Kotlin： 2.0.21 - Java：17 - Gradle：8.9 - minSdk：23 From 1a8355c9a9f25ee9d6efad255e6155ea2d3d9ad1 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:06:48 +0900 Subject: [PATCH 059/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=AE=E4=BB=95=E6=96=B9=E3=82=92?= =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=8F=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/RepositorySearchViewModel.kt | 21 +++++++++++++++++-- .../GitHubServiceRepositoryImpl.kt | 17 ++++++++++++--- .../features/github/utils/GitHubError.kt | 13 ++++++++++++ .../features/github/utils/NetworkResult.kt | 4 +--- app/src/main/res/values/strings.xml | 5 +++++ 5 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/GitHubError.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 5ccd576..7028faa 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -7,9 +7,11 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel +import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl +import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.launch import javax.inject.Inject @@ -45,7 +47,7 @@ class RepositorySearchViewModel try { val results = networkRepository.fetchSearchResults(query, context) if (results is NetworkResult.Error) { - _errorMessage.postValue(results.exception.message) + handleError(results.exception, context) return@launch } if (results is NetworkResult.Success) { @@ -53,8 +55,23 @@ class RepositorySearchViewModel } } catch (e: NetworkException) { Log.e("NetworkException", e.message, e) - _errorMessage.postValue(e.message) + handleError(GitHubError.NetworkError(e), context) } } } + + private fun handleError( + error: GitHubError, + context: Context, + ) { + val messageRes = + when (error) { + is GitHubError.NetworkError -> R.string.network_error + is GitHubError.ApiError -> R.string.api_error + is GitHubError.ParseError -> R.string.parse_error + is GitHubError.RateLimitError -> R.string.rate_limit_error + is GitHubError.AuthenticationError -> R.string.auth_error + } + _errorMessage.value = context.getString(messageRes) + } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt index 09c358a..ecec1d2 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt @@ -2,8 +2,11 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi +import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import org.json.JSONException +import retrofit2.HttpException +import java.io.IOException import javax.inject.Inject class GitHubServiceRepositoryImpl @@ -27,10 +30,18 @@ class GitHubServiceRepositoryImpl ) } NetworkResult.Success(items) + } catch (e: HttpException) { + val error = + when (e.code()) { + 429 -> GitHubError.RateLimitError + 401 -> GitHubError.AuthenticationError + else -> GitHubError.ApiError(e.code(), e.message()) + } + NetworkResult.Error(error) } catch (e: JSONException) { - NetworkResult.Error(NetworkException("JSONパースエラー", e)) - } catch (e: Exception) { - NetworkResult.Error(NetworkException("ネットワークエラー", e)) + NetworkResult.Error(GitHubError.ParseError(e)) + } catch (e: IOException) { + NetworkResult.Error(GitHubError.NetworkError(e)) } } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/GitHubError.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/GitHubError.kt new file mode 100644 index 0000000..622fdd7 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/GitHubError.kt @@ -0,0 +1,13 @@ +package jp.co.yumemi.android.code_check.features.github.utils + +sealed class GitHubError { + data class NetworkError(val exception: Exception) : GitHubError() + + data class ApiError(val code: Int, val message: String) : GitHubError() + + data class ParseError(val exception: Exception) : GitHubError() + + data object RateLimitError : GitHubError() + + data object AuthenticationError : GitHubError() +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt index 04c1a31..05d20a3 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/utils/NetworkResult.kt @@ -1,9 +1,7 @@ package jp.co.yumemi.android.code_check.features.github.utils -import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException - sealed class NetworkResult { data class Success(val data: T) : NetworkResult() - data class Error(val exception: NetworkException) : NetworkResult() + data class Error(val exception: GitHubError) : NetworkResult() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b820fba..9673950 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,4 +6,9 @@ "%1$d watchers" "%1$d forks" "%1$d open issues" + 認証エラー + ネットワークエラー + パースエラー + セッションの時間切れ + APIのエラー \ No newline at end of file From 3078e68cf18276be7dfca08d8bb7c64b85d604a9 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:19:17 +0900 Subject: [PATCH 060/108] =?UTF-8?q?fix:=20=E3=83=8D=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=82=AF=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E3=81=AE=E7=A7=BB=E5=8B=95?= =?UTF-8?q?=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/NetworkConnectivityService.kt | 20 +++++++++++++++++++ .../usecase/GitHubServiceUsecaseImpl.kt | 14 +++---------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt new file mode 100644 index 0000000..0ad2c94 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt @@ -0,0 +1,20 @@ +package jp.co.yumemi.android.code_check.core.api + +import android.content.Context +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import dagger.hilt.android.qualifiers.ApplicationContext +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class NetworkConnectivityService @Inject constructor( + @ApplicationContext private val context: Context +) { + fun isNetworkAvailable(): Boolean { + val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val network = connectivityManager.activeNetwork ?: return false + val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false + return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt index 5853681..8c4707e 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt @@ -1,9 +1,8 @@ package jp.co.yumemi.android.code_check.features.github.usecase import android.content.Context -import android.net.ConnectivityManager -import android.net.NetworkCapabilities import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult @@ -13,22 +12,15 @@ class GitHubServiceUsecaseImpl @Inject constructor( private val repository: GitHubServiceRepository, + private val networkConnectivityService: NetworkConnectivityService, ) : GitHubServiceUsecase { override suspend fun fetchSearchResults( inputText: String, context: Context, ): NetworkResult> { - if (!isNetworkAvailable(context)) { + if (!networkConnectivityService.isNetworkAvailable()) { throw NetworkException("オフライン状態です") } return repository.fetchSearchResults(inputText) } - - private fun isNetworkAvailable(context: Context): Boolean { - val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - - val network = connectivityManager.activeNetwork ?: return false - val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false - return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - } } From ef83d5fbf3b85a7ae4d1debbb6ff61e8234738da Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:22:30 +0900 Subject: [PATCH 061/108] =?UTF-8?q?fix:=20=E3=81=84=E3=82=89=E3=81=AA?= =?UTF-8?q?=E3=81=84context=E3=81=AE=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/search/RepositorySearchViewModel.kt | 10 ++++++++-- .../features/github/usecase/GitHubServiceUsecase.kt | 1 - .../github/usecase/GitHubServiceUsecaseImpl.kt | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 7028faa..06cb877 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -34,6 +34,7 @@ class RepositorySearchViewModel /** * GitHubのレポジトリ検索を行う * @param query 検索キーワード + * @param context コンテキスト */ fun searchRepositories( query: String, @@ -45,7 +46,7 @@ class RepositorySearchViewModel } viewModelScope.launch { try { - val results = networkRepository.fetchSearchResults(query, context) + val results = networkRepository.fetchSearchResults(query) if (results is NetworkResult.Error) { handleError(results.exception, context) return@launch @@ -60,7 +61,12 @@ class RepositorySearchViewModel } } - private fun handleError( + /** + * エラーが発生した時に、Viewに問題を表示するためのもの + * @param GitHubError エラー情報 + * @param context コンテキスト + */ + private fun handleError( error: GitHubError, context: Context, ) { diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt index c6a0760..d218139 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt @@ -7,6 +7,5 @@ import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult interface GitHubServiceUsecase { suspend fun fetchSearchResults( inputText: String, - context: Context, ): NetworkResult> } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt index 8c4707e..34e4ae7 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt @@ -16,7 +16,6 @@ class GitHubServiceUsecaseImpl ) : GitHubServiceUsecase { override suspend fun fetchSearchResults( inputText: String, - context: Context, ): NetworkResult> { if (!networkConnectivityService.isNetworkAvailable()) { throw NetworkException("オフライン状態です") From 71552bff2272dff89755c1b152790c994ef0bfc8 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:25:47 +0900 Subject: [PATCH 062/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=82=92=E9=80=9A=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/NetworkConnectivityService.kt | 20 ++++++++++--------- .../search/RepositorySearchViewModel.kt | 12 +++++------ .../github/usecase/GitHubServiceUsecase.kt | 5 +---- .../usecase/GitHubServiceUsecaseImpl.kt | 7 ++----- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt index 0ad2c94..d11f4f9 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt @@ -8,13 +8,15 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class NetworkConnectivityService @Inject constructor( - @ApplicationContext private val context: Context -) { - fun isNetworkAvailable(): Boolean { - val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - val network = connectivityManager.activeNetwork ?: return false - val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false - return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) +class NetworkConnectivityService + @Inject + constructor( + @ApplicationContext private val context: Context, + ) { + fun isNetworkAvailable(): Boolean { + val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val network = connectivityManager.activeNetwork ?: return false + val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false + return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } } -} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 06cb877..1fca658 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -61,12 +61,12 @@ class RepositorySearchViewModel } } - /** - * エラーが発生した時に、Viewに問題を表示するためのもの - * @param GitHubError エラー情報 - * @param context コンテキスト - */ - private fun handleError( + /** + * エラーが発生した時に、Viewに問題を表示するためのもの + * @param GitHubError エラー情報 + * @param context コンテキスト + */ + private fun handleError( error: GitHubError, context: Context, ) { diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt index d218139..3583218 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt @@ -1,11 +1,8 @@ package jp.co.yumemi.android.code_check.features.github.usecase -import android.content.Context import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult interface GitHubServiceUsecase { - suspend fun fetchSearchResults( - inputText: String, - ): NetworkResult> + suspend fun fetchSearchResults(inputText: String): NetworkResult> } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt index 34e4ae7..a2e4ba6 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt @@ -1,8 +1,7 @@ package jp.co.yumemi.android.code_check.features.github.usecase -import android.content.Context -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult @@ -14,9 +13,7 @@ class GitHubServiceUsecaseImpl private val repository: GitHubServiceRepository, private val networkConnectivityService: NetworkConnectivityService, ) : GitHubServiceUsecase { - override suspend fun fetchSearchResults( - inputText: String, - ): NetworkResult> { + override suspend fun fetchSearchResults(inputText: String): NetworkResult> { if (!networkConnectivityService.isNetworkAvailable()) { throw NetworkException("オフライン状態です") } From 7aa12afbf113e7aa8621a7d431269844e3fdbc95 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:36:58 +0900 Subject: [PATCH 063/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=E6=96=B9=E6=B3=95=E3=82=92string?= =?UTF-8?q?=E3=81=AEID=E3=82=92=E6=B8=A1=E3=81=99=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/RepositorySearchFragment.kt | 7 +++++- .../search/RepositorySearchViewModel.kt | 22 ++++++++----------- app/src/main/res/values/strings.xml | 1 + 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index fd3d492..0301939 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -48,7 +48,12 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { adapter.submitList(it) } viewModel.errorMessage.observe(viewLifecycleOwner) { - it?.let { DialogHelper.showErrorDialog(requireContext(), it) } + it?.let { + DialogHelper.showErrorDialog( + requireContext(), + requireContext().getString(it) + ) + } } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 1fca658..70338e9 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -10,7 +10,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException -import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.launch @@ -23,10 +23,10 @@ import javax.inject.Inject class RepositorySearchViewModel @Inject constructor( - private val networkRepository: GitHubServiceUsecaseImpl, + private val networkRepository: GitHubServiceUsecase, ) : ViewModel() { - private val _errorMessage = MutableLiveData() - val errorMessage: LiveData get() = _errorMessage + private val _errorMessage = MutableLiveData() + val errorMessage: LiveData get() = _errorMessage private val _searchResults = MutableLiveData>() val searchResults: LiveData> get() = _searchResults @@ -41,14 +41,14 @@ class RepositorySearchViewModel context: Context, ) { if (query.isBlank()) { - _errorMessage.postValue("検索キーワードを入力してください。") + _errorMessage.postValue(R.string.form_is_empty) return } viewModelScope.launch { try { val results = networkRepository.fetchSearchResults(query) if (results is NetworkResult.Error) { - handleError(results.exception, context) + handleError(results.exception) return@launch } if (results is NetworkResult.Success) { @@ -56,7 +56,7 @@ class RepositorySearchViewModel } } catch (e: NetworkException) { Log.e("NetworkException", e.message, e) - handleError(GitHubError.NetworkError(e), context) + handleError(GitHubError.NetworkError(e)) } } } @@ -66,11 +66,8 @@ class RepositorySearchViewModel * @param GitHubError エラー情報 * @param context コンテキスト */ - private fun handleError( - error: GitHubError, - context: Context, - ) { - val messageRes = + private fun handleError(error: GitHubError) { + _errorMessage.value = when (error) { is GitHubError.NetworkError -> R.string.network_error is GitHubError.ApiError -> R.string.api_error @@ -78,6 +75,5 @@ class RepositorySearchViewModel is GitHubError.RateLimitError -> R.string.rate_limit_error is GitHubError.AuthenticationError -> R.string.auth_error } - _errorMessage.value = context.getString(messageRes) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9673950..a665d57 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,4 +11,5 @@ パースエラー セッションの時間切れ APIのエラー + フォームが空欄になっています \ No newline at end of file From 9a7f3309f622f7af30387c52c02d9c1d2419c717 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:37:38 +0900 Subject: [PATCH 064/108] =?UTF-8?q?ref:=20=E4=BD=BF=E3=82=8F=E3=81=AA?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9FviewModel=E3=81=AE=E5=91=BC?= =?UTF-8?q?=E3=81=B3=E5=87=BA=E3=81=97=E6=96=B9=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/search/RepositorySearchFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index 0301939..3f7c5a8 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -36,7 +36,6 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { ) { super.onViewCreated(view, savedInstanceState) _binding = FragmentRepositorySearchBinding.bind(view) -// viewModel = ViewModelProvider(this)[RepositorySearchViewModel::class.java] observeViewModel() setupRecyclerView() From 0291ed44512ba5afe212e92bf33ee81f852947b7 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:40:05 +0900 Subject: [PATCH 065/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/search/RepositorySearchFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index 3f7c5a8..47392ab 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -50,7 +50,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { it?.let { DialogHelper.showErrorDialog( requireContext(), - requireContext().getString(it) + requireContext().getString(it), ) } } From 77249d4564718278d975d4809864931258fd95fa Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:41:53 +0900 Subject: [PATCH 066/108] =?UTF-8?q?ref:=20=E3=81=84=E3=82=89=E3=81=AA?= =?UTF-8?q?=E3=81=84context=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/search/RepositorySearchViewModel.kt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index 70338e9..d19b58f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -1,6 +1,5 @@ package jp.co.yumemi.android.code_check.core.presenter.search -import android.content.Context import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -34,12 +33,8 @@ class RepositorySearchViewModel /** * GitHubのレポジトリ検索を行う * @param query 検索キーワード - * @param context コンテキスト */ - fun searchRepositories( - query: String, - context: Context, - ) { + fun searchRepositories(query: String) { if (query.isBlank()) { _errorMessage.postValue(R.string.form_is_empty) return @@ -63,8 +58,7 @@ class RepositorySearchViewModel /** * エラーが発生した時に、Viewに問題を表示するためのもの - * @param GitHubError エラー情報 - * @param context コンテキスト + * @param error エラー情報 */ private fun handleError(error: GitHubError) { _errorMessage.value = From 46db2fc204c66afe13a895bfa7e6d9ddc6ffbf82 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 11:43:02 +0900 Subject: [PATCH 067/108] =?UTF-8?q?ref:=20=E3=81=84=E3=82=89=E3=81=AA?= =?UTF-8?q?=E3=81=84context=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/search/RepositorySearchFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index 47392ab..12a133c 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -71,7 +71,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private fun setupSearchInput() { binding.searchInputText.setOnEditorActionListener { editText, action, _ -> if (action == EditorInfo.IME_ACTION_SEARCH) { - viewModel.searchRepositories(editText.text.toString().trim(), requireContext()) + viewModel.searchRepositories(editText.text.toString().trim()) true } else { false From d488bc8899b8d513ca22a8e209d1da3f930ec61f Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:42:36 +0900 Subject: [PATCH 068/108] =?UTF-8?q?add:=20Unit=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E7=92=B0=E5=A2=83=E6=A7=8B=E7=AF=89=E3=82=92=E8=A1=8C?= =?UTF-8?q?=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index abdc496..f241c7b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,6 +66,9 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' implementation "com.google.dagger:hilt-android:2.55" kapt "com.google.dagger:hilt-compiler:2.55" + testImplementation "org.mockito:mockito-core:4.6.1" + testImplementation 'org.mockito:mockito-inline:5.2.0' + // Retrofit implementation("com.squareup.retrofit2:converter-moshi:2.9.0") From 5684cc6ebeae29c5c8b26c25c2076c0baa19f6d8 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:42:53 +0900 Subject: [PATCH 069/108] =?UTF-8?q?add:=20README=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 46637ed..aff929e 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,19 @@ ./gradlew ktlintCheck ``` +### Unitテストについて + +- Hilt, JUnit, Mockitoを持ちいてUnitテストを作成しました。 + +```bash +# 全件実行をする方法 +./gradlew test + +# 単体で動かす方法 +./gradlew :app:testDebugUnitTest --tests "jp.co.yumemi.android.code_check.features.github.GitHubServiceRepositoryImplTest" +``` + + ### 動作 1. 何かしらのキーワードを入力 From bf00735567c78a5da5fb590802c5a88ab0fd253c Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:43:06 +0900 Subject: [PATCH 070/108] =?UTF-8?q?add:=20GitHubServiceRepositoryImplTest?= =?UTF-8?q?=E3=82=92=E8=A8=98=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/GitHubServiceUsecaseImplTest.kt | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt new file mode 100644 index 0000000..8aaf44a --- /dev/null +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt @@ -0,0 +1,74 @@ +package jp.co.yumemi.android.code_check.features.github + +import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import kotlinx.coroutines.runBlocking +import org.junit.Assert.assertEquals +import org.junit.Assert.assertThrows +import org.junit.Before +import org.junit.Test +import org.mockito.Mockito.`when` +import org.mockito.Mockito.mock +import org.mockito.MockitoAnnotations + +class GitHubServiceUsecaseImplTest { + + private lateinit var repository: GitHubServiceRepository + private lateinit var networkConnectivityService: NetworkConnectivityService + private lateinit var usecase: GitHubServiceUsecaseImpl + + @Before + fun setUp() { + MockitoAnnotations.openMocks(this) + repository = mock(GitHubServiceRepository::class.java) + networkConnectivityService = mock(NetworkConnectivityService::class.java) + usecase = GitHubServiceUsecaseImpl(repository, networkConnectivityService) + } + + @Test + fun `fetchSearchResults throws NetworkException when offline`() { + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(false) + + val exception = assertThrows(NetworkException::class.java) { + runBlocking { + usecase.fetchSearchResults("test") + } + } + + assertEquals("オフライン状態です", exception.message) + } + + @Test + fun `fetchSearchResults returns results when online`() = runBlocking { + val mockResults = listOf( + RepositoryItem( + name = "repo1", + ownerIconUrl = "description1", + language = "url1", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + ), + RepositoryItem( + name = "repo2", + ownerIconUrl = "description2", + language = "url2", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + ) + ) + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) + + val result = usecase.fetchSearchResults("test") + + assertEquals(NetworkResult.Success(mockResults), result) + } +} \ No newline at end of file From bebd0c5d57e74bf884af8cb11363ddcb0f8ccf1b Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:43:20 +0900 Subject: [PATCH 071/108] =?UTF-8?q?add:=20GitHubServiceRepositoryImplTest?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/GitHubServiceRepositoryImplTest.kt | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt new file mode 100644 index 0000000..057d70d --- /dev/null +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt @@ -0,0 +1,122 @@ +package jp.co.yumemi.android.code_check.features.github + +import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryOwner +import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepositoryImpl +import jp.co.yumemi.android.code_check.features.github.utils.GitHubError +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import kotlinx.coroutines.runBlocking +import org.json.JSONException +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.mockito.Mockito.* +import retrofit2.HttpException +import java.io.IOException + +class GitHubServiceRepositoryImplTest { + + private lateinit var api: GitHubServiceApi + private lateinit var repository: GitHubServiceRepositoryImpl + + @Before + fun setUp() { + api = mock(GitHubServiceApi::class.java) + repository = GitHubServiceRepositoryImpl(api) + } + + @Test + fun `fetchSearchResults returns success with valid data`() = runBlocking { + // Arrange + val mockResponse = mockRepositoryList() + `when`(api.getRepository("test")).thenReturn(mockResponse) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals(2, success.data.size) + assertEquals("repo1", success.data[0].name) + assertEquals("owner1", success.data[0].ownerIconUrl) + } + + @Test + fun `fetchSearchResults returns error on HttpException`() = runBlocking { + // Arrange + val httpException = mock(HttpException::class.java) + `when`(httpException.code()).thenReturn(401) + `when`(api.getRepository("test")).thenThrow(httpException) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.AuthenticationError) + } + + @Test + fun `fetchSearchResults returns error on IOException`() = runBlocking { + // Arrange + `when`(api.getRepository("test")).thenAnswer { + throw IOException("Network error") + } + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.NetworkError) + } + + @Test + fun `fetchSearchResults returns error on JSONException`() = runBlocking { + // Arrange + `when`(api.getRepository("test")).thenAnswer { + throw JSONException("Parsing error") + } + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.ParseError) + } + + + // Mockデータ生成関数 + private fun mockRepositoryList(): RepositoryList { + return RepositoryList( + items = listOf( + RepositoryItem( + name = "repo1", + owner = RepositoryOwner("owner1"), + language = "Kotlin", + stargazersCount = 100, + watchersCount = 50, + forksCount = 20, + openIssuesCount = 5 + ), + RepositoryItem( + name = "repo2", + owner = RepositoryOwner("owner2"), + language = "Java", + stargazersCount = 200, + watchersCount = 80, + forksCount = 30, + openIssuesCount = 10 + ) + ) + ) + } +} + From 4cfa71d8969532b9ed5a867cffd09d2f4ecf83c0 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:45:28 +0900 Subject: [PATCH 072/108] =?UTF-8?q?update:=20UnitTest=E3=82=92CI=E3=81=A7?= =?UTF-8?q?=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check_workflow.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_workflow.yaml b/.github/workflows/check_workflow.yaml index ede563e..6876f03 100644 --- a/.github/workflows/check_workflow.yaml +++ b/.github/workflows/check_workflow.yaml @@ -1,7 +1,7 @@ name: Run Gradle on PRs on: pull_request jobs: - gradle: + ktlint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -12,5 +12,19 @@ jobs: - name: Change Permission run: chmod +x ./gradlew - - name: Execute Gradle check + - name: Execute Ktlint Check run: ./gradlew ktlintCheck + + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Change Permission + run: chmod +x ./gradlew + + - name: Execute Unit Tests + run: ./gradlew test From 1649323940c1119796d9b987957fc09361371244 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:51:21 +0900 Subject: [PATCH 073/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=82=92=E8=B5=B0=E3=82=89=E3=81=9B=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/GitHubServiceRepositoryImplTest.kt | 159 +++++++++--------- .../github/GitHubServiceUsecaseImplTest.kt | 68 ++++---- 2 files changed, 116 insertions(+), 111 deletions(-) diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt index 057d70d..d9eb4b7 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt @@ -12,12 +12,12 @@ import org.json.JSONException import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test -import org.mockito.Mockito.* +import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` import retrofit2.HttpException import java.io.IOException class GitHubServiceRepositoryImplTest { - private lateinit var api: GitHubServiceApi private lateinit var repository: GitHubServiceRepositoryImpl @@ -28,95 +28,98 @@ class GitHubServiceRepositoryImplTest { } @Test - fun `fetchSearchResults returns success with valid data`() = runBlocking { - // Arrange - val mockResponse = mockRepositoryList() - `when`(api.getRepository("test")).thenReturn(mockResponse) - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Success) - val success = result as NetworkResult.Success - assertEquals(2, success.data.size) - assertEquals("repo1", success.data[0].name) - assertEquals("owner1", success.data[0].ownerIconUrl) - } + fun `fetchSearchResults returns success with valid data`() = + runBlocking { + // Arrange + val mockResponse = mockRepositoryList() + `when`(api.getRepository("test")).thenReturn(mockResponse) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals(2, success.data.size) + assertEquals("repo1", success.data[0].name) + assertEquals("owner1", success.data[0].ownerIconUrl) + } @Test - fun `fetchSearchResults returns error on HttpException`() = runBlocking { - // Arrange - val httpException = mock(HttpException::class.java) - `when`(httpException.code()).thenReturn(401) - `when`(api.getRepository("test")).thenThrow(httpException) - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.AuthenticationError) - } + fun `fetchSearchResults returns error on HttpException`() = + runBlocking { + // Arrange + val httpException = mock(HttpException::class.java) + `when`(httpException.code()).thenReturn(401) + `when`(api.getRepository("test")).thenThrow(httpException) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.AuthenticationError) + } @Test - fun `fetchSearchResults returns error on IOException`() = runBlocking { - // Arrange - `when`(api.getRepository("test")).thenAnswer { - throw IOException("Network error") + fun `fetchSearchResults returns error on IOException`() = + runBlocking { + // Arrange + `when`(api.getRepository("test")).thenAnswer { + throw IOException("Network error") + } + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.NetworkError) } - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.NetworkError) - } - @Test - fun `fetchSearchResults returns error on JSONException`() = runBlocking { - // Arrange - `when`(api.getRepository("test")).thenAnswer { - throw JSONException("Parsing error") + fun `fetchSearchResults returns error on JSONException`() = + runBlocking { + // Arrange + `when`(api.getRepository("test")).thenAnswer { + throw JSONException("Parsing error") + } + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.ParseError) } - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.ParseError) - } - - // Mockデータ生成関数 private fun mockRepositoryList(): RepositoryList { return RepositoryList( - items = listOf( - RepositoryItem( - name = "repo1", - owner = RepositoryOwner("owner1"), - language = "Kotlin", - stargazersCount = 100, - watchersCount = 50, - forksCount = 20, - openIssuesCount = 5 + items = + listOf( + RepositoryItem( + name = "repo1", + owner = RepositoryOwner("owner1"), + language = "Kotlin", + stargazersCount = 100, + watchersCount = 50, + forksCount = 20, + openIssuesCount = 5, + ), + RepositoryItem( + name = "repo2", + owner = RepositoryOwner("owner2"), + language = "Java", + stargazersCount = 200, + watchersCount = 80, + forksCount = 30, + openIssuesCount = 10, + ), ), - RepositoryItem( - name = "repo2", - owner = RepositoryOwner("owner2"), - language = "Java", - stargazersCount = 200, - watchersCount = 80, - forksCount = 30, - openIssuesCount = 10 - ) - ) ) } } - diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt index 8aaf44a..f473f52 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt @@ -11,12 +11,11 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Test -import org.mockito.Mockito.`when` import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations class GitHubServiceUsecaseImplTest { - private lateinit var repository: GitHubServiceRepository private lateinit var networkConnectivityService: NetworkConnectivityService private lateinit var usecase: GitHubServiceUsecaseImpl @@ -33,42 +32,45 @@ class GitHubServiceUsecaseImplTest { fun `fetchSearchResults throws NetworkException when offline`() { `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(false) - val exception = assertThrows(NetworkException::class.java) { - runBlocking { - usecase.fetchSearchResults("test") + val exception = + assertThrows(NetworkException::class.java) { + runBlocking { + usecase.fetchSearchResults("test") + } } - } assertEquals("オフライン状態です", exception.message) } @Test - fun `fetchSearchResults returns results when online`() = runBlocking { - val mockResults = listOf( - RepositoryItem( - name = "repo1", - ownerIconUrl = "description1", - language = "url1", - stargazersCount = 100, - forksCount = 50, - openIssuesCount = 30, - watchersCount = 70, - ), - RepositoryItem( - name = "repo2", - ownerIconUrl = "description2", - language = "url2", - stargazersCount = 100, - forksCount = 50, - openIssuesCount = 30, - watchersCount = 70, - ) - ) - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) + fun `fetchSearchResults returns results when online`() = + runBlocking { + val mockResults = + listOf( + RepositoryItem( + name = "repo1", + ownerIconUrl = "description1", + language = "url1", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + ), + RepositoryItem( + name = "repo2", + ownerIconUrl = "description2", + language = "url2", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + ), + ) + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) - val result = usecase.fetchSearchResults("test") + val result = usecase.fetchSearchResults("test") - assertEquals(NetworkResult.Success(mockResults), result) - } -} \ No newline at end of file + assertEquals(NetworkResult.Success(mockResults), result) + } +} From 657a638a78b4c67ccdafbd9c44822bcad47bf4ab Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 12:59:30 +0900 Subject: [PATCH 074/108] =?UTF-8?q?update:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E5=8F=AF=E8=A6=96=E6=80=A7=E3=81=A8=E5=93=81=E8=B3=AA?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check_workflow.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_workflow.yaml b/.github/workflows/check_workflow.yaml index 6876f03..9325e33 100644 --- a/.github/workflows/check_workflow.yaml +++ b/.github/workflows/check_workflow.yaml @@ -27,4 +27,17 @@ jobs: run: chmod +x ./gradlew - name: Execute Unit Tests - run: ./gradlew test + run: ./gradlew test jacocoTestReport + + - name: Upload Test Results + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-results + path: app/build/test-results + + - name: Upload Coverage Report + uses: actions/upload-artifact@v4 + with: + name: coverage-report + path: app/build/reports/jacoco From 7af8d388899fea9544088451f30725f20347c7bd Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:02:21 +0900 Subject: [PATCH 075/108] =?UTF-8?q?update:=20Mockito=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E6=8F=83=E3=81=88?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f241c7b..cc8345b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' implementation "com.google.dagger:hilt-android:2.55" kapt "com.google.dagger:hilt-compiler:2.55" - testImplementation "org.mockito:mockito-core:4.6.1" + testImplementation "org.mockito:mockito-core:5.2.0" testImplementation 'org.mockito:mockito-inline:5.2.0' From cc2f09a87a524a567b95b953b4a34d250f7a6a0d Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:13:08 +0900 Subject: [PATCH 076/108] =?UTF-8?q?update:=20=E3=83=AC=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check_workflow.yaml | 2 +- app/build.gradle | 30 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_workflow.yaml b/.github/workflows/check_workflow.yaml index 9325e33..e6c72b0 100644 --- a/.github/workflows/check_workflow.yaml +++ b/.github/workflows/check_workflow.yaml @@ -40,4 +40,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: coverage-report - path: app/build/reports/jacoco + path: app/build/reports/tests/testDebugUnitTest/ diff --git a/app/build.gradle b/app/build.gradle index cc8345b..8ccc2b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,7 @@ plugins { id 'androidx.navigation.safeargs.kotlin' id("org.jlleitschuh.gradle.ktlint") version "12.1.2" id 'com.google.dagger.hilt.android' + id 'jacoco' } android { @@ -80,3 +81,32 @@ dependencies { kapt { correctErrorTypes true } + +jacoco { + toolVersion = "0.8.8" +} + +//tasks.withType(Test) { +// useJUnitPlatform() +// finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run +//} + +tasks.register("jacocoTestReport", JacocoReport) { + dependsOn(tasks.test) + + reports { + xml.required.set(true) + html.required.set(true) + } + + def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*'] + def debugTree = fileTree(dir: "$buildDir/intermediates/javac/debug", excludes: fileFilter) + def mainSrc = "$projectDir/src/main/java" + + sourceDirectories.setFrom(files([mainSrc])) + classDirectories.setFrom(files([debugTree])) + executionData.setFrom(fileTree(dir: "$buildDir", includes: [ + "jacoco/testDebugUnitTest.exec", + "outputs/code-coverage/connected/*coverage.ec" + ])) +} \ No newline at end of file From 731d0c60d9b7afac9255405fb6acb56b575d5327 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:22:36 +0900 Subject: [PATCH 077/108] =?UTF-8?q?update:=20=E3=83=AC=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=AE=E4=BB=95=E6=96=B9?= =?UTF-8?q?=E3=82=92=E6=98=8E=E8=A8=98=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aff929e..02e3dce 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ ```bash # 全件実行をする方法 -./gradlew test +./gradlew test jacocoTestReport # 単体で動かす方法 ./gradlew :app:testDebugUnitTest --tests "jp.co.yumemi.android.code_check.features.github.GitHubServiceRepositoryImplTest" From 096b694c98fa5ba24ed6033df6f85708832ba72d Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:22:58 +0900 Subject: [PATCH 078/108] =?UTF-8?q?fix:=20Kotlin=E3=81=AE=E3=82=BD?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=82=92=E8=A1=8C=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8ccc2b5..2499a35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -103,8 +103,10 @@ tasks.register("jacocoTestReport", JacocoReport) { def debugTree = fileTree(dir: "$buildDir/intermediates/javac/debug", excludes: fileFilter) def mainSrc = "$projectDir/src/main/java" - sourceDirectories.setFrom(files([mainSrc])) - classDirectories.setFrom(files([debugTree])) + sourceDirectories.setFrom(files([ + mainSrc, + "$projectDir/src/main/kotlin" + ])) executionData.setFrom(fileTree(dir: "$buildDir", includes: [ "jacoco/testDebugUnitTest.exec", "outputs/code-coverage/connected/*coverage.ec" From f4f633224753dfde7b902d461f2842c8f7fdb951 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:26:17 +0900 Subject: [PATCH 079/108] =?UTF-8?q?update:=20readme=E3=81=ABWeb=E3=81=A7?= =?UTF-8?q?=E8=A6=8B=E3=82=8C=E3=82=8B=E3=83=AC=E3=83=9D=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=81=AE=E3=83=91=E3=82=B9=E3=82=92=E8=A8=98=E8=BC=89=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 02e3dce..e6a9225 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,9 @@ ./gradlew :app:testDebugUnitTest --tests "jp.co.yumemi.android.code_check.features.github.GitHubServiceRepositoryImplTest" ``` +レポートの保存場所 +以下のパスにWeb表示ができるレポートが格納されます。 +`app/build/reports/tests/testDebugUnitTest/` ### 動作 From 69aec0d5d71e20d9d1c1f32deb33679a889bd94c Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:50:56 +0900 Subject: [PATCH 080/108] =?UTF-8?q?add:jetpackCompose=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2499a35..95643dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,6 +7,7 @@ plugins { id("org.jlleitschuh.gradle.ktlint") version "12.1.2" id 'com.google.dagger.hilt.android' id 'jacoco' + id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" } android { @@ -39,6 +40,10 @@ android { buildFeatures { viewBinding true buildConfig true + compose true + } + composeOptions { + kotlinCompilerExtensionVersion '1.5.0' } } @@ -76,6 +81,16 @@ dependencies { implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") implementation("com.squareup.retrofit2:retrofit:2.11.0") implementation("com.squareup.moshi:moshi-kotlin:1.14.0") + + // jetpack compose + def composeBom = platform('androidx.compose:compose-bom:2025.01.00') + implementation composeBom + androidTestImplementation composeBom + implementation 'androidx.compose.material3:material3' + implementation 'androidx.compose.foundation:foundation' + implementation 'androidx.compose.ui:ui' + implementation 'androidx.compose.ui:ui-tooling-preview' + debugImplementation 'androidx.compose.ui:ui-tooling' } kapt { @@ -86,11 +101,6 @@ jacoco { toolVersion = "0.8.8" } -//tasks.withType(Test) { -// useJUnitPlatform() -// finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run -//} - tasks.register("jacocoTestReport", JacocoReport) { dependsOn(tasks.test) @@ -111,4 +121,4 @@ tasks.register("jacocoTestReport", JacocoReport) { "jacoco/testDebugUnitTest.exec", "outputs/code-coverage/connected/*coverage.ec" ])) -} \ No newline at end of file +} From 6d3bfc6aa97176fa3b64598933cd35dd54d35f16 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 13:51:26 +0900 Subject: [PATCH 081/108] =?UTF-8?q?fix:=20=20Activity=E3=81=AE=E5=90=8D?= =?UTF-8?q?=E5=89=8D=E3=82=92MainActivity=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../android/code_check/{TopActivity.kt => MainActivity.kt} | 2 +- app/src/main/res/layout/activity_top.xml | 2 +- app/src/main/res/layout/fragment_repository_search.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/{TopActivity.kt => MainActivity.kt} (77%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e1287a..b83f7e1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ android:fullBackupContent="@xml/backup_descriptor" android:name=".CodeCheckApplication"> diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt similarity index 77% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt index 926636a..c00ec29 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt @@ -7,4 +7,4 @@ import androidx.appcompat.app.AppCompatActivity import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class TopActivity : AppCompatActivity(R.layout.activity_top) +class MainActivity : AppCompatActivity(R.layout.activity_top) diff --git a/app/src/main/res/layout/activity_top.xml b/app/src/main/res/layout/activity_top.xml index bba2b95..9eb3991 100644 --- a/app/src/main/res/layout/activity_top.xml +++ b/app/src/main/res/layout/activity_top.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".TopActivity"> + tools:context=".MainActivity"> + tools:context=".MainActivity"> Date: Mon, 20 Jan 2025 13:51:38 +0900 Subject: [PATCH 082/108] =?UTF-8?q?fix:=20=E3=83=87=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=88=E3=81=AE=E3=83=86=E3=83=BC=E3=83=9E=E3=82=92?= =?UTF-8?q?=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/theme/Color.kt | 11 +++ .../code_check/core/presenter/theme/Theme.kt | 71 +++++++++++++++++++ .../code_check/core/presenter/theme/Type.kt | 34 +++++++++ 3 files changed, 116 insertions(+) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt new file mode 100644 index 0000000..2fa9869 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt @@ -0,0 +1,11 @@ +package jp.co.yumemi.android.code_check.core.presenter.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt new file mode 100644 index 0000000..290ba05 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt @@ -0,0 +1,71 @@ +package jp.co.yumemi.android.code_check.core.presenter.theme + + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun CodeCheckAppTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt new file mode 100644 index 0000000..6859f57 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt @@ -0,0 +1,34 @@ +package jp.co.yumemi.android.code_check.core.presenter.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file From 5ceb594a8040735c8b80fe2206f7fde578b09d9e Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 16:52:30 +0900 Subject: [PATCH 083/108] =?UTF-8?q?add:=20=E6=A4=9C=E7=B4=A2=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 + .../yumemi/android/code_check/MainActivity.kt | 21 +- .../code_check/core/presenter/MainScreen.kt | 60 ++++++ .../detail/RepositoryDetailScreen.kt | 11 + .../core/presenter/router/MainRouter.kt | 45 ++++ .../search/RepositorySearchScreen.kt | 197 ++++++++++++++++++ .../code_check/core/presenter/theme/Theme.kt | 34 +-- 7 files changed, 347 insertions(+), 25 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt diff --git a/app/build.gradle b/app/build.gradle index 95643dc..be0e0d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,6 +74,7 @@ dependencies { kapt "com.google.dagger:hilt-compiler:2.55" testImplementation "org.mockito:mockito-core:5.2.0" testImplementation 'org.mockito:mockito-inline:5.2.0' + implementation 'androidx.hilt:hilt-navigation-compose:1.2.0' // Retrofit @@ -91,6 +92,9 @@ dependencies { implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-tooling-preview' debugImplementation 'androidx.compose.ui:ui-tooling' + implementation 'androidx.activity:activity-compose:1.10.0' + implementation 'androidx.navigation:navigation-compose:2.8.5' + } kapt { diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt index c00ec29..c25411a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt @@ -3,8 +3,27 @@ */ package jp.co.yumemi.android.code_check +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.ui.Modifier import dagger.hilt.android.AndroidEntryPoint +import jp.co.yumemi.android.code_check.core.presenter.MainScreen +import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme @AndroidEntryPoint -class MainActivity : AppCompatActivity(R.layout.activity_top) +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + CodeCheckAppTheme { + MainScreen() + } + } + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt new file mode 100644 index 0000000..6f5e6bb --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt @@ -0,0 +1,60 @@ +package jp.co.yumemi.android.code_check.core.presenter + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.navigation.compose.rememberNavController +import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.presenter.router.MainRouter + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainScreen() { + val context = LocalContext.current + val appName = context.getString(R.string.app_name) + + val navController = rememberNavController() + val topBarTitle by remember { + mutableStateOf(appName) + } + + Scaffold( + topBar = { + TopAppBar( + title = { + Text( + text = topBarTitle, + fontWeight = FontWeight.Bold + ) + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + titleContentColor = MaterialTheme.colorScheme.primary, + ), + ) + }, + ) { innerPadding -> + MainRouter( + toDetailScreen = { +// navController.navigate("${BottomNavigationBarRoute.ROUTE_EDITOR.route}/${id}") + }, + toBackScreen = { + navController.popBackStack() + }, + navController = navController, + modifier = Modifier + .padding(innerPadding) + ) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt new file mode 100644 index 0000000..107b118 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -0,0 +1,11 @@ +package jp.co.yumemi.android.code_check.core.presenter.detail + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable + +@Composable +fun RepositoryDetailScreen( + toBack: () -> Unit +){ + Text(text = "RepositoryDetailScreen") +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt new file mode 100644 index 0000000..41f2991 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt @@ -0,0 +1,45 @@ +package jp.co.yumemi.android.code_check.core.presenter.router + + +import android.util.Log +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.navigation.NavHostController +import androidx.navigation.NavType +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument +import jp.co.yumemi.android.code_check.core.presenter.detail.RepositoryDetailScreen +import jp.co.yumemi.android.code_check.core.presenter.search.RepositorySearchScreen + +@Composable +fun MainRouter( + toDetailScreen: () -> Unit, + toBackScreen: () -> Unit, + navController: NavHostController, + modifier: Modifier = Modifier +) { + NavHost( + navController = navController, + startDestination = BottomNavigationBarRoute.SEARCH.route, + modifier = modifier.fillMaxSize() + ) { + composable(BottomNavigationBarRoute.SEARCH.route) { + RepositorySearchScreen( + toDetailScreen = toDetailScreen + ) + } + composable(BottomNavigationBarRoute.DETAIL.route) { + RepositoryDetailScreen( + toBack = toBackScreen + ) + } + } +} + +enum class BottomNavigationBarRoute(val route: String,val title:String) { + SEARCH("search","検索"), + DETAIL("detail","詳細"), +} \ No newline at end of file diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt new file mode 100644 index 0000000..ba7ff08 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -0,0 +1,197 @@ +package jp.co.yumemi.android.code_check.core.presenter.search + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.sharp.Search +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.semantics.isTraversalGroup +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.LocalLifecycleOwner +import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme +import jp.co.yumemi.android.code_check.core.utils.DialogHelper + +@Composable +fun RepositorySearchScreen( + toDetailScreen: () -> Unit, + viewModel: RepositorySearchViewModel = hiltViewModel() +) { + var inputText by remember { mutableStateOf("") } + val repositoryName = remember { mutableStateListOf() } + val lifecycleOwner = LocalLifecycleOwner.current + val context = LocalContext.current + + LaunchedEffect(Unit) { + viewModel.searchResults.observe(lifecycleOwner) { + repositoryName.clear() + repositoryName.addAll(it) + } + viewModel.errorMessage.observe(lifecycleOwner) { + it?.let { + DialogHelper.showErrorDialog( + context, + context.getString(it), + ) + } + } + } + + Column { + CustomSearchBar( + inputText = inputText, + onValueChange = { inputText = it }, + searchAction = { searchWord -> + repositoryName.clear() + viewModel.searchRepositories(searchWord.trim()) + } + ) + RepositoryListView( + repositoryName = repositoryName, + onTapping = toDetailScreen, + ) + } +} + +@Composable +fun RepositoryListView( + repositoryName: List, + onTapping: () -> Unit = {} +) { + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .semantics { isTraversalGroup = true } + ) { + items(repositoryName.size) { index -> + Column( + modifier = Modifier + .clickable { onTapping() } + .fillMaxWidth() + .padding(vertical = 8.dp, horizontal = 16.dp) + ) { + Text( + text = repositoryName[index].name, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.primary + ) + Spacer(modifier = Modifier.height(8.dp)) + HorizontalDivider(color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.2f)) + } + } + } +} + +@Composable +fun CustomSearchBar( + inputText: String = "", + onValueChange: (String) -> Unit = {}, + searchAction:(String) -> Unit +) { + val context = LocalContext.current + val keyboardController = LocalSoftwareKeyboardController.current + + // キーボードアクションを定義 + val keyboardActions = KeyboardActions( + onSearch = { + searchAction(inputText) + keyboardController?.hide() + } + ) + + TextField( + value = inputText, + onValueChange = onValueChange, + placeholder = { Text(context.getString(R.string.searchInputText_hint)) }, + leadingIcon = { + Icon( + Icons.Sharp.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary + ) + }, + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .background( + color = MaterialTheme.colorScheme.surface, + shape = RoundedCornerShape(40.dp) + ), + colors = TextFieldDefaults.colors( + focusedContainerColor = MaterialTheme.colorScheme.primaryContainer, + unfocusedContainerColor = MaterialTheme.colorScheme.primaryContainer, + focusedTextColor = MaterialTheme.colorScheme.onSurface, + unfocusedTextColor = MaterialTheme.colorScheme.onSurface, + cursorColor = MaterialTheme.colorScheme.primary, + focusedIndicatorColor = MaterialTheme.colorScheme.primaryContainer, + unfocusedIndicatorColor = MaterialTheme.colorScheme.primaryContainer + ), + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Text, + imeAction = ImeAction.Search, + ), + keyboardActions = keyboardActions, + maxLines = 1, + singleLine = true + ) +} + +@Composable +@Preview(showBackground = true) +fun CustomSearchBarPreview() { + CodeCheckAppTheme { + CustomSearchBar(inputText = "Example") {} + } +} + +@Composable +@Preview(showBackground = true) +fun RepositoryListViewPreview() { + CodeCheckAppTheme { + RepositoryListView( + repositoryName = listOf( + RepositoryItem( + name = "Jetpack Compose", + ownerIconUrl = "", + language = "Jetpack Compose", + stargazersCount = 1, + forksCount = 1, + openIssuesCount = 1, + watchersCount = 1 + ) + ), + onTapping = {} + ) + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt index 290ba05..db9b027 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt @@ -1,7 +1,6 @@ package jp.co.yumemi.android.code_check.core.presenter.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme @@ -10,32 +9,27 @@ import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable -import androidx.compose.runtime.SideEffect -import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowCompat private val DarkColorScheme = darkColorScheme( primary = Purple80, secondary = PurpleGrey80, - tertiary = Pink80 + tertiary = Pink80, + background = Color(0xFF121212), + surface = Color(0xFF1E1E1E), + onPrimary = Color.Black, + onSecondary = Color.Black ) private val LightColorScheme = lightColorScheme( primary = Purple40, secondary = PurpleGrey40, - tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), + tertiary = Pink40, + background = Color(0xFFFFFFFF), + surface = Color(0xFFF5F5F5), onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ + onSecondary = Color.White ) @Composable @@ -54,14 +48,6 @@ fun CodeCheckAppTheme( darkTheme -> DarkColorScheme else -> LightColorScheme } - val view = LocalView.current - if (!view.isInEditMode) { - SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = colorScheme.primary.toArgb() - WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme - } - } MaterialTheme( colorScheme = colorScheme, From 21e0dd321518970d0edf4293810d26d49f9baf7f Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 16:57:52 +0900 Subject: [PATCH 084/108] =?UTF-8?q?add:=20=E3=83=AD=E3=83=BC=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E9=9D=A2=E3=81=AE=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/RepositorySearchScreen.kt | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index ba7ff08..423c381 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -2,8 +2,10 @@ package jp.co.yumemi.android.code_check.core.presenter.search import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -13,6 +15,7 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.sharp.Search +import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -26,6 +29,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalSoftwareKeyboardController @@ -51,11 +55,13 @@ fun RepositorySearchScreen( val repositoryName = remember { mutableStateListOf() } val lifecycleOwner = LocalLifecycleOwner.current val context = LocalContext.current + var isLoading by remember { mutableStateOf(false) } LaunchedEffect(Unit) { viewModel.searchResults.observe(lifecycleOwner) { repositoryName.clear() repositoryName.addAll(it) + isLoading = false } viewModel.errorMessage.observe(lifecycleOwner) { it?.let { @@ -64,9 +70,12 @@ fun RepositorySearchScreen( context.getString(it), ) } + isLoading = false } } + + Column { CustomSearchBar( inputText = inputText, @@ -74,8 +83,12 @@ fun RepositorySearchScreen( searchAction = { searchWord -> repositoryName.clear() viewModel.searchRepositories(searchWord.trim()) + isLoading = true } ) + if(isLoading){ + ProgressCycle() + } RepositoryListView( repositoryName = repositoryName, onTapping = toDetailScreen, @@ -83,6 +96,24 @@ fun RepositorySearchScreen( } } +@Composable +fun ProgressCycle(){ + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight() + .padding(8.dp) + .semantics { isTraversalGroup = true } + + ) { + CircularProgressIndicator() + Text(text = "検索中") + } + +} + @Composable fun RepositoryListView( repositoryName: List, From 15c7546197540f04f3d3d70ddada5b6018880adb Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 17:18:07 +0900 Subject: [PATCH 085/108] =?UTF-8?q?add:=20=E8=A9=B3=E7=B4=B0=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AB=E9=81=B7=E7=A7=BB=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 + .../yumemi/android/code_check/MainActivity.kt | 8 +- ...{RepositoryItem.kt => RepositoryEntity.kt} | 3 +- .../code_check/core/presenter/MainScreen.kt | 23 +-- .../detail/RepositoryDetailFragment.kt | 4 +- .../detail/RepositoryDetailScreen.kt | 10 +- .../core/presenter/router/MainRouter.kt | 28 ++-- .../RepositoryListRecyclerViewAdapter.kt | 18 +-- .../search/RepositorySearchFragment.kt | 8 +- .../search/RepositorySearchScreen.kt | 151 +++++++++--------- .../search/RepositorySearchViewModel.kt | 6 +- .../code_check/core/presenter/theme/Color.kt | 2 +- .../code_check/core/presenter/theme/Theme.kt | 62 +++---- .../code_check/core/presenter/theme/Type.kt | 22 +-- .../github/entity/GitHubServiceEntity.kt | 1 + .../reposiotory/GitHubServiceRepository.kt | 4 +- .../GitHubServiceRepositoryImpl.kt | 7 +- .../github/usecase/GitHubServiceUsecase.kt | 4 +- .../usecase/GitHubServiceUsecaseImpl.kt | 4 +- app/src/main/res/navigation/nav_graph.xml | 2 +- .../github/GitHubServiceUsecaseImplTest.kt | 6 +- 21 files changed, 195 insertions(+), 180 deletions(-) rename app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/{RepositoryItem.kt => RepositoryEntity.kt} (88%) diff --git a/.editorconfig b/.editorconfig index c91f60f..8dc7d85 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,2 +1,4 @@ [*.{kt,kts}] ktlint_standard_package-name = disabled +ktlint_function_naming_ignore_when_annotated_with = Composable + diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt index c25411a..60a049b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt @@ -6,12 +6,6 @@ package jp.co.yumemi.android.code_check import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.appcompat.app.AppCompatActivity -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.ui.Modifier import dagger.hilt.android.AndroidEntryPoint import jp.co.yumemi.android.code_check.core.presenter.MainScreen import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme @@ -21,7 +15,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - CodeCheckAppTheme { + CodeCheckAppTheme { MainScreen() } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryEntity.kt similarity index 88% rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryEntity.kt index 1136dce..e172ea5 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryEntity.kt @@ -4,7 +4,8 @@ import android.os.Parcelable import kotlinx.parcelize.Parcelize @Parcelize -data class RepositoryItem( +data class RepositoryEntity( + val id: Int, val name: String, val ownerIconUrl: String, val language: String, diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt index 6f5e6bb..b888478 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.navigation.compose.rememberNavController import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.presenter.router.BottomNavigationBarRoute import jp.co.yumemi.android.code_check.core.presenter.router.MainRouter @OptIn(ExperimentalMaterial3Api::class) @@ -35,26 +36,28 @@ fun MainScreen() { title = { Text( text = topBarTitle, - fontWeight = FontWeight.Bold + fontWeight = FontWeight.Bold, ) }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.primaryContainer, - titleContentColor = MaterialTheme.colorScheme.primary, - ), + colors = + TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + titleContentColor = MaterialTheme.colorScheme.primary, + ), ) }, ) { innerPadding -> MainRouter( - toDetailScreen = { -// navController.navigate("${BottomNavigationBarRoute.ROUTE_EDITOR.route}/${id}") + toDetailScreen = { id -> + navController.navigate("${BottomNavigationBarRoute.DETAIL.route}/$id") }, toBackScreen = { navController.popBackStack() }, navController = navController, - modifier = Modifier - .padding(innerPadding) + modifier = + Modifier + .padding(innerPadding), ) } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt index 614ee71..d535f66 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt @@ -10,7 +10,7 @@ import androidx.navigation.fragment.navArgs import coil.load import dagger.hilt.android.AndroidEntryPoint import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding @AndroidEntryPoint @@ -32,7 +32,7 @@ class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { bindViews(item) } - private fun bindViews(item: RepositoryItem) { + private fun bindViews(item: RepositoryEntity) { binding.ownerIconView.load(item.ownerIconUrl) binding.nameView.text = item.name binding.languageView.text = resources.getString(R.string.written_language, item.language) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 107b118..01ed0b4 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -5,7 +5,9 @@ import androidx.compose.runtime.Composable @Composable fun RepositoryDetailScreen( - toBack: () -> Unit -){ - Text(text = "RepositoryDetailScreen") -} \ No newline at end of file + toBack: () -> Unit, + repositoryId: Int, +) { +// Text(text = "RepositoryDetailScreen") + Text(text = "repositoryId: $repositoryId") +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt index 41f2991..6ddcdb8 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt @@ -1,7 +1,5 @@ package jp.co.yumemi.android.code_check.core.presenter.router - -import android.util.Log import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -9,37 +7,41 @@ import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable -import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument import jp.co.yumemi.android.code_check.core.presenter.detail.RepositoryDetailScreen import jp.co.yumemi.android.code_check.core.presenter.search.RepositorySearchScreen @Composable fun MainRouter( - toDetailScreen: () -> Unit, + toDetailScreen: (Int) -> Unit, toBackScreen: () -> Unit, navController: NavHostController, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, ) { NavHost( navController = navController, startDestination = BottomNavigationBarRoute.SEARCH.route, - modifier = modifier.fillMaxSize() + modifier = modifier.fillMaxSize(), ) { composable(BottomNavigationBarRoute.SEARCH.route) { RepositorySearchScreen( - toDetailScreen = toDetailScreen + toDetailScreen = toDetailScreen, ) } - composable(BottomNavigationBarRoute.DETAIL.route) { + composable( + BottomNavigationBarRoute.DETAIL.route + "/{id}", + arguments = listOf(navArgument("id") { type = NavType.IntType }), + ) { backStackEntry -> + val id = backStackEntry.arguments?.getInt("id") RepositoryDetailScreen( - toBack = toBackScreen + toBack = toBackScreen, + repositoryId = id ?: 0, ) } } } -enum class BottomNavigationBarRoute(val route: String,val title:String) { - SEARCH("search","検索"), - DETAIL("detail","詳細"), -} \ No newline at end of file +enum class BottomNavigationBarRoute(val route: String, val title: String) { + SEARCH("search", "検索"), + DETAIL("detail", "詳細"), +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt index f0d1656..4c420c3 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt @@ -8,23 +8,23 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity /** * DiffUtilの実装 */ private val diffUtilCallback = - object : DiffUtil.ItemCallback() { + object : DiffUtil.ItemCallback() { override fun areItemsTheSame( - oldItem: RepositoryItem, - newItem: RepositoryItem, + oldItem: RepositoryEntity, + newItem: RepositoryEntity, ): Boolean { return oldItem.name == newItem.name } override fun areContentsTheSame( - oldItem: RepositoryItem, - newItem: RepositoryItem, + oldItem: RepositoryEntity, + newItem: RepositoryEntity, ): Boolean { return oldItem == newItem } @@ -35,7 +35,7 @@ private val diffUtilCallback = */ class RepositoryListRecyclerViewAdapter( private val itemClickListener: OnItemClickListener, -) : ListAdapter(diffUtilCallback) { +) : ListAdapter(diffUtilCallback) { class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { private val repositoryNameView: TextView? = view.findViewById(R.id.repositoryNameView) @@ -43,7 +43,7 @@ class RepositoryListRecyclerViewAdapter( * ビューにデータをバインド */ fun bind( - item: RepositoryItem, + item: RepositoryEntity, clickListener: OnItemClickListener, ) { repositoryNameView?.text = item.name @@ -52,7 +52,7 @@ class RepositoryListRecyclerViewAdapter( } interface OnItemClickListener { - fun itemClick(repositoryItem: RepositoryItem) + fun itemClick(repositoryEntity: RepositoryEntity) } override fun onCreateViewHolder( diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt index 12a133c..c74716f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.utils.DialogHelper import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding @@ -23,8 +23,8 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { private val adapter by lazy { RepositoryListRecyclerViewAdapter( object : RepositoryListRecyclerViewAdapter.OnItemClickListener { - override fun itemClick(repositoryItem: RepositoryItem) { - onItemClick(repositoryItem) + override fun itemClick(repositoryEntity: RepositoryEntity) { + onItemClick(repositoryEntity) } }, ) @@ -83,7 +83,7 @@ class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { * リポジトリ検索結果のクリックイベント * リサイクラービューでアイテムが押された時に動作を行います。 */ - private fun onItemClick(item: RepositoryItem) { + private fun onItemClick(item: RepositoryEntity) { val action = RepositorySearchFragmentDirections .actionRepositoriesFragmentToRepositoryFragment(item = item) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index 423c381..ee29549 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -42,25 +42,25 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme import jp.co.yumemi.android.code_check.core.utils.DialogHelper @Composable fun RepositorySearchScreen( - toDetailScreen: () -> Unit, - viewModel: RepositorySearchViewModel = hiltViewModel() + toDetailScreen: (Int) -> Unit, + viewModel: RepositorySearchViewModel = hiltViewModel(), ) { var inputText by remember { mutableStateOf("") } - val repositoryName = remember { mutableStateListOf() } + val repositoryList = remember { mutableStateListOf() } val lifecycleOwner = LocalLifecycleOwner.current val context = LocalContext.current var isLoading by remember { mutableStateOf(false) } LaunchedEffect(Unit) { viewModel.searchResults.observe(lifecycleOwner) { - repositoryName.clear() - repositoryName.addAll(it) + repositoryList.clear() + repositoryList.addAll(it) isLoading = false } viewModel.errorMessage.observe(lifecycleOwner) { @@ -74,68 +74,67 @@ fun RepositorySearchScreen( } } - - Column { CustomSearchBar( inputText = inputText, onValueChange = { inputText = it }, searchAction = { searchWord -> - repositoryName.clear() + repositoryList.clear() viewModel.searchRepositories(searchWord.trim()) isLoading = true - } + }, ) - if(isLoading){ + if (isLoading) { ProgressCycle() } RepositoryListView( - repositoryName = repositoryName, + repositoryList = repositoryList, onTapping = toDetailScreen, ) } } @Composable -fun ProgressCycle(){ +fun ProgressCycle() { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight() - .padding(8.dp) - .semantics { isTraversalGroup = true } - + modifier = + Modifier + .fillMaxWidth() + .fillMaxHeight() + .padding(8.dp) + .semantics { isTraversalGroup = true }, ) { CircularProgressIndicator() Text(text = "検索中") } - } @Composable fun RepositoryListView( - repositoryName: List, - onTapping: () -> Unit = {} + repositoryList: List, + onTapping: (Int) -> Unit = {}, ) { LazyColumn( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .semantics { isTraversalGroup = true } + modifier = + Modifier + .fillMaxWidth() + .padding(8.dp) + .semantics { isTraversalGroup = true }, ) { - items(repositoryName.size) { index -> + items(repositoryList.size) { index -> Column( - modifier = Modifier - .clickable { onTapping() } - .fillMaxWidth() - .padding(vertical = 8.dp, horizontal = 16.dp) + modifier = + Modifier + .clickable { onTapping(repositoryList[index].id) } + .fillMaxWidth() + .padding(vertical = 8.dp, horizontal = 16.dp), ) { Text( - text = repositoryName[index].name, + text = repositoryList[index].name, style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.primary + color = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.height(8.dp)) HorizontalDivider(color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.2f)) @@ -148,18 +147,19 @@ fun RepositoryListView( fun CustomSearchBar( inputText: String = "", onValueChange: (String) -> Unit = {}, - searchAction:(String) -> Unit + searchAction: (String) -> Unit, ) { val context = LocalContext.current val keyboardController = LocalSoftwareKeyboardController.current // キーボードアクションを定義 - val keyboardActions = KeyboardActions( - onSearch = { - searchAction(inputText) - keyboardController?.hide() - } - ) + val keyboardActions = + KeyboardActions( + onSearch = { + searchAction(inputText) + keyboardController?.hide() + }, + ) TextField( value = inputText, @@ -169,32 +169,35 @@ fun CustomSearchBar( Icon( Icons.Sharp.Search, contentDescription = null, - tint = MaterialTheme.colorScheme.primary + tint = MaterialTheme.colorScheme.primary, ) }, - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .background( - color = MaterialTheme.colorScheme.surface, - shape = RoundedCornerShape(40.dp) + modifier = + Modifier + .fillMaxWidth() + .padding(8.dp) + .background( + color = MaterialTheme.colorScheme.surface, + shape = RoundedCornerShape(40.dp), + ), + colors = + TextFieldDefaults.colors( + focusedContainerColor = MaterialTheme.colorScheme.primaryContainer, + unfocusedContainerColor = MaterialTheme.colorScheme.primaryContainer, + focusedTextColor = MaterialTheme.colorScheme.onSurface, + unfocusedTextColor = MaterialTheme.colorScheme.onSurface, + cursorColor = MaterialTheme.colorScheme.primary, + focusedIndicatorColor = MaterialTheme.colorScheme.primaryContainer, + unfocusedIndicatorColor = MaterialTheme.colorScheme.primaryContainer, + ), + keyboardOptions = + KeyboardOptions( + keyboardType = KeyboardType.Text, + imeAction = ImeAction.Search, ), - colors = TextFieldDefaults.colors( - focusedContainerColor = MaterialTheme.colorScheme.primaryContainer, - unfocusedContainerColor = MaterialTheme.colorScheme.primaryContainer, - focusedTextColor = MaterialTheme.colorScheme.onSurface, - unfocusedTextColor = MaterialTheme.colorScheme.onSurface, - cursorColor = MaterialTheme.colorScheme.primary, - focusedIndicatorColor = MaterialTheme.colorScheme.primaryContainer, - unfocusedIndicatorColor = MaterialTheme.colorScheme.primaryContainer - ), - keyboardOptions = KeyboardOptions( - keyboardType = KeyboardType.Text, - imeAction = ImeAction.Search, - ), keyboardActions = keyboardActions, maxLines = 1, - singleLine = true + singleLine = true, ) } @@ -211,18 +214,20 @@ fun CustomSearchBarPreview() { fun RepositoryListViewPreview() { CodeCheckAppTheme { RepositoryListView( - repositoryName = listOf( - RepositoryItem( - name = "Jetpack Compose", - ownerIconUrl = "", - language = "Jetpack Compose", - stargazersCount = 1, - forksCount = 1, - openIssuesCount = 1, - watchersCount = 1 - ) - ), - onTapping = {} + repositoryList = + listOf( + RepositoryEntity( + name = "Jetpack Compose", + ownerIconUrl = "", + language = "Jetpack Compose", + stargazersCount = 1, + forksCount = 1, + openIssuesCount = 1, + watchersCount = 1, + id = 1, + ), + ), + onTapping = {}, ) } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt index d19b58f..33fef69 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase import jp.co.yumemi.android.code_check.features.github.utils.GitHubError @@ -27,8 +27,8 @@ class RepositorySearchViewModel private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage - private val _searchResults = MutableLiveData>() - val searchResults: LiveData> get() = _searchResults + private val _searchResults = MutableLiveData>() + val searchResults: LiveData> get() = _searchResults /** * GitHubのレポジトリ検索を行う diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt index 2fa9869..889d0f2 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Color.kt @@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val Pink40 = Color(0xFF7D5260) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt index db9b027..36a45d3 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Theme.kt @@ -1,6 +1,5 @@ package jp.co.yumemi.android.code_check.core.presenter.theme - import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme @@ -12,46 +11,49 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext -private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80, - background = Color(0xFF121212), - surface = Color(0xFF1E1E1E), - onPrimary = Color.Black, - onSecondary = Color.Black -) +private val DarkColorScheme = + darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80, + background = Color(0xFF121212), + surface = Color(0xFF1E1E1E), + onPrimary = Color.Black, + onSecondary = Color.Black, + ) -private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40, - background = Color(0xFFFFFFFF), - surface = Color(0xFFF5F5F5), - onPrimary = Color.White, - onSecondary = Color.White -) +private val LightColorScheme = + lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40, + background = Color(0xFFFFFFFF), + surface = Color(0xFFF5F5F5), + onPrimary = Color.White, + onSecondary = Color.White, + ) @Composable fun CodeCheckAppTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, - content: @Composable () -> Unit + content: @Composable () -> Unit, ) { - val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) - } + val colorScheme = + when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } - darkTheme -> DarkColorScheme - else -> LightColorScheme - } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } MaterialTheme( colorScheme = colorScheme, typography = Typography, - content = content + content = content, ) -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt index 6859f57..e59570c 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt @@ -7,14 +7,16 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp // Set of Material typography styles to start with -val Typography = Typography( - bodyLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) +val Typography = + Typography( + bodyLarge = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp, + ), /* Other default text styles to override titleLarge = TextStyle( fontFamily = FontFamily.Default, @@ -30,5 +32,5 @@ val Typography = Typography( lineHeight = 16.sp, letterSpacing = 0.5.sp ) - */ -) \ No newline at end of file + */ + ) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubServiceEntity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubServiceEntity.kt index 09453d6..d8579f7 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubServiceEntity.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/entity/GitHubServiceEntity.kt @@ -7,6 +7,7 @@ data class RepositoryList( ) data class RepositoryItem( + val id: Int, val name: String, val owner: RepositoryOwner, val language: String?, diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt index 0ccedef..8e7e161 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt @@ -1,8 +1,8 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult interface GitHubServiceRepository { - suspend fun fetchSearchResults(inputText: String): NetworkResult> + suspend fun fetchSearchResults(inputText: String): NetworkResult> } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt index ecec1d2..26b2d54 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt @@ -1,6 +1,6 @@ package jp.co.yumemi.android.code_check.features.github.reposiotory -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult @@ -14,12 +14,12 @@ class GitHubServiceRepositoryImpl constructor( private val gitHubRepositoryApi: GitHubServiceApi, ) : GitHubServiceRepository { - override suspend fun fetchSearchResults(inputText: String): NetworkResult> { + override suspend fun fetchSearchResults(inputText: String): NetworkResult> { return try { val repositoryList = gitHubRepositoryApi.getRepository(inputText) val items = repositoryList.items.map { item -> - RepositoryItem( + RepositoryEntity( name = item.name, ownerIconUrl = item.owner.avatarUrl, language = item.language ?: "none", @@ -27,6 +27,7 @@ class GitHubServiceRepositoryImpl watchersCount = item.watchersCount, forksCount = item.forksCount, openIssuesCount = item.openIssuesCount, + id = item.id, ) } NetworkResult.Success(items) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt index 3583218..50301ea 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt @@ -1,8 +1,8 @@ package jp.co.yumemi.android.code_check.features.github.usecase -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult interface GitHubServiceUsecase { - suspend fun fetchSearchResults(inputText: String): NetworkResult> + suspend fun fetchSearchResults(inputText: String): NetworkResult> } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt index a2e4ba6..f16b7ca 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt @@ -1,7 +1,7 @@ package jp.co.yumemi.android.code_check.features.github.usecase import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult @@ -13,7 +13,7 @@ class GitHubServiceUsecaseImpl private val repository: GitHubServiceRepository, private val networkConnectivityService: NetworkConnectivityService, ) : GitHubServiceUsecase { - override suspend fun fetchSearchResults(inputText: String): NetworkResult> { + override suspend fun fetchSearchResults(inputText: String): NetworkResult> { if (!networkConnectivityService.isNetworkAvailable()) { throw NetworkException("オフライン状態です") } diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index ea34d7b..910a239 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -22,7 +22,7 @@ tools:layout="@layout/fragment_repository_detail"> + app:argType="jp.co.yumemi.android.code_check.core.entity.RepositoryEntity" /> diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt index f473f52..1670272 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt @@ -1,7 +1,7 @@ package jp.co.yumemi.android.code_check.features.github import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService -import jp.co.yumemi.android.code_check.core.entity.RepositoryItem +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl @@ -47,7 +47,7 @@ class GitHubServiceUsecaseImplTest { runBlocking { val mockResults = listOf( - RepositoryItem( + RepositoryEntity( name = "repo1", ownerIconUrl = "description1", language = "url1", @@ -56,7 +56,7 @@ class GitHubServiceUsecaseImplTest { openIssuesCount = 30, watchersCount = 70, ), - RepositoryItem( + RepositoryEntity( name = "repo2", ownerIconUrl = "description2", language = "url2", From 3d295ebf50d6900e45d84ce3a701b300b66978a7 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 17:21:30 +0900 Subject: [PATCH 086/108] =?UTF-8?q?fix:=20=E3=83=AC=E3=83=9D=E3=82=B8?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=81=AE=E3=83=AA=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=82=E3=81=AE=E3=81=AF?= =?UTF-8?q?=E3=81=9D=E3=81=AE=E3=82=88=E3=81=86=E3=81=AA=E5=90=8D=E5=89=8D?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/RepositoryDetailViewModel.kt | 70 +++++++++++++++++++ .../features/github/api/GitHubServiceApi.kt | 2 +- .../api/GitHubServiceApiBuilderInterface.kt | 2 +- .../github/api/GitHubServiceApiImpl.kt | 4 +- .../GitHubServiceRepositoryImpl.kt | 2 +- 5 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt new file mode 100644 index 0000000..ab2eafb --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt @@ -0,0 +1,70 @@ +package jp.co.yumemi.android.code_check.core.presenter.detail + +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import jp.co.yumemi.android.code_check.R +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity +import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException +import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase +import jp.co.yumemi.android.code_check.features.github.utils.GitHubError +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class +RepositoryDetailViewModel@Inject + constructor( + private val networkRepository: GitHubServiceUsecase, + ) : ViewModel() { + private val _errorMessage = MutableLiveData() + val errorMessage: LiveData get() = _errorMessage + + private val _searchResults = MutableLiveData>() + val searchResults: LiveData> get() = _searchResults + + /** + * GitHubのレポジトリ検索を行う + * @param query 検索キーワード + */ + fun searchRepositories(query: String) { + if (query.isBlank()) { + _errorMessage.postValue(R.string.form_is_empty) + return + } + viewModelScope.launch { + try { + val results = networkRepository.fetchSearchResults(query) + if (results is NetworkResult.Error) { + handleError(results.exception) + return@launch + } + if (results is NetworkResult.Success) { + _searchResults.postValue(results.data) + } + } catch (e: NetworkException) { + Log.e("NetworkException", e.message, e) + handleError(GitHubError.NetworkError(e)) + } + } + } + + /** + * エラーが発生した時に、Viewに問題を表示するためのもの + * @param error エラー情報 + */ + private fun handleError(error: GitHubError) { + _errorMessage.value = + when (error) { + is GitHubError.NetworkError -> R.string.network_error + is GitHubError.ApiError -> R.string.api_error + is GitHubError.ParseError -> R.string.parse_error + is GitHubError.RateLimitError -> R.string.rate_limit_error + is GitHubError.AuthenticationError -> R.string.auth_error + } + } + } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt index 8a51f27..fd0a220 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt @@ -3,5 +3,5 @@ package jp.co.yumemi.android.code_check.features.github.api import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList interface GitHubServiceApi { - suspend fun getRepository(searchWord: String): RepositoryList + suspend fun getRepositoryList(searchWord: String): RepositoryList } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt index fcc38eb..59bb1fd 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt @@ -7,7 +7,7 @@ import retrofit2.http.Query interface GitHubServiceApiBuilderInterface { @GET("/search/repositories") - suspend fun getRepository( + suspend fun getRepositoryList( @Query("q") searchWord: String, ): Response } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt index e1997e0..a5026e2 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt @@ -40,8 +40,8 @@ class GitHubServiceApiImpl : GitHubServiceApi { .create(GitHubServiceApiBuilderInterface::class.java) } - override suspend fun getRepository(searchWord: String): RepositoryList { - val response = githubService.getRepository(searchWord) + override suspend fun getRepositoryList(searchWord: String): RepositoryList { + val response = githubService.getRepositoryList(searchWord) if (!response.isSuccessful) { throw when (response.code()) { diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt index 26b2d54..913363f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt @@ -16,7 +16,7 @@ class GitHubServiceRepositoryImpl ) : GitHubServiceRepository { override suspend fun fetchSearchResults(inputText: String): NetworkResult> { return try { - val repositoryList = gitHubRepositoryApi.getRepository(inputText) + val repositoryList = gitHubRepositoryApi.getRepositoryList(inputText) val items = repositoryList.items.map { item -> RepositoryEntity( From 3ca8e44331653949dcc450e0d6c49ac5f3c2d3eb Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 17:50:02 +0900 Subject: [PATCH 087/108] =?UTF-8?q?add:=20=E8=A9=B3=E7=B4=B0=E3=82=92?= =?UTF-8?q?=E6=8A=BC=E3=81=97=E3=81=9F=E6=99=82=E3=81=AB=E3=80=81=E8=A9=B3?= =?UTF-8?q?=E7=B4=B0=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?= =?UTF-8?q?=EF=BD=99ouni=20hennkou=20sita.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 + .../detail/RepositoryDetailScreen.kt | 214 +++++++++++++++++- .../detail/RepositoryDetailViewModel.kt | 14 +- .../search/RepositorySearchScreen.kt | 22 +- .../core/presenter/widget/ProgressCycle.kt | 32 +++ .../features/github/api/GitHubServiceApi.kt | 3 + .../api/GitHubServiceApiBuilderInterface.kt | 7 + .../github/api/GitHubServiceApiImpl.kt | 15 ++ .../reposiotory/GitHubServiceRepository.kt | 2 + .../GitHubServiceRepositoryImpl.kt | 30 +++ .../github/usecase/GitHubServiceUsecase.kt | 2 + .../usecase/GitHubServiceUsecaseImpl.kt | 7 + 12 files changed, 320 insertions(+), 30 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt diff --git a/app/build.gradle b/app/build.gradle index be0e0d6..d1c2efa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,6 +94,8 @@ dependencies { debugImplementation 'androidx.compose.ui:ui-tooling' implementation 'androidx.activity:activity-compose:1.10.0' implementation 'androidx.navigation:navigation-compose:2.8.5' + implementation "io.coil-kt:coil-compose:2.4.0" + implementation "androidx.compose.material:material-icons-extended:1.7.6" } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 01ed0b4..7dc58c4 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -1,13 +1,223 @@ package jp.co.yumemi.android.code_check.core.presenter.detail +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Report +import androidx.compose.material.icons.filled.Share +import androidx.compose.material.icons.filled.Star +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.LocalLifecycleOwner +import coil.compose.rememberAsyncImagePainter +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity +import jp.co.yumemi.android.code_check.core.presenter.widget.ProgressCycle +import jp.co.yumemi.android.code_check.core.utils.DialogHelper @Composable fun RepositoryDetailScreen( toBack: () -> Unit, repositoryId: Int, + viewModel: RepositoryDetailViewModel = hiltViewModel(), ) { -// Text(text = "RepositoryDetailScreen") - Text(text = "repositoryId: $repositoryId") + val repositoryDetail = remember { mutableStateOf(null) } + val context = LocalContext.current + var isLoading by remember { mutableStateOf(false) } + val lifecycleOwner = LocalLifecycleOwner.current + + LaunchedEffect(Unit) { + viewModel.searchResults.observe(lifecycleOwner) { + repositoryDetail.value = it + isLoading = false + } + viewModel.errorMessage.observe(lifecycleOwner) { errorMessage -> + errorMessage?.let { + DialogHelper.showErrorDialog(context, context.getString(it)) + } + isLoading = false + } + viewModel.searchRepositories(repositoryId) + } + + RepositoryDetailScaffold( + isLoading = isLoading, + repositoryDetail = repositoryDetail.value, + toBack = toBack + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RepositoryDetailScaffold( + isLoading: Boolean, + repositoryDetail: RepositoryEntity?, + toBack: () -> Unit +) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(8.dp) + ) { + if (isLoading) { + ProgressCycle() + } else { + repositoryDetail?.let { + RepositoryDetailContent(repository = it) + } + } + } +} + +@Composable +fun RepositoryDetailContent(repository: RepositoryEntity) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + RepositoryOverviewCard(repository = repository) + RepositoryStatsCard(repository = repository) + } +} + +@Composable +fun RepositoryOverviewCard(repository: RepositoryEntity) { + Card( + modifier = Modifier.fillMaxWidth(), + elevation = CardDefaults.cardElevation(4.dp) + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Image( + painter = rememberAsyncImagePainter(repository.ownerIconUrl), + contentDescription = "Owner Icon", + modifier = Modifier.size(80.dp) + ) + Text( + text = repository.name, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold + ) + Text( + text = "Language: ${repository.language}", + style = MaterialTheme.typography.bodyMedium + ) + } + } +} + +@Composable +fun RepositoryStatsCard(repository: RepositoryEntity) { + Card( + modifier = Modifier.fillMaxWidth(), + elevation = CardDefaults.cardElevation(4.dp) + ) { + Column( + modifier = Modifier.padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + imageVector = Icons.Default.Star, // 適切なアイコンを選択 + contentDescription = "Stars", + modifier = Modifier.size(24.dp), + tint = MaterialTheme.colorScheme.primary + ) + Spacer(modifier = Modifier.width(8.dp)) + Text("Stars: ${repository.stargazersCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) + } + + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + imageVector = Icons.Default.Share, // 適切なアイコンを選択 + contentDescription = "Forks", + modifier = Modifier.size(24.dp), + tint = MaterialTheme.colorScheme.primary + ) + Spacer(modifier = Modifier.width(8.dp)) + Text("Forks: ${repository.forksCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) + } + + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + imageVector = Icons.Default.Report, // 適切なアイコンを選択 + contentDescription = "Open Issues", + modifier = Modifier.size(24.dp), + tint = MaterialTheme.colorScheme.primary + ) + Spacer(modifier = Modifier.width(8.dp)) + Text("Open Issues: ${repository.openIssuesCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) + } + } + } +} + +@Preview(showBackground = true) +@Composable +fun PreviewRepositoryOverviewCard() { + RepositoryOverviewCard( + repository = RepositoryEntity( + id = 1, + name = "Example Repo", + ownerIconUrl = "https://via.placeholder.com/150", + language = "Kotlin", + stargazersCount = 123, + forksCount = 45, + openIssuesCount = 2, + watchersCount = 1 + ) + ) +} + +@Preview(showBackground = true) +@Composable +fun PreviewRepositoryStatsCard() { + RepositoryStatsCard( + repository = RepositoryEntity( + id = 1, + name = "Example Repo", + ownerIconUrl = "https://via.placeholder.com/150", + language = "Kotlin", + stargazersCount = 123, + forksCount = 45, + openIssuesCount = 2, + watchersCount = 1 + ) + ) } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt index ab2eafb..f93a8e0 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt @@ -24,21 +24,21 @@ RepositoryDetailViewModel@Inject private val _errorMessage = MutableLiveData() val errorMessage: LiveData get() = _errorMessage - private val _searchResults = MutableLiveData>() - val searchResults: LiveData> get() = _searchResults + private val _searchResults = MutableLiveData() + val searchResults: LiveData get() = _searchResults /** * GitHubのレポジトリ検索を行う - * @param query 検索キーワード + * @param id 検索キーワード */ - fun searchRepositories(query: String) { - if (query.isBlank()) { - _errorMessage.postValue(R.string.form_is_empty) + fun searchRepositories(id: Int) { + if (id == 0) { + _errorMessage.postValue(R.string.api_error) return } viewModelScope.launch { try { - val results = networkRepository.fetchSearchResults(query) + val results = networkRepository.fetchRepositoryDetail(id) if (results is NetworkResult.Error) { handleError(results.exception) return@launch diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index ee29549..0db0829 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -2,10 +2,8 @@ package jp.co.yumemi.android.code_check.core.presenter.search import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -15,7 +13,6 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.sharp.Search -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -29,7 +26,6 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalSoftwareKeyboardController @@ -44,6 +40,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme +import jp.co.yumemi.android.code_check.core.presenter.widget.ProgressCycle import jp.co.yumemi.android.code_check.core.utils.DialogHelper @Composable @@ -94,23 +91,6 @@ fun RepositorySearchScreen( } } -@Composable -fun ProgressCycle() { - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, - modifier = - Modifier - .fillMaxWidth() - .fillMaxHeight() - .padding(8.dp) - .semantics { isTraversalGroup = true }, - ) { - CircularProgressIndicator() - Text(text = "検索中") - } -} - @Composable fun RepositoryListView( repositoryList: List, diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt new file mode 100644 index 0000000..5de3eb6 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt @@ -0,0 +1,32 @@ +package jp.co.yumemi.android.code_check.core.presenter.widget + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.semantics.isTraversalGroup +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.dp + +@Composable +fun ProgressCycle() { + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + modifier = + Modifier + .fillMaxWidth() + .fillMaxHeight() + .padding(8.dp) + .semantics { isTraversalGroup = true }, + ) { + CircularProgressIndicator() + Text(text = "検索中") + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt index fd0a220..721b856 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApi.kt @@ -1,7 +1,10 @@ package jp.co.yumemi.android.code_check.features.github.api +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList interface GitHubServiceApi { suspend fun getRepositoryList(searchWord: String): RepositoryList + + suspend fun getRepositoryDetail(id: Int): RepositoryItem } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt index 59bb1fd..fd0ddba 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiBuilderInterface.kt @@ -1,8 +1,10 @@ package jp.co.yumemi.android.code_check.features.github.api +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList import retrofit2.Response import retrofit2.http.GET +import retrofit2.http.Path import retrofit2.http.Query interface GitHubServiceApiBuilderInterface { @@ -10,4 +12,9 @@ interface GitHubServiceApiBuilderInterface { suspend fun getRepositoryList( @Query("q") searchWord: String, ): Response + + @GET("/repositories/{id}") + suspend fun getRepositoryDetail( + @Path("id") id: Int, + ): Response } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt index a5026e2..edff3be 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/api/GitHubServiceApiImpl.kt @@ -3,6 +3,7 @@ package jp.co.yumemi.android.code_check.features.github.api import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import jp.co.yumemi.android.code_check.BuildConfig +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryItem import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import okhttp3.OkHttpClient @@ -53,4 +54,18 @@ class GitHubServiceApiImpl : GitHubServiceApi { } return response.body() ?: throw NetworkException("レスポンスが空でした") } + + override suspend fun getRepositoryDetail(id: Int): RepositoryItem { + val response = githubService.getRepositoryDetail(id) + + if (!response.isSuccessful) { + throw when (response.code()) { + 404 -> NetworkException("リポジトリが見つかりませんでした") + 403 -> NetworkException("APIレート制限に達しました") + 500 -> NetworkException("サーバーエラーが発生しました") + else -> NetworkException("エラーが発生しました: ${response.code()}") + } + } + return response.body() ?: throw NetworkException("レスポンスが空でした") + } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt index 8e7e161..9641df3 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepository.kt @@ -5,4 +5,6 @@ import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult interface GitHubServiceRepository { suspend fun fetchSearchResults(inputText: String): NetworkResult> + + suspend fun fetchRepositoryDetail(id: Int): NetworkResult } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt index 913363f..db846f4 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/reposiotory/GitHubServiceRepositoryImpl.kt @@ -45,6 +45,36 @@ class GitHubServiceRepositoryImpl NetworkResult.Error(GitHubError.NetworkError(e)) } } + + override suspend fun fetchRepositoryDetail(id: Int): NetworkResult { + return try { + val repositoryDetail = gitHubRepositoryApi.getRepositoryDetail(id) + val repositoryEntity = + RepositoryEntity( + name = repositoryDetail.name, + ownerIconUrl = repositoryDetail.owner.avatarUrl, + language = repositoryDetail.language ?: "none", + stargazersCount = repositoryDetail.stargazersCount, + watchersCount = repositoryDetail.watchersCount, + forksCount = repositoryDetail.forksCount, + openIssuesCount = repositoryDetail.openIssuesCount, + id = repositoryDetail.id, + ) + NetworkResult.Success(repositoryEntity) + } catch (e: HttpException) { + val error = + when (e.code()) { + 429 -> GitHubError.RateLimitError + 401 -> GitHubError.AuthenticationError + else -> GitHubError.ApiError(e.code(), e.message()) + } + NetworkResult.Error(error) + } catch (e: JSONException) { + NetworkResult.Error(GitHubError.ParseError(e)) + } catch (e: IOException) { + NetworkResult.Error(GitHubError.NetworkError(e)) + } + } } class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt index 50301ea..ad87471 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecase.kt @@ -5,4 +5,6 @@ import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult interface GitHubServiceUsecase { suspend fun fetchSearchResults(inputText: String): NetworkResult> + + suspend fun fetchRepositoryDetail(id: Int): NetworkResult } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt index f16b7ca..1e388cf 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/features/github/usecase/GitHubServiceUsecaseImpl.kt @@ -19,4 +19,11 @@ class GitHubServiceUsecaseImpl } return repository.fetchSearchResults(inputText) } + + override suspend fun fetchRepositoryDetail(id: Int): NetworkResult { + if (!networkConnectivityService.isNetworkAvailable()) { + throw NetworkException("オフライン状態です") + } + return repository.fetchRepositoryDetail(id) + } } From e01f44ca6828a03ade5d4e456c65a9ee42746336 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:08:45 +0900 Subject: [PATCH 088/108] =?UTF-8?q?add:=20=E8=A9=B3=E7=B4=B0=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AB=E8=A1=8C=E3=81=8F=E3=81=A8=E3=81=8D=E3=81=AB?= =?UTF-8?q?=E3=80=81AppBar=E3=81=AB=E6=88=BB=E3=82=8B=E3=83=9C=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=82=92=E7=94=A8=E6=84=8F=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/MainScreen.kt | 34 ++++++++++++++++++- .../core/presenter/router/MainRouter.kt | 14 ++++++-- .../core/presenter/widget/EmptyCompose.kt | 8 +++++ app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt index b888478..547414a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt @@ -1,7 +1,12 @@ package jp.co.yumemi.android.code_check.core.presenter import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.outlined.ArrowBack +import androidx.compose.material.icons.outlined.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -11,13 +16,16 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight +import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.presenter.router.BottomNavigationBarRoute import jp.co.yumemi.android.code_check.core.presenter.router.MainRouter +import jp.co.yumemi.android.code_check.core.presenter.widget.EmptyCompose @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -26,10 +34,29 @@ fun MainScreen() { val appName = context.getString(R.string.app_name) val navController = rememberNavController() - val topBarTitle by remember { + val navBackStackEntry by navController.currentBackStackEntryAsState() + var topBarTitle by remember { mutableStateOf(appName) } + val navigationIcon: @Composable () -> Unit = + if (navBackStackEntry?.destination?.route != BottomNavigationBarRoute.SEARCH.route) { + { + IconButton(onClick = { + navController.popBackStack() + }) { + Icon( + imageVector = Icons.AutoMirrored.Outlined.ArrowBack, + contentDescription = "Back" + ) + } + } + } else { + { + EmptyCompose() + } + } + Scaffold( topBar = { TopAppBar( @@ -44,6 +71,8 @@ fun MainScreen() { containerColor = MaterialTheme.colorScheme.primaryContainer, titleContentColor = MaterialTheme.colorScheme.primary, ), + navigationIcon = navigationIcon + ) }, ) { innerPadding -> @@ -54,6 +83,9 @@ fun MainScreen() { toBackScreen = { navController.popBackStack() }, + changeTopBarTitle = { + topBarTitle = it + }, navController = navController, modifier = Modifier diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt index 6ddcdb8..0238693 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt @@ -3,11 +3,13 @@ package jp.co.yumemi.android.code_check.core.presenter.router import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.navArgument +import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.presenter.detail.RepositoryDetailScreen import jp.co.yumemi.android.code_check.core.presenter.search.RepositorySearchScreen @@ -15,9 +17,13 @@ import jp.co.yumemi.android.code_check.core.presenter.search.RepositorySearchScr fun MainRouter( toDetailScreen: (Int) -> Unit, toBackScreen: () -> Unit, + changeTopBarTitle: (String) -> Unit, navController: NavHostController, modifier: Modifier = Modifier, ) { + + val context = LocalContext.current + NavHost( navController = navController, startDestination = BottomNavigationBarRoute.SEARCH.route, @@ -27,6 +33,7 @@ fun MainRouter( RepositorySearchScreen( toDetailScreen = toDetailScreen, ) + changeTopBarTitle(context.getString(R.string.app_name)) } composable( BottomNavigationBarRoute.DETAIL.route + "/{id}", @@ -37,11 +44,12 @@ fun MainRouter( toBack = toBackScreen, repositoryId = id ?: 0, ) + changeTopBarTitle(context.getString(R.string.detail)) } } } -enum class BottomNavigationBarRoute(val route: String, val title: String) { - SEARCH("search", "検索"), - DETAIL("detail", "詳細"), +enum class BottomNavigationBarRoute(val route: String, val title: Int) { + SEARCH("search", R.string.search), + DETAIL("detail", R.string.detail), } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt new file mode 100644 index 0000000..b4dc0b9 --- /dev/null +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt @@ -0,0 +1,8 @@ +package jp.co.yumemi.android.code_check.core.presenter.widget + +import androidx.compose.runtime.Composable + +@Composable +fun EmptyCompose(){ + +} \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a665d57..3b6a633 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,4 +12,6 @@ セッションの時間切れ APIのエラー フォームが空欄になっています + 詳細 + 検索 \ No newline at end of file From 5f6e98c5765f44492aed54995f57364f4ee42229 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:21:12 +0900 Subject: [PATCH 089/108] =?UTF-8?q?add:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=95=E3=81=9B=E3=82=8B=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=80=81=E3=82=B9=E3=83=8A=E3=83=83=E3=82=AF=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/MainScreen.kt | 32 +++++++++++++++++++ .../detail/RepositoryDetailScreen.kt | 15 ++++++++- .../core/presenter/router/MainRouter.kt | 3 ++ .../search/RepositorySearchScreen.kt | 5 +-- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt index 547414a..7104f6b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt @@ -9,6 +9,9 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold +import androidx.compose.material3.Snackbar +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults @@ -16,6 +19,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext @@ -26,6 +30,7 @@ import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.presenter.router.BottomNavigationBarRoute import jp.co.yumemi.android.code_check.core.presenter.router.MainRouter import jp.co.yumemi.android.code_check.core.presenter.widget.EmptyCompose +import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -39,6 +44,10 @@ fun MainScreen() { mutableStateOf(appName) } + val hostState = remember { SnackbarHostState() } + var isErrorMessage by remember { mutableStateOf(false) } + val scope = rememberCoroutineScope() + val navigationIcon: @Composable () -> Unit = if (navBackStackEntry?.destination?.route != BottomNavigationBarRoute.SEARCH.route) { { @@ -75,6 +84,7 @@ fun MainScreen() { ) }, + snackbarHost = {CustomSnackbarHost(hostState = hostState, isErrorMessage = isErrorMessage)} ) { innerPadding -> MainRouter( toDetailScreen = { id -> @@ -86,6 +96,12 @@ fun MainScreen() { changeTopBarTitle = { topBarTitle = it }, + showSnackbar = { message, isError -> + scope.launch { + isErrorMessage = isError + hostState.showSnackbar(message) + } + }, navController = navController, modifier = Modifier @@ -93,3 +109,19 @@ fun MainScreen() { ) } } + +@Composable +fun CustomSnackbarHost( + hostState: SnackbarHostState, + isErrorMessage: Boolean +) { + SnackbarHost( + hostState = hostState + ) { snackbarData -> + Snackbar( + snackbarData = snackbarData, + containerColor = if (isErrorMessage) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primaryContainer, + contentColor = if (isErrorMessage) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer + ) + } +} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 7dc58c4..3c70e0a 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -48,6 +49,7 @@ fun RepositoryDetailScreen( toBack: () -> Unit, repositoryId: Int, viewModel: RepositoryDetailViewModel = hiltViewModel(), + showSnackBar: (String, Boolean) -> Unit ) { val repositoryDetail = remember { mutableStateOf(null) } val context = LocalContext.current @@ -61,13 +63,24 @@ fun RepositoryDetailScreen( } viewModel.errorMessage.observe(lifecycleOwner) { errorMessage -> errorMessage?.let { - DialogHelper.showErrorDialog(context, context.getString(it)) + showSnackBar(context.getString(it), true) } isLoading = false } viewModel.searchRepositories(repositoryId) } + if(repositoryDetail.value == null && !isLoading){ + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.fillMaxWidth().fillMaxHeight() + ){ + Text(text = "データの取得に失敗しました。") + + } + } + RepositoryDetailScaffold( isLoading = isLoading, repositoryDetail = repositoryDetail.value, diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt index 0238693..d3fdbb0 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt @@ -18,6 +18,7 @@ fun MainRouter( toDetailScreen: (Int) -> Unit, toBackScreen: () -> Unit, changeTopBarTitle: (String) -> Unit, + showSnackbar: (String, Boolean) -> Unit, navController: NavHostController, modifier: Modifier = Modifier, ) { @@ -32,6 +33,7 @@ fun MainRouter( composable(BottomNavigationBarRoute.SEARCH.route) { RepositorySearchScreen( toDetailScreen = toDetailScreen, + showSnackBar = showSnackbar ) changeTopBarTitle(context.getString(R.string.app_name)) } @@ -43,6 +45,7 @@ fun MainRouter( RepositoryDetailScreen( toBack = toBackScreen, repositoryId = id ?: 0, + showSnackBar = showSnackbar ) changeTopBarTitle(context.getString(R.string.detail)) } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index 0db0829..515c413 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -47,6 +47,7 @@ import jp.co.yumemi.android.code_check.core.utils.DialogHelper fun RepositorySearchScreen( toDetailScreen: (Int) -> Unit, viewModel: RepositorySearchViewModel = hiltViewModel(), + showSnackBar:(String, Boolean) -> Unit ) { var inputText by remember { mutableStateOf("") } val repositoryList = remember { mutableStateListOf() } @@ -62,9 +63,9 @@ fun RepositorySearchScreen( } viewModel.errorMessage.observe(lifecycleOwner) { it?.let { - DialogHelper.showErrorDialog( - context, + showSnackBar( context.getString(it), + true ) } isLoading = false From acd828f4227a8c606501612a3c658b30ce576f18 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:24:20 +0900 Subject: [PATCH 090/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/MainScreen.kt | 13 +-- .../detail/RepositoryDetailScreen.kt | 107 +++++++++--------- .../core/presenter/router/MainRouter.kt | 5 +- .../search/RepositorySearchScreen.kt | 5 +- .../core/presenter/widget/EmptyCompose.kt | 5 +- 5 files changed, 67 insertions(+), 68 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt index 7104f6b..6e9794d 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/MainScreen.kt @@ -56,7 +56,7 @@ fun MainScreen() { }) { Icon( imageVector = Icons.AutoMirrored.Outlined.ArrowBack, - contentDescription = "Back" + contentDescription = "Back", ) } } @@ -80,11 +80,10 @@ fun MainScreen() { containerColor = MaterialTheme.colorScheme.primaryContainer, titleContentColor = MaterialTheme.colorScheme.primary, ), - navigationIcon = navigationIcon - + navigationIcon = navigationIcon, ) }, - snackbarHost = {CustomSnackbarHost(hostState = hostState, isErrorMessage = isErrorMessage)} + snackbarHost = { CustomSnackbarHost(hostState = hostState, isErrorMessage = isErrorMessage) }, ) { innerPadding -> MainRouter( toDetailScreen = { id -> @@ -113,15 +112,15 @@ fun MainScreen() { @Composable fun CustomSnackbarHost( hostState: SnackbarHostState, - isErrorMessage: Boolean + isErrorMessage: Boolean, ) { SnackbarHost( - hostState = hostState + hostState = hostState, ) { snackbarData -> Snackbar( snackbarData = snackbarData, containerColor = if (isErrorMessage) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primaryContainer, - contentColor = if (isErrorMessage) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer + contentColor = if (isErrorMessage) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer, ) } } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 3c70e0a..bfdc837 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -42,14 +42,13 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import coil.compose.rememberAsyncImagePainter import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.presenter.widget.ProgressCycle -import jp.co.yumemi.android.code_check.core.utils.DialogHelper @Composable fun RepositoryDetailScreen( toBack: () -> Unit, repositoryId: Int, viewModel: RepositoryDetailViewModel = hiltViewModel(), - showSnackBar: (String, Boolean) -> Unit + showSnackBar: (String, Boolean) -> Unit, ) { val repositoryDetail = remember { mutableStateOf(null) } val context = LocalContext.current @@ -70,21 +69,20 @@ fun RepositoryDetailScreen( viewModel.searchRepositories(repositoryId) } - if(repositoryDetail.value == null && !isLoading){ + if (repositoryDetail.value == null && !isLoading) { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier.fillMaxWidth().fillMaxHeight() - ){ + modifier = Modifier.fillMaxWidth().fillMaxHeight(), + ) { Text(text = "データの取得に失敗しました。") - } } RepositoryDetailScaffold( isLoading = isLoading, repositoryDetail = repositoryDetail.value, - toBack = toBack + toBack = toBack, ) } @@ -93,12 +91,13 @@ fun RepositoryDetailScreen( fun RepositoryDetailScaffold( isLoading: Boolean, repositoryDetail: RepositoryEntity?, - toBack: () -> Unit + toBack: () -> Unit, ) { Box( - modifier = Modifier - .fillMaxSize() - .padding(8.dp) + modifier = + Modifier + .fillMaxSize() + .padding(8.dp), ) { if (isLoading) { ProgressCycle() @@ -113,11 +112,12 @@ fun RepositoryDetailScaffold( @Composable fun RepositoryDetailContent(repository: RepositoryEntity) { Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp) - .verticalScroll(rememberScrollState()), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = + Modifier + .fillMaxSize() + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { RepositoryOverviewCard(repository = repository) RepositoryStatsCard(repository = repository) @@ -128,28 +128,29 @@ fun RepositoryDetailContent(repository: RepositoryEntity) { fun RepositoryOverviewCard(repository: RepositoryEntity) { Card( modifier = Modifier.fillMaxWidth(), - elevation = CardDefaults.cardElevation(4.dp) + elevation = CardDefaults.cardElevation(4.dp), ) { Column( - modifier = Modifier - .fillMaxWidth() - .padding(16.dp), + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp), - horizontalAlignment = Alignment.CenterHorizontally + horizontalAlignment = Alignment.CenterHorizontally, ) { Image( painter = rememberAsyncImagePainter(repository.ownerIconUrl), contentDescription = "Owner Icon", - modifier = Modifier.size(80.dp) + modifier = Modifier.size(80.dp), ) Text( text = repository.name, style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + fontWeight = FontWeight.Bold, ) Text( text = "Language: ${repository.language}", - style = MaterialTheme.typography.bodyMedium + style = MaterialTheme.typography.bodyMedium, ) } } @@ -159,18 +160,18 @@ fun RepositoryOverviewCard(repository: RepositoryEntity) { fun RepositoryStatsCard(repository: RepositoryEntity) { Card( modifier = Modifier.fillMaxWidth(), - elevation = CardDefaults.cardElevation(4.dp) + elevation = CardDefaults.cardElevation(4.dp), ) { Column( modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(12.dp) + verticalArrangement = Arrangement.spacedBy(12.dp), ) { Row(verticalAlignment = Alignment.CenterVertically) { Icon( - imageVector = Icons.Default.Star, // 適切なアイコンを選択 + imageVector = Icons.Default.Star, contentDescription = "Stars", modifier = Modifier.size(24.dp), - tint = MaterialTheme.colorScheme.primary + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) Text("Stars: ${repository.stargazersCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) @@ -178,10 +179,10 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { Row(verticalAlignment = Alignment.CenterVertically) { Icon( - imageVector = Icons.Default.Share, // 適切なアイコンを選択 + imageVector = Icons.Default.Share, contentDescription = "Forks", modifier = Modifier.size(24.dp), - tint = MaterialTheme.colorScheme.primary + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) Text("Forks: ${repository.forksCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) @@ -189,10 +190,10 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { Row(verticalAlignment = Alignment.CenterVertically) { Icon( - imageVector = Icons.Default.Report, // 適切なアイコンを選択 + imageVector = Icons.Default.Report, contentDescription = "Open Issues", modifier = Modifier.size(24.dp), - tint = MaterialTheme.colorScheme.primary + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) Text("Open Issues: ${repository.openIssuesCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) @@ -205,16 +206,17 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { @Composable fun PreviewRepositoryOverviewCard() { RepositoryOverviewCard( - repository = RepositoryEntity( - id = 1, - name = "Example Repo", - ownerIconUrl = "https://via.placeholder.com/150", - language = "Kotlin", - stargazersCount = 123, - forksCount = 45, - openIssuesCount = 2, - watchersCount = 1 - ) + repository = + RepositoryEntity( + id = 1, + name = "Example Repo", + ownerIconUrl = "https://via.placeholder.com/150", + language = "Kotlin", + stargazersCount = 123, + forksCount = 45, + openIssuesCount = 2, + watchersCount = 1, + ), ) } @@ -222,15 +224,16 @@ fun PreviewRepositoryOverviewCard() { @Composable fun PreviewRepositoryStatsCard() { RepositoryStatsCard( - repository = RepositoryEntity( - id = 1, - name = "Example Repo", - ownerIconUrl = "https://via.placeholder.com/150", - language = "Kotlin", - stargazersCount = 123, - forksCount = 45, - openIssuesCount = 2, - watchersCount = 1 - ) + repository = + RepositoryEntity( + id = 1, + name = "Example Repo", + ownerIconUrl = "https://via.placeholder.com/150", + language = "Kotlin", + stargazersCount = 123, + forksCount = 45, + openIssuesCount = 2, + watchersCount = 1, + ), ) } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt index d3fdbb0..aa6a49d 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/router/MainRouter.kt @@ -22,7 +22,6 @@ fun MainRouter( navController: NavHostController, modifier: Modifier = Modifier, ) { - val context = LocalContext.current NavHost( @@ -33,7 +32,7 @@ fun MainRouter( composable(BottomNavigationBarRoute.SEARCH.route) { RepositorySearchScreen( toDetailScreen = toDetailScreen, - showSnackBar = showSnackbar + showSnackBar = showSnackbar, ) changeTopBarTitle(context.getString(R.string.app_name)) } @@ -45,7 +44,7 @@ fun MainRouter( RepositoryDetailScreen( toBack = toBackScreen, repositoryId = id ?: 0, - showSnackBar = showSnackbar + showSnackBar = showSnackbar, ) changeTopBarTitle(context.getString(R.string.detail)) } diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index 515c413..1b01faf 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -41,13 +41,12 @@ import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme import jp.co.yumemi.android.code_check.core.presenter.widget.ProgressCycle -import jp.co.yumemi.android.code_check.core.utils.DialogHelper @Composable fun RepositorySearchScreen( toDetailScreen: (Int) -> Unit, viewModel: RepositorySearchViewModel = hiltViewModel(), - showSnackBar:(String, Boolean) -> Unit + showSnackBar: (String, Boolean) -> Unit, ) { var inputText by remember { mutableStateOf("") } val repositoryList = remember { mutableStateListOf() } @@ -65,7 +64,7 @@ fun RepositorySearchScreen( it?.let { showSnackBar( context.getString(it), - true + true, ) } isLoading = false diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt index b4dc0b9..7546c96 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/EmptyCompose.kt @@ -3,6 +3,5 @@ package jp.co.yumemi.android.code_check.core.presenter.widget import androidx.compose.runtime.Composable @Composable -fun EmptyCompose(){ - -} \ No newline at end of file +fun EmptyCompose() { +} From 9baaee1ab837631b7d9b2897deaa0e9ec74e858a Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:25:24 +0900 Subject: [PATCH 091/108] =?UTF-8?q?ref:=20material3=E3=81=AE=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E8=A7=A3=E9=99=A4=E3=82=92=E6=B6=88=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/detail/RepositoryDetailScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index bfdc837..854e4f3 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -86,7 +86,6 @@ fun RepositoryDetailScreen( ) } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun RepositoryDetailScaffold( isLoading: Boolean, From 5c3c9e2e79ed0d0125b31550694674683b71a53a Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:46:01 +0900 Subject: [PATCH 092/108] =?UTF-8?q?add:=20=E8=A9=B3=E7=B4=B0=E5=88=86?= =?UTF-8?q?=E3=81=AEUnitTest=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/code_check/ExampleUnitTest.kt | 16 -- .../features/github/GitHubMockData.kt | 132 +++++++++++++ .../github/GitHubServiceRepositoryImplTest.kt | 186 ++++++++++-------- .../github/GitHubServiceUsecaseImplTest.kt | 128 ++++++++---- 4 files changed, 322 insertions(+), 140 deletions(-) delete mode 100644 app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt create mode 100644 app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt deleted file mode 100644 index b435cbc..0000000 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package jp.co.yumemi.android.code_check - -import org.junit.Assert.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt new file mode 100644 index 0000000..823bc6b --- /dev/null +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt @@ -0,0 +1,132 @@ +package jp.co.yumemi.android.code_check.features.github + +import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService +import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryItem +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList +import jp.co.yumemi.android.code_check.features.github.entity.RepositoryOwner +import jp.co.yumemi.android.code_check.features.github.utils.GitHubError +import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` +import java.io.IOException + +object GitHubMockData { + + // 正常なリポジトリ検索結果 + fun getMockRepositoryList(): RepositoryList { + return RepositoryList( + items = listOf( + RepositoryItem( + name = "repo1", + owner = RepositoryOwner( + avatarUrl = "url1" + ), + language = "Kotlin", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + id = 1 + ), + RepositoryItem( + name = "repo2", + owner = RepositoryOwner( + avatarUrl = "url2" + ), + language = "Java", + stargazersCount = 200, + forksCount = 80, + openIssuesCount = 20, + watchersCount = 60, + id = 2 + ) + ) + ) + } + + fun getMockRepositoryEntityList(): List { + return listOf( + RepositoryEntity( + name = "repo1", + ownerIconUrl = "url1", + language = "Kotlin", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + id = 1 + ), + RepositoryEntity( + name = "repo2", + ownerIconUrl = "url2", + language = "Java", + stargazersCount = 200, + forksCount = 80, + openIssuesCount = 20, + watchersCount = 60, + id = 2 + ) + ) + } + + // 正常なリポジトリ詳細 + fun getMockRepositoryItem(): RepositoryItem { + return RepositoryItem( + name = "repo1", + language = "Kotlin", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + id = 1, + owner = RepositoryOwner( + avatarUrl = "url1" + ) + ) + } + + fun getMockRepositoryEntity(): RepositoryEntity { + return RepositoryEntity( + name = "repo1", + ownerIconUrl = "url1", + language = "Kotlin", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + id = 1 + ) + } + + + + // ネットワークエラー + fun getMockNetworkError(): NetworkResult.Error { + return NetworkResult.Error(GitHubError.NetworkError(IOException("Network issue"))) + } + + // APIエラー (例えば404) + fun getMockApiError404(): NetworkResult.Error { + return NetworkResult.Error(GitHubError.ApiError(404, "Not Found")) + } + + // APIエラー (例えば500) + fun getMockApiError500(): NetworkResult.Error { + return NetworkResult.Error(GitHubError.ApiError(500, "Internal Server Error")) + } + + // オフライン時のネットワーク接続サービス + fun getMockOfflineNetworkService(): NetworkConnectivityService { + val networkService = mock(NetworkConnectivityService::class.java) + `when`(networkService.isNetworkAvailable()).thenReturn(false) + return networkService + } + + // オンライン時のネットワーク接続サービス + fun getMockOnlineNetworkService(): NetworkConnectivityService { + val networkService = mock(NetworkConnectivityService::class.java) + `when`(networkService.isNetworkAvailable()).thenReturn(true) + return networkService + } +} diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt index d9eb4b7..0dddb6c 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt @@ -10,8 +10,8 @@ import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.runBlocking import org.json.JSONException import org.junit.Assert.assertEquals -import org.junit.Before import org.junit.Test +import org.junit.Before import org.mockito.Mockito.mock import org.mockito.Mockito.`when` import retrofit2.HttpException @@ -28,98 +28,116 @@ class GitHubServiceRepositoryImplTest { } @Test - fun `fetchSearchResults returns success with valid data`() = - runBlocking { - // Arrange - val mockResponse = mockRepositoryList() - `when`(api.getRepository("test")).thenReturn(mockResponse) - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Success) - val success = result as NetworkResult.Success - assertEquals(2, success.data.size) - assertEquals("repo1", success.data[0].name) - assertEquals("owner1", success.data[0].ownerIconUrl) - } + fun `fetchSearchResults returns success with valid data`() = runBlocking { + // Arrange + val mockResponse = GitHubMockData.getMockRepositoryList() + `when`(api.getRepositoryList("test")).thenReturn(mockResponse) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals(2, success.data.size) + assertEquals("repo1", success.data[0].name) + assertEquals("url1", success.data[0].ownerIconUrl) // 修正: ownerIconUrl -> avatarUrl + } + @Test - fun `fetchSearchResults returns error on HttpException`() = - runBlocking { - // Arrange - val httpException = mock(HttpException::class.java) - `when`(httpException.code()).thenReturn(401) - `when`(api.getRepository("test")).thenThrow(httpException) - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.AuthenticationError) + fun `fetchSearchResults returns error on HttpException`() = runBlocking { + // Arrange + val httpException = mock(HttpException::class.java) + `when`(httpException.code()).thenReturn(401) + `when`(api.getRepositoryList("test")).thenThrow(httpException) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.AuthenticationError) + } + + @Test + fun `fetchSearchResults returns error on IOException`() = runBlocking { + // Arrange + `when`(api.getRepositoryList("test")).thenAnswer { + throw IOException("Network error") } + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.NetworkError) + } + @Test - fun `fetchSearchResults returns error on IOException`() = - runBlocking { - // Arrange - `when`(api.getRepository("test")).thenAnswer { - throw IOException("Network error") - } - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.NetworkError) + fun `fetchSearchResults returns error on JSONException`() = runBlocking { + // Arrange + `when`(api.getRepositoryList("test")).thenAnswer { + throw JSONException("Parsing error") } + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.ParseError) + } + + @Test + fun `fetchRepositoryDetail returns success with valid data`() = runBlocking { + // Arrange + val mockDetail = GitHubMockData.getMockRepositoryItem() + `when`(api.getRepositoryDetail(1)).thenReturn(mockDetail) + + // Act + val result = repository.fetchRepositoryDetail(1) + + // Assert + assert(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals("repo1", success.data.name) + assertEquals("url1", success.data.ownerIconUrl) + } + @Test - fun `fetchSearchResults returns error on JSONException`() = - runBlocking { - // Arrange - `when`(api.getRepository("test")).thenAnswer { - throw JSONException("Parsing error") - } - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.ParseError) + fun `fetchRepositoryDetail returns error on HttpException`() = runBlocking { + // Arrange + val httpException = mock(HttpException::class.java) + `when`(httpException.code()).thenReturn(429) + `when`(api.getRepositoryDetail(1)).thenThrow(httpException) + + // Act + val result = repository.fetchRepositoryDetail(1) + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.RateLimitError) + } + + @Test + fun `fetchRepositoryDetail returns error on IOException`() = runBlocking { + // Arrange + `when`(api.getRepositoryDetail(1)).thenAnswer { + throw IOException("Network error") } - // Mockデータ生成関数 - private fun mockRepositoryList(): RepositoryList { - return RepositoryList( - items = - listOf( - RepositoryItem( - name = "repo1", - owner = RepositoryOwner("owner1"), - language = "Kotlin", - stargazersCount = 100, - watchersCount = 50, - forksCount = 20, - openIssuesCount = 5, - ), - RepositoryItem( - name = "repo2", - owner = RepositoryOwner("owner2"), - language = "Java", - stargazersCount = 200, - watchersCount = 80, - forksCount = 30, - openIssuesCount = 10, - ), - ), - ) + // Act + val result = repository.fetchRepositoryDetail(1) + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.NetworkError) } } diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt index 1670272..a0812d0 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt @@ -5,15 +5,13 @@ import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl +import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.runBlocking -import org.junit.Assert.assertEquals -import org.junit.Assert.assertThrows +import org.junit.Assert.* import org.junit.Before import org.junit.Test -import org.mockito.Mockito.mock -import org.mockito.Mockito.`when` -import org.mockito.MockitoAnnotations +import org.mockito.Mockito.* class GitHubServiceUsecaseImplTest { private lateinit var repository: GitHubServiceRepository @@ -22,7 +20,6 @@ class GitHubServiceUsecaseImplTest { @Before fun setUp() { - MockitoAnnotations.openMocks(this) repository = mock(GitHubServiceRepository::class.java) networkConnectivityService = mock(NetworkConnectivityService::class.java) usecase = GitHubServiceUsecaseImpl(repository, networkConnectivityService) @@ -32,45 +29,96 @@ class GitHubServiceUsecaseImplTest { fun `fetchSearchResults throws NetworkException when offline`() { `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(false) - val exception = - assertThrows(NetworkException::class.java) { - runBlocking { - usecase.fetchSearchResults("test") - } + val exception = assertThrows(NetworkException::class.java) { + runBlocking { + usecase.fetchSearchResults("test") } + } assertEquals("オフライン状態です", exception.message) } @Test - fun `fetchSearchResults returns results when online`() = - runBlocking { - val mockResults = - listOf( - RepositoryEntity( - name = "repo1", - ownerIconUrl = "description1", - language = "url1", - stargazersCount = 100, - forksCount = 50, - openIssuesCount = 30, - watchersCount = 70, - ), - RepositoryEntity( - name = "repo2", - ownerIconUrl = "description2", - language = "url2", - stargazersCount = 100, - forksCount = 50, - openIssuesCount = 30, - watchersCount = 70, - ), - ) - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) - - val result = usecase.fetchSearchResults("test") - - assertEquals(NetworkResult.Success(mockResults), result) + fun `fetchSearchResults returns success when online`() = runBlocking { + val mockResults = GitHubMockData.getMockRepositoryEntityList() + + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) + + val result = usecase.fetchSearchResults("test") + + assertTrue(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals(2, success.data.size) + assertEquals("repo1", success.data[0].name) + assertEquals("repo2", success.data[1].name) + } + + @Test + fun `fetchSearchResults returns error on API failure`() = runBlocking { + val mockError = GitHubMockData.getMockApiError404() + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchSearchResults("test")).thenReturn(mockError) + + val result = usecase.fetchSearchResults("test") + + assertTrue(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assertTrue(error.exception is GitHubError.ApiError) + assertEquals(404, (error.exception as GitHubError.ApiError).code) + } + + @Test + fun `fetchRepositoryDetail throws NetworkException when offline`() { + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(false) + + val exception = assertThrows(NetworkException::class.java) { + runBlocking { + usecase.fetchRepositoryDetail(1) + } } + + assertEquals("オフライン状態です", exception.message) + } + + @Test + fun `fetchRepositoryDetail returns success when online`() = runBlocking { + val mockDetail = GitHubMockData.getMockRepositoryEntity() + + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchRepositoryDetail(1)).thenReturn(NetworkResult.Success(mockDetail)) + + val result = usecase.fetchRepositoryDetail(1) + + assertTrue(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals("repo1", success.data.name) + } + + @Test + fun `fetchRepositoryDetail returns error on API failure`() = runBlocking { + val mockError = GitHubMockData.getMockApiError500() + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchRepositoryDetail(1)).thenReturn(mockError) + + val result = usecase.fetchRepositoryDetail(1) + + assertTrue(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assertTrue(error.exception is GitHubError.ApiError) + assertEquals(500, (error.exception as GitHubError.ApiError).code) + } + + @Test + fun `fetchRepositoryDetail handles network error`() = runBlocking { + val mockError = GitHubMockData.getMockNetworkError() + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchRepositoryDetail(1)).thenReturn(mockError) + + val result = usecase.fetchRepositoryDetail(1) + + assertTrue(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assertTrue(error.exception is GitHubError.NetworkError) + } } From 23d30502784007583c1fd5114e4deb18bd38ec9f Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:50:28 +0900 Subject: [PATCH 093/108] =?UTF-8?q?delete:=20fragment=E3=81=AE=E6=99=82?= =?UTF-8?q?=E3=81=AE=E8=A8=98=E8=BF=B0=E3=82=92=E3=81=99=E3=81=B9=E3=81=A6?= =?UTF-8?q?=E6=B6=88=E5=8E=BB=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/RepositoryDetailFragment.kt | 49 -------- .../RepositoryListRecyclerViewAdapter.kt | 74 ------------ .../search/RepositorySearchFragment.kt | 97 ---------------- app/src/main/res/layout/activity_top.xml | 22 ---- .../res/layout/fragment_repository_detail.xml | 108 ------------------ .../res/layout/fragment_repository_search.xml | 60 ---------- app/src/main/res/layout/layout_item.xml | 21 ---- app/src/main/res/navigation/nav_graph.xml | 28 ----- 8 files changed, 459 deletions(-) delete mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt delete mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt delete mode 100644 app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt delete mode 100644 app/src/main/res/layout/activity_top.xml delete mode 100644 app/src/main/res/layout/fragment_repository_detail.xml delete mode 100644 app/src/main/res/layout/fragment_repository_search.xml delete mode 100644 app/src/main/res/layout/layout_item.xml delete mode 100644 app/src/main/res/navigation/nav_graph.xml diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt deleted file mode 100644 index d535f66..0000000 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailFragment.kt +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2021 YUMEMI Inc. All rights reserved. - */ -package jp.co.yumemi.android.code_check.core.presenter.detail - -import android.os.Bundle -import android.view.View -import androidx.fragment.app.Fragment -import androidx.navigation.fragment.navArgs -import coil.load -import dagger.hilt.android.AndroidEntryPoint -import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity -import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding - -@AndroidEntryPoint -class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) { - private val args: RepositoryDetailFragmentArgs by navArgs() - - private var _binding: FragmentRepositoryDetailBinding? = null - private val binding get() = _binding ?: throw IllegalStateException("Binding is null") - - override fun onViewCreated( - view: View, - savedInstanceState: Bundle?, - ) { - super.onViewCreated(view, savedInstanceState) - - _binding = FragmentRepositoryDetailBinding.bind(view) - - val item = args.item - bindViews(item) - } - - private fun bindViews(item: RepositoryEntity) { - binding.ownerIconView.load(item.ownerIconUrl) - binding.nameView.text = item.name - binding.languageView.text = resources.getString(R.string.written_language, item.language) - binding.starsView.text = resources.getString(R.string.stars_count, item.stargazersCount) - binding.watchersView.text = resources.getString(R.string.watchers_count, item.watchersCount) - binding.forksView.text = resources.getString(R.string.forks_count, item.forksCount) - binding.openIssuesView.text = resources.getString(R.string.open_issues_count, item.openIssuesCount) - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt deleted file mode 100644 index 4c420c3..0000000 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositoryListRecyclerViewAdapter.kt +++ /dev/null @@ -1,74 +0,0 @@ -package jp.co.yumemi.android.code_check.core.presenter.search - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView -import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity - -/** - * DiffUtilの実装 - */ -private val diffUtilCallback = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldItem: RepositoryEntity, - newItem: RepositoryEntity, - ): Boolean { - return oldItem.name == newItem.name - } - - override fun areContentsTheSame( - oldItem: RepositoryEntity, - newItem: RepositoryEntity, - ): Boolean { - return oldItem == newItem - } - } - -/** - * RecyclerView Adapter - */ -class RepositoryListRecyclerViewAdapter( - private val itemClickListener: OnItemClickListener, -) : ListAdapter(diffUtilCallback) { - class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - private val repositoryNameView: TextView? = view.findViewById(R.id.repositoryNameView) - - /** - * ビューにデータをバインド - */ - fun bind( - item: RepositoryEntity, - clickListener: OnItemClickListener, - ) { - repositoryNameView?.text = item.name - itemView.setOnClickListener { clickListener.itemClick(item) } - } - } - - interface OnItemClickListener { - fun itemClick(repositoryEntity: RepositoryEntity) - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int, - ): ViewHolder { - val view = - LayoutInflater.from(parent.context) - .inflate(R.layout.layout_item, parent, false) - return ViewHolder(view) - } - - override fun onBindViewHolder( - holder: ViewHolder, - position: Int, - ) { - holder.bind(getItem(position), itemClickListener) - } -} diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt deleted file mode 100644 index c74716f..0000000 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchFragment.kt +++ /dev/null @@ -1,97 +0,0 @@ -package jp.co.yumemi.android.code_check.core.presenter.search - -import android.os.Bundle -import android.view.View -import android.view.inputmethod.EditorInfo -import androidx.fragment.app.Fragment -import androidx.fragment.app.viewModels -import androidx.navigation.fragment.findNavController -import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager -import dagger.hilt.android.AndroidEntryPoint -import jp.co.yumemi.android.code_check.R -import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity -import jp.co.yumemi.android.code_check.core.utils.DialogHelper -import jp.co.yumemi.android.code_check.databinding.FragmentRepositorySearchBinding - -@AndroidEntryPoint -class RepositorySearchFragment : Fragment(R.layout.fragment_repository_search) { - private var _binding: FragmentRepositorySearchBinding? = null - private val binding get() = _binding ?: throw IllegalStateException("Binding is null") - private val viewModel: RepositorySearchViewModel by viewModels() - - private val adapter by lazy { - RepositoryListRecyclerViewAdapter( - object : RepositoryListRecyclerViewAdapter.OnItemClickListener { - override fun itemClick(repositoryEntity: RepositoryEntity) { - onItemClick(repositoryEntity) - } - }, - ) - } - - override fun onViewCreated( - view: View, - savedInstanceState: Bundle?, - ) { - super.onViewCreated(view, savedInstanceState) - _binding = FragmentRepositorySearchBinding.bind(view) - - observeViewModel() - setupRecyclerView() - setupSearchInput() - } - - private fun observeViewModel() { - viewModel.searchResults.observe(viewLifecycleOwner) { - adapter.submitList(it) - } - viewModel.errorMessage.observe(viewLifecycleOwner) { - it?.let { - DialogHelper.showErrorDialog( - requireContext(), - requireContext().getString(it), - ) - } - } - } - - private fun setupRecyclerView() { - val layoutManager = LinearLayoutManager(requireContext()) - val dividerItemDecoration = - DividerItemDecoration(requireContext(), layoutManager.orientation) - - binding.recyclerView.apply { - this.layoutManager = layoutManager - addItemDecoration(dividerItemDecoration) - adapter = this@RepositorySearchFragment.adapter - } - } - - private fun setupSearchInput() { - binding.searchInputText.setOnEditorActionListener { editText, action, _ -> - if (action == EditorInfo.IME_ACTION_SEARCH) { - viewModel.searchRepositories(editText.text.toString().trim()) - true - } else { - false - } - } - } - - /** - * リポジトリ検索結果のクリックイベント - * リサイクラービューでアイテムが押された時に動作を行います。 - */ - private fun onItemClick(item: RepositoryEntity) { - val action = - RepositorySearchFragmentDirections - .actionRepositoriesFragmentToRepositoryFragment(item = item) - findNavController().navigate(action) - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} diff --git a/app/src/main/res/layout/activity_top.xml b/app/src/main/res/layout/activity_top.xml deleted file mode 100644 index 9eb3991..0000000 --- a/app/src/main/res/layout/activity_top.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_repository_detail.xml b/app/src/main/res/layout/fragment_repository_detail.xml deleted file mode 100644 index 8e1b54f..0000000 --- a/app/src/main/res/layout/fragment_repository_detail.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_repository_search.xml b/app/src/main/res/layout/fragment_repository_search.xml deleted file mode 100644 index 5d1e079..0000000 --- a/app/src/main/res/layout/fragment_repository_search.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_item.xml b/app/src/main/res/layout/layout_item.xml deleted file mode 100644 index 5ade5cc..0000000 --- a/app/src/main/res/layout/layout_item.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml deleted file mode 100644 index 910a239..0000000 --- a/app/src/main/res/navigation/nav_graph.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - From d67d4a532651ae7935b711b11ab3d560e4f93ca5 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:51:58 +0900 Subject: [PATCH 094/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/RepositoryDetailScreen.kt | 1 - .../features/github/GitHubMockData.kt | 69 +++--- .../github/GitHubServiceRepositoryImplTest.kt | 205 +++++++++--------- .../github/GitHubServiceUsecaseImplTest.kt | 137 ++++++------ 4 files changed, 212 insertions(+), 200 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 854e4f3..e6a2303 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -20,7 +20,6 @@ import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.filled.Star import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt index 823bc6b..26e9a85 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubMockData.kt @@ -12,36 +12,38 @@ import org.mockito.Mockito.`when` import java.io.IOException object GitHubMockData { - // 正常なリポジトリ検索結果 fun getMockRepositoryList(): RepositoryList { return RepositoryList( - items = listOf( - RepositoryItem( - name = "repo1", - owner = RepositoryOwner( - avatarUrl = "url1" + items = + listOf( + RepositoryItem( + name = "repo1", + owner = + RepositoryOwner( + avatarUrl = "url1", + ), + language = "Kotlin", + stargazersCount = 100, + forksCount = 50, + openIssuesCount = 30, + watchersCount = 70, + id = 1, ), - language = "Kotlin", - stargazersCount = 100, - forksCount = 50, - openIssuesCount = 30, - watchersCount = 70, - id = 1 - ), - RepositoryItem( - name = "repo2", - owner = RepositoryOwner( - avatarUrl = "url2" + RepositoryItem( + name = "repo2", + owner = + RepositoryOwner( + avatarUrl = "url2", + ), + language = "Java", + stargazersCount = 200, + forksCount = 80, + openIssuesCount = 20, + watchersCount = 60, + id = 2, ), - language = "Java", - stargazersCount = 200, - forksCount = 80, - openIssuesCount = 20, - watchersCount = 60, - id = 2 - ) - ) + ), ) } @@ -55,7 +57,7 @@ object GitHubMockData { forksCount = 50, openIssuesCount = 30, watchersCount = 70, - id = 1 + id = 1, ), RepositoryEntity( name = "repo2", @@ -65,8 +67,8 @@ object GitHubMockData { forksCount = 80, openIssuesCount = 20, watchersCount = 60, - id = 2 - ) + id = 2, + ), ) } @@ -80,9 +82,10 @@ object GitHubMockData { openIssuesCount = 30, watchersCount = 70, id = 1, - owner = RepositoryOwner( - avatarUrl = "url1" - ) + owner = + RepositoryOwner( + avatarUrl = "url1", + ), ) } @@ -95,12 +98,10 @@ object GitHubMockData { forksCount = 50, openIssuesCount = 30, watchersCount = 70, - id = 1 + id = 1, ) } - - // ネットワークエラー fun getMockNetworkError(): NetworkResult.Error { return NetworkResult.Error(GitHubError.NetworkError(IOException("Network issue"))) diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt index 0dddb6c..ce9ec3a 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceRepositoryImplTest.kt @@ -1,17 +1,14 @@ package jp.co.yumemi.android.code_check.features.github import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi -import jp.co.yumemi.android.code_check.features.github.entity.RepositoryItem -import jp.co.yumemi.android.code_check.features.github.entity.RepositoryList -import jp.co.yumemi.android.code_check.features.github.entity.RepositoryOwner import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepositoryImpl import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult import kotlinx.coroutines.runBlocking import org.json.JSONException import org.junit.Assert.assertEquals -import org.junit.Test import org.junit.Before +import org.junit.Test import org.mockito.Mockito.mock import org.mockito.Mockito.`when` import retrofit2.HttpException @@ -28,116 +25,122 @@ class GitHubServiceRepositoryImplTest { } @Test - fun `fetchSearchResults returns success with valid data`() = runBlocking { - // Arrange - val mockResponse = GitHubMockData.getMockRepositoryList() - `when`(api.getRepositoryList("test")).thenReturn(mockResponse) - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Success) - val success = result as NetworkResult.Success - assertEquals(2, success.data.size) - assertEquals("repo1", success.data[0].name) - assertEquals("url1", success.data[0].ownerIconUrl) // 修正: ownerIconUrl -> avatarUrl - } - + fun `fetchSearchResults returns success with valid data`() = + runBlocking { + // Arrange + val mockResponse = GitHubMockData.getMockRepositoryList() + `when`(api.getRepositoryList("test")).thenReturn(mockResponse) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals(2, success.data.size) + assertEquals("repo1", success.data[0].name) + assertEquals("url1", success.data[0].ownerIconUrl) // 修正: ownerIconUrl -> avatarUrl + } @Test - fun `fetchSearchResults returns error on HttpException`() = runBlocking { - // Arrange - val httpException = mock(HttpException::class.java) - `when`(httpException.code()).thenReturn(401) - `when`(api.getRepositoryList("test")).thenThrow(httpException) - - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.AuthenticationError) - } + fun `fetchSearchResults returns error on HttpException`() = + runBlocking { + // Arrange + val httpException = mock(HttpException::class.java) + `when`(httpException.code()).thenReturn(401) + `when`(api.getRepositoryList("test")).thenThrow(httpException) + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.AuthenticationError) + } @Test - fun `fetchSearchResults returns error on IOException`() = runBlocking { - // Arrange - `when`(api.getRepositoryList("test")).thenAnswer { - throw IOException("Network error") + fun `fetchSearchResults returns error on IOException`() = + runBlocking { + // Arrange + `when`(api.getRepositoryList("test")).thenAnswer { + throw IOException("Network error") + } + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.NetworkError) } - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.NetworkError) - } - @Test - fun `fetchSearchResults returns error on JSONException`() = runBlocking { - // Arrange - `when`(api.getRepositoryList("test")).thenAnswer { - throw JSONException("Parsing error") + fun `fetchSearchResults returns error on JSONException`() = + runBlocking { + // Arrange + `when`(api.getRepositoryList("test")).thenAnswer { + throw JSONException("Parsing error") + } + + // Act + val result = repository.fetchSearchResults("test") + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.ParseError) } - // Act - val result = repository.fetchSearchResults("test") - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.ParseError) - } - @Test - fun `fetchRepositoryDetail returns success with valid data`() = runBlocking { - // Arrange - val mockDetail = GitHubMockData.getMockRepositoryItem() - `when`(api.getRepositoryDetail(1)).thenReturn(mockDetail) - - // Act - val result = repository.fetchRepositoryDetail(1) - - // Assert - assert(result is NetworkResult.Success) - val success = result as NetworkResult.Success - assertEquals("repo1", success.data.name) - assertEquals("url1", success.data.ownerIconUrl) - } + fun `fetchRepositoryDetail returns success with valid data`() = + runBlocking { + // Arrange + val mockDetail = GitHubMockData.getMockRepositoryItem() + `when`(api.getRepositoryDetail(1)).thenReturn(mockDetail) + + // Act + val result = repository.fetchRepositoryDetail(1) + + // Assert + assert(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals("repo1", success.data.name) + assertEquals("url1", success.data.ownerIconUrl) + } @Test - fun `fetchRepositoryDetail returns error on HttpException`() = runBlocking { - // Arrange - val httpException = mock(HttpException::class.java) - `when`(httpException.code()).thenReturn(429) - `when`(api.getRepositoryDetail(1)).thenThrow(httpException) - - // Act - val result = repository.fetchRepositoryDetail(1) - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.RateLimitError) - } + fun `fetchRepositoryDetail returns error on HttpException`() = + runBlocking { + // Arrange + val httpException = mock(HttpException::class.java) + `when`(httpException.code()).thenReturn(429) + `when`(api.getRepositoryDetail(1)).thenThrow(httpException) + + // Act + val result = repository.fetchRepositoryDetail(1) + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.RateLimitError) + } @Test - fun `fetchRepositoryDetail returns error on IOException`() = runBlocking { - // Arrange - `when`(api.getRepositoryDetail(1)).thenAnswer { - throw IOException("Network error") + fun `fetchRepositoryDetail returns error on IOException`() = + runBlocking { + // Arrange + `when`(api.getRepositoryDetail(1)).thenAnswer { + throw IOException("Network error") + } + + // Act + val result = repository.fetchRepositoryDetail(1) + + // Assert + assert(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assert(error.exception is GitHubError.NetworkError) } - - // Act - val result = repository.fetchRepositoryDetail(1) - - // Assert - assert(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assert(error.exception is GitHubError.NetworkError) - } } diff --git a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt index a0812d0..4a9ae28 100644 --- a/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt +++ b/app/src/test/kotlin/jp/co/yumemi/android/code_check/features/github/GitHubServiceUsecaseImplTest.kt @@ -1,17 +1,19 @@ package jp.co.yumemi.android.code_check.features.github import jp.co.yumemi.android.code_check.core.api.NetworkConnectivityService -import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository import jp.co.yumemi.android.code_check.features.github.reposiotory.NetworkException import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl import jp.co.yumemi.android.code_check.features.github.utils.GitHubError import jp.co.yumemi.android.code_check.features.github.utils.NetworkResult +import junit.framework.Assert.assertEquals import kotlinx.coroutines.runBlocking -import org.junit.Assert.* +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test -import org.mockito.Mockito.* +import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` class GitHubServiceUsecaseImplTest { private lateinit var repository: GitHubServiceRepository @@ -29,96 +31,103 @@ class GitHubServiceUsecaseImplTest { fun `fetchSearchResults throws NetworkException when offline`() { `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(false) - val exception = assertThrows(NetworkException::class.java) { - runBlocking { - usecase.fetchSearchResults("test") + val exception = + assertThrows(NetworkException::class.java) { + runBlocking { + usecase.fetchSearchResults("test") + } } - } assertEquals("オフライン状態です", exception.message) } @Test - fun `fetchSearchResults returns success when online`() = runBlocking { - val mockResults = GitHubMockData.getMockRepositoryEntityList() + fun `fetchSearchResults returns success when online`() = + runBlocking { + val mockResults = GitHubMockData.getMockRepositoryEntityList() - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchSearchResults("test")).thenReturn(NetworkResult.Success(mockResults)) - val result = usecase.fetchSearchResults("test") + val result = usecase.fetchSearchResults("test") - assertTrue(result is NetworkResult.Success) - val success = result as NetworkResult.Success - assertEquals(2, success.data.size) - assertEquals("repo1", success.data[0].name) - assertEquals("repo2", success.data[1].name) - } + assertTrue(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals(2, success.data.size) + assertEquals("repo1", success.data[0].name) + assertEquals("repo2", success.data[1].name) + } @Test - fun `fetchSearchResults returns error on API failure`() = runBlocking { - val mockError = GitHubMockData.getMockApiError404() - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchSearchResults("test")).thenReturn(mockError) - - val result = usecase.fetchSearchResults("test") - - assertTrue(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assertTrue(error.exception is GitHubError.ApiError) - assertEquals(404, (error.exception as GitHubError.ApiError).code) - } + fun `fetchSearchResults returns error on API failure`() = + runBlocking { + val mockError = GitHubMockData.getMockApiError404() + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchSearchResults("test")).thenReturn(mockError) + + val result = usecase.fetchSearchResults("test") + + assertTrue(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assertTrue(error.exception is GitHubError.ApiError) + assertEquals(404, (error.exception as GitHubError.ApiError).code) + } @Test fun `fetchRepositoryDetail throws NetworkException when offline`() { `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(false) - val exception = assertThrows(NetworkException::class.java) { - runBlocking { - usecase.fetchRepositoryDetail(1) + val exception = + assertThrows(NetworkException::class.java) { + runBlocking { + usecase.fetchRepositoryDetail(1) + } } - } assertEquals("オフライン状態です", exception.message) } @Test - fun `fetchRepositoryDetail returns success when online`() = runBlocking { - val mockDetail = GitHubMockData.getMockRepositoryEntity() + fun `fetchRepositoryDetail returns success when online`() = + runBlocking { + val mockDetail = GitHubMockData.getMockRepositoryEntity() - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchRepositoryDetail(1)).thenReturn(NetworkResult.Success(mockDetail)) + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchRepositoryDetail(1)).thenReturn(NetworkResult.Success(mockDetail)) - val result = usecase.fetchRepositoryDetail(1) + val result = usecase.fetchRepositoryDetail(1) - assertTrue(result is NetworkResult.Success) - val success = result as NetworkResult.Success - assertEquals("repo1", success.data.name) - } + assertTrue(result is NetworkResult.Success) + val success = result as NetworkResult.Success + assertEquals("repo1", success.data.name) + } @Test - fun `fetchRepositoryDetail returns error on API failure`() = runBlocking { - val mockError = GitHubMockData.getMockApiError500() - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchRepositoryDetail(1)).thenReturn(mockError) - - val result = usecase.fetchRepositoryDetail(1) - - assertTrue(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assertTrue(error.exception is GitHubError.ApiError) - assertEquals(500, (error.exception as GitHubError.ApiError).code) - } + fun `fetchRepositoryDetail returns error on API failure`() = + runBlocking { + val mockError = GitHubMockData.getMockApiError500() + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchRepositoryDetail(1)).thenReturn(mockError) + + val result = usecase.fetchRepositoryDetail(1) + + assertTrue(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assertTrue(error.exception is GitHubError.ApiError) + assertEquals(500, (error.exception as GitHubError.ApiError).code) + } @Test - fun `fetchRepositoryDetail handles network error`() = runBlocking { - val mockError = GitHubMockData.getMockNetworkError() - `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) - `when`(repository.fetchRepositoryDetail(1)).thenReturn(mockError) + fun `fetchRepositoryDetail handles network error`() = + runBlocking { + val mockError = GitHubMockData.getMockNetworkError() + `when`(networkConnectivityService.isNetworkAvailable()).thenReturn(true) + `when`(repository.fetchRepositoryDetail(1)).thenReturn(mockError) - val result = usecase.fetchRepositoryDetail(1) + val result = usecase.fetchRepositoryDetail(1) - assertTrue(result is NetworkResult.Error) - val error = result as NetworkResult.Error - assertTrue(error.exception is GitHubError.NetworkError) - } + assertTrue(result is NetworkResult.Error) + val error = result as NetworkResult.Error + assertTrue(error.exception is GitHubError.NetworkError) + } } From c30c4790c4551adebd929a8b50a8ca1cf7111991 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 18:55:17 +0900 Subject: [PATCH 095/108] =?UTF-8?q?ref:=20=E3=83=AA=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/detail/RepositoryDetailViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt index f93a8e0..e33fb8b 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt @@ -16,8 +16,8 @@ import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel -class -RepositoryDetailViewModel@Inject +class RepositoryDetailViewModel + @Inject constructor( private val networkRepository: GitHubServiceUsecase, ) : ViewModel() { From 3c5024e369e0a33d0f4c76f590013d2e96219876 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:01:46 +0900 Subject: [PATCH 096/108] =?UTF-8?q?fix:=20=E3=82=BF=E3=82=A4=E3=83=9D?= =?UTF-8?q?=E3=82=B0=E3=83=A9=E3=83=95=E3=82=A3=E3=83=BC=E3=81=AE=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E3=81=AE=E5=AE=9F=E8=A3=85=E3=82=92=E8=A1=8C=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/theme/Type.kt | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt index e59570c..e35dc03 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/theme/Type.kt @@ -17,20 +17,36 @@ val Typography = lineHeight = 24.sp, letterSpacing = 0.5.sp, ), - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ + titleLarge = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp, + ), + titleMedium = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 18.sp, + lineHeight = 24.sp, + letterSpacing = 0.15.sp, + ), + bodyMedium = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.25.sp, + ), + labelSmall = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp, + ), ) From d026e5499883e684092287b52fbfc2d7461028f8 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:05:18 +0900 Subject: [PATCH 097/108] =?UTF-8?q?fix:=20=E3=82=A2=E3=82=AF=E3=82=BB?= =?UTF-8?q?=E3=82=B7=E3=83=93=E3=83=AA=E3=83=86=E3=82=A3=E3=81=A8=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=82=AB=E3=83=A9=E3=82=A4=E3=82=BC=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/widget/ProgressCycle.kt | 32 ++++++++++++++----- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt index 5de3eb6..ce11546 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt @@ -10,23 +10,39 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.isTraversalGroup import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp +import jp.co.yumemi.android.code_check.R @Composable -fun ProgressCycle() { +fun ProgressCycle( + message: String = stringResource(R.string.searching), + contentDescription: String = stringResource(R.string.loading_content_description) +) { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, modifier = - Modifier - .fillMaxWidth() - .fillMaxHeight() - .padding(8.dp) - .semantics { isTraversalGroup = true }, + Modifier + .fillMaxWidth() + .fillMaxHeight() + .padding(8.dp) + .semantics { + isTraversalGroup = true + this.contentDescription = contentDescription + } ) { - CircularProgressIndicator() - Text(text = "検索中") + CircularProgressIndicator( + modifier = Modifier.semantics { + this.contentDescription = contentDescription + } + ) + Text( + text = message, + modifier = Modifier.padding(top = 8.dp) + ) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b6a633..71387e1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,4 +14,6 @@ フォームが空欄になっています 詳細 検索 + 検索中 + データを読み込んでいます \ No newline at end of file From bedab2d43836490409296b86d7b866839ba446fa Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:07:26 +0900 Subject: [PATCH 098/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=AE?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/detail/RepositoryDetailViewModel.kt | 4 ++-- app/src/main/res/values/strings.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt index e33fb8b..46b2eb9 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailViewModel.kt @@ -33,7 +33,7 @@ class RepositoryDetailViewModel */ fun searchRepositories(id: Int) { if (id == 0) { - _errorMessage.postValue(R.string.api_error) + _errorMessage.postValue(R.string.invalid_repository_id) return } viewModelScope.launch { @@ -47,7 +47,7 @@ class RepositoryDetailViewModel _searchResults.postValue(results.data) } } catch (e: NetworkException) { - Log.e("NetworkException", e.message, e) + Log.e("RepositoryDetailViewModel", "Failed to fetch repository details for id: $id", e) handleError(GitHubError.NetworkError(e)) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 71387e1..20a882e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,6 +12,7 @@ セッションの時間切れ APIのエラー フォームが空欄になっています + 正しいIDが返されませんでした 詳細 検索 検索中 From 99b1860be2fe607c83fda38d422270123ba4a0b8 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:14:41 +0900 Subject: [PATCH 099/108] =?UTF-8?q?fix:=20=E3=82=A2=E3=82=AF=E3=82=BB?= =?UTF-8?q?=E3=82=B7=E3=83=93=E3=83=AA=E3=83=86=E3=82=A3=E3=81=AE=E6=94=B9?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/search/RepositorySearchScreen.kt | 8 ++++++-- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index 1b01faf..5dc3168 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -29,6 +29,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.isTraversalGroup import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.input.ImeAction @@ -148,7 +149,7 @@ fun CustomSearchBar( leadingIcon = { Icon( Icons.Sharp.Search, - contentDescription = null, + contentDescription = context.getString(R.string.search_icon_description), tint = MaterialTheme.colorScheme.primary, ) }, @@ -159,7 +160,10 @@ fun CustomSearchBar( .background( color = MaterialTheme.colorScheme.surface, shape = RoundedCornerShape(40.dp), - ), + ) + .semantics { + contentDescription = context.getString(R.string.search_bar_description) + }, colors = TextFieldDefaults.colors( focusedContainerColor = MaterialTheme.colorScheme.primaryContainer, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 20a882e..7a589bd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,4 +17,6 @@ 検索 検索中 データを読み込んでいます + 検索アイコン + 検索バー \ No newline at end of file From 1942c47edd26c768c5a0598bedf3d259edb851da Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:17:44 +0900 Subject: [PATCH 100/108] =?UTF-8?q?fix:=20=E7=94=BB=E5=83=8F=E8=AA=AD?= =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=E3=81=AE=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/RepositoryDetailScreen.kt | 13 +++++++-- .../core/presenter/widget/ProgressCycle.kt | 27 ++++++++++--------- app/src/main/res/values/strings.xml | 1 + 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index e6a2303..82a7d3f 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -32,6 +32,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -39,6 +40,7 @@ import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import coil.compose.rememberAsyncImagePainter +import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.presenter.widget.ProgressCycle @@ -124,6 +126,8 @@ fun RepositoryDetailContent(repository: RepositoryEntity) { @Composable fun RepositoryOverviewCard(repository: RepositoryEntity) { + val context = LocalContext.current + Card( modifier = Modifier.fillMaxWidth(), elevation = CardDefaults.cardElevation(4.dp), @@ -137,8 +141,13 @@ fun RepositoryOverviewCard(repository: RepositoryEntity) { horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - painter = rememberAsyncImagePainter(repository.ownerIconUrl), - contentDescription = "Owner Icon", + painter = + rememberAsyncImagePainter( + model = repository.ownerIconUrl, + error = painterResource(R.drawable.ic_launcher_foreground), + placeholder = painterResource(R.drawable.ic_launcher_background), + ), + contentDescription = context.getString(R.string.owner_icon_description), modifier = Modifier.size(80.dp), ) Text( diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt index ce11546..d0a5bd1 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/widget/ProgressCycle.kt @@ -20,29 +20,30 @@ import jp.co.yumemi.android.code_check.R @Composable fun ProgressCycle( message: String = stringResource(R.string.searching), - contentDescription: String = stringResource(R.string.loading_content_description) + contentDescription: String = stringResource(R.string.loading_content_description), ) { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, modifier = - Modifier - .fillMaxWidth() - .fillMaxHeight() - .padding(8.dp) - .semantics { - isTraversalGroup = true - this.contentDescription = contentDescription - } + Modifier + .fillMaxWidth() + .fillMaxHeight() + .padding(8.dp) + .semantics { + isTraversalGroup = true + this.contentDescription = contentDescription + }, ) { CircularProgressIndicator( - modifier = Modifier.semantics { - this.contentDescription = contentDescription - } + modifier = + Modifier.semantics { + this.contentDescription = contentDescription + }, ) Text( text = message, - modifier = Modifier.padding(top = 8.dp) + modifier = Modifier.padding(top = 8.dp), ) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a589bd..64c0210 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,4 +19,5 @@ データを読み込んでいます 検索アイコン 検索バー + ユーザーアイコン \ No newline at end of file From 0c897744fbf7c930bbeab451f7fd73768c39258c Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:18:37 +0900 Subject: [PATCH 101/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code_check/core/presenter/detail/RepositoryDetailScreen.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 82a7d3f..7494615 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -76,7 +76,7 @@ fun RepositoryDetailScreen( horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth().fillMaxHeight(), ) { - Text(text = "データの取得に失敗しました。") + Text(text = context.getString(R.string.error_data_fetch_failed)) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64c0210..18c2cf7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,4 +20,5 @@ 検索アイコン 検索バー ユーザーアイコン + データの取得に失敗しました \ No newline at end of file From 39c75af5beeb1efbabbb60de7f935563de58ff01 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:25:21 +0900 Subject: [PATCH 102/108] =?UTF-8?q?fix:=20=E7=8A=B6=E6=85=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=8F=E3=83=B3?= =?UTF-8?q?=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=AE=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/detail/RepositoryDetailScreen.kt | 13 ++++++++++--- app/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 7494615..5ae619c 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -1,5 +1,6 @@ package jp.co.yumemi.android.code_check.core.presenter.detail +import androidx.activity.compose.BackHandler import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -56,27 +57,33 @@ fun RepositoryDetailScreen( var isLoading by remember { mutableStateOf(false) } val lifecycleOwner = LocalLifecycleOwner.current + BackHandler(onBack = toBack) + + var error by remember { mutableStateOf(null) } + LaunchedEffect(Unit) { viewModel.searchResults.observe(lifecycleOwner) { repositoryDetail.value = it isLoading = false + error = null } viewModel.errorMessage.observe(lifecycleOwner) { errorMessage -> errorMessage?.let { showSnackBar(context.getString(it), true) + error = context.getString(it) } isLoading = false } viewModel.searchRepositories(repositoryId) } - if (repositoryDetail.value == null && !isLoading) { + if (error != null) { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth().fillMaxHeight(), ) { - Text(text = context.getString(R.string.error_data_fetch_failed)) + Text(text = error!!) } } @@ -156,7 +163,7 @@ fun RepositoryOverviewCard(repository: RepositoryEntity) { fontWeight = FontWeight.Bold, ) Text( - text = "Language: ${repository.language}", + text = context.getString(R.string.language_format, repository.language), style = MaterialTheme.typography.bodyMedium, ) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 18c2cf7..6659f1c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,4 +21,5 @@ 検索バー ユーザーアイコン データの取得に失敗しました + Language: %s \ No newline at end of file From 8513674843e9233142291f04decb0bef8ae7beac Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:35:35 +0900 Subject: [PATCH 103/108] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=A8?= =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E4=BD=93=E9=A8=93=E3=81=AE?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/RepositorySearchScreen.kt | 137 +++++++++++++++++- app/src/main/res/values/strings.xml | 5 + 2 files changed, 139 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt index 5dc3168..a9184b0 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/search/RepositorySearchScreen.kt @@ -2,17 +2,23 @@ package jp.co.yumemi.android.code_check.core.presenter.search import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.sharp.Search +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -25,15 +31,19 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.isTraversalGroup import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -42,6 +52,9 @@ import jp.co.yumemi.android.code_check.R import jp.co.yumemi.android.code_check.core.entity.RepositoryEntity import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme import jp.co.yumemi.android.code_check.core.presenter.widget.ProgressCycle +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch @Composable fun RepositorySearchScreen( @@ -54,12 +67,18 @@ fun RepositorySearchScreen( val lifecycleOwner = LocalLifecycleOwner.current val context = LocalContext.current var isLoading by remember { mutableStateOf(false) } + var isError by remember { mutableStateOf(false) } + + // デバウンス処理の追加 + val scope = rememberCoroutineScope() + var searchJob by remember { mutableStateOf(null) } LaunchedEffect(Unit) { viewModel.searchResults.observe(lifecycleOwner) { repositoryList.clear() repositoryList.addAll(it) isLoading = false + isError = false } viewModel.errorMessage.observe(lifecycleOwner) { it?.let { @@ -69,6 +88,7 @@ fun RepositorySearchScreen( ) } isLoading = false + isError = true } } @@ -77,13 +97,28 @@ fun RepositorySearchScreen( inputText = inputText, onValueChange = { inputText = it }, searchAction = { searchWord -> - repositoryList.clear() - viewModel.searchRepositories(searchWord.trim()) - isLoading = true + searchJob?.cancel() + searchJob = + scope.launch { + delay(500) // 500ms遅延 + if (searchWord.isBlank()) return@launch + repositoryList.clear() + viewModel.searchRepositories(searchWord.trim()) + isLoading = true + } }, ) if (isLoading) { ProgressCycle() + } else if (repositoryList.isEmpty() && !isError) { + EmptyState() + } else if (isError) { + ErrorState( + onRetry = { + viewModel.searchRepositories(inputText.trim()) + isLoading = true + }, + ) } RepositoryListView( repositoryList = repositoryList, @@ -185,6 +220,102 @@ fun CustomSearchBar( ) } +@Composable +fun ErrorState( + onRetry: () -> Unit, + modifier: Modifier = Modifier, +) { + Column( + modifier = + modifier + .fillMaxWidth() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + Icon( + imageVector = Icons.Filled.Error, + contentDescription = stringResource(R.string.error_icon_description), + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(48.dp), + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = stringResource(R.string.error_data_fetch_failed), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.error, + textAlign = TextAlign.Center, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Button( + onClick = onRetry, + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + ), + ) { + Text(stringResource(R.string.retry)) + } + } +} + +@Composable +fun EmptyState(modifier: Modifier = Modifier) { + Column( + modifier = + modifier + .fillMaxWidth() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + Icon( + imageVector = Icons.Filled.Search, + contentDescription = stringResource(R.string.empty_state_icon_description), + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(48.dp), + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = stringResource(R.string.empty_state_title), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, + textAlign = TextAlign.Center, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = stringResource(R.string.empty_state_description), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + } +} + +@Preview(showBackground = true) +@Composable +fun EmptyStatePreview() { + CodeCheckAppTheme { + EmptyState() + } +} + +@Preview(showBackground = true) +@Composable +fun ErrorStatePreview() { + CodeCheckAppTheme { + ErrorState(onRetry = {}) + } +} + @Composable @Preview(showBackground = true) fun CustomSearchBarPreview() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6659f1c..fa51ec3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,4 +22,9 @@ ユーザーアイコン データの取得に失敗しました Language: %s + 再度行う + エラーアイコン + 検索アイコン + リポジトリが見つかりません + 検索ワードを入力してリポジトリを探してください \ No newline at end of file From e9a1c79a725bc0ac136940f6325975319d4efc70 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:42:57 +0900 Subject: [PATCH 104/108] =?UTF-8?q?fix:=20=E7=B5=B1=E8=A8=88=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=81=AE=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/RepositoryDetailScreen.kt | 20 ++++++++++++++++--- app/src/main/res/values/strings.xml | 3 +++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 5ae619c..271e93c 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -172,6 +172,8 @@ fun RepositoryOverviewCard(repository: RepositoryEntity) { @Composable fun RepositoryStatsCard(repository: RepositoryEntity) { + val context = LocalContext.current + Card( modifier = Modifier.fillMaxWidth(), elevation = CardDefaults.cardElevation(4.dp), @@ -188,7 +190,11 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) - Text("Stars: ${repository.stargazersCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) + Text( + text = context.getString(R.string.stars_count_format, repository.stargazersCount), + fontSize = 18.sp, + fontWeight = FontWeight.Medium, + ) } Row(verticalAlignment = Alignment.CenterVertically) { @@ -199,7 +205,11 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) - Text("Forks: ${repository.forksCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) + Text( + text = context.getString(R.string.forks_count_format, repository.forksCount), + fontSize = 18.sp, + fontWeight = FontWeight.Medium, + ) } Row(verticalAlignment = Alignment.CenterVertically) { @@ -210,7 +220,11 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) - Text("Open Issues: ${repository.openIssuesCount}", fontSize = 18.sp, fontWeight = FontWeight.Medium) + Text( + text = context.getString(R.string.issues_count_format, repository.openIssuesCount), + fontSize = 18.sp, + fontWeight = FontWeight.Medium, + ) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa51ec3..2e44add 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,4 +27,7 @@ 検索アイコン リポジトリが見つかりません 検索ワードを入力してリポジトリを探してください + Stars: %d + Forks: %d + Open Issues: %d \ No newline at end of file From 230ba6c5be557f930d10c1bd95f98ed625dbf372 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:44:06 +0900 Subject: [PATCH 105/108] =?UTF-8?q?fix:=20=E5=88=9D=E6=9C=9F=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=8A=B6=E6=85=8B?= =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=A8UI=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=AE=E5=88=B6=E5=BE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presenter/detail/RepositoryDetailScreen.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 271e93c..4bf9107 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -62,6 +62,7 @@ fun RepositoryDetailScreen( var error by remember { mutableStateOf(null) } LaunchedEffect(Unit) { + isLoading = true viewModel.searchResults.observe(lifecycleOwner) { repositoryDetail.value = it isLoading = false @@ -77,7 +78,7 @@ fun RepositoryDetailScreen( viewModel.searchRepositories(repositoryId) } - if (error != null) { + if (error != null && !isLoading) { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, @@ -87,11 +88,13 @@ fun RepositoryDetailScreen( } } - RepositoryDetailScaffold( - isLoading = isLoading, - repositoryDetail = repositoryDetail.value, - toBack = toBack, - ) + if (error == null) { + RepositoryDetailScaffold( + isLoading = isLoading, + repositoryDetail = repositoryDetail.value, + toBack = toBack, + ) + } } @Composable From e6cfc324480d0ffeff1f2858f6a92eb16c4779cb Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 19:48:43 +0900 Subject: [PATCH 106/108] =?UTF-8?q?fix:=E6=96=87=E5=AD=97=E5=88=97?= =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=AE=E9=87=8D=E8=A4=87?= =?UTF-8?q?=E3=81=AE=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2e44add..7493715 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,6 @@ Android Engineer CodeCheck GitHub のリポジトリを検索できるよー - Written in %s "%1$d stars" "%1$d watchers" "%1$d forks" From a94b51d38296d8d6a2c46487e1994aa771057007 Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 20:25:15 +0900 Subject: [PATCH 107/108] =?UTF-8?q?fix:=E3=82=AB=E3=82=A6=E3=83=B3?= =?UTF-8?q?=E3=83=88=E8=A1=A8=E7=A4=BA=E6=96=87=E5=AD=97=E5=88=97=E3=81=AE?= =?UTF-8?q?=E9=87=8D=E8=A4=87=E3=81=A8=E4=B8=8D=E6=95=B4=E5=90=88=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/presenter/detail/RepositoryDetailScreen.kt | 6 +++--- app/src/main/res/values/strings.xml | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt index 4bf9107..260b384 100644 --- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt +++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/core/presenter/detail/RepositoryDetailScreen.kt @@ -194,7 +194,7 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = context.getString(R.string.stars_count_format, repository.stargazersCount), + text = context.getString(R.string.stars_count, repository.stargazersCount), fontSize = 18.sp, fontWeight = FontWeight.Medium, ) @@ -209,7 +209,7 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = context.getString(R.string.forks_count_format, repository.forksCount), + text = context.getString(R.string.forks_count, repository.forksCount), fontSize = 18.sp, fontWeight = FontWeight.Medium, ) @@ -224,7 +224,7 @@ fun RepositoryStatsCard(repository: RepositoryEntity) { ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = context.getString(R.string.issues_count_format, repository.openIssuesCount), + text = context.getString(R.string.open_issues_count, repository.openIssuesCount), fontSize = 18.sp, fontWeight = FontWeight.Medium, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7493715..49b65d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,7 +26,4 @@ 検索アイコン リポジトリが見つかりません 検索ワードを入力してリポジトリを探してください - Stars: %d - Forks: %d - Open Issues: %d \ No newline at end of file From 617c9d0ce6f9ea33a7fa1ecfa419308a8ef6b0ca Mon Sep 17 00:00:00 2001 From: harutiro Date: Mon, 20 Jan 2025 20:37:20 +0900 Subject: [PATCH 108/108] =?UTF-8?q?readme=E3=81=AE=E8=A8=98=E8=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 78 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index e6a9225..25a777f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## 概要 -本プロジェクトは株式会社ゆめみ（以下弊社）が、弊社に Android エンジニアを希望する方に出す課題のベースプロジェクトです。本課題が与えられた方は、下記の概要を詳しく読んだ上で課題を取り組んでください。 +このプロジェクトは、GitHubリポジトリの検索と表示を行うAndroidアプリケーションです。Jetpack Composeを使用してUIを構築し、Hiltを使用して依存性注入を行っています。 ## アプリ仕様 @@ -10,6 +10,37 @@ +## ディレクトリ構成 +```bash +. +├── .editorconfig +├── .github/ +│ ├── PULL_REQUEST_TEMPLATE.md +│ └── workflows/ +├── .gitignore +├── .gradle/ +├── .idea/ +├── .kotlin/ +├── app/ +│ ├── src/ +│ │ ├── main/ +│ │ │ ├── java/ +│ │ │ ├── kotlin/ +│ │ │ └── res/ +│ │ └── test/ +│ └── build.gradle +├── build.gradle +├── docs/ +├── gradle/ +├── gradle.properties +├── gradlew +├── gradlew.bat +├── LICENSE +├── local.properties +├── README.md +└── settings.gradle +``` + ### 環境 - IDE：Android Studio Ladybug | 2024.2.1 Patch 3 @@ -61,32 +92,41 @@ 2. GitHub API（`search/repositories`）でリポジトリを検索し、結果一覧を概要（リポジトリ名）で表示 3. 特定の結果を選択したら、該当リポジトリの詳細（リポジトリ名、オーナーアイコン、プロジェクト言語、Star 数、Watcher 数、Fork 数、Issue 数）を表示 -## 課題取り組み方法 -Issues を確認した上、本プロジェクトを [**Duplicate** してください](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/duplicating-a-repository)（Fork しないようにしてください。必要ならプライベートリポジトリにしても大丈夫です）。今後のコミットは全てご自身のリポジトリで行ってください。 +### 依存関係 -コードチェックの課題 Issue は全て [`課題`](https://github.com/yumemi-inc/android-engineer-codecheck/milestone/1) Milestone がついており、難易度に応じて Label が [`初級`](https://github.com/yumemi-inc/android-engineer-codecheck/issues?q=is%3Aopen+is%3Aissue+label%3A初級+milestone%3A課題)、[`中級`](https://github.com/yumemi-inc/android-engineer-codecheck/issues?q=is%3Aopen+is%3Aissue+label%3A中級+milestone%3A課題+) と [`ボーナス`](https://github.com/yumemi-inc/android-engineer-codecheck/issues?q=is%3Aopen+is%3Aissue+label%3Aボーナス+milestone%3A課題+) に分けられています。課題の必須／選択は下記の表とします。 +主要な依存関係は以下の通りです。 -| | 初級 | 中級 | ボーナス -|--:|:--:|:--:|:--:| -| 新卒／未経験者 | 必須 | 選択 | 選択 | -| 中途／経験者 | 必須 | 必須 | 選択 | +- Jetpack Compose +- Hilt +- Retrofit +- Moshi +- Coil -課題 Issueをご自身のリポジトリーにコピーするGitHub Actionsをご用意しております。 -[こちらのWorkflow](./.github/workflows/copy-issues.yml)を[手動でトリガーする](https://docs.github.com/ja/actions/managing-workflow-runs/manually-running-a-workflow)ことでコピーできますのでご活用下さい。 +依存関係の詳細は、`app/build.gradle` ファイルを参照してください。 -課題が完成したら、リポジトリのアドレスを教えてください。 +### 重要なファイルとディレクトリ -## 参考記事 +app/src/main/java - Javaソースコード +kotlin - Kotlinソースコード +res - リソースファイル（レイアウト、文字列、画像など） +test - ユニットテスト +androidTest - インストルメンテーションテスト +build.gradle - モジュールのビルド設定 +gradle.properties - プロジェクト全体のプロパティ設定 -提出された課題の評価ポイントに関しては、[こちらの記事](https://qiita.com/blendthink/items/aa70b8b3106fb4e3555f)に詳しく書かれてありますので、ぜひご覧ください。 +### トラブルシューティング -## AIサービスの利用について +- ビルドエラーが発生する場合: + - 依存関係が正しくインストールされているか確認してください。 + - キャッシュをクリアして再ビルドを試みてください。 -ChatGPTなどAIサービスの利用は禁止しておりません。 - -利用にあたって工夫したプロンプトやソースコメント等をご提出頂くことで、加点評価する場合もございます。 (減点評価はありません) +```bash +./gradlew clean +./gradlew build +``` -また、弊社コードチェック担当者もAIサービスを利用させていただく場合があります。 +- テストが失敗する場合: + - テストコードが最新の実装に対応しているか確認してください。 + - 必要に応じてモックデータを更新してください。 -AIサービスの利用は差し控えてもらいたいなどのご要望がある場合は、お気軽にお申し出ください。