From adeb517d4e61d5ec71ae63636f6dc3e91f0d85a8 Mon Sep 17 00:00:00 2001 From: salih Date: Tue, 26 Nov 2024 16:46:22 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B0=D1=8F=205?= =?UTF-8?q?=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/dtos/food_dto.dart | 23 + lib/data/mappers/foods_mapper.dart | 10 + lib/data/repository/api_interface.dart | 5 + lib/data/repository/food_repository.dart | 31 ++ lib/data/repository/mock_repository.dart | 28 ++ lib/domain/models/card.dart | 15 +- .../details_page/details_page.dart | 17 +- lib/presentation/home_page/card.dart | 224 +++++----- lib/presentation/home_page/home_page.dart | 52 +-- pubspec.lock | 397 ++++++++++++++++++ pubspec.yaml | 9 +- 11 files changed, 643 insertions(+), 168 deletions(-) create mode 100644 lib/data/dtos/food_dto.dart create mode 100644 lib/data/mappers/foods_mapper.dart create mode 100644 lib/data/repository/api_interface.dart create mode 100644 lib/data/repository/food_repository.dart create mode 100644 lib/data/repository/mock_repository.dart diff --git a/lib/data/dtos/food_dto.dart b/lib/data/dtos/food_dto.dart new file mode 100644 index 0000000..9b497e8 --- /dev/null +++ b/lib/data/dtos/food_dto.dart @@ -0,0 +1,23 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'food_dto.g.dart'; + +@JsonSerializable(createToJson: false) +class FoodsDto{ + final List? meals; + + const FoodsDto({this.meals}); + + factory FoodsDto.fromJson(Map json) => _$FoodsDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class FoodDataDto{ + final String? idMeal; + final String? strMeal; + final String? strMealThumb; + + const FoodDataDto({this.idMeal, this.strMeal, this.strMealThumb}); + + factory FoodDataDto.fromJson(Map json) => _$FoodDataDtoFromJson(json); +} diff --git a/lib/data/mappers/foods_mapper.dart b/lib/data/mappers/foods_mapper.dart new file mode 100644 index 0000000..12ca7e4 --- /dev/null +++ b/lib/data/mappers/foods_mapper.dart @@ -0,0 +1,10 @@ +import 'package:pmu/data/dtos/food_dto.dart'; +import 'package:pmu/domain/models/card.dart'; + +extension FoodDataDtoToModel on FoodDataDto { + MarketData toDomain() => MarketData( + beanId: idMeal ?? "Неизвестно", + colorGroup: strMeal ?? "Неизвестная категория", + imageUrl: strMealThumb, + ); +} diff --git a/lib/data/repository/api_interface.dart b/lib/data/repository/api_interface.dart new file mode 100644 index 0000000..f914192 --- /dev/null +++ b/lib/data/repository/api_interface.dart @@ -0,0 +1,5 @@ +import 'package:pmu/domain/models/card.dart'; + +abstract class ApiInterface{ + Future?> loadData(); +} \ No newline at end of file diff --git a/lib/data/repository/food_repository.dart b/lib/data/repository/food_repository.dart new file mode 100644 index 0000000..4059e91 --- /dev/null +++ b/lib/data/repository/food_repository.dart @@ -0,0 +1,31 @@ +import 'package:dio/dio.dart'; +import 'package:pmu/data/dtos/food_dto.dart'; +import 'package:pmu/data/mappers/foods_mapper.dart'; +import 'package:pmu/data/repository/api_interface.dart'; +import 'package:pmu/domain/models/card.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; + +class FoodRepository extends ApiInterface{ + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )); + + static const String _baseUrl = 'https://www.themealdb.com/api/json'; + + @override + Future?> loadData() async { + try { + const String url = '$_baseUrl/v1/1/filter.php?i=chicken_breast'; + + final Response response = await _dio.get>(url); + + final FoodsDto dto = FoodsDto.fromJson(response.data as Map); + final List? items = dto.meals?.map((e) => e.toDomain()).toList(); + return items; + } on DioException catch(e){ + return null; + } + } +} \ No newline at end of file diff --git a/lib/data/repository/mock_repository.dart b/lib/data/repository/mock_repository.dart new file mode 100644 index 0000000..e4ab061 --- /dev/null +++ b/lib/data/repository/mock_repository.dart @@ -0,0 +1,28 @@ +import 'package:pmu/data/repository/api_interface.dart'; +import 'package:pmu/domain/models/card.dart'; + +class MockRepository extends ApiInterface { + @override + Future?> loadData() async{ + return [ + MarketData( + beanId: '1', + colorGroup: + 'khaki', + imageUrl: 'https://www.themealdb.com/images/media/meals/sbx7n71587673021.jpg' + ), + MarketData( + beanId: '2', + colorGroup: + 'khaki', + imageUrl: 'https://www.themealdb.com/images/media/meals/sbx7n71587673021.jpg' + ), + MarketData( + beanId: '3', + colorGroup: + 'khaki', + imageUrl: 'https://www.themealdb.com/images/media/meals/sbx7n71587673021.jpg' + ), + ]; + } +} \ No newline at end of file diff --git a/lib/domain/models/card.dart b/lib/domain/models/card.dart index 7c5da88..7f8efba 100644 --- a/lib/domain/models/card.dart +++ b/lib/domain/models/card.dart @@ -1,10 +1,11 @@ class MarketData { - final String price; - final String name; - final String? discount; - final String size; - final String? image; + final String beanId; + final String colorGroup; + final String? imageUrl; - MarketData(this.price, this.name, this.discount, this.size, - {required this.image}); + MarketData({ + required this.beanId, + required this.colorGroup, + required this.imageUrl, + }); } diff --git a/lib/presentation/details_page/details_page.dart b/lib/presentation/details_page/details_page.dart index 3765d65..a170903 100644 --- a/lib/presentation/details_page/details_page.dart +++ b/lib/presentation/details_page/details_page.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:pmu/domain/models/card.dart'; class DetailsPage extends StatelessWidget { - final MarketData data; + final MarketData meals; - const DetailsPage(this.data, {super.key}); + const DetailsPage(this.meals, {super.key}); @override Widget build(BuildContext context) { @@ -26,19 +26,8 @@ class DetailsPage extends StatelessWidget { children: [ Padding( padding: const EdgeInsets.only(bottom: 16.0), - child: Image.network(data.image ?? ''), + child: Image.network(meals.imageUrl ?? ''), ), - Padding( - padding: const EdgeInsets.only(bottom: 4.0), - child: Text( - data.name, - style: Theme.of(context).textTheme.headlineLarge, - ), - ), - Text( - data.size, - style: Theme.of(context).textTheme.bodyLarge, - ) ], ), ), diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/home_page/card.dart index 20a2dcc..72dd433 100644 --- a/lib/presentation/home_page/card.dart +++ b/lib/presentation/home_page/card.dart @@ -3,21 +3,29 @@ part of "home_page.dart"; typedef OnLikeCallback = void Function(String title, bool isLiked)?; class _MarketCard extends StatefulWidget { - final String price; - final String name; - final String? discount; - final String size; - final String? image; + final String beanId; + final String colorGroup; + final String? imageUrl; final OnLikeCallback onLike; final VoidCallback? onTap; - const _MarketCard(this.price, this.name, this.discount, this.size, - {required this.image, this.onLike, this.onTap}); + const _MarketCard({ + required this.beanId, + required this.colorGroup, + required this.imageUrl, + this.onLike, + this.onTap, + }); - factory _MarketCard.formDate(MarketData date, - {OnLikeCallback? onLike, VoidCallback? onTap}) => - _MarketCard(date.price, date.name, date.discount, date.size, - image: date.image, onLike: onLike, onTap: onTap); + factory _MarketCard.fromData(MarketData items, + {OnLikeCallback? onLike, VoidCallback? onTap}) => + _MarketCard( + beanId: items.beanId, + colorGroup: items.colorGroup, + imageUrl: items.imageUrl, + onLike: onLike, + onTap: onTap, + ); @override State<_MarketCard> createState() => _MarketCardState(); @@ -31,114 +39,102 @@ class _MarketCardState extends State<_MarketCard> { return GestureDetector( onTap: widget.onTap, child: Container( - padding: const EdgeInsets.all(10), - margin: const EdgeInsets.all(4), - constraints: const BoxConstraints(minHeight: 140), - decoration: BoxDecoration( - color: Color(0xFFE5E4E2), - borderRadius: BorderRadius.circular(16), - ), - child: IntrinsicHeight( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ClipRRect( - borderRadius: BorderRadius.circular(14), - child: SizedBox( - width: double.infinity, - height: 160, - child: Stack( - children: [ - Positioned.fill( - child: Image.network( - widget.image ?? '', - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => const Placeholder(), + padding: const EdgeInsets.all(10), + margin: const EdgeInsets.all(4), + constraints: const BoxConstraints(minHeight: 140), + decoration: BoxDecoration( + color: const Color(0xFFE5E4E2), + borderRadius: BorderRadius.circular(16), + ), + child: IntrinsicHeight( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ClipRRect( + borderRadius: BorderRadius.circular(14), + child: SizedBox( + width: double.infinity, + height: 160, + child: Stack( + children: [ + Positioned.fill( + child: Image.network( + widget.imageUrl ?? '', + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => const Placeholder(), + ), + ), + Align( + alignment: Alignment.bottomRight, + child: Container( + decoration: const BoxDecoration( + color: Color(0xFFffef42), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), ), ), - Align( - alignment: Alignment.bottomRight, - child: Container( - decoration: const BoxDecoration( - color: Color(0xFFffef42), - borderRadius: BorderRadius.only( - topLeft: Radius.circular(20), - )), - padding: const EdgeInsets.fromLTRB(8, 2, 8, 2), - child: Text( - "новинка", - style: Theme.of(context) - .textTheme - .bodyMedium - ?.copyWith(color: Colors.black), - ), - ), + padding: const EdgeInsets.fromLTRB(8, 2, 8, 2), + child: Text( + "новинка", + style: Theme.of(context) + .textTheme + .bodyMedium + ?.copyWith(color: Colors.black), + ), + ), + ), + ], + ), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: Text( + widget.colorGroup, + style: const TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Spacer(), + Align( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(left: 8.0), + child: GestureDetector( + onTap: () { + setState(() { + isLiked = !isLiked; + }); + widget.onLike?.call(widget.colorGroup, isLiked); + }, + child: AnimatedSwitcher( + duration: const Duration(milliseconds: 100), + child: isLiked + ? const Icon( + Icons.favorite, + color: Colors.redAccent, + key: ValueKey(0), ) - ], - )), - ), - Row( - children: [ - Padding( - padding: const EdgeInsets.only( - top: 6, - ), - child: Text( - widget.discount ?? '', - style: - TextStyle(fontSize: 26, color: Color(0xFFF1571E)), + : const Icon( + Icons.favorite, + color: Colors.grey, + key: ValueKey(1), + ), + ), ), ), - Text( - widget.price, - style: TextStyle( - fontSize: 16, decoration: TextDecoration.lineThrough), - ), - ], - ), - Text( - widget.name, - style: TextStyle(fontSize: 20), - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - widget.size, - style: TextStyle(fontSize: 18), - ), - const Spacer(), - Align( - alignment: Alignment.bottomRight, - child: Padding( - padding: const EdgeInsets.only(left: 8.0), - child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.name, isLiked); - }, - child: AnimatedSwitcher( - duration: const Duration(milliseconds: 100), - child: isLiked - ? const Icon( - Icons.favorite, - color: Colors.redAccent, - key: ValueKey(0), - ) - : const Icon( - Icons.favorite, - color: Colors.grey, - key: ValueKey(1), - )), - )), - ) - ], - ) - ], - ), - )), + ), + ], + ), + ], + ), + ), + ), ); } } diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 64e88f7..05735e9 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,5 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:pmu/data/repository/food_repository.dart'; +import 'package:pmu/data/repository/mock_repository.dart'; import 'package:pmu/domain/models/card.dart'; import 'package:pmu/presentation/details_page/details_page.dart'; @@ -15,7 +17,7 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - final Color _color = Color(0xFFFFA400); + final Color _color = const Color(0xFFFFA400); @override Widget build(BuildContext context) { @@ -34,38 +36,26 @@ class Body extends StatelessWidget { @override Widget build(BuildContext context) { - final markerDate = [ - MarketData('100₽', "Банан", '80₽ ', '100 г', - image: - 'https://main-cdn.sbermegamarket.ru/big1/hlr-system/428/425/752/325/184/4/100028179877b0.jpg'), - MarketData('180₽', "Мандарины", '160₽ ', '100 г', - image: - 'https://main-cdn.sbermegamarket.ru/big2/hlr-system/105/621/149/532/518/46/100028180607b0.jpg'), - MarketData('140₽', "Сыр", '120₽ ', '100 г', - image: - 'https://main-cdn.sbermegamarket.ru/big2/hlr-system/-21/355/242/874/191/753/100026606392b0.jpg'), - MarketData('188₽', "Крабовые палочки Aro", '159₽ ', '500 г', - image: - 'https://main-cdn.sbermegamarket.ru/big2/hlr-system/208/792/956/332/518/55/100028195753b0.jpg'), - MarketData('100₽', "Черноголовка Кола", '99₽ ', '2 л', - image: - 'https://main-cdn.sbermegamarket.ru/big2/hlr-system/822/548/713/816/182/3/100032947636b0.jpg'), - ]; + final marketData = FoodRepository().loadData(); return Center( - child: SingleChildScrollView( - child: Wrap( - children: markerDate - .map((x) => SizedBox( - width: MediaQuery.of(context).size.width / 2 - 16, - child: _MarketCard.formDate( - x, - onLike: (title, isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, x), - ), - )) - .toList(), + child: FutureBuilder?>( + future: marketData, + builder: (context, snapshot) => SingleChildScrollView( + child: snapshot.hasData + ? Column( + mainAxisAlignment: MainAxisAlignment.center, + children: snapshot.data?.map((data) { + return _MarketCard.fromData( + data, + onLike: (String title, bool isLiked) => + _showSnackBar(context, title, isLiked), + onTap: () => _navToDetails(context, data), + ); + }).toList() ?? + [], + ) + : const CircularProgressIndicator(), ), ), ); diff --git a/pubspec.lock b/pubspec.lock index b9fd799..5f86281 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: "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: 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 f48e601..74edf93 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,6 +31,10 @@ dependencies: flutter: sdk: flutter + json_annotation: ^4.8.1 + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 + # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -40,6 +44,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 @@ -57,8 +64,6 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - assets: - - assets/pict.png # To add assets to your application, add an assets section, like this: # assets: