revengel66/PMD_labs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lab6 part 2 end

Browse Source
This commit is contained in:
revengel66 2024-12-17 11:50:32 +04:00
parent aa0c4a7f9d
commit 903878a412
14 changed files with 277 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/data/dtos/characters_dto.dart
View File

@ -6,7 +6,8 @@ part 'characters_dto.g.dart';
@JsonSerializable(createToJson: false)
class CharactersDto{
final List<CharactersDataDto>? data;
const CharactersDto({this.data});
final MetaDto? meta;
const CharactersDto({this.data, this.meta});
factory CharactersDto.fromJson(Map<String, dynamic> json) => _$CharactersDtoFromJson(json);
}
@ -28,4 +29,24 @@ class CharasterAttributesDataDto{
const CharasterAttributesDataDto({this.name, this.born, this.died, this.image});
factory CharasterAttributesDataDto.fromJson(Map<String, dynamic> json) => _$CharasterAttributesDataDtoFromJson(json);
}
@JsonSerializable(createToJson: false)
class MetaDto {
final PaginationDto? pagination;
const MetaDto({this.pagination});
factory MetaDto.fromJson(Map<String, dynamic> 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<String, dynamic> json) => _$PaginationDtoFromJson(json);
}

16
lib/data/dtos/characters_dto.g.dart
View File

@ -11,6 +11,9 @@ CharactersDto _$CharactersDtoFromJson(Map<String, dynamic> json) =>
data: (json['data'] as List<dynamic>?)
?.map((e) => CharactersDataDto.fromJson(e as Map<String, dynamic>))
.toList(),
meta: json['meta'] == null
? null
: MetaDto.fromJson(json['meta'] as Map<String, dynamic>),
);
CharactersDataDto _$CharactersDataDtoFromJson(Map<String, dynamic> json) =>
@ -31,3 +34,16 @@ CharasterAttributesDataDto _$CharasterAttributesDataDtoFromJson(
died: json['died'] as String?,
image: json['image'] as String?,
);
MetaDto _$MetaDtoFromJson(Map<String, dynamic> json) => MetaDto(
pagination: json['pagination'] == null
? null
: PaginationDto.fromJson(json['pagination'] as Map<String, dynamic>),
);
PaginationDto _$PaginationDtoFromJson(Map<String, dynamic> json) =>
PaginationDto(
current: (json['current'] as num?)?.toInt(),
next: (json['next'] as num?)?.toInt(),
last: (json['last'] as num?)?.toInt(),
);

11
lib/data/mappes/characters_mapper.dart
View File

@ -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'
: '';
}
}
}
extension CharactersDtoToModel on CharactersDto {
HomeData toDomain() => HomeData(
data: data?.map((e) => e.toDomain()).toList(),
nextPage: meta?.pagination?.next,
);
}

8
lib/domain/models/home.dart Normal file
View File

@ -0,0 +1,8 @@
import 'card.dart';
class HomeData {
final List<CardData>? data;
final int? nextPage;
HomeData({this.data, this.nextPage});
}

20
lib/presentation/home_page/bloc/bloc.dart
View File

@ -11,13 +11,29 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
}
Future<void> _onLoadData(HomeLoadDataEvent event, Emitter<HomeState> emit) async {
emit(state.copyWith(isLoading: true));
if (event.nextPage == null) {
emit(state.copyWith(isLoading: true));
} else {
emit(state.copyWith(isPaginationLoading: true));
}
final data = await repo.loadData(q: event.search);
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,
));
}

4
lib/presentation/home_page/bloc/events.dart
View File

@ -5,5 +5,7 @@ class HomeEvent {
class HomeLoadDataEvent extends HomeEvent{
final String? search;
const HomeLoadDataEvent({this.search});
final int? nextPage;
const HomeLoadDataEvent({this.search, this.nextPage});
}

18
lib/presentation/home_page/bloc/state.dart
View File

@ -1,29 +1,43 @@
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 List<CardData>? data;
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({
List<CardData>? data,
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<Object?> get props => [
data,
isLoading,
isPaginationLoading,
error,
];
}

92
lib/presentation/home_page/bloc/state.g.dart Normal file
View File

@ -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);
}

37
lib/presentation/home_page/home_page.dart
View File

@ -79,21 +79,35 @@ class Body extends StatefulWidget {
}
class _BodyState extends State<Body> {
final searchController = TextEditingController();
final scrollController = ScrollController();
final ApiInterface repo = PotterRepository();
late Future<List<CardData>?> data = repo.loadData(q: null);
final TextEditingController searchController = TextEditingController();
late Future<List<CardData>?> data;
@override
void initState() {
WidgetsBinding.instance.addPostFrameCallback((_) {
context.read<HomeBloc>().add(const HomeLoadDataEvent());
});
scrollController.addListener(_onNextPageListener);
super.initState();
}
void _onNextPageListener() {
if (scrollController.offset > scrollController.position.maxScrollExtent) {
final bloc = context.read<HomeBloc>();
if (!bloc.state.isPaginationLoading) {
bloc.add(HomeLoadDataEvent(
search: searchController.text,
nextPage: bloc.state.data?.nextPage,
));
}
}
}
@override
void dispose(){
searchController.dispose();
scrollController.dispose();
super.dispose();
}
@ -115,16 +129,21 @@ class _BodyState extends State<Body> {
),
BlocBuilder<HomeBloc, HomeState>(
builder: (context, state) => state.isLoading
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?.length ?? 0,
itemCount: state.data?.data?.length ?? 0,
itemBuilder: (context, index) {
final data = state.data?[index];
final data = state.data?.data?[index];
return data != null
? _Card.fromData(
data,
@ -137,7 +156,11 @@ class _BodyState extends State<Body> {
), // RefreshIndicator
), // Expanded
), // BlocBuilder
BlocBuilder<HomeBloc, HomeState>(
builder: (context, state) => state.isPaginationLoading
? const CircularProgressIndicator()
: const SizedBox.shrink(),
)
],
),
);

10
lib/repositories/api_interface.dart
View File

@ -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<List<CardData>?> loadData({String? q});
}
Future<HomeData?> loadData({OnErrorCallback? onError});
}

44
lib/repositories/mock_repository.dart
View File

@ -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 <List<CardData>?> 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 <HomeData?> 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",
// )
//];
}
}

23
lib/repositories/potter_repository.dart
View File

@ -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<List<CardData>?> loadData({String? q}) async {
try{
Future<HomeData?> loadData({
OnErrorCallback? onError,
String? q,
int page = 1,
int pageSize = 25,
}) async {
try {
const String url = '$_baseUrl/v1/characters';
final Response<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(
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<String, dynamic>);
final List<CardData>? 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;
}
}

16
pubspec.lock
View File

@ -166,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:

2
pubspec.yaml
View File

@ -41,7 +41,7 @@ dependencies:
equatable: ^2.0.5
flutter_bloc: ^8.1.5
copy_with_extension_gen: ^5.0.4
dev_dependencies:
flutter_test:
sdk: flutter