chubykina_polina/PIbd-32_Chubykina_P.P._mobilki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

не работает поиск :(((

Browse Source
This commit is contained in:
Полина Чубыкина 2024-11-18 13:20:53 +04:00
parent 6a63a40f22
commit 2d28208440
4 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/data/dtos/pokemon_dto.dart
View File

@ -24,31 +24,20 @@ class PokemonDataDto {
final String? name;
final String? url;
final String? imageUrl;
final PokemonDetailsDto? details;
final int? height; // Добавлено поле для роста
final int? weight; // Добавлено поле для веса
final List<AbilityDto>? abilities; // Добавлено поле для способностей
const PokemonDataDto({
this.name,
this.url,
this.imageUrl,
this.details,
});
factory PokemonDataDto.fromJson(Map<String, dynamic> json) => _$PokemonDataDtoFromJson(json);
}
@JsonSerializable(createToJson: false)
class PokemonDetailsDto {
final int? height;
final int? weight;
final List<AbilityDto>? abilities;
const PokemonDetailsDto({
this.height,
this.weight,
this.abilities,
});
factory PokemonDetailsDto.fromJson(Map<String, dynamic> json) => _$PokemonDetailsDtoFromJson(json);
factory PokemonDataDto.fromJson(Map<String, dynamic> json) => _$PokemonDataDtoFromJson(json);
}
@JsonSerializable(createToJson: false)

7
lib/data/dtos/pokemon_dto.g.dart
View File

@ -20,13 +20,6 @@ PokemonDataDto _$PokemonDataDtoFromJson(Map<String, dynamic> json) =>
name: json['name'] as String?,
url: json['url'] as String?,
imageUrl: json['imageUrl'] as String?,
details: json['details'] == null
? null
: PokemonDetailsDto.fromJson(json['details'] as Map<String, dynamic>),
);
PokemonDetailsDto _$PokemonDetailsDtoFromJson(Map<String, dynamic> json) =>
PokemonDetailsDto(
height: (json['height'] as num?)?.toInt(),
weight: (json['weight'] as num?)?.toInt(),
abilities: (json['abilities'] as List<dynamic>?)

9
lib/data/mappers/pokemon_mapper.dart
View File

@ -16,14 +16,7 @@ extension PokemonDataDtoToModel on PokemonDataDto {
CardData toDomain() => CardData(
name ?? 'UNKNOWN',
imageUrl: imageUrl ?? _imagePlaceholder,
descriptionText: details?.toDescriptionText() ?? 'ID: ${url?.split('/')[6] ?? 'UNKNOWN'}',
descriptionText: 'Height: ${height ?? 'UNKNOWN'} cm, Weight: ${weight ?? 'UNKNOWN'} g, Abilities: ${abilities?.map((ability) => ability.ability?.name ?? 'UNKNOWN').join(', ') ?? 'UNKNOWN'}',
id: url?.split('/')[6] ?? 'UNKNOWN',
);
}
extension PokemonDetailsDtoToModel on PokemonDetailsDto {
String toDescriptionText() {
final abilitiesText = abilities?.map((ability) => ability.ability?.name ?? 'UNKNOWN').join(', ') ?? 'UNKNOWN';
return 'Height: ${height ?? 'UNKNOWN'} cm, Weight: ${weight ?? 'UNKNOWN'} kg, Abilities: $abilitiesText';
}
}

32
lib/data/repositories/pokemon_repository.dart
View File

@ -18,11 +18,11 @@ class PokeRepository extends ApiInterface {
Future<HomeData?> loadData({
OnErrorCallback? onError,
String? q,
int page = 1,
int pageSize = 25,
int page = 0,
int pageSize = 10,
}) async {
try {
final String url = '$_baseUrl/pokemon';
String url = '$_baseUrl/pokemon';
final Map<String, dynamic> queryParameters = {
'offset': page,
@ -30,7 +30,7 @@ class PokeRepository extends ApiInterface {
};
if (q != null && q.isNotEmpty) {
queryParameters['name'] = q;
url = '$_baseUrl/pokemon/$q';
}
final Response<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(
@ -42,15 +42,29 @@ class PokeRepository extends ApiInterface {
final List<PokemonDataDto> pokemonDataList = dto.results ?? [];
final List<PokemonDataDto> updatedPokemonDataList = await Future.wait(pokemonDataList.map((pokemonData) async {
final detailsUrl = 'https://pokeapi.co/api/v2/pokemon/${pokemonData.url?.split('/')[6]}';
final id = pokemonData.url?.split('/')[6];
final detailsUrl = 'https://pokeapi.co/api/v2/pokemon/$id';
final detailsResponse = await _dio.get<Map<dynamic, dynamic>>(detailsUrl);
final PokemonDetailsDto detailsDto = PokemonDetailsDto.fromJson(detailsResponse.data as Map<String, dynamic>);
final String imageUrl = 'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/${pokemonData.url?.split('/')[6]}.png';
final int height = detailsResponse.data?['height'];
final int weight = detailsResponse.data?['weight'];
final List<dynamic> abilities = detailsResponse.data?['abilities'];
final List<AbilityDto> abilityDtos = abilities.map((ability) {
return AbilityDto(
ability: AbilityDetailDto(
name: ability['ability']['name'],
),
);
}).toList();
return PokemonDataDto(
name: pokemonData.name,
url: pokemonData.url,
imageUrl: imageUrl,
details: detailsDto,
imageUrl: 'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/$id.png',
height: height,
weight: weight,
abilities: abilityDtos,
);
}));