From 6e87fa8939ad61e4e2c9c6eafeb44daf51d31f7c Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Wed, 2 Oct 2024 14:02:45 +0400 Subject: [PATCH] all done --- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 1016 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 473 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 1490 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 2591 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 3749 bytes assets/app_icon.png | Bin 0 -> 392 bytes assets/svg/ru.svg | 19 ++ assets/svg/uk.svg | 23 ++ l10n.yaml | 6 + l10n/app_en.arb | 7 + l10n/app_ru.arb | 7 + .../extensions/local_context_x.dart | 6 + lib/components/l10n/app_locale.dart | 147 +++++++++++ lib/components/l10n/app_locale_en.dart | 17 ++ lib/components/l10n/app_locale_ru.dart | 17 ++ lib/components/resources/resources.g.dart | 12 + lib/components/utils/debounce.dart | 3 +- lib/data/dtos/characters_dto.dart | 12 +- lib/data/dtos/characters_dto.g.dart | 19 +- lib/data/mappers/characters_mapper.dart | 6 +- lib/data/repositories/mock_repository.dart | 2 + lib/data/repositories/potter_repository.dart | 20 +- lib/domain/models/card_data.dart | 4 +- lib/main.dart | 55 +++-- lib/presentation/home_page/home_page.dart | 153 ------------ .../other/common/svg_objects.dart | 32 +++ .../other/like_bloc/like_bloc.dart | 35 +++ .../other/like_bloc/like_events.dart | 13 + .../other/like_bloc/like_state.dart | 12 + .../other/locale_bloc/locale_bloc.dart | 18 ++ .../other/locale_bloc/locale_events.dart | 7 + .../other/locale_bloc/locale_state.dart | 14 ++ .../details_page/details_page.dart | 0 .../{ => pages}/home_page/bloc/bloc.dart | 17 +- .../{ => pages}/home_page/bloc/events.dart | 0 .../{ => pages}/home_page/bloc/state.dart | 11 +- .../{ => pages}/home_page/card.dart | 68 +++--- .../pages/home_page/home_page.dart | 190 +++++++++++++++ makefile | 18 ++ pubspec.lock | 228 +++++++++++++++++- pubspec.yaml | 21 +- 41 files changed, 947 insertions(+), 272 deletions(-) create mode 100644 assets/app_icon.png create mode 100644 assets/svg/ru.svg create mode 100644 assets/svg/uk.svg create mode 100644 l10n.yaml create mode 100644 l10n/app_en.arb create mode 100644 l10n/app_ru.arb create mode 100644 lib/components/extensions/local_context_x.dart create mode 100644 lib/components/l10n/app_locale.dart create mode 100644 lib/components/l10n/app_locale_en.dart create mode 100644 lib/components/l10n/app_locale_ru.dart create mode 100644 lib/components/resources/resources.g.dart delete mode 100644 lib/presentation/home_page/home_page.dart create mode 100644 lib/presentation/other/common/svg_objects.dart create mode 100644 lib/presentation/other/like_bloc/like_bloc.dart create mode 100644 lib/presentation/other/like_bloc/like_events.dart create mode 100644 lib/presentation/other/like_bloc/like_state.dart create mode 100644 lib/presentation/other/locale_bloc/locale_bloc.dart create mode 100644 lib/presentation/other/locale_bloc/locale_events.dart create mode 100644 lib/presentation/other/locale_bloc/locale_state.dart rename lib/presentation/{ => pages}/details_page/details_page.dart (100%) rename lib/presentation/{ => pages}/home_page/bloc/bloc.dart (55%) rename lib/presentation/{ => pages}/home_page/bloc/events.dart (100%) rename lib/presentation/{ => pages}/home_page/bloc/state.dart (74%) rename lib/presentation/{ => pages}/home_page/card.dart (62%) create mode 100644 lib/presentation/pages/home_page/home_page.dart create mode 100644 makefile diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..63d892cc676370b2dc8723b8a9d5df5777a2e545 100644 GIT binary patch literal 1016 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBYWP;uuoF_;$|i?%qI&WAVv8 z=TzFyus${D6XbfDb}Eujv4z_+=#=jFe~eH4o)kQsFiA#<)47G?WP;2h%}#@3GY?kG ztGs?a=WXV_yKlCB->!dedEHFgw0&Fm-QRv~_qAEKcE{MfU1sx^FC~R_2G^{Ebsr3_ z-fNjMX~D^anJX3)KWf@^NuGy0zTAJa@=Q%tM^#Djlq0N?g^q4969fl_nZ*6*>#v4$ z3pi_->Xo)noawhf`-SQ+zoYLTc%NZQ;$FoPeZb*^$Qw4^2jNf3CVgSJeBjrGW2^-R zY0Mj0KW6r^EOwmwBG{H$uG{Wz#6ym!x6RUY^gp> zw+}=FFwSeRU7&V8JAJ8u@(WQ5#<~X6MgG-d8qDsFxiFqz! zA-7Jv_NdMkyN*c_2HTtS7nvVDwAZsl`UBsdDR-7jyA~hG5uF=WBe2GDPS|tRPnYJ+ zbjlO?X>zmBZ?)Tos1lXJr!Upk%G+POaL&}ii>>kJBG#GOPuvTnWf;m`)KsNQ#)Sb9Lh~EttRXu96rfAn*2Jyq$Uda#VDQd0P zdYryf_rbrkJumLP+Vmo;)cZ@#^!I7T&qaQloR@yQv3YfbYlSWA8qu|Zo)L>D9ex*D z;PXYfm@6v(mX}ohy9FYC#&TLacNOjr(fxm2;aj)qYPL7Rca211{Vq*3IV5%H@Ke!D z+tr0Cp>6-u1D}UHVVkfzA(^W-$MaUbLA9Dy@1%zopr01QXGVE_OC literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..313ab8ec3b6b6ae7e6388322d37188ddf13c9faa 100644 GIT binary patch literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FfQlyd@lthY9_NhRC&t~gT3^;Jt@H;m&ul9T<9g<3i9_$PRO0c-a$zWu`g>wcZK z6TRVL$Jb-~x%?&HgU5O$^8AMVDrFb*>h>*Ly`eE?&0^txz3$(;dhHf-Z$8E+8Y_1) z|9$2GuA-j3uU+2P7scLqUi^Ud?hLp28=duztT#>Myg9>JKdx5i)o;gdZ3llmXQ+Dg z_Ttk?osvCA)>nIWs27^VeEBc9U7~xt>tX*yk@t4u++RZ>et#ZUkM literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@U+Ymp+cH2CMmVyV8qdd9L%jTd(y>ih?&beozsjsN{peq zOXU9On7MR}FiW`f-EhZfk?S zN9BjDp3aN220)qN;$Y`_O<}QcE;Hx6W+zcEt;x&^Y4AllD0-@EFh4(1uQNE`} z5Ur_$Qps79{=<)G-Tm|Hokz;Sfhf!ZdJNJQ=mqk_Mk)DZ0vhdWeV1_2Q$c?!U=eMB zKP8@c)>Vp zoUE4-d%fP$I#MVKz#^qIg0 zKSk@SY3ef_4`E1md*2y(-^N1@rx6^=3BIR~o@^PUG?V}0a4(m80aH}CZwS9a7A94b zrptbzgXYVJVIb;|?Wb{la?BH%u@nlg0|poz^Ve0XEQWq=(7{}xx|$+Fb14rT4csI7 zv*;0auaSE4OTHBPS=O~oX2feZEyV<0I17oJeQwo+hz_rDT0t}*?fibyc71YN(8#K) z^;RJwsgPZ@S&Zu5KVd2s#nGJrEozydJnJK(X`h+0%0#zS4VXM>XeTJ-Rlz+9k-I;2 zc`IFS<1e6jc=)#|c@N}8)bTw{2SVP#rq}4K5iJ(vn9`EqHhzS?bx)8T`Psk zaTIy;0GnsDh7!w=r#L9_EAtd2;Wq;_3+FOvwEmBwd8|6O~q5UCAVjXyc+)H`{u8t{orM;g_8pgw&seGvC zUaD)~o8|RP2}O44$LChp&vxuvm3e?GpMincaZnw$jzL4%v+8YN=hAM7zF8W%be{Al09h`zjO_S+d zV$FD7rl1{50k)cXs>MDb()zxoe1oz+^l%xrMVG-|nBgL}(|l z4JGr}N;k=s+rEqaG=qVR{@ZoNBvk53idW7JhP$dW$>lom63B$H!t&t{BK}C?Z1lph zx{{+?0>t*ryL(r9_+C}SP{4G=LnB!wM)BDrJ z=PyU$jmL!&h3bI>{lq~c5Wcb`D<^!rYD^M5DNtT0y=Y!0Rgx>xErvyt4_g$49d5$d zUJ|yRL9(A&{~Ag^Fn3WMAZOVcXk9J98d%UW#VEx&>PFIKj`Zy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..b075f5b554f760b78958c79ce686ecb33f8a47f1 100644 GIT binary patch literal 2591 zcmeH}=~ohn8pahdaYslrHAE7%TyiOwA_YaoW!zH6ElWjh(ac=Z%wcfDB}0udbIYNI zx&vy6qEn7-giDa-%>`^S!6h>@Q**)edjEs_2iypPuKO=bT@0fS;$jik^y` zoSeEB9v8HG%l|u|J-d6>L((ZHr#$0@!v<%{FVt{oQ)-1T*8VlR@Y;%|J!Ev8Bl{7YE^HMMCthD;Jf5fxv#$m# z+pA^ES;jW=qNsiRWgWDYdTcRcLvWFP3-IW06K^dC`C8k_eQWY%Zv zq$H|X=B6h-f4l9`qNqDqG7UK#x|ok?;J``h=dPR67XbS$mI90G30Ld^^fN;ri@h!yeK2 zNF@xVn&s$}k!fI+a*y|zV0Y+QA3Go>URNOpBDMhYG&~zD;md?8wp7y6hlyA4wL+Ug zZEzSR^Ue8;va#e4Mg&~g&@!BcMIeDS?cv>yc60l=;R`x2pLgt<0`VcRbS5>CdkBo0 zmqG@@gl!;R!nAQF{}?i`RuRdJ5i+m7NM2{S4MJp{`gu&dIdUZ6@lnWV$R)Rz37}f5XC+u z{tj`;{<>H_qj_B4eFOD9TzgiXDG@~McaT^UrY4u+=1V7wPi{vt&v7us-|Pq+6u%IVG@2B{$cg7_4w%+HBqck?g`WouM zKF$|M+JE8HV0BmxKpUI0N0VSh+tUrnTIBldal@P6<_hAkm11OD?MLp?HZ3nu>g4Kckg#&;hj}W6xpt} zl24}B2_u9-Mfqr2SiDO+=&h5&fIlYeWNM>OFY0`Q3LTrrF-$(3DDstV#gO+ zN{7$4LT(pXJe9|`F}JJV$2KJ-7=gbPV(x@$XYqS*qDRu$;?~sys;O0U+Kpz=TcGlo z$Yz`lM2yK(XVj7?E}kQkAA)RQtg2GSv&<9HJ~LV%V~$OGnr--PY}!S7BBp)oy3#(H zz|B6K`{k6{Hq}Zc-y&slg`Rw_sztVJ5KPE9sDGrXB|NFksS)4yx#g}---;V_q*i`N zTAtpCC_%rgA$JiOwIdP6Tg|*T5YqaXTf^%WbY5CWwdC-PZhzKg2-|DqS11|P)r3l%(d~b{^Ep408I;QG^r?a1REIl z?{h6z{ODkIFvVJ{3G+*iCa<( zp>gK@@d+Hin}J|Z`3ya|58n&!@E2^@YdFT0ts+}{PVM}-P}Z~KNweIB32nn>b0)ql ztx0mUKsK=z<%Jtvt1#^GQ{0-gQ;4EUn4RUOYOBWd1wP5+j%&u5oWjd))V8S>>hML4 ztM67F@sSM}9FRETnc-Hac}@S;VM)A0tNI_mvDTYbCs5Y5*K;vgn%$;BJi2a!NH+`g zozqhO7rk!RPpK_*-h;?^CcD&o4DVU>d+`3YC{fMwDDOzUZ|3u>f6RBSehK;XR&T&t z_bB;SxB|J??1-Qj>N<$0sDbjWk38#j-9{ z8r>cL_l1-Lf!vzwl^C$<4O%I)yG*tA8bKqC#`y;>%w`=-9$yF~n^Ah*G+&mT=}qNb zz2eJPPf{gt29_W$o2eE1JSzjCX1W586&z8%6_We1;HO+Q-dlaGP;*yWANfhopY}tz z8FAc+l7e|9cD zQg(5Bp2dV{vGKa*f)sI?!9NX-jg@0hrM`+ooHOl)~pZlDfGf~nN14tHoNIS?9|QRJgZm6_n)85rKe ze7t2Ak+O4Hz`Z!G+ovE!fO(?@T4s8Q3|Y!zn(w5N&(DKfL5R50c9VWsne8aI*A=7( zC{vdr!H9l!YG~v=LnM=@vdl`puk?#U_w=*i`aQQVzf3HxbRU4~r1#uNfjm$aqYQG8hg>eu>8xg(Whgkg4gy(qx_$|@GVV;Z|-j$)rQ8J2SD{s=NCOTh=mRB z{aCF8NXeSwAEUC{@s00C&sJA?I+cuvD8xrt>>YCKnAC4+!U9&munX4*3}Uc0>%-@t zq+Q6NjQnC8;39YsgMFBF8vMg={>go3wOs|2k1kahpicdbzCZ?ky1((mjt$s_prylp XBXJ^j{^@(W;3wzh?uTo3J(K$%wzZPF literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372eebdb28e45604e46eeda8dd24651419bc0..9fbeed2e50af33e34cd973eb60f30f173572a627 100644 GIT binary patch literal 3749 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 literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` diff --git a/assets/app_icon.png b/assets/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1586fd01256b12f315cd737edaa019c208d082a1 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-&H|6fVg?3oVGw3ym^DX&fq~J= z)5S5QV$R!}hTfrx66_!1V~t!@dfIl!M6oEcA3S zYj~jG(ZQkAX>xDJhZqaz6TXW-->InkaLDqx?Vjg9Kg;u{=EQG&Z*S0H`jJgkWoDMj zY!c9u_?t%+chxVPm^WwZ;-&NF9A@mlu-kn?+#JK2=iOpwj<>fn&q;X5=Q!`N#kc(r zXHK&@7{^o8w$z?uQ^(~S)(3)hXCE!&Dd~G^*tF-s_lkd##gi&}_ziEUhUIf^YU-}| z#%Vlh=AqvbAEaLI=iJn`ddL5cOwZB}W^8*8x+$OV{?qZgyh3Fs-!H=t=iMe;EVaKk zlY{@mGQp%R+df=isk+MX(Td4$&Dn^f5_OEr>L=Yivc(q|vJ4EKu6{1-oD!M + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/svg/uk.svg b/assets/svg/uk.svg new file mode 100644 index 0000000..88e2211 --- /dev/null +++ b/assets/svg/uk.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/l10n.yaml b/l10n.yaml new file mode 100644 index 0000000..810ca4a --- /dev/null +++ b/l10n.yaml @@ -0,0 +1,6 @@ +arb-dir: l10n +template-arb-file: app_ru.arb +output-localization-file: app_locale.dart +output-dir: lib/components/l10n +output-class: AppLocale +synthetic-package: false diff --git a/l10n/app_en.arb b/l10n/app_en.arb new file mode 100644 index 0000000..b39a396 --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,7 @@ +{ + "@@locale": "en", + + "cardLiked": "Card added in favourite", + "cardDisliked": "Card deleted from favourite", + "searchInputPlaceholder": "Search..." +} \ No newline at end of file diff --git a/l10n/app_ru.arb b/l10n/app_ru.arb new file mode 100644 index 0000000..4bacd91 --- /dev/null +++ b/l10n/app_ru.arb @@ -0,0 +1,7 @@ +{ + "@@locale": "ru", + + "cardLiked": "Карточка добавлена в Избранное", + "cardDisliked": "Карточка удалена из Избранного", + "searchInputPlaceholder": "Поиск..." +} \ No newline at end of file diff --git a/lib/components/extensions/local_context_x.dart b/lib/components/extensions/local_context_x.dart new file mode 100644 index 0000000..52a9a2e --- /dev/null +++ b/lib/components/extensions/local_context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/cupertino.dart'; +import 'package:lab/components/l10n/app_locale.dart'; + +extension LocalContextX on BuildContext { + AppLocale get locale => AppLocale.of(this)!; +} diff --git a/lib/components/l10n/app_locale.dart b/lib/components/l10n/app_locale.dart new file mode 100644 index 0000000..33fc87a --- /dev/null +++ b/lib/components/l10n/app_locale.dart @@ -0,0 +1,147 @@ +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:intl/intl.dart' as intl; + +import 'app_locale_en.dart'; +import 'app_locale_ru.dart'; + +// ignore_for_file: type=lint + +/// Callers can lookup localized strings with an instance of AppLocale +/// returned by `AppLocale.of(context)`. +/// +/// Applications need to include `AppLocale.delegate()` in their app's +/// `localizationDelegates` list, and the locales they support in the app's +/// `supportedLocales` list. For example: +/// +/// ```dart +/// import 'l10n/app_locale.dart'; +/// +/// return MaterialApp( +/// localizationsDelegates: AppLocale.localizationsDelegates, +/// supportedLocales: AppLocale.supportedLocales, +/// home: MyApplicationHome(), +/// ); +/// ``` +/// +/// ## Update pubspec.yaml +/// +/// Please make sure to update your pubspec.yaml to include the following +/// packages: +/// +/// ```yaml +/// dependencies: +/// # Internationalization support. +/// flutter_localizations: +/// sdk: flutter +/// intl: any # Use the pinned version from flutter_localizations +/// +/// # Rest of dependencies +/// ``` +/// +/// ## iOS Applications +/// +/// iOS applications define key application metadata, including supported +/// locales, in an Info.plist file that is built into the application bundle. +/// To configure the locales supported by your app, you’ll need to edit this +/// file. +/// +/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file. +/// Then, in the Project Navigator, open the Info.plist file under the Runner +/// project’s Runner folder. +/// +/// Next, select the Information Property List item, select Add Item from the +/// Editor menu, then select Localizations from the pop-up menu. +/// +/// Select and expand the newly-created Localizations item then, for each +/// locale your application supports, add a new item and select the locale +/// you wish to add from the pop-up menu in the Value field. This list should +/// be consistent with the languages listed in the AppLocale.supportedLocales +/// property. +abstract class AppLocale { + AppLocale(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString()); + + final String localeName; + + static AppLocale? of(BuildContext context) { + return Localizations.of(context, AppLocale); + } + + static const LocalizationsDelegate delegate = _AppLocaleDelegate(); + + /// A list of this localizations delegate along with the default localizations + /// delegates. + /// + /// Returns a list of localizations delegates containing this delegate along with + /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate, + /// and GlobalWidgetsLocalizations.delegate. + /// + /// Additional delegates can be added by appending to this list in + /// MaterialApp. This list does not have to be used at all if a custom list + /// of delegates is preferred or required. + static const List> localizationsDelegates = >[ + delegate, + GlobalMaterialLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + ]; + + /// A list of this localizations delegate's supported locales. + static const List supportedLocales = [ + Locale('en'), + Locale('ru') + ]; + + /// No description provided for @cardLiked. + /// + /// In ru, this message translates to: + /// **'Карточка добавлена в Избранное'** + String get cardLiked; + + /// No description provided for @cardDisliked. + /// + /// In ru, this message translates to: + /// **'Карточка удалена из Избранного'** + String get cardDisliked; + + /// No description provided for @searchInputPlaceholder. + /// + /// In ru, this message translates to: + /// **'Поиск...'** + String get searchInputPlaceholder; +} + +class _AppLocaleDelegate extends LocalizationsDelegate { + const _AppLocaleDelegate(); + + @override + Future load(Locale locale) { + return SynchronousFuture(lookupAppLocale(locale)); + } + + @override + bool isSupported(Locale locale) => ['en', 'ru'].contains(locale.languageCode); + + @override + bool shouldReload(_AppLocaleDelegate old) => false; +} + +AppLocale lookupAppLocale(Locale locale) { + + + // Lookup logic when only language code is specified. + switch (locale.languageCode) { + case 'en': return AppLocaleEn(); + case 'ru': return AppLocaleRu(); + } + + throw FlutterError( + 'AppLocale.delegate failed to load unsupported locale "$locale". This is likely ' + 'an issue with the localizations generation tool. Please file an issue ' + 'on GitHub with a reproducible sample app and the gen-l10n configuration ' + 'that was used.' + ); +} diff --git a/lib/components/l10n/app_locale_en.dart b/lib/components/l10n/app_locale_en.dart new file mode 100644 index 0000000..c6084cd --- /dev/null +++ b/lib/components/l10n/app_locale_en.dart @@ -0,0 +1,17 @@ +import 'app_locale.dart'; + +// ignore_for_file: type=lint + +/// The translations for English (`en`). +class AppLocaleEn extends AppLocale { + AppLocaleEn([String locale = 'en']) : super(locale); + + @override + String get cardLiked => 'Card added in favourite'; + + @override + String get cardDisliked => 'Card deleted from favourite'; + + @override + String get searchInputPlaceholder => 'Search...'; +} diff --git a/lib/components/l10n/app_locale_ru.dart b/lib/components/l10n/app_locale_ru.dart new file mode 100644 index 0000000..7191228 --- /dev/null +++ b/lib/components/l10n/app_locale_ru.dart @@ -0,0 +1,17 @@ +import 'app_locale.dart'; + +// ignore_for_file: type=lint + +/// The translations for Russian (`ru`). +class AppLocaleRu extends AppLocale { + AppLocaleRu([String locale = 'ru']) : super(locale); + + @override + String get cardLiked => 'Карточка добавлена в Избранное'; + + @override + String get cardDisliked => 'Карточка удалена из Избранного'; + + @override + String get searchInputPlaceholder => 'Поиск...'; +} diff --git a/lib/components/resources/resources.g.dart b/lib/components/resources/resources.g.dart new file mode 100644 index 0000000..cfeb1ff --- /dev/null +++ b/lib/components/resources/resources.g.dart @@ -0,0 +1,12 @@ +/// Generate by [asset_generator](https://github.com/fluttercandies/flutter_asset_generator) library. +/// PLEASE DO NOT EDIT MANUALLY. +// ignore_for_file: constant_identifier_names +class R { + const R._(); + + /// ![preview](file://C:\MyFiles\pmd\PIbd-33_Dyakonov_R_R_PMD\assets\svg\ru.svg) + static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg'; + + /// ![preview](file://C:\MyFiles\pmd\PIbd-33_Dyakonov_R_R_PMD\assets\svg\uk.svg) + static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg'; +} diff --git a/lib/components/utils/debounce.dart b/lib/components/utils/debounce.dart index 6ebc241..e82ea45 100644 --- a/lib/components/utils/debounce.dart +++ b/lib/components/utils/debounce.dart @@ -12,8 +12,7 @@ class Debounce { static Timer? _timer; static void run( - {required VoidCallback action, - Duration delay = const Duration(milliseconds: 500)}) { + {required VoidCallback action, Duration delay = const Duration(milliseconds: 500)}) { _timer?.cancel(); _timer = Timer(delay, action); } diff --git a/lib/data/dtos/characters_dto.dart b/lib/data/dtos/characters_dto.dart index dbf04a1..3dae693 100644 --- a/lib/data/dtos/characters_dto.dart +++ b/lib/data/dtos/characters_dto.dart @@ -11,8 +11,7 @@ class CharactersDto { const CharactersDto({this.data, this.meta}); - factory CharactersDto.fromJson(Map json) => - _$CharactersDtoFromJson(json); + factory CharactersDto.fromJson(Map json) => _$CharactersDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -21,8 +20,7 @@ class MetaDto { const MetaDto({this.pagination}); - factory MetaDto.fromJson(Map json) => - _$MetaDtoFromJson(json); + factory MetaDto.fromJson(Map json) => _$MetaDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -33,8 +31,7 @@ class PaginationDto { const PaginationDto({this.current, this.last, this.next}); - factory PaginationDto.fromJson(Map json) => - _$PaginationDtoFromJson(json); + factory PaginationDto.fromJson(Map json) => _$PaginationDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -44,8 +41,7 @@ class CharacterDataDto { const CharacterDataDto(this.id, this.attributes); - factory CharacterDataDto.fromJson(Map json) => - _$CharacterDataDtoFromJson(json); + factory CharacterDataDto.fromJson(Map json) => _$CharacterDataDtoFromJson(json); } @JsonSerializable(createToJson: false) diff --git a/lib/data/dtos/characters_dto.g.dart b/lib/data/dtos/characters_dto.g.dart index 06ce41d..b221805 100644 --- a/lib/data/dtos/characters_dto.g.dart +++ b/lib/data/dtos/characters_dto.g.dart @@ -6,14 +6,11 @@ part of 'characters_dto.dart'; // JsonSerializableGenerator // ************************************************************************** -CharactersDto _$CharactersDtoFromJson(Map json) => - CharactersDto( +CharactersDto _$CharactersDtoFromJson(Map json) => CharactersDto( data: (json['data'] as List?) ?.map((e) => CharacterDataDto.fromJson(e as Map)) .toList(), - meta: json['meta'] == null - ? null - : MetaDto.fromJson(json['meta'] as Map), + meta: json['meta'] == null ? null : MetaDto.fromJson(json['meta'] as Map), ); MetaDto _$MetaDtoFromJson(Map json) => MetaDto( @@ -22,24 +19,20 @@ MetaDto _$MetaDtoFromJson(Map json) => MetaDto( : PaginationDto.fromJson(json['pagination'] as Map), ); -PaginationDto _$PaginationDtoFromJson(Map json) => - PaginationDto( +PaginationDto _$PaginationDtoFromJson(Map json) => PaginationDto( current: (json['current'] as num?)?.toInt(), last: (json['last'] as num?)?.toInt(), next: (json['next'] as num?)?.toInt(), ); -CharacterDataDto _$CharacterDataDtoFromJson(Map json) => - CharacterDataDto( +CharacterDataDto _$CharacterDataDtoFromJson(Map json) => CharacterDataDto( json['id'] as String?, json['attributes'] == null ? null - : CharacterAttributesDataDto.fromJson( - json['attributes'] as Map), + : CharacterAttributesDataDto.fromJson(json['attributes'] as Map), ); -CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson( - Map json) => +CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson(Map json) => CharacterAttributesDataDto( json['name'] as String?, json['image'] as String?, diff --git a/lib/data/mappers/characters_mapper.dart b/lib/data/mappers/characters_mapper.dart index 7c94908..0ca1411 100644 --- a/lib/data/mappers/characters_mapper.dart +++ b/lib/data/mappers/characters_mapper.dart @@ -4,6 +4,7 @@ import 'package:lab/domain/models/home_data.dart'; extension CharacterDataDtoToModel on CharacterDataDto { CardData toDomain() => CardData( + id: id, name: attributes?.name ?? "UNKNOWN", image: attributes?.image ?? "https://upload.wikimedia.org/wikipedia/commons/a/a2/Person_Image_Placeholder.png", @@ -11,7 +12,6 @@ extension CharacterDataDtoToModel on CharacterDataDto { } extension ChatactersDtoToModel on CharactersDto { - HomeData toDomain() => HomeData( - data: data?.map((e) => e.toDomain()).toList(), - nextPage: meta?.pagination?.next); + HomeData toDomain() => + HomeData(data: data?.map((e) => e.toDomain()).toList(), nextPage: meta?.pagination?.next); } diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart index 3e3814a..49a1713 100644 --- a/lib/data/repositories/mock_repository.dart +++ b/lib/data/repositories/mock_repository.dart @@ -7,11 +7,13 @@ class MockRepository extends ApiInterface { Future loadData({OnErrorCallback? onError}) async { return HomeData(data: [ const CardData( + id: '0', name: "test 0", species: "Species 0", image: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTtAT11wKgHrJBUYzIBFogucXg0a9fE0fQXDQ&s"), const CardData( + id: "1", name: "test 1", species: "Species 1", image: diff --git a/lib/data/repositories/potter_repository.dart b/lib/data/repositories/potter_repository.dart index 1456872..393d22b 100644 --- a/lib/data/repositories/potter_repository.dart +++ b/lib/data/repositories/potter_repository.dart @@ -7,33 +7,23 @@ import 'package:lab/domain/models/home_data.dart'; import 'package:pretty_dio_logger/pretty_dio_logger.dart'; class PotterRepository extends ApiInterface { - static final Dio _dio = Dio( - BaseOptions(connectTimeout: const Duration(seconds: 10))) - ..interceptors.add( - PrettyDioLogger(request: true, requestHeader: true, requestBody: true)); + static final Dio _dio = Dio(BaseOptions(connectTimeout: const Duration(seconds: 10))) + ..interceptors.add(PrettyDioLogger(request: true, requestHeader: true, requestBody: true)); static const String _baseUrl = "https://api.potterdb.com/v1"; @override Future loadData( - {OnErrorCallback? onError, - String? q, - int page = 1, - int pageSize = 10}) async { + {OnErrorCallback? onError, String? q, int page = 1, int pageSize = 10}) async { try { const String url = '$_baseUrl/characters'; final Response response = await _dio.get>( url, - queryParameters: { - 'filter[name_cont]': q, - 'page[number]': page, - 'page[size]': pageSize - }, + queryParameters: {'filter[name_cont]': q, 'page[number]': page, 'page[size]': pageSize}, ); - final CharactersDto dto = - CharactersDto.fromJson(response.data as Map); + final CharactersDto dto = CharactersDto.fromJson(response.data as Map); return dto.toDomain(); } on DioException catch (e) { log("DioException: $e"); diff --git a/lib/domain/models/card_data.dart b/lib/domain/models/card_data.dart index f5b0b9b..93f7a18 100644 --- a/lib/domain/models/card_data.dart +++ b/lib/domain/models/card_data.dart @@ -2,6 +2,8 @@ class CardData { final String name; final String image; final String species; + final String? id; - const CardData({required this.name, required this.image, required this.species}); + const CardData( + {required this.id, required this.name, required this.image, required this.species}); } diff --git a/lib/main.dart b/lib/main.dart index c0f9722..d412764 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,14 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:lab/components/l10n/app_locale.dart'; import 'package:lab/data/repositories/potter_repository.dart'; -import 'package:lab/presentation/home_page/bloc/bloc.dart'; -import 'package:lab/presentation/home_page/home_page.dart'; +import 'package:lab/presentation/other/like_bloc/like_bloc.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_bloc.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_state.dart'; +import 'package:lab/presentation/pages/home_page/home_page.dart'; +import 'package:lab/presentation/pages/home_page/bloc/bloc.dart'; void main() { runApp(const MyApp()); @@ -13,21 +19,36 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Flutter Demo', - debugShowCheckedModeBanner: false, - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.white), - useMaterial3: true, - ), - home: RepositoryProvider( - lazy: true, - create: (_) => PotterRepository(), - child: BlocProvider( - lazy: false, - create: (context) => HomeBloc(context.read()), - child: const MyHomePage(title: 'Lab 6: Architecture'), - ), + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc(Locale(Platform.localeName)), + child: BlocBuilder( + builder: (context, state) { + return MaterialApp( + title: 'Flutter Demo', + debugShowCheckedModeBanner: false, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + locale: state.currentLocale, + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.white), + useMaterial3: true, + ), + home: RepositoryProvider( + lazy: true, + create: (_) => PotterRepository(), + child: BlocProvider( + lazy: false, + create: (context) => LikeBloc(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage(title: 'Lab 7: Internationalization and other'), + ), + ), + ), + ); + }, ), ); } diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart deleted file mode 100644 index 02372ea..0000000 --- a/lib/presentation/home_page/home_page.dart +++ /dev/null @@ -1,153 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:lab/components/utils/debounce.dart'; -import 'package:lab/domain/models/card_data.dart'; -import 'package:lab/presentation/details_page/details_page.dart'; -import 'package:lab/presentation/home_page/bloc/bloc.dart'; -import 'package:lab/presentation/home_page/bloc/events.dart'; -import 'package:lab/presentation/home_page/bloc/state.dart'; - -part 'card.dart'; - -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - final TextEditingController _searchController = TextEditingController(); - final _scrollController = ScrollController(); - - @override - void initState() { - WidgetsBinding.instance.addPostFrameCallback((_) { - context.read().add(const HomeLoadDataEvent()); - }); - - _scrollController.addListener(_onNextPageListener); - - super.initState(); - } - - @override - void dispose() { - _searchController.dispose(); - _scrollController.dispose(); - super.dispose(); - } - - void _onNextPageListener() { - if (_scrollController.offset >= - _scrollController.position.maxScrollExtent) { - final bloc = context.read(); - if (!bloc.state.isPaginationLoading) { - bloc.add(HomeLoadDataEvent( - search: _searchController.text, - nextPage: bloc.state.data?.nextPage)); - } - } - } - - Future _onRefresh() { - context - .read() - .add(HomeLoadDataEvent(search: _searchController.text)); - return Future.value(null); - } - - void _onSearchInputChange(search) { - Debounce.run( - action: () => - context.read().add(HomeLoadDataEvent(search: search))); - } - - void _showSnackBar(BuildContext context, String text) { - WidgetsBinding.instance.addPostFrameCallback((_) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text(text), - duration: const Duration(seconds: 2), - backgroundColor: Colors.black54, - )); - }); - } - - void _navigateToDetailsPage(BuildContext context, CardData data) { - Navigator.push( - context, - CupertinoPageRoute(builder: (context) => DetailsPage(data: data)), - ); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: Text(widget.title), - ), - body: Column( - children: [ - Padding( - padding: - const EdgeInsets.only(right: 30, left: 30, top: 20, bottom: 20), - child: CupertinoSearchTextField( - controller: _searchController, - onChanged: _onSearchInputChange, - ), - ), - BlocBuilder( - builder: (context, state) => state.error != null - ? Text( - state.error ?? "", - style: Theme.of(context) - .textTheme - .headlineSmall - ?.copyWith(color: Colors.red), - ) - : state.isLoading - ? const Padding( - padding: EdgeInsets.only(top: 20), - child: CircularProgressIndicator(), - ) - : Expanded( - child: RefreshIndicator( - onRefresh: _onRefresh, - child: ListView.separated( - controller: _scrollController, - padding: const EdgeInsets.symmetric( - vertical: 20, horizontal: 30), - separatorBuilder: (context, index) => - const SizedBox(height: 20), - itemCount: state.data?.data?.length ?? 0, - itemBuilder: (context, index) { - final data = state.data?.data?[index]; - - return data == null - ? const SizedBox.shrink() - : _Card.fromData( - data, - onLike: (String text) => - _showSnackBar(context, text), - onTap: () => - _navigateToDetailsPage(context, data), - ); - }, - ), - ), - ), - ), - BlocBuilder( - builder: (context, state) => state.isPaginationLoading - ? const CircularProgressIndicator() - : const SizedBox.shrink(), - ), - ], - ), - ); - } -} diff --git a/lib/presentation/other/common/svg_objects.dart b/lib/presentation/other/common/svg_objects.dart new file mode 100644 index 0000000..3969700 --- /dev/null +++ b/lib/presentation/other/common/svg_objects.dart @@ -0,0 +1,32 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:lab/components/resources/resources.g.dart'; + +abstract class SvgObjects { + static void init() { + final pictures = [R.ASSETS_SVG_RU_SVG, R.ASSETS_SVG_UK_SVG]; + + for (final String p in pictures) { + final loader = SvgAssetLoader(p); + svg.cache.putIfAbsent(loader.cacheKey(null), () => loader.loadBytes(null)); + } + } +} + +class SvgRu extends StatelessWidget { + const SvgRu({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_RU_SVG); + } +} + +class SvgUk extends StatelessWidget { + const SvgUk({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_UK_SVG); + } +} diff --git a/lib/presentation/other/like_bloc/like_bloc.dart b/lib/presentation/other/like_bloc/like_bloc.dart new file mode 100644 index 0000000..62a4a84 --- /dev/null +++ b/lib/presentation/other/like_bloc/like_bloc.dart @@ -0,0 +1,35 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:lab/presentation/other/like_bloc/like_events.dart'; +import 'package:lab/presentation/other/like_bloc/like_state.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +const String _likedPrefsKey = "liked"; + +class LikeBloc extends Bloc { + LikeBloc() : super(const LikeState(likedIds: [])) { + on(_onChangeLike); + on(_onLoadLikes); + } + + Future _onLoadLikes(LoadLikesEvent event, Emitter emit) async { + final prefs = await SharedPreferences.getInstance(); + final data = prefs.getStringList(_likedPrefsKey); + + emit(state.copyWith(likedIds: data)); + } + + Future _onChangeLike(ChangeLikeEvent event, Emitter emit) async { + final updatedList = List.from(state.likedIds ?? []); + + if (updatedList.contains(event.id)) { + updatedList.remove(event.id); + } else { + updatedList.add(event.id); + } + + final prefs = await SharedPreferences.getInstance(); + prefs.setStringList(_likedPrefsKey, updatedList); + + emit(state.copyWith(likedIds: updatedList)); + } +} diff --git a/lib/presentation/other/like_bloc/like_events.dart b/lib/presentation/other/like_bloc/like_events.dart new file mode 100644 index 0000000..d0326d8 --- /dev/null +++ b/lib/presentation/other/like_bloc/like_events.dart @@ -0,0 +1,13 @@ +abstract class LikeEvent { + const LikeEvent(); +} + +class LoadLikesEvent extends LikeEvent { + const LoadLikesEvent(); +} + +class ChangeLikeEvent extends LikeEvent { + final String id; + + const ChangeLikeEvent(this.id); +} diff --git a/lib/presentation/other/like_bloc/like_state.dart b/lib/presentation/other/like_bloc/like_state.dart new file mode 100644 index 0000000..f359dc5 --- /dev/null +++ b/lib/presentation/other/like_bloc/like_state.dart @@ -0,0 +1,12 @@ +import 'package:equatable/equatable.dart'; + +class LikeState extends Equatable { + final List? likedIds; + + const LikeState({required this.likedIds}); + + LikeState copyWith({List? likedIds}) => LikeState(likedIds: likedIds ?? this.likedIds); + + @override + List get props => [likedIds]; +} diff --git a/lib/presentation/other/locale_bloc/locale_bloc.dart b/lib/presentation/other/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..ce46bd8 --- /dev/null +++ b/lib/presentation/other/locale_bloc/locale_bloc.dart @@ -0,0 +1,18 @@ +import 'dart:ui'; + +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:lab/components/l10n/app_locale.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_events.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_state.dart'; + +class LocaleBloc extends Bloc { + LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) { + on(_onChangeLocale); + } + + Future _onChangeLocale(ChangeLocaleEvent event, Emitter emit) async { + final toChange = AppLocale.supportedLocales + .firstWhere((e) => e.languageCode != state.currentLocale.languageCode); + emit(state.copyWith(currentLocale: toChange)); + } +} diff --git a/lib/presentation/other/locale_bloc/locale_events.dart b/lib/presentation/other/locale_bloc/locale_events.dart new file mode 100644 index 0000000..c08cd1b --- /dev/null +++ b/lib/presentation/other/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent { + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent { + const ChangeLocaleEvent(); +} diff --git a/lib/presentation/other/locale_bloc/locale_state.dart b/lib/presentation/other/locale_bloc/locale_state.dart new file mode 100644 index 0000000..f76a8a5 --- /dev/null +++ b/lib/presentation/other/locale_bloc/locale_state.dart @@ -0,0 +1,14 @@ +import 'dart:ui'; +import 'package:equatable/equatable.dart'; + +class LocaleState extends Equatable { + final Locale currentLocale; + + const LocaleState({required this.currentLocale}); + + LocaleState copyWith({Locale? currentLocale}) => + LocaleState(currentLocale: currentLocale ?? this.currentLocale); + + @override + List get props => [currentLocale]; +} diff --git a/lib/presentation/details_page/details_page.dart b/lib/presentation/pages/details_page/details_page.dart similarity index 100% rename from lib/presentation/details_page/details_page.dart rename to lib/presentation/pages/details_page/details_page.dart diff --git a/lib/presentation/home_page/bloc/bloc.dart b/lib/presentation/pages/home_page/bloc/bloc.dart similarity index 55% rename from lib/presentation/home_page/bloc/bloc.dart rename to lib/presentation/pages/home_page/bloc/bloc.dart index dab7910..73e1f74 100644 --- a/lib/presentation/home_page/bloc/bloc.dart +++ b/lib/presentation/pages/home_page/bloc/bloc.dart @@ -1,6 +1,6 @@ import 'package:lab/data/repositories/potter_repository.dart'; -import 'package:lab/presentation/home_page/bloc/events.dart'; -import 'package:lab/presentation/home_page/bloc/state.dart'; +import 'package:lab/presentation/pages/home_page/bloc/events.dart'; +import 'package:lab/presentation/pages/home_page/bloc/state.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; class HomeBloc extends Bloc { @@ -10,8 +10,7 @@ class HomeBloc extends Bloc { on(_onLoadData); } - Future _onLoadData( - HomeLoadDataEvent event, Emitter emit) async { + Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async { if (event.nextPage == null) { emit(state.copyWith(isLoading: true)); } else { @@ -20,17 +19,13 @@ class HomeBloc extends Bloc { String? error; - final data = await repo.loadData( - q: event.search, page: event.nextPage ?? 1, onError: (e) => error = e); + final data = + await repo.loadData(q: event.search, page: event.nextPage ?? 1, onError: (e) => error = e); if (event.nextPage != null) { data?.data?.insertAll(0, state.data?.data ?? []); } - emit(state.copyWith( - isLoading: false, - isPaginationLoading: false, - data: data, - error: error)); + emit(state.copyWith(isLoading: false, isPaginationLoading: false, data: data, error: error)); } } diff --git a/lib/presentation/home_page/bloc/events.dart b/lib/presentation/pages/home_page/bloc/events.dart similarity index 100% rename from lib/presentation/home_page/bloc/events.dart rename to lib/presentation/pages/home_page/bloc/events.dart diff --git a/lib/presentation/home_page/bloc/state.dart b/lib/presentation/pages/home_page/bloc/state.dart similarity index 74% rename from lib/presentation/home_page/bloc/state.dart rename to lib/presentation/pages/home_page/bloc/state.dart index 361aa61..b12ddf8 100644 --- a/lib/presentation/home_page/bloc/state.dart +++ b/lib/presentation/pages/home_page/bloc/state.dart @@ -8,17 +8,10 @@ class HomeState extends Equatable { final String? error; const HomeState( - {this.data, - this.isLoading = false, - this.isPaginationLoading = false, - this.error}); + {this.data, this.isLoading = false, this.isPaginationLoading = false, this.error}); // Получение нового экземпляра состояния - HomeState copyWith( - {HomeData? data, - bool? isLoading, - bool? isPaginationLoading, - String? error}) => + HomeState copyWith({HomeData? data, bool? isLoading, bool? isPaginationLoading, String? error}) => HomeState( data: data ?? this.data, isLoading: isLoading ?? this.isLoading, diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/pages/home_page/card.dart similarity index 62% rename from lib/presentation/home_page/card.dart rename to lib/presentation/pages/home_page/card.dart index 7bbe8ce..0a6b029 100644 --- a/lib/presentation/home_page/card.dart +++ b/lib/presentation/pages/home_page/card.dart @@ -1,25 +1,33 @@ part of "home_page.dart"; -typedef OnLikeFunction = void Function(String text); +typedef OnLikeCallback = void Function(String? id, String text, bool isLiked); -class _Card extends StatefulWidget { +class Card extends StatelessWidget { + final String? id; final String name; final String image; final String species; + final bool isLiked; - final OnLikeFunction? onLike; + final OnLikeCallback? onLike; final VoidCallback? onTap; - const _Card( - {required this.name, - required this.species, - required this.image, - this.onLike, - this.onTap}); + const Card({ + super.key, + required this.id, + required this.name, + required this.species, + required this.image, + this.onLike, + this.onTap, + this.isLiked = false, + }); - factory _Card.fromData( - CardData data, {OnLikeFunction? onLike, VoidCallback? onTap}) => - _Card( + factory Card.fromData(CardData data, + {OnLikeCallback? onLike, VoidCallback? onTap, bool isLiked = false}) => + Card( + id: data.id, + isLiked: isLiked, name: data.name, image: data.image, species: data.species, @@ -27,30 +35,17 @@ class _Card extends StatefulWidget { onLike: onLike, ); - @override - State createState() => _CardState(); -} - -class _CardState extends State<_Card> { - bool _isFavourite = false; - - void toggleIsFavourite() { - setState(() { - _isFavourite = !_isFavourite; - }); - widget.onLike?.call(_isFavourite - ? "Card added in favourite" - : "Card deleted from favourite"); - } - @override Widget build(BuildContext context) { + void toggleIsFavourite() { + onLike?.call(id, !isLiked ? context.locale.cardLiked : context.locale.cardDisliked, isLiked); + } + return GestureDetector( - onTap: widget.onTap, + onTap: onTap, child: Container( width: double.infinity, - padding: - const EdgeInsets.only(top: 15, bottom: 15, left: 30, right: 30), + padding: const EdgeInsets.only(top: 15, bottom: 15, left: 30, right: 30), decoration: BoxDecoration( border: Border.all(color: Colors.black12, width: 2), borderRadius: BorderRadius.circular(20)), @@ -64,7 +59,7 @@ class _CardState extends State<_Card> { onTap: toggleIsFavourite, child: AnimatedSwitcher( duration: const Duration(milliseconds: 200), - child: _isFavourite + child: isLiked ? const Icon( Icons.favorite, color: Colors.red, @@ -82,7 +77,7 @@ class _CardState extends State<_Card> { const SizedBox(height: 20), Center( child: Image.network( - widget.image, + image, width: 250, height: 250, ), @@ -92,10 +87,9 @@ class _CardState extends State<_Card> { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(widget.name, style: const TextStyle(fontSize: 17)), - Text("Species: ${widget.species}", - style: - const TextStyle(fontSize: 17, color: Colors.orange)) + Text(name, style: const TextStyle(fontSize: 17)), + Text("Species: $species", + style: const TextStyle(fontSize: 17, color: Colors.orange)) ], ), ) diff --git a/lib/presentation/pages/home_page/home_page.dart b/lib/presentation/pages/home_page/home_page.dart new file mode 100644 index 0000000..dd0cae2 --- /dev/null +++ b/lib/presentation/pages/home_page/home_page.dart @@ -0,0 +1,190 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:lab/components/extensions/local_context_x.dart'; +import 'package:lab/components/utils/debounce.dart'; +import 'package:lab/domain/models/card_data.dart'; +import 'package:lab/presentation/other/common/svg_objects.dart'; +import 'package:lab/presentation/other/like_bloc/like_bloc.dart'; +import 'package:lab/presentation/other/like_bloc/like_events.dart'; +import 'package:lab/presentation/other/like_bloc/like_state.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_bloc.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_events.dart'; +import 'package:lab/presentation/other/locale_bloc/locale_state.dart'; +import 'package:lab/presentation/pages/details_page/details_page.dart'; +import 'package:lab/presentation/pages/home_page/bloc/bloc.dart'; +import 'package:lab/presentation/pages/home_page/bloc/events.dart'; +import 'package:lab/presentation/pages/home_page/bloc/state.dart'; + +part 'card.dart'; + +class MyHomePage extends StatefulWidget { + const MyHomePage({super.key, required this.title}); + + final String title; + + @override + State createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + final TextEditingController _searchController = TextEditingController(); + final _scrollController = ScrollController(); + + @override + void initState() { + WidgetsBinding.instance.addPostFrameCallback((_) { + context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); + }); + + _scrollController.addListener(_onNextPageListener); + SvgObjects.init(); + + super.initState(); + } + + @override + void dispose() { + _searchController.dispose(); + _scrollController.dispose(); + super.dispose(); + } + + void _onNextPageListener() { + if (_scrollController.offset >= _scrollController.position.maxScrollExtent) { + final bloc = context.read(); + if (!bloc.state.isPaginationLoading) { + bloc.add( + HomeLoadDataEvent(search: _searchController.text, nextPage: bloc.state.data?.nextPage)); + } + } + } + + Future _onRefresh() { + context.read().add(HomeLoadDataEvent(search: _searchController.text)); + return Future.value(null); + } + + void _onSearchInputChange(search) { + Debounce.run(action: () => context.read().add(HomeLoadDataEvent(search: search))); + } + + void _onLike(String? id, String text, bool isLiked) { + if (id != null) { + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, id, text, isLiked); + } + } + + void _showSnackBar(BuildContext context, String? id, String text, bool isLiked) { + WidgetsBinding.instance.addPostFrameCallback((_) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text(text), + duration: const Duration(seconds: 2), + backgroundColor: Colors.black54, + )); + }); + } + + void _navigateToDetailsPage(BuildContext context, CardData data) { + Navigator.push( + context, + CupertinoPageRoute(builder: (context) => DetailsPage(data: data)), + ); + } + + void _handleLocaleButtonTap() { + context.read().add(const ChangeLocaleEvent()); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: Theme.of(context).colorScheme.inversePrimary, + title: Text(widget.title), + ), + body: Column( + children: [ + Padding( + padding: const EdgeInsets.only(right: 30, left: 30, top: 20, bottom: 20), + child: Row( + children: [ + Expanded( + flex: 4, + child: CupertinoSearchTextField( + controller: _searchController, + placeholder: context.locale.searchInputPlaceholder, + onChanged: _onSearchInputChange, + )), + GestureDetector( + onTap: _handleLocaleButtonTap, + child: SizedBox.square( + dimension: 50, + child: Padding( + padding: const EdgeInsets.only(left: 12), + child: BlocBuilder( + builder: (context, state) { + return state.currentLocale.languageCode == "ru" + ? const SvgRu() + : const SvgUk(); + }, + ), + ), + ), + ), + ], + ), + ), + BlocBuilder( + builder: (context, state) => state.error != null + ? Text( + state.error ?? "", + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), + ) + : state.isLoading + ? const Padding( + padding: EdgeInsets.only(top: 20), + child: CircularProgressIndicator(), + ) + : BlocBuilder( + builder: (context, likeState) { + return Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.separated( + controller: _scrollController, + padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 30), + separatorBuilder: (context, index) => const SizedBox(height: 20), + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + + return data == null + ? const SizedBox.shrink() + : Card.fromData( + data, + isLiked: likeState.likedIds?.contains(data.id) == true, + onLike: (String? id, String text, bool isLiked) => + _onLike(id, text, isLiked), + onTap: () => _navigateToDetailsPage(context, data), + ); + }, + ), + ), + ); + }, + ), + ), + BlocBuilder( + builder: (context, state) => state.isPaginationLoading + ? const CircularProgressIndicator() + : const SizedBox.shrink(), + ), + ], + ), + ); + } +} diff --git a/makefile b/makefile new file mode 100644 index 0000000..a7d3b14 --- /dev/null +++ b/makefile @@ -0,0 +1,18 @@ +gen: + dart run build_runner build --delete-conflicting-outputs + +icon: + dart run flutter_launcher_icons:main + +init_res: + dart pub global activate flutter_asset_generator + +format: + dart format . --line-length 100 + +res: + fgen --output lib/components/resources/resources.g.dart --no-watch --no-preview; \ + make format + +locale: + flutter gen-l10n \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index cf63f83..37164c0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -22,6 +22,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.7.0" + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" args: dependency: transitive description: @@ -134,6 +142,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + url: "https://pub.dev" + source: hosted + version: "0.4.1" clock: dependency: transitive description: @@ -222,6 +238,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" file: dependency: transitive description: @@ -251,6 +275,14 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.6" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -259,11 +291,29 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" + source: hosted + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" frontend_server_client: dependency: transitive description: @@ -288,6 +338,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + http: + dependency: transitive + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -304,6 +362,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + url: "https://pub.dev" + source: hosted + version: "4.2.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + url: "https://pub.dev" + source: hosted + version: "0.19.0" io: dependency: transitive description: @@ -440,6 +514,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" pool: dependency: transitive description: @@ -480,6 +610,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" + source: hosted + version: "2.2.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f + url: "https://pub.dev" + source: hosted + version: "2.5.2" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: @@ -589,6 +775,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -637,6 +847,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + url: "https://pub.dev" + source: hosted + version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" yaml: dependency: transitive description: @@ -647,4 +873,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.2 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 06ebd47..084e37d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: flutter: sdk: flutter - + flutter_svg: 2.0.7 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 @@ -43,6 +43,12 @@ dependencies: flutter_bloc: ^8.1.5 equatable: ^2.0.5 + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + + shared_preferences: 2.2.3 + dev_dependencies: flutter_test: sdk: flutter @@ -54,14 +60,25 @@ dev_dependencies: # rules and activating additional ones. flutter_lints: ^4.0.0 + flutter_launcher_icons: 0.13.1 + build_runner: ^2.4.9 json_serializable: ^6.7.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec +flutter_icons: + android: "ic_launcher" + image_path: "assets/app_icon.png" + min_sdk_android: 21 + # The following section is specific to Flutter packages. flutter: + generate: true + + assets: + - assets/svg/ # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in @@ -97,4 +114,4 @@ flutter: # weight: 700 # # For details regarding fonts from package dependencies, - # see https://flutter.dev/to/font-from-package + # see https://flutter.dev/to/font-from-package \ No newline at end of file