From 2c5e39c05b2b09eceb9631bab0e6168d191cb841 Mon Sep 17 00:00:00 2001 From: ujijrujijr Date: Fri, 15 Nov 2024 21:47:58 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=205=20(=D0=B7=D0=B0=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=20=D0=B7=D0=B0=D0=BB=D0=B8=D1=82=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/dto/games_dto.dart | 54 +++ lib/data/dto/games_dto.g.dart | 21 + lib/data/mappers/games_mapper.dart | 18 + lib/data/repositories/api_interface.dart | 5 + lib/data/repositories/games_repository.dart | 59 +++ lib/data/repositories/mock_repository.dart | 33 ++ lib/domain/models/game.dart | 10 +- .../details_page/details_page.dart | 206 ++++++--- lib/presentation/home_page/gameCard.dart | 22 +- lib/presentation/home_page/home_page.dart | 98 +++-- pubspec.lock | 413 ++++++++++++++++++ pubspec.yaml | 45 +- 12 files changed, 853 insertions(+), 131 deletions(-) create mode 100644 lib/data/dto/games_dto.dart create mode 100644 lib/data/dto/games_dto.g.dart create mode 100644 lib/data/mappers/games_mapper.dart create mode 100644 lib/data/repositories/api_interface.dart create mode 100644 lib/data/repositories/games_repository.dart create mode 100644 lib/data/repositories/mock_repository.dart diff --git a/lib/data/dto/games_dto.dart b/lib/data/dto/games_dto.dart new file mode 100644 index 0000000..ba013eb --- /dev/null +++ b/lib/data/dto/games_dto.dart @@ -0,0 +1,54 @@ +import 'package:json_annotation/json_annotation.dart'; +//автоматически сгенерился +part 'games_dto.g.dart'; + +// createToJson:false - указание, что сериализатор не нужен, нужен только десериализатор +@JsonSerializable(createToJson: false) +class GamesDto { + @JsonKey(name: 'results') + final List? data; + + const GamesDto({this.data}); + + factory GamesDto.fromJson(Map json) => _$GamesDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class GameDto { + //для rawg, для получения описания игры + @JsonKey(name: 'id') + final int? id; + + final String? name; + + final String? description; + + + @JsonKey(name: 'background_image') + final String? image; + + // @JsonKey(name: 'original_release_date') + @JsonKey(name: 'released') + final String? date; + + const GameDto(this.id, this.name, this.description, this.image, this.date); + + factory GameDto.fromJson(Map json) => _$GameDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class GameInfoDto extends GameDto{ + GameInfoDto(super.id, super.name, super.description, super.image, super.date); + +} + +// giant bomb +// @JsonSerializable(createToJson: false) +// class ImageDto { +// @JsonKey(name: 'original_url') +// final String? originalUrl; +// +// const ImageDto({this.originalUrl}); +// +// factory ImageDto.fromJson(Map json) => _$ImageDtoFromJson(json); +// } \ No newline at end of file diff --git a/lib/data/dto/games_dto.g.dart b/lib/data/dto/games_dto.g.dart new file mode 100644 index 0000000..683e0f8 --- /dev/null +++ b/lib/data/dto/games_dto.g.dart @@ -0,0 +1,21 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'games_dto.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +GamesDto _$GamesDtoFromJson(Map json) => GamesDto( + data: (json['results'] as List?) + ?.map((e) => GameDto.fromJson(e as Map)) + .toList(), + ); + +GameDto _$GameDtoFromJson(Map json) => GameDto( + (json['id'] as num?)?.toInt(), + json['name'] as String?, + json['description'] as String?, + json['background_image'] as String?, + json['released'] as String?, + ); diff --git a/lib/data/mappers/games_mapper.dart b/lib/data/mappers/games_mapper.dart new file mode 100644 index 0000000..6b65adc --- /dev/null +++ b/lib/data/mappers/games_mapper.dart @@ -0,0 +1,18 @@ +import 'package:mobiles_labs_5th_semester/data/dto/games_dto.dart'; +import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; +import 'package:html/parser.dart'; + +extension GameDtoToModel on GameDto { + GameData toDomain() { + // удаление HTML-тегов и системных символов из описания + String cleanedDescription = description ?? ''; + if (cleanedDescription.isNotEmpty) { + + cleanedDescription = cleanedDescription.replaceAll(RegExp(r'<[^>]*>'), ''); + //cleanedDescription = cleanedDescription.replaceAll(RegExp(r'\n|\r|\t'), ' '); + } + // return GameData(name: name ?? 'Неизвестная игра', price: 100, image: image?.originalUrl, description: cleanedDescription); + return GameData(id:id, name: name ?? 'Неизвестная игра', date: DateTime.parse(date ?? '2000-01-01'), image: image, description: cleanedDescription); + + } +} \ 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..c40045b --- /dev/null +++ b/lib/data/repositories/api_interface.dart @@ -0,0 +1,5 @@ +import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; + +abstract class ApiInterface { + Future?> loadData(String? q); +} \ No newline at end of file diff --git a/lib/data/repositories/games_repository.dart b/lib/data/repositories/games_repository.dart new file mode 100644 index 0000000..6d0c5b3 --- /dev/null +++ b/lib/data/repositories/games_repository.dart @@ -0,0 +1,59 @@ +import 'package:mobiles_labs_5th_semester/data/dto/games_dto.dart'; +import 'package:mobiles_labs_5th_semester/data/mappers/games_mapper.dart'; +import 'package:mobiles_labs_5th_semester/data/repositories/api_interface.dart'; +import 'package:dio/dio.dart'; +import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; + + +class GamesRepository extends ApiInterface { + // Для обращения к api, с удобным выводом в консоль + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )); + + // static const String _baseUrl = 'https://www.giantbomb.com'; + static const String _baseUrl = 'https://api.rawg.io'; + + + @override + Future?> loadData(String? q) async { + try { + // const String url = '$_baseUrl/api/games/?api_key=cfbca5bd0888309438b9cef29bbe13364bece292&format=json&limit=30&filter=date_added:2020-01-01|2099-12-31,original_release_date:2020-01-01|2099-12-31,platforms:94'; + String url = '$_baseUrl/api/games?key=793f3ef5bdb64d128bebbb6e68ab89bd&format=json&page_size=10&platforms=4'; + if (q != null) { + url += '&search=$q'; + } + final Response response = await _dio.get>(url); + + final GamesDto gamesDto = GamesDto.fromJson(response.data as Map); + + final List? data = gamesDto.data?.map((e) => e.toDomain()).toList(); + + return data; + } + on DioException catch (e) { + + return null; + } + } + + Future loadGameData(int? id) async { + try { + String url = '$_baseUrl/api/games/${id.toString()}?key=793f3ef5bdb64d128bebbb6e68ab89bd&format=json'; + + final Response response = await _dio.get>(url); + + final GameDto gameDto = GameDto.fromJson(response.data as Map); + + final GameData data = gameDto.toDomain(); + return data; + } + on DioException catch (e) { + + return null; + } + } +} \ 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..a2c788d --- /dev/null +++ b/lib/data/repositories/mock_repository.dart @@ -0,0 +1,33 @@ +// import 'package:flutter/material.dart'; +// import 'package:mobiles_labs_5th_semester/data/repositories/api_interface.dart'; +// import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; +// +// //реализация apiInterface +// //"фейковые" данные, которые подходят +// class MockRepository extends ApiInterface { +// @override +// Future?> loadData(String? q) async { +// return [ +// GameData( +// name: 'Late Shift', +// //price: 399, +// date: DateTime(2016, 20, 02), +// description: 'Late Shift - криминальный FMV-триллер с невероятно высокими ставками. Вы окажетесь в эпицентре лондонского ограбления и выберете своё приключение в интерактивном кинофильме с меняющейся историей, ведущей к одной из семи концовок. Ваши решения определяют вас.', +// image: +// 'https://shared.akamai.steamstatic.com/store_item_assets/steam/apps/584980/capsule_616x353.jpg?t=1697110140'), +// GameData( +// name: 'Dark Nights with Poe & Munro', +// //price: 450, +// date: DateTime(2019, 05, 05), +// description: 'Проведите местных радиоведущих По и Манро через шесть похожих на короткометражки эпизодов сверъестественной странности и обжигающего сюжета. От создателей The Infectious Madness of Doctor Dekker и The Shapeshifting Detective.', +// image: +// 'https://shared.akamai.steamstatic.com/store_item_assets/steam/apps/1098170/capsule_616x353.jpg?t=1725541685'), +// GameData( +// date: DateTime(1900, 20, 02), +// name: 'Неизвестная игра', +// //price: 999, +// +// ) +// ]; +// } +// } \ No newline at end of file diff --git a/lib/domain/models/game.dart b/lib/domain/models/game.dart index 644ffdf..1a866a2 100644 --- a/lib/domain/models/game.dart +++ b/lib/domain/models/game.dart @@ -1,13 +1,17 @@ class GameData { + final int? id; final String name; - final int price; + //final int price; + final DateTime date; final String? image; //Описание игры final String? description; GameData( - {required this.name, - required this.price, + { this.id, + required this.name, + //required this.price, + required this.date, this.description, this.image = 'https://parpol.ru/wp-content/uploads/2019/09/placeholder.png'}); diff --git a/lib/presentation/details_page/details_page.dart b/lib/presentation/details_page/details_page.dart index 9a41708..af72b63 100644 --- a/lib/presentation/details_page/details_page.dart +++ b/lib/presentation/details_page/details_page.dart @@ -2,68 +2,170 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; -class DetailsPage extends StatelessWidget { - final GameData data; +import '../../data/repositories/games_repository.dart'; - const DetailsPage(this.data, {super.key}); + +class DetailsPage extends StatefulWidget { + final int? gameId; + + const DetailsPage(this.gameId, {super.key}); + + @override + State createState() => _DetailsPageState(); +} + +class _DetailsPageState extends State { + @override + void initState() { + super.initState(); + } @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - backgroundColor: Color.fromARGB(255, 56, 90, 128), - - //backgroundColor: Color.fromARGB(255, 46, 65, 80), - iconTheme: IconThemeData(color: Colors.white) - ), backgroundColor: Color.fromARGB(255, 46, 65, 80), - //backgroundColor: Color.fromARGB(255, 56, 90, 128), - body: Center( - //прокрутка по вертикали на случай, если описание длинное - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - children: [ - SizedBox( - height: 220, - width: MediaQuery.of(context).size.width, - child: Image.network( - data.image ?? '', - fit: BoxFit.fill, - errorBuilder: (_, __, ___) => const Placeholder(), - ), - ), - Padding( - padding: const EdgeInsets.only(top: 12.0, bottom: 12.0), - child: Text( - data.name, - style: const TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 40, + appBar: AppBar( + backgroundColor: Color.fromARGB(255, 56, 90, 128), + iconTheme: IconThemeData(color: Colors.white) + ), + body: Body(gameId: widget.gameId)); + } +} +class Body extends StatefulWidget { + final int? gameId; + const Body({super.key, required this.gameId}); + + @override + State createState() => _BodyState(); +} + +class _BodyState extends State { + late Future data; + final repo = GamesRepository(); + + @override + void initState() { + super.initState(); + data = repo.loadGameData(widget.gameId); + } + + @override + Widget build(BuildContext context) { + return Center( + child: FutureBuilder( + future: data, + builder: (context, snapshot) => SingleChildScrollView( + child: snapshot.hasData + ? Padding( + padding: const EdgeInsets.all(8.0), + child: + Column( + children: [ + SizedBox( + height: 220, + width: MediaQuery.of(context).size.width, + child: Image.network( + snapshot.data?.image ?? '', + fit: BoxFit.fill, + errorBuilder: (_, __, ___) => const Placeholder(), ), - textAlign: TextAlign.center, ), - ), - Text( - data.description ?? 'У игры нет описания', - style: const TextStyle( - color: Colors.white, - fontSize: 24, + Padding( + padding: const EdgeInsets.only(top: 12.0, bottom: 12.0), + child: Text( + snapshot.data?.name ?? '', + style: const TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 40, + ), + textAlign: TextAlign.center, + ), ), - softWrap: true, - // textAlign: TextAlign.left - textAlign: TextAlign.justify - ), - ] + Text( + snapshot.data?.description ?? 'У игры нет описания', + style: const TextStyle( + color: Colors.white, + fontSize: 24, + ), + softWrap: true, + // textAlign: TextAlign.left + textAlign: TextAlign.justify + ), + ] - ), - ), - ) - - ) + ) + ) : const CircularProgressIndicator() + ) + ) ); + + + } -} \ No newline at end of file +} + + // final data = GamesRepository().loadGameData(widget.gameId); + + // return Center( + // child: FutureBuilder ( + // future: data, + // builder: (context, snapshot) => snapshot.hasData ? Scaffold( + // appBar: AppBar( + // backgroundColor: Color.fromARGB(255, 56, 90, 128), + // iconTheme: IconThemeData(color: Colors.white) + // ), + // backgroundColor: Color.fromARGB(255, 46, 65, 80), + // //backgroundColor: Color.fromARGB(255, 56, 90, 128), + // body: Center( + // //прокрутка по вертикали на случай, если описание длинное + // child: SingleChildScrollView( + // child: Padding( + // padding: const EdgeInsets.all(8.0), + // child: Column( + // children: [ + // SizedBox( + // height: 220, + // width: MediaQuery.of(context).size.width, + // child: Image.network( + // snapshot.data?.image ?? '', + // fit: BoxFit.fill, + // errorBuilder: (_, __, ___) => const Placeholder(), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(top: 12.0, bottom: 12.0), + // child: Text( + // snapshot.data?.name ?? '', + // style: const TextStyle( + // color: Colors.white, + // fontWeight: FontWeight.bold, + // fontSize: 40, + // ), + // textAlign: TextAlign.center, + // ), + // ), + // Text( + // snapshot.data?.description ?? 'У игры нет описания', + // style: const TextStyle( + // color: Colors.white, + // fontSize: 24, + // ), + // softWrap: true, + // // textAlign: TextAlign.left + // textAlign: TextAlign.justify + // ), + // ] + // + // ), + // ), + // ) + // + // ) + // ) : const CircularProgressIndicator(), +// ) +// +// ); +// } +// } diff --git a/lib/presentation/home_page/gameCard.dart b/lib/presentation/home_page/gameCard.dart index ac8c8ba..e363f13 100644 --- a/lib/presentation/home_page/gameCard.dart +++ b/lib/presentation/home_page/gameCard.dart @@ -3,10 +3,12 @@ part of 'home_page.dart'; typedef OnLikeCallback = void Function(String title, bool isLiked)?; class _GameCard extends StatefulWidget { + final int? id; final String name; - final int price; + //final int price; + final DateTime date; final String? image; - final String? description; + // final String? description; //OnLikeCallback - пользовательский тип, ф-ия final OnLikeCallback onLike; @@ -15,10 +17,12 @@ class _GameCard extends StatefulWidget { //обычный конструктор const _GameCard({ super.key, + this.id, required this.name, - required this.price, + // required this.price, + required this.date, this.image, - this.description, + // this.description, this.onLike, this.onTap, }); @@ -27,10 +31,12 @@ class _GameCard extends StatefulWidget { factory _GameCard.fromData(GameData data, {OnLikeCallback onLike, VoidCallback? onTap}) => _GameCard( + id: data.id, name: data.name, - price: data.price, + //price: data.price, + date: data.date, image: data.image, - description: data.description, + // description: data.description, onLike: onLike, onTap: onTap, ); @@ -109,9 +115,9 @@ class _GameCardState extends State<_GameCard> { textAlign: TextAlign.center, ) ), - // Цена игры + // Релиз игры Text( - '${widget.price} руб.', + '${widget.date.day.toString().padLeft(2, '0')}.${widget.date.month.toString().padLeft(2, '0')}.${widget.date.year}', style: const TextStyle( color: Colors.white, fontWeight: FontWeight.bold, diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 9abb866..1104ef3 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,8 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; +import 'package:mobiles_labs_5th_semester/data/repositories/mock_repository.dart'; import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; import 'package:mobiles_labs_5th_semester/presentation/details_page/details_page.dart'; +import '../../data/repositories/games_repository.dart'; + part 'gameCard.dart'; class MyHomePage extends StatefulWidget { @@ -15,6 +18,11 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { + @override + void initState() { + super.initState(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -31,40 +39,67 @@ class _MyHomePageState extends State { } } -class Body extends StatelessWidget { +//!!!скорее всего надо будет заменить на stateful +class Body extends StatefulWidget { const Body({super.key}); + @override + State createState() => _BodyState(); +} + +class _BodyState extends State { + late Future?> data; + final searchController = TextEditingController(); + final repo = GamesRepository(); + + @override + void initState() { + data = repo.loadData(null); + super.initState(); + } + + @override Widget build(BuildContext context) { - final data = [ - GameData( - name: 'Late Shift', - price: 399, - description: 'Late Shift - криминальный FMV-триллер с невероятно высокими ставками. Вы окажетесь в эпицентре лондонского ограбления и выберете своё приключение в интерактивном кинофильме с меняющейся историей, ведущей к одной из семи концовок. Ваши решения определяют вас.', - image: - 'https://shared.akamai.steamstatic.com/store_item_assets/steam/apps/584980/capsule_616x353.jpg?t=1697110140'), - GameData( - name: 'Dark Nights with Poe & Munro', - price: 450, - description: 'Проведите местных радиоведущих По и Манро через шесть похожих на короткометражки эпизодов сверъестественной странности и обжигающего сюжета. От создателей The Infectious Madness of Doctor Dekker и The Shapeshifting Detective.', - image: - 'https://shared.akamai.steamstatic.com/store_item_assets/steam/apps/1098170/capsule_616x353.jpg?t=1725541685'), - GameData( - name: 'Неизвестная игра', - price: 999, - ) - ]; - return Center( - child: SingleChildScrollView( - child: Column( - children: data.map((data) { - return _GameCard.fromData( - data, - onLike: (String title, bool isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ); - }).toList()))); + return Column( + children: [ + Padding( + padding: const EdgeInsets.only(top: 12, left: 12, right: 12), + child: CupertinoSearchTextField( + backgroundColor: Colors.white, + style: TextStyle(color: Color.fromARGB(255, 46, 65, 80)), + // borderRadius: const BorderRadiusTween(2.0), + controller: searchController, + onChanged: (search) { + setState(() { + data = repo.loadData(search); + }); + }, + ), + ), + Expanded( + child: Center( + child: FutureBuilder?>( + future: data, + builder: (context, snapshot) => SingleChildScrollView( + child: snapshot.hasData + ? Column( + children: snapshot.data?.map((data) { + return _GameCard.fromData( + data, + onLike: (String title, bool isLiked) => + _showSnackBar(context, title, isLiked), + onTap: () => _navToDetails(context, data), + ); + }).toList() ?? + []) + : const CircularProgressIndicator() + ), + ), + ), + ), + ], + ); } void _showSnackBar(BuildContext context, String title, bool isLiked) { @@ -85,10 +120,11 @@ class Body extends StatelessWidget { )); }); } + void _navToDetails(BuildContext context, GameData data) { Navigator.push( context, - CupertinoPageRoute(builder: (context) => DetailsPage(data)), + CupertinoPageRoute(builder: (context) => DetailsPage(data.id ?? 0)), ); } } diff --git a/pubspec.lock b/pubspec.lock index 07514d0..02dd804 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,30 @@ 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" + csslib: + dependency: transitive + description: + name: csslib + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + url: "https://pub.dev" + source: hosted + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -49,6 +182,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 +214,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 +248,86 @@ 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" + html: + dependency: "direct main" + description: + name: html + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" + url: "https://pub.dev" + source: hosted + version: "0.15.5" + 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 +360,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 +400,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 +424,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 +517,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 +549,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 +581,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 f3aa812..45a3b08 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,55 +11,26 @@ dependencies: sdk: flutter cupertino_icons: ^1.0.8 - #добавил в лаб 5 + # добавил в лаб 5 json_annotation: ^4.8.1 + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 + # чтобы получить нормальное описание без html тегов + html: ^0.15.0 dev_dependencies: flutter_test: sdk: flutter - + # добавил в лаб 5 + build_runner: ^2.4.9 + json_serializable: ^6.7.1 flutter_lints: ^4.0.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec -# The following section is specific to Flutter packages. flutter: - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/to/resolution-aware-images - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/to/asset-from-package - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/to/font-from-package