diff --git a/assets/fonts/Correction_Tape.ttf b/assets/fonts/Correction_Tape.ttf new file mode 100644 index 0000000..89bd19d Binary files /dev/null and b/assets/fonts/Correction_Tape.ttf differ diff --git a/lib/card_data.dart b/lib/card_data.dart new file mode 100644 index 0000000..82ef497 --- /dev/null +++ b/lib/card_data.dart @@ -0,0 +1,12 @@ +class CardData { + final String title; + final String artist; + final String year; + final String url; + final List genres; + final List tracks; + final String summary; + final String? imageUrl; + + CardData({required this.title, required this.artist, required this.year, required this.url, required this.genres, required this.tracks, required this.summary, required this.imageUrl}); +} \ No newline at end of file diff --git a/lib/data/dto/album_dto.dart b/lib/data/dto/album_dto.dart new file mode 100644 index 0000000..84794f1 --- /dev/null +++ b/lib/data/dto/album_dto.dart @@ -0,0 +1,49 @@ +import 'package:json_annotation/json_annotation.dart'; +import 'package:uuid/uuid.dart'; + +@JsonSerializable(createToJson: false) +class AlbumDto { + final List? data; + + const AlbumDto({this.data,}); +} + + +@JsonSerializable(createToJson: false) +class AlbumDataDto { + final String id; + final String? title; + final String? artist; + String? year; + List? genres; + List? tracks; + String? summary; + String? url; + final AlbumDataImagesDto? images; + + AlbumDataDto({ + String? id, + this.title, + this.artist, + this.year, + this.genres, + this.tracks, + this.summary, + this.url, + this.images, + }) : id = id ?? const Uuid().v4(); // Генерация id +} + +@JsonSerializable(createToJson: false) +class AlbumDataImagesDto { + final AlbumDataImagesJPGDto? jpg; + + const AlbumDataImagesDto({this.jpg}); +} + +@JsonSerializable(createToJson: false) +class AlbumDataImagesJPGDto { + final String? image_url; + + const AlbumDataImagesJPGDto({this.image_url}); +} \ No newline at end of file diff --git a/lib/data/mapper/album_mapper.dart b/lib/data/mapper/album_mapper.dart new file mode 100644 index 0000000..fa6d2b7 --- /dev/null +++ b/lib/data/mapper/album_mapper.dart @@ -0,0 +1,108 @@ +import 'dart:convert'; + +import 'package:dio/dio.dart'; +import 'package:pmd_labs/data/dto/album_dto.dart'; +import 'package:pmd_labs/card_data.dart'; + +extension AlbumDataDtoMapper on AlbumDataDto { + List fetchAlbums(List albumsData) { + List albums = []; + + for (var album in albumsData) { + // Ищем изображение с самым большим размером + String? albumImage; + + // Ищем наиболее подходящее изображение + List images = album['image'] as List; + var largestImage = images.firstWhere( + (image) => image['size'] == 'mega', + orElse: () => + images.firstWhere( + (image) => image['size'] == 'extralarge', + orElse: () => + images.firstWhere( + (image) => image['size'] == 'large', + orElse: () => images.first // запасной вариант + ) + ) + ); + + albumImage = largestImage['#text'] as String?; + + if (album['name'] != "(null)" && album['artist'] != "(null)") { + albums.add(AlbumDataDto( + id: null, + // Вы можете установить значение id, если оно доступно + title: album['name'] as String?, + artist: album['artist'] as String?, + year: "", + // Год будет заполнен позже + genres: [], + // Позже будет заполнен из второго респонса + tracks: [], + // Позже будет заполнен из второго респонса + summary: "", + // Описание + url: album['url'] as String?, + images: AlbumDataImagesDto( + jpg: AlbumDataImagesJPGDto(image_url: albumImage), + ), + )); + } + } + return albums; + } + + Future fetchAlbumDetails(Map data, + AlbumDataDto album) async { + if (data['album'] != null) { + // Получаем жанры и год + String year = ""; + List genres = []; + + // Находим год в тегах + year = (data['album']?['tags']?['tag'] as List) + .firstWhere( + (tag) => tag['name'].contains(RegExp(r'^\d{4}$')), + orElse: () => null, + )?['name'] ?? "_"; + + // Получаем список жанров + genres = List.from( + (data['album']?['tags']?['tag'] as List? ?? []) + .map((tag) => tag['name'] as String) + ); + + // Заполняем список треков + List tracks = List.from( + (data['album']?['tracks']?['track'] as List? ?? []) + .map((track) => track['name'] as String) + ); + + // Обновляем информацию в нашем DTO альбома + album.year = year; + album.genres = genres; + album.tracks = tracks; + + // Обновляем дополнительную информацию, если необходимо + album.summary = + data['album']?['wiki']?['summary'] ?? "missing";// или аналогичное поле + } + + return album; // возвращаем заполненное DTO + } + + CardData toDomain() { + return CardData( + title: title ?? 'UNKNOWN', + artist: artist ?? 'UNKNOWN', + year: year ?? 'UNKNOWN', + url: url ?? 'UNKNOWN', + summary: summary ?? 'UNKNOWN', + genres: genres ?? ['UNKNOWN'], + tracks: tracks ?? ['UNKNOWN'], + imageUrl: images?.jpg?.image_url ?? + 'UNKNOWN', // Привязываем imageUrl к DTO + ); + } +} \ No newline at end of file diff --git a/lib/data/repositories/album_repository.dart b/lib/data/repositories/album_repository.dart new file mode 100644 index 0000000..e5326cc --- /dev/null +++ b/lib/data/repositories/album_repository.dart @@ -0,0 +1,63 @@ +import 'package:pmd_labs/data/dto/album_dto.dart'; +import 'package:pmd_labs/data/mapper/album_mapper.dart'; // Путь к вашему мапперу +import 'package:dio/dio.dart'; +import 'package:pmd_labs/card_data.dart'; +import 'package:pretty_dio_logger/pretty_dio_logger.dart'; + +abstract class ApiInterface { + Future?> loadData(); +} + +class AlbumRepository extends ApiInterface { + static final Dio _dio = Dio() + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )); + + static const String apiKey = '535d9d508a785fae99bfb492d8f15a58'; + static const String _baseUrl = 'https://api.your_album_api.com'; // Замените на ваш базовый URL + + // Метод для загрузки списка альбомов по названию + @override + Future?> loadData({String? albumName}) async { + albumName ??= 'a'; + final String url = + 'https://ws.audioscrobbler.com/2.0/?method=album.search&album=$albumName&api_key=$apiKey&format=json'; + + try { + final response = await _dio.get(url); + + if (response.statusCode == 200) { + final List albumsData = + AlbumDataDto().fetchAlbums( + response.data['results']['albummatches']['album']); + + return albumsData.map((album) => album.toDomain()).toList(); + } else { + throw Exception('Failed to load albums: ${response.statusCode}'); + } + } catch (e) { + throw Exception('Error during fetching albums: $e'); + } + } + + // Получение информации об альбоме + Future getAlbumInfo(AlbumDataDto album) async { + final String url = + 'https://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=$apiKey&artist=${album + .artist}&album=${album.title}&format=json'; + + try { + final response = await _dio.get(url); + + if (response.statusCode == 200) { + return await AlbumDataDto().fetchAlbumDetails(response.data, album); + } else { + throw Exception('Failed to load album info: ${response.statusCode}'); + } + } catch (e) { + throw Exception('Error during fetching album info: $e'); + } + } +} \ No newline at end of file diff --git a/lib/details_page/detail_page.dart b/lib/details_page/detail_page.dart new file mode 100644 index 0000000..9bccc21 --- /dev/null +++ b/lib/details_page/detail_page.dart @@ -0,0 +1,259 @@ +import 'package:flutter/material.dart'; +import 'package:pmd_labs/card_data.dart'; +import 'package:pmd_labs/data/dto/album_dto.dart'; +import 'package:pmd_labs/data/repositories/album_repository.dart'; + +class DetailsPage extends StatefulWidget { + final CardData data; + + const DetailsPage(this.data, {super.key}); + + @override + _DetailsPageState createState() => _DetailsPageState(); +} + +class _DetailsPageState extends State { + late Future _albumInfoFuture; + late AlbumRepository _repository; + + @override + void initState() { + super.initState(); + _repository = AlbumRepository(); + + if (widget.data.imageUrl == null) { + print("Данные не полностью переданы!"); + } else { + _albumInfoFuture = _fetchAlbumInfo(); + } + } + + Future _fetchAlbumInfo() async { + AlbumDataImagesJPGDto imagesJPGDto = AlbumDataImagesJPGDto( + image_url: widget.data.imageUrl, + ); + + AlbumDataImagesDto imagesDto = AlbumDataImagesDto( + jpg: imagesJPGDto, + ); + + AlbumDataDto albumDto = AlbumDataDto( + title: widget.data.title, + artist: widget.data.artist, + images: imagesDto, + ); + + await _repository.getAlbumInfo(albumDto); + return albumDto; + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: const Color(0xFF231a24), + title: Text( + widget.data.title, + style: Theme + .of(context) + .textTheme + .headlineLarge + ?.copyWith(color: Colors.orange), + ), + ), + body: Container( + color: const Color(0xFF403042), + child: FutureBuilder( + future: _albumInfoFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.waiting) { + return const Center(child: CircularProgressIndicator()); + } else if (snapshot.hasError) { + return Center(child: Text('Error: ${snapshot.error}', style: Theme + .of(context) + .textTheme + .bodyLarge)); + } else if (!snapshot.hasData || snapshot.data == null) { + return const Center(child: Text( + 'No data available', style: TextStyle(color: Colors.white))); + } else { + AlbumDataDto albumDetails = snapshot.data!; + + return SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.only(bottom: 16.0), + child: ClipRRect( + borderRadius: const BorderRadius.all(Radius.circular( + 20)), + child: Image.network( widget.data.imageUrl ?? '', + height: 300, + width: double.infinity, + fit: BoxFit.cover, + ), + ), + ), + // Bloc для названия, исполнителя, года и жанров + _buildInfoBlock(albumDetails), + // Bloc для треков + _buildTracksBlock(albumDetails), + // Bloc для саммари + _buildSummaryBlock(albumDetails), + ], + ), + ); + } + }, + ), + ), + ); + } + + Widget _buildInfoBlock(AlbumDataDto albumDetails) { + return Container( + width: MediaQuery + .of(context) + .size + .width, + margin: const EdgeInsets.only(top: 16, left: 5, right: 5), + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: const Color(0xFF231a24), + border: Border.all(color: Colors.orange), + borderRadius: BorderRadius.circular(10), + ), + child: Column( + children: [ + Text( + widget.data.title, + style: Theme + .of(context) + .textTheme + .headlineLarge + ?.copyWith(color: Colors.orange), + ), + Text( + 'Artist:', + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.orange), + ), + Text( + '${albumDetails.artist}', + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white), + ), + SizedBox(height: 8.0), // Отступ между блоками + + Text( + 'Year:', + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.orange), + ), + Text( + '${albumDetails.year}', + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white), + ), + SizedBox(height: 8.0), // Отступ между блоками + + Text( + 'Genres:', + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.orange), + ), + Text( + '${albumDetails.genres?.join(', ')}', + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white), + ), + ], + ), + ); + } + + Widget _buildTracksBlock(AlbumDataDto albumDetails) { + return Container( + width: MediaQuery + .of(context) + .size + .width, + margin: const EdgeInsets.only(top: 16, left: 5, right: 5), + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: const Color(0xFF231a24), + border: Border.all(color: Colors.orange), + borderRadius: BorderRadius.circular(10), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Tracks:', + style: Theme + .of(context) + .textTheme + .headlineSmall + ?.copyWith(color: Colors.orange), + ), + SizedBox(height: 8.0), + ...albumDetails.tracks!.map((track) => + Padding( + padding: const EdgeInsets.only(bottom: 4.0), + child: Row( + children: [ + const Icon( + Icons.favorite_border_outlined, + color: Colors.purple, + ), + const SizedBox(width: 8.0), + // Отступ между иконкой и текстом + Text( + track, + style: Theme + .of(context) + .textTheme + .bodyMedium + ?.copyWith(color: Colors.white), + ), + ], + ), + )), + ], + ), + ); + } + + Widget _buildSummaryBlock(AlbumDataDto albumDetails) { + return Container( + width: MediaQuery + .of(context) + .size + .width, + margin: const EdgeInsets.only(top: 16, left: 5, right: 5), + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: const Color(0xFF231a24), + border: Border.all(color: Colors.orange), + borderRadius: BorderRadius.circular(10), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Summary:', + style: Theme + .of(context) + .textTheme + .headlineSmall + ?.copyWith(color: Colors.orange), + ), + SizedBox(height: 8.0), // Отступ между заголовком и текстом + Text( + '${albumDetails.summary}', + style: Theme + .of(context) + .textTheme + .bodyMedium + ?.copyWith(color: Colors.white), + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/lib/home_page/card.dart b/lib/home_page/card.dart new file mode 100644 index 0000000..67a08dd --- /dev/null +++ b/lib/home_page/card.dart @@ -0,0 +1,140 @@ +part of 'home_page.dart'; + +class _CardState extends State<_Card> { + bool isLiked = false; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: widget.onTap, + child: Container( + margin: const EdgeInsets.only(top: 16, left: 5, right: 5), + constraints: const BoxConstraints(minHeight: 140), + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: const Color(0xFF231a24), + borderRadius: BorderRadius.circular(20), + border: Border.all( + color: Colors.orange, + width: 6, + ), + ), + child: IntrinsicHeight( + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ClipRRect( + borderRadius: BorderRadius.circular(20), + child: SizedBox( + width: 140, + height: 100, + child: Image.network( + widget.imageUrl ?? '', + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => const Placeholder(), + ), + ), + ), + Flexible( + child: Padding( + padding: const EdgeInsets.only(left: 16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + widget.title, + style: Theme.of(context) + .textTheme + .headlineLarge + ?.copyWith(color: Colors.orange), // Грязно-белый цвет + ), + Text( + widget.artist, + style: Theme.of(context) + .textTheme + .bodyMedium + ?.copyWith(color: Color(0xFFDCDCDC)), // Грязно-белый цвет + ), + ], + ), + ), + ), + Padding( + padding: const EdgeInsets.only(left: 8.0, right: 16, bottom: 16), + child: GestureDetector( + onTap: () { + setState(() { + isLiked = !isLiked; + }); + widget.onLike?.call(widget.title, isLiked); + }, + child: AnimatedSwitcher( + duration: const Duration(milliseconds: 300), + child: isLiked + ? const Icon( + Icons.favorite, + color: Colors.pink, + key: ValueKey(0), + ) + : const Icon( + Icons.favorite_border_outlined, + color: Colors.purple), + key: ValueKey(1), + ), + ), + ) + ], + ), + ), + ), + ); + } +} + +typedef onLikeCallback = void Function(String title, bool isLiked)?; + +class _Card extends StatefulWidget { + final String title; + final String artist; + final String year; + final List genres; + final String? imageUrl; + final onLikeCallback onLike; + final VoidCallback? onTap; + + const _Card(this.title, + {required this.artist, required this.year, required this.genres, this.imageUrl, this.onLike, this.onTap}); + + factory _Card.fromData(CardData data, {onLikeCallback? onLike, VoidCallback? onTap}) { + // Инициализация изображений альбома + AlbumDataImagesJPGDto imagesJPGDto = AlbumDataImagesJPGDto( + image_url: data.imageUrl, // Это URL изображений + ); + + AlbumDataImagesDto imagesDto = AlbumDataImagesDto( + jpg: imagesJPGDto, + ); + + // Создаем DTO альбома + AlbumDataDto albumDto = AlbumDataDto( + title: data.title, + artist: data.artist, + images: imagesDto, + ); + + // Предполагается, что year и genres уже есть в data + return _Card( + albumDto.title ?? 'UNKNOWN', + artist: albumDto.artist ?? 'UNKNOWN', + year: data.year, + genres: data.genres, + imageUrl: data.imageUrl, + onLike: onLike, + onTap: onTap, + ); + } + + @override + State<_Card> createState() => _CardState(); +} \ No newline at end of file diff --git a/lib/home_page/home_page.dart b/lib/home_page/home_page.dart new file mode 100644 index 0000000..0195e09 --- /dev/null +++ b/lib/home_page/home_page.dart @@ -0,0 +1,126 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:pmd_labs/data/repositories/album_repository.dart'; +import 'package:pmd_labs/details_page/detail_page.dart'; + +import 'package:pmd_labs/card_data.dart'; + +import '../data/dto/album_dto.dart'; + +part 'card.dart'; + + +class MyHomePage extends StatefulWidget { + const MyHomePage({super.key, required this.title}); + + // This widget is the home page of your application. It is stateful, meaning + // that it has a State object (defined below) that contains fields that affect + // how it looks. + + // This class is the configuration for the state. It holds the values (in this + // case the title) provided by the parent (in this case the App widget) and + // used by the build method of the State. Fields in a Widget subclass are + // always marked "final". + + final String title; + + @override + State createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: const Color(0xFF231a24), // Цвет фона AppBar + title: Text( + widget.title, + style: Theme.of(context) + .textTheme + .headlineLarge + ?.copyWith(color: Colors.orange), // Цвет текста заголовка + ), + ), + body: Container( + color: const Color(0xFF403042), + child: const Body(), // Ваш виджет Body + ), + ); + } +} + +class Body extends StatefulWidget { + const Body({super.key}); + + @override + State createState() => _BodyState(); +} + +class _BodyState extends State { + final AlbumRepository repo = AlbumRepository(); + var data = AlbumRepository().loadData(); + + void _showSnackbar(BuildContext context, String title, bool isLiked) { + WidgetsBinding.instance.addPostFrameCallback((_) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text( + 'Лайк на $title ${isLiked ? 'поставлен' : 'убран'}', + style: Theme + .of(context) + .textTheme + .bodyLarge, + ), + backgroundColor: Colors.orangeAccent, + duration: const Duration(seconds: 1), + )); + }); + } + + void _navToDetails(BuildContext context, CardData data) { + Navigator.push( + context, CupertinoPageRoute(builder: (context) => DetailsPage(data))); + } + + + @override + Widget build(BuildContext context) { + return Padding( + padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(12), + child: CupertinoSearchTextField( + onChanged: (search) { + setState(() { + data = repo.loadData(albumName:search); + }); + }, + style: TextStyle(color: Colors.orange, fontFamily: 'Correction_Tape'), + ), + ), + Expanded(child: Center( + child: FutureBuilder?>( + future: data, + builder: (context, snapshot) => + SingleChildScrollView( + child: snapshot.hasData ? Column( + mainAxisAlignment: MainAxisAlignment.center, + children: snapshot.data!.map((data) { + return _Card.fromData(data, + onLike: (String title, bool isLiked) => + _showSnackbar(context, title, isLiked), + onTap: () => _navToDetails(context, data),); + }).toList() ?? [], + ) + : const CircularProgressIndicator(), + ), + ), + ), + ) + ], + + )); + }} + diff --git a/lib/main.dart b/lib/main.dart index f177dc1..b31ba09 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:pmd_labs/home_page/home_page.dart'; void main() { runApp(const MyApp()); @@ -7,64 +8,22 @@ void main() { class MyApp extends StatelessWidget { const MyApp({super.key}); - @override + // This widget is the root of your application. + @override Widget build(BuildContext context) { return MaterialApp( title: 'Flutter Demo', theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + textTheme: const TextTheme( + headlineLarge: TextStyle(fontFamily: 'Correction_Tape'), + bodyLarge: TextStyle(fontFamily: 'Correction_Tape'), + bodyMedium: TextStyle(fontFamily: 'Correction_Tape'), + headlineSmall: TextStyle(fontFamily: 'Correction_Tape'), + ), + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), useMaterial3: true, ), - home: const MyHomePage(title: 'Иевлева Милана Дмитриевна'), + home: const MyHomePage(title: 'Catalog of Music Albums'), ); } -} - -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - int _counter = 0; - - void _incrementCounter() { - setState(() { - _counter++; - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: Text(widget.title), - ), - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headlineMedium, - ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), ); - } -} +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 07514d0..330b067 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,35 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + url: "https://pub.dev" + source: hosted + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + url: "https://pub.dev" + source: hosted + version: "6.7.0" + args: + dependency: transitive + description: + name: args + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" + source: hosted + version: "2.6.0" async: dependency: transitive description: @@ -17,6 +46,70 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + url: "https://pub.dev" + source: hosted + version: "2.4.13" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + url: "https://pub.dev" + source: hosted + version: "7.3.2" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + url: "https://pub.dev" + source: hosted + version: "8.9.2" characters: dependency: transitive description: @@ -25,6 +118,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" clock: dependency: transitive description: @@ -33,6 +134,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + url: "https://pub.dev" + source: hosted + version: "4.10.0" collection: dependency: transitive description: @@ -41,6 +150,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + crypto: + dependency: transitive + description: + name: crypto + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" + source: hosted + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -49,6 +174,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + url: "https://pub.dev" + source: hosted + version: "2.3.7" + dio: + dependency: "direct main" + description: + name: dio + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + url: "https://pub.dev" + source: hosted + version: "5.7.0" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + url: "https://pub.dev" + source: hosted + version: "2.0.0" fake_async: dependency: transitive description: @@ -57,6 +206,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -75,6 +240,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" + http: + dependency: "direct main" + description: + name: http + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" + source: hosted + version: "0.13.6" + 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 +352,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 +392,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 +416,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 +509,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 +541,30 @@ 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" + uuid: + dependency: "direct main" + description: + name: uuid + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" + source: hosted + version: "3.0.7" 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 37f6555..5ccf91b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,10 +35,18 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + json_annotation: ^4.9.0 + dio: ^5.4.2+1 + pretty_dio_logger: ^1.3.1 + http: ^0.13.3 + uuid: ^3.0.5 dev_dependencies: flutter_test: sdk: flutter + build_runner: ^2.4.9 + json_serializable: ^6.7.1 + http: ^0.13.3 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is @@ -69,6 +77,8 @@ flutter: # 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 @@ -88,3 +98,7 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/to/font-from-package + fonts: + - family: Correction_Tape + fonts: + - asset: assets/fonts/Correction_Tape.ttf \ No newline at end of file