diff --git a/lib/components/utils/debounce.dart b/lib/components/utils/debounce.dart new file mode 100644 index 0000000..a28b3cc --- /dev/null +++ b/lib/components/utils/debounce.dart @@ -0,0 +1,18 @@ +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/characters_dto.dart b/lib/data/dtos/characters_dto.dart index 757ab27..adb13d4 100644 --- a/lib/data/dtos/characters_dto.dart +++ b/lib/data/dtos/characters_dto.dart @@ -6,7 +6,8 @@ part 'characters_dto.g.dart'; @JsonSerializable(createToJson: false) class CharactersDto{ final List? data; - const CharactersDto({this.data}); + final MetaDto? meta; + const CharactersDto({this.data, this.meta}); factory CharactersDto.fromJson(Map json) => _$CharactersDtoFromJson(json); } @@ -28,4 +29,24 @@ class CharasterAttributesDataDto{ const CharasterAttributesDataDto({this.name, this.born, this.died, this.image}); factory CharasterAttributesDataDto.fromJson(Map json) => _$CharasterAttributesDataDtoFromJson(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 43414bc..997f5d9 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) => CharactersDataDto.fromJson(e as Map)) .toList(), + meta: json['meta'] == null + ? null + : MetaDto.fromJson(json['meta'] as Map), ); CharactersDataDto _$CharactersDataDtoFromJson(Map json) => @@ -31,3 +34,16 @@ CharasterAttributesDataDto _$CharasterAttributesDataDtoFromJson( 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/mappes/characters_mapper.dart b/lib/data/mappes/characters_mapper.dart index 486ba5f..8f6ecb6 100644 --- a/lib/data/mappes/characters_mapper.dart +++ b/lib/data/mappes/characters_mapper.dart @@ -1,5 +1,6 @@ import 'package:pmd_lab/data/dtos/characters_dto.dart'; import 'package:pmd_lab/domain/models/card.dart'; +import 'package:pmd_lab/domain/models/home.dart'; const _imagePlaceholder = 'https://cdn-icons-png.flaticon.com/512/4054/4054617.png'; @@ -11,7 +12,6 @@ extension CharacterDataDtoToModel on CharactersDataDto { imgUrl: attributes?.image ?? _imagePlaceholder, description: _makeDescription(attributes?.born, attributes?.died), ); - String _makeDescription(String? born, String? died){ return born != null && died != null ? '$born - $died' @@ -21,4 +21,11 @@ extension CharacterDataDtoToModel on CharactersDataDto { ? 'died: $died' : ''; } -} \ No newline at end of file +} + +extension CharactersDtoToModel on CharactersDto { + HomeData toDomain() => HomeData( + data: data?.map((e) => e.toDomain()).toList(), + nextPage: meta?.pagination?.next, + ); +} 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 84be076..dafc92e 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:pmd_lab/presentation/home_page/bloc/bloc.dart'; import 'package:pmd_lab/presentation/home_page/home_page.dart'; +import 'package:pmd_lab/repositories/potter_repository.dart'; void main() { runApp(const MyApp()); @@ -16,7 +19,15 @@ class MyApp extends StatelessWidget { // colorScheme: ColorScheme.fromSeed(seedColor: Colors.black), colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), useMaterial3: true, ), - home: const MyHomePage(title: 'Flutter rocks!'), + home: RepositoryProvider( + lazy: true, + create: (_) => PotterRepository(), + child: BlocProvider( + lazy: true, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage(title: 'Potter API'), + ), + ) ); } } diff --git a/lib/presentation/home_page/bloc/bloc.dart b/lib/presentation/home_page/bloc/bloc.dart new file mode 100644 index 0000000..5024834 --- /dev/null +++ b/lib/presentation/home_page/bloc/bloc.dart @@ -0,0 +1,41 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd_lab/presentation/home_page/bloc/events.dart'; +import 'package:pmd_lab/presentation/home_page/bloc/state.dart'; +import 'package:pmd_lab/repositories/potter_repository.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, + )); + } + +} + diff --git a/lib/presentation/home_page/bloc/events.dart b/lib/presentation/home_page/bloc/events.dart new file mode 100644 index 0000000..26a31be --- /dev/null +++ b/lib/presentation/home_page/bloc/events.dart @@ -0,0 +1,11 @@ + +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..10269be --- /dev/null +++ b/lib/presentation/home_page/bloc/state.dart @@ -0,0 +1,44 @@ +import 'package:equatable/equatable.dart'; +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:pmd_lab/domain/models/card.dart'; +import 'package:pmd_lab/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, + }); + + HomeState copyWith({ + HomeData? data, + bool? isLoading, + bool? isPaginationLoading, + String? error, + }) => + HomeState( + data: data ?? this.data, + isLoading: isLoading ?? this.isLoading, + isPaginationLoading: isPaginationLoading ?? this.isPaginationLoading, + error: error ?? this.error, + ); + + @override + List get props => [ + data, + isLoading, + isPaginationLoading, + error, + ]; +} + + 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 c82fb52..60b4f4a 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,7 +1,12 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd_lab/components/utils/debounce.dart'; import 'package:pmd_lab/domain/models/card.dart'; import 'package:pmd_lab/presentation/details_page/details_page.dart'; +import 'package:pmd_lab/presentation/home_page/bloc/bloc.dart'; +import 'package:pmd_lab/presentation/home_page/bloc/events.dart'; +import 'package:pmd_lab/presentation/home_page/bloc/state.dart'; import 'package:pmd_lab/repositories/api_interface.dart'; import 'package:pmd_lab/repositories/mock_repository.dart'; import 'package:pmd_lab/repositories/potter_repository.dart'; @@ -74,14 +79,36 @@ class Body extends StatefulWidget { } class _BodyState extends State { + final searchController = TextEditingController(); + final scrollController = ScrollController(); final ApiInterface repo = PotterRepository(); - late Future?> data = repo.loadData(q: null); - final TextEditingController searchController = TextEditingController(); + late Future?> data; @override void initState() { + WidgetsBinding.instance.addPostFrameCallback((_) { + context.read().add(const HomeLoadDataEvent()); + }); + scrollController.addListener(_onNextPageListener); super.initState(); - data = repo.loadData(q: null); + } + 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 @@ -96,34 +123,43 @@ class _BodyState extends State { child: CupertinoSearchTextField( controller: searchController, onChanged: (search) { - setState(() { - data = repo.loadData(q: search.isNotEmpty ? search : null); - }); + Debounce.run(() => context.read().add(HomeLoadDataEvent(search: search))); }, ), ), - Expanded( - child: FutureBuilder?>( - future: data, - builder: (context, snapshot) => - SingleChildScrollView( - padding: const EdgeInsets.only( - left: 20, right: 20, top: 20), - child: snapshot.hasData - ? Column( - children: snapshot.data?.map((data) { - return _Card.fromData( - data, - onLike: (text, isLiked) => - _showSnackBar(context, text, isLiked), - onTap: () => _navToDetails(context, data), - ); - }).toList() ?? - [], + + 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( + 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 CircularProgressIndicator() - ), - ) + : const SizedBox.shrink(); + }, + ), // ListView.builder + ), // RefreshIndicator + ), // Expanded + ), // BlocBuilder + BlocBuilder( + builder: (context, state) => state.isPaginationLoading + ? const CircularProgressIndicator() + : const SizedBox.shrink(), ) ], ), @@ -152,5 +188,9 @@ class _BodyState extends State { ); } + Future _onRefresh() { + context.read().add(HomeLoadDataEvent(search: searchController.text)); + return Future.value(null); + } } \ No newline at end of file diff --git a/lib/repositories/api_interface.dart b/lib/repositories/api_interface.dart index 5cf45be..80ad162 100644 --- a/lib/repositories/api_interface.dart +++ b/lib/repositories/api_interface.dart @@ -1,5 +1,9 @@ -import 'package:pmd_lab/domain/models/card.dart'; + +import 'package:pmd_lab/domain/models/home.dart'; + +typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { - Future?> loadData({String? q}); -} \ No newline at end of file + Future loadData({OnErrorCallback? onError}); +} + diff --git a/lib/repositories/mock_repository.dart b/lib/repositories/mock_repository.dart index 6c91601..7d17dc0 100644 --- a/lib/repositories/mock_repository.dart +++ b/lib/repositories/mock_repository.dart @@ -1,28 +1,30 @@ +import 'package:pmd_lab/domain/models/home.dart'; import 'package:pmd_lab/repositories/api_interface.dart'; import 'package:pmd_lab/domain/models/card.dart'; class MockRepository extends ApiInterface { @override - Future ?> loadData({String? q}) async { - return [ - CardData( - 'Какая-то новость', - description: 'В данном блоке рекомендуем разместить краткую информацию', - imgUrl: - 'https://universal.revengel.ru/assets/cache_image/images/services/3_731x487_1cb.png', - ), - CardData( - 'Ещё какая-то новость', - description: 'В данном блоке рекомендуем разместить краткую информацию', - imgUrl: - "https://universal.revengel.ru/assets/cache_image/images/services/2_731x487_1cb.png", - ), - CardData( - 'Ещё одна новость', - description: 'В данном блоке рекомендуем разместить краткую информацию', - imgUrl: - "https://universal.revengel.ru/assets/cache_image/images/services/1_731x487_1cb.png", - ) - ]; + Future loadData({OnErrorCallback? onError}) async { + return HomeData(); + // return [ + // CardData( + // 'Какая-то новость', + // description: 'В данном блоке рекомендуем разместить краткую информацию', + // imgUrl: + // 'https://universal.revengel.ru/assets/cache_image/images/services/3_731x487_1cb.png', + // ), + // CardData( + // 'Ещё какая-то новость', + // description: 'В данном блоке рекомендуем разместить краткую информацию', + // imgUrl: + // "https://universal.revengel.ru/assets/cache_image/images/services/2_731x487_1cb.png", + // ), + // CardData( + // 'Ещё одна новость', + // description: 'В данном блоке рекомендуем разместить краткую информацию', + // imgUrl: + // "https://universal.revengel.ru/assets/cache_image/images/services/1_731x487_1cb.png", + // ) + //]; } } \ No newline at end of file diff --git a/lib/repositories/potter_repository.dart b/lib/repositories/potter_repository.dart index 139695d..7947c4f 100644 --- a/lib/repositories/potter_repository.dart +++ b/lib/repositories/potter_repository.dart @@ -4,6 +4,7 @@ import 'package:dio/dio.dart'; import 'package:pmd_lab/data/dtos/characters_dto.dart'; import 'package:pmd_lab/data/mappes/characters_mapper.dart'; import 'package:pmd_lab/domain/models/card.dart'; +import 'package:pmd_lab/domain/models/home.dart'; import 'package:pmd_lab/repositories/api_interface.dart'; import 'package:pretty_dio_logger/pretty_dio_logger.dart'; @@ -17,22 +18,30 @@ class PotterRepository extends ApiInterface{ static const String _baseUrl = 'https://api.potterdb.com'; @override - Future?> loadData({String? q}) async { - try{ + Future loadData({ + OnErrorCallback? onError, + String? q, + int page = 1, + int pageSize = 25, + }) 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) { - log("DioException: $e"); + } on DioException catch (e) { + onError?.call(e.error?.toString()); return null; } } diff --git a/pubspec.lock b/pubspec.lock index 5f86281..5864156 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.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: @@ -198,6 +222,14 @@ packages: 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: @@ -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 1b8c8c1..5dc6dd4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,9 @@ dependencies: 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 dev_dependencies: flutter_test: sdk: flutter