diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..345888d --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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..334610a 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-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..1966948 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..745b050 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..745b050 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.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..1adae92 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-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..75025cf Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..b489390 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..b489390 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.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..51a3dcf 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-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..9784f16 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..512f1d8 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..512f1d8 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.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..00e8478 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-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..04ef206 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1bc12f7 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..1bc12f7 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.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..b049e56 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/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..66a5487 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..cdc749c Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..cdc749c Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/assets/launcher.jpeg b/assets/launcher.jpeg new file mode 100644 index 0000000..8375fbc Binary files /dev/null and b/assets/launcher.jpeg 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..e7068b9 --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,15 @@ +{ + "@@locale": "en", + + "title": "Comments App", + "credits": "made by", + "search": "Search", + "comment": "{nickname}'s comment", + "liked": "liked", + "disliked": "disliked", + "neutralized": "neutralized", + "born": "Born", + "died": "Died", + + "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..7499d00 --- /dev/null +++ b/l10n/app_ru.arb @@ -0,0 +1,15 @@ +{ + "@@locale": "ru", + + "title": "Комментарии", + "credits": "сделано", + "search": "Поиск", + "comment": "Комментарий {nickname}", + "liked": "лайкнут", + "disliked": "дизлайкнут", + "neutralized": "без реакции", + "born": "Родился", + "died": "Умер", + + "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..a25731e --- /dev/null +++ b/lib/components/extensions/context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/widgets.dart'; +import 'package:pmu_labworks/components/locale/l10n/app_locale.dart'; + +extension LocalContextX on BuildContext { + AppLocale get locale => AppLocale.of(this)!; +} diff --git a/lib/components/locale/l10n/app_locale.dart b/lib/components/locale/l10n/app_locale.dart new file mode 100644 index 0000000..1f2eb4e --- /dev/null +++ b/lib/components/locale/l10n/app_locale.dart @@ -0,0 +1,189 @@ +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 @title. + /// + /// In ru, this message translates to: + /// **'Комментарии'** + String get title; + + /// No description provided for @credits. + /// + /// In ru, this message translates to: + /// **'сделано'** + String get credits; + + /// No description provided for @search. + /// + /// In ru, this message translates to: + /// **'Поиск'** + String get search; + + /// No description provided for @comment. + /// + /// In ru, this message translates to: + /// **'Комментарий {nickname}'** + String comment(Object nickname); + + /// 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 @neutralized. + /// + /// In ru, this message translates to: + /// **'без реакции'** + String get neutralized; + + /// No description provided for @born. + /// + /// In ru, this message translates to: + /// **'Родился'** + String get born; + + /// No description provided for @died. + /// + /// In ru, this message translates to: + /// **'Умер'** + String get died; + + /// 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..9b3f173 --- /dev/null +++ b/lib/components/locale/l10n/app_locale_en.dart @@ -0,0 +1,40 @@ +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 title => 'Comments App'; + + @override + String get credits => 'made by'; + + @override + String get search => 'Search'; + + @override + String comment(Object nickname) { + return '$nickname\'s comment'; + } + + @override + String get liked => 'liked'; + + @override + String get disliked => 'disliked'; + + @override + String get neutralized => 'neutralized'; + + @override + String get born => 'Born'; + + @override + String get died => 'Died'; + + @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..6d7a80d --- /dev/null +++ b/lib/components/locale/l10n/app_locale_ru.dart @@ -0,0 +1,40 @@ +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 title => 'Комментарии'; + + @override + String get credits => 'сделано'; + + @override + String get search => 'Поиск'; + + @override + String comment(Object nickname) { + return 'Комментарий $nickname'; + } + + @override + String get liked => 'лайкнут'; + + @override + String get disliked => 'дизлайкнут'; + + @override + String get neutralized => 'без реакции'; + + @override + String get born => 'Родился'; + + @override + String get died => 'Умер'; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} diff --git a/lib/components/resources.g.dart b/lib/components/resources.g.dart new file mode 100644 index 0000000..4ce026a --- /dev/null +++ b/lib/components/resources.g.dart @@ -0,0 +1,12 @@ +/// 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._(); + + /// ![preview](file://C:\Users\masen\StudioProjects\pmu_labworks\assets\svg\ru.svg) + static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg'; + + /// ![preview](file://C:\Users\masen\StudioProjects\pmu_labworks\assets\svg\uk.svg) + static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg'; +} diff --git a/lib/data/dtos/characters_dto.dart b/lib/data/dtos/characters_dto.dart index 67c42b3..2bccf76 100644 --- a/lib/data/dtos/characters_dto.dart +++ b/lib/data/dtos/characters_dto.dart @@ -12,8 +12,7 @@ class CharactersDto { this.meta, }); - factory CharactersDto.fromJson(Map json) => - _$CharactersDtoFromJson(json); + factory CharactersDto.fromJson(Map json) => _$CharactersDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -24,8 +23,7 @@ class CharacterDataDto { const CharacterDataDto({this.id, this.type, this.attributes}); - factory CharacterDataDto.fromJson(Map json) => - _$CharacterDataDtoFromJson(json); + factory CharacterDataDto.fromJson(Map json) => _$CharacterDataDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -35,8 +33,7 @@ class CharacterAttributesDataDto { final String? died; final String? image; - const CharacterAttributesDataDto( - {this.name, this.born, this.died, this.image}); + const CharacterAttributesDataDto({this.name, this.born, this.died, this.image}); factory CharacterAttributesDataDto.fromJson(Map json) => _$CharacterAttributesDataDtoFromJson(json); @@ -48,8 +45,7 @@ class MetaDto { const MetaDto({this.pagination}); - factory MetaDto.fromJson(Map json) => - _$MetaDtoFromJson(json); + factory MetaDto.fromJson(Map json) => _$MetaDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -60,6 +56,5 @@ class PaginationDto { const PaginationDto({this.current, this.next, this.last}); - factory PaginationDto.fromJson(Map json) => - _$PaginationDtoFromJson(json); + factory PaginationDto.fromJson(Map json) => _$PaginationDtoFromJson(json); } diff --git a/lib/data/dtos/characters_dto.g.dart b/lib/data/dtos/characters_dto.g.dart index c4e1b40..6066b05 100644 --- a/lib/data/dtos/characters_dto.g.dart +++ b/lib/data/dtos/characters_dto.g.dart @@ -6,28 +6,22 @@ part of 'characters_dto.dart'; // JsonSerializableGenerator // ************************************************************************** -CharactersDto _$CharactersDtoFromJson(Map json) => - CharactersDto( +CharactersDto _$CharactersDtoFromJson(Map json) => CharactersDto( data: (json['data'] as List?) ?.map((e) => CharacterDataDto.fromJson(e as Map)) .toList(), - meta: json['meta'] == null - ? null - : MetaDto.fromJson(json['meta'] as Map), + meta: json['meta'] == null ? null : MetaDto.fromJson(json['meta'] as Map), ); -CharacterDataDto _$CharacterDataDtoFromJson(Map json) => - CharacterDataDto( +CharacterDataDto _$CharacterDataDtoFromJson(Map json) => CharacterDataDto( id: json['id'] as String?, type: json['type'] as String?, attributes: json['attributes'] == null ? null - : CharacterAttributesDataDto.fromJson( - json['attributes'] as Map), + : CharacterAttributesDataDto.fromJson(json['attributes'] as Map), ); -CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson( - Map json) => +CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson(Map json) => CharacterAttributesDataDto( name: json['name'] as String?, born: json['born'] as String?, @@ -41,8 +35,7 @@ MetaDto _$MetaDtoFromJson(Map json) => MetaDto( : PaginationDto.fromJson(json['pagination'] as Map), ); -PaginationDto _$PaginationDtoFromJson(Map json) => - PaginationDto( +PaginationDto _$PaginationDtoFromJson(Map json) => PaginationDto( current: (json['current'] as num?)?.toInt(), next: (json['next'] as num?)?.toInt(), last: (json['last'] as num?)?.toInt(), diff --git a/lib/data/mappers/characters_mapper.dart b/lib/data/mappers/characters_mapper.dart index 79c6009..b3d8ef0 100644 --- a/lib/data/mappers/characters_mapper.dart +++ b/lib/data/mappers/characters_mapper.dart @@ -12,11 +12,10 @@ extension CharactersDtoToModel on CharactersDto { extension CharacterDataDtoToModel on CharacterDataDto { CommentData toDomain() => CommentData( + id: id, title: type ?? 'UNKNOWN', text: _makeDescriptionText(attributes?.born, attributes?.died), - user: UserData( - nickname: attributes?.name ?? 'Noname', - avatarUrl: attributes?.image), + user: UserData(nickname: attributes?.name ?? 'Noname', avatarUrl: attributes?.image), ); String _makeDescriptionText(String? born, String? died) { diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart index 4e714f9..da9a711 100644 --- a/lib/data/repositories/mock_repository.dart +++ b/lib/data/repositories/mock_repository.dart @@ -12,8 +12,7 @@ class MockRepository extends ApiInterface { text: 'this app is so cool ' * 10, user: UserData( nickname: 'Steve', - avatarUrl: - 'https://preview.free3d.com/img/2016/03/1875481443430303321/hld8c0oa.jpg', + avatarUrl: 'https://preview.free3d.com/img/2016/03/1875481443430303321/hld8c0oa.jpg', ), ), CommentData( @@ -27,8 +26,7 @@ class MockRepository extends ApiInterface { ), CommentData( title: 'BREAKING!!!', - text: - 'ONLY NOW you can purchase the ability to put likes and dislikes for only 299\$', + text: 'ONLY NOW you can purchase the ability to put likes and dislikes for only 299\$', user: UserData( nickname: 'Bethesda', avatarUrl: 'https://i.playground.ru/p/BWixorSTeZQfoPvdVL9lgA.jpeg', diff --git a/lib/data/repositories/potterdb_repository.dart b/lib/data/repositories/potterdb_repository.dart index 482f7d1..e17389a 100644 --- a/lib/data/repositories/potterdb_repository.dart +++ b/lib/data/repositories/potterdb_repository.dart @@ -33,8 +33,7 @@ class PotterDBRepository extends ApiInterface { }, ); - final CharactersDto dto = - CharactersDto.fromJson(response.data as Map); + final CharactersDto dto = CharactersDto.fromJson(response.data as Map); final HomeData data = dto.toDomain(); return data; } on DioException catch (e) { diff --git a/lib/domain/models/comment.dart b/lib/domain/models/comment.dart index 9d706e8..02d79ac 100644 --- a/lib/domain/models/comment.dart +++ b/lib/domain/models/comment.dart @@ -1,11 +1,13 @@ import 'user.dart'; class CommentData { + final String? id; final String title; final String text; final UserData user; CommentData({ + this.id, required this.title, required this.text, required this.user, diff --git a/lib/main.dart b/lib/main.dart index f95b776..afe524b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,15 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu_labworks/components/extensions/context_x.dart'; +import 'package:pmu_labworks/components/locale/l10n/app_locale.dart'; import 'package:pmu_labworks/data/repositories/potterdb_repository.dart'; import 'package:pmu_labworks/view/home_page/bloc/bloc.dart'; import 'package:pmu_labworks/view/home_page/home_page.dart'; +import 'package:pmu_labworks/view/reaction_bloc/reaction_bloc.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_bloc.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_state.dart'; void main() { runApp(const MyApp()); @@ -13,21 +20,36 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Comments App', - debugShowCheckedModeBanner: false, - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), - useMaterial3: true, - ), - home: RepositoryProvider( - lazy: true, - create: (_) => PotterDBRepository(), - child: BlocProvider( - lazy: false, - create: (context) => HomeBloc(context.read()), - child: const HomePage(title: 'Comments App'), - ), + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc(Locale(Platform.localeName)), + child: BlocBuilder( + builder: (context, state) { + return MaterialApp( + title: "Comments App", + locale: state.currentLocale, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + debugShowCheckedModeBanner: false, + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), + useMaterial3: true, + ), + home: RepositoryProvider( + lazy: true, + create: (_) => PotterDBRepository(), + child: BlocProvider( + lazy: false, + create: (context) => ReactionBloc(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: HomePage(title: "Comments App"), + ), + ), + ), + ); + }, ), ); } diff --git a/lib/view/common/svg_objects.dart b/lib/view/common/svg_objects.dart new file mode 100644 index 0000000..8823fe9 --- /dev/null +++ b/lib/view/common/svg_objects.dart @@ -0,0 +1,34 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:pmu_labworks/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/view/details_page/details_page.dart b/lib/view/details_page/details_page.dart index e139772..a36fc54 100644 --- a/lib/view/details_page/details_page.dart +++ b/lib/view/details_page/details_page.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:pmu_labworks/components/extensions/context_x.dart'; import 'package:pmu_labworks/domain/models/comment.dart'; class DetailsPage extends StatelessWidget { @@ -11,7 +12,7 @@ class DetailsPage extends StatelessWidget { return Scaffold( appBar: AppBar( title: Text( - '${_shortenNickname(model.user.nickname)}\'s comment', + context.locale.comment(model.user.nickname), ), ), body: Padding( @@ -41,8 +42,7 @@ class DetailsPage extends StatelessWidget { left: 8, bottom: 8, child: Container( - padding: const EdgeInsets.symmetric( - vertical: 4.0, horizontal: 8.0), + padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 8.0), color: Colors.black.withOpacity(0.6), child: Text( _shortenNickname(model.user.nickname, maxLength: 13), diff --git a/lib/view/dialogs/error_dialog.dart b/lib/view/dialogs/error_dialog.dart index 7366703..8de67d2 100644 --- a/lib/view/dialogs/error_dialog.dart +++ b/lib/view/dialogs/error_dialog.dart @@ -24,10 +24,7 @@ class ErrorDialog extends StatelessWidget { const SizedBox(height: 12), Text( error ?? 'UNKNOWN', - style: Theme.of(context) - .textTheme - .bodyLarge - ?.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white), ), ], ), diff --git a/lib/view/home_page/bloc/bloc.dart b/lib/view/home_page/bloc/bloc.dart index 7cacfda..07545fc 100644 --- a/lib/view/home_page/bloc/bloc.dart +++ b/lib/view/home_page/bloc/bloc.dart @@ -36,4 +36,4 @@ class HomeBloc extends Bloc { error: error, )); } -} \ No newline at end of file +} diff --git a/lib/view/home_page/bloc/state.g.dart b/lib/view/home_page/bloc/state.g.dart index 114ac25..258a914 100644 --- a/lib/view/home_page/bloc/state.g.dart +++ b/lib/view/home_page/bloc/state.g.dart @@ -72,8 +72,7 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy { // ignore: cast_nullable_to_non_nullable : isLoading as bool, isPaginationLoading: - isPaginationLoading == const $CopyWithPlaceholder() || - isPaginationLoading == null + isPaginationLoading == const $CopyWithPlaceholder() || isPaginationLoading == null ? _value.isPaginationLoading // ignore: cast_nullable_to_non_nullable : isPaginationLoading as bool, diff --git a/lib/view/home_page/comment.dart b/lib/view/home_page/comment.dart index 1931d96..25d54b2 100644 --- a/lib/view/home_page/comment.dart +++ b/lib/view/home_page/comment.dart @@ -1,72 +1,65 @@ part of 'home_page.dart'; -typedef OnActionCallback = void Function( - String nickname, bool isLiked, bool isDisliked)?; +typedef OnLikeCallback = void Function( + String? id, String nickname, bool isLiked, bool isDisliked)?; +typedef OnDislikeCallback = void Function( + String? id, String nickname, bool isLiked, bool isDisliked)?; -class _Comment extends StatefulWidget { +class _Comment extends StatelessWidget { + final String? id; final String title; final String text; - final UserData? user; - final OnActionCallback onAction; + final UserData user; + final bool isLiked; + final bool isDisliked; + final OnLikeCallback? onLike; + final OnDislikeCallback? onDislike; final VoidCallback? onTap; const _Comment({ + this.id, required this.title, required this.text, - this.user, - this.onAction, + required this.user, + this.isLiked = false, + this.isDisliked = false, + this.onLike, + this.onDislike, this.onTap, }); factory _Comment.fromData( CommentData data, { - OnActionCallback onAction, + bool isLiked = false, + bool isDisliked = false, + OnLikeCallback? onLike, + OnDislikeCallback? onDislike, VoidCallback? onTap, }) => _Comment( + id: data.id, title: data.title, text: data.text, user: data.user, - onAction: onAction, + isLiked: isLiked, + isDisliked: isDisliked, + onLike: onLike, + onDislike: onDislike, onTap: onTap, ); - @override - State<_Comment> createState() => _CommentState(); -} - -class _CommentState extends State<_Comment> { - bool isLiked = false; - bool isDisliked = false; - void _onLike() { - setState(() { - isLiked = !isLiked; - if (isLiked && isDisliked) { - isDisliked = false; - } - }); - if (widget.onAction != null) { - widget.onAction?.call(widget.user!.nickname, isLiked, isDisliked); - } + onLike?.call(id, user.nickname, isLiked, isDisliked); } void _onDislike() { - setState(() { - isDisliked = !isDisliked; - if (isDisliked && isLiked) { - isLiked = false; - } - }); - if (widget.onAction != null) { - widget.onAction?.call(widget.user!.nickname, isLiked, isDisliked); - } + onDislike?.call(id, user.nickname, isLiked, isDisliked); } @override Widget build(BuildContext context) { return GestureDetector( - onTap: widget.onTap, + onTap: onTap, child: Container( margin: const EdgeInsets.all(16), padding: const EdgeInsets.all(16), @@ -93,10 +86,9 @@ class _CommentState extends State<_Comment> { child: SizedBox( height: 80, width: 80, - child: widget.user!.avatarUrl != null && - widget.user!.avatarUrl!.isNotEmpty + child: user.avatarUrl != null && user.avatarUrl!.isNotEmpty ? Image.network( - widget.user!.avatarUrl!, + user.avatarUrl!, fit: BoxFit.cover, ) : Container( @@ -111,7 +103,7 @@ class _CommentState extends State<_Comment> { SizedBox( width: 80, child: Text( - widget.user!.nickname, + user.nickname, style: Theme.of(context).textTheme.bodyMedium, maxLines: 1, overflow: TextOverflow.ellipsis, @@ -131,9 +123,7 @@ class _CommentState extends State<_Comment> { IconButton( iconSize: 20, icon: Icon( - isDisliked - ? Icons.thumb_down - : Icons.thumb_down_outlined, + isDisliked ? Icons.thumb_down : Icons.thumb_down_outlined, color: isDisliked ? Colors.red : Colors.grey, ), onPressed: _onDislike, @@ -149,12 +139,12 @@ class _CommentState extends State<_Comment> { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - widget.title, + title, style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 8), Text( - widget.text, + text, style: Theme.of(context).textTheme.bodyLarge, ), ], diff --git a/lib/view/home_page/home_page.dart b/lib/view/home_page/home_page.dart index 4fead2a..91f8082 100644 --- a/lib/view/home_page/home_page.dart +++ b/lib/view/home_page/home_page.dart @@ -1,15 +1,24 @@ +import 'dart:io'; import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu_labworks/components/extensions/context_x.dart'; import 'package:pmu_labworks/components/utils/debounce.dart'; import 'package:pmu_labworks/domain/models/comment.dart'; import 'package:pmu_labworks/domain/models/user.dart'; +import 'package:pmu_labworks/view/common/svg_objects.dart'; import 'package:pmu_labworks/view/details_page/details_page.dart'; import 'package:pmu_labworks/view/home_page/bloc/bloc.dart'; import 'package:pmu_labworks/view/home_page/bloc/events.dart'; import 'package:pmu_labworks/view/home_page/bloc/state.dart'; +import 'package:pmu_labworks/view/reaction_bloc/reaction_bloc.dart'; +import 'package:pmu_labworks/view/reaction_bloc/reaction_event.dart'; +import 'package:pmu_labworks/view/reaction_bloc/reaction_state.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_bloc.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_events.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_state.dart'; part 'comment.dart'; @@ -44,8 +53,8 @@ class _HomePageState extends State { fontSize: 20, fontWeight: FontWeight.bold, )), - const Text( - 'made by Factorino', + Text( + context.locale.credits + ' Factorino', style: TextStyle( fontSize: 12, fontStyle: FontStyle.italic, @@ -81,8 +90,11 @@ class _BodyState extends State<_Body> { @override void initState() { + SvgObjects.init(); + WidgetsBinding.instance.addPostFrameCallback((_) { context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadReactionsEvent()); }); scrollController.addListener(_onNextPageListener); @@ -103,50 +115,76 @@ class _BodyState extends State<_Body> { padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top), child: Column( children: [ - Padding( - padding: const EdgeInsets.all(12), - child: CupertinoSearchTextField( - controller: searchController, - onChanged: (search) { - Debounce.run(() => context - .read() - .add(HomeLoadDataEvent(search: search))); - }, - ), + Row( + children: [ + Expanded( + flex: 4, + child: Padding( + padding: const EdgeInsets.all(12), + 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(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), + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), ) : state.isLoading ? const CircularProgressIndicator() - : Expanded( - child: RefreshIndicator( - onRefresh: _onRefresh, - child: ListView.builder( - controller: scrollController, - padding: EdgeInsets.zero, - itemCount: state.data?.data?.length ?? 0, - itemBuilder: (context, index) { - final data = state.data?.data?[index]; - return data != null - ? _Comment.fromData( - data, - onAction: - (nickname, isLiked, isDisliked) => - _showSnackBar(context, nickname, - isLiked, isDisliked), - onTap: () => _navToDetails(context, data), - ) - : const SizedBox.shrink(); - }, - ), - ), + : BlocBuilder( + builder: (context, reactionState) { + return Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.builder( + controller: scrollController, + padding: EdgeInsets.zero, + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + return data != null + ? _Comment.fromData( + data, + onLike: _onLike, + onDislike: _onDislike, + isLiked: + reactionState.likedIds?.contains(data.id) == true, + isDisliked: + reactionState.dislikedIds?.contains(data.id) == true, + onTap: () => _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }, + ), + ), + ); + }, ), ), BlocBuilder( @@ -160,12 +198,30 @@ class _BodyState extends State<_Body> { } Future _onRefresh() { - context - .read() - .add(HomeLoadDataEvent(search: searchController.text)); + context.read().add(HomeLoadDataEvent(search: searchController.text)); return Future.value(null); } + void _onLike(String? id, String nickname, bool isLiked, bool isDisliked) { + if (id != null) { + if (isDisliked) { + isDisliked = false; + } + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, nickname, !isLiked, isDisliked); + } + } + + void _onDislike(String? id, String nickname, bool isLiked, bool isDisliked) { + if (id != null) { + if (isLiked) { + isLiked = false; + } + context.read().add(ChangeDislikeEvent(id)); + _showSnackBar(context, nickname, isLiked, !isDisliked); + } + } + void _navToDetails(BuildContext context, CommentData data) { Navigator.push( context, @@ -173,22 +229,22 @@ class _BodyState extends State<_Body> { ); } - void _showSnackBar( - BuildContext context, String nickname, bool isLiked, bool isDisliked) { + void _showSnackBar(BuildContext context, String nickname, bool isLiked, bool isDisliked) { WidgetsBinding.instance.addPostFrameCallback((_) { final String action; - if (isLiked) { - action = 'liked'; - } else if (isDisliked) { - action = 'disliked'; + if (isLiked && !isDisliked) { + action = context.locale.liked; + } else if (!isLiked && isDisliked) { + action = context.locale.disliked; } else { - action = 'neutralized'; // Состояние без лайков/дизлайков + action = context.locale.neutralized; // Состояние без лайков/дизлайков } + print('$isLiked $isDisliked = $action'); ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( - '$nickname\'s comment $action', + context.locale.comment(nickname) + ' ' + action, style: Theme.of(context).textTheme.bodyLarge, ), backgroundColor: Colors.white70, diff --git a/lib/view/locale_bloc/locale_bloc.dart b/lib/view/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..6610d69 --- /dev/null +++ b/lib/view/locale_bloc/locale_bloc.dart @@ -0,0 +1,17 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmu_labworks/components/locale/l10n/app_locale.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_events.dart'; +import 'package:pmu_labworks/view/locale_bloc/locale_state.dart'; + +class LocaleBloc extends Bloc { + LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) { + on(_onChangeLocale); + } + + Future _onChangeLocale(ChangeLocaleEvent event, Emitter emit) async { + final toChange = AppLocale.supportedLocales + .firstWhere((e) => e.languageCode != state.currentLocale.languageCode); + emit(state.copyWith(currentLocale: toChange)); + } +} diff --git a/lib/view/locale_bloc/locale_events.dart b/lib/view/locale_bloc/locale_events.dart new file mode 100644 index 0000000..c08cd1b --- /dev/null +++ b/lib/view/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent { + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent { + const ChangeLocaleEvent(); +} diff --git a/lib/view/locale_bloc/locale_state.dart b/lib/view/locale_bloc/locale_state.dart new file mode 100644 index 0000000..b9221ca --- /dev/null +++ b/lib/view/locale_bloc/locale_state.dart @@ -0,0 +1,15 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; +import 'package:flutter/material.dart'; + +part 'locale_state.g.dart'; + +@CopyWith() +class LocaleState extends Equatable { + final Locale currentLocale; + + const LocaleState({required this.currentLocale}); + + @override + List get props => [currentLocale]; +} diff --git a/lib/view/locale_bloc/locale_state.g.dart b/lib/view/locale_bloc/locale_state.g.dart new file mode 100644 index 0000000..23ee063 --- /dev/null +++ b/lib/view/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/lib/view/reaction_bloc/reaction_bloc.dart b/lib/view/reaction_bloc/reaction_bloc.dart new file mode 100644 index 0000000..1a7e01c --- /dev/null +++ b/lib/view/reaction_bloc/reaction_bloc.dart @@ -0,0 +1,68 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import 'reaction_event.dart'; +import 'reaction_state.dart'; + +const String _likedPrefsKey = 'liked'; +const String _dislikedPrefsKey = 'disliked'; + +class ReactionBloc extends Bloc { + ReactionBloc() : super(const ReactionState(likedIds: [], dislikedIds: [])) { + on(_onChangeLike); + on(_onChangeDislike); + on(_onLoadReactions); + } + + Future _onLoadReactions(LoadReactionsEvent event, Emitter emit) async { + final prefs = await SharedPreferences.getInstance(); + final likedData = prefs.getStringList(_likedPrefsKey); + final dislikedData = prefs.getStringList(_dislikedPrefsKey); + + emit(state.copyWith( + likedIds: likedData ?? [], + dislikedIds: dislikedData ?? [], + )); + } + + Future _onChangeLike(ChangeLikeEvent event, Emitter emit) async { + final updatedLikedList = List.from(state.likedIds ?? []); + final updatedDislikedList = List.from(state.dislikedIds ?? []); + + if (updatedLikedList.contains(event.id)) { + updatedLikedList.remove(event.id); + } else { + updatedLikedList.add(event.id); + updatedDislikedList.remove(event.id); // Убираем дизлайк, если он был + } + + final prefs = await SharedPreferences.getInstance(); + prefs.setStringList(_likedPrefsKey, updatedLikedList); + prefs.setStringList(_dislikedPrefsKey, updatedDislikedList); + + emit(state.copyWith( + likedIds: updatedLikedList, + dislikedIds: updatedDislikedList, + )); + } + + Future _onChangeDislike(ChangeDislikeEvent event, Emitter emit) async { + final updatedLikedList = List.from(state.likedIds ?? []); + final updatedDislikedList = List.from(state.dislikedIds ?? []); + + if (updatedDislikedList.contains(event.id)) { + updatedDislikedList.remove(event.id); + } else { + updatedDislikedList.add(event.id); + updatedLikedList.remove(event.id); // Убираем лайк, если он был + } + + final prefs = await SharedPreferences.getInstance(); + prefs.setStringList(_likedPrefsKey, updatedLikedList); + prefs.setStringList(_dislikedPrefsKey, updatedDislikedList); + + emit(state.copyWith( + likedIds: updatedLikedList, + dislikedIds: updatedDislikedList, + )); + } +} diff --git a/lib/view/reaction_bloc/reaction_event.dart b/lib/view/reaction_bloc/reaction_event.dart new file mode 100644 index 0000000..3f4cd10 --- /dev/null +++ b/lib/view/reaction_bloc/reaction_event.dart @@ -0,0 +1,19 @@ +abstract class ReactionEvent { + const ReactionEvent(); +} + +class LoadReactionsEvent extends ReactionEvent { + const LoadReactionsEvent(); +} + +class ChangeLikeEvent extends ReactionEvent { + final String id; + + const ChangeLikeEvent(this.id); +} + +class ChangeDislikeEvent extends ReactionEvent { + final String id; + + const ChangeDislikeEvent(this.id); +} diff --git a/lib/view/reaction_bloc/reaction_state.dart b/lib/view/reaction_bloc/reaction_state.dart new file mode 100644 index 0000000..ca39820 --- /dev/null +++ b/lib/view/reaction_bloc/reaction_state.dart @@ -0,0 +1,15 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; + +part 'reaction_state.g.dart'; + +@CopyWith() +class ReactionState extends Equatable { + final List? likedIds; + final List? dislikedIds; + + const ReactionState({required this.likedIds, required this.dislikedIds}); + + @override + List get props => [likedIds, dislikedIds]; +} diff --git a/lib/view/reaction_bloc/reaction_state.g.dart b/lib/view/reaction_bloc/reaction_state.g.dart new file mode 100644 index 0000000..f794f42 --- /dev/null +++ b/lib/view/reaction_bloc/reaction_state.g.dart @@ -0,0 +1,67 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'reaction_state.dart'; + +// ************************************************************************** +// CopyWithGenerator +// ************************************************************************** + +abstract class _$ReactionStateCWProxy { + ReactionState likedIds(List? likedIds); + + ReactionState dislikedIds(List? dislikedIds); + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `ReactionState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// ReactionState(...).copyWith(id: 12, name: "My name") + /// ```` + ReactionState call({ + List? likedIds, + List? dislikedIds, + }); +} + +/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfReactionState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfReactionState.copyWith.fieldName(...)` +class _$ReactionStateCWProxyImpl implements _$ReactionStateCWProxy { + const _$ReactionStateCWProxyImpl(this._value); + + final ReactionState _value; + + @override + ReactionState likedIds(List? likedIds) => this(likedIds: likedIds); + + @override + ReactionState dislikedIds(List? dislikedIds) => this(dislikedIds: dislikedIds); + + @override + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `ReactionState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// ReactionState(...).copyWith(id: 12, name: "My name") + /// ```` + ReactionState call({ + Object? likedIds = const $CopyWithPlaceholder(), + Object? dislikedIds = const $CopyWithPlaceholder(), + }) { + return ReactionState( + likedIds: likedIds == const $CopyWithPlaceholder() + ? _value.likedIds + // ignore: cast_nullable_to_non_nullable + : likedIds as List?, + dislikedIds: dislikedIds == const $CopyWithPlaceholder() + ? _value.dislikedIds + // ignore: cast_nullable_to_non_nullable + : dislikedIds as List?, + ); + } +} + +extension $ReactionStateCopyWith on ReactionState { + /// Returns a callable class that can be used as follows: `instanceOfReactionState.copyWith(...)` or like so:`instanceOfReactionState.copyWith.fieldName(...)`. + // ignore: library_private_types_in_public_api + _$ReactionStateCWProxy get copyWith => _$ReactionStateCWProxyImpl(this); +} diff --git a/makefile b/makefile new file mode 100644 index 0000000..7de4354 --- /dev/null +++ b/makefile @@ -0,0 +1,19 @@ +gen: + flutter pub run build_runner build --delete-conflicting-outputs + +icon: + flutter pub run flutter_launcher_icons:main + +init_res: + dart pub global activate flutter_asset_generator + +format: + dart format . --line-length 100 + +res: + fgen --output lib/components/resources.g.dart --no-watch --no-preview; \ + make format + +loc: + flutter gen-l10n + make format \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 71a4808..b6423a5 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: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + url: "https://pub.dev" + source: hosted + version: "0.4.1" clock: dependency: transitive description: @@ -238,6 +254,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" file: dependency: transitive description: @@ -267,6 +291,14 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.6" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -275,11 +307,29 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" + source: hosted + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" frontend_server_client: dependency: transitive description: @@ -304,6 +354,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + http: + dependency: transitive + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -320,6 +378,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + url: "https://pub.dev" + source: hosted + version: "4.2.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + url: "https://pub.dev" + source: hosted + version: "0.19.0" io: dependency: transitive description: @@ -456,6 +530,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" + 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: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + 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: @@ -496,6 +626,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: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f + url: "https://pub.dev" + source: hosted + version: "2.5.2" + 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: @@ -605,6 +791,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -653,6 +863,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + url: "https://pub.dev" + source: hosted + version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" yaml: dependency: transitive description: @@ -663,4 +889,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.2 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index ddb0804..0fac472 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,6 +35,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + flutter_svg: 2.0.7 # Сетевое взаимодействие json_annotation: ^4.8.1 @@ -44,9 +45,15 @@ dependencies: # BLoC equatable: ^2.0.5 flutter_bloc: ^8.1.5 - copy_with_extension_gen: ^5.0.4 + # Localization + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + + shared_preferences: 2.2.3 + dev_dependencies: flutter_test: sdk: flutter @@ -62,12 +69,21 @@ dev_dependencies: build_runner: ^2.4.9 json_serializable: ^6.7.1 + # Иконки + flutter_launcher_icons: 0.13.1 + +flutter_launcher_icons: + android: "ic_launcher" + ios: false + image_path: "assets/launcher.jpeg" + min_sdk_android: 21 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter packages. flutter: - + 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. @@ -77,6 +93,8 @@ flutter: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg + assets: + - assets/svg/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images