вроде готовая лаба
This commit is contained in:
parent
427b718bcb
commit
d2b4355e37
6
l10n.yaml
Normal file
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
|
9
l10n/app_en.arb
Normal file
9
l10n/app_en.arb
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"@@locale": "en",
|
||||||
|
|
||||||
|
"search": "Search",
|
||||||
|
"liked": "liked!",
|
||||||
|
"disliked": "disliked :(",
|
||||||
|
|
||||||
|
"arbEnding": "Чтобы не забыть про отсутствие запятой :)"
|
||||||
|
}
|
9
l10n/app_ru.arb
Normal file
9
l10n/app_ru.arb
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"@@locale": "ru",
|
||||||
|
|
||||||
|
"search": "Поиск",
|
||||||
|
"liked": "понравился!",
|
||||||
|
"disliked": "разонравился :(",
|
||||||
|
|
||||||
|
"arbEnding": "Чтобы не забыть про отсутствие запятой :)"
|
||||||
|
}
|
6
lib/components/extensions/context_x.dart
Normal file
6
lib/components/extensions/context_x.dart
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
import 'package:flutter/widgets.dart';
|
||||||
|
import '../locale/l10n/app_locale.dart';
|
||||||
|
|
||||||
|
extension LocalContextX on BuildContext {
|
||||||
|
AppLocale get locale => AppLocale.of(this)!;
|
||||||
|
}
|
153
lib/components/locale/l10n/app_locale.dart
Normal file
153
lib/components/locale/l10n/app_locale.dart
Normal file
@ -0,0 +1,153 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:flutter/widgets.dart';
|
||||||
|
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||||
|
import 'package:intl/intl.dart' as intl;
|
||||||
|
|
||||||
|
import 'app_locale_en.dart';
|
||||||
|
import 'app_locale_ru.dart';
|
||||||
|
|
||||||
|
// ignore_for_file: type=lint
|
||||||
|
|
||||||
|
/// Callers can lookup localized strings with an instance of AppLocale
|
||||||
|
/// returned by `AppLocale.of(context)`.
|
||||||
|
///
|
||||||
|
/// Applications need to include `AppLocale.delegate()` in their app's
|
||||||
|
/// `localizationDelegates` list, and the locales they support in the app's
|
||||||
|
/// `supportedLocales` list. For example:
|
||||||
|
///
|
||||||
|
/// ```dart
|
||||||
|
/// import 'l10n/app_locale.dart';
|
||||||
|
///
|
||||||
|
/// return MaterialApp(
|
||||||
|
/// localizationsDelegates: AppLocale.localizationsDelegates,
|
||||||
|
/// supportedLocales: AppLocale.supportedLocales,
|
||||||
|
/// home: MyApplicationHome(),
|
||||||
|
/// );
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// ## Update pubspec.yaml
|
||||||
|
///
|
||||||
|
/// Please make sure to update your pubspec.yaml to include the following
|
||||||
|
/// packages:
|
||||||
|
///
|
||||||
|
/// ```yaml
|
||||||
|
/// dependencies:
|
||||||
|
/// # Internationalization support.
|
||||||
|
/// flutter_localizations:
|
||||||
|
/// sdk: flutter
|
||||||
|
/// intl: any # Use the pinned version from flutter_localizations
|
||||||
|
///
|
||||||
|
/// # Rest of dependencies
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// ## iOS Applications
|
||||||
|
///
|
||||||
|
/// iOS applications define key application metadata, including supported
|
||||||
|
/// locales, in an Info.plist file that is built into the application bundle.
|
||||||
|
/// To configure the locales supported by your app, you’ll need to edit this
|
||||||
|
/// file.
|
||||||
|
///
|
||||||
|
/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
|
||||||
|
/// Then, in the Project Navigator, open the Info.plist file under the Runner
|
||||||
|
/// project’s Runner folder.
|
||||||
|
///
|
||||||
|
/// Next, select the Information Property List item, select Add Item from the
|
||||||
|
/// Editor menu, then select Localizations from the pop-up menu.
|
||||||
|
///
|
||||||
|
/// Select and expand the newly-created Localizations item then, for each
|
||||||
|
/// locale your application supports, add a new item and select the locale
|
||||||
|
/// you wish to add from the pop-up menu in the Value field. This list should
|
||||||
|
/// be consistent with the languages listed in the AppLocale.supportedLocales
|
||||||
|
/// property.
|
||||||
|
abstract class AppLocale {
|
||||||
|
AppLocale(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
|
||||||
|
|
||||||
|
final String localeName;
|
||||||
|
|
||||||
|
static AppLocale? of(BuildContext context) {
|
||||||
|
return Localizations.of<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 @search.
|
||||||
|
///
|
||||||
|
/// In ru, this message translates to:
|
||||||
|
/// **'Поиск'**
|
||||||
|
String get search;
|
||||||
|
|
||||||
|
/// No description provided for @liked.
|
||||||
|
///
|
||||||
|
/// In ru, this message translates to:
|
||||||
|
/// **'понравился!'**
|
||||||
|
String get liked;
|
||||||
|
|
||||||
|
/// No description provided for @disliked.
|
||||||
|
///
|
||||||
|
/// In ru, this message translates to:
|
||||||
|
/// **'разонравился :('**
|
||||||
|
String get disliked;
|
||||||
|
|
||||||
|
/// No description provided for @arbEnding.
|
||||||
|
///
|
||||||
|
/// In ru, this message translates to:
|
||||||
|
/// **'Чтобы не забыть про отсутствие запятой :)'**
|
||||||
|
String get arbEnding;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AppLocaleDelegate extends LocalizationsDelegate<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.'
|
||||||
|
);
|
||||||
|
}
|
20
lib/components/locale/l10n/app_locale_en.dart
Normal file
20
lib/components/locale/l10n/app_locale_en.dart
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import 'app_locale.dart';
|
||||||
|
|
||||||
|
// ignore_for_file: type=lint
|
||||||
|
|
||||||
|
/// The translations for English (`en`).
|
||||||
|
class AppLocaleEn extends AppLocale {
|
||||||
|
AppLocaleEn([String locale = 'en']) : super(locale);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get search => 'Search';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get liked => 'liked!';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get disliked => 'disliked :(';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)';
|
||||||
|
}
|
20
lib/components/locale/l10n/app_locale_ru.dart
Normal file
20
lib/components/locale/l10n/app_locale_ru.dart
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import 'app_locale.dart';
|
||||||
|
|
||||||
|
// ignore_for_file: type=lint
|
||||||
|
|
||||||
|
/// The translations for Russian (`ru`).
|
||||||
|
class AppLocaleRu extends AppLocale {
|
||||||
|
AppLocaleRu([String locale = 'ru']) : super(locale);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get search => 'Поиск';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get liked => 'понравился!';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get disliked => 'разонравился :(';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)';
|
||||||
|
}
|
@ -3,4 +3,10 @@
|
|||||||
// ignore_for_file: constant_identifier_names
|
// ignore_for_file: constant_identifier_names
|
||||||
class R {
|
class R {
|
||||||
const R._();
|
const R._();
|
||||||
|
|
||||||
|
/// ![preview](file://C:\Users\Polly\StudioProjects\PIbd-32_Chubykina_P.P._mobilki\assets\svg\gb.svg)
|
||||||
|
static const String ASSETS_SVG_GB_SVG = 'assets/svg/gb.svg';
|
||||||
|
|
||||||
|
/// ![preview](file://C:\Users\Polly\StudioProjects\PIbd-32_Chubykina_P.P._mobilki\assets\svg\ru.svg)
|
||||||
|
static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg';
|
||||||
}
|
}
|
||||||
|
@ -10,11 +10,11 @@ class Debounce {
|
|||||||
|
|
||||||
static Timer? _timer;
|
static Timer? _timer;
|
||||||
|
|
||||||
static void run (
|
static void run(
|
||||||
VoidCallback action, {
|
VoidCallback action, {
|
||||||
Duration delay = const Duration(milliseconds: 500),
|
Duration delay = const Duration(milliseconds: 500),
|
||||||
}) {
|
}) {
|
||||||
_timer?.cancel();
|
_timer?.cancel();
|
||||||
_timer = Timer(delay, action);
|
_timer = Timer(delay, action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -57,4 +57,4 @@ 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) => _$PaginationDtoFromJson(json);
|
factory PaginationDto.fromJson(Map<String, dynamic> json) => _$PaginationDtoFromJson(json);
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,8 @@ class PokemonTypeDetailDto {
|
|||||||
required this.url,
|
required this.url,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory PokemonTypeDetailDto.fromJson(Map<String, dynamic> json) => _$PokemonTypeDetailDtoFromJson(json);
|
factory PokemonTypeDetailDto.fromJson(Map<String, dynamic> json) =>
|
||||||
|
_$PokemonTypeDetailDtoFromJson(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonSerializable(createToJson: false)
|
@JsonSerializable(createToJson: false)
|
||||||
@ -53,5 +54,6 @@ class PokemonSpritesDto {
|
|||||||
required this.front_default,
|
required this.front_default,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory PokemonSpritesDto.fromJson(Map<String, dynamic> json) => _$PokemonSpritesDtoFromJson(json);
|
factory PokemonSpritesDto.fromJson(Map<String, dynamic> json) =>
|
||||||
}
|
_$PokemonSpritesDtoFromJson(json);
|
||||||
|
}
|
||||||
|
@ -8,25 +8,27 @@ const _imagePlaceholder =
|
|||||||
|
|
||||||
extension CharactersDtoToModel on CharactersDto {
|
extension CharactersDtoToModel on CharactersDto {
|
||||||
HomeData toDomain() => HomeData(
|
HomeData toDomain() => HomeData(
|
||||||
data: data?.map((e) => e.toDomain()).toList(),
|
data: data?.map((e) => e.toDomain()).toList(),
|
||||||
nextPage: meta?.pagination?.next,
|
nextPage: meta?.pagination?.next,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
extension CharacterDataDtoToModel on CharacterDataDto {
|
extension CharacterDataDtoToModel on CharacterDataDto {
|
||||||
CardData toDomain() => CardData(
|
CardData toDomain() => CardData(
|
||||||
attributes?.name ?? 'UNKNOWN',
|
attributes?.name ?? 'UNKNOWN',
|
||||||
imageUrl: attributes?.image ?? _imagePlaceholder,
|
imageUrl: attributes?.image ?? _imagePlaceholder,
|
||||||
descriptionText: _makeDescriptionText(attributes?.born, attributes?.died),
|
descriptionText:
|
||||||
);
|
_makeDescriptionText(attributes?.born, attributes?.died),
|
||||||
|
id: id,
|
||||||
|
);
|
||||||
|
|
||||||
String _makeDescriptionText(String? born, String? died) {
|
String _makeDescriptionText(String? born, String? died) {
|
||||||
return born != null && died != null
|
return born != null && died != null
|
||||||
? '$born - $died'
|
? '$born - $died'
|
||||||
: born != null
|
: born != null
|
||||||
? 'born: $born'
|
? 'born: $born'
|
||||||
: died != null
|
: died != null
|
||||||
? 'died: $died'
|
? 'died: $died'
|
||||||
: '';
|
: '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,12 +6,12 @@ const _imagePlaceholder =
|
|||||||
|
|
||||||
extension PokemonDtoToModel on PokemonDto {
|
extension PokemonDtoToModel on PokemonDto {
|
||||||
CardData toDomain() => CardData(
|
CardData toDomain() => CardData(
|
||||||
name,
|
name,
|
||||||
imageUrl: sprites.front_default ?? _imagePlaceholder,
|
imageUrl: sprites.front_default ?? _imagePlaceholder,
|
||||||
descriptionText: _makeDescriptionText(types),
|
descriptionText: _makeDescriptionText(types),
|
||||||
);
|
);
|
||||||
|
|
||||||
String _makeDescriptionText(List<PokemonTypeDto> types) {
|
String _makeDescriptionText(List<PokemonTypeDto> types) {
|
||||||
return 'Types: ${types.map((type) => type.type.name).join(', ')}';
|
return 'Types: ${types.map((type) => type.type.name).join(', ')}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,4 +5,4 @@ typedef OnErrorCallback = void Function(String? error);
|
|||||||
|
|
||||||
abstract class ApiInterface {
|
abstract class ApiInterface {
|
||||||
Future<HomeData?> loadData({OnErrorCallback? onError});
|
Future<HomeData?> loadData({OnErrorCallback? onError});
|
||||||
}
|
}
|
||||||
|
@ -12,14 +12,14 @@ class MockRepository extends ApiInterface {
|
|||||||
'Freeze',
|
'Freeze',
|
||||||
descriptionText: 'so cold..',
|
descriptionText: 'so cold..',
|
||||||
imageUrl:
|
imageUrl:
|
||||||
'https://www.skedaddlewildlife.com/wp-content/uploads/2018/09/depositphotos_22425309-stock-photo-a-lonely-raccoon-in-winter.jpg',
|
'https://www.skedaddlewildlife.com/wp-content/uploads/2018/09/depositphotos_22425309-stock-photo-a-lonely-raccoon-in-winter.jpg',
|
||||||
),
|
),
|
||||||
CardData(
|
CardData(
|
||||||
'Hi',
|
'Hi',
|
||||||
descriptionText: 'pretty face',
|
descriptionText: 'pretty face',
|
||||||
icon: Icons.hail,
|
icon: Icons.hail,
|
||||||
imageUrl:
|
imageUrl:
|
||||||
'https://www.thesprucepets.com/thmb/nKNaS4I586B_H7sEUw9QAXvWM_0=/2121x0/filters:no_upscale():strip_icc()/GettyImages-135630198-5ba7d225c9e77c0050cff91b.jpg',
|
'https://www.thesprucepets.com/thmb/nKNaS4I586B_H7sEUw9QAXvWM_0=/2121x0/filters:no_upscale():strip_icc()/GettyImages-135630198-5ba7d225c9e77c0050cff91b.jpg',
|
||||||
),
|
),
|
||||||
CardData(
|
CardData(
|
||||||
'Orange',
|
'Orange',
|
||||||
@ -30,4 +30,4 @@ class MockRepository extends ApiInterface {
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
|
@ -21,7 +21,7 @@ class PotterRepository extends ApiInterface {
|
|||||||
OnErrorCallback? onError,
|
OnErrorCallback? onError,
|
||||||
String? q,
|
String? q,
|
||||||
int page = 1,
|
int page = 1,
|
||||||
int pageSize = 5,
|
int pageSize = 25,
|
||||||
}) async {
|
}) async {
|
||||||
try {
|
try {
|
||||||
const String url = '$_baseUrl/v1/characters';
|
const String url = '$_baseUrl/v1/characters';
|
||||||
@ -43,4 +43,4 @@ class PotterRepository extends ApiInterface {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,11 +5,13 @@ class CardData {
|
|||||||
final String descriptionText;
|
final String descriptionText;
|
||||||
final IconData icon;
|
final IconData icon;
|
||||||
final String? imageUrl;
|
final String? imageUrl;
|
||||||
|
final String? id;
|
||||||
|
|
||||||
CardData(
|
CardData(
|
||||||
this.text, {
|
this.text, {
|
||||||
required this.descriptionText,
|
required this.descriptionText,
|
||||||
this.icon = Icons.catching_pokemon,
|
this.icon = Icons.catching_pokemon,
|
||||||
this.imageUrl,
|
this.imageUrl,
|
||||||
});
|
this.id,
|
||||||
}
|
});
|
||||||
|
}
|
||||||
|
@ -5,4 +5,4 @@ class HomeData {
|
|||||||
final int? nextPage;
|
final int? nextPage;
|
||||||
|
|
||||||
HomeData({this.data, this.nextPage});
|
HomeData({this.data, this.nextPage});
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
|
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:mobilki_lab1/presentation/home_page/bloc/bloc.dart';
|
import 'package:mobilki_lab1/presentation/home_page/bloc/bloc.dart';
|
||||||
import 'package:mobilki_lab1/presentation/home_page/home_page.dart';
|
import 'package:mobilki_lab1/presentation/home_page/home_page.dart';
|
||||||
|
import 'package:mobilki_lab1/presentation/like_bloc/like_bloc.dart';
|
||||||
|
import 'package:mobilki_lab1/presentation/locale_bloc/locale_bloc.dart';
|
||||||
|
import 'package:mobilki_lab1/presentation/locale_bloc/locale_state.dart';
|
||||||
|
import 'components/locale/l10n/app_locale.dart';
|
||||||
import 'data/repositories/potter_repository.dart';
|
import 'data/repositories/potter_repository.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@ -13,21 +19,36 @@ class MyApp extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return BlocProvider<LocaleBloc>(
|
||||||
title: 'Flutter Demo',
|
lazy: false,
|
||||||
debugShowCheckedModeBanner: false,
|
create: (context) => LocaleBloc(Locale(Platform.localeName)),
|
||||||
theme: ThemeData(
|
child: BlocBuilder<LocaleBloc, LocaleState>(
|
||||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
|
builder: (context, state) {
|
||||||
useMaterial3: true,
|
return MaterialApp(
|
||||||
),
|
title: 'Flutter Demo',
|
||||||
home: RepositoryProvider<PotterRepository>(
|
locale: state.currentLocale,
|
||||||
lazy: true,
|
localizationsDelegates: AppLocale.localizationsDelegates,
|
||||||
create: (_) => PotterRepository(),
|
supportedLocales: AppLocale.supportedLocales,
|
||||||
child: BlocProvider<HomeBloc>(
|
debugShowCheckedModeBanner: false,
|
||||||
lazy: false,
|
theme: ThemeData(
|
||||||
create: (context) => HomeBloc(context.read<PotterRepository>()),
|
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
|
||||||
child: const MyHomePage(title: 'Чубыкина Полина Павловна'),
|
useMaterial3: true,
|
||||||
),
|
),
|
||||||
|
home: RepositoryProvider<PotterRepository>(
|
||||||
|
lazy: true,
|
||||||
|
create: (_) => PotterRepository(),
|
||||||
|
child: BlocProvider<LikeBloc>(
|
||||||
|
lazy: false,
|
||||||
|
create: (context) => LikeBloc(),
|
||||||
|
child: BlocProvider<HomeBloc>(
|
||||||
|
lazy: false,
|
||||||
|
create: (context) => HomeBloc(context.read<PotterRepository>()),
|
||||||
|
child: const MyHomePage(title: 'Чубыкина Полина Павловна'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
34
lib/presentation/common/svg_objects.dart
Normal file
34
lib/presentation/common/svg_objects.dart
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
import 'package:flutter/widgets.dart';
|
||||||
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import '../../components/resources.g.dart';
|
||||||
|
|
||||||
|
abstract class SvgObjects {
|
||||||
|
static void init() {
|
||||||
|
final pics = <String>[
|
||||||
|
R.ASSETS_SVG_RU_SVG,
|
||||||
|
R.ASSETS_SVG_GB_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_GB_SVG);
|
||||||
|
}
|
||||||
|
}
|
@ -36,4 +36,4 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
|||||||
error: error,
|
error: error,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,4 +7,4 @@ class HomeLoadDataEvent extends HomeEvent {
|
|||||||
final int? nextPage;
|
final int? nextPage;
|
||||||
|
|
||||||
const HomeLoadDataEvent({this.search, this.nextPage});
|
const HomeLoadDataEvent({this.search, this.nextPage});
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,9 @@ class HomeState extends Equatable {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => [
|
List<Object?> get props => [
|
||||||
data,
|
data,
|
||||||
isLoading,
|
isLoading,
|
||||||
isPaginationLoading,
|
isPaginationLoading,
|
||||||
error,
|
error,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,28 +1,33 @@
|
|||||||
part of 'home_page.dart';
|
part of 'home_page.dart';
|
||||||
|
|
||||||
typedef OnLikeCallback = void Function(String title, bool isLiked)?;
|
typedef OnLikeCallback = void Function(String? id, String title, bool isLiked)?;
|
||||||
|
|
||||||
class _Card extends StatefulWidget {
|
class _Card extends StatelessWidget {
|
||||||
final String text;
|
final String text;
|
||||||
final String descriptionText;
|
final String descriptionText;
|
||||||
final IconData icon;
|
final IconData icon;
|
||||||
final String? imageUrl;
|
final String? imageUrl;
|
||||||
final OnLikeCallback onLike;
|
final OnLikeCallback onLike;
|
||||||
final VoidCallback? onTap;
|
final VoidCallback? onTap;
|
||||||
|
final String? id;
|
||||||
|
final bool isLiked;
|
||||||
|
|
||||||
const _Card(
|
const _Card(
|
||||||
this.text, {
|
this.text, {
|
||||||
this.icon = Icons.catching_pokemon,
|
this.icon = Icons.ac_unit_outlined,
|
||||||
required this.descriptionText,
|
required this.descriptionText,
|
||||||
this.imageUrl,
|
this.imageUrl,
|
||||||
this.onLike,
|
this.onLike,
|
||||||
this.onTap,
|
this.onTap,
|
||||||
|
this.id,
|
||||||
|
this.isLiked = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory _Card.fromData(
|
factory _Card.fromData(
|
||||||
CardData data, {
|
CardData data, {
|
||||||
OnLikeCallback onLike,
|
OnLikeCallback onLike,
|
||||||
VoidCallback? onTap,
|
VoidCallback? onTap,
|
||||||
|
bool isLiked = false,
|
||||||
}) =>
|
}) =>
|
||||||
_Card(
|
_Card(
|
||||||
data.text,
|
data.text,
|
||||||
@ -31,26 +36,20 @@ class _Card extends StatefulWidget {
|
|||||||
imageUrl: data.imageUrl,
|
imageUrl: data.imageUrl,
|
||||||
onLike: onLike,
|
onLike: onLike,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
|
isLiked: isLiked,
|
||||||
|
id: data.id,
|
||||||
);
|
);
|
||||||
|
|
||||||
@override
|
|
||||||
State<_Card> createState() => _CardState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _CardState extends State<_Card> {
|
|
||||||
bool isLiked = false;
|
|
||||||
|
|
||||||
@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),
|
||||||
constraints: const BoxConstraints(minHeight: 140),
|
constraints: const BoxConstraints(minHeight: 160),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.white70,
|
color: Colors.white70,
|
||||||
borderRadius: BorderRadius.circular(20),
|
borderRadius: BorderRadius.circular(20),
|
||||||
border: Border.all(color: Colors.grey.shade200),
|
|
||||||
boxShadow: [
|
boxShadow: [
|
||||||
BoxShadow(
|
BoxShadow(
|
||||||
color: Colors.grey.withOpacity(.5),
|
color: Colors.grey.withOpacity(.5),
|
||||||
@ -71,11 +70,17 @@ class _CardState extends State<_Card> {
|
|||||||
),
|
),
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
width: 160,
|
width: 120,
|
||||||
child: Image.network(
|
child: Stack(
|
||||||
widget.imageUrl ?? '',
|
children: [
|
||||||
fit: BoxFit.cover,
|
Positioned.fill(
|
||||||
errorBuilder: (_, __, ___) => const Placeholder(),
|
child: Image.network(
|
||||||
|
imageUrl ?? '',
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
errorBuilder: (_, __, ___) => const Placeholder(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -86,13 +91,13 @@ class _CardState extends State<_Card> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
widget.text,
|
text,
|
||||||
style: Theme.of(context).textTheme.headlineLarge,
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
),
|
),
|
||||||
Text(
|
Text(
|
||||||
widget.descriptionText,
|
descriptionText,
|
||||||
style: Theme.of(context).textTheme.bodyLarge,
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
),
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -100,20 +105,12 @@ class _CardState extends State<_Card> {
|
|||||||
Align(
|
Align(
|
||||||
alignment: Alignment.bottomRight,
|
alignment: Alignment.bottomRight,
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.only(
|
padding:
|
||||||
left: 8.0,
|
const EdgeInsets.only(left: 8, right: 16, bottom: 16),
|
||||||
right: 16.0,
|
|
||||||
bottom: 16.0,
|
|
||||||
),
|
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: () {
|
onTap: () => onLike?.call(id, text, isLiked),
|
||||||
setState(() {
|
|
||||||
isLiked = !isLiked;
|
|
||||||
});
|
|
||||||
widget.onLike?.call(widget.text, isLiked);
|
|
||||||
},
|
|
||||||
child: AnimatedSwitcher(
|
child: AnimatedSwitcher(
|
||||||
duration: const Duration(milliseconds: 300),
|
duration: const Duration(milliseconds: 200),
|
||||||
child: isLiked
|
child: isLiked
|
||||||
? const Icon(
|
? const Icon(
|
||||||
Icons.favorite,
|
Icons.favorite,
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
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:mobilki_lab1/components/extensions/context_x.dart';
|
||||||
import 'package:mobilki_lab1/components/utils/debounce.dart';
|
import 'package:mobilki_lab1/components/utils/debounce.dart';
|
||||||
import 'package:mobilki_lab1/data/repositories/potter_repository.dart';
|
import 'package:mobilki_lab1/data/repositories/potter_repository.dart';
|
||||||
import 'package:mobilki_lab1/data/repositories/pokemon_repository.dart';
|
import 'package:mobilki_lab1/data/repositories/pokemon_repository.dart';
|
||||||
@ -10,6 +11,13 @@ import 'package:mobilki_lab1/presentation/details_page/details_page.dart';
|
|||||||
import 'package:mobilki_lab1/presentation/home_page/bloc/bloc.dart';
|
import 'package:mobilki_lab1/presentation/home_page/bloc/bloc.dart';
|
||||||
import 'package:mobilki_lab1/presentation/home_page/bloc/events.dart';
|
import 'package:mobilki_lab1/presentation/home_page/bloc/events.dart';
|
||||||
import 'package:mobilki_lab1/presentation/home_page/bloc/state.dart';
|
import 'package:mobilki_lab1/presentation/home_page/bloc/state.dart';
|
||||||
|
import '../common/svg_objects.dart';
|
||||||
|
import '../like_bloc/like_bloc.dart';
|
||||||
|
import '../like_bloc/like_event.dart';
|
||||||
|
import '../like_bloc/like_state.dart';
|
||||||
|
import '../locale_bloc/locale_bloc.dart';
|
||||||
|
import '../locale_bloc/locale_events.dart';
|
||||||
|
import '../locale_bloc/locale_state.dart';
|
||||||
|
|
||||||
part 'card.dart';
|
part 'card.dart';
|
||||||
|
|
||||||
@ -42,8 +50,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<LikeBloc>().add(const LoadLikesEvent());
|
||||||
});
|
});
|
||||||
|
|
||||||
scrollController.addListener(_onNextPageListener);
|
scrollController.addListener(_onNextPageListener);
|
||||||
@ -76,14 +87,39 @@ 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.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
|
padding: const EdgeInsets.all(12),
|
||||||
},
|
child: CupertinoSearchTextField(
|
||||||
),
|
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
|
||||||
@ -93,26 +129,30 @@ class BodyState extends State<Body> {
|
|||||||
)
|
)
|
||||||
: state.isLoading
|
: state.isLoading
|
||||||
? const CircularProgressIndicator()
|
? const CircularProgressIndicator()
|
||||||
: Expanded(
|
: BlocBuilder<LikeBloc, LikeState>(
|
||||||
child: RefreshIndicator(
|
builder: (context, likeState) {
|
||||||
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) {
|
||||||
? _Card.fromData(
|
final data = state.data?.data?[index];
|
||||||
data,
|
return data != null
|
||||||
onLike: (title, isLiked) =>
|
? _Card.fromData(
|
||||||
_showSnackBar(context, title, isLiked),
|
data,
|
||||||
onTap: () => _navToDetails(context, data),
|
onLike: _onLike,
|
||||||
)
|
isLiked: likeState.likedIds?.contains(data.id) == true,
|
||||||
: const SizedBox.shrink();
|
onTap: () => _navToDetails(context, data),
|
||||||
},
|
)
|
||||||
),
|
: const SizedBox.shrink();
|
||||||
),
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
BlocBuilder<HomeBloc, HomeState>(
|
BlocBuilder<HomeBloc, HomeState>(
|
||||||
@ -141,7 +181,7 @@ class BodyState extends State<Body> {
|
|||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||||
content: Text(
|
content: Text(
|
||||||
'$title ${isLiked ? 'liked!' : 'disliked :('}',
|
'$title ${isLiked ? context.locale.liked : context.locale.disliked}',
|
||||||
style: Theme.of(context).textTheme.bodyLarge,
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
),
|
),
|
||||||
backgroundColor: Colors.orangeAccent,
|
backgroundColor: Colors.orangeAccent,
|
||||||
@ -149,4 +189,11 @@ class BodyState extends State<Body> {
|
|||||||
));
|
));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onLike(String? id, String title, bool isLiked) {
|
||||||
|
if (id != null) {
|
||||||
|
context.read<LikeBloc>().add(ChangeLikeEvent(id));
|
||||||
|
_showSnackBar(context, title, !isLiked);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
36
lib/presentation/like_bloc/like_bloc.dart
Normal file
36
lib/presentation/like_bloc/like_bloc.dart
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
|
import 'like_event.dart';
|
||||||
|
import 'like_state.dart';
|
||||||
|
|
||||||
|
const String _likedPrefsKey = 'liked';
|
||||||
|
|
||||||
|
class LikeBloc extends Bloc<LikeEvent, LikeState> {
|
||||||
|
LikeBloc() : super(const LikeState(likedIds: [])) {
|
||||||
|
on<ChangeLikeEvent>(_onChangeLike);
|
||||||
|
on<LoadLikesEvent>(_onLoadLikes);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onLoadLikes(LoadLikesEvent event, Emitter<LikeState> emit) async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final data = prefs.getStringList(_likedPrefsKey);
|
||||||
|
|
||||||
|
emit(state.copyWith(likedIds: data));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onChangeLike(ChangeLikeEvent event, Emitter<LikeState> emit) async {
|
||||||
|
final updatedList = List<String>.from(state.likedIds ?? []);
|
||||||
|
|
||||||
|
if (updatedList.contains(event.id)) {
|
||||||
|
updatedList.remove(event.id);
|
||||||
|
} else {
|
||||||
|
updatedList.add(event.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
prefs.setStringList(_likedPrefsKey, updatedList);
|
||||||
|
|
||||||
|
emit(state.copyWith(likedIds: updatedList));
|
||||||
|
}
|
||||||
|
}
|
13
lib/presentation/like_bloc/like_event.dart
Normal file
13
lib/presentation/like_bloc/like_event.dart
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
abstract class LikeEvent {
|
||||||
|
const LikeEvent();
|
||||||
|
}
|
||||||
|
|
||||||
|
class LoadLikesEvent extends LikeEvent {
|
||||||
|
const LoadLikesEvent();
|
||||||
|
}
|
||||||
|
|
||||||
|
class ChangeLikeEvent extends LikeEvent {
|
||||||
|
final String id;
|
||||||
|
|
||||||
|
const ChangeLikeEvent(this.id);
|
||||||
|
}
|
14
lib/presentation/like_bloc/like_state.dart
Normal file
14
lib/presentation/like_bloc/like_state.dart
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import 'package:copy_with_extension/copy_with_extension.dart';
|
||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
|
||||||
|
part 'like_state.g.dart';
|
||||||
|
|
||||||
|
@CopyWith()
|
||||||
|
class LikeState extends Equatable {
|
||||||
|
final List<String>? likedIds;
|
||||||
|
|
||||||
|
const LikeState({required this.likedIds});
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [likedIds];
|
||||||
|
}
|
56
lib/presentation/like_bloc/like_state.g.dart
Normal file
56
lib/presentation/like_bloc/like_state.g.dart
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
|
part of 'like_state.dart';
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// CopyWithGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
abstract class _$LikeStateCWProxy {
|
||||||
|
LikeState likedIds(List<String>? likedIds);
|
||||||
|
|
||||||
|
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||||
|
///
|
||||||
|
/// Usage
|
||||||
|
/// ```dart
|
||||||
|
/// LikeState(...).copyWith(id: 12, name: "My name")
|
||||||
|
/// ````
|
||||||
|
LikeState call({
|
||||||
|
List<String>? likedIds,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLikeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLikeState.copyWith.fieldName(...)`
|
||||||
|
class _$LikeStateCWProxyImpl implements _$LikeStateCWProxy {
|
||||||
|
const _$LikeStateCWProxyImpl(this._value);
|
||||||
|
|
||||||
|
final LikeState _value;
|
||||||
|
|
||||||
|
@override
|
||||||
|
LikeState likedIds(List<String>? likedIds) => this(likedIds: likedIds);
|
||||||
|
|
||||||
|
@override
|
||||||
|
|
||||||
|
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||||
|
///
|
||||||
|
/// Usage
|
||||||
|
/// ```dart
|
||||||
|
/// LikeState(...).copyWith(id: 12, name: "My name")
|
||||||
|
/// ````
|
||||||
|
LikeState call({
|
||||||
|
Object? likedIds = const $CopyWithPlaceholder(),
|
||||||
|
}) {
|
||||||
|
return LikeState(
|
||||||
|
likedIds: likedIds == const $CopyWithPlaceholder()
|
||||||
|
? _value.likedIds
|
||||||
|
// ignore: cast_nullable_to_non_nullable
|
||||||
|
: likedIds as List<String>?,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension $LikeStateCopyWith on LikeState {
|
||||||
|
/// Returns a callable class that can be used as follows: `instanceOfLikeState.copyWith(...)` or like so:`instanceOfLikeState.copyWith.fieldName(...)`.
|
||||||
|
// ignore: library_private_types_in_public_api
|
||||||
|
_$LikeStateCWProxy get copyWith => _$LikeStateCWProxyImpl(this);
|
||||||
|
}
|
17
lib/presentation/locale_bloc/locale_bloc.dart
Normal file
17
lib/presentation/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:mobilki_lab1/components/locale/l10n/app_locale.dart';
|
||||||
|
import 'package:mobilki_lab1/presentation/locale_bloc/locale_events.dart';
|
||||||
|
import 'package:mobilki_lab1/presentation/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/presentation/locale_bloc/locale_events.dart
Normal file
7
lib/presentation/locale_bloc/locale_events.dart
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
abstract class LocaleEvent {
|
||||||
|
const LocaleEvent();
|
||||||
|
}
|
||||||
|
|
||||||
|
class ChangeLocaleEvent extends LocaleEvent {
|
||||||
|
const ChangeLocaleEvent();
|
||||||
|
}
|
15
lib/presentation/locale_bloc/locale_state.dart
Normal file
15
lib/presentation/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];
|
||||||
|
}
|
58
lib/presentation/locale_bloc/locale_state.g.dart
Normal file
58
lib/presentation/locale_bloc/locale_state.g.dart
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
|
part of 'locale_state.dart';
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// CopyWithGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
abstract class _$LocaleStateCWProxy {
|
||||||
|
LocaleState currentLocale(Locale currentLocale);
|
||||||
|
|
||||||
|
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||||
|
///
|
||||||
|
/// Usage
|
||||||
|
/// ```dart
|
||||||
|
/// LocaleState(...).copyWith(id: 12, name: "My name")
|
||||||
|
/// ````
|
||||||
|
LocaleState call({
|
||||||
|
Locale? currentLocale,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLocaleState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLocaleState.copyWith.fieldName(...)`
|
||||||
|
class _$LocaleStateCWProxyImpl implements _$LocaleStateCWProxy {
|
||||||
|
const _$LocaleStateCWProxyImpl(this._value);
|
||||||
|
|
||||||
|
final LocaleState _value;
|
||||||
|
|
||||||
|
@override
|
||||||
|
LocaleState currentLocale(Locale currentLocale) =>
|
||||||
|
this(currentLocale: currentLocale);
|
||||||
|
|
||||||
|
@override
|
||||||
|
|
||||||
|
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||||
|
///
|
||||||
|
/// Usage
|
||||||
|
/// ```dart
|
||||||
|
/// LocaleState(...).copyWith(id: 12, name: "My name")
|
||||||
|
/// ````
|
||||||
|
LocaleState call({
|
||||||
|
Object? currentLocale = const $CopyWithPlaceholder(),
|
||||||
|
}) {
|
||||||
|
return LocaleState(
|
||||||
|
currentLocale:
|
||||||
|
currentLocale == const $CopyWithPlaceholder() || currentLocale == null
|
||||||
|
? _value.currentLocale
|
||||||
|
// ignore: cast_nullable_to_non_nullable
|
||||||
|
: currentLocale as Locale,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension $LocaleStateCopyWith on LocaleState {
|
||||||
|
/// Returns a callable class that can be used as follows: `instanceOfLocaleState.copyWith(...)` or like so:`instanceOfLocaleState.copyWith.fieldName(...)`.
|
||||||
|
// ignore: library_private_types_in_public_api
|
||||||
|
_$LocaleStateCWProxy get copyWith => _$LocaleStateCWProxyImpl(this);
|
||||||
|
}
|
4
makefile
4
makefile
@ -17,4 +17,8 @@ format:
|
|||||||
|
|
||||||
res:
|
res:
|
||||||
fgen --output lib/components/resources.g.dart --no-watch --no-preview; \
|
fgen --output lib/components/resources.g.dart --no-watch --no-preview; \
|
||||||
|
make format
|
||||||
|
|
||||||
|
loc:
|
||||||
|
flutter gen-l10n; \
|
||||||
make format
|
make format
|
180
pubspec.lock
180
pubspec.lock
@ -254,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:
|
||||||
@ -299,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:
|
||||||
@ -328,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:
|
||||||
@ -352,6 +386,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.3.0"
|
version: "4.3.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:
|
||||||
@ -488,6 +530,38 @@ 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:
|
petitparser:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -496,6 +570,22 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.0.2"
|
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:
|
||||||
@ -536,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: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.3.3"
|
||||||
|
shared_preferences_foundation:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_foundation
|
||||||
|
sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.5.3"
|
||||||
|
shared_preferences_linux:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_linux
|
||||||
|
sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.1"
|
||||||
|
shared_preferences_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_platform_interface
|
||||||
|
sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.1"
|
||||||
|
shared_preferences_web:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_web
|
||||||
|
sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.2"
|
||||||
|
shared_preferences_windows:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_windows
|
||||||
|
sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.1"
|
||||||
shelf:
|
shelf:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -645,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:
|
||||||
@ -693,6 +863,14 @@ 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: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.0"
|
||||||
xml:
|
xml:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -711,4 +889,4 @@ packages:
|
|||||||
version: "3.1.2"
|
version: "3.1.2"
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.5.3 <4.0.0"
|
dart: ">=3.5.3 <4.0.0"
|
||||||
flutter: ">=3.18.0-18.0.pre.54"
|
flutter: ">=3.24.0"
|
||||||
|
12
pubspec.yaml
12
pubspec.yaml
@ -11,6 +11,8 @@ dependencies:
|
|||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|
||||||
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
|
||||||
dio: ^5.4.2+1
|
dio: ^5.4.2+1
|
||||||
pretty_dio_logger: ^1.3.1
|
pretty_dio_logger: ^1.3.1
|
||||||
@ -19,6 +21,12 @@ dependencies:
|
|||||||
flutter_bloc: ^8.1.5
|
flutter_bloc: ^8.1.5
|
||||||
copy_with_extension_gen: ^5.0.4
|
copy_with_extension_gen: ^5.0.4
|
||||||
|
|
||||||
|
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
|
||||||
@ -37,4 +45,8 @@ flutter_icons:
|
|||||||
min_sdk_android: 21
|
min_sdk_android: 21
|
||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
|
generate: true
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|
||||||
|
assets:
|
||||||
|
- assets/svg/
|
||||||
|
Loading…
Reference in New Issue
Block a user