diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..b3fdbd0 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..b6f2385 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..d4400a0 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..5830471 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..6676853 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/sekiroicon.jpg b/assets/sekiroicon.jpg new file mode 100644 index 0000000..e5f4083 Binary files /dev/null and b/assets/sekiroicon.jpg differ diff --git a/assets/sekiroicon.png b/assets/sekiroicon.png deleted file mode 100644 index d6d3625..0000000 Binary files a/assets/sekiroicon.png and /dev/null differ diff --git a/assets/svg/ru.svg b/assets/svg/ru.svg new file mode 100644 index 0000000..9c0cc49 --- /dev/null +++ b/assets/svg/ru.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/uk.svg b/assets/svg/uk.svg new file mode 100644 index 0000000..f87fdb0 --- /dev/null +++ b/assets/svg/uk.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file 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..acf0a55 --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,9 @@ +{ + "@@locale": "en", + + "search": "Search", + "liked": "liked!", + "disliked": "disliked", + + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" +} \ No newline at end of file diff --git a/l10n/app_ru.arb b/l10n/app_ru.arb new file mode 100644 index 0000000..b823375 --- /dev/null +++ b/l10n/app_ru.arb @@ -0,0 +1,9 @@ +{ + "@@locale": "ru", + + "search": "Поиск", + "liked": "понравился!", + "disliked": "разонравился", + + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" +} \ No newline at end of file diff --git a/lib/components/extensions/context_x.dart b/lib/components/extensions/context_x.dart new file mode 100644 index 0000000..2d80393 --- /dev/null +++ b/lib/components/extensions/context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/cupertino.dart'; +import 'package:pmu_labs/components/locale/l10n/app_locale.dart'; + +extension LocalContextX on BuildContext{ + AppLocale get locale => AppLocale.of(this)!; +} \ No newline at end of file diff --git a/lib/components/locale/l10n/app_locale.dart b/lib/components/locale/l10n/app_locale.dart new file mode 100644 index 0000000..1a23eb7 --- /dev/null +++ b/lib/components/locale/l10n/app_locale.dart @@ -0,0 +1,153 @@ +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; + + /// No description provided for @arbEnding. + /// + /// In ru, this message translates to: + /// **'Чтобы не забыть про отсутствие запятой :)'** + String get arbEnding; +} + +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..8f9dc19 --- /dev/null +++ b/lib/components/locale/l10n/app_locale_en.dart @@ -0,0 +1,20 @@ +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 => 'disliked'; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} 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..4685a92 --- /dev/null +++ b/lib/components/locale/l10n/app_locale_ru.dart @@ -0,0 +1,20 @@ +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 => 'разонравился'; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} diff --git a/lib/components/resources.g.dart b/lib/components/resources.g.dart new file mode 100644 index 0000000..5270ada --- /dev/null +++ b/lib/components/resources.g.dart @@ -0,0 +1,12 @@ +/// Generate by [flutter_assets_generator](https://github.com/goodswifter/flutter_assets_generator) library. +/// +/// PLEASE DO NOT EDIT MANUALLY. +class R { + const R._(); + + /// ![preview](file://C:\Users\shotb\StudioProjects\pmu_labs\assets\svg\ru.svg) + static const String assetsSvgRuSvg = 'assets/svg/ru.svg'; + + /// ![preview](file://C:\Users\shotb\StudioProjects\pmu_labs\assets\svg\uk.svg) + static const String assetsSvgUkSvg = 'assets/svg/uk.svg'; +} diff --git a/lib/data/dtos/bosses_dto.dart b/lib/data/dtos/bosses_dto.dart index e3851ef..ea868d0 100644 --- a/lib/data/dtos/bosses_dto.dart +++ b/lib/data/dtos/bosses_dto.dart @@ -2,14 +2,14 @@ import 'package:json_annotation/json_annotation.dart'; part 'bosses_dto.g.dart'; @JsonSerializable(createToJson: false) -class BossesDto{ +class BossesDto { final List? data; const BossesDto({this.data}); factory BossesDto.fromJson(Map json) => _$BossesDtoFromJson(json); } @JsonSerializable(createToJson: false) -class BossesDataDto{ +class BossesDataDto { final String? id; final String? type; final BossAttributesDataDto? attributes; @@ -20,12 +20,14 @@ class BossesDataDto{ } @JsonSerializable(createToJson: false) -class BossAttributesDataDto{ +class BossAttributesDataDto { + final String? id; final String? title; final String? imageUrl; final String? description; - const BossAttributesDataDto({this.title, this.imageUrl, this.description}); + const BossAttributesDataDto({this.id,this.title, this.imageUrl, this.description}); - factory BossAttributesDataDto.fromJson(Map json) => _$BossAttributesDataDtoFromJson(json); -} \ No newline at end of file + factory BossAttributesDataDto.fromJson(Map json) => + _$BossAttributesDataDtoFromJson(json); +} diff --git a/lib/data/dtos/bosses_dto.g.dart b/lib/data/dtos/bosses_dto.g.dart index f1c4b55..a85586c 100644 --- a/lib/data/dtos/bosses_dto.g.dart +++ b/lib/data/dtos/bosses_dto.g.dart @@ -26,6 +26,7 @@ BossesDataDto _$BossesDataDtoFromJson(Map json) => BossAttributesDataDto _$BossAttributesDataDtoFromJson( Map json) => BossAttributesDataDto( + id: json['id'] as String?, title: json['title'] as String?, imageUrl: json['imageUrl'] as String?, description: json['description'] as String?, diff --git a/lib/data/mappers/bosses_mapper.dart b/lib/data/mappers/bosses_mapper.dart index 531f90e..aff57e8 100644 --- a/lib/data/mappers/bosses_mapper.dart +++ b/lib/data/mappers/bosses_mapper.dart @@ -4,8 +4,9 @@ import 'package:pmu_labs/domain/models/card.dart'; extension BossDataDtoToModel on BossAttributesDataDto { CardData toDomain() => CardData( title ?? 'UNKNOWN', + id: id ?? 'UNKNOWN', descriptionText: 'Открыть', //attributes?.description, - gameDesc: description,//attributes?.drop, + gameDesc: description, //attributes?.drop, imageUrl: imageUrl, ); } diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart index 038c22c..38ead3f 100644 --- a/lib/data/repositories/api_interface.dart +++ b/lib/data/repositories/api_interface.dart @@ -2,6 +2,6 @@ import 'package:pmu_labs/domain/models/card.dart'; typedef OnErrorCallback = void Function(String? error); -abstract class ApiInterface{ +abstract class ApiInterface { Future?> loadData(); -} \ No newline at end of file +} diff --git a/lib/data/repositories/bosses_repository.dart b/lib/data/repositories/bosses_repository.dart index 9afef6a..3ab2a91 100644 --- a/lib/data/repositories/bosses_repository.dart +++ b/lib/data/repositories/bosses_repository.dart @@ -13,11 +13,13 @@ Map transformJsonToBossesDtoFormat( final title = boss['title'] as String; final imageUrl = boss['original']?['source'] as String? ?? ''; final description = descs.firstWhere((desc) => desc.$1 == title).$2; + final id = boss['pageid'].toString(); return { 'title': title, 'imageUrl': imageUrl, 'description': description, + 'id': id, }; }).toList(); @@ -33,7 +35,7 @@ void removeByTitle(Map map, String title) { }); } -void getBySearch(Map map, String? title){ +void getBySearch(Map map, String? title) { map.removeWhere((key, value) { return value is Map && value['title'] != title; }); @@ -49,30 +51,31 @@ class BossesRepository extends ApiInterface { static const String _baseUrl = 'https://sekiro.fandom.com/ru/api.php'; @override - Future?> loadData({OnErrorCallback? onError,String? q,}) async { + Future?> loadData({ + OnErrorCallback? onError, + String? q, + }) async { try { String url = ''; - if(q != null && q != ""){ - url ='$_baseUrl?action=query&titles=$q&prop=pageimages&piprop=original&format=json&origin=*'; - }else{ + if (q != null && q != "") { + url = + '$_baseUrl?action=query&titles=$q&prop=pageimages&piprop=original&format=json&origin=*'; + } else { url = '$_baseUrl?action=query&generator=categorymembers&gcmtitle=Category:Боссы&gcmnamespace=0&gcmlimit=50&prop=pageimages&piprop=original&format=json&origin=*'; } + final List? data; + BossesDto dto; - final Response response = await _dio.get>( - url - ); + final Response response = await _dio.get>(url); final pages = response.data['query']['pages'] as Map; removeByTitle(pages, 'Боссы'); - - List<(String, String)> descs = []; for (var boss in pages.values) { - final Response respDesc = await _dio.get< - Map>( + final Response respDesc = await _dio.get>( 'https://sekiro.fandom.com/ru/api.php?action=parse&page=${boss['title']}&prop=text§ion=1&format=json'); final htmlContent = respDesc.data['parse']['text']['*']; var doc = html.parse(htmlContent); @@ -81,17 +84,18 @@ class BossesRepository extends ApiInterface { } final transData = transformJsonToBossesDtoFormat(pages, descs); - - if(q != null && q != ""){ + dto = BossesDto.fromJson(transData); + if (q != null && q != "") { getBySearch(pages, q); final transData = transformJsonToBossesDtoFormat(pages, descs); - final BossesDto dto = BossesDto.fromJson(transData); - final List? data = dto.data?.map((e) => e.toDomain()).toList(); - return data; + dto = BossesDto.fromJson(transData); } - final BossesDto dto = BossesDto.fromJson(transData); - final List? data = dto.data?.map((e) => e.toDomain()).toList(); + + data = dto.data?.map((e) => e.toDomain()).toList(); + //for(int i = 0; i?> loadData() async{ + Future?> loadData() async { return [ CardData('Warhammer 40000:Space Marine 2', descriptionText: 'Читать новость', + id: '1', imageUrl: 'https://news.xbox.com/en-us/wp-content/uploads/sites/2/2021/12/SpaceMarine2_TemporaryArtwork_4K_logo.jpg', gameDesc: 'Обретите сверхчеловеческую мощь космодесантника. Пустите в ход смертоносные навыки и разрушительное оружие, чтобы ' + @@ -17,13 +18,14 @@ class MockRepository extends ApiInterface { 'ужасам Галактики в эпических боях сразу на нескольких планетах. Раскройте мрачные секреты и отбросьте тень вечной ночи.'), CardData('Risk of rain 2', descriptionText: 'Читать новость', - imageUrl: - 'https://digiseller.mycdn.ink/preview/990130/p1_3675944_49000546.jpg', + id: '2', + imageUrl: 'https://digiseller.mycdn.ink/preview/990130/p1_3675944_49000546.jpg', gameDesc: 'Вас ожидает более тысячи созданных вручную областей. Каждая из них кишит смертельно опасными монстрами и огромными боссами,' + ' стремящимися оборвать вашу жизнь. Дойдите до финального босса и выберитесь с планеты, либо продолжите своё приключение,' + ' чтобы выяснить, как долго вы сможете продержаться. Благодаря умной системе повышения уровня ваша сила и сила ваших врагов будет постоянно расти во время игры.'), CardData('Yakuza 0', descriptionText: 'Читать новость', + id: '3', imageUrl: 'https://avatars.mds.yandex.net/get-marketpic/1588570/pic3d2a9b85ee47202578aac1bb1f97fcc0/orig', gameDesc: 'В декабре 1988 года двое героев из мира якудза — Кадзума Кирю (молодой якудза низшего ранга из региона Канто)' + diff --git a/lib/domain/models/card.dart b/lib/domain/models/card.dart index 7f781b7..c584d3d 100644 --- a/lib/domain/models/card.dart +++ b/lib/domain/models/card.dart @@ -3,11 +3,13 @@ class CardData { final String? descriptionText; final String? imageUrl; final String? gameDesc; + late final String id; CardData( - this.text, { - required this.descriptionText, - this.imageUrl, - required this.gameDesc, - }); -} \ No newline at end of file + this.text, { + required this.descriptionText, + this.imageUrl, + required this.gameDesc, + required this.id, + }); +} diff --git a/lib/main.dart b/lib/main.dart index 10f0ca6..8b8c6c0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,13 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart%20%20'; +import 'package:pmu_labs/components/locale/l10n/app_locale.dart'; import 'package:pmu_labs/data/repositories/bosses_repository.dart'; import 'package:pmu_labs/presentation/home_page/bloc/bloc.dart'; +import 'package:pmu_labs/presentation/like_bloc/like_bloc.dart'; +import 'package:pmu_labs/presentation/locale_bloc/locale_bloc.dart'; +import 'package:pmu_labs/presentation/locale_bloc/locale_state.dart'; import 'presentation/home_page/home_page.dart'; void main() { @@ -13,21 +19,36 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Flutter Demo', - debugShowCheckedModeBanner: false, - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurpleAccent), - useMaterial3: true, - ), - home: RepositoryProvider( - lazy: true, - create: (_) => BossesRepository(), - child: BlocProvider( - lazy: false, - create: (context) => HomeBloc(context.read()), - child: const MyHomePage(title: 'Боссы Sekiro'), - ), + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc(Locale(Platform.localeName)), + child: BlocBuilder( + builder: (context, state) { + return MaterialApp( + title: 'Flutter Demo', + locale: state.currentLocale, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + debugShowCheckedModeBanner: false, + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurpleAccent), + useMaterial3: true, + ), + home: RepositoryProvider( + lazy: true, + create: (_) => BossesRepository(), + child: BlocProvider( + lazy: false, + create: (context) => LikeBloc(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage(title: 'Боссы Sekiro'), + ), + ), + ), + ); + } ), ); } diff --git a/lib/presentation/common/svg_objects.dart b/lib/presentation/common/svg_objects.dart new file mode 100644 index 0000000..1555c69 --- /dev/null +++ b/lib/presentation/common/svg_objects.dart @@ -0,0 +1,34 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:pmu_labs/components/resources.g.dart'; + +abstract class SvgObjects { + static void init() { + final pics = [ + R.assetsSvgRuSvg, + R.assetsSvgUkSvg, + ]; + 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.assetsSvgRuSvg); + } +} + +class SvgUk extends StatelessWidget { + const SvgUk({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.assetsSvgUkSvg); + } +} diff --git a/lib/presentation/details_page/details_page.dart b/lib/presentation/details_page/details_page.dart index 9841d4a..09eeb9d 100644 --- a/lib/presentation/details_page/details_page.dart +++ b/lib/presentation/details_page/details_page.dart @@ -9,12 +9,15 @@ class DetailsPage extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(backgroundColor: Colors.deepPurple, + appBar: AppBar( + backgroundColor: Colors.deepPurple, ), body: SingleChildScrollView( child: Container( - constraints: BoxConstraints( minHeight: MediaQuery.sizeOf(context).height - 105), - decoration: const BoxDecoration(color: Colors.deepPurpleAccent,), + constraints: BoxConstraints(minHeight: MediaQuery.sizeOf(context).height - 105), + decoration: const BoxDecoration( + color: Colors.deepPurpleAccent, + ), padding: const EdgeInsets.all(10), child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/presentation/home_page/bloc/bloc.dart b/lib/presentation/home_page/bloc/bloc.dart index 6de58b4..94e4400 100644 --- a/lib/presentation/home_page/bloc/bloc.dart +++ b/lib/presentation/home_page/bloc/bloc.dart @@ -10,8 +10,7 @@ class HomeBloc extends Bloc { on(_onLoadData); } - Future _onLoadData( - HomeLoadDataEvent event, Emitter emit) async { + Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async { emit(state.copyWith(isLoading: true)); String? error; diff --git a/lib/presentation/home_page/bloc/events.dart b/lib/presentation/home_page/bloc/events.dart index 7868db8..4c16a3f 100644 --- a/lib/presentation/home_page/bloc/events.dart +++ b/lib/presentation/home_page/bloc/events.dart @@ -1,9 +1,9 @@ -abstract class HomeEvent{ +abstract class HomeEvent { const HomeEvent(); } -class HomeLoadDataEvent extends HomeEvent{ +class HomeLoadDataEvent extends HomeEvent { final String? search; const HomeLoadDataEvent({this.search}); -} \ No newline at end of file +} diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/home_page/card.dart index 87cd278..4143f21 100644 --- a/lib/presentation/home_page/card.dart +++ b/lib/presentation/home_page/card.dart @@ -1,46 +1,44 @@ part of 'home_page.dart'; -typedef OnLikeCallback = void Function(String title, bool isLiked); +typedef OnLikeCallback = void Function(String? id, String title, bool isLiked); -class _Card extends StatefulWidget { +class _Card extends StatelessWidget { final String text; final String descriptionText; final String? imageUrl; final OnLikeCallback? onLike; final VoidCallback? onTap; + final String id; + final bool isLiked; - const _Card( - this.text, { + const _Card(this.text, { required this.descriptionText, this.imageUrl, this.onLike, this.onTap, + required this.id, + this.isLiked = false, }); - factory _Card.fromData( - CardData data, { + factory _Card.fromData(CardData data, { OnLikeCallback? onLike, VoidCallback? onTap, + bool isLiked = false, }) => _Card( data.text!, + id: data.id, descriptionText: data.descriptionText!, imageUrl: data.imageUrl, onLike: onLike, onTap: onTap, + isLiked: isLiked, ); - @override - State<_Card> createState() => _CardState(); -} - -class _CardState extends State<_Card> { - bool isLiked = false; - @override Widget build(BuildContext context) { return GestureDetector( - onTap: widget.onTap, + onTap: onTap, child: Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), child: Container( @@ -66,12 +64,11 @@ class _CardState extends State<_Card> { children: [ Positioned.fill( child: Image.network( - widget.imageUrl ?? '', + imageUrl ?? '', fit: BoxFit.cover, errorBuilder: (_, __, ___) => const Placeholder(), ), ), - ], ), ), @@ -83,12 +80,18 @@ class _CardState extends State<_Card> { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - widget.text, - style: Theme.of(context).textTheme.titleLarge, + text, + style: Theme + .of(context) + .textTheme + .titleLarge, ), Text( - widget.descriptionText, - style: Theme.of(context).textTheme.bodyLarge, + descriptionText, + style: Theme + .of(context) + .textTheme + .bodyLarge, ) ], ), @@ -103,24 +106,19 @@ class _CardState extends State<_Card> { bottom: 15, ), child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.text, isLiked); - }, + onTap: () => onLike?.call(id, text, isLiked), child: AnimatedSwitcher( duration: const Duration(milliseconds: 300), child: isLiked ? const Icon( - Icons.favorite, - color: Colors.purpleAccent, - key: ValueKey(0), - ) + Icons.favorite, + color: Colors.purpleAccent, + key: ValueKey(0), + ) : const Icon( - Icons.favorite_border, - key: ValueKey(1), - ), + Icons.favorite_border, + key: ValueKey(1), + ), ), ), ), diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 4d7fa71..99f02f1 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,13 +1,21 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart%20%20'; +import 'package:pmu_labs/components/extensions/context_x.dart'; +import 'package:pmu_labs/presentation/common/svg_objects.dart'; import 'package:pmu_labs/presentation/details_page/details_page.dart'; import 'package:pmu_labs/presentation/home_page/bloc/bloc.dart'; import 'package:pmu_labs/presentation/home_page/bloc/events.dart'; import 'package:pmu_labs/presentation/home_page/bloc/state.dart'; +import 'package:pmu_labs/presentation/like_bloc/like_bloc.dart'; +import 'package:pmu_labs/presentation/like_bloc/like_state.dart'; +import 'package:pmu_labs/presentation/locale_bloc/locale_bloc.dart'; +import 'package:pmu_labs/presentation/locale_bloc/locale_events.dart'; +import 'package:pmu_labs/presentation/locale_bloc/locale_state.dart'; import '../../components/utils/debounce.dart'; import '../../domain/models/card.dart'; +import '../like_bloc/like_event.dart'; part 'card.dart'; @@ -47,8 +55,11 @@ class _BodyState extends State { @override void initState() { + SvgObjects.init(); + WidgetsBinding.instance.addPostFrameCallback((_) { context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); }); super.initState(); } @@ -66,19 +77,50 @@ class _BodyState extends State { return Future.value(null); } + void _onLike(String? id, String title, bool isLiked) { + if (id != null) { + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, title , !isLiked); + } + } + @override Widget build(BuildContext context) { return Column( children: [ Padding( padding: const EdgeInsets.all(12), - child: CupertinoSearchTextField( - controller: searchController, - onChanged: (search ) { - Debounce.run(() => context - .read() - .add(HomeLoadDataEvent(search: search))); - }, + child: Row( + children: [ + Expanded( + child: CupertinoSearchTextField( + controller: searchController, + placeholder: context.locale.search, + onChanged: (search) { + Debounce.run(() => context + .read() + .add(HomeLoadDataEvent(search: search))); + }, + ), + ), + 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( @@ -92,23 +134,25 @@ class _BodyState extends State { ) : state.isLoading ? const CircularProgressIndicator() - : Expanded( - child: RefreshIndicator( - onRefresh: _onRefresh, - child: ListView.builder( - padding: EdgeInsets.zero, - itemCount: state.data?.length ?? 0, - itemBuilder: (context, index) { - final data = state.data?[index]; - return data != null - ? _Card.fromData( - data, - onLike: (String title, bool isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ) - : const SizedBox.shrink(); - }, + : BlocBuilder( + builder: (context, likeState) => Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.builder( + padding: EdgeInsets.zero, + itemCount: state.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?[index]; + return data != null + ? _Card.fromData( + data, + onLike: _onLike, + isLiked: likeState.likedIds?.contains(data.id) == true, + onTap: () => _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }, + ), ), ), ), @@ -128,7 +172,7 @@ class _BodyState extends State { WidgetsBinding.instance.addPostFrameCallback((_) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( - 'News $title ${isLiked ? 'liked' : 'disliked '}', + '$title ${isLiked ? context.locale.liked : context.locale.disliked}', style: Theme.of(context).textTheme.bodyLarge, ), backgroundColor: Colors.deepPurpleAccent, diff --git a/lib/presentation/like_bloc/like_bloc.dart b/lib/presentation/like_bloc/like_bloc.dart new file mode 100644 index 0000000..54b9c73 --- /dev/null +++ b/lib/presentation/like_bloc/like_bloc.dart @@ -0,0 +1,34 @@ +import 'package:flutter_bloc/flutter_bloc.dart%20%20'; +import 'package:pmu_labs/presentation/like_bloc/like_event.dart'; +import 'package:pmu_labs/presentation/like_bloc/like_state.dart'; +import 'package:shared_preferences/shared_preferences.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(); + prefs.setStringList(_likedPrefsKey, updatedList); + emit(state.copyWith(likedIds: updatedList)); + } +} \ No newline at end of file diff --git a/lib/presentation/like_bloc/like_event.dart b/lib/presentation/like_bloc/like_event.dart new file mode 100644 index 0000000..11ea044 --- /dev/null +++ b/lib/presentation/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); +} \ No newline at end of file diff --git a/lib/presentation/like_bloc/like_state.dart b/lib/presentation/like_bloc/like_state.dart new file mode 100644 index 0000000..35f2475 --- /dev/null +++ b/lib/presentation/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]; +} \ No newline at end of file diff --git a/lib/presentation/like_bloc/like_state.g.dart b/lib/presentation/like_bloc/like_state.g.dart new file mode 100644 index 0000000..0888cf2 --- /dev/null +++ b/lib/presentation/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/presentation/locale_bloc/locale_bloc.dart b/lib/presentation/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..80cd7b7 --- /dev/null +++ b/lib/presentation/locale_bloc/locale_bloc.dart @@ -0,0 +1,17 @@ + +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu_labs/components/locale/l10n/app_locale.dart'; +import 'package:pmu_labs/presentation/locale_bloc/locale_events.dart'; +import 'package:pmu_labs/presentation/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)); + } +} \ No newline at end of file diff --git a/lib/presentation/locale_bloc/locale_events.dart b/lib/presentation/locale_bloc/locale_events.dart new file mode 100644 index 0000000..3d09e52 --- /dev/null +++ b/lib/presentation/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent{ + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent{ + const ChangeLocaleEvent(); +} \ No newline at end of file diff --git a/lib/presentation/locale_bloc/locale_state.dart b/lib/presentation/locale_bloc/locale_state.dart new file mode 100644 index 0000000..8539fbf --- /dev/null +++ b/lib/presentation/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]; +} \ No newline at end of file diff --git a/lib/presentation/locale_bloc/locale_state.g.dart b/lib/presentation/locale_bloc/locale_state.g.dart new file mode 100644 index 0000000..e374db6 --- /dev/null +++ b/lib/presentation/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/makefile b/makefile index ca6f5c4..53a4f91 100644 --- a/makefile +++ b/makefile @@ -1,2 +1,19 @@ gen: - flutter pub run build_runner build --delete-conflicting-outputs \ No newline at end of file + flutter pub run build_runner build --delete-conflicting-outputs + +icon: + flutter pub run flutter_launcher_icons:main + +init_res: + dart pub global activate flutter_assets_generator + +format: + dart format . --line-length 100 + +res: + fgen --output lib/components/resources.g.dart --no-watch --no-preview; \ + mingw32-make format + +loc: + flutter gen-l10n + mingw32-make format \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 131da67..864ca91 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -182,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: @@ -246,6 +262,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: @@ -291,11 +315,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: @@ -328,6 +370,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.15.5" + http: + dependency: transitive + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -352,6 +402,14 @@ packages: 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: @@ -488,6 +546,38 @@ 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: @@ -496,6 +586,22 @@ packages: 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: @@ -536,6 +642,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: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab" + url: "https://pub.dev" + source: hosted + version: "2.3.3" + 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: @@ -645,6 +807,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" + url: "https://pub.dev" + source: hosted + version: "1.1.15" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" + url: "https://pub.dev" + source: hosted + version: "1.1.12" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" + url: "https://pub.dev" + source: hosted + version: "1.1.16" vector_math: dependency: transitive description: @@ -693,6 +879,14 @@ 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: @@ -711,4 +905,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 f148053..42752b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,14 +34,21 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. + + html: ^0.15.0 cupertino_icons: ^1.0.8 + json_annotation: ^4.9.0 dio: ^5.4.2+1 pretty_dio_logger: ^1.3.1 - json_annotation: ^4.8.1 - html: ^0.15.0 - - equatable: ^2.0.5 flutter_bloc: ^8.1.5 + equatable: ^2.0.5 + flutter_svg: 2.0.7 + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + copy_with_extension_gen: ^5.0.4 + copy_with_extension: ^5.0.4 + shared_preferences: ^2.2.3 dev_dependencies: flutter_test: @@ -59,22 +66,26 @@ dev_dependencies: flutter_lints: ^4.0.0 -flutter_icons: + +flutter_launcher_icons: android: "ic_launcher" - ios: true - image_path: "assets/house.jpg" + image_path: "assets/sekiroicon.jpg" 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: + generate: true # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true + assets: + - assets/svg/ + # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg