diff --git a/lib/components/utils/debounce.dart b/lib/components/utils/debounce.dart new file mode 100644 index 0000000..9257275 --- /dev/null +++ b/lib/components/utils/debounce.dart @@ -0,0 +1,20 @@ +import 'dart:ui'; +import 'dart:async'; + +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/players_dto.dart b/lib/data/dtos/players_dto.dart index a75436f..9028a18 100644 --- a/lib/data/dtos/players_dto.dart +++ b/lib/data/dtos/players_dto.dart @@ -5,8 +5,12 @@ part 'players_dto.g.dart'; @JsonSerializable(createToJson: false) class PlayersDto { final List? items; + final PaginationDto? pagination; - const PlayersDto({this.items}); + const PlayersDto({ + this.items, + this.pagination, + }); factory PlayersDto.fromJson(Map json) => _$PlayersDtoFromJson(json); } @@ -58,4 +62,13 @@ class PlayerPositionDataDto { const PlayerPositionDataDto(this.label); factory PlayerPositionDataDto.fromJson(Map json) => _$PlayerPositionDataDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class PaginationDto { + final int? offset; + + const PaginationDto({this.offset}); + + factory PaginationDto.fromJson(Map json) => _$PaginationDtoFromJson(json); } \ No newline at end of file diff --git a/lib/data/dtos/players_dto.g.dart b/lib/data/dtos/players_dto.g.dart index 80021da..4012ae2 100644 --- a/lib/data/dtos/players_dto.g.dart +++ b/lib/data/dtos/players_dto.g.dart @@ -10,6 +10,9 @@ PlayersDto _$PlayersDtoFromJson(Map json) => PlayersDto( items: (json['items'] as List?) ?.map((e) => PlayerDataDto.fromJson(e as Map)) .toList(), + pagination: json['pagination'] == null + ? null + : PaginationDto.fromJson(json['pagination'] as Map), ); PlayerDataDto _$PlayerDataDtoFromJson(Map json) => @@ -54,3 +57,8 @@ PlayerPositionDataDto _$PlayerPositionDataDtoFromJson( PlayerPositionDataDto( json['label'] as String?, ); + +PaginationDto _$PaginationDtoFromJson(Map json) => + PaginationDto( + offset: (json['offset'] as num?)?.toInt(), + ); diff --git a/lib/data/mappers/players_mapper.dart b/lib/data/mappers/players_mapper.dart index dd1f523..06abbd6 100644 --- a/lib/data/mappers/players_mapper.dart +++ b/lib/data/mappers/players_mapper.dart @@ -1,5 +1,6 @@ import 'package:untitled/data/dtos/players_dto.dart'; import 'package:untitled/domain/models/card.dart'; +import 'package:untitled/domain/models/home.dart'; extension PlayerDataDtoToModel on PlayerDataDto { CardData toDomain() => CardData( @@ -7,4 +8,11 @@ extension PlayerDataDtoToModel on PlayerDataDto { imageUrl: shieldUrl, descriptionText: 'Rating: $overallRating', ); +} + +extension PlayersDtoToModel on PlayersDto { + HomeData toDomain() => HomeData( + data: items?.map((e) => e.toDomain()).toList(), + nextPage: pagination?.offset! + 1, + ); } \ No newline at end of file diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart index cb85c95..cdefa7b 100644 --- a/lib/data/repositories/api_interface.dart +++ b/lib/data/repositories/api_interface.dart @@ -1,5 +1,8 @@ import 'package:untitled/domain/models/card.dart'; +import 'package:untitled/domain/models/home.dart'; + +typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { - Future?> loadData(); + 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 c633560..937e34a 100644 --- a/lib/data/repositories/mock_repository.dart +++ b/lib/data/repositories/mock_repository.dart @@ -1,12 +1,13 @@ import 'package:flutter/material.dart'; import 'package:untitled/domain/models/card.dart'; +import 'package:untitled/domain/models/home.dart'; import 'api_interface.dart'; class MockRepository extends ApiInterface { @override - Future?> loadData() async { - return [ + Future loadData({OnErrorCallback? onError}) async { + return HomeData(data:[ const CardData( 'Freeze', descriptionText: 'lol', @@ -27,6 +28,6 @@ class MockRepository extends ApiInterface { imageUrl: 'https://us-tuna-sounds-images.voicemod.net/1871fd78-7359-4b9e-8e65-957cc1d35de5-1692182201559.jpg', ), - ]; + ]); } } \ No newline at end of file diff --git a/lib/data/repositories/player_repository.dart b/lib/data/repositories/player_repository.dart index d5f4ac8..74b52cf 100644 --- a/lib/data/repositories/player_repository.dart +++ b/lib/data/repositories/player_repository.dart @@ -4,6 +4,7 @@ import 'package:untitled/data/dtos/players_dto.dart'; import 'package:untitled/data/mappers/players_mapper.dart'; import 'package:untitled/data/repositories/api_interface.dart'; import 'package:untitled/domain/models/card.dart'; +import 'package:untitled/domain/models/home.dart'; class PlayerRepository extends ApiInterface { static final Dio _dio = Dio() @@ -15,10 +16,15 @@ class PlayerRepository extends ApiInterface { static const String _baseUrl = 'https://drop-api.ea.com'; @override - Future?> loadData({String? q}) async { + Future loadData({ + OnErrorCallback? onError, + String? q, + int offset = 0, + int limit = 10, + }) async { try { const String url = '$_baseUrl/rating/ea-sports-fc'; - Map query = {'offset': 0, 'limit': 10}; + Map query = {'offset': offset, 'limit': limit}; if (q != null) { if(q.length >= 3) { query['search'] = q; @@ -27,10 +33,10 @@ class PlayerRepository extends ApiInterface { final Response response = await _dio.get>(url, queryParameters: query); final PlayersDto dto = PlayersDto.fromJson(response.data as Map); - final List? data = dto.items?.map((e) => e.toDomain()).toList(); + final HomeData data = dto.toDomain(); return data; } on DioException catch (e) { - // todo + 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..7ab6b1f --- /dev/null +++ b/lib/domain/models/home.dart @@ -0,0 +1,8 @@ +import 'package:untitled/domain/models/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 f5c2303..44a1add 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:untitled/data/repositories/player_repository.dart'; +import 'package:untitled/presentation/home_page/bloc/bloc.dart'; import 'package:untitled/presentation/home_page/home_page.dart'; void main() { @@ -17,7 +20,15 @@ class MyApp extends StatelessWidget { colorScheme: ColorScheme.fromSeed(seedColor: Colors.white), useMaterial3: true, ), - home: const MyHomePage(title: 'Блохин Дмитрий Алексеевич'), + home: RepositoryProvider( + lazy: true, + create: (_) => PlayerRepository(), + 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..2fcb232 --- /dev/null +++ b/lib/presentation/home_page/bloc/bloc.dart @@ -0,0 +1,39 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:untitled/data/repositories/player_repository.dart'; +import 'package:untitled/presentation/home_page/bloc/events.dart'; +import 'package:untitled/presentation/home_page/bloc/state.dart'; + +class HomeBloc extends Bloc { + final PlayerRepository repo; + + HomeBloc(this.repo) : super(const HomeState()) { + on(_onLoadData); + } + + void _onLoadData(HomeLoadDataEvent event, Emitter emit) async { + if (event.offset == null) { + emit(state.copyWith(isLoading: true)); + } else { + emit(state.copyWith(isPaginationLoading: true)); + } + + String? error; + + final data = await repo.loadData( + q: event.search, + offset: event.offset ?? 0, + onError: (e) => error = e, + ); + + if (event.offset != 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..f9f0895 --- /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? offset; + + const HomeLoadDataEvent({this.search, this.offset}); +} \ 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..3a8e90d --- /dev/null +++ b/lib/presentation/home_page/bloc/state.dart @@ -0,0 +1,41 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; +import 'package:untitled/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, + ]; +} \ 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 b0b4ecc..92359a7 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,8 +1,14 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:untitled/components/utils/debounce.dart'; import 'package:untitled/data/repositories/player_repository.dart'; import 'package:untitled/domain/models/card.dart'; +import 'package:untitled/main.dart'; import 'package:untitled/presentation/details_page/details_page.dart'; +import 'package:untitled/presentation/home_page/bloc/bloc.dart'; +import 'package:untitled/presentation/home_page/bloc/events.dart'; +import 'package:untitled/presentation/home_page/bloc/state.dart'; part 'card.dart'; @@ -22,10 +28,7 @@ class _MyHomePageState extends State { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( 'Hello', - style: Theme - .of(context) - .textTheme - .bodyMedium, + style: Theme.of(context).textTheme.bodyMedium, ), backgroundColor: Colors.purple, duration: const Duration(seconds: 1), @@ -56,51 +59,90 @@ class WidgetBody extends StatefulWidget { class _WidgetBodyState extends State { final PlayerRepository repos = PlayerRepository(); final searchController = TextEditingController(); + final scrollController = ScrollController(); late Future?> data; @override void initState() { - data = repos.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, + offset: bloc.state.data?.nextPage, + )); + } + } + } + + @override + void dispose() { + searchController.dispose(); + super.dispose(); + } + @override Widget build(BuildContext context) { - return Center( - child: FutureBuilder?>( - future: data, - builder: (context, snapshot) => - SingleChildScrollView( - child: snapshot.hasData - ? Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ + return BlocBuilder( + builder: (context, state) => state.error != null + ? Text( + state.error ?? '', + style: Theme.of(context) + .textTheme + .headlineSmall + ?.copyWith(color: Colors.greenAccent), + ) + : state.isLoading + ? const CircularProgressIndicator() + : Column(children: [ Padding( - padding: const EdgeInsets.all(12), + padding: const EdgeInsets.all(8), child: CupertinoSearchTextField( controller: searchController, onChanged: (search) { - setState(() { - data = repos.loadData(q: search); - }); + Debounce.run(() => context + .read() + .add(HomeLoadDataEvent(search: search))); }, ), ), - ...snapshot.data?.map((data) { - return _Card.fromData( - data, - onLike: (String title, bool isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ); - }).toList() ?? - [], - ], - ) - : 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: (String title, bool isLiked) => + _showSnackBar( + context, title, isLiked), + onTap: () => _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }), + ), + ), + BlocBuilder( + builder: (context, state) => state.isPaginationLoading + ? const CircularProgressIndicator() + : const SizedBox.shrink(), + ) + ])); } void _navToDetails(BuildContext context, CardData data) { @@ -115,14 +157,18 @@ class _WidgetBodyState extends State { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( 'Ronaldo $title ${isLiked ? 'liked!' : 'dislaked'}', - style: Theme - .of(context) - .textTheme - .bodyLarge, + style: Theme.of(context).textTheme.bodyLarge, ), backgroundColor: Colors.green, duration: const Duration(seconds: 1), )); }); } + + Future _onRefresh() { + context + .read() + .add(HomeLoadDataEvent(search: searchController.text)); + return Future.value(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 e6650fc..cec3eee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,10 @@ dependencies: json_annotation: ^4.9.0 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 dev_dependencies: flutter_test: