From 96016dcfe324e67f69af0b99e82ea86a958a2101 Mon Sep 17 00:00:00 2001 From: Serxiolog Date: Mon, 11 Nov 2024 22:32:44 +0400 Subject: [PATCH] Five (need to update) LABA --- command.txt | 1 + lib/data/dtos/anime_dto.dart | 47 +++ lib/data/dtos/anime_dto.g.dart | 37 ++ lib/data/mappers/anime_mapper.dart | 10 + lib/data/repositories/anime_repository.dart | 33 ++ lib/data/repositories/api_interface.dart | 6 + lib/data/repositories/mock_repository.dart | 27 ++ lib/presentation/home_page/home_page.dart | 52 ++- pubspec.lock | 397 ++++++++++++++++++++ pubspec.yaml | 6 + 10 files changed, 585 insertions(+), 31 deletions(-) create mode 100644 command.txt create mode 100644 lib/data/dtos/anime_dto.dart create mode 100644 lib/data/dtos/anime_dto.g.dart create mode 100644 lib/data/mappers/anime_mapper.dart create mode 100644 lib/data/repositories/anime_repository.dart create mode 100644 lib/data/repositories/api_interface.dart create mode 100644 lib/data/repositories/mock_repository.dart diff --git a/command.txt b/command.txt new file mode 100644 index 0000000..af34da3 --- /dev/null +++ b/command.txt @@ -0,0 +1 @@ +flutter pub run build_runner build --delete-conflicting-outputs diff --git a/lib/data/dtos/anime_dto.dart b/lib/data/dtos/anime_dto.dart new file mode 100644 index 0000000..e83fe7c --- /dev/null +++ b/lib/data/dtos/anime_dto.dart @@ -0,0 +1,47 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'anime_dto.g.dart'; + +@JsonSerializable(createToJson: false) +class AnimesDto { + final List? data; + + const AnimesDto({this.data}); + + factory AnimesDto.fromJson(Map json) => _$AnimesDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class AnimeDataDto { + @JsonKey(name: 'mal_id') + final int? id; + final String? title; + final String? synopsis; + final double? score; + final AnimeImagesDto? images; + + const AnimeDataDto(this.id, this.title, this.synopsis, this.images, this.score); + factory AnimeDataDto.fromJson(Map json) => _$AnimeDataDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class AnimeImagesDto { + final AnimeImagesJpgDto? jpg; + + const AnimeImagesDto({this.jpg}); + + factory AnimeImagesDto.fromJson(Map json) => _$AnimeImagesDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class AnimeImagesJpgDto { + @JsonKey(name: 'image_url') + final String? image; + @JsonKey(name: 'small_image_url') + final String? smallImage; + @JsonKey(name: 'large_image_url') + final String? largeImage; + + const AnimeImagesJpgDto(this.image, this.smallImage, this.largeImage); + factory AnimeImagesJpgDto.fromJson(Map json) => _$AnimeImagesJpgDtoFromJson(json); +} \ No newline at end of file diff --git a/lib/data/dtos/anime_dto.g.dart b/lib/data/dtos/anime_dto.g.dart new file mode 100644 index 0000000..2b58860 --- /dev/null +++ b/lib/data/dtos/anime_dto.g.dart @@ -0,0 +1,37 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'anime_dto.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +AnimesDto _$AnimesDtoFromJson(Map json) => AnimesDto( + data: (json['data'] as List?) + ?.map((e) => AnimeDataDto.fromJson(e as Map)) + .toList(), + ); + +AnimeDataDto _$AnimeDataDtoFromJson(Map json) => AnimeDataDto( + (json['mal_id'] as num?)?.toInt(), + json['title'] as String?, + json['synopsis'] as String?, + json['images'] == null + ? null + : AnimeImagesDto.fromJson(json['images'] as Map), + (json['score'] as num?)?.toDouble(), + ); + +AnimeImagesDto _$AnimeImagesDtoFromJson(Map json) => + AnimeImagesDto( + jpg: json['jpg'] == null + ? null + : AnimeImagesJpgDto.fromJson(json['jpg'] as Map), + ); + +AnimeImagesJpgDto _$AnimeImagesJpgDtoFromJson(Map json) => + AnimeImagesJpgDto( + json['image_url'] as String?, + json['small_image_url'] as String?, + json['large_image_url'] as String?, + ); diff --git a/lib/data/mappers/anime_mapper.dart b/lib/data/mappers/anime_mapper.dart new file mode 100644 index 0000000..04cdd1f --- /dev/null +++ b/lib/data/mappers/anime_mapper.dart @@ -0,0 +1,10 @@ +import 'package:first_project/data/dtos/anime_dto.dart'; +import 'package:first_project/presentation/home_page/home_page.dart'; + +extension AnimeDataDtoToModel on AnimeDataDto { + CardData toDomain() => CardData( + title ?? 'NOT', + imageUrl: images?.jpg?.image ?? "NONE", + description: synopsis ?? "NONE", + ); +} \ No newline at end of file diff --git a/lib/data/repositories/anime_repository.dart b/lib/data/repositories/anime_repository.dart new file mode 100644 index 0000000..3decdb0 --- /dev/null +++ b/lib/data/repositories/anime_repository.dart @@ -0,0 +1,33 @@ + +import 'package:dio/dio.dart'; +import 'package:first_project/data/dtos/anime_dto.dart'; +import 'package:first_project/data/mappers/anime_mapper.dart'; +import 'package:first_project/data/repositories/api_interface.dart'; +import 'package:first_project/presentation/home_page/home_page.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; + +class AnimeRepository extends ApiInterface { + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )); + + static const String _baseUrl = 'https://api.jikan.moe'; + + @override + Future?> loadData() async{ + try + { + const String url = '$_baseUrl/v4/anime'; + final Response response = await _dio.get>(url); + + final AnimesDto dto = AnimesDto.fromJson(response.data as Map); + final List? data = dto.data?.map((e) => e.toDomain()).toList(); + return data; + } on DioException catch (e) + { + return null; + } + } +} \ No newline at end of file diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart new file mode 100644 index 0000000..af66c8b --- /dev/null +++ b/lib/data/repositories/api_interface.dart @@ -0,0 +1,6 @@ + +import 'package:first_project/presentation/home_page/home_page.dart'; + +abstract class ApiInterface { + Future?> loadData(); +} \ No newline at end of file diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart new file mode 100644 index 0000000..4105276 --- /dev/null +++ b/lib/data/repositories/mock_repository.dart @@ -0,0 +1,27 @@ +import 'package:first_project/data/repositories/api_interface.dart'; +import 'package:first_project/presentation/home_page/home_page.dart'; +import 'package:flutter/material.dart'; + +class MockRepository extends ApiInterface { + @override + Future?> loadData() async { + return [ + const CardData( + "First", + description: "SomeText", + ), + const CardData( + "Second", + icon: Icons.gamepad, + description: "ManyText", + imageUrl: + "https://i.pinimg.com/originals/21/73/24/217324138d1bbc91663d4943ebe5de60.jpg", + ), + const CardData( + "Third", + icon: Icons.offline_bolt_outlined, + description: "Wow >_<", + ), + ]; + } +} \ No newline at end of file diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index f10f892..06812a6 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,3 +1,5 @@ +import 'package:first_project/data/repositories/anime_repository.dart'; +import 'package:first_project/data/repositories/mock_repository.dart'; import 'package:first_project/domain/models/card.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -46,38 +48,26 @@ class Body extends StatelessWidget { @override Widget build(BuildContext context) { - final data = [ - const CardData( - "First", - description: "SomeText", - ), - const CardData( - "Second", - icon: Icons.gamepad, - description: "ManyText", - imageUrl: - "https://i.pinimg.com/originals/21/73/24/217324138d1bbc91663d4943ebe5de60.jpg", - ), - const CardData( - "Third", - icon: Icons.offline_bolt_outlined, - description: "Wow >_<", - ), - ]; + final data = AnimeRepository().loadData(); return Center( - child: SingleChildScrollView( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: data.map( - (e) { - return _Card.fromData( - e, - onLike: (String title, bool isLiked) => - _showLiked(context, title, isLiked), - onTap: () => _navToDetails(context, e), - ); - }, - ).toList(), + child: FutureBuilder?>( + future: data, + builder: (context, snapshot) => SingleChildScrollView( + child: snapshot.hasData + ? Column( + mainAxisAlignment: MainAxisAlignment.center, + children: snapshot.data!.map( + (e) { + return _Card.fromData( + e, + onLike: (String title, bool isLiked) => + _showLiked(context, title, isLiked), + onTap: () => _navToDetails(context, e), + ); + }, + ).toList(), + ) + : const CircularProgressIndicator(), ), )); } diff --git a/pubspec.lock b/pubspec.lock index 07514d0..55bbb91 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: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + url: "https://pub.dev" + source: hosted + version: "4.10.0" 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: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + 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: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + url: "https://pub.dev" + source: hosted + version: "6.8.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: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.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: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + url: "https://pub.dev" + source: hosted + version: "2.0.0" 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: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" 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.2 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 37d844c..c415a84 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,10 +36,16 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + json_annotation: ^4.8.1 + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 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