From cdb75ec01b722575f605ce6d992192871553ffd4 Mon Sep 17 00:00:00 2001 From: Arkadiy Radaev Date: Thu, 19 Dec 2024 13:33:07 +0400 Subject: [PATCH] lab 7 done fix --- lib/components/locale/l10n/app_locale.dart | 2 +- lib/components/locale/l10n/app_locale_ru.dart | 2 +- lib/data/dtos/car_dto.dart | 8 +++++++- lib/data/dtos/car_dto.g.dart | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/components/locale/l10n/app_locale.dart b/lib/components/locale/l10n/app_locale.dart index 9d068fd..ed349f7 100644 --- a/lib/components/locale/l10n/app_locale.dart +++ b/lib/components/locale/l10n/app_locale.dart @@ -98,7 +98,7 @@ abstract class AppLocale { /// No description provided for @search. /// /// In ru, this message translates to: - /// **'Поиск по марке 🚗'** + /// **'Поиск по марке 🏎️'** String get search; /// No description provided for @liked. diff --git a/lib/components/locale/l10n/app_locale_ru.dart b/lib/components/locale/l10n/app_locale_ru.dart index 9a84efa..3e759f9 100644 --- a/lib/components/locale/l10n/app_locale_ru.dart +++ b/lib/components/locale/l10n/app_locale_ru.dart @@ -7,7 +7,7 @@ class AppLocaleRu extends AppLocale { AppLocaleRu([String locale = 'ru']) : super(locale); @override - String get search => 'Поиск по марке 🚗'; + String get search => 'Поиск по марке 🏎️'; @override String get liked => 'Респект! 🤑'; diff --git a/lib/data/dtos/car_dto.dart b/lib/data/dtos/car_dto.dart index cf75fd1..1e965d4 100644 --- a/lib/data/dtos/car_dto.dart +++ b/lib/data/dtos/car_dto.dart @@ -4,10 +4,16 @@ part 'car_dto.g.dart'; @JsonSerializable(createToJson: false) class CarDto { + @JsonKey(name: 'Count') + final int? count; + @JsonKey(name: 'Message') + final String? message; + @JsonKey(name: 'SearchCriteria') + final String? searchCriteria; @JsonKey(name: 'Results') final List? data; - const CarDto({this.data}); + const CarDto({this.data, this.count,this.message, this.searchCriteria}); factory CarDto.fromJson(Map json) => _$CarDtoFromJson(json); } diff --git a/lib/data/dtos/car_dto.g.dart b/lib/data/dtos/car_dto.g.dart index 2f1dc04..b5ead49 100644 --- a/lib/data/dtos/car_dto.g.dart +++ b/lib/data/dtos/car_dto.g.dart @@ -11,6 +11,9 @@ CarDto _$CarDtoFromJson(Map json) => CarDto( ?.map( (e) => CarAttributesResultDto.fromJson(e as Map)) .toList(), + count: (json['Count'] as num?)?.toInt(), + message: json['Message'] as String?, + searchCriteria: json['SearchCriteria'] as String?, ); CarAttributesResultDto _$CarAttributesResultDtoFromJson(