From 3588ff0f0264d94ff0954b96bf97c1247516c93a Mon Sep 17 00:00:00 2001 From: Kirill <117719052+KirillFirsof@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:14:31 +0400 Subject: [PATCH] lab7 ready --- .gitignore | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 1437 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 1061 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 1909 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 2742 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 4185 bytes assets/launcher.png | Bin 0 -> 26012 bytes l10n.yaml | 6 + l10n/app_en.arb | 9 + l10n/app_ru.arb | 9 + lib/components/extensions/context_x.dart | 6 + lib/components/locale/l10n/app_locale.dart | 153 ++++ lib/components/locale/l10n/app_locale_en.dart | 20 + lib/components/locale/l10n/app_locale_ru.dart | 20 + lib/components/util/debounce.dart | 20 + lib/data/dtos/films_dto.dart | 60 ++ lib/data/mapper/films_mapper.dart | 38 + lib/data/repositories/api_interface.dart | 7 + lib/data/repositories/mock_repository.dart | 45 ++ .../repositories/potter_films_repository.dart | 44 ++ lib/{ => domain}/models/card.dart | 14 +- lib/domain/models/home.dart | 8 + lib/main.dart | 15 +- lib/presentaition/common/svg_objects.dart | 34 + .../details_page/details_page.dart | 27 +- lib/presentaition/home_page/bloc/bloc.dart | 39 + lib/presentaition/home_page/bloc/events.dart | 10 + lib/presentaition/home_page/bloc/state.dart | 29 + lib/presentaition/home_page/card.dart | 145 ++-- lib/presentaition/home_page/home_page.dart | 240 ++++-- lib/presentaition/like_bloc/like_bloc.dart | 36 + lib/presentaition/like_bloc/like_event.dart | 13 + lib/presentaition/like_bloc/like_state.dart | 14 + .../locale_bloc/locale_bloc.dart | 17 + .../locale_bloc/locale_events.dart | 7 + .../locale_bloc/locale_state.dart | 15 + makefile | 15 + pubspec.lock | 681 +++++++++++++++++- pubspec.yaml | 34 +- 39 files changed, 1668 insertions(+), 168 deletions(-) create mode 100644 assets/launcher.png 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/context_x.dart create mode 100644 lib/components/locale/l10n/app_locale.dart create mode 100644 lib/components/locale/l10n/app_locale_en.dart create mode 100644 lib/components/locale/l10n/app_locale_ru.dart create mode 100644 lib/components/util/debounce.dart create mode 100644 lib/data/dtos/films_dto.dart create mode 100644 lib/data/mapper/films_mapper.dart create mode 100644 lib/data/repositories/api_interface.dart create mode 100644 lib/data/repositories/mock_repository.dart create mode 100644 lib/data/repositories/potter_films_repository.dart rename lib/{ => domain}/models/card.dart (54%) create mode 100644 lib/domain/models/home.dart create mode 100644 lib/presentaition/common/svg_objects.dart create mode 100644 lib/presentaition/home_page/bloc/bloc.dart create mode 100644 lib/presentaition/home_page/bloc/events.dart create mode 100644 lib/presentaition/home_page/bloc/state.dart create mode 100644 lib/presentaition/like_bloc/like_bloc.dart create mode 100644 lib/presentaition/like_bloc/like_event.dart create mode 100644 lib/presentaition/like_bloc/like_state.dart create mode 100644 lib/presentaition/locale_bloc/locale_bloc.dart create mode 100644 lib/presentaition/locale_bloc/locale_events.dart create mode 100644 lib/presentaition/locale_bloc/locale_state.dart create mode 100644 makefile diff --git a/.gitignore b/.gitignore index 29a3a50..810bb9a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,9 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build 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..3f746144fc3a53e2452cf7c163d7b732fc691dd0 100644 GIT binary patch delta 1430 zcmV;H1!?-A1f2_z8Gix*007#LBoF`q1!PG?K~#7F?ORQ6<3t#qu_uX>CQV2S3YFln zyKq8qsss`TF5G%uegsD(egX$B9O!RB2nh)xA?RVRC|y=WTox6zP1AhGA2E+-5@QmN zH;HGGb+qrn$;6NI&g*$U$FG_1`?t5Z#bS{VG8_(%kB_geu7B$F`glCXse^-qo12?P zqmelbBYR4(1j`z+PNxH9^*j%QQmKSttyUY2My6@vm%(6w;Rcvyvw8XS>HB%JICY6n zCX6|g$+cw}4<6ZXGy=|@_VtsC{9A92ip7+?VlfN`hjXs$!t8+VcDwi$=W@9mKsZ~i zR&nLJm~YR|FMlsDzw`%>=rp{GBSOlbf06&>Q%dQe`TO{ruL=*}t$cl+l2OOz9gVRkJR&2fwrykr;#4;E@C>}^4VVTB7Cyb7jLsU+XdaK-R( zkIQ*r-G7Xi45LdGlf7byffp05OgZTiESS3=BU&hxIBWbrvMD5;D<%ohVdg=&{F>Yc zi)tqVD~3@GMh=GIx)|84bh;7i633%@U1WWm@seS-Ubgr%5)MS0x7VtQaW+Qg9-nZj zG#MDt8=&KCjD)!&&pb2=273r=8^i<=){uaSAb*RPfZ@8B!^1NtSOQC-jbxs7Asl6?&`c1_{-f!Q$1@=bDHTi8Y!#aEsz&Mk58ru?UHW1C}!rv zUw`&-q3hoN_&wn^X4{io3SKfyuoJBOc?axPng{;XGI<#``SY2`JbL~9>pVcKeg2}e z9+MEGeB*8I6*E?kB~YGkPK9NQCekUGB!9OsDK#RFC1ZtV@Za*>0@~>MGd(=2AMHh< z$tfqENMunJldEGkPph(5LBDXuCMBNE{GO$^sAUYkM0vn~JoyaT?c3vr?`+IVhS`RV z!MP8Y7KdpLHM_B~8E>81xHB6QyghxHhmszF1q|xERd}2Hh{RHP&jN-FiE#QJfqw-I z^6LcwmLDrIUP_z9&*ckKzP+QcX91XP*jRzmf<)n1Qht((c4=c|u8lf~rQf<)#uQiX z+kiGsMx(satt5eAV&7D4p}8!W?fc!xB3ken#!Ll+`j<~A8--@VLkXfYMGQ%&jcMKz zO(vGUM<5on#tax!+p{1r49c3aM}J@$gD|o%`vl#qR4R_=DePGgm@O5Wc|xiY#niV? z8q$^ogW5=YTJ+HVw$5&$&`hSgySv(hY!;e3p;v;fPrD4y5G;LygBiDoTiB z-aL*e=~)mMrldz;0fXOVy;L!`mNADHnhJXsg3M!sRbG`e_XQ-={wBdXUVj0BR;)e) zTrTRdEW83zDy=SU~0`gj|7JRH`V@9>6V-8vbvn=c65jTlYpWiFk5q`YTAV1k`s9q&z^ot>SYp04sg7-s1mO}bNG kPxd(p*6|9+%YgY81s&5cZ4UvE%>V!Z07*qoM6N<$g8Z_hc>n+a 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..122e71f4e27809499a2ab34e8dd7811ba973e0e5 100644 GIT binary patch delta 1051 zcmV+$1myd=1EmO%8Gix*007uvZqNV#1MEpeK~#7F%~{KC(?ArR$4&Dr$yaoT#AmQ! zQK@3Xq7r|?mmq}bhA#ji_yGhG>+ZX3(j-pvu+5pdjq6VAc)C9kl+9>`aQGxRiDxDh$FYv6Hk(a` z<4{Xa9;fMa%5=@=^NdCy8I5K5m$S1UpFe$&5#Q{x*B^cSio?bGx5L+O^vOF#_Lop{{8KoylbYGTCEn7PeiNL3T8qt_^-q#<8h(JwGioK;;+ZS z2`n*P-EKFdaeuK`WHgrH2m;3x4jqFk$z1-J{hyX8%hG- zyWMVA;>tYwj!hgx_*tfjza9rS1~n^UN^2pCsfgnQ(a@|&2Dl8BBfvFfLcLxO-2-eR zxKI)hj0j8wS0x@NiE&SnO2M3&W@Msi8_zt zVZE%#BsbJ+3L&@1*)@xA)ZJ;FR@39PkVrq-DGk zw@kQP@Snj-e?1N!m-sF0pj3%FPlfZMU*D6}O4uImugAd&yfqupOqS)W zN~5`)&o-%nRDXb?_t*p4mX}*;p;LzW3t}oYcUlzh<#K87EpWd|JlW}G+UBt^%u9bg z4sLo`v-Kq@>SZlyh9Rvq675;6K`lGNhKOlwJbx&`Iy7DcKhCha66YL&#CO{)Sc{X` zUyp;E0h{T9|1$T%ub2e(<7!)!qf{(&26csrFT{tZ9tXew&6UE^j0S@NNWuyBqH-hn zaYk*Z#CNw27E_%_UklyxlA3ZJ}#IF?uliDGv zv42pl4xh(K-#&Mq+$36Cq7+Gdi(1!Uf&hL$L5(a+>_OX76e3is!{_lmE0Ek)sk#${ zAs#IGclbP>&obIF#KFWBrNIPYvMh|?8+oBZC)Z46n}WL*#u$cA?z#u9X^lmPK=o#x;U%rP7r2d z4C418Tvn^Y=W(q|TNdBdQ;&mFtqz~Zd)@A&%%X0O)3ELY5wzPM9UWc#`Ca%`=jE%$ zYMbx&r>CdK$Hzz(R3lV5(2m$dI3r8og(ukUr4`O5Y4e=lr|gL>FNQ+?`SK9>e-sCE VFI6HSoBsd+002ovPDHLkV1lHL2A%)_ literal 442 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 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..8519d991e96ea475c40c29c7cc4705bac40e1722 100644 GIT binary patch literal 2742 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 wD~?DQ7$RX{h=hS55(b8BNt#6CJT>R}9}H{( 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..04c8bcde590ca9478e823c9556c330d44456fcc2 100644 GIT binary patch literal 4185 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 diff --git a/assets/launcher.png b/assets/launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..cc0a5ff8b614ee786e3bebaba6c75dcdb73e1b84 GIT binary patch literal 26012 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 literal 0 HcmV?d00001 diff --git a/l10n.yaml b/l10n.yaml new file mode 100644 index 0000000..d26d702 --- /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/locale/l10n +output-class: AppLocale +synthetic-package: false \ No newline at end of file diff --git a/l10n/app_en.arb b/l10n/app_en.arb new file mode 100644 index 0000000..12efc72 --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,9 @@ + { + "@@locale": "en", + + "search": "Search", + "liked": "liked!", + "disliked": "disliked :(", + + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" +} \ No newline at end of file diff --git a/l10n/app_ru.arb b/l10n/app_ru.arb new file mode 100644 index 0000000..2c4995d --- /dev/null +++ b/l10n/app_ru.arb @@ -0,0 +1,9 @@ + { + "@@locale": "ru", + + "search": "Поиск", + "liked": "понравился!", + "disliked": "Уже не нравится :(", + + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" +} \ No newline at end of file diff --git a/lib/components/extensions/context_x.dart b/lib/components/extensions/context_x.dart new file mode 100644 index 0000000..8e4a7af --- /dev/null +++ b/lib/components/extensions/context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/widgets.dart'; +import '../locale/l10n/app_locale.dart'; + +extension LocalContextX on BuildContext { + AppLocale get locale => AppLocale.of(this)!; +} diff --git a/lib/components/locale/l10n/app_locale.dart b/lib/components/locale/l10n/app_locale.dart new file mode 100644 index 0000000..b67c8f3 --- /dev/null +++ b/lib/components/locale/l10n/app_locale.dart @@ -0,0 +1,153 @@ +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 @search. + /// + /// In ru, this message translates to: + /// **'Поиск'** + String get search; + + /// No description provided for @liked. + /// + /// In ru, this message translates to: + /// **'понравился!'** + String get liked; + + /// No description provided for @disliked. + /// + /// In ru, this message translates to: + /// **'Уже не нравится :('** + String get disliked; + + /// No description provided for @arbEnding. + /// + /// In ru, this message translates to: + /// **'Чтобы не забыть про отсутствие запятой :)'** + String get arbEnding; +} + +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/locale/l10n/app_locale_en.dart b/lib/components/locale/l10n/app_locale_en.dart new file mode 100644 index 0000000..599548c --- /dev/null +++ b/lib/components/locale/l10n/app_locale_en.dart @@ -0,0 +1,20 @@ +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 search => 'Search'; + + @override + String get liked => 'liked!'; + + @override + String get disliked => 'disliked :('; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} diff --git a/lib/components/locale/l10n/app_locale_ru.dart b/lib/components/locale/l10n/app_locale_ru.dart new file mode 100644 index 0000000..8bf7ec0 --- /dev/null +++ b/lib/components/locale/l10n/app_locale_ru.dart @@ -0,0 +1,20 @@ +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 search => 'Поиск'; + + @override + String get liked => 'понравился!'; + + @override + String get disliked => 'Уже не нравится :('; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} diff --git a/lib/components/util/debounce.dart b/lib/components/util/debounce.dart new file mode 100644 index 0000000..6e1c470 --- /dev/null +++ b/lib/components/util/debounce.dart @@ -0,0 +1,20 @@ +import 'dart:async'; +import 'dart:ui'; + +class Debounce { + factory Debounce() => _instance; + + Debounce._(); + + static final Debounce _instance = Debounce._(); + + static Timer? _timer; + + static void run( + VoidCallback action, { + Duration delay = const Duration(milliseconds: 500), + }) { + _timer?.cancel(); + _timer = Timer(delay, action); + } +} diff --git a/lib/data/dtos/films_dto.dart b/lib/data/dtos/films_dto.dart new file mode 100644 index 0000000..009399c --- /dev/null +++ b/lib/data/dtos/films_dto.dart @@ -0,0 +1,60 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'films_dto.g.dart'; + +@JsonSerializable(createToJson: false) +class FilmsDto { + final List? data; + final MetaDto? meta; + + const FilmsDto({ + this.data, + this.meta, + }); + + factory FilmsDto.fromJson(Map json) => _$FilmsDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class FilmDataDto { + final String? id; + final String? type; + final FilmAttributesDataDto? attributes; + + const FilmDataDto({this.id, this.type, this.attributes}); + + factory FilmDataDto.fromJson(Map json) => _$FilmDataDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class FilmAttributesDataDto { + final String? title; + final DateTime? release_date; + final String? budget; + final String? poster; + + const FilmAttributesDataDto({this.title, this.release_date, this.budget, this.poster}); + + factory FilmAttributesDataDto.fromJson(Map json) => + _$FilmAttributesDataDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class MetaDto { + final PaginationDto? pagination; + + const MetaDto({this.pagination}); + + factory MetaDto.fromJson(Map json) => _$MetaDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class PaginationDto { + final int? current; + final int? next; + final int? last; + + const PaginationDto({this.current, this.next, this.last}); + + factory PaginationDto.fromJson(Map json) => _$PaginationDtoFromJson(json); +} diff --git a/lib/data/mapper/films_mapper.dart b/lib/data/mapper/films_mapper.dart new file mode 100644 index 0000000..22b23e8 --- /dev/null +++ b/lib/data/mapper/films_mapper.dart @@ -0,0 +1,38 @@ +import 'package:testlab/data/dtos/films_dto.dart'; +import 'package:testlab/domain/models/card.dart'; +import 'package:testlab/domain/models/home.dart'; +import 'package:intl/intl.dart'; + +const _imagePlaceholder = + 'https://ralfvanveen.com/wp-content/uploads/2021/06/Placeholder-_-Glossary.svg'; + +extension FilmsDtoToModel on FilmsDto { + HomeData toDomain() => HomeData( + data: data?.map((e) => e.toDomain()).toList(), + nextPage: meta?.pagination?.next, + ); +} + +extension FilmDataDtoToModel on FilmDataDto { + CardData toDomain() => CardData( + attributes?.title ?? 'UNKNOWN', + imageUrl: attributes?.poster ?? _imagePlaceholder, + descriptionText: + _makeDescriptionText(formatDateToString(attributes?.release_date), attributes?.budget), + id: id, + ); + + String formatDateToString(DateTime? date) { + return date != null ? DateFormat('yyyy-MM-dd').format(date) : 'UNKNOWN DATE'; + } + + String _makeDescriptionText(String? release_date, String? budget) { + return release_date != null && budget != null + ? '$release_date \n $budget' + : release_date != null + ? 'release: $release_date' + : budget != null + ? 'budget: $budget' + : ''; + } +} diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart new file mode 100644 index 0000000..6760b2c --- /dev/null +++ b/lib/data/repositories/api_interface.dart @@ -0,0 +1,7 @@ +import 'package:testlab/domain/models/home.dart'; + +typedef OnErrorCallback = void Function(String? error); + +abstract class ApiInterface { + Future loadData({OnErrorCallback? onError}); +} diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart new file mode 100644 index 0000000..c83abc8 --- /dev/null +++ b/lib/data/repositories/mock_repository.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; +import 'package:testlab/data/repositories/api_interface.dart'; +import 'package:testlab/domain/models/card.dart'; +import 'package:testlab/domain/models/home.dart'; + +class MockRepository extends ApiInterface { + @override + Future loadData({OnErrorCallback? onError}) async { + return HomeData(data: [ + CardData( + 'Mobile dev', + descriptionText: 'И когда ты успел стать экспертом в мобильной разработке?', + imageUrl: + 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQtsv2O-lLpxro9HH9CUejcymOOnGdQJwjasg&s', + ), + CardData( + 'Грустный кот', + descriptionText: 'Котик грустит, аж плачет', + icon: Icons.star, + imageUrl: + 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT--ZMDGsa_8y9r9u0RjAn576ajsVVfsOIcDA&s', + ), + CardData( + 'Веселый кот', + descriptionText: 'Котик стал очень веселый, аж улыбается', + icon: Icons.work, + imageUrl: + 'https://img-webcalypt.ru/storage/memes/YhGTdxW7HnbmhqAd37XjsMCTj1fHUW7AADagYMDbmyU9VBEhDBbq4d3XNGDWo34FibwtjyeVsyxudpzeViSmHdJ7e6C50tLbZnkZZAP81AV7aM0R8VSi4YEnqgcZ1EtE-md.jpeg', + ), + CardData( + 'Кот накачаля', + descriptionText: 'Кот накачался, аж широкий', + icon: Icons.question_answer, + imageUrl: 'https://s00.yaplakal.com/pics/pics_original/9/1/8/11586819.jpg', + ), + CardData( + 'Кот крутой', + descriptionText: 'Кот стал очень крутым, аж в очках', + icon: Icons.favorite_border, + imageUrl: + 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSmwxp_mc1c8Rukc6Dg4GLNv1JLZbO7DKqF4w&s', + ), + ]); + } +} diff --git a/lib/data/repositories/potter_films_repository.dart b/lib/data/repositories/potter_films_repository.dart new file mode 100644 index 0000000..b4b0d99 --- /dev/null +++ b/lib/data/repositories/potter_films_repository.dart @@ -0,0 +1,44 @@ +import 'package:dio/dio.dart'; +import 'package:testlab/data/dtos/films_dto.dart'; +import 'package:testlab/data/mapper/films_mapper.dart'; +import 'package:testlab/data/repositories/api_interface.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; +import 'package:testlab/domain/models/home.dart'; + +class PotterFilmsRepository extends ApiInterface { + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )); + + static const String _baseUrl = 'https://api.potterdb.com'; + + @override + Future loadData({ + OnErrorCallback? onError, + String? q, + int page = 1, + int pageSize = 5, + }) async { + try { + const String url = '$_baseUrl/v1/movies'; + + final Response response = await _dio.get>( + url, + queryParameters: { + 'filter[title_cont]': q, + 'page[number]': page, + 'page[size]': pageSize, + }, + ); + + final FilmsDto dto = FilmsDto.fromJson(response.data as Map); + final HomeData data = dto.toDomain(); + return data; + } on DioException catch (e) { + onError?.call(e.error?.toString()); + return null; + } + } +} diff --git a/lib/models/card.dart b/lib/domain/models/card.dart similarity index 54% rename from lib/models/card.dart rename to lib/domain/models/card.dart index 07f7bb9..02d4acf 100644 --- a/lib/models/card.dart +++ b/lib/domain/models/card.dart @@ -5,11 +5,13 @@ class CardData { final String descriptionText; final IconData icon; final String? imageUrl; + final String? id; CardData( - this.text, { - required this.descriptionText, - this.icon = Icons.cake, - this.imageUrl, - }); -} \ No newline at end of file + this.text, { + required this.descriptionText, + this.icon = Icons.cake, + this.imageUrl, + this.id, + }); +} diff --git a/lib/domain/models/home.dart b/lib/domain/models/home.dart new file mode 100644 index 0000000..2f0ba57 --- /dev/null +++ b/lib/domain/models/home.dart @@ -0,0 +1,8 @@ +import 'card.dart'; + +class HomeData { + final List? data; + final int? nextPage; + + HomeData({this.data, this.nextPage}); +} diff --git a/lib/main.dart b/lib/main.dart index 8806f86..822b87d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,8 @@ import 'package:flutter/material.dart'; import 'package:testlab/presentaition/home_page/home_page.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:testlab/presentaition/home_page/bloc/bloc.dart'; +import 'data/repositories/potter_films_repository.dart'; void main() { runApp(const MyApp()); @@ -14,10 +17,18 @@ class MyApp extends StatelessWidget { title: 'Flutter Demo', debugShowCheckedModeBanner: false, theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.pink), + colorScheme: ColorScheme.fromSeed(seedColor: Colors.red), useMaterial3: true, ), - home: const MyHomePage(title: 'Фирсов Кирилл Алексеевич'), + home: RepositoryProvider( + lazy: true, + create: (_) => PotterFilmsRepository(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage(title: 'Фирсов Кирилл Алексеевич'), + ), + ), ); } } diff --git a/lib/presentaition/common/svg_objects.dart b/lib/presentaition/common/svg_objects.dart new file mode 100644 index 0000000..8b11b35 --- /dev/null +++ b/lib/presentaition/common/svg_objects.dart @@ -0,0 +1,34 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import '../../components/resources.g.dart'; + +abstract class SvgObjects { + static void init() { + final pics = [ + R.assetsSvgRuSvg, + R.assetsSvgUkSvg, + ]; + for (final String p in pics) { + 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.assetsSvgRuSvg); + } +} + +class SvgUk extends StatelessWidget { + const SvgUk({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.assetsSvgUkSvg); + } +} \ No newline at end of file diff --git a/lib/presentaition/details_page/details_page.dart b/lib/presentaition/details_page/details_page.dart index d59df1a..770cbce 100644 --- a/lib/presentaition/details_page/details_page.dart +++ b/lib/presentaition/details_page/details_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:testlab/models/card.dart'; +import 'package:testlab/domain/models/card.dart'; class DetailsPage extends StatelessWidget { final CardData data; @@ -16,11 +16,11 @@ class DetailsPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: const EdgeInsets.all( 16.0), + padding: const EdgeInsets.all(16.0), child: ClipRRect( borderRadius: BorderRadius.circular(15), child: Image.network( - data.imageUrl ?? '', + data.imageUrl ?? '', width: double.infinity, fit: BoxFit.cover, ), @@ -41,19 +41,18 @@ class DetailsPage extends StatelessWidget { ), Padding( padding: const EdgeInsets.all(5.0), - child: Center( - child: Text( - data.descriptionText, - style: const TextStyle( - color: Colors.white, - fontSize: 18, - ), - ) - ), - ), + child: Center( + child: Text( + data.descriptionText, + style: const TextStyle( + color: Colors.white, + fontSize: 18, + ), + )), + ), ], ), backgroundColor: Colors.black, ); } -} \ No newline at end of file +} diff --git a/lib/presentaition/home_page/bloc/bloc.dart b/lib/presentaition/home_page/bloc/bloc.dart new file mode 100644 index 0000000..3d899c4 --- /dev/null +++ b/lib/presentaition/home_page/bloc/bloc.dart @@ -0,0 +1,39 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:testlab/data/repositories/potter_films_repository.dart'; +import 'package:testlab/presentaition/home_page/bloc/events.dart'; +import 'package:testlab/presentaition/home_page/bloc/state.dart'; + +class HomeBloc extends Bloc { + final PotterFilmsRepository repo; + + HomeBloc(this.repo) : super(const HomeState()) { + on(_onLoadData); + } + + Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async { + if (event.nextPage == null) { + emit(state.copyWith(isLoading: true)); + } else { + emit(state.copyWith(isPaginationLoading: true)); + } + + String? error; + + 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, + )); + } +} diff --git a/lib/presentaition/home_page/bloc/events.dart b/lib/presentaition/home_page/bloc/events.dart new file mode 100644 index 0000000..cefba70 --- /dev/null +++ b/lib/presentaition/home_page/bloc/events.dart @@ -0,0 +1,10 @@ +abstract class HomeEvent { + const HomeEvent(); +} + +class HomeLoadDataEvent extends HomeEvent { + final String? search; + final int? nextPage; + + const HomeLoadDataEvent({this.search, this.nextPage}); +} diff --git a/lib/presentaition/home_page/bloc/state.dart b/lib/presentaition/home_page/bloc/state.dart new file mode 100644 index 0000000..2990318 --- /dev/null +++ b/lib/presentaition/home_page/bloc/state.dart @@ -0,0 +1,29 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; + +import '../../../domain/models/home.dart'; + +part 'state.g.dart'; + +@CopyWith() +class HomeState extends Equatable { + final HomeData? data; + final bool isLoading; + final bool isPaginationLoading; + final String? error; + + const HomeState({ + this.data, + this.isLoading = false, + this.isPaginationLoading = false, + this.error, + }); + + @override + List get props => [ + data, + isLoading, + isPaginationLoading, + error, + ]; +} diff --git a/lib/presentaition/home_page/card.dart b/lib/presentaition/home_page/card.dart index c6473df..8769405 100644 --- a/lib/presentaition/home_page/card.dart +++ b/lib/presentaition/home_page/card.dart @@ -1,28 +1,33 @@ part of 'home_page.dart'; -typedef OnLikeCallback = void Function(String title, bool isLiked)?; +typedef OnLikeCallback = void Function(String? id, String title, bool isLiked)?; -class _Card extends StatefulWidget { +class _Card extends StatelessWidget { final String text; final String descriptionText; final IconData icon; final String? imageUrl; final OnLikeCallback onLike; final VoidCallback? onTap; + final String? id; + final bool isLiked; const _Card( - this.text, { - this.icon = Icons.catching_pokemon, - required this.descriptionText, - this.imageUrl, - this.onLike, - this.onTap, - }); + this.text, { + this.icon = Icons.ac_unit_outlined, + required this.descriptionText, + this.imageUrl, + this.onLike, + this.onTap, + this.id, + this.isLiked = false, + }); factory _Card.fromData( - CardData data, { + CardData data, { OnLikeCallback onLike, VoidCallback? onTap, + bool isLiked = false, }) => _Card( data.text, @@ -31,25 +36,22 @@ class _Card extends StatefulWidget { imageUrl: data.imageUrl, onLike: onLike, onTap: onTap, + isLiked: isLiked, + id: data.id, ); - @override + /*@override State<_Card> createState() => _CardState(); } class _CardState extends State<_Card> { - bool isLiked = false; + bool isLiked = false;*/ @override Widget build(BuildContext context) { return GestureDetector( - onLongPress: widget.onTap, - onDoubleTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.text, isLiked); - }, + onTap: onTap, + onDoubleTap: () => onLike?.call(id, text, isLiked), child: Container( margin: const EdgeInsets.all(16), constraints: const BoxConstraints(minHeight: 170), @@ -69,51 +71,42 @@ class _CardState extends State<_Card> { child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding( - padding: const EdgeInsets.only( - left: 10, - top: 10, - right: 3, - bottom: 10 - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(15), - child: SizedBox( - height: double.infinity, - width: 150, - child: Image.network( - widget.imageUrl ?? '', - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => const Placeholder(), - ), + Padding( + padding: const EdgeInsets.only(left: 10, top: 10, right: 3, bottom: 10), + child: ClipRRect( + borderRadius: BorderRadius.circular(15), + child: SizedBox( + height: double.infinity, + width: 150, + child: Image.network( + imageUrl ?? '', + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => const Placeholder(), ), + ), ), ), - Expanded( - child: Stack( - children: [ - Align( - alignment: Alignment.bottomLeft, - child: Padding( - padding: const EdgeInsets.only( - left: 8.0, - right: 8.0, - bottom: 16.0, - ), - child: Icon( - widget.icon, - ), + child: Stack( + children: [ + Align( + alignment: Alignment.bottomLeft, + child: Padding( + padding: const EdgeInsets.only( + left: 8.0, + right: 8.0, + bottom: 16.0, + ), + child: Icon( + icon, ), ), - - Padding( - padding: const EdgeInsets.only(left: 3.0, top: 3.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + ), + Padding( + padding: const EdgeInsets.only(left: 3.0, top: 3.0), + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - widget.text, + text, style: const TextStyle( color: Colors.white, fontSize: 14, @@ -121,45 +114,37 @@ class _CardState extends State<_Card> { ), ), Text( - widget.descriptionText, + descriptionText, style: const TextStyle( color: Colors.white, fontSize: 13, - ), - ), - ] + ), ), - ), - ], - ) - ), + ]), + ), + ], + )), Align( alignment: Alignment.bottomRight, child: Padding( padding: const EdgeInsets.only( - left: 8.0, right: 16.0, bottom: 16.0, ), child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.text, isLiked); - }, + onTap: () => onLike?.call(id, text, isLiked), child: AnimatedSwitcher( duration: const Duration(milliseconds: 300), child: isLiked ? const Icon( - Icons.thumb_up, - color: Colors.redAccent, - key: ValueKey(0), - ) + Icons.thumb_up, + color: Colors.redAccent, + key: ValueKey(0), + ) : const Icon( - Icons.thumb_up_off_alt, - key: ValueKey(1), - ), + Icons.thumb_up_off_alt, + key: ValueKey(1), + ), ), ), ), @@ -170,4 +155,4 @@ class _CardState extends State<_Card> { ), ); } -} \ No newline at end of file +} diff --git a/lib/presentaition/home_page/home_page.dart b/lib/presentaition/home_page/home_page.dart index 9cb0037..d805c37 100644 --- a/lib/presentaition/home_page/home_page.dart +++ b/lib/presentaition/home_page/home_page.dart @@ -1,7 +1,20 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:testlab/models/card.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:testlab/components/extensions/context_x.dart'; +import 'package:testlab/components/util/debounce.dart'; import 'package:testlab/presentaition/details_page/details_page.dart'; +import 'package:testlab/presentaition/home_page/bloc/bloc.dart'; +import 'package:testlab/presentaition/home_page/bloc/events.dart'; +import 'package:testlab/presentaition/home_page/bloc/state.dart'; +import 'package:testlab/domain/models/card.dart'; +import '../common/svg_objects.dart'; +import '../like_bloc/like_bloc.dart'; +import '../like_bloc/like_event.dart'; +import '../like_bloc/like_state.dart'; +import '../locale_bloc/locale_bloc.dart'; +import '../locale_bloc/locale_events.dart'; +import '../locale_bloc/locale_state.dart'; part 'card.dart'; @@ -17,88 +30,179 @@ class MyHomePage extends StatefulWidget { class _MyHomePageState extends State { final Color _color = Colors.grey.shade600; - @override - void initState() { - super.initState(); - } - @override Widget build(BuildContext context) { return Scaffold( backgroundColor: Colors.black, appBar: AppBar( - backgroundColor: _color, - title: Text( - widget.title, - style: const TextStyle( - color: Colors.white, - fontSize: 20, - ), + backgroundColor: _color, + title: Text( + widget.title, + style: const TextStyle( + color: Colors.white, + fontSize: 20, ), + ), ), body: const Body(), ); } } -class Body extends StatelessWidget { - const Body({super.key}); +class Body extends StatefulWidget { + const Body(); + + @override + State createState() => BodyState(); +} + +class BodyState extends State { + final searchController = TextEditingController(); + final scrollController = ScrollController(); + + @override + void initState() { + SvgObjects.init(); + WidgetsBinding.instance.addPostFrameCallback((_) { + context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); + }); + + scrollController.addListener(_onNextPageListener); + super.initState(); + } + + 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, + )); + } + } + } + + @override + void dispose() { + searchController.dispose(); + scrollController.dispose(); + super.dispose(); + } @override Widget build(BuildContext context) { - final data = [ - CardData( - 'Mobile dev', - descriptionText: 'И когда ты успел стать экспертом в мобильной разработке?', - imageUrl: - 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQtsv2O-lLpxro9HH9CUejcymOOnGdQJwjasg&s', + return Padding( + padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top), + child: Column( + children: [ + Row( + children: [ + Expanded( + flex: 4, + child: Padding( + padding: const EdgeInsets.all(12), + child: CupertinoSearchTextField( + style: const TextStyle( + color: Colors.white, + fontSize: 16, + ), + decoration: BoxDecoration( + color: Colors.black54, + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Colors.white54, + width: 1, + ), + ), + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + controller: searchController, + onChanged: (search) { + Debounce.run(() => context.read().add(HomeLoadDataEvent(search: search))); + }, + prefixIcon: const Icon( + CupertinoIcons.search, + color: Colors.white, + ), + suffixIcon: const Icon( + CupertinoIcons.clear, + color: Colors.white, + ), + placeholder: 'Search...', + placeholderStyle: const TextStyle( + color: Colors.white54, + ), + ), + ), ), - CardData( - 'Грустный кот', - descriptionText: 'Котик грустит, аж плачет', - icon: Icons.star, - imageUrl: - 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT--ZMDGsa_8y9r9u0RjAn576ajsVVfsOIcDA&s', - ), - CardData( - 'Веселый кот', - descriptionText: 'Котик стал очень веселый, аж улыбается', - icon: Icons.work, - imageUrl: - 'https://img-webcalypt.ru/storage/memes/YhGTdxW7HnbmhqAd37XjsMCTj1fHUW7AADagYMDbmyU9VBEhDBbq4d3XNGDWo34FibwtjyeVsyxudpzeViSmHdJ7e6C50tLbZnkZZAP81AV7aM0R8VSi4YEnqgcZ1EtE-md.jpeg', - ), - CardData( - 'Кот накачаля', - descriptionText: 'Кот накачался, аж широкий', - icon: Icons.question_answer, - imageUrl: - 'https://s00.yaplakal.com/pics/pics_original/9/1/8/11586819.jpg', - ), - CardData( - 'Кот крутой', - descriptionText: 'Кот стал очень крутым, аж в очках', - icon: Icons.favorite_border, - imageUrl: - 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSmwxp_mc1c8Rukc6Dg4GLNv1JLZbO7DKqF4w&s', - ), - ]; - return Center( - child: SingleChildScrollView( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: data.map((data) { - return _Card.fromData( - data, - onLike: (String title, bool isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ); - }).toList(), + GestureDetector( + onTap: () => context.read().add(const ChangeLocaleEvent()), + child: SizedBox.square( + dimension: 50, + child: Padding( + padding: const EdgeInsets.only(right: 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 CircularProgressIndicator() + : BlocBuilder( + builder: (context, likeState) { + return Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.builder( + controller: scrollController, + padding: EdgeInsets.zero, + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + return data != null + ? _Card.fromData( + data, + onLike: _onLike, + isLiked: likeState.likedIds?.contains(data.id) == true, + onTap: () => _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }, + ), + ), + ); + }, + ), + ), + BlocBuilder( + builder: (context, state) => state.isPaginationLoading + ? const CircularProgressIndicator() + : const SizedBox.shrink(), + ), + ], + ), ); } + Future _onRefresh() { + context.read().add(HomeLoadDataEvent(search: searchController.text)); + return Future.value(null); + } + void _navToDetails(BuildContext context, CardData data) { Navigator.push( context, @@ -110,7 +214,7 @@ class Body extends StatelessWidget { WidgetsBinding.instance.addPostFrameCallback((_) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( - 'You ${isLiked ? 'like!' : 'disliked :('} $title ', + '$title ${isLiked ? context.locale.liked : context.locale.disliked}', style: const TextStyle( color: Colors.white, fontSize: 18, @@ -121,4 +225,12 @@ class Body extends StatelessWidget { duration: const Duration(seconds: 1), )); }); - }} \ No newline at end of file + } + + void _onLike(String? id, String title, bool isLiked) { + if (id != null) { + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, title, !isLiked); + } + } +} diff --git a/lib/presentaition/like_bloc/like_bloc.dart b/lib/presentaition/like_bloc/like_bloc.dart new file mode 100644 index 0000000..5ba512c --- /dev/null +++ b/lib/presentaition/like_bloc/like_bloc.dart @@ -0,0 +1,36 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +import 'like_event.dart'; +import 'like_state.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)); + } +} \ No newline at end of file diff --git a/lib/presentaition/like_bloc/like_event.dart b/lib/presentaition/like_bloc/like_event.dart new file mode 100644 index 0000000..43032db --- /dev/null +++ b/lib/presentaition/like_bloc/like_event.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); +} \ No newline at end of file diff --git a/lib/presentaition/like_bloc/like_state.dart b/lib/presentaition/like_bloc/like_state.dart new file mode 100644 index 0000000..0099c7c --- /dev/null +++ b/lib/presentaition/like_bloc/like_state.dart @@ -0,0 +1,14 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; + +part 'like_state.g.dart'; + +@CopyWith() +class LikeState extends Equatable { + final List? likedIds; + + const LikeState({required this.likedIds}); + + @override + List get props => [likedIds]; +} \ No newline at end of file diff --git a/lib/presentaition/locale_bloc/locale_bloc.dart b/lib/presentaition/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..07309bf --- /dev/null +++ b/lib/presentaition/locale_bloc/locale_bloc.dart @@ -0,0 +1,17 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:testlab/components/locale/l10n/app_locale.dart'; +import 'package:testlab/presentaition/locale_bloc/locale_events.dart'; +import 'package:testlab/presentaition/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)); + } +} \ No newline at end of file diff --git a/lib/presentaition/locale_bloc/locale_events.dart b/lib/presentaition/locale_bloc/locale_events.dart new file mode 100644 index 0000000..f345ef9 --- /dev/null +++ b/lib/presentaition/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent { + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent { + const ChangeLocaleEvent(); +} \ No newline at end of file diff --git a/lib/presentaition/locale_bloc/locale_state.dart b/lib/presentaition/locale_bloc/locale_state.dart new file mode 100644 index 0000000..8539fbf --- /dev/null +++ b/lib/presentaition/locale_bloc/locale_state.dart @@ -0,0 +1,15 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; +import 'package:flutter/material.dart'; + +part 'locale_state.g.dart'; + +@CopyWith() +class LocaleState extends Equatable { + final Locale currentLocale; + + const LocaleState({required this.currentLocale}); + + @override + List get props => [currentLocale]; +} \ No newline at end of file diff --git a/makefile b/makefile new file mode 100644 index 0000000..982f849 --- /dev/null +++ b/makefile @@ -0,0 +1,15 @@ +gen: + flutter pub build_runner build --delete-conflicting-outputs + +icon: + flutter pub run flutter_launcher_icons:main + +init_res: + dart pub global activate flutter_assets_generator + +format: + dart format . --line-length 100 + +res: + fgen --output lib/components/resources.g.dart --no-watch --no-preview; \ + make format \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index b9fd799..c78fce2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,43 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + url: "https://pub.dev" + source: hosted + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + 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: + name: args + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" + source: hosted + version: "2.6.0" async: dependency: transitive description: @@ -9,6 +46,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.11.0" + bloc: + dependency: transitive + description: + name: bloc + sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" + url: "https://pub.dev" + source: hosted + version: "8.1.4" boolean_selector: dependency: transitive description: @@ -17,6 +62,70 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + url: "https://pub.dev" + source: hosted + version: "2.4.13" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + url: "https://pub.dev" + source: hosted + version: "7.3.2" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + url: "https://pub.dev" + source: hosted + version: "8.9.2" characters: dependency: transitive description: @@ -25,6 +134,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" + source: hosted + version: "0.4.2" clock: dependency: transitive description: @@ -33,6 +158,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + url: "https://pub.dev" + source: hosted + version: "4.10.1" collection: dependency: transitive description: @@ -41,6 +174,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + copy_with_extension: + dependency: transitive + description: + name: copy_with_extension + sha256: fbcf890b0c34aedf0894f91a11a579994b61b4e04080204656b582708b5b1125 + url: "https://pub.dev" + source: hosted + version: "5.0.4" + copy_with_extension_gen: + dependency: "direct main" + description: + name: copy_with_extension_gen + sha256: "51cd11094096d40824c8da629ca7f16f3b7cea5fc44132b679617483d43346b0" + url: "https://pub.dev" + source: hosted + version: "5.0.4" + crypto: + dependency: transitive + description: + name: crypto + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" + source: hosted + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -49,6 +214,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + url: "https://pub.dev" + source: hosted + version: "2.3.7" + dio: + dependency: "direct main" + description: + name: dio + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + url: "https://pub.dev" + source: hosted + version: "5.7.0" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + equatable: + dependency: "direct main" + description: + name: equatable + sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" + url: "https://pub.dev" + source: hosted + version: "2.0.7" fake_async: dependency: transitive description: @@ -57,11 +254,51 @@ 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: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_bloc: + dependency: "direct main" + description: + name: flutter_bloc + sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a + 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: @@ -70,11 +307,125 @@ 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: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + 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: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + url: "https://pub.dev" + source: hosted + version: "4.3.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + url: "https://pub.dev" + source: hosted + version: "0.19.0" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: transitive + description: + name: js + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + url: "https://pub.dev" + source: hosted + version: "0.7.1" + json_annotation: + dependency: "direct main" + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + json_serializable: + dependency: "direct dev" + description: + name: json_serializable + sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c + url: "https://pub.dev" + source: hosted + version: "6.9.0" leak_tracker: dependency: transitive description: @@ -107,6 +458,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -131,6 +498,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.15.0" + mime: + dependency: transitive + description: + name: mime + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" path: dependency: transitive description: @@ -139,11 +530,195 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + 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: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + 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: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + pretty_dio_logger: + dependency: "direct main" + description: + name: pretty_dio_logger + sha256: "36f2101299786d567869493e2f5731de61ce130faa14679473b26905a92b6407" + url: "https://pub.dev" + source: hosted + version: "1.4.0" + provider: + dependency: transitive + description: + name: provider + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" + source: hosted + version: "6.1.2" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + 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: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" + url: "https://pub.dev" + source: hosted + version: "2.3.4" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" + url: "https://pub.dev" + source: hosted + version: "2.5.3" + 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: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + url: "https://pub.dev" + source: hosted + version: "2.0.1" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + source_helper: + dependency: transitive + description: + name: source_helper + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" + source: hosted + version: "1.3.4" source_span: dependency: transitive description: @@ -168,6 +743,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" string_scanner: dependency: transitive description: @@ -192,6 +775,46 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.2" + timing: + dependency: transitive + description: + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" + url: "https://pub.dev" + source: hosted + version: "1.1.15" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" + url: "https://pub.dev" + source: hosted + version: "1.1.12" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" + url: "https://pub.dev" + source: hosted + version: "1.1.16" vector_math: dependency: transitive description: @@ -208,6 +831,62 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.5" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.5.3 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index f35dbb3..02af619 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,6 +35,23 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + flutter_svg: 2.0.7 + + json_annotation: ^4.8.1 + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 + + # BLoC + + equatable: ^2.0.5 + flutter_bloc: ^8.1.5 + copy_with_extension_gen: ^5.0.4 + + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + + shared_preferences: 2.2.3 dev_dependencies: flutter_test: @@ -45,8 +62,19 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. + build_runner: ^2.4.9 + json_serializable: ^6.7.1 + flutter_lints: ^4.0.0 + flutter_launcher_icons: 0.13.1 + +flutter_icons: + android: "ic_launcher" + ios: true + image_path: "assets/launcher.jpg" + min_sdk_android: 21 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec @@ -56,8 +84,12 @@ flutter: # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. + generate: true uses-material-design: true + assets: + - assets/svg/ + # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg @@ -87,4 +119,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