diff --git a/lib/data/dtos/pokemon_dto.dart b/lib/data/dtos/pokemon_dto.dart index fcbf468..b075ed1 100644 --- a/lib/data/dtos/pokemon_dto.dart +++ b/lib/data/dtos/pokemon_dto.dart @@ -23,6 +23,7 @@ class PokemonDataDto { final List? evolvesTo; final List? abilities; final PokemonImagesDto? images; + final String? artist; const PokemonDataDto({ this.id, @@ -31,6 +32,7 @@ class PokemonDataDto { this.evolvesTo, this.abilities, this.images, + this.artist, }); factory PokemonDataDto.fromJson(Map json) => _$PokemonDataDtoFromJson(json); diff --git a/lib/data/dtos/pokemon_dto.g.dart b/lib/data/dtos/pokemon_dto.g.dart index d5b37cf..f120cf5 100644 --- a/lib/data/dtos/pokemon_dto.g.dart +++ b/lib/data/dtos/pokemon_dto.g.dart @@ -30,6 +30,7 @@ PokemonDataDto _$PokemonDataDtoFromJson(Map json) => images: json['images'] == null ? null : PokemonImagesDto.fromJson(json['images'] as Map), + artist: json['artist'] as String?, ); PokemonAbilityDto _$PokemonAbilityDtoFromJson(Map json) => diff --git a/lib/data/mappers/pokemon_mapper.dart b/lib/data/mappers/pokemon_mapper.dart index 22ddd16..a73a90a 100644 --- a/lib/data/mappers/pokemon_mapper.dart +++ b/lib/data/mappers/pokemon_mapper.dart @@ -17,7 +17,7 @@ extension PokemonDataDtoToModel on PokemonDataDto { CardData toDomain() => CardData( name ?? 'UNKNOWN', imageUrl: images?.large ?? _imagePlaceholder, - descriptionText: _makeDescriptionText(types, evolvesTo, abilities), + descriptionText: _makeDescriptionText(types, evolvesTo, abilities, artist), id: id, ); @@ -25,15 +25,18 @@ extension PokemonDataDtoToModel on PokemonDataDto { List? types, List? evolvesTo, List? abilities, + String? artist, ) { final typeText = types != null && types.isNotEmpty ? 'Types: ${types.join(", ")}' : ''; final evolvesToText = evolvesTo != null && evolvesTo.isNotEmpty ? 'Evolves To: ${evolvesTo.join(", ")}' : ''; final abilitiesText = abilities != null && abilities.isNotEmpty ? 'Abilities: ${abilities.map((a) => a.name).join(", ")}' : ''; + final artistText = artist != null ? 'Artist: $artist' : ''; return [ typeText, evolvesToText, abilitiesText, + artistText, ].where((text) => text.isNotEmpty).join('\n'); } } \ No newline at end of file diff --git a/lib/data/repositories/pokemon_repository.dart b/lib/data/repositories/pokemon_repository.dart index 5fdf60c..c3f52d0 100644 --- a/lib/data/repositories/pokemon_repository.dart +++ b/lib/data/repositories/pokemon_repository.dart @@ -30,7 +30,7 @@ class PokemonRepository extends ApiInterface { }; if (q != null) { - queryParameters['q'] = 'name:$q*'; + queryParameters['q'] = 'name:*$q*'; } final Response response = await _dio.get>(