diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launch.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launch.xml new file mode 100644 index 0000000..55aebf9 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launch.xml @@ -0,0 +1,3 @@ + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..55aebf9 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,3 @@ + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launch.png b/android/app/src/main/res/mipmap-hdpi/ic_launch.png new file mode 100644 index 0000000..2b0ce7a Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launch.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launch.png b/android/app/src/main/res/mipmap-mdpi/ic_launch.png new file mode 100644 index 0000000..ab7e632 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launch.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launch.png b/android/app/src/main/res/mipmap-xhdpi/ic_launch.png new file mode 100644 index 0000000..5bba9c2 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launch.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launch.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launch.png new file mode 100644 index 0000000..407c2ba Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launch.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launch.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launch.png new file mode 100644 index 0000000..8a9bfe8 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launch.png differ diff --git a/assets/icon.jpeg b/assets/icon.jpeg new file mode 100644 index 0000000..9d844b4 Binary files /dev/null and b/assets/icon.jpeg differ diff --git a/assets/icon.jpg b/assets/icon.jpg new file mode 100644 index 0000000..f8923c5 Binary files /dev/null and b/assets/icon.jpg differ diff --git a/assets/svg/ru.svg b/assets/svg/ru.svg new file mode 100644 index 0000000..52ca896 --- /dev/null +++ b/assets/svg/ru.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + diff --git a/assets/svg/uk.svg b/assets/svg/uk.svg new file mode 100644 index 0000000..cc90264 --- /dev/null +++ b/assets/svg/uk.svg @@ -0,0 +1,45 @@ + + + + + + + + + + diff --git a/l10n.yaml b/l10n.yaml new file mode 100644 index 0000000..d26d702 --- /dev/null +++ b/l10n.yaml @@ -0,0 +1,6 @@ +arb-dir: l10n +template-arb-file: app_ru.arb +output-localization-file: app_locale.dart +output-dir: lib/components/locale/l10n +output-class: AppLocale +synthetic-package: false \ No newline at end of file diff --git a/l10n/app_en.arb b/l10n/app_en.arb new file mode 100644 index 0000000..163cefe --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,8 @@ +{ + "@@locale": "en", + + "search": "Search", + "liked": "liked!", + "disliked": "unliked" + +} diff --git a/l10n/app_ru.arb b/l10n/app_ru.arb new file mode 100644 index 0000000..27bca94 --- /dev/null +++ b/l10n/app_ru.arb @@ -0,0 +1,7 @@ +{ + "@@locale": "ru", + + "search": "Поиск", + "liked": "понравился!", + "disliked": "разонравился" +} diff --git a/lib/card_data.dart b/lib/card_data.dart index 801dd5c..7b7a60d 100644 --- a/lib/card_data.dart +++ b/lib/card_data.dart @@ -22,5 +22,4 @@ class CardData { required this.summary, this.imageUrl, }); - -} \ No newline at end of file +} diff --git a/lib/components/extension/context_x.dart b/lib/components/extension/context_x.dart new file mode 100644 index 0000000..fb0db87 --- /dev/null +++ b/lib/components/extension/context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/widgets.dart'; +import 'package:pmd_labs/components/locale/l10n/app_locale.dart'; + +extension LocalContextX on BuildContext { + AppLocale get locale => AppLocale.of(this)!; +} diff --git a/lib/components/locale/l10n/app_locale.dart b/lib/components/locale/l10n/app_locale.dart new file mode 100644 index 0000000..1c601cd --- /dev/null +++ b/lib/components/locale/l10n/app_locale.dart @@ -0,0 +1,147 @@ +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:intl/intl.dart' as intl; + +import 'app_locale_en.dart'; +import 'app_locale_ru.dart'; + +// ignore_for_file: type=lint + +/// Callers can lookup localized strings with an instance of AppLocale +/// returned by `AppLocale.of(context)`. +/// +/// Applications need to include `AppLocale.delegate()` in their app's +/// `localizationDelegates` list, and the locales they support in the app's +/// `supportedLocales` list. For example: +/// +/// ```dart +/// import 'l10n/app_locale.dart'; +/// +/// return MaterialApp( +/// localizationsDelegates: AppLocale.localizationsDelegates, +/// supportedLocales: AppLocale.supportedLocales, +/// home: MyApplicationHome(), +/// ); +/// ``` +/// +/// ## Update pubspec.yaml +/// +/// Please make sure to update your pubspec.yaml to include the following +/// packages: +/// +/// ```yaml +/// dependencies: +/// # Internationalization support. +/// flutter_localizations: +/// sdk: flutter +/// intl: any # Use the pinned version from flutter_localizations +/// +/// # Rest of dependencies +/// ``` +/// +/// ## iOS Applications +/// +/// iOS applications define key application metadata, including supported +/// locales, in an Info.plist file that is built into the application bundle. +/// To configure the locales supported by your app, you’ll need to edit this +/// file. +/// +/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file. +/// Then, in the Project Navigator, open the Info.plist file under the Runner +/// project’s Runner folder. +/// +/// Next, select the Information Property List item, select Add Item from the +/// Editor menu, then select Localizations from the pop-up menu. +/// +/// Select and expand the newly-created Localizations item then, for each +/// locale your application supports, add a new item and select the locale +/// you wish to add from the pop-up menu in the Value field. This list should +/// be consistent with the languages listed in the AppLocale.supportedLocales +/// property. +abstract class AppLocale { + AppLocale(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString()); + + final String localeName; + + static AppLocale? of(BuildContext context) { + return Localizations.of(context, AppLocale); + } + + static const LocalizationsDelegate delegate = _AppLocaleDelegate(); + + /// A list of this localizations delegate along with the default localizations + /// delegates. + /// + /// Returns a list of localizations delegates containing this delegate along with + /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate, + /// and GlobalWidgetsLocalizations.delegate. + /// + /// Additional delegates can be added by appending to this list in + /// MaterialApp. This list does not have to be used at all if a custom list + /// of delegates is preferred or required. + static const List> localizationsDelegates = >[ + delegate, + GlobalMaterialLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + ]; + + /// A list of this localizations delegate's supported locales. + static const List supportedLocales = [ + Locale('en'), + Locale('ru') + ]; + + /// No description provided for @search. + /// + /// In ru, this message translates to: + /// **'Поиск'** + String get search; + + /// No description provided for @liked. + /// + /// In ru, this message translates to: + /// **'понравился!'** + String get liked; + + /// No description provided for @disliked. + /// + /// In ru, this message translates to: + /// **'разонравился'** + String get disliked; +} + +class _AppLocaleDelegate extends LocalizationsDelegate { + const _AppLocaleDelegate(); + + @override + Future load(Locale locale) { + return SynchronousFuture(lookupAppLocale(locale)); + } + + @override + bool isSupported(Locale locale) => ['en', 'ru'].contains(locale.languageCode); + + @override + bool shouldReload(_AppLocaleDelegate old) => false; +} + +AppLocale lookupAppLocale(Locale locale) { + + + // Lookup logic when only language code is specified. + switch (locale.languageCode) { + case 'en': return AppLocaleEn(); + case 'ru': return AppLocaleRu(); + } + + throw FlutterError( + 'AppLocale.delegate failed to load unsupported locale "$locale". This is likely ' + 'an issue with the localizations generation tool. Please file an issue ' + 'on GitHub with a reproducible sample app and the gen-l10n configuration ' + 'that was used.' + ); +} diff --git a/lib/components/locale/l10n/app_locale_en.dart b/lib/components/locale/l10n/app_locale_en.dart new file mode 100644 index 0000000..362a0d2 --- /dev/null +++ b/lib/components/locale/l10n/app_locale_en.dart @@ -0,0 +1,17 @@ +import 'app_locale.dart'; + +// ignore_for_file: type=lint + +/// The translations for English (`en`). +class AppLocaleEn extends AppLocale { + AppLocaleEn([String locale = 'en']) : super(locale); + + @override + String get search => 'Search'; + + @override + String get liked => 'liked!'; + + @override + String get disliked => 'unliked'; +} diff --git a/lib/components/locale/l10n/app_locale_ru.dart b/lib/components/locale/l10n/app_locale_ru.dart new file mode 100644 index 0000000..e1485c0 --- /dev/null +++ b/lib/components/locale/l10n/app_locale_ru.dart @@ -0,0 +1,17 @@ +import 'app_locale.dart'; + +// ignore_for_file: type=lint + +/// The translations for Russian (`ru`). +class AppLocaleRu extends AppLocale { + AppLocaleRu([String locale = 'ru']) : super(locale); + + @override + String get search => 'Поиск'; + + @override + String get liked => 'понравился!'; + + @override + String get disliked => 'разонравился'; +} diff --git a/lib/components/resources.g.dart b/lib/components/resources.g.dart new file mode 100644 index 0000000..9645894 --- /dev/null +++ b/lib/components/resources.g.dart @@ -0,0 +1,10 @@ +/// Generate by [asset_generator](https://github.com/fluttercandies/flutter_asset_generator) library. +/// PLEASE DO NOT EDIT MANUALLY. +// ignore_for_file: constant_identifier_names +class R { + const R._(); + + static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg'; + + static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg'; +} diff --git a/lib/components/utils/debounce.dart b/lib/components/utils/debounce.dart index 806846d..743725b 100644 --- a/lib/components/utils/debounce.dart +++ b/lib/components/utils/debounce.dart @@ -13,10 +13,10 @@ class Debounce { static Timer? _timer; static void run( - VoidCallback action, { - Duration delay = const Duration(milliseconds: 5000), - }) { + VoidCallback action, { + Duration delay = const Duration(milliseconds: 5000), + }) { _timer?.cancel(); _timer = Timer(delay, action); } -} \ No newline at end of file +} diff --git a/lib/components/utils/error_callback.dart b/lib/components/utils/error_callback.dart index 5e3110f..9419c43 100644 --- a/lib/components/utils/error_callback.dart +++ b/lib/components/utils/error_callback.dart @@ -1 +1 @@ -typedef OnErrorCallback = void Function(String? error)?; \ No newline at end of file +typedef OnErrorCallback = void Function(String? error)?; diff --git a/lib/data/dto/album_dto.dart b/lib/data/dto/album_dto.dart index 9ed0ecd..a0cb009 100644 --- a/lib/data/dto/album_dto.dart +++ b/lib/data/dto/album_dto.dart @@ -17,9 +17,8 @@ class AlbumDto { data: (json['data'] as List?) ?.map((e) => AlbumDataDto.fromJson(e as Map)) .toList(), - pagination: json['pagination'] != null - ? AlbumPaginationDto.fromJson(json['pagination']) - : null, + pagination: + json['pagination'] != null ? AlbumPaginationDto.fromJson(json['pagination']) : null, ); } } @@ -86,9 +85,7 @@ class AlbumDataDto { tracks: (json['tracks'] as List?)?.map((e) => e as String).toList(), summary: json['summary'], url: json['url'], - images: json['images'] != null - ? AlbumDataImagesDto.fromJson(json['images']) - : null, + images: json['images'] != null ? AlbumDataImagesDto.fromJson(json['images']) : null, ); } } @@ -105,9 +102,7 @@ class AlbumDataImagesDto { // Метод для конструирования экземпляра static AlbumDataImagesDto fromJson(Map json) { return AlbumDataImagesDto( - jpg: json['jpg'] != null - ? AlbumDataImagesJPGDto.fromJson(json['jpg']) - : null, + jpg: json['jpg'] != null ? AlbumDataImagesJPGDto.fromJson(json['jpg']) : null, ); } } @@ -127,4 +122,4 @@ class AlbumDataImagesJPGDto { image_url: json['image_url'], ); } -} \ No newline at end of file +} diff --git a/lib/data/mapper/album_mapper.dart b/lib/data/mapper/album_mapper.dart index 8f9bc82..3b02f96 100644 --- a/lib/data/mapper/album_mapper.dart +++ b/lib/data/mapper/album_mapper.dart @@ -7,11 +7,15 @@ import 'package:uuid/uuid.dart'; import '../../home_page/home_page.dart'; +String generateAlbumId(String name, String artist, String url) { + // Простой способ создания уникального идентификатора + return '$name|$artist|$url'; +} + extension AlbumDataDtoMapper on AlbumDataDto { List fetchAlbums(List albumsData) { const String defaultImageUrl = "https://i.ibb.co/VwCkRD4/image.jpg"; List albums = []; - final Uuid uuid = Uuid(); for (var album in albumsData) { // Ищем изображение с самым большим размером @@ -20,22 +24,22 @@ extension AlbumDataDtoMapper on AlbumDataDto { // Ищем наиболее подходящее изображение List images = album['image'] as List; var largestImage = images.firstWhere( - (image) => image['size'] == 'mega', + (image) => image['size'] == 'mega', orElse: () => images.firstWhere( - (image) => image['size'] == 'extralarge', + (image) => image['size'] == 'extralarge', orElse: () => images.firstWhere( - (image) => image['size'] == 'large', + (image) => image['size'] == 'large', orElse: () => null, // запасной вариант ), ), ); - if(largestImage['#text'] != "") + if (largestImage['#text'] != "") albumImage = largestImage['#text'] as String?; else albumImage = defaultImageUrl; if (album['name'] != "(null)" && album['artist'] != "(null)") { - final id = uuid.v4(); + final id = generateAlbumId(album['name'], album['artist'], album['url']); albums.add(AlbumDataDto( id: id, title: album['name'] as String?, @@ -61,23 +65,20 @@ extension AlbumDataDtoMapper on AlbumDataDto { List genres = []; // Находим год в тегах - year = (data['album']?['tags']?['tag'] as List) - .firstWhere( + year = (data['album']?['tags']?['tag'] as List).firstWhere( (tag) => tag['name'].contains(RegExp(r'^\d{4}$')), - orElse: () => null, - )?['name'] ?? "_"; + orElse: () => null, + )?['name'] ?? + "_"; // Получаем список жанров - genres = List.from( - (data['album']?['tags']?['tag'] as List? ?? []) - .map((tag) => tag['name'] as String) - ); + 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) - ); + .map((track) => track['name'] as String)); // Обновляем информацию в нашем DTO альбома album.year = year; @@ -85,8 +86,7 @@ extension AlbumDataDtoMapper on AlbumDataDto { album.tracks = tracks; // Обновляем дополнительную информацию, если необходимо - album.summary = - data['album']?['wiki']?['summary'] ?? "missing"; // или аналогичное поле + album.summary = data['album']?['wiki']?['summary'] ?? "missing"; // или аналогичное поле } return album; // возвращаем заполненное DTO @@ -120,9 +120,7 @@ extension AlbumDtoMapper on AlbumDto { HomeData toDomain() { return HomeData( data: data?.map((e) => e.toDomain()).toList(), - nextPage: (pagination?.hasNextPage ?? false) - ? ((pagination?.currentPage ?? 0) + 1) - : null, + nextPage: (pagination?.hasNextPage ?? false) ? ((pagination?.currentPage ?? 0) + 1) : null, ); } -} \ No newline at end of file +} diff --git a/lib/data/repositories/album_repository.dart b/lib/data/repositories/album_repository.dart index 01a7cbf..6a957c3 100644 --- a/lib/data/repositories/album_repository.dart +++ b/lib/data/repositories/album_repository.dart @@ -21,8 +21,7 @@ class AlbumRepository extends ApiInterface { // Метод для загрузки списка альбомов по названию с учетом пагинации @override Future?> loadData({String? albumName, int page = 1, int pageSize = 5}) async { - if (albumName == null || albumName == "") - albumName = 'a'; + if (albumName == null || albumName == "") albumName = 'a'; final String url = 'https://ws.audioscrobbler.com/2.0/?method=album.search&album=$albumName&api_key=$apiKey&format=json&limit=$pageSize&page=$page'; @@ -31,8 +30,7 @@ class AlbumRepository extends ApiInterface { if (response.statusCode == 200) { final List albumsData = - AlbumDataDto().fetchAlbums( - response.data['results']['albummatches']['album']); + AlbumDataDto().fetchAlbums(response.data['results']['albummatches']['album']); return albumsData.map((album) => album.toDomain()).toList(); } else { @@ -60,4 +58,4 @@ class AlbumRepository extends ApiInterface { 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 index 9bccc21..405dc21 100644 --- a/lib/details_page/detail_page.dart +++ b/lib/details_page/detail_page.dart @@ -54,11 +54,7 @@ class _DetailsPageState extends State { backgroundColor: const Color(0xFF231a24), title: Text( widget.data.title, - style: Theme - .of(context) - .textTheme - .headlineLarge - ?.copyWith(color: Colors.orange), + style: Theme.of(context).textTheme.headlineLarge?.copyWith(color: Colors.orange), ), ), body: Container( @@ -69,13 +65,12 @@ class _DetailsPageState extends State { 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)); + 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))); + return const Center( + child: Text('No data available', style: TextStyle(color: Colors.white))); } else { AlbumDataDto albumDetails = snapshot.data!; @@ -86,9 +81,9 @@ class _DetailsPageState extends State { Padding( padding: const EdgeInsets.only(bottom: 16.0), child: ClipRRect( - borderRadius: const BorderRadius.all(Radius.circular( - 20)), - child: Image.network( widget.data.imageUrl ?? '', + borderRadius: const BorderRadius.all(Radius.circular(20)), + child: Image.network( + widget.data.imageUrl ?? '', height: 300, width: double.infinity, fit: BoxFit.cover, @@ -113,10 +108,7 @@ class _DetailsPageState extends State { Widget _buildInfoBlock(AlbumDataDto albumDetails) { return Container( - width: MediaQuery - .of(context) - .size - .width, + width: MediaQuery.of(context).size.width, margin: const EdgeInsets.only(top: 16, left: 5, right: 5), padding: const EdgeInsets.all(16), decoration: BoxDecoration( @@ -128,11 +120,7 @@ class _DetailsPageState extends State { children: [ Text( widget.data.title, - style: Theme - .of(context) - .textTheme - .headlineLarge - ?.copyWith(color: Colors.orange), + style: Theme.of(context).textTheme.headlineLarge?.copyWith(color: Colors.orange), ), Text( 'Artist:', @@ -169,10 +157,7 @@ class _DetailsPageState extends State { Widget _buildTracksBlock(AlbumDataDto albumDetails) { return Container( - width: MediaQuery - .of(context) - .size - .width, + width: MediaQuery.of(context).size.width, margin: const EdgeInsets.only(top: 16, left: 5, right: 5), padding: const EdgeInsets.all(16), decoration: BoxDecoration( @@ -185,15 +170,10 @@ class _DetailsPageState extends State { children: [ Text( 'Tracks:', - style: Theme - .of(context) - .textTheme - .headlineSmall - ?.copyWith(color: Colors.orange), + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.orange), ), SizedBox(height: 8.0), - ...albumDetails.tracks!.map((track) => - Padding( + ...albumDetails.tracks!.map((track) => Padding( padding: const EdgeInsets.only(bottom: 4.0), child: Row( children: [ @@ -205,11 +185,7 @@ class _DetailsPageState extends State { // Отступ между иконкой и текстом Text( track, - style: Theme - .of(context) - .textTheme - .bodyMedium - ?.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white), ), ], ), @@ -221,10 +197,7 @@ class _DetailsPageState extends State { Widget _buildSummaryBlock(AlbumDataDto albumDetails) { return Container( - width: MediaQuery - .of(context) - .size - .width, + width: MediaQuery.of(context).size.width, margin: const EdgeInsets.only(top: 16, left: 5, right: 5), padding: const EdgeInsets.all(16), decoration: BoxDecoration( @@ -237,23 +210,15 @@ class _DetailsPageState extends State { children: [ Text( 'Summary:', - style: Theme - .of(context) - .textTheme - .headlineSmall - ?.copyWith(color: Colors.orange), + 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), + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white), ), ], ), ); } -} \ No newline at end of file +} diff --git a/lib/home_page/bloc/events.dart b/lib/home_page/bloc/events.dart index 5bedbf8..73d7080 100644 --- a/lib/home_page/bloc/events.dart +++ b/lib/home_page/bloc/events.dart @@ -15,4 +15,4 @@ class HomeLoadDataEvent extends HomeEvent { @override List get props => [search, nextPage]; -} \ No newline at end of file +} diff --git a/lib/home_page/bloc/home_bloc.dart b/lib/home_page/bloc/home_bloc.dart index d550140..05ea3a8 100644 --- a/lib/home_page/bloc/home_bloc.dart +++ b/lib/home_page/bloc/home_bloc.dart @@ -28,7 +28,8 @@ class HomeBloc extends Bloc { final newDataList = data; existingIds = existingData.map((item) => item.id).toSet(); final newData = newDataList?.where((newItem) => !existingIds.contains(newItem.id)).toList(); - updatedData = HomeData(data: [...existingData, ...?newData], nextPage: (event.nextPage ?? 1) + 1); + updatedData = + HomeData(data: [...existingData, ...?newData], nextPage: (event.nextPage ?? 1) + 1); } else { updatedData = HomeData(data: data, nextPage: (event.nextPage ?? 1) + 1); } @@ -39,4 +40,4 @@ class HomeBloc extends Bloc { print("Error loading data: $e"); } } -} \ No newline at end of file +} diff --git a/lib/home_page/bloc/state.dart b/lib/home_page/bloc/state.dart index b83aa53..5356de5 100644 --- a/lib/home_page/bloc/state.dart +++ b/lib/home_page/bloc/state.dart @@ -24,4 +24,4 @@ class HomeState extends Equatable { @override List get props => [data, isLoading, isPaginationLoading]; -} \ No newline at end of file +} diff --git a/lib/home_page/card.dart b/lib/home_page/card.dart index 67a08dd..8b126b5 100644 --- a/lib/home_page/card.dart +++ b/lib/home_page/card.dart @@ -1,24 +1,64 @@ part of 'home_page.dart'; -class _CardState extends State<_Card> { - bool isLiked = false; +typedef onLikeCallback = void Function(String id, String title, bool isLiked)?; + +class _Card extends StatelessWidget { + final String title; + final String artist; + final String year; + final List genres; + final String? imageUrl; + final onLikeCallback onLike; + final VoidCallback? onTap; + final String id; + final bool isLiked; + + const _Card( + this.title, { + required this.artist, + required this.year, + required this.genres, + this.imageUrl, + this.onLike, + this.onTap, + required this.id, + this.isLiked = false, + }); + + factory _Card.fromData( + CardData data, { + onLikeCallback onLike, + VoidCallback? onTap, + bool isLiked = false, + }) => + _Card( + data.title, + artist: data.artist, + year: data.year, + genres: data.genres, + imageUrl: data.imageUrl, + onLike: onLike, + onTap: onTap, + id: data.id, + isLiked: isLiked, + ); @override Widget build(BuildContext context) { return GestureDetector( - onTap: widget.onTap, + onTap: 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, - ), + 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, @@ -30,31 +70,40 @@ class _CardState extends State<_Card> { width: 140, height: 100, child: Image.network( - widget.imageUrl ?? '', + imageUrl ?? '', fit: BoxFit.cover, errorBuilder: (_, __, ___) => const Placeholder(), ), ), ), - Flexible( + Expanded( child: Padding( padding: const EdgeInsets.only(left: 16.0), child: Column( - crossAxisAlignment: CrossAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - widget.title, + title, style: Theme.of(context) .textTheme - .headlineLarge - ?.copyWith(color: Colors.orange), // Грязно-белый цвет + .headlineSmall + ?.copyWith(color: Colors.orange), ), Text( - widget.artist, + artist, style: Theme.of(context) .textTheme .bodyMedium - ?.copyWith(color: Color(0xFFDCDCDC)), // Грязно-белый цвет + ?.copyWith(color: Color(0xFFDCDCDC)), + ), + // Здесь можно добавить отображение года и жанров, если это необходимо + Text( + year, + style: Theme.of(context).textTheme.bodyMedium, + ), + Text( + genres.join(', '), + style: Theme.of(context).textTheme.bodyMedium, ), ], ), @@ -63,24 +112,20 @@ class _CardState extends State<_Card> { Padding( padding: const EdgeInsets.only(left: 8.0, right: 16, bottom: 16), child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.title, isLiked); - }, + onTap: () => onLike?.call(id, title, isLiked), child: AnimatedSwitcher( duration: const Duration(milliseconds: 300), child: isLiked ? const Icon( - Icons.favorite, - color: Colors.pink, - key: ValueKey(0), - ) + Icons.favorite, + color: Colors.redAccent, + key: ValueKey(0), + ) : const Icon( - Icons.favorite_border_outlined, - color: Colors.purple), - key: ValueKey(1), + Icons.favorite_border, + color: Colors.purple, + key: ValueKey(1), + ), ), ), ) @@ -90,51 +135,4 @@ class _CardState extends State<_Card> { ), ); } -} - -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 index 60a2722..840170f 100644 --- a/lib/home_page/home_page.dart +++ b/lib/home_page/home_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd_labs/components/extension/context_x.dart'; import 'package:pmd_labs/components/utils/debounce.dart'; import 'package:pmd_labs/data/repositories/album_repository.dart'; import 'package:pmd_labs/details_page/detail_page.dart'; @@ -9,6 +10,13 @@ import 'package:pmd_labs/home_page/bloc/state.dart'; import 'package:pmd_labs/card_data.dart'; import '../data/dto/album_dto.dart'; +import '../like_bloc/like_bloc.dart'; +import '../like_bloc/like_event.dart'; +import '../like_bloc/like_state.dart'; +import '../locale_bloc/locale_bloc.dart'; +import '../locale_bloc/locale_events.dart'; +import '../locale_bloc/locale_state.dart'; +import '../svg_objects.dart'; import 'bloc/home_bloc.dart'; part 'card.dart'; @@ -30,10 +38,7 @@ class _MyHomePageState extends State { backgroundColor: const Color(0xFF231a24), title: Text( widget.title, - style: Theme.of(context) - .textTheme - .headlineLarge - ?.copyWith(color: Colors.orange), + style: Theme.of(context).textTheme.headlineLarge?.copyWith(color: Colors.orange), ), ), body: Container( @@ -59,12 +64,14 @@ class _BodyState extends State { @override void initState() { - super.initState(); // Настройка времени дебаунса - WidgetsBinding.instance.addPostFrameCallback((_) { + SvgObjects.init(); + WidgetsBinding.instance.addPostFrameCallback((_){ context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); }); scrollController.addListener(_onNextPageListener); + super.initState(); } void _onNextPageListener() { @@ -82,7 +89,7 @@ class _BodyState extends State { WidgetsBinding.instance.addPostFrameCallback((_) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( - 'Лайк на $title ${isLiked ? 'поставлен' : 'убран'}', + '$title ${isLiked ? context.locale.liked : context.locale.disliked}', style: Theme.of(context).textTheme.bodyLarge, ), backgroundColor: Colors.orangeAccent, @@ -91,11 +98,20 @@ class _BodyState extends State { }); } + void _onLike(String id, String title, bool isLiked) { + print("$id $title, $isLiked"); + context.read().add(ChangeLikeEvent(id)); + _showSnackbar(context, title, !isLiked); + } + void _navToDetails(BuildContext context, CardData data) { - Navigator.push( - context, - CupertinoPageRoute(builder: (context) => DetailsPage(data)) - ); + Navigator.push(context, CupertinoPageRoute(builder: (context) => DetailsPage(data))); + } + Future _onRefresh() { + context + .read() + .add(HomeLoadDataEvent(search: searchController.text)); + return Future.value(null); } @override @@ -106,46 +122,68 @@ class _BodyState extends State { children: [ Padding( padding: const EdgeInsets.all(12), - child: CupertinoSearchTextField( - controller: searchController, - onChanged: (search) { - Debounce.run(() { - context.read().add(HomeLoadDataEvent(search: search)); - }); - }, - style: TextStyle(color: Colors.orange, fontFamily: 'Correction_Tape'), - ), - ), - Expanded( - child: BlocBuilder( - builder: (context, state) { - if (state.isLoading) { - return const Center(child: CircularProgressIndicator()); - } - return RefreshIndicator( - onRefresh: () async { - // Добавим состояние загрузки - context.read().add(HomeLoadDataEvent(search: searchController.text)); - }, - child: ListView.builder( - controller: scrollController, - padding: EdgeInsets.zero, - itemCount: state.data?.data?.length ?? 0, - itemBuilder: (context, index) { - final cardData = state.data?.data?[index]; - return cardData != null - ? _Card.fromData( - cardData, - onLike: (title, isLiked) => _showSnackbar(context, title, isLiked), - onTap: () => _navToDetails(context, cardData), - ) - : const SizedBox.shrink(); + child: Row( + children: [ + Expanded( + child: CupertinoSearchTextField( + controller: searchController, + placeholder: context.locale.search, + onChanged: (search) { + Debounce.run(() { + context.read().add(HomeLoadDataEvent(search: search)); + }); }, + style: TextStyle(color: Colors.orange, fontFamily: 'Correction_Tape'), ), - ); - }, + ), + // GestureDetector размещен справа от поля поиска + GestureDetector( + onTap: () => + context.read().add(const ChangeLocaleEvent()), + child: SizedBox.square( + dimension: 50, + child: Padding( + padding: const EdgeInsets.only(left: 12), + child: BlocBuilder( + builder: (context, state) { + return state.currentLocale.languageCode == 'ru' + ? const SvgRu() + : const SvgUk(); + }, + ), + ), + ), + ), + ], ), ), + BlocBuilder( + builder: (context, state) => state.isLoading + ? CircularProgressIndicator() + : BlocBuilder( + builder: (context, likeState) => Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.builder( + controller: scrollController, + padding: EdgeInsets.zero, + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + return data != null + ? _Card.fromData( + data, + isLiked: likeState.likedIds + ?.contains(data.id) == + true, + onLike: _onLike, + onTap: () => + _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }), + ), + ))), BlocBuilder( builder: (context, state) { if (state.isPaginationLoading) { @@ -161,7 +199,6 @@ class _BodyState extends State { ), ); } - @override void dispose() { searchController.dispose(); @@ -175,4 +212,4 @@ class HomeData { final int? nextPage; HomeData({this.data, this.nextPage}); -} \ No newline at end of file +} diff --git a/lib/like_bloc/like_bloc.dart b/lib/like_bloc/like_bloc.dart new file mode 100644 index 0000000..fbfbed8 --- /dev/null +++ b/lib/like_bloc/like_bloc.dart @@ -0,0 +1,39 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +import 'like_event.dart'; +import 'like_state.dart'; + +const String _likedPrefsKey = 'liked'; + +class LikeBloc extends Bloc { + LikeBloc() : super(const LikeState(likedIds: [])) { + on(_onChangeLike); + on(_onLoadLikes); + } + + Future _onLoadLikes(LoadLikesEvent event, Emitter emit) async { + final prefs = await SharedPreferences.getInstance(); + final data = prefs.getStringList(_likedPrefsKey) ?? []; + + emit(state.copyWith(likedIds: data)); + } + + Future _onChangeLike(ChangeLikeEvent event, Emitter emit) async { + final updatedList = List.from(state.likedIds ?? []); + + if (updatedList.contains(event.id)) { + updatedList.remove(event.id); + } else { + updatedList.add(event.id); + } + + final prefs = await SharedPreferences.getInstance(); + await prefs.setStringList(_likedPrefsKey, updatedList); + + // Отладка + print('Saved likes: $updatedList'); // Просто для проверки + + emit(state.copyWith(likedIds: updatedList)); + } +} diff --git a/lib/like_bloc/like_event.dart b/lib/like_bloc/like_event.dart new file mode 100644 index 0000000..d0326d8 --- /dev/null +++ b/lib/like_bloc/like_event.dart @@ -0,0 +1,13 @@ +abstract class LikeEvent { + const LikeEvent(); +} + +class LoadLikesEvent extends LikeEvent { + const LoadLikesEvent(); +} + +class ChangeLikeEvent extends LikeEvent { + final String id; + + const ChangeLikeEvent(this.id); +} diff --git a/lib/like_bloc/like_state.dart b/lib/like_bloc/like_state.dart new file mode 100644 index 0000000..5f0959f --- /dev/null +++ b/lib/like_bloc/like_state.dart @@ -0,0 +1,14 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; + +part 'like_state.g.dart'; + +@CopyWith() +class LikeState extends Equatable { + final List? likedIds; + + const LikeState({required this.likedIds}); + + @override + List get props => [likedIds]; +} diff --git a/lib/like_bloc/like_state.g.dart b/lib/like_bloc/like_state.g.dart new file mode 100644 index 0000000..0888cf2 --- /dev/null +++ b/lib/like_bloc/like_state.g.dart @@ -0,0 +1,56 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'like_state.dart'; + +// ************************************************************************** +// CopyWithGenerator +// ************************************************************************** + +abstract class _$LikeStateCWProxy { + LikeState likedIds(List? likedIds); + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// LikeState(...).copyWith(id: 12, name: "My name") + /// ```` + LikeState call({ + List? likedIds, + }); +} + +/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLikeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLikeState.copyWith.fieldName(...)` +class _$LikeStateCWProxyImpl implements _$LikeStateCWProxy { + const _$LikeStateCWProxyImpl(this._value); + + final LikeState _value; + + @override + LikeState likedIds(List? likedIds) => this(likedIds: likedIds); + + @override + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// LikeState(...).copyWith(id: 12, name: "My name") + /// ```` + LikeState call({ + Object? likedIds = const $CopyWithPlaceholder(), + }) { + return LikeState( + likedIds: likedIds == const $CopyWithPlaceholder() + ? _value.likedIds + // ignore: cast_nullable_to_non_nullable + : likedIds as List?, + ); + } +} + +extension $LikeStateCopyWith on LikeState { + /// Returns a callable class that can be used as follows: `instanceOfLikeState.copyWith(...)` or like so:`instanceOfLikeState.copyWith.fieldName(...)`. + // ignore: library_private_types_in_public_api + _$LikeStateCWProxy get copyWith => _$LikeStateCWProxyImpl(this); +} diff --git a/lib/locale_bloc/locale_bloc.dart b/lib/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..1188233 --- /dev/null +++ b/lib/locale_bloc/locale_bloc.dart @@ -0,0 +1,17 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd_labs/components/locale/l10n/app_locale.dart'; +import 'package:pmd_labs/locale_bloc/locale_events.dart'; +import 'package:pmd_labs/locale_bloc/locale_state.dart'; + +class LocaleBloc extends Bloc { + LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) { + on(_onChangeLocale); + } + + Future _onChangeLocale(ChangeLocaleEvent event, Emitter emit) async { + final toChange = AppLocale.supportedLocales + .firstWhere((e) => e.languageCode != state.currentLocale.languageCode); + emit(state.copyWith(currentLocale: toChange)); + } +} diff --git a/lib/locale_bloc/locale_events.dart b/lib/locale_bloc/locale_events.dart new file mode 100644 index 0000000..c08cd1b --- /dev/null +++ b/lib/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent { + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent { + const ChangeLocaleEvent(); +} diff --git a/lib/locale_bloc/locale_state.dart b/lib/locale_bloc/locale_state.dart new file mode 100644 index 0000000..b9221ca --- /dev/null +++ b/lib/locale_bloc/locale_state.dart @@ -0,0 +1,15 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; +import 'package:flutter/material.dart'; + +part 'locale_state.g.dart'; + +@CopyWith() +class LocaleState extends Equatable { + final Locale currentLocale; + + const LocaleState({required this.currentLocale}); + + @override + List get props => [currentLocale]; +} diff --git a/lib/locale_bloc/locale_state.g.dart b/lib/locale_bloc/locale_state.g.dart new file mode 100644 index 0000000..e374db6 --- /dev/null +++ b/lib/locale_bloc/locale_state.g.dart @@ -0,0 +1,58 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'locale_state.dart'; + +// ************************************************************************** +// CopyWithGenerator +// ************************************************************************** + +abstract class _$LocaleStateCWProxy { + LocaleState currentLocale(Locale currentLocale); + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// LocaleState(...).copyWith(id: 12, name: "My name") + /// ```` + LocaleState call({ + Locale? currentLocale, + }); +} + +/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLocaleState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLocaleState.copyWith.fieldName(...)` +class _$LocaleStateCWProxyImpl implements _$LocaleStateCWProxy { + const _$LocaleStateCWProxyImpl(this._value); + + final LocaleState _value; + + @override + LocaleState currentLocale(Locale currentLocale) => + this(currentLocale: currentLocale); + + @override + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// LocaleState(...).copyWith(id: 12, name: "My name") + /// ```` + LocaleState call({ + Object? currentLocale = const $CopyWithPlaceholder(), + }) { + return LocaleState( + currentLocale: + currentLocale == const $CopyWithPlaceholder() || currentLocale == null + ? _value.currentLocale + // ignore: cast_nullable_to_non_nullable + : currentLocale as Locale, + ); + } +} + +extension $LocaleStateCopyWith on LocaleState { + /// Returns a callable class that can be used as follows: `instanceOfLocaleState.copyWith(...)` or like so:`instanceOfLocaleState.copyWith.fieldName(...)`. + // ignore: library_private_types_in_public_api + _$LocaleStateCWProxy get copyWith => _$LocaleStateCWProxyImpl(this); +} diff --git a/lib/main.dart b/lib/main.dart index e2389c3..befe3da 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,17 @@ +import 'dart:io'; + +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:pmd_labs/data/repositories/album_repository.dart'; import 'package:pmd_labs/home_page/home_page.dart'; +import 'components/locale/l10n/app_locale.dart'; import 'home_page/bloc/home_bloc.dart'; import 'home_page/home_page.dart'; +import 'like_bloc/like_bloc.dart'; +import 'locale_bloc/locale_bloc.dart'; +import 'locale_bloc/locale_state.dart'; void main() { runApp(const MyApp()); @@ -13,30 +20,51 @@ void main() { class MyApp extends StatelessWidget { const MyApp({super.key}); - // This widget is the root of your application. @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Лабы ПМУ', - theme: ThemeData( - 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, + // Устанавливаем локаль по умолчанию + final initialLocale = kIsWeb + ? const Locale('ru') // Измените это на необходимую локаль для веба + : Locale(Platform.localeName);// локаль по умолчанию для мобильных приложений или веба + + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc(initialLocale), + child: BlocBuilder( + builder: (context, state) { + return MaterialApp( + title: 'Лабы ПМУ', + locale: state.currentLocale, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + debugShowCheckedModeBanner: false, + theme: ThemeData( + 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: RepositoryProvider( + lazy: true, + create: (_) => AlbumRepository(), + child: BlocProvider( + lazy: false, + create: (context) => LikeBloc(), + child: BlocProvider( + lazy: false, + create: (context) => + HomeBloc(context.read()), + child: const MyHomePage(title: 'Catalog of Music Albums'), + ), + ), + ), + ); + }, ), - home: RepositoryProvider( - lazy: true, - create: (_) => AlbumRepository(), - child: BlocProvider( - lazy: false, - create: (context) => HomeBloc(context.read()), - child: const MyHomePage(title: 'Catalog of Music Albums'), - ), - ) ); } } \ No newline at end of file diff --git a/lib/svg_objects.dart b/lib/svg_objects.dart new file mode 100644 index 0000000..30ce03c --- /dev/null +++ b/lib/svg_objects.dart @@ -0,0 +1,34 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:pmd_labs/components/resources.g.dart'; + +abstract class SvgObjects { + static void init() { + final pics = [ + R.ASSETS_SVG_RU_SVG, + R.ASSETS_SVG_UK_SVG, + ]; + for (final String p in pics) { + final loader = SvgAssetLoader(p); + svg.cache.putIfAbsent(loader.cacheKey(null), () => loader.loadBytes(null)); + } + } +} + +class SvgRu extends StatelessWidget { + const SvgRu({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_RU_SVG); + } +} + +class SvgUk extends StatelessWidget { + const SvgUk({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_UK_SVG); + } +} diff --git a/pubspec.lock b/pubspec.lock index 042ca33..d7c4fa5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -22,6 +22,14 @@ packages: 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: @@ -134,6 +142,14 @@ packages: 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: @@ -146,10 +162,10 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: transitive description: @@ -166,6 +182,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" + copy_with_extension: + dependency: "direct main" + description: + name: copy_with_extension + sha256: fbcf890b0c34aedf0894f91a11a579994b61b4e04080204656b582708b5b1125 + url: "https://pub.dev" + source: hosted + version: "5.0.4" + copy_with_extension_gen: + dependency: "direct main" + description: + name: copy_with_extension_gen + sha256: "51cd11094096d40824c8da629ca7f16f3b7cea5fc44132b679617483d43346b0" + url: "https://pub.dev" + source: hosted + version: "5.0.4" crypto: dependency: transitive description: @@ -222,6 +254,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" file: dependency: transitive description: @@ -251,6 +291,14 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.6" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -259,11 +307,29 @@ packages: url: "https://pub.dev" source: hosted version: "4.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: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" + source: hosted + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" frontend_server_client: dependency: transitive description: @@ -312,14 +378,30 @@ packages: 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: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -340,10 +422,10 @@ packages: dependency: "direct dev" description: name: json_serializable - sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.9.0" leak_tracker: dependency: transitive description: @@ -448,6 +530,62 @@ 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" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" pool: dependency: transitive description: @@ -488,6 +626,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" + url: "https://pub.dev" + source: hosted + version: "2.3.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" + url: "https://pub.dev" + source: hosted + version: "2.3.4" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" + url: "https://pub.dev" + source: hosted + version: "2.5.3" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: @@ -500,10 +694,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -605,6 +799,30 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.7" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752" + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33 + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a" + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" vector_math: dependency: transitive description: @@ -653,6 +871,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" yaml: dependency: transitive description: @@ -663,4 +897,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.2 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 04e25c1..1f49b2f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,10 +30,7 @@ environment: dependencies: flutter: sdk: flutter - - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. + flutter_svg: 2.0.7 cupertino_icons: ^1.0.8 json_annotation: ^4.9.0 dio: ^5.4.2+1 @@ -42,64 +39,38 @@ dependencies: uuid: ^3.0.5 equatable: ^2.0.7 flutter_bloc: ^8.1.6 + copy_with_extension_gen: ^5.0.4 + copy_with_extension: ^5.0.4 + + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + + shared_preferences: ^2.2.3 dev_dependencies: flutter_test: sdk: flutter + + flutter_lints: ^4.0.0 + + flutter_launcher_icons: 0.13.1 + 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 - # 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 +flutter_icons: + android: "ic_launcher" + ios: true + image_path: "assets/icon.jpeg" + min_sdk_android: 21 -# 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 + assets: + - assets/svg/ fonts: - family: Correction_Tape fonts: diff --git a/web/icon.png b/web/icon.png new file mode 100644 index 0000000..8678f47 Binary files /dev/null and b/web/icon.png differ diff --git a/web/icons/icon.png b/web/icons/icon.png new file mode 100644 index 0000000..8678f47 Binary files /dev/null and b/web/icons/icon.png differ diff --git a/web/index.html b/web/index.html index f368d23..c275356 100644 --- a/web/index.html +++ b/web/index.html @@ -24,10 +24,10 @@ - + - + pmd_labs diff --git a/web/manifest.json b/web/manifest.json index 6d2b29e..3cdd0b5 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -10,23 +10,23 @@ "prefer_related_applications": false, "icons": [ { - "src": "icons/Icon-192.png", + "src": "icons/icon.png", "sizes": "192x192", "type": "image/png" }, { - "src": "icons/Icon-512.png", + "src": "icons/icon.png", "sizes": "512x512", "type": "image/png" }, { - "src": "icons/Icon-maskable-192.png", + "src": "icons/icon.png", "sizes": "192x192", "type": "image/png", "purpose": "maskable" }, { - "src": "icons/Icon-maskable-512.png", + "src": "icons/icon.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable"