LabWork07 is Done
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||||
|
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||||
|
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
|
||||||
|
</adaptive-icon>
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 11 KiB |
BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
Normal file
After Width: | Height: | Size: 852 B |
BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 28 KiB |
BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
Normal file
After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 5.3 KiB |
BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
Normal file
After Width: | Height: | Size: 459 B |
BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 14 KiB |
BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
Normal file
After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 721 B After Width: | Height: | Size: 17 KiB |
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 44 KiB |
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
Normal file
After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 87 KiB |
After Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 52 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 138 KiB |
After Width: | Height: | Size: 138 KiB |
BIN
assets/launcher.jpeg
Normal file
After Width: | Height: | Size: 199 KiB |
19
assets/svg/ru.svg
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
|
||||||
|
<svg width="800px" height="800px" viewBox="0 -4 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g clip-path="url(#clip0_503_2726)">
|
||||||
|
<rect x="0.25" y="0.25" width="27.5" height="19.5" rx="1.75" fill="white" stroke="#F5F5F5" stroke-width="0.5"/>
|
||||||
|
<mask id="mask0_503_2726" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="28" height="20">
|
||||||
|
<rect x="0.25" y="0.25" width="27.5" height="19.5" rx="1.75" fill="white" stroke="white" stroke-width="0.5"/>
|
||||||
|
</mask>
|
||||||
|
<g mask="url(#mask0_503_2726)">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13.3333H28V6.66667H0V13.3333Z" fill="#0C47B7"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 20H28V13.3333H0V20Z" fill="#E53B35"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<clipPath id="clip0_503_2726">
|
||||||
|
<rect width="28" height="20" rx="2" fill="white"/>
|
||||||
|
</clipPath>
|
||||||
|
</defs>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 968 B |
23
assets/svg/uk.svg
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||||
|
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
|
||||||
|
<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
viewBox="0 0 512 512" xml:space="preserve">
|
||||||
|
<path style="fill:#41479B;" d="M473.655,88.276H38.345C17.167,88.276,0,105.443,0,126.621V385.38
|
||||||
|
c0,21.177,17.167,38.345,38.345,38.345h435.31c21.177,0,38.345-17.167,38.345-38.345V126.621
|
||||||
|
C512,105.443,494.833,88.276,473.655,88.276z"/>
|
||||||
|
<path style="fill:#F5F5F5;" d="M511.469,120.282c-3.022-18.159-18.797-32.007-37.814-32.007h-9.977l-163.54,107.147V88.276h-88.276
|
||||||
|
v107.147L48.322,88.276h-9.977c-19.017,0-34.792,13.847-37.814,32.007l139.778,91.58H0v88.276h140.309L0.531,391.717
|
||||||
|
c3.022,18.159,18.797,32.007,37.814,32.007h9.977l163.54-107.147v107.147h88.276V316.577l163.54,107.147h9.977
|
||||||
|
c19.017,0,34.792-13.847,37.814-32.007l-139.778-91.58H512v-88.276H371.691L511.469,120.282z"/>
|
||||||
|
<g>
|
||||||
|
<polygon style="fill:#FF4B55;" points="282.483,88.276 229.517,88.276 229.517,229.517 0,229.517 0,282.483 229.517,282.483
|
||||||
|
229.517,423.724 282.483,423.724 282.483,282.483 512,282.483 512,229.517 282.483,229.517 "/>
|
||||||
|
<path style="fill:#FF4B55;" d="M24.793,421.252l186.583-121.114h-32.428L9.224,410.31
|
||||||
|
C13.377,415.157,18.714,418.955,24.793,421.252z"/>
|
||||||
|
<path style="fill:#FF4B55;" d="M346.388,300.138H313.96l180.716,117.305c5.057-3.321,9.277-7.807,12.287-13.075L346.388,300.138z"
|
||||||
|
/>
|
||||||
|
<path style="fill:#FF4B55;" d="M4.049,109.475l157.73,102.387h32.428L15.475,95.842C10.676,99.414,6.749,104.084,4.049,109.475z"/>
|
||||||
|
<path style="fill:#FF4B55;" d="M332.566,211.862l170.035-110.375c-4.199-4.831-9.578-8.607-15.699-10.86L300.138,211.862H332.566z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
6
l10n.yaml
Normal file
@ -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
|
15
l10n/app_en.arb
Normal file
@ -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": "Чтобы не забыть про отсутствие запятой :)"
|
||||||
|
}
|
15
l10n/app_ru.arb
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"@@locale": "ru",
|
||||||
|
|
||||||
|
"title": "Комментарии",
|
||||||
|
"credits": "сделано",
|
||||||
|
"search": "Поиск",
|
||||||
|
"comment": "Комментарий {nickname}",
|
||||||
|
"liked": "лайкнут",
|
||||||
|
"disliked": "дизлайкнут",
|
||||||
|
"neutralized": "без реакции",
|
||||||
|
"born": "Родился",
|
||||||
|
"died": "Умер",
|
||||||
|
|
||||||
|
"arbEnding": "Чтобы не забыть про отсутствие запятой :)"
|
||||||
|
}
|
6
lib/components/extensions/context_x.dart
Normal file
@ -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)!;
|
||||||
|
}
|
189
lib/components/locale/l10n/app_locale.dart
Normal file
@ -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<AppLocale>(context, AppLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const LocalizationsDelegate<AppLocale> 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<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
|
||||||
|
delegate,
|
||||||
|
GlobalMaterialLocalizations.delegate,
|
||||||
|
GlobalCupertinoLocalizations.delegate,
|
||||||
|
GlobalWidgetsLocalizations.delegate,
|
||||||
|
];
|
||||||
|
|
||||||
|
/// A list of this localizations delegate's supported locales.
|
||||||
|
static const List<Locale> supportedLocales = <Locale>[
|
||||||
|
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<AppLocale> {
|
||||||
|
const _AppLocaleDelegate();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<AppLocale> load(Locale locale) {
|
||||||
|
return SynchronousFuture<AppLocale>(lookupAppLocale(locale));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool isSupported(Locale locale) => <String>['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.'
|
||||||
|
);
|
||||||
|
}
|
40
lib/components/locale/l10n/app_locale_en.dart
Normal file
@ -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 => 'Чтобы не забыть про отсутствие запятой :)';
|
||||||
|
}
|
40
lib/components/locale/l10n/app_locale_ru.dart
Normal file
@ -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 => 'Чтобы не забыть про отсутствие запятой :)';
|
||||||
|
}
|
12
lib/components/resources.g.dart
Normal file
@ -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';
|
||||||
|
}
|
@ -12,8 +12,7 @@ class CharactersDto {
|
|||||||
this.meta,
|
this.meta,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory CharactersDto.fromJson(Map<String, dynamic> json) =>
|
factory CharactersDto.fromJson(Map<String, dynamic> json) => _$CharactersDtoFromJson(json);
|
||||||
_$CharactersDtoFromJson(json);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonSerializable(createToJson: false)
|
@JsonSerializable(createToJson: false)
|
||||||
@ -24,8 +23,7 @@ class CharacterDataDto {
|
|||||||
|
|
||||||
const CharacterDataDto({this.id, this.type, this.attributes});
|
const CharacterDataDto({this.id, this.type, this.attributes});
|
||||||
|
|
||||||
factory CharacterDataDto.fromJson(Map<String, dynamic> json) =>
|
factory CharacterDataDto.fromJson(Map<String, dynamic> json) => _$CharacterDataDtoFromJson(json);
|
||||||
_$CharacterDataDtoFromJson(json);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonSerializable(createToJson: false)
|
@JsonSerializable(createToJson: false)
|
||||||
@ -35,8 +33,7 @@ class CharacterAttributesDataDto {
|
|||||||
final String? died;
|
final String? died;
|
||||||
final String? image;
|
final String? image;
|
||||||
|
|
||||||
const CharacterAttributesDataDto(
|
const CharacterAttributesDataDto({this.name, this.born, this.died, this.image});
|
||||||
{this.name, this.born, this.died, this.image});
|
|
||||||
|
|
||||||
factory CharacterAttributesDataDto.fromJson(Map<String, dynamic> json) =>
|
factory CharacterAttributesDataDto.fromJson(Map<String, dynamic> json) =>
|
||||||
_$CharacterAttributesDataDtoFromJson(json);
|
_$CharacterAttributesDataDtoFromJson(json);
|
||||||
@ -48,8 +45,7 @@ class MetaDto {
|
|||||||
|
|
||||||
const MetaDto({this.pagination});
|
const MetaDto({this.pagination});
|
||||||
|
|
||||||
factory MetaDto.fromJson(Map<String, dynamic> json) =>
|
factory MetaDto.fromJson(Map<String, dynamic> json) => _$MetaDtoFromJson(json);
|
||||||
_$MetaDtoFromJson(json);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonSerializable(createToJson: false)
|
@JsonSerializable(createToJson: false)
|
||||||
@ -60,6 +56,5 @@ class PaginationDto {
|
|||||||
|
|
||||||
const PaginationDto({this.current, this.next, this.last});
|
const PaginationDto({this.current, this.next, this.last});
|
||||||
|
|
||||||
factory PaginationDto.fromJson(Map<String, dynamic> json) =>
|
factory PaginationDto.fromJson(Map<String, dynamic> json) => _$PaginationDtoFromJson(json);
|
||||||
_$PaginationDtoFromJson(json);
|
|
||||||
}
|
}
|
||||||
|
@ -6,28 +6,22 @@ part of 'characters_dto.dart';
|
|||||||
// JsonSerializableGenerator
|
// JsonSerializableGenerator
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
|
|
||||||
CharactersDto _$CharactersDtoFromJson(Map<String, dynamic> json) =>
|
CharactersDto _$CharactersDtoFromJson(Map<String, dynamic> json) => CharactersDto(
|
||||||
CharactersDto(
|
|
||||||
data: (json['data'] as List<dynamic>?)
|
data: (json['data'] as List<dynamic>?)
|
||||||
?.map((e) => CharacterDataDto.fromJson(e as Map<String, dynamic>))
|
?.map((e) => CharacterDataDto.fromJson(e as Map<String, dynamic>))
|
||||||
.toList(),
|
.toList(),
|
||||||
meta: json['meta'] == null
|
meta: json['meta'] == null ? null : MetaDto.fromJson(json['meta'] as Map<String, dynamic>),
|
||||||
? null
|
|
||||||
: MetaDto.fromJson(json['meta'] as Map<String, dynamic>),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
CharacterDataDto _$CharacterDataDtoFromJson(Map<String, dynamic> json) =>
|
CharacterDataDto _$CharacterDataDtoFromJson(Map<String, dynamic> json) => CharacterDataDto(
|
||||||
CharacterDataDto(
|
|
||||||
id: json['id'] as String?,
|
id: json['id'] as String?,
|
||||||
type: json['type'] as String?,
|
type: json['type'] as String?,
|
||||||
attributes: json['attributes'] == null
|
attributes: json['attributes'] == null
|
||||||
? null
|
? null
|
||||||
: CharacterAttributesDataDto.fromJson(
|
: CharacterAttributesDataDto.fromJson(json['attributes'] as Map<String, dynamic>),
|
||||||
json['attributes'] as Map<String, dynamic>),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson(
|
CharacterAttributesDataDto _$CharacterAttributesDataDtoFromJson(Map<String, dynamic> json) =>
|
||||||
Map<String, dynamic> json) =>
|
|
||||||
CharacterAttributesDataDto(
|
CharacterAttributesDataDto(
|
||||||
name: json['name'] as String?,
|
name: json['name'] as String?,
|
||||||
born: json['born'] as String?,
|
born: json['born'] as String?,
|
||||||
@ -41,8 +35,7 @@ MetaDto _$MetaDtoFromJson(Map<String, dynamic> json) => MetaDto(
|
|||||||
: PaginationDto.fromJson(json['pagination'] as Map<String, dynamic>),
|
: PaginationDto.fromJson(json['pagination'] as Map<String, dynamic>),
|
||||||
);
|
);
|
||||||
|
|
||||||
PaginationDto _$PaginationDtoFromJson(Map<String, dynamic> json) =>
|
PaginationDto _$PaginationDtoFromJson(Map<String, dynamic> json) => PaginationDto(
|
||||||
PaginationDto(
|
|
||||||
current: (json['current'] as num?)?.toInt(),
|
current: (json['current'] as num?)?.toInt(),
|
||||||
next: (json['next'] as num?)?.toInt(),
|
next: (json['next'] as num?)?.toInt(),
|
||||||
last: (json['last'] as num?)?.toInt(),
|
last: (json['last'] as num?)?.toInt(),
|
||||||
|
@ -12,11 +12,10 @@ extension CharactersDtoToModel on CharactersDto {
|
|||||||
|
|
||||||
extension CharacterDataDtoToModel on CharacterDataDto {
|
extension CharacterDataDtoToModel on CharacterDataDto {
|
||||||
CommentData toDomain() => CommentData(
|
CommentData toDomain() => CommentData(
|
||||||
|
id: id,
|
||||||
title: type ?? 'UNKNOWN',
|
title: type ?? 'UNKNOWN',
|
||||||
text: _makeDescriptionText(attributes?.born, attributes?.died),
|
text: _makeDescriptionText(attributes?.born, attributes?.died),
|
||||||
user: UserData(
|
user: UserData(nickname: attributes?.name ?? 'Noname', avatarUrl: attributes?.image),
|
||||||
nickname: attributes?.name ?? 'Noname',
|
|
||||||
avatarUrl: attributes?.image),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
String _makeDescriptionText(String? born, String? died) {
|
String _makeDescriptionText(String? born, String? died) {
|
||||||
|
@ -12,8 +12,7 @@ class MockRepository extends ApiInterface {
|
|||||||
text: 'this app is so cool ' * 10,
|
text: 'this app is so cool ' * 10,
|
||||||
user: UserData(
|
user: UserData(
|
||||||
nickname: 'Steve',
|
nickname: 'Steve',
|
||||||
avatarUrl:
|
avatarUrl: 'https://preview.free3d.com/img/2016/03/1875481443430303321/hld8c0oa.jpg',
|
||||||
'https://preview.free3d.com/img/2016/03/1875481443430303321/hld8c0oa.jpg',
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
CommentData(
|
CommentData(
|
||||||
@ -27,8 +26,7 @@ class MockRepository extends ApiInterface {
|
|||||||
),
|
),
|
||||||
CommentData(
|
CommentData(
|
||||||
title: 'BREAKING!!!',
|
title: 'BREAKING!!!',
|
||||||
text:
|
text: 'ONLY NOW you can purchase the ability to put likes and dislikes for only 299\$',
|
||||||
'ONLY NOW you can purchase the ability to put likes and dislikes for only 299\$',
|
|
||||||
user: UserData(
|
user: UserData(
|
||||||
nickname: 'Bethesda',
|
nickname: 'Bethesda',
|
||||||
avatarUrl: 'https://i.playground.ru/p/BWixorSTeZQfoPvdVL9lgA.jpeg',
|
avatarUrl: 'https://i.playground.ru/p/BWixorSTeZQfoPvdVL9lgA.jpeg',
|
||||||
|
@ -33,8 +33,7 @@ class PotterDBRepository extends ApiInterface {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
final CharactersDto dto =
|
final CharactersDto dto = CharactersDto.fromJson(response.data as Map<String, dynamic>);
|
||||||
CharactersDto.fromJson(response.data as Map<String, dynamic>);
|
|
||||||
final HomeData data = dto.toDomain();
|
final HomeData data = dto.toDomain();
|
||||||
return data;
|
return data;
|
||||||
} on DioException catch (e) {
|
} on DioException catch (e) {
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
import 'user.dart';
|
import 'user.dart';
|
||||||
|
|
||||||
class CommentData {
|
class CommentData {
|
||||||
|
final String? id;
|
||||||
final String title;
|
final String title;
|
||||||
final String text;
|
final String text;
|
||||||
final UserData user;
|
final UserData user;
|
||||||
|
|
||||||
CommentData({
|
CommentData({
|
||||||
|
this.id,
|
||||||
required this.title,
|
required this.title,
|
||||||
required this.text,
|
required this.text,
|
||||||
required this.user,
|
required this.user,
|
||||||
|
@ -1,8 +1,15 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.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/data/repositories/potterdb_repository.dart';
|
||||||
import 'package:pmu_labworks/view/home_page/bloc/bloc.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/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() {
|
void main() {
|
||||||
runApp(const MyApp());
|
runApp(const MyApp());
|
||||||
@ -13,21 +20,36 @@ class MyApp extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return BlocProvider<LocaleBloc>(
|
||||||
title: 'Comments App',
|
lazy: false,
|
||||||
debugShowCheckedModeBanner: false,
|
create: (context) => LocaleBloc(Locale(Platform.localeName)),
|
||||||
theme: ThemeData(
|
child: BlocBuilder<LocaleBloc, LocaleState>(
|
||||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue),
|
builder: (context, state) {
|
||||||
useMaterial3: true,
|
return MaterialApp(
|
||||||
),
|
title: "Comments App",
|
||||||
home: RepositoryProvider<PotterDBRepository>(
|
locale: state.currentLocale,
|
||||||
lazy: true,
|
localizationsDelegates: AppLocale.localizationsDelegates,
|
||||||
create: (_) => PotterDBRepository(),
|
supportedLocales: AppLocale.supportedLocales,
|
||||||
child: BlocProvider<HomeBloc>(
|
debugShowCheckedModeBanner: false,
|
||||||
lazy: false,
|
theme: ThemeData(
|
||||||
create: (context) => HomeBloc(context.read<PotterDBRepository>()),
|
colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue),
|
||||||
child: const HomePage(title: 'Comments App'),
|
useMaterial3: true,
|
||||||
),
|
),
|
||||||
|
home: RepositoryProvider<PotterDBRepository>(
|
||||||
|
lazy: true,
|
||||||
|
create: (_) => PotterDBRepository(),
|
||||||
|
child: BlocProvider<ReactionBloc>(
|
||||||
|
lazy: false,
|
||||||
|
create: (context) => ReactionBloc(),
|
||||||
|
child: BlocProvider<HomeBloc>(
|
||||||
|
lazy: false,
|
||||||
|
create: (context) => HomeBloc(context.read<PotterDBRepository>()),
|
||||||
|
child: HomePage(title: "Comments App"),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
34
lib/view/common/svg_objects.dart
Normal file
@ -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 = <String>[
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:pmu_labworks/components/extensions/context_x.dart';
|
||||||
import 'package:pmu_labworks/domain/models/comment.dart';
|
import 'package:pmu_labworks/domain/models/comment.dart';
|
||||||
|
|
||||||
class DetailsPage extends StatelessWidget {
|
class DetailsPage extends StatelessWidget {
|
||||||
@ -11,7 +12,7 @@ class DetailsPage extends StatelessWidget {
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Text(
|
title: Text(
|
||||||
'${_shortenNickname(model.user.nickname)}\'s comment',
|
context.locale.comment(model.user.nickname),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
@ -41,8 +42,7 @@ class DetailsPage extends StatelessWidget {
|
|||||||
left: 8,
|
left: 8,
|
||||||
bottom: 8,
|
bottom: 8,
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: const EdgeInsets.symmetric(
|
padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 8.0),
|
||||||
vertical: 4.0, horizontal: 8.0),
|
|
||||||
color: Colors.black.withOpacity(0.6),
|
color: Colors.black.withOpacity(0.6),
|
||||||
child: Text(
|
child: Text(
|
||||||
_shortenNickname(model.user.nickname, maxLength: 13),
|
_shortenNickname(model.user.nickname, maxLength: 13),
|
||||||
|
@ -24,10 +24,7 @@ class ErrorDialog extends StatelessWidget {
|
|||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
Text(
|
Text(
|
||||||
error ?? 'UNKNOWN',
|
error ?? 'UNKNOWN',
|
||||||
style: Theme.of(context)
|
style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white),
|
||||||
.textTheme
|
|
||||||
.bodyLarge
|
|
||||||
?.copyWith(color: Colors.white),
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
@ -36,4 +36,4 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
|||||||
error: error,
|
error: error,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -72,8 +72,7 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy {
|
|||||||
// ignore: cast_nullable_to_non_nullable
|
// ignore: cast_nullable_to_non_nullable
|
||||||
: isLoading as bool,
|
: isLoading as bool,
|
||||||
isPaginationLoading:
|
isPaginationLoading:
|
||||||
isPaginationLoading == const $CopyWithPlaceholder() ||
|
isPaginationLoading == const $CopyWithPlaceholder() || isPaginationLoading == null
|
||||||
isPaginationLoading == null
|
|
||||||
? _value.isPaginationLoading
|
? _value.isPaginationLoading
|
||||||
// ignore: cast_nullable_to_non_nullable
|
// ignore: cast_nullable_to_non_nullable
|
||||||
: isPaginationLoading as bool,
|
: isPaginationLoading as bool,
|
||||||
|
@ -1,72 +1,65 @@
|
|||||||
part of 'home_page.dart';
|
part of 'home_page.dart';
|
||||||
|
|
||||||
typedef OnActionCallback = void Function(
|
typedef OnLikeCallback = void Function(
|
||||||
String nickname, bool isLiked, bool isDisliked)?;
|
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 title;
|
||||||
final String text;
|
final String text;
|
||||||
final UserData? user;
|
final UserData user;
|
||||||
final OnActionCallback onAction;
|
final bool isLiked;
|
||||||
|
final bool isDisliked;
|
||||||
|
final OnLikeCallback? onLike;
|
||||||
|
final OnDislikeCallback? onDislike;
|
||||||
final VoidCallback? onTap;
|
final VoidCallback? onTap;
|
||||||
|
|
||||||
const _Comment({
|
const _Comment({
|
||||||
|
this.id,
|
||||||
required this.title,
|
required this.title,
|
||||||
required this.text,
|
required this.text,
|
||||||
this.user,
|
required this.user,
|
||||||
this.onAction,
|
this.isLiked = false,
|
||||||
|
this.isDisliked = false,
|
||||||
|
this.onLike,
|
||||||
|
this.onDislike,
|
||||||
this.onTap,
|
this.onTap,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory _Comment.fromData(
|
factory _Comment.fromData(
|
||||||
CommentData data, {
|
CommentData data, {
|
||||||
OnActionCallback onAction,
|
bool isLiked = false,
|
||||||
|
bool isDisliked = false,
|
||||||
|
OnLikeCallback? onLike,
|
||||||
|
OnDislikeCallback? onDislike,
|
||||||
VoidCallback? onTap,
|
VoidCallback? onTap,
|
||||||
}) =>
|
}) =>
|
||||||
_Comment(
|
_Comment(
|
||||||
|
id: data.id,
|
||||||
title: data.title,
|
title: data.title,
|
||||||
text: data.text,
|
text: data.text,
|
||||||
user: data.user,
|
user: data.user,
|
||||||
onAction: onAction,
|
isLiked: isLiked,
|
||||||
|
isDisliked: isDisliked,
|
||||||
|
onLike: onLike,
|
||||||
|
onDislike: onDislike,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
);
|
);
|
||||||
|
|
||||||
@override
|
|
||||||
State<_Comment> createState() => _CommentState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _CommentState extends State<_Comment> {
|
|
||||||
bool isLiked = false;
|
|
||||||
bool isDisliked = false;
|
|
||||||
|
|
||||||
void _onLike() {
|
void _onLike() {
|
||||||
setState(() {
|
onLike?.call(id, user.nickname, isLiked, isDisliked);
|
||||||
isLiked = !isLiked;
|
|
||||||
if (isLiked && isDisliked) {
|
|
||||||
isDisliked = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (widget.onAction != null) {
|
|
||||||
widget.onAction?.call(widget.user!.nickname, isLiked, isDisliked);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onDislike() {
|
void _onDislike() {
|
||||||
setState(() {
|
onDislike?.call(id, user.nickname, isLiked, isDisliked);
|
||||||
isDisliked = !isDisliked;
|
|
||||||
if (isDisliked && isLiked) {
|
|
||||||
isLiked = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (widget.onAction != null) {
|
|
||||||
widget.onAction?.call(widget.user!.nickname, isLiked, isDisliked);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return GestureDetector(
|
return GestureDetector(
|
||||||
onTap: widget.onTap,
|
onTap: onTap,
|
||||||
child: Container(
|
child: Container(
|
||||||
margin: const EdgeInsets.all(16),
|
margin: const EdgeInsets.all(16),
|
||||||
padding: const EdgeInsets.all(16),
|
padding: const EdgeInsets.all(16),
|
||||||
@ -93,10 +86,9 @@ class _CommentState extends State<_Comment> {
|
|||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: 80,
|
height: 80,
|
||||||
width: 80,
|
width: 80,
|
||||||
child: widget.user!.avatarUrl != null &&
|
child: user.avatarUrl != null && user.avatarUrl!.isNotEmpty
|
||||||
widget.user!.avatarUrl!.isNotEmpty
|
|
||||||
? Image.network(
|
? Image.network(
|
||||||
widget.user!.avatarUrl!,
|
user.avatarUrl!,
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
)
|
)
|
||||||
: Container(
|
: Container(
|
||||||
@ -111,7 +103,7 @@ class _CommentState extends State<_Comment> {
|
|||||||
SizedBox(
|
SizedBox(
|
||||||
width: 80,
|
width: 80,
|
||||||
child: Text(
|
child: Text(
|
||||||
widget.user!.nickname,
|
user.nickname,
|
||||||
style: Theme.of(context).textTheme.bodyMedium,
|
style: Theme.of(context).textTheme.bodyMedium,
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
@ -131,9 +123,7 @@ class _CommentState extends State<_Comment> {
|
|||||||
IconButton(
|
IconButton(
|
||||||
iconSize: 20,
|
iconSize: 20,
|
||||||
icon: Icon(
|
icon: Icon(
|
||||||
isDisliked
|
isDisliked ? Icons.thumb_down : Icons.thumb_down_outlined,
|
||||||
? Icons.thumb_down
|
|
||||||
: Icons.thumb_down_outlined,
|
|
||||||
color: isDisliked ? Colors.red : Colors.grey,
|
color: isDisliked ? Colors.red : Colors.grey,
|
||||||
),
|
),
|
||||||
onPressed: _onDislike,
|
onPressed: _onDislike,
|
||||||
@ -149,12 +139,12 @@ class _CommentState extends State<_Comment> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
widget.title,
|
title,
|
||||||
style: Theme.of(context).textTheme.headlineSmall,
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
Text(
|
Text(
|
||||||
widget.text,
|
text,
|
||||||
style: Theme.of(context).textTheme.bodyLarge,
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
@ -1,15 +1,24 @@
|
|||||||
|
import 'dart:io';
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.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/components/utils/debounce.dart';
|
||||||
import 'package:pmu_labworks/domain/models/comment.dart';
|
import 'package:pmu_labworks/domain/models/comment.dart';
|
||||||
import 'package:pmu_labworks/domain/models/user.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/details_page/details_page.dart';
|
||||||
import 'package:pmu_labworks/view/home_page/bloc/bloc.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/events.dart';
|
||||||
import 'package:pmu_labworks/view/home_page/bloc/state.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';
|
part 'comment.dart';
|
||||||
|
|
||||||
@ -44,8 +53,8 @@ class _HomePageState extends State<HomePage> {
|
|||||||
fontSize: 20,
|
fontSize: 20,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
)),
|
)),
|
||||||
const Text(
|
Text(
|
||||||
'made by Factorino',
|
context.locale.credits + ' Factorino',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontStyle: FontStyle.italic,
|
fontStyle: FontStyle.italic,
|
||||||
@ -81,8 +90,11 @@ class _BodyState extends State<_Body> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
|
SvgObjects.init();
|
||||||
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
context.read<HomeBloc>().add(const HomeLoadDataEvent());
|
context.read<HomeBloc>().add(const HomeLoadDataEvent());
|
||||||
|
context.read<ReactionBloc>().add(const LoadReactionsEvent());
|
||||||
});
|
});
|
||||||
|
|
||||||
scrollController.addListener(_onNextPageListener);
|
scrollController.addListener(_onNextPageListener);
|
||||||
@ -103,50 +115,76 @@ class _BodyState extends State<_Body> {
|
|||||||
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Padding(
|
Row(
|
||||||
padding: const EdgeInsets.all(12),
|
children: [
|
||||||
child: CupertinoSearchTextField(
|
Expanded(
|
||||||
controller: searchController,
|
flex: 4,
|
||||||
onChanged: (search) {
|
child: Padding(
|
||||||
Debounce.run(() => context
|
padding: const EdgeInsets.all(12),
|
||||||
.read<HomeBloc>()
|
child: CupertinoSearchTextField(
|
||||||
.add(HomeLoadDataEvent(search: search)));
|
controller: searchController,
|
||||||
},
|
placeholder: context.locale.search,
|
||||||
),
|
onChanged: (search) {
|
||||||
|
Debounce.run(
|
||||||
|
() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
GestureDetector(
|
||||||
|
onTap: () => context.read<LocaleBloc>().add(const ChangeLocaleEvent()),
|
||||||
|
child: SizedBox.square(
|
||||||
|
dimension: 50,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.only(right: 12),
|
||||||
|
child: BlocBuilder<LocaleBloc, LocaleState>(
|
||||||
|
builder: (context, state) {
|
||||||
|
return state.currentLocale.languageCode == 'ru'
|
||||||
|
? const SvgRu()
|
||||||
|
: const SvgUk();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
BlocBuilder<HomeBloc, HomeState>(
|
BlocBuilder<HomeBloc, HomeState>(
|
||||||
builder: (context, state) => state.error != null
|
builder: (context, state) => state.error != null
|
||||||
? Text(
|
? Text(
|
||||||
state.error ?? '',
|
state.error ?? '',
|
||||||
style: Theme.of(context)
|
style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red),
|
||||||
.textTheme
|
|
||||||
.headlineSmall
|
|
||||||
?.copyWith(color: Colors.red),
|
|
||||||
)
|
)
|
||||||
: state.isLoading
|
: state.isLoading
|
||||||
? const CircularProgressIndicator()
|
? const CircularProgressIndicator()
|
||||||
: Expanded(
|
: BlocBuilder<ReactionBloc, ReactionState>(
|
||||||
child: RefreshIndicator(
|
builder: (context, reactionState) {
|
||||||
onRefresh: _onRefresh,
|
return Expanded(
|
||||||
child: ListView.builder(
|
child: RefreshIndicator(
|
||||||
controller: scrollController,
|
onRefresh: _onRefresh,
|
||||||
padding: EdgeInsets.zero,
|
child: ListView.builder(
|
||||||
itemCount: state.data?.data?.length ?? 0,
|
controller: scrollController,
|
||||||
itemBuilder: (context, index) {
|
padding: EdgeInsets.zero,
|
||||||
final data = state.data?.data?[index];
|
itemCount: state.data?.data?.length ?? 0,
|
||||||
return data != null
|
itemBuilder: (context, index) {
|
||||||
? _Comment.fromData(
|
final data = state.data?.data?[index];
|
||||||
data,
|
return data != null
|
||||||
onAction:
|
? _Comment.fromData(
|
||||||
(nickname, isLiked, isDisliked) =>
|
data,
|
||||||
_showSnackBar(context, nickname,
|
onLike: _onLike,
|
||||||
isLiked, isDisliked),
|
onDislike: _onDislike,
|
||||||
onTap: () => _navToDetails(context, data),
|
isLiked:
|
||||||
)
|
reactionState.likedIds?.contains(data.id) == true,
|
||||||
: const SizedBox.shrink();
|
isDisliked:
|
||||||
},
|
reactionState.dislikedIds?.contains(data.id) == true,
|
||||||
),
|
onTap: () => _navToDetails(context, data),
|
||||||
),
|
)
|
||||||
|
: const SizedBox.shrink();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
BlocBuilder<HomeBloc, HomeState>(
|
BlocBuilder<HomeBloc, HomeState>(
|
||||||
@ -160,12 +198,30 @@ class _BodyState extends State<_Body> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _onRefresh() {
|
Future<void> _onRefresh() {
|
||||||
context
|
context.read<HomeBloc>().add(HomeLoadDataEvent(search: searchController.text));
|
||||||
.read<HomeBloc>()
|
|
||||||
.add(HomeLoadDataEvent(search: searchController.text));
|
|
||||||
return Future.value(null);
|
return Future.value(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onLike(String? id, String nickname, bool isLiked, bool isDisliked) {
|
||||||
|
if (id != null) {
|
||||||
|
if (isDisliked) {
|
||||||
|
isDisliked = false;
|
||||||
|
}
|
||||||
|
context.read<ReactionBloc>().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<ReactionBloc>().add(ChangeDislikeEvent(id));
|
||||||
|
_showSnackBar(context, nickname, isLiked, !isDisliked);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _navToDetails(BuildContext context, CommentData data) {
|
void _navToDetails(BuildContext context, CommentData data) {
|
||||||
Navigator.push(
|
Navigator.push(
|
||||||
context,
|
context,
|
||||||
@ -173,22 +229,22 @@ class _BodyState extends State<_Body> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _showSnackBar(
|
void _showSnackBar(BuildContext context, String nickname, bool isLiked, bool isDisliked) {
|
||||||
BuildContext context, String nickname, bool isLiked, bool isDisliked) {
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
final String action;
|
final String action;
|
||||||
|
|
||||||
if (isLiked) {
|
if (isLiked && !isDisliked) {
|
||||||
action = 'liked';
|
action = context.locale.liked;
|
||||||
} else if (isDisliked) {
|
} else if (!isLiked && isDisliked) {
|
||||||
action = 'disliked';
|
action = context.locale.disliked;
|
||||||
} else {
|
} else {
|
||||||
action = 'neutralized'; // Состояние без лайков/дизлайков
|
action = context.locale.neutralized; // Состояние без лайков/дизлайков
|
||||||
}
|
}
|
||||||
|
print('$isLiked $isDisliked = $action');
|
||||||
|
|
||||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||||
content: Text(
|
content: Text(
|
||||||
'$nickname\'s comment $action',
|
context.locale.comment(nickname) + ' ' + action,
|
||||||
style: Theme.of(context).textTheme.bodyLarge,
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
),
|
),
|
||||||
backgroundColor: Colors.white70,
|
backgroundColor: Colors.white70,
|
||||||
|
17
lib/view/locale_bloc/locale_bloc.dart
Normal file
@ -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<LocaleEvent, LocaleState> {
|
||||||
|
LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) {
|
||||||
|
on<ChangeLocaleEvent>(_onChangeLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onChangeLocale(ChangeLocaleEvent event, Emitter<LocaleState> emit) async {
|
||||||
|
final toChange = AppLocale.supportedLocales
|
||||||
|
.firstWhere((e) => e.languageCode != state.currentLocale.languageCode);
|
||||||
|
emit(state.copyWith(currentLocale: toChange));
|
||||||
|
}
|
||||||
|
}
|
7
lib/view/locale_bloc/locale_events.dart
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
abstract class LocaleEvent {
|
||||||
|
const LocaleEvent();
|
||||||
|
}
|
||||||
|
|
||||||
|
class ChangeLocaleEvent extends LocaleEvent {
|
||||||
|
const ChangeLocaleEvent();
|
||||||
|
}
|
15
lib/view/locale_bloc/locale_state.dart
Normal file
@ -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<Object?> get props => [currentLocale];
|
||||||
|
}
|
56
lib/view/locale_bloc/locale_state.g.dart
Normal file
@ -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);
|
||||||
|
}
|
68
lib/view/reaction_bloc/reaction_bloc.dart
Normal file
@ -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<ReactionEvent, ReactionState> {
|
||||||
|
ReactionBloc() : super(const ReactionState(likedIds: [], dislikedIds: [])) {
|
||||||
|
on<ChangeLikeEvent>(_onChangeLike);
|
||||||
|
on<ChangeDislikeEvent>(_onChangeDislike);
|
||||||
|
on<LoadReactionsEvent>(_onLoadReactions);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onLoadReactions(LoadReactionsEvent event, Emitter<ReactionState> 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<void> _onChangeLike(ChangeLikeEvent event, Emitter<ReactionState> emit) async {
|
||||||
|
final updatedLikedList = List<String>.from(state.likedIds ?? []);
|
||||||
|
final updatedDislikedList = List<String>.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<void> _onChangeDislike(ChangeDislikeEvent event, Emitter<ReactionState> emit) async {
|
||||||
|
final updatedLikedList = List<String>.from(state.likedIds ?? []);
|
||||||
|
final updatedDislikedList = List<String>.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,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
19
lib/view/reaction_bloc/reaction_event.dart
Normal file
@ -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);
|
||||||
|
}
|
15
lib/view/reaction_bloc/reaction_state.dart
Normal file
@ -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<String>? likedIds;
|
||||||
|
final List<String>? dislikedIds;
|
||||||
|
|
||||||
|
const ReactionState({required this.likedIds, required this.dislikedIds});
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [likedIds, dislikedIds];
|
||||||
|
}
|
67
lib/view/reaction_bloc/reaction_state.g.dart
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
|
part of 'reaction_state.dart';
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// CopyWithGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
abstract class _$ReactionStateCWProxy {
|
||||||
|
ReactionState likedIds(List<String>? likedIds);
|
||||||
|
|
||||||
|
ReactionState dislikedIds(List<String>? 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<String>? likedIds,
|
||||||
|
List<String>? 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<String>? likedIds) => this(likedIds: likedIds);
|
||||||
|
|
||||||
|
@override
|
||||||
|
ReactionState dislikedIds(List<String>? 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<String>?,
|
||||||
|
dislikedIds: dislikedIds == const $CopyWithPlaceholder()
|
||||||
|
? _value.dislikedIds
|
||||||
|
// ignore: cast_nullable_to_non_nullable
|
||||||
|
: dislikedIds as List<String>?,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
19
makefile
Normal file
@ -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
|
228
pubspec.lock
@ -22,6 +22,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.7.0"
|
version: "6.7.0"
|
||||||
|
archive:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: archive
|
||||||
|
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "3.6.1"
|
||||||
args:
|
args:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -134,6 +142,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.3"
|
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:
|
clock:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -238,6 +254,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.1"
|
version: "1.3.1"
|
||||||
|
ffi:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: ffi
|
||||||
|
sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.1.3"
|
||||||
file:
|
file:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -267,6 +291,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "8.1.6"
|
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:
|
flutter_lints:
|
||||||
dependency: "direct dev"
|
dependency: "direct dev"
|
||||||
description:
|
description:
|
||||||
@ -275,11 +307,29 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.0"
|
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:
|
flutter_test:
|
||||||
dependency: "direct dev"
|
dependency: "direct dev"
|
||||||
description: flutter
|
description: flutter
|
||||||
source: sdk
|
source: sdk
|
||||||
version: "0.0.0"
|
version: "0.0.0"
|
||||||
|
flutter_web_plugins:
|
||||||
|
dependency: transitive
|
||||||
|
description: flutter
|
||||||
|
source: sdk
|
||||||
|
version: "0.0.0"
|
||||||
frontend_server_client:
|
frontend_server_client:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -304,6 +354,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.3.2"
|
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:
|
http_multi_server:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -320,6 +378,22 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.2"
|
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:
|
io:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -456,6 +530,62 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.9.0"
|
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:
|
pool:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -496,6 +626,62 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.0"
|
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:
|
shelf:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -605,6 +791,30 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.2"
|
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:
|
vector_math:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -653,6 +863,22 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.0.1"
|
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:
|
yaml:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -663,4 +889,4 @@ packages:
|
|||||||
version: "3.1.2"
|
version: "3.1.2"
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.5.2 <4.0.0"
|
dart: ">=3.5.2 <4.0.0"
|
||||||
flutter: ">=3.18.0-18.0.pre.54"
|
flutter: ">=3.22.0"
|
||||||
|
22
pubspec.yaml
@ -35,6 +35,7 @@ dependencies:
|
|||||||
# The following adds the Cupertino Icons font to your application.
|
# The following adds the Cupertino Icons font to your application.
|
||||||
# Use with the CupertinoIcons class for iOS style icons.
|
# Use with the CupertinoIcons class for iOS style icons.
|
||||||
cupertino_icons: ^1.0.8
|
cupertino_icons: ^1.0.8
|
||||||
|
flutter_svg: 2.0.7
|
||||||
|
|
||||||
# Сетевое взаимодействие
|
# Сетевое взаимодействие
|
||||||
json_annotation: ^4.8.1
|
json_annotation: ^4.8.1
|
||||||
@ -44,9 +45,15 @@ dependencies:
|
|||||||
# BLoC
|
# BLoC
|
||||||
equatable: ^2.0.5
|
equatable: ^2.0.5
|
||||||
flutter_bloc: ^8.1.5
|
flutter_bloc: ^8.1.5
|
||||||
|
|
||||||
copy_with_extension_gen: ^5.0.4
|
copy_with_extension_gen: ^5.0.4
|
||||||
|
|
||||||
|
# Localization
|
||||||
|
flutter_localizations:
|
||||||
|
sdk: flutter
|
||||||
|
intl: ^0.19.0
|
||||||
|
|
||||||
|
shared_preferences: 2.2.3
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
@ -62,12 +69,21 @@ dev_dependencies:
|
|||||||
build_runner: ^2.4.9
|
build_runner: ^2.4.9
|
||||||
json_serializable: ^6.7.1
|
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
|
# For information on the generic Dart part of this file, see the
|
||||||
# following page: https://dart.dev/tools/pub/pubspec
|
# following page: https://dart.dev/tools/pub/pubspec
|
||||||
|
|
||||||
# The following section is specific to Flutter packages.
|
# The following section is specific to Flutter packages.
|
||||||
flutter:
|
flutter:
|
||||||
|
generate: true
|
||||||
# The following line ensures that the Material Icons font is
|
# The following line ensures that the Material Icons font is
|
||||||
# included with your application, so that you can use the icons in
|
# included with your application, so that you can use the icons in
|
||||||
# the material Icons class.
|
# the material Icons class.
|
||||||
@ -77,6 +93,8 @@ flutter:
|
|||||||
# assets:
|
# assets:
|
||||||
# - images/a_dot_burr.jpeg
|
# - images/a_dot_burr.jpeg
|
||||||
# - images/a_dot_ham.jpeg
|
# - images/a_dot_ham.jpeg
|
||||||
|
assets:
|
||||||
|
- assets/svg/
|
||||||
|
|
||||||
# An image asset can refer to one or more resolution-specific "variants", see
|
# An image asset can refer to one or more resolution-specific "variants", see
|
||||||
# https://flutter.dev/to/resolution-aware-images
|
# https://flutter.dev/to/resolution-aware-images
|
||||||
|