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..54535ad 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..80aa327 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..defb0e4 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..328b546 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..c0bf4b3 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/icon.jpg b/assets/icon.jpg new file mode 100644 index 0000000..34dc9ce 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..ae12982 --- /dev/null +++ b/assets/svg/ru.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/svg/uk.svg b/assets/svg/uk.svg new file mode 100644 index 0000000..88e2211 --- /dev/null +++ b/assets/svg/uk.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + \ 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..1106903 --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,9 @@ +{ + "@@locale": "en", + + "search": "Search", + "liked": "You liked ", + "disliked": "You 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..f668c33 --- /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..9d9b340 --- /dev/null +++ b/lib/components/extensions/context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/cupertino.dart'; +import '../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..e79d953 --- /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..caf8f92 --- /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 => 'You liked '; + + @override + String get disliked => 'You 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..aae8d98 --- /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..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 24e35af..bed72b6 100644 --- a/lib/components/utils/debounce.dart +++ b/lib/components/utils/debounce.dart @@ -9,13 +9,13 @@ class Debounce { static final Debounce _instance = Debounce._(); static Timer? _timer; - // если в течении 0.5 сек появится новый вызов (изменится текст в поле ввода) + // если в течении 1.5 сек появится новый вызов (изменится текст в поле ввода) // то текущий вызов заменяется новым - static void run ( - VoidCallback action, { - Duration delay = const Duration(milliseconds: 500), - }) { + static void run( + VoidCallback action, { + Duration delay = const Duration(milliseconds: 1500), + }) { _timer?.cancel(); _timer = Timer(delay, action); } -} \ No newline at end of file +} diff --git a/lib/data/dto/games_dto.dart b/lib/data/dto/games_dto.dart index aa2e4a1..e868185 100644 --- a/lib/data/dto/games_dto.dart +++ b/lib/data/dto/games_dto.dart @@ -1,5 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; -//автоматически сгенерился + part 'games_dto.g.dart'; // createToJson:false - указание, что сериализатор не нужен, нужен только десериализатор @@ -8,18 +8,16 @@ class GamesDto { @JsonKey(name: 'results') final List? data; - final int? current; final int? next; - // final int? previous; - const GamesDto({this.data, this.current, this.next}); + const GamesDto({this.data, this.next}); factory GamesDto.fromJson(Map json) => _$GamesDtoFromJson(json); } @JsonSerializable(createToJson: false) class GameDto { - //для получения описания игры + //для получения описания игры + хранения лайков @JsonKey(name: 'id') final int? id; @@ -27,7 +25,6 @@ class GameDto { final String? description; - @JsonKey(name: 'background_image') final String? image; @@ -37,4 +34,4 @@ class GameDto { const GameDto(this.id, this.name, this.description, this.image, this.date); factory GameDto.fromJson(Map json) => _$GameDtoFromJson(json); -} \ No newline at end of file +} diff --git a/lib/data/dto/games_dto.g.dart b/lib/data/dto/games_dto.g.dart index 1d3efd3..ee22d49 100644 --- a/lib/data/dto/games_dto.g.dart +++ b/lib/data/dto/games_dto.g.dart @@ -7,21 +7,16 @@ part of 'games_dto.dart'; // ************************************************************************** GamesDto _$GamesDtoFromJson(Map json) => GamesDto( - data: (json['results'] as List?) - ?.map((e) => GameDto.fromJson(e as Map)) - .toList(), - current: getNextPageNumber(json['next']) != null ? getNextPageNumber(json['next'])! - 1 : null, - next: getNextPageNumber(json['next']), -); + data: (json['results'] as List?)?.map((e) => GameDto.fromJson(e as Map)).toList(), + next: getNextPageNumber(json['next']), + ); int? getNextPageNumber(String url) { RegExp regExp = RegExp(r'page=(\d+)'); Match? match = regExp.firstMatch(url); - String? number; if (match != null) { return int.parse(match.group(1)!); } - //по умолчанию след. = 2, т.е. тек. = 1 else { return null; } diff --git a/lib/data/mappers/games_mapper.dart b/lib/data/mappers/games_mapper.dart index ea1292c..b2c150b 100644 --- a/lib/data/mappers/games_mapper.dart +++ b/lib/data/mappers/games_mapper.dart @@ -1,27 +1,19 @@ import 'package:mobiles_labs_5th_semester/data/dto/games_dto.dart'; import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; -import 'package:mobiles_labs_5th_semester/domain/models/page_of_games_home.dart'; +import 'package:mobiles_labs_5th_semester/domain/models/games.dart'; extension GamesDtoToModel on GamesDto { - PageOfGames toDomain() => PageOfGames( - data: data?.map((e) => e.toDomain()).toList(), - nextPage: next); + Games toDomain() => Games(data: data?.map((e) => e.toDomain()).toList(), nextPage: next); } extension GameDtoToModel on GameDto { - GameData toDomain() { + Game toDomain() { // удаление HTML-тегов из описания String cleanedDescription = description ?? ''; if (cleanedDescription.isNotEmpty) { - cleanedDescription = - cleanedDescription.replaceAll(RegExp(r'<[^>]*>'), ''); + cleanedDescription = cleanedDescription.replaceAll(RegExp(r'<[^>]*>'), ''); } - // return GameData(name: name ?? 'Неизвестная игра', price: 100, image: image?.originalUrl, description: cleanedDescription); - return GameData( - id: id, - name: name ?? 'Неизвестная игра', - date: DateTime.parse(date ?? '2000-01-01'), - image: image, - description: cleanedDescription); + + return Game(id: id, name: name ?? 'Неизвестная игра', date: DateTime.parse(date ?? '2000-01-01'), image: image, description: cleanedDescription); } } diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart index 67303b5..8dfee61 100644 --- a/lib/data/repositories/api_interface.dart +++ b/lib/data/repositories/api_interface.dart @@ -1,8 +1,7 @@ -import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; -import 'package:mobiles_labs_5th_semester/domain/models/page_of_games_home.dart'; +import 'package:mobiles_labs_5th_semester/domain/models/games.dart'; typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { - Future loadData({OnErrorCallback? onError}); -} \ No newline at end of file + Future loadData({OnErrorCallback? onError}); +} diff --git a/lib/data/repositories/games_repository.dart b/lib/data/repositories/games_repository.dart index d8c7120..50d610e 100644 --- a/lib/data/repositories/games_repository.dart +++ b/lib/data/repositories/games_repository.dart @@ -5,8 +5,7 @@ import 'package:dio/dio.dart'; import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; import 'package:pretty_dio_logger/pretty_dio_logger.dart'; -import '../../domain/models/page_of_games_home.dart'; - +import '../../domain/models/games.dart'; class GamesRepository extends ApiInterface { // Для обращения к api, с удобным выводом в консоль @@ -18,9 +17,8 @@ class GamesRepository extends ApiInterface { static const String _baseUrl = 'https://api.rawg.io'; - @override - Future loadData({OnErrorCallback? onError, String? q, int page = 1, int pageSize = 10}) async { + Future loadData({OnErrorCallback? onError, String? q, int page = 1, int pageSize = 10}) async { try { String url = '$_baseUrl/api/games?key=793f3ef5bdb64d128bebbb6e68ab89bd&format=json&platforms=4'; url += '&page=$page'; @@ -34,17 +32,16 @@ class GamesRepository extends ApiInterface { final GamesDto gamesDto = GamesDto.fromJson(response.data as Map); - final PageOfGames? data = gamesDto.toDomain(); + final Games? data = gamesDto.toDomain(); return data; - } - on DioException catch (e) { + } on DioException catch (e) { onError?.call(e.error?.toString()); return null; } } - Future loadGameData(int? id) async { + Future loadGameData(int? id) async { try { String url = '$_baseUrl/api/games/${id.toString()}?key=793f3ef5bdb64d128bebbb6e68ab89bd&format=json'; @@ -52,11 +49,10 @@ class GamesRepository extends ApiInterface { final GameDto gameDto = GameDto.fromJson(response.data as Map); - final GameData data = gameDto.toDomain(); + final Game data = gameDto.toDomain(); return data; - } - on DioException catch (e) { + } on DioException catch (e) { return null; } } -} \ No newline at end of file +} diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart deleted file mode 100644 index a2c788d..0000000 --- a/lib/data/repositories/mock_repository.dart +++ /dev/null @@ -1,33 +0,0 @@ -// import 'package:flutter/material.dart'; -// import 'package:mobiles_labs_5th_semester/data/repositories/api_interface.dart'; -// import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; -// -// //реализация apiInterface -// //"фейковые" данные, которые подходят -// class MockRepository extends ApiInterface { -// @override -// Future?> loadData(String? q) async { -// return [ -// GameData( -// name: 'Late Shift', -// //price: 399, -// date: DateTime(2016, 20, 02), -// description: 'Late Shift - криминальный FMV-триллер с невероятно высокими ставками. Вы окажетесь в эпицентре лондонского ограбления и выберете своё приключение в интерактивном кинофильме с меняющейся историей, ведущей к одной из семи концовок. Ваши решения определяют вас.', -// image: -// 'https://shared.akamai.steamstatic.com/store_item_assets/steam/apps/584980/capsule_616x353.jpg?t=1697110140'), -// GameData( -// name: 'Dark Nights with Poe & Munro', -// //price: 450, -// date: DateTime(2019, 05, 05), -// description: 'Проведите местных радиоведущих По и Манро через шесть похожих на короткометражки эпизодов сверъестественной странности и обжигающего сюжета. От создателей The Infectious Madness of Doctor Dekker и The Shapeshifting Detective.', -// image: -// 'https://shared.akamai.steamstatic.com/store_item_assets/steam/apps/1098170/capsule_616x353.jpg?t=1725541685'), -// GameData( -// date: DateTime(1900, 20, 02), -// name: 'Неизвестная игра', -// //price: 999, -// -// ) -// ]; -// } -// } \ No newline at end of file diff --git a/lib/domain/models/game.dart b/lib/domain/models/game.dart index 1a866a2..0995d01 100644 --- a/lib/domain/models/game.dart +++ b/lib/domain/models/game.dart @@ -1,18 +1,14 @@ -class GameData { +class Game { final int? id; final String name; - //final int price; final DateTime date; final String? image; - //Описание игры final String? description; - GameData( - { this.id, - required this.name, - //required this.price, - required this.date, - this.description, - this.image = - 'https://parpol.ru/wp-content/uploads/2019/09/placeholder.png'}); -} \ No newline at end of file + Game( + {required this.id, + required this.name, + required this.date, + this.description, + this.image = 'https://parpol.ru/wp-content/uploads/2019/09/placeholder.png'}); +} diff --git a/lib/domain/models/games.dart b/lib/domain/models/games.dart new file mode 100644 index 0000000..a7d1c07 --- /dev/null +++ b/lib/domain/models/games.dart @@ -0,0 +1,7 @@ +import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; + +class Games { + final List? data; + final int? nextPage; + Games({this.data, this.nextPage}); +} diff --git a/lib/domain/models/page_of_games_home.dart b/lib/domain/models/page_of_games_home.dart deleted file mode 100644 index adcdb9b..0000000 --- a/lib/domain/models/page_of_games_home.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; - -class PageOfGames { - final List? data; - final int? nextPage; - //final int? prevPage; - PageOfGames({this.data, this.nextPage}); -} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 8a069e5..2cb92aa 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:mobiles_labs_5th_semester/data/repositories/games_repository.dart'; import 'package:mobiles_labs_5th_semester/presentation/home_page/bloc/bloc.dart'; +import 'package:mobiles_labs_5th_semester/presentation/like_bloc/like_bloc.dart'; +import 'package:mobiles_labs_5th_semester/presentation/locale_bloc/locale_bloc.dart'; +import 'package:mobiles_labs_5th_semester/presentation/locale_bloc/locale_state.dart'; +import 'components/locale/l10n/app_locale.dart'; import 'presentation/home_page/home_page.dart'; void main() { @@ -14,23 +18,31 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Flutter Demo', - debugShowCheckedModeBanner: false, - home: RepositoryProvider( - //репозиторий будет создан только тогда, когда будет запрошен, а не сразу при создании виджета - lazy: true, - create: (_) => GamesRepository(), - child: BlocProvider( - //bloc будет создан сразу при создании виджета - lazy: false, - //context нужен, чтобы суметь обратиться к провайдеру, кот. выше по дереву - create: (context) => HomeBloc(context.read()), - child: const HomePage(title: 'Чернышев Георгий Янович'), - ), - ) - ); + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc(Locale('ru')), + child: BlocBuilder(builder: (context, state) { + return MaterialApp( + title: 'Flutter Demo', + locale: state.currentLocale, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + debugShowCheckedModeBanner: false, + home: RepositoryProvider( + //репозиторий будет создан только тогда, когда будет запрошен, а не сразу при создании виджета + lazy: true, + create: (_) => GamesRepository(), + child: BlocProvider( + lazy: false, + create: (context) => LikeBloc(), + child: BlocProvider( + //bloc будет создан сразу при создании виджета + lazy: false, + //context нужен, чтобы суметь обратиться к провайдеру, кот. выше по дереву + create: (context) => HomeBloc(context.read()), + child: const HomePage(title: 'неSteam'), + ), + ))); + })); } } - - diff --git a/lib/presentation/common/svg_objects.dart b/lib/presentation/common/svg_objects.dart new file mode 100644 index 0000000..ca7daa2 --- /dev/null +++ b/lib/presentation/common/svg_objects.dart @@ -0,0 +1,34 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:mobiles_labs_5th_semester/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/lib/presentation/details_page/bloc/state.dart b/lib/presentation/details_page/bloc/state.dart index 4efaeea..4e1a0d8 100644 --- a/lib/presentation/details_page/bloc/state.dart +++ b/lib/presentation/details_page/bloc/state.dart @@ -1,13 +1,14 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; import 'package:equatable/equatable.dart'; import '../../../domain/models/game.dart'; -import 'package:copy_with_extension/copy_with_extension.dart'; + part 'state.g.dart'; @CopyWith() class GameDetailsState extends Equatable { - final GameData? gameData; + final Game? gameData; const GameDetailsState({this.gameData}); @override List get props => [gameData]; -} \ No newline at end of file +} diff --git a/lib/presentation/details_page/bloc/state.g.dart b/lib/presentation/details_page/bloc/state.g.dart index 5e531e1..5d8da86 100644 --- a/lib/presentation/details_page/bloc/state.g.dart +++ b/lib/presentation/details_page/bloc/state.g.dart @@ -7,7 +7,7 @@ part of 'state.dart'; // ************************************************************************** abstract class _$GameDetailsStateCWProxy { - GameDetailsState gameData(GameData? gameData); + GameDetailsState gameData(Game? gameData); /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `GameDetailsState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. /// @@ -16,7 +16,7 @@ abstract class _$GameDetailsStateCWProxy { /// GameDetailsState(...).copyWith(id: 12, name: "My name") /// ```` GameDetailsState call({ - GameData? gameData, + Game? gameData, }); } @@ -27,7 +27,7 @@ class _$GameDetailsStateCWProxyImpl implements _$GameDetailsStateCWProxy { final GameDetailsState _value; @override - GameDetailsState gameData(GameData? gameData) => this(gameData: gameData); + GameDetailsState gameData(Game? gameData) => this(gameData: gameData); @override @@ -44,7 +44,7 @@ class _$GameDetailsStateCWProxyImpl implements _$GameDetailsStateCWProxy { gameData: gameData == const $CopyWithPlaceholder() ? _value.gameData // ignore: cast_nullable_to_non_nullable - : gameData as GameData?, + : gameData as Game?, ); } } diff --git a/lib/presentation/details_page/details_page.dart b/lib/presentation/details_page/details_page.dart index 05d5722..00a5716 100644 --- a/lib/presentation/details_page/details_page.dart +++ b/lib/presentation/details_page/details_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; + import '../../data/repositories/games_repository.dart'; import 'bloc/bloc.dart'; import 'bloc/event.dart'; @@ -31,7 +31,6 @@ class DetailsPage extends StatelessWidget { } } - class Body extends StatelessWidget { const Body({super.key}); @@ -85,4 +84,4 @@ class Body extends StatelessWidget { }, ); } -} \ No newline at end of file +} diff --git a/lib/presentation/home_page/bloc/bloc.dart b/lib/presentation/home_page/bloc/bloc.dart index b80db10..b914ef3 100644 --- a/lib/presentation/home_page/bloc/bloc.dart +++ b/lib/presentation/home_page/bloc/bloc.dart @@ -7,12 +7,12 @@ class HomeBloc extends Bloc { final GamesRepository repo; //связывание метода _onLoadData с конкретным событием в конструкторе - HomeBloc(this.repo) : super (const HomeState()) { + HomeBloc(this.repo) : super(const HomeState()) { on(_onLoadData); } //Emitter - генератор событий - Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async{ + Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async { if (event.nextPage == null) { emit(state.copyWith(isLoading: true)); } else { @@ -21,20 +21,11 @@ class HomeBloc extends Bloc { String? error; - final data = await repo.loadData( - q: event.search, - page: event.nextPage ?? 1, - onError: (e) => error = e - ); + final data = await repo.loadData(q: event.search, page: event.nextPage ?? 1, onError: (e) => error = e); if (event.nextPage != null) { data?.data?.insertAll(0, state.data?.data ?? []); } - emit(state.copyWith( - data: data, - isLoading: false, - isPaginationLoading: false, - error: error - )); + emit(state.copyWith(data: data, isLoading: false, isPaginationLoading: false, error: error)); } -} \ No newline at end of file +} diff --git a/lib/presentation/home_page/bloc/events.dart b/lib/presentation/home_page/bloc/events.dart index cb3baee..cefba70 100644 --- a/lib/presentation/home_page/bloc/events.dart +++ b/lib/presentation/home_page/bloc/events.dart @@ -6,5 +6,5 @@ class HomeLoadDataEvent extends HomeEvent { final String? search; final int? nextPage; - const HomeLoadDataEvent({this. search, this.nextPage}); -} \ No newline at end of file + const HomeLoadDataEvent({this.search, this.nextPage}); +} diff --git a/lib/presentation/home_page/bloc/state.dart b/lib/presentation/home_page/bloc/state.dart index c361cff..759de10 100644 --- a/lib/presentation/home_page/bloc/state.dart +++ b/lib/presentation/home_page/bloc/state.dart @@ -1,22 +1,17 @@ -import 'package:equatable/equatable.dart'; -import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; -import 'package:mobiles_labs_5th_semester/domain/models/page_of_games_home.dart'; import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; +import 'package:mobiles_labs_5th_semester/domain/models/games.dart'; part 'state.g.dart'; @CopyWith() class HomeState extends Equatable { - final PageOfGames? data; + final Games? data; final bool isLoading; final bool isPaginationLoading; final String? error; - const HomeState( - {this.data, - this.isLoading = false, - this.isPaginationLoading = false, - this.error}); + const HomeState({this.data, this.isLoading = false, this.isPaginationLoading = false, this.error}); //какие поля будут сравниваться у состояний @override diff --git a/lib/presentation/home_page/bloc/state.g.dart b/lib/presentation/home_page/bloc/state.g.dart index 44e0a97..728b04c 100644 --- a/lib/presentation/home_page/bloc/state.g.dart +++ b/lib/presentation/home_page/bloc/state.g.dart @@ -7,7 +7,7 @@ part of 'state.dart'; // ************************************************************************** abstract class _$HomeStateCWProxy { - HomeState data(PageOfGames? data); + HomeState data(Games? data); HomeState isLoading(bool isLoading); @@ -22,7 +22,7 @@ abstract class _$HomeStateCWProxy { /// HomeState(...).copyWith(id: 12, name: "My name") /// ```` HomeState call({ - PageOfGames? data, + Games? data, bool? isLoading, bool? isPaginationLoading, String? error, @@ -36,14 +36,13 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy { final HomeState _value; @override - HomeState data(PageOfGames? data) => this(data: data); + HomeState data(Games? data) => this(data: data); @override HomeState isLoading(bool isLoading) => this(isLoading: isLoading); @override - HomeState isPaginationLoading(bool isPaginationLoading) => - this(isPaginationLoading: isPaginationLoading); + HomeState isPaginationLoading(bool isPaginationLoading) => this(isPaginationLoading: isPaginationLoading); @override HomeState error(String? error) => this(error: error); @@ -66,17 +65,15 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy { data: data == const $CopyWithPlaceholder() ? _value.data // ignore: cast_nullable_to_non_nullable - : data as PageOfGames?, + : data as Games?, isLoading: isLoading == const $CopyWithPlaceholder() || isLoading == null ? _value.isLoading // ignore: cast_nullable_to_non_nullable : isLoading as bool, - isPaginationLoading: - isPaginationLoading == const $CopyWithPlaceholder() || - isPaginationLoading == null - ? _value.isPaginationLoading - // ignore: cast_nullable_to_non_nullable - : isPaginationLoading as bool, + isPaginationLoading: isPaginationLoading == const $CopyWithPlaceholder() || isPaginationLoading == null + ? _value.isPaginationLoading + // ignore: cast_nullable_to_non_nullable + : isPaginationLoading as bool, error: error == const $CopyWithPlaceholder() ? _value.error // ignore: cast_nullable_to_non_nullable diff --git a/lib/presentation/home_page/gameCard.dart b/lib/presentation/home_page/game_card.dart similarity index 50% rename from lib/presentation/home_page/gameCard.dart rename to lib/presentation/home_page/game_card.dart index e363f13..39bbddb 100644 --- a/lib/presentation/home_page/gameCard.dart +++ b/lib/presentation/home_page/game_card.dart @@ -1,62 +1,45 @@ part of 'home_page.dart'; -typedef OnLikeCallback = void Function(String title, bool isLiked)?; +typedef OnLikeCallback = void Function(String? id, String title, bool isLiked)?; -class _GameCard extends StatefulWidget { +class _GameCard extends StatelessWidget { final int? id; final String name; - //final int price; final DateTime date; final String? image; - // final String? description; + final bool isLiked; - //OnLikeCallback - пользовательский тип, ф-ия + //OnLikeCallback - пользовательский тип final OnLikeCallback onLike; final VoidCallback? onTap; //обычный конструктор - const _GameCard({ - super.key, - this.id, - required this.name, - // required this.price, - required this.date, - this.image, - // this.description, - this.onLike, - this.onTap, - }); + const _GameCard( + {super.key, + this.id, + required this.name, + required this.date, + this.image, + this.onLike, + this.onTap, + this.isLiked = false}); //именованный конструктор - factory _GameCard.fromData(GameData data, - {OnLikeCallback onLike, VoidCallback? onTap}) => - _GameCard( + factory _GameCard.fromData(Game data, {OnLikeCallback onLike, VoidCallback? onTap, bool isLiked = false}) => _GameCard( id: data.id, name: data.name, - //price: data.price, date: data.date, image: data.image, - // description: data.description, + isLiked: isLiked, onLike: onLike, onTap: onTap, ); - //Переход в stateful - @override - State<_GameCard> createState() => _GameCardState(); -} - -//extends - переход в stateful -class _GameCardState extends State<_GameCard> { - //доп. поле, которое будет меняться; состояние того, нравится игра или нет - bool isLiked = false; - @override Widget build(BuildContext context) { return Container( margin: const EdgeInsets.all(10), padding: const EdgeInsets.only(top: 3, bottom: 3, left: 10, right: 10), - // constraints: const BoxConstraints(minHeight: 350), //форма карточки decoration: BoxDecoration( color: const Color.fromARGB(255, 56, 90, 128), @@ -73,19 +56,9 @@ class _GameCardState extends State<_GameCard> { Padding( padding: EdgeInsets.only(bottom: 4, top: 2), child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.name, isLiked); - }, + onTap: () => onLike?.call(id.toString(), name, isLiked), child: AnimatedSwitcher( - duration: const Duration(milliseconds: 175), - child: isLiked - ? const Icon(Icons.favorite, - color: Colors.pink, key: ValueKey(0)) - : const Icon(Icons.favorite_border, - color: Colors.white, key: ValueKey(1))))), + duration: const Duration(milliseconds: 175), child: isLiked ? const Icon(Icons.favorite, color: Colors.pink, key: ValueKey(0)) : const Icon(Icons.favorite_border, color: Colors.white, key: ValueKey(1))))), ], ), //ClipRRect для скругления краёв фото @@ -95,7 +68,7 @@ class _GameCardState extends State<_GameCard> { height: 200, width: MediaQuery.of(context).size.width, child: Image.network( - widget.image ?? '', + image ?? '', fit: BoxFit.fill, errorBuilder: (_, __, ___) => const Placeholder(), ), @@ -103,21 +76,20 @@ class _GameCardState extends State<_GameCard> { ), // Название игры GestureDetector( - onTap: widget.onTap, - child: - Text( - widget.name, - style: const TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 32, - ), - textAlign: TextAlign.center, - ) - ), + onTap: onTap, + child: Text( + name, + style: const TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 32, + ), + textAlign: TextAlign.center, + )), // Релиз игры Text( - '${widget.date.day.toString().padLeft(2, '0')}.${widget.date.month.toString().padLeft(2, '0')}.${widget.date.year}', + //день и месяц обязательно 2 символа, если в месяце/числе 1 цифра, то дополняется 0 + '${date.day.toString().padLeft(2, '0')}.${date.month.toString().padLeft(2, '0')}.${date.year}', style: const TextStyle( color: Colors.white, fontWeight: FontWeight.bold, diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 451c146..2138d72 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -1,19 +1,23 @@ -import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:mobiles_labs_5th_semester/data/repositories/mock_repository.dart'; +import 'package:mobiles_labs_5th_semester/components/extensions/context_x.dart'; import 'package:mobiles_labs_5th_semester/domain/models/game.dart'; -import 'package:mobiles_labs_5th_semester/main.dart'; +import 'package:mobiles_labs_5th_semester/presentation/common/svg_objects.dart'; import 'package:mobiles_labs_5th_semester/presentation/details_page/details_page.dart'; import 'package:mobiles_labs_5th_semester/presentation/home_page/bloc/bloc.dart'; import 'package:mobiles_labs_5th_semester/presentation/home_page/bloc/events.dart'; import 'package:mobiles_labs_5th_semester/presentation/home_page/bloc/state.dart'; +import 'package:mobiles_labs_5th_semester/presentation/like_bloc/like_bloc.dart'; +import 'package:mobiles_labs_5th_semester/presentation/locale_bloc/locale_events.dart'; import '../../components/utils/debounce.dart'; -import '../../data/repositories/games_repository.dart'; -import 'bloc/state.dart'; +import '../like_bloc/like_event.dart'; +import '../like_bloc/like_state.dart'; +import '../locale_bloc/locale_bloc.dart'; +import '../locale_bloc/locale_state.dart'; -part 'gameCard.dart'; +part 'game_card.dart'; class HomePage extends StatefulWidget { const HomePage({super.key, required this.title}); @@ -38,15 +42,13 @@ class _HomePageState extends State { backgroundColor: Color.fromARGB(255, 56, 90, 128), title: Text( widget.title, - style: const TextStyle( - color: Colors.white, fontWeight: FontWeight.bold), + style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold), ), ), body: const Body()); } } - class Body extends StatefulWidget { const Body({super.key}); @@ -55,17 +57,18 @@ class Body extends StatefulWidget { } class _BodyState extends State { - late Future?> data; + late Future?> data; final searchController = TextEditingController(); final scrollController = ScrollController(); - // final repo = GamesRepository(); @override void initState() { - //добавление кастомного события + SvgObjects.init(); + //добавление кастомных событий WidgetsBinding.instance.addPostFrameCallback((_) { context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); }); scrollController.addListener(_onNextPageListener); @@ -97,78 +100,97 @@ class _BodyState extends State { children: [ Padding( padding: const EdgeInsets.only(top: 12, left: 12, right: 12), - child: CupertinoSearchTextField( - backgroundColor: Colors.white, - style: TextStyle(color: Color.fromARGB(255, 46, 65, 80)), - // borderRadius: const BorderRadiusTween(2.0), - controller: searchController, - onChanged: (search) { - Debounce.run(() => context - .read() - .add(HomeLoadDataEvent(search: search))); - }, + child: Row( + children: [ + Expanded( + flex: 3, + child: CupertinoSearchTextField( + placeholder: context.locale.search, + backgroundColor: Colors.white, + style: TextStyle(color: Color.fromARGB(255, 46, 65, 80)), + controller: searchController, + onChanged: (search) { + Debounce.run(() => context.read().add(HomeLoadDataEvent(search: search))); + }, + ), + ), + //значок svg с языком + Padding( + padding: const EdgeInsets.only(left: 12.0), + child: GestureDetector( + //при нажатии на значок отправка события в bloc + onTap: () => context.read().add(const ChangeLocaleEvent()), + child: SizedBox.square( + dimension: 50, + child: Padding( + padding: EdgeInsets.only(right: 12), + child: BlocBuilder(builder: (context, state) { + return state.currentLocale.languageCode == 'ru' ? const SvgRu() : const SvgUk(); + }), + ), + )), + ) + ], ), ), BlocBuilder( - builder: (context, state) => state.error != null - ? Text( - state.error ?? '', - style: Theme.of(context) - .textTheme - .headlineSmall - ?.copyWith(color: Colors.red), - ) - : state.isLoading - ? const CircularProgressIndicator() - : Expanded( - child: RefreshIndicator( - onRefresh: _onRefresh, - child: ListView.builder( - controller: scrollController, - itemCount: state.data?.data?.length ?? 0, - itemBuilder: (context, index) { - final data = state.data?.data?[index]; - return data != null - ? _GameCard.fromData( - data, - onLike: (title, isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ) - : const SizedBox.shrink(); - }, - ), - ), - ), - ), + builder: (context, state) => state.error != null + ? Text( + state.error ?? '', + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), + ) + : state.isLoading + ? const CircularProgressIndicator() + : BlocBuilder( + builder: (context, likeState) { + return Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.builder( + controller: scrollController, + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + return data != null + ? _GameCard.fromData( + data, + onLike: _onLike, + isLiked: likeState.likedIds?.contains(data.id.toString()) == true, + onTap: () => _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }, + ), + ), + ); + }, + )), //значок загрузки при пагинации BlocBuilder( - builder: (context, state) => state.isPaginationLoading - ? const CircularProgressIndicator() - : const SizedBox.shrink(), + builder: (context, state) => state.isPaginationLoading ? const CircularProgressIndicator() : const SizedBox.shrink(), ) ], ); } Future _onRefresh() { - context - .read() - .add(HomeLoadDataEvent(search: searchController.text)); + context.read().add(HomeLoadDataEvent(search: searchController.text)); return Future.value(null); } - void _showSnackBar(BuildContext context, String title, bool isLiked) { + void _onLike(String? id, String name, bool isLiked) { + if (id != null) { + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, name, !isLiked); + } + } + + void _showSnackBar(BuildContext context, String name, bool isLiked) { WidgetsBinding.instance.addPostFrameCallback((_) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( - isLiked - ? 'Вы поставили лайк игре "$title"' - : 'Вы убрали лайк у игры "$title"', - style: Theme.of(context) - .textTheme - .bodyLarge - ?.copyWith(color: Colors.pink, fontWeight: FontWeight.bold), + isLiked ? context.locale.liked + '"$name"' : context.locale.disliked + '"$name"', + style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.pink, fontWeight: FontWeight.bold), textAlign: TextAlign.center, ), backgroundColor: Colors.white, @@ -177,10 +199,13 @@ class _BodyState extends State { }); } - void _navToDetails(BuildContext context, GameData data) { - Navigator.push( - context, - CupertinoPageRoute(builder: (context) => DetailsPage(data.id ?? 0)), - ); + void _navToDetails(BuildContext context, Game data) { + if (data.id != null) { + Navigator.push( + context, + CupertinoPageRoute(builder: (context) => DetailsPage(data.id!)), + ); + } + } } diff --git a/lib/presentation/like_bloc/like_bloc.dart b/lib/presentation/like_bloc/like_bloc.dart new file mode 100644 index 0000000..5345342 --- /dev/null +++ b/lib/presentation/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 { + //Shared Preferences = Map (не бд) + final prefs = await SharedPreferences.getInstance(); + //получение из словаря списка id лайкнутых игр по ключу 'liked' + 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)); + } +} diff --git a/lib/presentation/like_bloc/like_event.dart b/lib/presentation/like_bloc/like_event.dart new file mode 100644 index 0000000..d0326d8 --- /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); +} diff --git a/lib/presentation/like_bloc/like_state.dart b/lib/presentation/like_bloc/like_state.dart new file mode 100644 index 0000000..5f0959f --- /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]; +} 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..1e83504 --- /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 '../../components/locale/l10n/app_locale.dart'; +import 'locale_events.dart'; +import '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/presentation/locale_bloc/locale_events.dart b/lib/presentation/locale_bloc/locale_events.dart new file mode 100644 index 0000000..c08cd1b --- /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(); +} diff --git a/lib/presentation/locale_bloc/locale_state.dart b/lib/presentation/locale_bloc/locale_state.dart new file mode 100644 index 0000000..567c82f --- /dev/null +++ b/lib/presentation/locale_bloc/locale_state.dart @@ -0,0 +1,15 @@ +import 'package:equatable/equatable.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:copy_with_extension/copy_with_extension.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/presentation/locale_bloc/locale_state.g.dart b/lib/presentation/locale_bloc/locale_state.g.dart new file mode 100644 index 0000000..23ee063 --- /dev/null +++ b/lib/presentation/locale_bloc/locale_state.g.dart @@ -0,0 +1,56 @@ +// 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/pubspec.lock b/pubspec.lock index 1f9ec2e..086c84c 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: @@ -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: @@ -275,6 +299,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: @@ -283,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: @@ -320,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: @@ -336,6 +394,22 @@ 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: @@ -472,6 +546,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: @@ -512,6 +642,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" + source: hosted + version: "2.2.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + 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: @@ -621,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: ab9ff38fc771e9ee1139320adbe3d18a60327370c218c60752068ebee4b49ab1 + url: "https://pub.dev" + source: hosted + version: "1.1.15" vector_math: dependency: transitive description: @@ -669,6 +879,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: @@ -679,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 70e12d2..2f7ddd0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,6 +20,13 @@ dependencies: flutter_bloc: ^8.1.6 equatable: ^2.0.5 copy_with_extension_gen: ^5.0.4 + flutter_svg: 2.0.7 + + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + + shared_preferences: 2.2.3 dev_dependencies: flutter_test: @@ -30,10 +37,18 @@ dev_dependencies: json_serializable: ^6.7.1 flutter_lints: ^4.0.0 + flutter_launcher_icons: 0.13.1 +flutter_icons: + android: "ic_launcher" + ios: false + image_path: "assets/icon.jpg" + min_sdk_android: 21 flutter: - uses-material-design: true + generate: true + assets: + - assets/svg/