From 7cede4272f51aeade386120fa8045283ad08def2 Mon Sep 17 00:00:00 2001 From: Yourdax Date: Wed, 11 Dec 2024 05:09:29 +0400 Subject: [PATCH] =?UTF-8?q?=D1=87=D1=8C=D1=8E=D1=82=D1=8C=20=D1=87=D1=8C?= =?UTF-8?q?=D1=8E=D1=82=D1=8C=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB=D0=BE=D1=81?= =?UTF-8?q?=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/dtos/quotes_dto.dart | 23 + lib/data/mappers/quotes_mapper.dart | 13 + .../presentation/dialogs/error_dialog.dart | 33 + .../presentation/dialogs/show_dialog.dart | 12 + lib/data/repositories/api_interface.dart | 7 + lib/data/repositories/quotes_repository.dart | 39 ++ lib/main.dart | 187 +++--- lib/test/home_page.dart | 176 ------ lib/test/quote_card.dart | 55 -- pubspec.lock | 572 +++++++++++++++++- pubspec.yaml | 95 +-- 11 files changed, 793 insertions(+), 419 deletions(-) create mode 100644 lib/data/dtos/quotes_dto.dart create mode 100644 lib/data/mappers/quotes_mapper.dart create mode 100644 lib/data/presentation/dialogs/error_dialog.dart create mode 100644 lib/data/presentation/dialogs/show_dialog.dart create mode 100644 lib/data/repositories/api_interface.dart create mode 100644 lib/data/repositories/quotes_repository.dart delete mode 100644 lib/test/home_page.dart delete mode 100644 lib/test/quote_card.dart diff --git a/lib/data/dtos/quotes_dto.dart b/lib/data/dtos/quotes_dto.dart new file mode 100644 index 0000000..7898b28 --- /dev/null +++ b/lib/data/dtos/quotes_dto.dart @@ -0,0 +1,23 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'quotes_dto.g.dart'; + +@JsonSerializable(createToJson: false) +class QuotesDto { + final List? quotes; + + const QuotesDto({this.quotes}); + + factory QuotesDto.fromJson(Map json) => _$QuotesDtoFromJson(json); +} + +@JsonSerializable(createToJson: false) +class QuoteDataDto { + final String? text; + final String? author; + final String? imageUrl; + + const QuoteDataDto({this.text, this.author, this.imageUrl}); + + factory QuoteDataDto.fromJson(Map json) => _$QuoteDataDtoFromJson(json); +} \ No newline at end of file diff --git a/lib/data/mappers/quotes_mapper.dart b/lib/data/mappers/quotes_mapper.dart new file mode 100644 index 0000000..edd9769 --- /dev/null +++ b/lib/data/mappers/quotes_mapper.dart @@ -0,0 +1,13 @@ +import '/data/dtos/quotes_dto.dart'; +import '/main.dart'; + +const _imagePlaceholder = + 'https://cdn-icons-png.flaticon.com/128/17818/17818874.png'; + +extension QuoteDtoToModel on QuoteDataDto { + Quote toDomain() => Quote( + text ?? 'Без текста', + author ?? 'Неизвестный автор', + imageUrl ?? _imagePlaceholder, + ); +} \ No newline at end of file diff --git a/lib/data/presentation/dialogs/error_dialog.dart b/lib/data/presentation/dialogs/error_dialog.dart new file mode 100644 index 0000000..5431cf6 --- /dev/null +++ b/lib/data/presentation/dialogs/error_dialog.dart @@ -0,0 +1,33 @@ +import 'package:flutter/material.dart'; + +class ErrorDialog extends StatelessWidget { + final String? error; + + const ErrorDialog(this.error, {super.key}); + + @override + Widget build(BuildContext context) { + return Center( + child: Material( + color: Colors.transparent, + child: Container( + margin: const EdgeInsets.all(36), + padding: const EdgeInsets.all(20), + decoration: const BoxDecoration( + color: Colors.grey, borderRadius: BorderRadius.all(Radius.circular(10))), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + const Icon(Icons.error, color: Colors.white), + const SizedBox(height: 12), + Text( + error ?? 'UNKNOWN', + style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white), + ), + ], + ), + ), + ), + ); + } +} \ No newline at end of file diff --git a/lib/data/presentation/dialogs/show_dialog.dart b/lib/data/presentation/dialogs/show_dialog.dart new file mode 100644 index 0000000..39bf3da --- /dev/null +++ b/lib/data/presentation/dialogs/show_dialog.dart @@ -0,0 +1,12 @@ +import 'package:flutter/material.dart'; +import 'error_dialog.dart'; + +void showErrorDialog( + BuildContext context, { + required String error, + }) { + showDialog( + context: context, + builder: (_) => ErrorDialog(error), + ); +} \ 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..65bb47a --- /dev/null +++ b/lib/data/repositories/api_interface.dart @@ -0,0 +1,7 @@ +import '/main.dart'; + +typedef OnErrorCallback = void Function(String? error); + +abstract class ApiInterface { + Future?> loadData({OnErrorCallback? onError}); +} diff --git a/lib/data/repositories/quotes_repository.dart b/lib/data/repositories/quotes_repository.dart new file mode 100644 index 0000000..ddd37a9 --- /dev/null +++ b/lib/data/repositories/quotes_repository.dart @@ -0,0 +1,39 @@ +import 'package:dio/dio.dart'; +import '/data/dtos/quotes_dto.dart'; +import '/data/mappers/quotes_mapper.dart'; +import '/data/repositories/api_interface.dart'; +import '/main.dart'; +import '/data/presentation/dialogs/show_dialog.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; + +class QuotesRepository extends ApiInterface { + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )) + ..options.headers = { + 'Authorization': 'Bearer 82ccaa45c8344de4ac008b2487d33361', // Add the API key here + }; + + static const String _baseUrl = 'https://favqs.com/api'; + + @override + Future?> loadData({String? q, OnErrorCallback? onError}) async { + try { + const String url = '$_baseUrl/quotes'; + + final Response response = await _dio.get>( + url, + queryParameters: q != null ? {'filter[text_cont]': q} : null, + ); + + final QuotesDto dto = QuotesDto.fromJson(response.data as Map); + final List? data = dto.quotes?.map((e) => e.toDomain()).toList(); + return data; + } on DioException catch (e) { + onError?.call(e.response?.statusMessage); + return null; + } + } +} diff --git a/lib/main.dart b/lib/main.dart index 4cbcad4..16e6a8a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import '/data/repositories/quotes_repository.dart'; void main() { runApp(const MyApp()); @@ -27,6 +28,7 @@ class Quote { bool isFavorite; Quote(this.text, this.author, this.imagePath, [this.isFavorite = false]); + void toggleFavorite() { isFavorite = !isFavorite; } @@ -34,6 +36,7 @@ class Quote { class MyHomePage extends StatefulWidget { const MyHomePage({super.key, required this.title}); + final String title; @override @@ -41,49 +44,49 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - final TextEditingController quoteTextController = TextEditingController(); - final TextEditingController quoteAuthorController = TextEditingController(); - + final TextEditingController searchController = TextEditingController(); final List _quotes = []; - final String defaultImagePath = - 'https://cdn-icons-png.flaticon.com/128/17818/17818874.png'; + final List _filteredQuotes = []; + + final QuotesRepository _quotesRepository = QuotesRepository(); @override void initState() { super.initState(); - _quotes.add(Quote( - 'Сила воли — это ключ к успеху.', - 'Аноним', - 'https://cdn-icons-png.flaticon.com/128/17818/17818880.png', - )); - _quotes.add(Quote( - 'Вера в себя — это первый шаг к победе.', - 'Аноним', - 'https://cdn-icons-png.flaticon.com/128/17818/17818889.png', - )); - _quotes.add(Quote( - 'Не бойся быть отличным, бойся быть обычным.', - 'Аноним', - 'https://cdn-icons-png.flaticon.com/128/17818/17818899.png', - )); - } + _loadQuotes(); - void _addQuote() { - setState(() { - final newQuote = Quote( - quoteTextController.text.addQuotesIfMissing().capitalize(), - quoteAuthorController.text.capitalize(), - defaultImagePath, - ); - _quotes.add(newQuote); - quoteTextController.clear(); - quoteAuthorController.clear(); + searchController.addListener(() { + _filterQuotes(searchController.text); }); } - void _removeQuote(int index) { + Future _loadQuotes() async { + final quotes = await _quotesRepository.loadData(onError: (error) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Ошибка загрузки: $error')), + ); + }); + if (quotes != null) { + setState(() { + _quotes.addAll(quotes); + _filteredQuotes.addAll(quotes); + }); + } + } + + void _filterQuotes(String query) { setState(() { - _quotes.removeAt(index); + if (query.isEmpty) { + _filteredQuotes.clear(); + _filteredQuotes.addAll(_quotes); + } else { + _filteredQuotes.clear(); + _filteredQuotes.addAll( + _quotes.where((quote) => + quote.text.toLowerCase().contains(query.toLowerCase()) || + quote.author.toLowerCase().contains(query.toLowerCase())), + ); + } }); } @@ -97,25 +100,28 @@ class _MyHomePageState extends State { ), body: Column( children: [ - const Padding( - padding: EdgeInsets.all(16.0), - child: Text( - 'Список цитат', - style: TextStyle(fontSize: 20, fontWeight: FontWeight.normal), + Padding( + padding: const EdgeInsets.all(16.0), + child: TextField( + controller: searchController, + decoration: const InputDecoration( + labelText: 'Поиск', + prefixIcon: Icon(Icons.search), + ), ), ), Expanded( - child: _quotes.isEmpty + child: _filteredQuotes.isEmpty ? const Center( child: Text( - 'Нет добавленных цитат. Добавьте первую!', + 'Нет цитат для отображения.', style: TextStyle(fontSize: 18, color: Colors.grey), ), ) : ListView.builder( - itemCount: _quotes.length, + itemCount: _filteredQuotes.length, itemBuilder: (context, index) { - final quote = _quotes[index]; + final quote = _filteredQuotes[index]; return Card( margin: const EdgeInsets.symmetric( vertical: 8.0, @@ -138,37 +144,26 @@ class _MyHomePageState extends State { fontSize: 18, fontWeight: FontWeight.w500), ), subtitle: Text('- ${quote.author}'), - trailing: Row( - mainAxisSize: MainAxisSize.min, - children: [ - IconButton( - icon: Icon( - quote.isFavorite - ? Icons.favorite - : Icons.favorite_border, - color: quote.isFavorite ? Colors.red : null, + trailing: IconButton( + icon: Icon( + quote.isFavorite + ? Icons.favorite + : Icons.favorite_border, + color: quote.isFavorite ? Colors.red : null, + ), + onPressed: () { + setState(() { + quote.toggleFavorite(); + }); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(quote.isFavorite + ? 'Цитата добавлена в избранное' + : 'Цитата удалена из избранного'), + duration: const Duration(seconds: 2), ), - onPressed: () { - setState(() { - quote.toggleFavorite(); - }); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(quote.isFavorite - ? 'Цитата добавлена в избранное' - : 'Цитата удалена из избранного'), - duration: const Duration(seconds: 2), - ), - ); - }, - ), - IconButton( - icon: const Icon(Icons.delete), - onPressed: () { - _removeQuote(index); - }, - ), - ], + ); + }, ), onTap: () { Navigator.push( @@ -180,61 +175,19 @@ class _MyHomePageState extends State { ); }, ), - ); }, ), ), ], ), - floatingActionButton: FloatingActionButton( - onPressed: () { - showDialog( - context: context, - builder: (context) { - return AlertDialog( - title: const Text('Новая цитата'), - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - TextField( - controller: quoteTextController, - decoration: const InputDecoration( - hintText: 'Введите текст цитаты', - ), - ), - const SizedBox(height: 8), - TextField( - controller: quoteAuthorController, - decoration: const InputDecoration( - hintText: 'Введите автора цитаты', - ), - ), - ], - ), - actions: [ - TextButton( - onPressed: () { - _addQuote(); - Navigator.of(context).pop(); - }, - child: const Text('Добавить'), - ), - ], - ); - }, - ); - }, - tooltip: 'Добавить цитату', - child: const Icon(Icons.format_quote), - ), - //floatingActionButtonLocation: FloatingActionButtonLocation.endDocked, ); } } class QuoteDetailScreen extends StatelessWidget { final Quote quote; + const QuoteDetailScreen({super.key, required this.quote}); @override @@ -275,6 +228,10 @@ class QuoteDetailScreen extends StatelessWidget { } } + + + + extension StringExtension on String { String capitalize() { return split(' ').map((word) { diff --git a/lib/test/home_page.dart b/lib/test/home_page.dart deleted file mode 100644 index 7a5cfef..0000000 --- a/lib/test/home_page.dart +++ /dev/null @@ -1,176 +0,0 @@ -import 'package:flutter/material.dart'; -import './quote_card.dart'; - -class Quote { - final String text; - final String author; - final String imagePath; - bool isFavorite; - - Quote(this.text, this.author, this.imagePath, [this.isFavorite = false]); - - void toggleFavorite() { - isFavorite = !isFavorite; - } -} - -class HomePage extends StatefulWidget { - const HomePage({super.key}); - - @override - State createState() => _HomePageState(); -} - -class _HomePageState extends State { - final TextEditingController quoteTextController = TextEditingController(); - final TextEditingController quoteAuthorController = TextEditingController(); - - final List _quotes = []; - final String defaultImagePath = - 'https://cdn-icons-png.flaticon.com/128/17818/17818874.png'; - - @override - void initState() { - super.initState(); - _quotes.addAll([ - Quote( - 'Сила воли — это ключ к успеху.', - 'Аноним', - 'https://cdn-icons-png.flaticon.com/128/17818/17818880.png', - ), - Quote( - 'Вера в себя — это первый шаг к победе.', - 'Аноним', - 'https://cdn-icons-png.flaticon.com/128/17818/17818889.png', - ), - Quote( - 'Не бойся быть отличным, бойся быть обычным.', - 'Аноним', - 'https://cdn-icons-png.flaticon.com/128/17818/17818899.png', - ), - ]); - } - - void _addQuote() { - setState(() { - final newQuote = Quote( - quoteTextController.text.addQuotesIfMissing().capitalize(), - quoteAuthorController.text.capitalize(), - defaultImagePath, - ); - _quotes.add(newQuote); - quoteTextController.clear(); - quoteAuthorController.clear(); - }); - } - - void _removeQuote(int index) { - setState(() { - _quotes.removeAt(index); - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Цитаты'), - backgroundColor: Theme.of(context).colorScheme.primaryContainer, - foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer, - ), - body: Column( - children: [ - const Padding( - padding: EdgeInsets.all(16.0), - child: Text( - 'Список цитат', - style: TextStyle(fontSize: 20, fontWeight: FontWeight.normal), - ), - ), - Expanded( - child: _quotes.isEmpty - ? const Center( - child: Text( - 'Нет добавленных цитат. Добавьте первую!', - style: TextStyle(fontSize: 18, color: Colors.grey), - ), - ) - : ListView.builder( - itemCount: _quotes.length, - itemBuilder: (context, index) { - return QuoteCard( - quote: _quotes[index], - onDelete: () => _removeQuote(index), - onFavoriteToggle: () { - setState(() { - _quotes[index].toggleFavorite(); - }); - }, - ); - }, - ), - ), - ], - ), - floatingActionButton: FloatingActionButton( - onPressed: () { - showDialog( - context: context, - builder: (context) { - return AlertDialog( - title: const Text('Новая цитата'), - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - TextField( - controller: quoteTextController, - decoration: const InputDecoration( - hintText: 'Введите текст цитаты', - ), - ), - const SizedBox(height: 8), - TextField( - controller: quoteAuthorController, - decoration: const InputDecoration( - hintText: 'Введите автора цитаты', - ), - ), - ], - ), - actions: [ - TextButton( - onPressed: () { - _addQuote(); - Navigator.of(context).pop(); - }, - child: const Text('Добавить'), - ), - ], - ); - }, - ); - }, - tooltip: 'Добавить цитату', - child: const Icon(Icons.format_quote), - ), - ); - } -} - -extension StringExtension on String { - String capitalize() { - return split(' ').map((word) { - if (word.isNotEmpty) { - return '${word[0].toUpperCase()}${word.substring(1).toLowerCase()}'; - } - return word; - }).join(' '); - } - - String addQuotesIfMissing() { - if (startsWith('\"') && endsWith('\"')) return this; - if (startsWith('\"') && !endsWith('\"')) return '$this\"'; - if (endsWith('\"') && !startsWith('\"')) return '\"$this'; - return '\"$this\"'; - } -} diff --git a/lib/test/quote_card.dart b/lib/test/quote_card.dart deleted file mode 100644 index 64c5e68..0000000 --- a/lib/test/quote_card.dart +++ /dev/null @@ -1,55 +0,0 @@ -import 'package:flutter/material.dart'; -import './home_page.dart'; - -class QuoteCard extends StatelessWidget { - final Quote quote; - final VoidCallback onDelete; - final VoidCallback onFavoriteToggle; - - const QuoteCard({ - super.key, - required this.quote, - required this.onDelete, - required this.onFavoriteToggle, - }); - - @override - Widget build(BuildContext context) { - return Card( - margin: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 10.0), - child: ListTile( - contentPadding: const EdgeInsets.all(8.0), - leading: SizedBox( - width: 50.0, - child: Image.network( - quote.imagePath, - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => - const Icon(Icons.error, color: Colors.red), - ), - ), - title: Text( - quote.text, - style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w500), - ), - subtitle: Text('- ${quote.author}'), - trailing: Row( - mainAxisSize: MainAxisSize.min, - children: [ - IconButton( - icon: Icon( - quote.isFavorite ? Icons.favorite : Icons.favorite_border, - color: quote.isFavorite ? Colors.red : null, - ), - onPressed: onFavoriteToggle, - ), - IconButton( - icon: const Icon(Icons.delete), - onPressed: onDelete, - ), - ], - ), - ), - ); - } -} diff --git a/pubspec.lock b/pubspec.lock index cbb6965..65e7e99 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,43 @@ # 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" + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" + args: + dependency: transitive + description: + name: args + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" + source: hosted + version: "2.6.0" async: dependency: transitive description: @@ -9,6 +46,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.11.0" + bloc: + dependency: transitive + description: + name: bloc + sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" + url: "https://pub.dev" + source: hosted + version: "8.1.4" boolean_selector: dependency: transitive description: @@ -17,6 +62,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 +134,22 @@ 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" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" + source: hosted + version: "0.4.2" clock: dependency: transitive description: @@ -33,6 +158,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 +174,38 @@ 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" + copy_with_extension: + dependency: transitive + description: + name: copy_with_extension + sha256: ed472ae80d807094d7a7d7ef67901f8167d18c7998e6db81785a51364aede627 + url: "https://pub.dev" + source: hosted + version: "6.0.0" + copy_with_extension_gen: + dependency: "direct main" + description: + name: copy_with_extension_gen + sha256: "0be2694d3d50df16d91c04e7444181bfb2a0ad8a3b169d58de0c38a69864e4bd" + url: "https://pub.dev" + source: hosted + version: "6.0.0" + 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 +214,38 @@ 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" + equatable: + dependency: "direct main" + description: + name: equatable + sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" + url: "https://pub.dev" + source: hosted + version: "2.0.7" fake_async: dependency: transitive description: @@ -57,24 +254,165 @@ 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 source: sdk version: "0.0.0" + flutter_bloc: + dependency: "direct main" + description: + name: flutter_bloc + sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a + url: "https://pub.dev" + source: hosted + version: "8.1.6" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5" + url: "https://pub.dev" + source: hosted + version: "0.14.2" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123" + url: "https://pub.dev" + source: hosted + version: "2.0.16" flutter_test: dependency: "direct dev" 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: + dependency: transitive + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.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" + image: + dependency: transitive + description: + name: image + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + url: "https://pub.dev" + source: hosted + version: "4.3.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + url: "https://pub.dev" + source: hosted + version: "0.19.0" + 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: @@ -103,10 +441,26 @@ packages: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.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 +485,30 @@ 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" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.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 +517,99 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + 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" + provider: + dependency: transitive + description: + name: provider + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" + source: hosted + version: "6.1.2" + 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 +634,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 +666,46 @@ 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_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" + url: "https://pub.dev" + source: hosted + version: "1.1.15" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" + url: "https://pub.dev" + source: hosted + version: "1.1.12" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" + url: "https://pub.dev" + source: hosted + version: "1.1.16" vector_math: dependency: transitive description: @@ -208,6 +722,54 @@ 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" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.5.4 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7ac63e5..3d45f9b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,90 +1,49 @@ name: pmu_flutter_labs description: "A new Flutter project." -# The following line prevents the package from being accidentally published to -# pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# In Windows, build-name is used as the major, minor, and patch parts -# of the product and file versions while build-number is used as the build suffix. +publish_to: 'none' version: 1.0.0+1 environment: sdk: ^3.5.4 -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. dependencies: flutter: sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. + # Виджеты cupertino_icons: ^1.0.8 + flutter_svg: ^2.0.16 + + # Сетевое взаимодействие + json_annotation: ^4.8.1 + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 + + # BLoC + equatable: ^2.0.5 + flutter_bloc: ^8.1.5 + copy_with_extension_gen: ^6.0.0 + + # Localization + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + + #shared_preferences: ^2.0.0 dev_dependencies: flutter_test: sdk: flutter + flutter_lints: ^5.0.0 + # Иконки + flutter_launcher_icons: ^0.14.2 + # Сетевое взаимодействие + 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 - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. - 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. + generate: true 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