From 1e6e02e9a0c8645bf9b62814bd2014e8c7ecf26d Mon Sep 17 00:00:00 2001 From: kamilia Date: Wed, 16 Oct 2024 17:22:28 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=206=20=D0=B3=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0,=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B5=D1=82,=20=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=BD=D1=83=D0=B6=D0=BD=D0=B0=20=D0=BB=D0=B8=20=D0=BE=D0=BD?= =?UTF-8?q?=D0=B0=3F....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/components/utils/debounce.dart | 20 ++++ lib/data/dtos/characters_dto.dart | 31 ++++- lib/data/dtos/characters_dto.g.dart | 16 +++ lib/data/mappers/characters_mapper.dart | 8 ++ lib/data/repositories/api_interface.dart | 3 +- lib/data/repositories/mock_repository.dart | 84 +++++--------- lib/data/repositories/potter_repository.dart | 19 +++- lib/domain/models/home.dart | 8 ++ lib/main.dart | 13 ++- lib/presentation/home_page/bloc/bloc.dart | 39 +++++++ lib/presentation/home_page/bloc/events.dart | 10 ++ lib/presentation/home_page/bloc/state.dart | 29 +++++ lib/presentation/home_page/bloc/state.g.dart | 92 +++++++++++++++ lib/presentation/home_page/home_page.dart | 112 +++++++++++++------ pubspec.lock | 56 ++++++++++ pubspec.yaml | 4 +- 16 files changed, 440 insertions(+), 104 deletions(-) create mode 100644 lib/components/utils/debounce.dart create mode 100644 lib/domain/models/home.dart create mode 100644 lib/presentation/home_page/bloc/bloc.dart create mode 100644 lib/presentation/home_page/bloc/events.dart create mode 100644 lib/presentation/home_page/bloc/state.dart create mode 100644 lib/presentation/home_page/bloc/state.g.dart diff --git a/lib/components/utils/debounce.dart b/lib/components/utils/debounce.dart new file mode 100644 index 0000000..b4e1f35 --- /dev/null +++ b/lib/components/utils/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); + } +} \ No newline at end of file diff --git a/lib/data/dtos/characters_dto.dart b/lib/data/dtos/characters_dto.dart index b4f94cc..8b68802 100644 --- a/lib/data/dtos/characters_dto.dart +++ b/lib/data/dtos/characters_dto.dart @@ -5,8 +5,12 @@ part 'characters_dto.g.dart'; @JsonSerializable(createToJson: false) class CharactersDto { final List? data; + final MetaDto? meta; - const CharactersDto({this.data}); + const CharactersDto({ + this.data, + this.meta, + }); factory CharactersDto.fromJson(Map json) => _$CharactersDtoFromJson(json); } @@ -15,7 +19,7 @@ class CharactersDto { class CharacterDataDto { final String? id; final String? type; - final CharacterAttributesDataDto? attributes; //составной элемент + final CharacterAttributesDataDto? attributes; const CharacterDataDto({this.id, this.type, this.attributes}); @@ -31,5 +35,26 @@ class CharacterAttributesDataDto { const CharacterAttributesDataDto({this.name, this.born, this.died, this.image}); - factory CharacterAttributesDataDto.fromJson(Map json) => _$CharacterAttributesDataDtoFromJson(json); + factory CharacterAttributesDataDto.fromJson(Map json) => + _$CharacterAttributesDataDtoFromJson(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); } \ No newline at end of file diff --git a/lib/data/dtos/characters_dto.g.dart b/lib/data/dtos/characters_dto.g.dart index bd8c5d9..c4e1b40 100644 --- a/lib/data/dtos/characters_dto.g.dart +++ b/lib/data/dtos/characters_dto.g.dart @@ -11,6 +11,9 @@ CharactersDto _$CharactersDtoFromJson(Map json) => data: (json['data'] as List?) ?.map((e) => CharacterDataDto.fromJson(e as Map)) .toList(), + meta: json['meta'] == null + ? null + : MetaDto.fromJson(json['meta'] as Map), ); CharacterDataDto _$CharacterDataDtoFromJson(Map json) => @@ -31,3 +34,16 @@ CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson( died: json['died'] as String?, image: json['image'] as String?, ); + +MetaDto _$MetaDtoFromJson(Map json) => MetaDto( + pagination: json['pagination'] == null + ? null + : PaginationDto.fromJson(json['pagination'] as Map), + ); + +PaginationDto _$PaginationDtoFromJson(Map json) => + PaginationDto( + current: (json['current'] as num?)?.toInt(), + next: (json['next'] as num?)?.toInt(), + last: (json['last'] as num?)?.toInt(), + ); diff --git a/lib/data/mappers/characters_mapper.dart b/lib/data/mappers/characters_mapper.dart index 6e87319..49568f7 100644 --- a/lib/data/mappers/characters_mapper.dart +++ b/lib/data/mappers/characters_mapper.dart @@ -1,9 +1,17 @@ import 'package:pmu/data/dtos/characters_dto.dart'; import 'package:pmu/domain/models/card.dart'; +import '../../domain/models/home.dart'; const _imagePlaceholder = 'https://upload.wikimedia.org/wikipedia/en/archive/b/b1/20210811082420%21Portrait_placeholder.png'; +extension CharactersDtoToModel on CharactersDto { + HomeData toDomain() => HomeData( + data: data?.map((e) => e.toDomain()).toList(), + nextPage: meta?.pagination?.next, + ); +} + extension CharacterDataDtoToModel on CharacterDataDto { CardData toDomain() => CardData( attributes?.name ?? 'UNKNOWN', diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart index 696a971..a1fc369 100644 --- a/lib/data/repositories/api_interface.dart +++ b/lib/data/repositories/api_interface.dart @@ -1,7 +1,8 @@ import 'package:pmu/domain/models/card.dart'; +import 'package:pmu/domain/models/home.dart'; typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { - Future?> loadData({OnErrorCallback? onError}); + Future loadData({OnErrorCallback? onError}); } \ No newline at end of file diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart index 5bda3e8..a8b07f2 100644 --- a/lib/data/repositories/mock_repository.dart +++ b/lib/data/repositories/mock_repository.dart @@ -1,67 +1,33 @@ import 'package:flutter/material.dart'; import 'package:pmu/data/repositories/api_interface.dart'; import 'package:pmu/domain/models/card.dart'; +import 'package:pmu/domain/models/home.dart'; class MockRepository extends ApiInterface { @override - Future?> loadData({OnErrorCallback? onError}) async { - return [ - CardData( - 'собирается к первой паре', - descriptionText: 'надел носочек и думает о смысле жизни', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/564x/7d/87/eb/7d87eb75ac6fcb46beabc5cb388c7d34.jpg', - ), - CardData( - 'уснул за завтраком', - descriptionText: 'всю ночь делал лабы....а кто не делал?', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/564x/c5/30/b6/c530b6de14c58fd8f56ec28dac9376c9.jpg', - ), - CardData( - 'едет к первой паре', - descriptionText: '(спит)', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/564x/b2/af/d9/b2afd919443c31d2d309a1c67b11930e.jpg', - ), - CardData( - 'довольный', - descriptionText: 'пришел в столовку строилки', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/736x/a3/12/0f/a3120feb082602247d5ab6d66bf2db61.jpg', - ), - CardData( - 'делает лабы ночью', - descriptionText: 'опять... ну ничему жизнь не учит', - icon: Icons.favorite, - imageUrl: - 'https://sun9-69.userapi.com/impg/MLc9nPmTUsLHA3Q53nqxz8tao0oyQ_5dGWidNQ/cXmzhWa97Qc.jpg?size=421x421&quality=95&sign=04c80f2ff2a43ff5b936190987e591e5&type=album', - ), - CardData( - 'всё бросил и уехал в саратов', - descriptionText: 'я ему завидую', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/564x/d4/25/fb/d425fb23ef181e36ad93d7c8c7f7292e.jpg', - ), - CardData( - 'кушоет арбуз', - descriptionText: 'и никакой депрессии!', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/736x/cc/e4/38/cce4384798b795b8d69e9caa8bf02c46.jpg', - ), - CardData( - 'ой, а этот как сюда попал?', - descriptionText: 'отвернитесь, он стесняется', - icon: Icons.favorite, - imageUrl: - 'https://i.pinimg.com/736x/64/33/86/6433869ef972b167fb43cf74e0ad40aa.jpg', - ), - ]; + Future loadData({OnErrorCallback? onError}) async { + return HomeData( + data: [ + CardData( + 'Freeze', + descriptionText: 'so cold..', + imageUrl: + 'https://www.skedaddlewildlife.com/wp-content/uploads/2018/09/depositphotos_22425309-stock-photo-a-lonely-raccoon-in-winter.jpg', + ), + CardData( + 'Hi', + descriptionText: 'pretty face', + icon: Icons.hail, + imageUrl: + 'https://www.thesprucepets.com/thmb/nKNaS4I586B_H7sEUw9QAXvWM_0=/2121x0/filters:no_upscale():strip_icc()/GettyImages-135630198-5ba7d225c9e77c0050cff91b.jpg', + ), + CardData( + 'Orange', + descriptionText: 'I like autumn', + icon: Icons.warning_amber, + imageUrl: 'https://furmanagers.com/wp-content/uploads/2019/11/dreamstime_l_22075357.jpg', + ), + ], + ); } } \ No newline at end of file diff --git a/lib/data/repositories/potter_repository.dart b/lib/data/repositories/potter_repository.dart index 928f78c..c588706 100644 --- a/lib/data/repositories/potter_repository.dart +++ b/lib/data/repositories/potter_repository.dart @@ -4,6 +4,8 @@ import 'package:pmu/data/mappers/characters_mapper.dart'; import 'package:pmu/data/repositories/api_interface.dart'; import 'package:pmu/domain/models/card.dart'; import 'package:pretty_dio_logger/pretty_dio_logger.dart'; +import 'package:pmu/domain/models/home.dart'; +import 'package:pmu/presentation/home_page/bloc/events.dart'; class PotterRepository extends ApiInterface { static final Dio _dio = Dio() @@ -15,20 +17,29 @@ class PotterRepository extends ApiInterface { static const String _baseUrl = 'https://api.potterdb.com'; @override - Future?> loadData({String? q, OnErrorCallback? onError}) async { + Future loadData({ + OnErrorCallback? onError, + String? q, + int page = 1, + int pageSize = 5, + }) async { try { const String url = '$_baseUrl/v1/characters'; final Response response = await _dio.get>( url, - queryParameters: q != null ? {'filter[name_cont]': q} : null, + queryParameters: { + 'filter[name_cont]': q, + 'page[number]': page, + 'page[size]': pageSize, + }, ); final CharactersDto dto = CharactersDto.fromJson(response.data as Map); - final List? data = dto.data?.map((e) => e.toDomain()).toList(); + final HomeData data = dto.toDomain(); return data; } on DioException catch (e) { - onError?.call(e.response?.statusMessage); + onError?.call(e.error?.toString()); return null; } } diff --git a/lib/domain/models/home.dart b/lib/domain/models/home.dart new file mode 100644 index 0000000..4f1fbf6 --- /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}); +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index ceacd83..c350b03 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu/presentation/home_page/bloc/bloc.dart'; import 'package:pmu/presentation/home_page/home_page.dart'; +import 'data/repositories/potter_repository.dart'; void main() { runApp(const MyApp()); @@ -17,7 +20,15 @@ class MyApp extends StatelessWidget { colorScheme: ColorScheme.fromSeed(seedColor: Colors.orange), useMaterial3: true, ), - home: const MyHomePage(title: 'Сафиулова Камилия Наилевна'), + home: RepositoryProvider( + lazy: true, + create: (_) => PotterRepository(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage(title: 'Сафиулова Камилия Наилевна'), + ), + ), ); } } diff --git a/lib/presentation/home_page/bloc/bloc.dart b/lib/presentation/home_page/bloc/bloc.dart new file mode 100644 index 0000000..3c086e5 --- /dev/null +++ b/lib/presentation/home_page/bloc/bloc.dart @@ -0,0 +1,39 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu/data/repositories/potter_repository.dart'; +import 'package:pmu/presentation/home_page/bloc/events.dart'; +import 'package:pmu/presentation/home_page/bloc/state.dart'; + +class HomeBloc extends Bloc { + final PotterRepository 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, + )); + } +} \ No newline at end of file diff --git a/lib/presentation/home_page/bloc/events.dart b/lib/presentation/home_page/bloc/events.dart new file mode 100644 index 0000000..025c2b0 --- /dev/null +++ b/lib/presentation/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}); +} \ No newline at end of file diff --git a/lib/presentation/home_page/bloc/state.dart b/lib/presentation/home_page/bloc/state.dart new file mode 100644 index 0000000..b7d71b3 --- /dev/null +++ b/lib/presentation/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, + ]; +} \ No newline at end of file diff --git a/lib/presentation/home_page/bloc/state.g.dart b/lib/presentation/home_page/bloc/state.g.dart new file mode 100644 index 0000000..114ac25 --- /dev/null +++ b/lib/presentation/home_page/bloc/state.g.dart @@ -0,0 +1,92 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'state.dart'; + +// ************************************************************************** +// CopyWithGenerator +// ************************************************************************** + +abstract class _$HomeStateCWProxy { + HomeState data(HomeData? data); + + HomeState isLoading(bool isLoading); + + HomeState isPaginationLoading(bool isPaginationLoading); + + HomeState error(String? error); + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `HomeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// HomeState(...).copyWith(id: 12, name: "My name") + /// ```` + HomeState call({ + HomeData? data, + bool? isLoading, + bool? isPaginationLoading, + String? error, + }); +} + +/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfHomeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfHomeState.copyWith.fieldName(...)` +class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy { + const _$HomeStateCWProxyImpl(this._value); + + final HomeState _value; + + @override + HomeState data(HomeData? data) => this(data: data); + + @override + HomeState isLoading(bool isLoading) => this(isLoading: isLoading); + + @override + HomeState isPaginationLoading(bool isPaginationLoading) => + this(isPaginationLoading: isPaginationLoading); + + @override + HomeState error(String? error) => this(error: error); + + @override + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `HomeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// HomeState(...).copyWith(id: 12, name: "My name") + /// ```` + HomeState call({ + Object? data = const $CopyWithPlaceholder(), + Object? isLoading = const $CopyWithPlaceholder(), + Object? isPaginationLoading = const $CopyWithPlaceholder(), + Object? error = const $CopyWithPlaceholder(), + }) { + return HomeState( + data: data == const $CopyWithPlaceholder() + ? _value.data + // ignore: cast_nullable_to_non_nullable + : data as HomeData?, + isLoading: isLoading == const $CopyWithPlaceholder() || isLoading == null + ? _value.isLoading + // ignore: cast_nullable_to_non_nullable + : isLoading as bool, + isPaginationLoading: + isPaginationLoading == const $CopyWithPlaceholder() || + isPaginationLoading == null + ? _value.isPaginationLoading + // ignore: cast_nullable_to_non_nullable + : isPaginationLoading as bool, + error: error == const $CopyWithPlaceholder() + ? _value.error + // ignore: cast_nullable_to_non_nullable + : error as String?, + ); + } +} + +extension $HomeStateCopyWith on HomeState { + /// Returns a callable class that can be used as follows: `instanceOfHomeState.copyWith(...)` or like so:`instanceOfHomeState.copyWith.fieldName(...)`. + // ignore: library_private_types_in_public_api + _$HomeStateCWProxy get copyWith => _$HomeStateCWProxyImpl(this); +} diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 615e159..4eaddad 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,9 +1,15 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:pmu/domain/models/card.dart'; - -import '../details_page/details_page.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu/components/utils/debounce.dart'; import 'package:pmu/data/repositories/potter_repository.dart'; +import 'package:pmu/domain/models/card.dart'; +import 'package:pmu/main.dart'; +import 'package:pmu/presentation/details_page/details_page.dart'; +import 'package:pmu/presentation/home_page/bloc/bloc.dart'; +import 'package:pmu/presentation/home_page/bloc/events.dart'; +import 'package:pmu/presentation/home_page/bloc/state.dart'; + part 'card.dart'; class MyHomePage extends StatefulWidget { @@ -16,7 +22,6 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - @override Widget build(BuildContext context) { return const Scaffold(body: Body()); @@ -24,24 +29,46 @@ class _MyHomePageState extends State { } class Body extends StatefulWidget { - const Body({super.key}); + const Body(); @override - State createState() => _BodyState(); + State createState() => BodyState(); } -class _BodyState extends State { +class BodyState extends State { final searchController = TextEditingController(); - late Future?> data; - - final repo = PotterRepository(); + final scrollController = ScrollController(); @override void initState() { - data = repo.loadData(); + WidgetsBinding.instance.addPostFrameCallback((_) { + context.read().add(const HomeLoadDataEvent()); + }); + + 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) { return Padding( @@ -53,40 +80,55 @@ class _BodyState extends State { child: CupertinoSearchTextField( controller: searchController, onChanged: (search) { - setState(() { - data = repo.loadData(q: search); - }); + Debounce.run(() => context.read().add(HomeLoadDataEvent(search: search))); }, ), ), - Expanded( - child: Center( - child: FutureBuilder?>( - future: data, - builder: (context, snapshot) => SingleChildScrollView( - child: snapshot.hasData - ? Column( - mainAxisAlignment: MainAxisAlignment.center, - children: snapshot.data?.map((data) { - return _Card.fromData( - data, - onLike: (String title, bool isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ); - }).toList() ?? - [], - ) - : const CircularProgressIndicator(), + BlocBuilder( + builder: (context, state) => state.error != null + ? Text( + state.error ?? '', + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), + ) + : state.isLoading + ? const CircularProgressIndicator() + : 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: (title, isLiked) => + _showSnackBar(context, title, isLiked), + 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, @@ -101,9 +143,9 @@ class _BodyState extends State { '$title ${isLiked ? 'liked!' : 'disliked :('}', style: Theme.of(context).textTheme.bodyLarge, ), - backgroundColor: Colors.brown.shade300, + backgroundColor: Colors.orangeAccent, duration: const Duration(seconds: 1), )); }); } -} \ No newline at end of file +} diff --git a/pubspec.lock b/pubspec.lock index ee34858..66c079e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -38,6 +38,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: @@ -158,6 +166,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + 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: @@ -198,6 +222,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + equatable: + dependency: "direct main" + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" fake_async: dependency: transitive description: @@ -227,6 +259,14 @@ packages: 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_lints: dependency: "direct dev" description: @@ -392,6 +432,14 @@ packages: 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: @@ -424,6 +472,14 @@ packages: 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: diff --git a/pubspec.yaml b/pubspec.yaml index aca7ff3..e1520c6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,7 +33,9 @@ dependencies: json_annotation: ^4.8.1 dio: ^5.4.2+1 pretty_dio_logger: ^1.3.1 - + equatable: ^2.0.5 + flutter_bloc: ^8.1.5 + copy_with_extension_gen: ^5.0.4 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8