From 6e60f76f2f920f140cd5341c0d91ca9d17daf0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Wed, 11 Dec 2024 04:57:28 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=205=20=D0=BB=D0=B0=D0=B1=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 26 ++ lib/data/dtos/user_dto.dart | 76 +++++ lib/data/dtos/user_dto.g.dart | 46 +++ lib/data/mappers/user_mapper.dart | 21 ++ lib/data/repositories/api_interface.dart | 5 + pubspec.lock | 397 +++++++++++++++++++++++ pubspec.yaml | 6 + 7 files changed, 577 insertions(+) create mode 100644 Makefile create mode 100644 lib/data/dtos/user_dto.dart create mode 100644 lib/data/dtos/user_dto.g.dart create mode 100644 lib/data/mappers/user_mapper.dart create mode 100644 lib/data/repositories/api_interface.dart diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..808a68a --- /dev/null +++ b/Makefile @@ -0,0 +1,26 @@ +# Устанавливаем переменную для команды flutter +FLUTTER = flutter + +# Команда для генерации кода с build_runner +gen: install-dependencies + $(FLUTTER) pub run build_runner build --delete-conflicting-outputs + +# Устанавливаем зависимости (если их нет) +install-dependencies: + $(FLUTTER) pub get + +# Очистка проекта (по желанию) +clean: + $(FLUTTER) clean + +# Для генерации кода с очисткой +clean-generate: clean generate + +# Отображение доступных команд +help: + @echo "Доступные команды:" + @echo " generate - Запуск генерации кода с build_runner" + @echo " install-dependencies - Установить зависимости" + @echo " clean - Очистить проект" + @echo " clean-generate - Очистка и генерация кода" + @echo " help - Показать эту справку" diff --git a/lib/data/dtos/user_dto.dart b/lib/data/dtos/user_dto.dart new file mode 100644 index 0000000..755cad5 --- /dev/null +++ b/lib/data/dtos/user_dto.dart @@ -0,0 +1,76 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'user_dto.g.dart'; + +@JsonSerializable(createToJson: false) +class UsersDto { + final List? items; + final int? count; + final int? limit; + final int? countAll; + final int? pagesCount; + final int? pageNumber; + final bool? hasPrevPage; + final bool? hasNextPage; + + const UsersDto( + {this.items, + this.count, + this.limit, + this.countAll, + this.pagesCount, + this.pageNumber, + this.hasPrevPage, + this.hasNextPage}); + + factory UsersDto.fromJson(Map json) => + _$UsersDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class UserDto { + final UserDataDto? model; + final int? age; + final double? distance; + + const UserDto({this.model, this.age, this.distance}); + + factory UserDto.fromJson(Map json) => + _$UserDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class LocationDto { + final double? lat; + final double? lon; + + const LocationDto({this.lat, this.lon}); + + factory LocationDto.fromJson(Map json) => + _$LocationDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class UserDataDto { + final int? id; + final String? name; + final String? surname; + final String? description; + final String? image; + final String? gender; + final String? dateOfBirth; + final LocationDto? location; + + const UserDataDto( + {this.id, + this.name, + this.surname, + this.description, + this.image, + this.gender, + this.dateOfBirth, + this.location}); + + factory UserDataDto.fromJson(Map json) => + _$UserDataDtoFromJson(json); +} diff --git a/lib/data/dtos/user_dto.g.dart b/lib/data/dtos/user_dto.g.dart new file mode 100644 index 0000000..0590f8a --- /dev/null +++ b/lib/data/dtos/user_dto.g.dart @@ -0,0 +1,46 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user_dto.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +UsersDto _$UsersDtoFromJson(Map json) => UsersDto( + items: (json['items'] as List?) + ?.map((e) => UserDto.fromJson(e as Map)) + .toList(), + count: (json['count'] as num?)?.toInt(), + limit: (json['limit'] as num?)?.toInt(), + countAll: (json['countAll'] as num?)?.toInt(), + pagesCount: (json['pagesCount'] as num?)?.toInt(), + pageNumber: (json['pageNumber'] as num?)?.toInt(), + hasPrevPage: json['hasPrevPage'] as bool?, + hasNextPage: json['hasNextPage'] as bool?, + ); + +UserDto _$UserDtoFromJson(Map json) => UserDto( + model: json['model'] == null + ? null + : UserDataDto.fromJson(json['model'] as Map), + age: (json['age'] as num?)?.toInt(), + distance: (json['distance'] as num?)?.toDouble(), + ); + +LocationDto _$LocationDtoFromJson(Map json) => LocationDto( + lat: (json['lat'] as num?)?.toDouble(), + lon: (json['lon'] as num?)?.toDouble(), + ); + +UserDataDto _$UserDataDtoFromJson(Map json) => UserDataDto( + id: (json['id'] as num?)?.toInt(), + name: json['name'] as String?, + surname: json['surname'] as String?, + description: json['description'] as String?, + image: json['image'] as String?, + gender: json['gender'] as String?, + dateOfBirth: json['dateOfBirth'] as String?, + location: json['location'] == null + ? null + : LocationDto.fromJson(json['location'] as Map), + ); diff --git a/lib/data/mappers/user_mapper.dart b/lib/data/mappers/user_mapper.dart new file mode 100644 index 0000000..01bfc36 --- /dev/null +++ b/lib/data/mappers/user_mapper.dart @@ -0,0 +1,21 @@ +import 'package:pmu/data/dtos/user_dto.dart'; + +import '../../domain/card.dart'; + +extension UserDataDtoToModel on UserDataDto { + CardPostData toDomain() { + const allowedExtensions = ['jpg', 'jpeg', 'gif']; + + bool isValidImageUrl(String? url) { + if (url == null) return false; + final extension = url.split('.').last.toLowerCase(); + return allowedExtensions.contains(extension); + } + + return CardPostData( + name ?? "", + description ?? "", + isValidImageUrl(image) ? image! : "https://placehold.co/480x640/png", + false); + } +} diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart new file mode 100644 index 0000000..3ab71e8 --- /dev/null +++ b/lib/data/repositories/api_interface.dart @@ -0,0 +1,5 @@ +import 'package:pmu/domain/card.dart'; + +abstract class ApiInterface { + Future?> loadData(); +} diff --git a/pubspec.lock b/pubspec.lock index b9fd799..23d7aac 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,35 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + url: "https://pub.dev" + source: hosted + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + url: "https://pub.dev" + source: hosted + version: "6.7.0" + args: + dependency: transitive + description: + name: args + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" + source: hosted + version: "2.6.0" async: dependency: transitive description: @@ -17,6 +46,70 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + url: "https://pub.dev" + source: hosted + version: "2.4.13" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + url: "https://pub.dev" + source: hosted + version: "7.3.2" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + url: "https://pub.dev" + source: hosted + version: "8.9.2" characters: dependency: transitive description: @@ -25,6 +118,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" clock: dependency: transitive description: @@ -33,6 +134,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + url: "https://pub.dev" + source: hosted + version: "4.10.1" collection: dependency: transitive description: @@ -41,6 +150,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + crypto: + dependency: transitive + description: + name: crypto + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" + source: hosted + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -49,6 +174,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + url: "https://pub.dev" + source: hosted + version: "2.3.7" + dio: + dependency: "direct main" + description: + name: dio + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + url: "https://pub.dev" + source: hosted + version: "5.7.0" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + url: "https://pub.dev" + source: hosted + version: "2.0.0" fake_async: dependency: transitive description: @@ -57,6 +206,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -75,6 +240,78 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + io: + dependency: transitive + description: + name: io + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + url: "https://pub.dev" + source: hosted + version: "1.0.5" + js: + dependency: transitive + description: + name: js + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + url: "https://pub.dev" + source: hosted + version: "0.7.1" + json_annotation: + dependency: "direct main" + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + json_serializable: + dependency: "direct dev" + description: + name: json_serializable + sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c + url: "https://pub.dev" + source: hosted + version: "6.9.0" leak_tracker: dependency: transitive description: @@ -107,6 +344,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -131,6 +384,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.15.0" + mime: + dependency: transitive + description: + name: mime + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" path: dependency: transitive description: @@ -139,11 +408,75 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + pretty_dio_logger: + dependency: "direct main" + description: + name: pretty_dio_logger + sha256: "36f2101299786d567869493e2f5731de61ce130faa14679473b26905a92b6407" + url: "https://pub.dev" + source: hosted + version: "1.4.0" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + url: "https://pub.dev" + source: hosted + version: "2.0.1" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + source_helper: + dependency: transitive + description: + name: source_helper + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" + source: hosted + version: "1.3.4" source_span: dependency: transitive description: @@ -168,6 +501,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" string_scanner: dependency: transitive description: @@ -192,6 +533,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.2" + timing: + dependency: transitive + description: + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" vector_math: dependency: transitive description: @@ -208,6 +565,46 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.5" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.5.3 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index c4dc87e..ba9bdf2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,6 +31,9 @@ dependencies: flutter: sdk: flutter + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 + json_annotation: ^4.8.1 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -40,6 +43,9 @@ dev_dependencies: flutter_test: sdk: flutter + build_runner: ^2.4.9 + json_serializable: ^6.7.1 + # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your From 5a97a3bb7f6396b22ccc9f799310eb3d6d1ba836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 13 Dec 2024 00:54:01 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BB=20DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/dto/page_dto.dart | 28 +++++++++++++ lib/data/dto/user_dto.dart | 32 +++++++++++++++ lib/data/dtos/user_dto.dart | 76 ----------------------------------- lib/data/dtos/user_dto.g.dart | 46 --------------------- 4 files changed, 60 insertions(+), 122 deletions(-) create mode 100644 lib/data/dto/page_dto.dart create mode 100644 lib/data/dto/user_dto.dart delete mode 100644 lib/data/dtos/user_dto.dart delete mode 100644 lib/data/dtos/user_dto.g.dart diff --git a/lib/data/dto/page_dto.dart b/lib/data/dto/page_dto.dart new file mode 100644 index 0000000..250a153 --- /dev/null +++ b/lib/data/dto/page_dto.dart @@ -0,0 +1,28 @@ +import 'package:json_annotation/json_annotation.dart'; + +@JsonSerializable(createToJson: false) +class PageDto { + final List items; + final int itemsCount; + final int totalItemsCount; + final int pageNumber; + final int itemsByPage; + final int? prevPageNumber; + final int? nextPageNumber; + final int firstPageNumber; + final int lastPageNumber; + + const PageDto( + {this.items, + this.itemsCount, + this.totalItemsCount, + this.pageNumber, + this.itemsByPage, + this.prevPageNumber, + this.nextPageNumber, + this.firstPageNumber, + this.lastPageNumber}); + + factory PageDto.fromJson(Map json) => + _$PageDtoFromJson(json); +} diff --git a/lib/data/dto/user_dto.dart b/lib/data/dto/user_dto.dart new file mode 100644 index 0000000..1014a4b --- /dev/null +++ b/lib/data/dto/user_dto.dart @@ -0,0 +1,32 @@ +import 'package:json_annotation/json_annotation.dart'; + +@JsonSerializable(createToJson: false) +class UserDto { + final int? id; + final String? name; + final String? surname; + final String? description; + final String? image; + final String? gender; + final String? dateOfBirth; + final double? lat; + final double? lon; + final int? age; + final double? distance; + + const UserDto( + {this.id, + this.name, + this.surname, + this.description, + this.image, + this.gender, + this.dateOfBirth, + this.lat, + this.lon, + this.age, + this.distance}); + + factory UserDto.fromJson(Map json) => + _$UserDtoFromJson(json); +} diff --git a/lib/data/dtos/user_dto.dart b/lib/data/dtos/user_dto.dart deleted file mode 100644 index 755cad5..0000000 --- a/lib/data/dtos/user_dto.dart +++ /dev/null @@ -1,76 +0,0 @@ -import 'package:json_annotation/json_annotation.dart'; - -part 'user_dto.g.dart'; - -@JsonSerializable(createToJson: false) -class UsersDto { - final List? items; - final int? count; - final int? limit; - final int? countAll; - final int? pagesCount; - final int? pageNumber; - final bool? hasPrevPage; - final bool? hasNextPage; - - const UsersDto( - {this.items, - this.count, - this.limit, - this.countAll, - this.pagesCount, - this.pageNumber, - this.hasPrevPage, - this.hasNextPage}); - - factory UsersDto.fromJson(Map json) => - _$UsersDtoFromJson(json); -} - -@JsonSerializable(createToJson: false) -class UserDto { - final UserDataDto? model; - final int? age; - final double? distance; - - const UserDto({this.model, this.age, this.distance}); - - factory UserDto.fromJson(Map json) => - _$UserDtoFromJson(json); -} - -@JsonSerializable(createToJson: false) -class LocationDto { - final double? lat; - final double? lon; - - const LocationDto({this.lat, this.lon}); - - factory LocationDto.fromJson(Map json) => - _$LocationDtoFromJson(json); -} - -@JsonSerializable(createToJson: false) -class UserDataDto { - final int? id; - final String? name; - final String? surname; - final String? description; - final String? image; - final String? gender; - final String? dateOfBirth; - final LocationDto? location; - - const UserDataDto( - {this.id, - this.name, - this.surname, - this.description, - this.image, - this.gender, - this.dateOfBirth, - this.location}); - - factory UserDataDto.fromJson(Map json) => - _$UserDataDtoFromJson(json); -} diff --git a/lib/data/dtos/user_dto.g.dart b/lib/data/dtos/user_dto.g.dart deleted file mode 100644 index 0590f8a..0000000 --- a/lib/data/dtos/user_dto.g.dart +++ /dev/null @@ -1,46 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'user_dto.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -UsersDto _$UsersDtoFromJson(Map json) => UsersDto( - items: (json['items'] as List?) - ?.map((e) => UserDto.fromJson(e as Map)) - .toList(), - count: (json['count'] as num?)?.toInt(), - limit: (json['limit'] as num?)?.toInt(), - countAll: (json['countAll'] as num?)?.toInt(), - pagesCount: (json['pagesCount'] as num?)?.toInt(), - pageNumber: (json['pageNumber'] as num?)?.toInt(), - hasPrevPage: json['hasPrevPage'] as bool?, - hasNextPage: json['hasNextPage'] as bool?, - ); - -UserDto _$UserDtoFromJson(Map json) => UserDto( - model: json['model'] == null - ? null - : UserDataDto.fromJson(json['model'] as Map), - age: (json['age'] as num?)?.toInt(), - distance: (json['distance'] as num?)?.toDouble(), - ); - -LocationDto _$LocationDtoFromJson(Map json) => LocationDto( - lat: (json['lat'] as num?)?.toDouble(), - lon: (json['lon'] as num?)?.toDouble(), - ); - -UserDataDto _$UserDataDtoFromJson(Map json) => UserDataDto( - id: (json['id'] as num?)?.toInt(), - name: json['name'] as String?, - surname: json['surname'] as String?, - description: json['description'] as String?, - image: json['image'] as String?, - gender: json['gender'] as String?, - dateOfBirth: json['dateOfBirth'] as String?, - location: json['location'] == null - ? null - : LocationDto.fromJson(json['location'] as Map), - ); From 12cf583b359f2f441f318a97df2fe6cf9bb64c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 13 Dec 2024 01:01:50 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D0=A1=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BC=D0=B0=D0=BF=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8B=20DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/dto/page_dto.dart | 17 ++++++++++------- lib/data/dto/page_dto.g.dart | 21 +++++++++++++++++++++ lib/data/dto/user_dto.dart | 2 ++ lib/data/dto/user_dto.g.dart | 21 +++++++++++++++++++++ lib/data/mappers/user_mapper.dart | 7 +++---- 5 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 lib/data/dto/page_dto.g.dart create mode 100644 lib/data/dto/user_dto.g.dart diff --git a/lib/data/dto/page_dto.dart b/lib/data/dto/page_dto.dart index 250a153..466d4cb 100644 --- a/lib/data/dto/page_dto.dart +++ b/lib/data/dto/page_dto.dart @@ -1,16 +1,19 @@ import 'package:json_annotation/json_annotation.dart'; +import 'package:pmu/data/dto/user_dto.dart'; + +part 'page_dto.g.dart'; @JsonSerializable(createToJson: false) class PageDto { - final List items; - final int itemsCount; - final int totalItemsCount; - final int pageNumber; - final int itemsByPage; + final List? items; + final int? itemsCount; + final int? totalItemsCount; + final int? pageNumber; + final int? itemsByPage; final int? prevPageNumber; final int? nextPageNumber; - final int firstPageNumber; - final int lastPageNumber; + final int? firstPageNumber; + final int? lastPageNumber; const PageDto( {this.items, diff --git a/lib/data/dto/page_dto.g.dart b/lib/data/dto/page_dto.g.dart new file mode 100644 index 0000000..134b70f --- /dev/null +++ b/lib/data/dto/page_dto.g.dart @@ -0,0 +1,21 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'page_dto.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +PageDto _$PageDtoFromJson(Map json) => PageDto( + items: (json['items'] as List?) + ?.map((e) => UserDto.fromJson(e as Map)) + .toList(), + itemsCount: (json['itemsCount'] as num?)?.toInt(), + totalItemsCount: (json['totalItemsCount'] as num?)?.toInt(), + pageNumber: (json['pageNumber'] as num?)?.toInt(), + itemsByPage: (json['itemsByPage'] as num?)?.toInt(), + prevPageNumber: (json['prevPageNumber'] as num?)?.toInt(), + nextPageNumber: (json['nextPageNumber'] as num?)?.toInt(), + firstPageNumber: (json['firstPageNumber'] as num?)?.toInt(), + lastPageNumber: (json['lastPageNumber'] as num?)?.toInt(), + ); diff --git a/lib/data/dto/user_dto.dart b/lib/data/dto/user_dto.dart index 1014a4b..7d8bd25 100644 --- a/lib/data/dto/user_dto.dart +++ b/lib/data/dto/user_dto.dart @@ -1,5 +1,7 @@ import 'package:json_annotation/json_annotation.dart'; +part 'user_dto.g.dart'; + @JsonSerializable(createToJson: false) class UserDto { final int? id; diff --git a/lib/data/dto/user_dto.g.dart b/lib/data/dto/user_dto.g.dart new file mode 100644 index 0000000..635337f --- /dev/null +++ b/lib/data/dto/user_dto.g.dart @@ -0,0 +1,21 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user_dto.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +UserDto _$UserDtoFromJson(Map json) => UserDto( + id: (json['id'] as num?)?.toInt(), + name: json['name'] as String?, + surname: json['surname'] as String?, + description: json['description'] as String?, + image: json['image'] as String?, + gender: json['gender'] as String?, + dateOfBirth: json['dateOfBirth'] as String?, + lat: (json['lat'] as num?)?.toDouble(), + lon: (json['lon'] as num?)?.toDouble(), + age: (json['age'] as num?)?.toInt(), + distance: (json['distance'] as num?)?.toDouble(), + ); diff --git a/lib/data/mappers/user_mapper.dart b/lib/data/mappers/user_mapper.dart index 01bfc36..a534764 100644 --- a/lib/data/mappers/user_mapper.dart +++ b/lib/data/mappers/user_mapper.dart @@ -1,8 +1,7 @@ -import 'package:pmu/data/dtos/user_dto.dart'; +import 'package:pmu/data/dto/user_dto.dart'; +import 'package:pmu/domain/card.dart'; -import '../../domain/card.dart'; - -extension UserDataDtoToModel on UserDataDto { +extension UserDtoToModel on UserDto { CardPostData toDomain() { const allowedExtensions = ['jpg', 'jpeg', 'gif']; From 19f937922f58cb458913b74f7053bae9b98f5b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 13 Dec 2024 01:30:41 +0400 Subject: [PATCH 4/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20mock=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/mock_user_repository.dart | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 lib/data/repositories/mock_user_repository.dart diff --git a/lib/data/repositories/mock_user_repository.dart b/lib/data/repositories/mock_user_repository.dart new file mode 100644 index 0000000..dc924a0 --- /dev/null +++ b/lib/data/repositories/mock_user_repository.dart @@ -0,0 +1,90 @@ +import 'package:pmu/data/repositories/api_interface.dart'; +import 'package:pmu/domain/card.dart'; + +class MockUserRepository extends ApiInterface { + @override + Future?> loadData() async { + return [ + const CardPostData( + name: "Марьяна", + surname: "Ро", + description: "Люблю вечерами погамать в майн", + imageUrl: "https://placehold.co/600x400/png", + age: 21, + distance: 24.5, + isLiked: false), + const CardPostData( + name: "Константин", + surname: "Злобин", + description: "Веду канал в тг про криптожизнь", + imageUrl: "https://placehold.co/600x400/png", + age: 24, + distance: 478.3, + isLiked: false), + const CardPostData( + name: "Марьяна", + surname: "Ро", + description: "Люблю вечерами погамать в майн", + imageUrl: "https://placehold.co/600x400/png", + age: 21, + distance: 24.5, + isLiked: false), + const CardPostData( + name: "Константин", + surname: "Злобин", + description: "Веду канал в тг про криптожизнь", + imageUrl: "https://placehold.co/600x400/png", + age: 24, + distance: 478.3, + isLiked: false), + const CardPostData( + name: "Марьяна", + surname: "Ро", + description: "Люблю вечерами погамать в майн", + imageUrl: "https://placehold.co/600x400/png", + age: 21, + distance: 24.5, + isLiked: false), + const CardPostData( + name: "Константин", + surname: "Злобин", + description: "Веду канал в тг про криптожизнь", + imageUrl: "https://placehold.co/600x400/png", + age: 24, + distance: 478.3, + isLiked: false), + const CardPostData( + name: "Марьяна", + surname: "Ро", + description: "Люблю вечерами погамать в майн", + imageUrl: "https://placehold.co/600x400/png", + age: 21, + distance: 24.5, + isLiked: false), + const CardPostData( + name: "Константин", + surname: "Злобин", + description: "Веду канал в тг про криптожизнь", + imageUrl: "https://placehold.co/600x400/png", + age: 24, + distance: 478.3, + isLiked: false), + const CardPostData( + name: "Марьяна", + surname: "Ро", + description: "Люблю вечерами погамать в майн", + imageUrl: "https://placehold.co/600x400/png", + age: 21, + distance: 24.5, + isLiked: false), + const CardPostData( + name: "Константин", + surname: "Злобин", + description: "Веду канал в тг про криптожизнь", + imageUrl: "https://placehold.co/600x400/png", + age: 24, + distance: 478.3, + isLiked: false) + ]; + } +} From 8083c2367fb3d0f8fcffa2629980c137b8e26e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 13 Dec 2024 03:03:08 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=205=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/mappers/user_mapper.dart | 16 +++-- .../repositories/api_user_repository.dart | 30 +++++++++ .../repositories/mock_user_repository.dart | 64 ------------------- lib/domain/card.dart | 18 ++++-- .../detail_pages/card_detail_page.dart | 4 +- lib/presentation/home_page/card.dart | 33 +++++++--- lib/presentation/home_page/home_page.dart | 50 ++++++--------- 7 files changed, 101 insertions(+), 114 deletions(-) create mode 100644 lib/data/repositories/api_user_repository.dart diff --git a/lib/data/mappers/user_mapper.dart b/lib/data/mappers/user_mapper.dart index a534764..786cde9 100644 --- a/lib/data/mappers/user_mapper.dart +++ b/lib/data/mappers/user_mapper.dart @@ -12,9 +12,17 @@ extension UserDtoToModel on UserDto { } return CardPostData( - name ?? "", - description ?? "", - isValidImageUrl(image) ? image! : "https://placehold.co/480x640/png", - false); + name: name ?? "", + surname: surname ?? "", + description: description ?? "", + imageUrl: isValidImageUrl(image) + ? image + : (gender! == "male" + ? "https://avatar.iran.liara.run/public/boy" + : "https://avatar.iran.liara.run/public/girl") + .toString(), + isLiked: false, + age: age, + distance: distance); } } diff --git a/lib/data/repositories/api_user_repository.dart b/lib/data/repositories/api_user_repository.dart new file mode 100644 index 0000000..ef69560 --- /dev/null +++ b/lib/data/repositories/api_user_repository.dart @@ -0,0 +1,30 @@ +import 'package:pmu/data/dto/page_dto.dart'; +import 'package:pmu/data/dto/user_dto.dart'; +import 'package:pmu/data/mappers/user_mapper.dart'; +import 'package:pmu/data/repositories/api_interface.dart'; +import 'package:pmu/domain/card.dart'; +import 'package:dio/dio.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; + +class ApiUserRepository extends ApiInterface { + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger(requestHeader: true, requestBody: true)); + static const String _baseUrl = + 'http://lovesearch-api.nspotapov.ru/api/users/'; + + @override + Future?> loadData() async { + const String url = _baseUrl; + final List data = []; + final Response response = + await _dio.get>(url); + final PageDto pageDto = + PageDto.fromJson(response.data as Map); + int itemsCount = pageDto.itemsCount ?? 0; + for (int i = 0; i < itemsCount; i++) { + final CardPostData cardPost = pageDto.items![i].toDomain(); + data.add(cardPost); + } + return data; + } +} diff --git a/lib/data/repositories/mock_user_repository.dart b/lib/data/repositories/mock_user_repository.dart index dc924a0..76268d8 100644 --- a/lib/data/repositories/mock_user_repository.dart +++ b/lib/data/repositories/mock_user_repository.dart @@ -5,70 +5,6 @@ class MockUserRepository extends ApiInterface { @override Future?> loadData() async { return [ - const CardPostData( - name: "Марьяна", - surname: "Ро", - description: "Люблю вечерами погамать в майн", - imageUrl: "https://placehold.co/600x400/png", - age: 21, - distance: 24.5, - isLiked: false), - const CardPostData( - name: "Константин", - surname: "Злобин", - description: "Веду канал в тг про криптожизнь", - imageUrl: "https://placehold.co/600x400/png", - age: 24, - distance: 478.3, - isLiked: false), - const CardPostData( - name: "Марьяна", - surname: "Ро", - description: "Люблю вечерами погамать в майн", - imageUrl: "https://placehold.co/600x400/png", - age: 21, - distance: 24.5, - isLiked: false), - const CardPostData( - name: "Константин", - surname: "Злобин", - description: "Веду канал в тг про криптожизнь", - imageUrl: "https://placehold.co/600x400/png", - age: 24, - distance: 478.3, - isLiked: false), - const CardPostData( - name: "Марьяна", - surname: "Ро", - description: "Люблю вечерами погамать в майн", - imageUrl: "https://placehold.co/600x400/png", - age: 21, - distance: 24.5, - isLiked: false), - const CardPostData( - name: "Константин", - surname: "Злобин", - description: "Веду канал в тг про криптожизнь", - imageUrl: "https://placehold.co/600x400/png", - age: 24, - distance: 478.3, - isLiked: false), - const CardPostData( - name: "Марьяна", - surname: "Ро", - description: "Люблю вечерами погамать в майн", - imageUrl: "https://placehold.co/600x400/png", - age: 21, - distance: 24.5, - isLiked: false), - const CardPostData( - name: "Константин", - surname: "Злобин", - description: "Веду канал в тг про криптожизнь", - imageUrl: "https://placehold.co/600x400/png", - age: 24, - distance: 478.3, - isLiked: false), const CardPostData( name: "Марьяна", surname: "Ро", diff --git a/lib/domain/card.dart b/lib/domain/card.dart index 3a96a32..d188721 100644 --- a/lib/domain/card.dart +++ b/lib/domain/card.dart @@ -1,8 +1,18 @@ class CardPostData { - final String name; - final String description; + final String? name; + final String? surname; + final String? description; final String? imageUrl; - final bool isLiked; + final int? age; + final double? distance; + final bool? isLiked; - const CardPostData(this.name, this.description, this.imageUrl, this.isLiked); + const CardPostData( + {this.name, + this.surname, + this.description, + this.imageUrl, + this.isLiked, + this.age, + this.distance}); } diff --git a/lib/presentation/detail_pages/card_detail_page.dart b/lib/presentation/detail_pages/card_detail_page.dart index ebd244e..e9d724b 100644 --- a/lib/presentation/detail_pages/card_detail_page.dart +++ b/lib/presentation/detail_pages/card_detail_page.dart @@ -25,14 +25,14 @@ class DetailPage extends StatelessWidget { Padding( padding: const EdgeInsets.all(4.0), child: Text( - data.name, + data.name ?? "", style: const TextStyle(color: Colors.black, fontSize: 30), ), ), Padding( padding: const EdgeInsets.all(4.0), child: Text( - data.description, + data.description ?? "", style: const TextStyle(color: Colors.black, fontSize: 20), ), ), diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/home_page/card.dart index 59aeb86..70dd95c 100644 --- a/lib/presentation/home_page/card.dart +++ b/lib/presentation/home_page/card.dart @@ -9,21 +9,34 @@ const double NORMAL_ICON_SCALE = 2.0; const double SCALED_ICON_SCALE = 2.5; class CardPost extends StatefulWidget { - final String description; + final String? description; final String? imageUrl; - final bool isLiked; - final String name; + final bool? isLiked; + final String? name; + final String? surname; final OnLikeCallback onLike; final VoidCallback? onTap; - const CardPost(this.name, this.description, this.imageUrl, this.isLiked, - this.onLike, this.onTap); + const CardPost( + {this.name, + this.surname, + this.description, + this.imageUrl, + this.isLiked, + this.onLike, + this.onTap}); factory CardPost.fromData(CardPostData data, {OnLikeCallback onLike, VoidCallback? onTap}) => - CardPost(data.name, data.description, data.imageUrl, data.isLiked, onLike, - onTap); + CardPost( + name: data.name, + surname: data.surname, + description: data.description, + imageUrl: data.imageUrl, + isLiked: data.isLiked, + onLike: onLike, + onTap: onTap); @override State createState() => _CardPostState(); @@ -67,7 +80,7 @@ class _CardPostState extends State { children: [ Flexible( child: Text( - widget.name, + (widget.name ?? "") + (" ") + (widget.surname ?? ""), style: const TextStyle( color: Colors.white, fontSize: 30, @@ -83,7 +96,7 @@ class _CardPostState extends State { children: [ Flexible( child: Text( - widget.description, + widget.description ?? "", textAlign: TextAlign.center, style: const TextStyle( color: Colors.white, @@ -118,7 +131,7 @@ class _CardPostState extends State { iconScale = NORMAL_ICON_SCALE; }); }); - widget.onLike?.call(widget.name, isLiked); + widget.onLike?.call(widget.name ?? "", isLiked); }) }, child: AnimatedScale( diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index f8d3f6f..79c6876 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:pmu/data/repositories/api_user_repository.dart'; import 'package:pmu/domain/card.dart'; import 'package:pmu/presentation/detail_pages/card_detail_page.dart'; import 'package:pmu/presentation/home_page/card.dart'; @@ -42,10 +43,7 @@ class Body extends StatelessWidget { content: Text( '${isLiked ? 'Вы поставили лайк: ' : 'Вы убрали лайк: '} $title', style: const TextStyle( - color: Colors.black45, - fontSize: 20, - fontWeight: FontWeight.bold - ), + color: Colors.black45, fontSize: 20, fontWeight: FontWeight.bold), ), backgroundColor: isLiked ? Colors.green : Colors.red, duration: const Duration(seconds: 2), @@ -55,32 +53,24 @@ class Body extends StatelessWidget { @override Widget build(BuildContext context) { - final data = [ - const CardPostData( - "Евгения", - "Люблю программирование и кататься на скейте", - "https://avatar.iran.liara.run/public/girl", - false), - const CardPostData("Алекс", "Junior Flutter Engineer", - "https://avatar.iran.liara.run/public/36", false), - const CardPostData( - "Станислав", - "Нет ничего приятнее прогулки на природе!", - "https://avatar.iran.liara.run/public/boy", - false), - const CardPostData("Вероника", "В свободное время хожу на уроки вокала", - "https://avatar.iran.liara.run/public/93", false), - ]; + final data = ApiUserRepository().loadData(); return Center( - child: SingleChildScrollView( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: data.map((data) { - return CardPost.fromData(data, - onLike: (String title, bool isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data)); - }).toList(), - ))); + child: FutureBuilder?>( + future: data, + builder: (context, snapshot) => SingleChildScrollView( + child: snapshot.hasData + ? Column( + mainAxisAlignment: MainAxisAlignment.center, + children: snapshot.data + ?.map((data) => CardPost.fromData(data, + onLike: (String title, bool isLiked) => + _showSnackBar(context, title, isLiked), + onTap: () => _navToDetails(context, data))) + .toList() ?? + []) + : const CircularProgressIndicator(), + ), + ), + ); } }