Compare commits
No commits in common. "c1d6ed3a26ee211e33a735c698857063ea74b5c3" and "bcec27d19391339297c542c14e3c4dd6aaad4a8b" have entirely different histories.
c1d6ed3a26
...
bcec27d193
28
.vscode/launch.json
vendored
@ -1,28 +0,0 @@
|
|||||||
{
|
|
||||||
// Use IntelliSense to learn about possible attributes.
|
|
||||||
// Hover to view descriptions of existing attributes.
|
|
||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
|
||||||
"version": "0.2.0",
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"name": "flutter_app",
|
|
||||||
"cwd": "flutter_app",
|
|
||||||
"request": "launch",
|
|
||||||
"type": "dart"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "flutter_app (profile mode)",
|
|
||||||
"cwd": "flutter_app",
|
|
||||||
"request": "launch",
|
|
||||||
"type": "dart",
|
|
||||||
"flutterMode": "profile"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "flutter_app (release mode)",
|
|
||||||
"cwd": "flutter_app",
|
|
||||||
"request": "launch",
|
|
||||||
"type": "dart",
|
|
||||||
"flutterMode": "release"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 968 B After Width: | Height: | Size: 968 B |
@ -1,3 +0,0 @@
|
|||||||
description: This file stores settings for Dart & Flutter DevTools.
|
|
||||||
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
|
||||||
extensions:
|
|
@ -427,7 +427,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||||
CLANG_ANALYZER_NONNULL = YES;
|
CLANG_ANALYZER_NONNULL = YES;
|
||||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||||
CLANG_CXX_LIBRARY = "libc++";
|
CLANG_CXX_LIBRARY = "libc++";
|
||||||
@ -484,7 +484,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||||
CLANG_ANALYZER_NONNULL = YES;
|
CLANG_ANALYZER_NONNULL = YES;
|
||||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||||
CLANG_CXX_LIBRARY = "libc++";
|
CLANG_CXX_LIBRARY = "libc++";
|
||||||
|
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 295 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 406 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 450 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 462 B |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 704 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 406 B |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 586 B |
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 862 B |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 862 B |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 762 B |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 1.4 KiB |
@ -1,6 +0,0 @@
|
|||||||
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
|
|
@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"@@locale": "en",
|
|
||||||
|
|
||||||
"search": "Search",
|
|
||||||
"liked": "liked!",
|
|
||||||
"disliked": "disliked :(",
|
|
||||||
|
|
||||||
"arbEnding": "Чтобы не забыть про отсутствие запятой :)"
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"@@locale": "ru",
|
|
||||||
|
|
||||||
"search": "Поиск",
|
|
||||||
"liked": "Добавлено в понравившиеся :)",
|
|
||||||
"disliked": "Удалено из понравившегося :(",
|
|
||||||
|
|
||||||
"arbEnding": "Чтобы не забыть про отсутствие запятой :)"
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
import 'package:flutter_app/components/locale/l10n/app_locale.dart';
|
|
||||||
import 'package:flutter/widgets.dart';
|
|
||||||
|
|
||||||
extension LocalContextX on BuildContext {
|
|
||||||
AppLocale get locale => AppLocale.of(this)!;
|
|
||||||
}
|
|
@ -1,153 +0,0 @@
|
|||||||
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.'
|
|
||||||
);
|
|
||||||
}
|
|
@ -1,20 +0,0 @@
|
|||||||
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 => 'Чтобы не забыть про отсутствие запятой :)';
|
|
||||||
}
|
|
@ -1,20 +0,0 @@
|
|||||||
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 => 'Чтобы не забыть про отсутствие запятой :)';
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
/// Generate by [asset_generator](https://github.com/fluttercandies/flutter_asset_generator) library.
|
|
||||||
/// PLEASE DO NOT EDIT MANUALLY.
|
|
||||||
// ignore_for_file: constant_identifier_names
|
|
||||||
class R {
|
|
||||||
const R._();
|
|
||||||
|
|
||||||
static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg';
|
|
||||||
|
|
||||||
static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg';
|
|
||||||
}
|
|
@ -24,6 +24,5 @@ class ThronesCharacterDto {
|
|||||||
required this.imageUrl,
|
required this.imageUrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory ThronesCharacterDto.fromJson(Map<String, dynamic> json) =>
|
factory ThronesCharacterDto.fromJson(Map<String, dynamic> json) => _$ThronesCharacterDtoFromJson(json);
|
||||||
_$ThronesCharacterDtoFromJson(json);
|
|
||||||
}
|
}
|
@ -27,8 +27,7 @@ class ThronesRepository extends ApiInterface {
|
|||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
final List<CardData> data = characters
|
final List<CardData> data = characters
|
||||||
.where((character) =>
|
.where((character) => q == null || character.fullName.toLowerCase().contains(q.toLowerCase()))
|
||||||
q == null || character.fullName.toLowerCase().contains(q.toLowerCase()))
|
|
||||||
.map((e) => e.toDomain())
|
.map((e) => e.toDomain())
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ class CardData {
|
|||||||
final String? fullName;
|
final String? fullName;
|
||||||
final String? title;
|
final String? title;
|
||||||
final String? family;
|
final String? family;
|
||||||
final int? id;
|
|
||||||
|
|
||||||
CardData({
|
CardData({
|
||||||
required this.text,
|
required this.text,
|
||||||
@ -22,6 +21,5 @@ class CardData {
|
|||||||
required this.fullName,
|
required this.fullName,
|
||||||
required this.title,
|
required this.title,
|
||||||
required this.family,
|
required this.family,
|
||||||
this.id,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
@ -1,14 +1,7 @@
|
|||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_app/data/repositories/got_repository.dart';
|
import 'package:flutter_app/data/repositories/got_repository.dart';
|
||||||
import 'package:flutter_app/presentation/home_page/bloc/bloc.dart';
|
import 'package:flutter_app/presentation/home_page/bloc/bloc.dart';
|
||||||
import 'package:flutter_app/presentation/home_page/home_page.dart';
|
|
||||||
import 'package:flutter_app/presentation/like_bloc/like_bloc.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_bloc.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_state.dart';
|
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_app/components/locale/l10n/app_locale.dart';
|
|
||||||
import 'presentation/home_page/home_page.dart';
|
import 'presentation/home_page/home_page.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@ -20,17 +13,8 @@ class MyApp extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocProvider<LocaleBloc>(
|
|
||||||
lazy: false,
|
|
||||||
create: (context) => LocaleBloc((Locale(Platform.localeName))),
|
|
||||||
child: BlocBuilder<LocaleBloc, LocaleState>(
|
|
||||||
builder: (context, state) {
|
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: '7 Kingdoms',
|
title: '7 Kingdoms',
|
||||||
locale: state.currentLocale,
|
|
||||||
localizationsDelegates: AppLocale.localizationsDelegates,
|
|
||||||
supportedLocales: AppLocale.supportedLocales,
|
|
||||||
debugShowCheckedModeBanner: false,
|
|
||||||
theme: ThemeData(
|
theme: ThemeData(
|
||||||
colorScheme: ColorScheme.fromSeed(seedColor: const Color.fromARGB(255, 20, 40, 150)),
|
colorScheme: ColorScheme.fromSeed(seedColor: const Color.fromARGB(255, 20, 40, 150)),
|
||||||
useMaterial3: true,
|
useMaterial3: true,
|
||||||
@ -38,18 +22,12 @@ class MyApp extends StatelessWidget {
|
|||||||
home: RepositoryProvider<ThronesRepository>(
|
home: RepositoryProvider<ThronesRepository>(
|
||||||
lazy: true,
|
lazy: true,
|
||||||
create: (_) => ThronesRepository(),
|
create: (_) => ThronesRepository(),
|
||||||
child: BlocProvider<LikeBloc>(
|
|
||||||
lazy: false,
|
|
||||||
create: (context) => LikeBloc(),
|
|
||||||
child: BlocProvider<HomeBloc>(
|
child: BlocProvider<HomeBloc>(
|
||||||
lazy: false,
|
lazy: false,
|
||||||
create: (context) => HomeBloc(context.read<ThronesRepository>()),
|
create: (context) => HomeBloc(context.read<ThronesRepository>()),
|
||||||
child: const MyHomePage(title: "Федоренко Галина Юрьевна"),
|
child: const MyHomePage(title: '7 Kingdoms'),
|
||||||
),
|
|
||||||
),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
),
|
),
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
import 'package:flutter/widgets.dart';
|
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
|
||||||
import 'package:flutter_app/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,8 +1,8 @@
|
|||||||
part of 'home_page.dart';
|
part of 'home_page.dart';
|
||||||
|
|
||||||
typedef OnLikeCallback = void Function(String? id, String title, bool isLiked)?;
|
typedef OnLikeCallback = void Function(String title, bool isLiked)?;
|
||||||
|
|
||||||
class _Card extends StatelessWidget {
|
class _Card extends StatefulWidget {
|
||||||
final String text;
|
final String text;
|
||||||
final String descriptionText;
|
final String descriptionText;
|
||||||
final String? fullName;
|
final String? fullName;
|
||||||
@ -10,8 +10,6 @@ class _Card extends StatelessWidget {
|
|||||||
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, {
|
||||||
@ -21,15 +19,12 @@ class _Card extends StatelessWidget {
|
|||||||
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,
|
||||||
@ -39,14 +34,19 @@ class _Card extends StatelessWidget {
|
|||||||
imageUrl: data.imageUrl,
|
imageUrl: data.imageUrl,
|
||||||
onLike: onLike,
|
onLike: onLike,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
isLiked: isLiked,
|
|
||||||
id: data.id.toString()
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@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: onTap,
|
onTap: widget.onTap,
|
||||||
child: Card(
|
child: Card(
|
||||||
margin: const EdgeInsets.all(8.0),
|
margin: const EdgeInsets.all(8.0),
|
||||||
child: Column(
|
child: Column(
|
||||||
@ -58,7 +58,7 @@ class _Card extends StatelessWidget {
|
|||||||
height: 250,
|
height: 250,
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
child: Image.network(
|
child: Image.network(
|
||||||
imageUrl ?? '',
|
widget.imageUrl ?? '',
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
errorBuilder: (_, __, ___) => const Placeholder(),
|
errorBuilder: (_, __, ___) => const Placeholder(),
|
||||||
),
|
),
|
||||||
@ -70,14 +70,14 @@ class _Card extends StatelessWidget {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
fullName ?? 'Default Name',
|
widget.fullName ?? 'Default Name',
|
||||||
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
|
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
|
||||||
fontSize: 20.0,
|
fontSize: 20.0,
|
||||||
fontFamily: 'Times New Roman',
|
fontFamily: 'Times New Roman',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Text(
|
Text(
|
||||||
descriptionText,
|
widget.descriptionText,
|
||||||
style: Theme.of(context).textTheme.bodyMedium,
|
style: Theme.of(context).textTheme.bodyMedium,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@ -92,7 +92,12 @@ class _Card extends StatelessWidget {
|
|||||||
bottom: 16.0,
|
bottom: 16.0,
|
||||||
),
|
),
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: () => onLike?.call(id, text, isLiked),
|
onTap: () {
|
||||||
|
setState(() {
|
||||||
|
isLiked = !isLiked;
|
||||||
|
});
|
||||||
|
widget.onLike?.call(widget.fullName ?? 'Default Name', isLiked);
|
||||||
|
},
|
||||||
child: AnimatedSwitcher(
|
child: AnimatedSwitcher(
|
||||||
duration: const Duration(milliseconds: 300),
|
duration: const Duration(milliseconds: 300),
|
||||||
child: isLiked
|
child: isLiked
|
||||||
|
@ -1,19 +1,11 @@
|
|||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_app/components/extensions/context_x.dart';
|
|
||||||
import 'package:flutter_app/components/utils/debounce.dart';
|
import 'package:flutter_app/components/utils/debounce.dart';
|
||||||
import 'package:flutter_app/data/repositories/got_repository.dart';
|
import 'package:flutter_app/data/repositories/got_repository.dart';
|
||||||
import 'package:flutter_app/domain/models/card.dart';
|
import 'package:flutter_app/domain/models/card.dart';
|
||||||
import 'package:flutter_app/presentation/common/svg_object.dart';
|
|
||||||
import 'package:flutter_app/presentation/home_page/bloc/bloc.dart';
|
import 'package:flutter_app/presentation/home_page/bloc/bloc.dart';
|
||||||
import 'package:flutter_app/presentation/home_page/bloc/events.dart';
|
import 'package:flutter_app/presentation/home_page/bloc/events.dart';
|
||||||
import 'package:flutter_app/presentation/home_page/bloc/state.dart';
|
import 'package:flutter_app/presentation/home_page/bloc/state.dart';
|
||||||
import 'package:flutter_app/presentation/like_bloc/like_bloc.dart';
|
|
||||||
import 'package:flutter_app/presentation/like_bloc/like_events.dart';
|
|
||||||
import 'package:flutter_app/presentation/like_bloc/like_state.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_bloc.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_events.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_state.dart';
|
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import '../details_page/details_page.dart';
|
import '../details_page/details_page.dart';
|
||||||
|
|
||||||
@ -50,7 +42,6 @@ class _BodyState extends State<Body> {
|
|||||||
void initState() {
|
void initState() {
|
||||||
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);
|
||||||
|
|
||||||
@ -82,56 +73,24 @@ 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: [
|
||||||
Row(
|
Padding(
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
flex: 4,
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.all(12),
|
padding: const EdgeInsets.all(12),
|
||||||
child: CupertinoSearchTextField(
|
child: CupertinoSearchTextField(
|
||||||
controller: searchController,
|
controller: searchController,
|
||||||
placeholder: context.locale.search,
|
|
||||||
onChanged: (search) {
|
onChanged: (search) {
|
||||||
Debounce.run(() => context
|
Debounce.run(() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
|
||||||
.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()
|
||||||
: BlocBuilder<LikeBloc, LikeState>(
|
: Expanded(
|
||||||
builder: (context, likeState) {
|
|
||||||
return Expanded(
|
|
||||||
child: RefreshIndicator(
|
child: RefreshIndicator(
|
||||||
onRefresh: _onRefresh,
|
onRefresh: _onRefresh,
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
@ -143,16 +102,14 @@ class _BodyState extends State<Body> {
|
|||||||
return data != null
|
return data != null
|
||||||
? _Card.fromData(
|
? _Card.fromData(
|
||||||
data,
|
data,
|
||||||
onLike: _onLike,
|
onLike: (title, isLiked) =>
|
||||||
isLiked: likeState.likedIds?.contains(data.id.toString()) == true,
|
_showSnackBar(context, title, isLiked),
|
||||||
onTap: () => _navToDetails(context, data),
|
onTap: () => _navToDetails(context, data),
|
||||||
)
|
)
|
||||||
: const SizedBox.shrink();
|
: const SizedBox.shrink();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
|
||||||
}
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
BlocBuilder<HomeBloc, HomeState>(
|
BlocBuilder<HomeBloc, HomeState>(
|
||||||
@ -181,20 +138,12 @@ 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 ? context.locale.disliked : context.locale.liked}',
|
'$title ${isLiked ? 'liked!' : 'disliked :('}',
|
||||||
style: const TextStyle(color: Colors.white),
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
),
|
),
|
||||||
backgroundColor: const Color.fromARGB(255, 20, 40, 150),
|
backgroundColor: Colors.brown.shade300,
|
||||||
duration: const Duration(seconds: 1),
|
duration: const Duration(seconds: 1),
|
||||||
));
|
));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onLike(String? id, String title, bool isLiked) {
|
|
||||||
if (id != null){
|
|
||||||
context.read<LikeBloc>().add(ChangeLikeEvent(id));
|
|
||||||
_showSnackBar(context, title, isLiked);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -1,38 +0,0 @@
|
|||||||
import 'package:shared_preferences/shared_preferences.dart';
|
|
||||||
import 'package:copy_with_extension/copy_with_extension.dart';
|
|
||||||
import 'dart:async';
|
|
||||||
|
|
||||||
import 'package:flutter_app/presentation/like_bloc/like_events.dart';
|
|
||||||
import 'package:flutter_app/presentation/like_bloc/like_state.dart';
|
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
||||||
|
|
||||||
const String _likedPrefsKey = 'liked';
|
|
||||||
|
|
||||||
class LikeBloc extends Bloc<LikeEvent, LikeState> {
|
|
||||||
LikeBloc() : super(const LikeState(likedIds: [])) {
|
|
||||||
on<ChangeLikeEvent>(_onChangeLike);
|
|
||||||
on<LoadLikesEvent>(_onLoadLikes);
|
|
||||||
}
|
|
||||||
|
|
||||||
FutureOr<void> _onLoadLikes(LoadLikesEvent event, Emitter<LikeState> emit) async {
|
|
||||||
final prefs = await SharedPreferences.getInstance();
|
|
||||||
final data = prefs.getStringList(_likedPrefsKey);
|
|
||||||
|
|
||||||
emit(state.copyWith(likedIds: data));
|
|
||||||
}
|
|
||||||
|
|
||||||
FutureOr<void> _onChangeLike(ChangeLikeEvent event, Emitter<LikeState> emit) async{
|
|
||||||
final updatedList = List<String>.from(state.likedIds ?? []);
|
|
||||||
|
|
||||||
if (updatedList.contains(event.id.toString())) {
|
|
||||||
updatedList.remove(event.id.toString());
|
|
||||||
} else {
|
|
||||||
updatedList.add(event.id.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
final prefs = await SharedPreferences.getInstance();
|
|
||||||
prefs.setStringList(_likedPrefsKey, updatedList);
|
|
||||||
|
|
||||||
emit(state.copyWith(likedIds: updatedList));
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
abstract class LikeEvent {
|
|
||||||
const LikeEvent();
|
|
||||||
}
|
|
||||||
|
|
||||||
class LoadLikesEvent extends LikeEvent {
|
|
||||||
const LoadLikesEvent();
|
|
||||||
}
|
|
||||||
|
|
||||||
class ChangeLikeEvent extends LikeEvent {
|
|
||||||
final String id;
|
|
||||||
|
|
||||||
const ChangeLikeEvent(this.id);
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
import 'package:equatable/equatable.dart';
|
|
||||||
import 'package:flutter/cupertino.dart';
|
|
||||||
import 'package:copy_with_extension/copy_with_extension.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];
|
|
||||||
}
|
|
@ -1,56 +0,0 @@
|
|||||||
// 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);
|
|
||||||
}
|
|
@ -1,19 +0,0 @@
|
|||||||
import 'dart:async';
|
|
||||||
import 'dart:ui';
|
|
||||||
|
|
||||||
import 'package:flutter_app/components/locale/l10n/app_locale.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_events.dart';
|
|
||||||
import 'package:flutter_app/presentation/locale_bloc/locale_state.dart';
|
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
||||||
|
|
||||||
class LocaleBloc extends Bloc<LocaleEvent, LocaleState> {
|
|
||||||
LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) {
|
|
||||||
on<ChangeLocaleEvent>(_onChangeLocale);
|
|
||||||
}
|
|
||||||
|
|
||||||
FutureOr<void> _onChangeLocale(ChangeLocaleEvent event, Emitter<LocaleState> emit) async {
|
|
||||||
final toChange = AppLocale.supportedLocales
|
|
||||||
.firstWhere((e) => e.languageCode != state.currentLocale.languageCode);
|
|
||||||
emit(state.copyWith(currentLocale: toChange));
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,7 +0,0 @@
|
|||||||
abstract class LocaleEvent {
|
|
||||||
const LocaleEvent();
|
|
||||||
}
|
|
||||||
|
|
||||||
class ChangeLocaleEvent extends LocaleEvent {
|
|
||||||
const ChangeLocaleEvent();
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
import 'package:equatable/equatable.dart';
|
|
||||||
import 'package:flutter/cupertino.dart';
|
|
||||||
import 'package:copy_with_extension/copy_with_extension.dart';
|
|
||||||
|
|
||||||
part 'locale_state.g.dart';
|
|
||||||
|
|
||||||
@CopyWith()
|
|
||||||
class LocaleState extends Equatable {
|
|
||||||
final Locale currentLocale;
|
|
||||||
|
|
||||||
const LocaleState({required this.currentLocale});
|
|
||||||
|
|
||||||
@override
|
|
||||||
List<Object?> get props => [currentLocale];
|
|
||||||
}
|
|
@ -1,58 +0,0 @@
|
|||||||
// 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);
|
|
||||||
}
|
|
@ -5,8 +5,6 @@
|
|||||||
import FlutterMacOS
|
import FlutterMacOS
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
import shared_preferences_foundation
|
|
||||||
|
|
||||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||||
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
|
|
||||||
}
|
}
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
gen:
|
|
||||||
flutter pub run build_runner build --delete-conflicting-outputs
|
|
||||||
|
|
||||||
hello:
|
|
||||||
echo "Hello, user!"
|
|
||||||
|
|
||||||
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
|
|
@ -22,14 +22,6 @@ 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:
|
||||||
@ -142,14 +134,6 @@ 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: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "0.4.2"
|
|
||||||
clock:
|
clock:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -254,14 +238,6 @@ 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:
|
||||||
@ -291,14 +267,6 @@ 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:
|
||||||
@ -307,29 +275,11 @@ 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:
|
||||||
@ -354,14 +304,6 @@ 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:
|
||||||
@ -378,22 +320,6 @@ 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: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "4.3.0"
|
|
||||||
intl:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: intl
|
|
||||||
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "0.19.0"
|
|
||||||
io:
|
io:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -530,62 +456,6 @@ 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: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.0"
|
|
||||||
path_provider_linux:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path_provider_linux
|
|
||||||
sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "2.2.1"
|
|
||||||
path_provider_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path_provider_platform_interface
|
|
||||||
sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.2"
|
|
||||||
path_provider_windows:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path_provider_windows
|
|
||||||
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "2.3.0"
|
|
||||||
petitparser:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: petitparser
|
|
||||||
sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "6.0.2"
|
|
||||||
platform:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: platform
|
|
||||||
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "3.1.6"
|
|
||||||
plugin_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: plugin_platform_interface
|
|
||||||
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.8"
|
|
||||||
pool:
|
pool:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -626,62 +496,6 @@ 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:
|
||||||
@ -791,30 +605,6 @@ 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: "773c9522d66d523e1c7b25dfb95cc91c26a1e17b107039cfe147285e92de7878"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.14"
|
|
||||||
vector_graphics_codec:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: vector_graphics_codec
|
|
||||||
sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.12"
|
|
||||||
vector_graphics_compiler:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: vector_graphics_compiler
|
|
||||||
sha256: ab9ff38fc771e9ee1139320adbe3d18a60327370c218c60752068ebee4b49ab1
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.15"
|
|
||||||
vector_math:
|
vector_math:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -863,22 +653,6 @@ 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:
|
|
||||||
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:
|
||||||
@ -889,4 +663,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.24.0"
|
flutter: ">=3.18.0-18.0.pre.54"
|
||||||
|
@ -30,52 +30,27 @@ environment:
|
|||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|
||||||
|
|
||||||
# The following adds the Cupertino Icons font to your application.
|
|
||||||
# Use with the CupertinoIcons class for iOS style icons.
|
|
||||||
cupertino_icons: ^1.0.8
|
|
||||||
flutter_svg: 2.0.7
|
|
||||||
|
|
||||||
json_annotation: ^4.8.1
|
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
|
||||||
|
cupertino_icons: ^1.0.8
|
||||||
# BLoC
|
flutter_bloc: ^8.1.6
|
||||||
|
|
||||||
equatable: ^2.0.5
|
equatable: ^2.0.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
|
||||||
|
build_runner: ^2.4.9
|
||||||
|
json_serializable: ^6.7.1
|
||||||
|
|
||||||
# The "flutter_lints" package below contains a set of recommended lints to
|
# The "flutter_lints" package below contains a set of recommended lints to
|
||||||
# encourage good coding practices. The lint set provided by the package is
|
# encourage good coding practices. The lint set provided by the package is
|
||||||
# activated in the `analysis_options.yaml` file located at the root of your
|
# activated in the `analysis_options.yaml` file located at the root of your
|
||||||
# package. See that file for information about deactivating specific lint
|
# package. See that file for information about deactivating specific lint
|
||||||
# rules and activating additional ones.
|
# rules and activating additional ones.
|
||||||
|
|
||||||
build_runner: ^2.4.9
|
|
||||||
json_serializable: ^6.7.1
|
|
||||||
|
|
||||||
flutter_lints: ^4.0.0
|
flutter_lints: ^4.0.0
|
||||||
|
|
||||||
flutter_launcher_icons: 0.13.1
|
|
||||||
|
|
||||||
flutter_icons:
|
|
||||||
android: "ic_launcher"
|
|
||||||
ios: true
|
|
||||||
image_path: "assets/launcher.jpg"
|
|
||||||
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
|
||||||
|
|
||||||
@ -85,12 +60,8 @@ flutter:
|
|||||||
# 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.
|
||||||
generate: true
|
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|
||||||
assets:
|
|
||||||
- assets/svg/
|
|
||||||
|
|
||||||
# To add assets to your application, add an assets section, like this:
|
# To add assets to your application, add an assets section, like this:
|
||||||
# assets:
|
# assets:
|
||||||
# - images/a_dot_burr.jpeg
|
# - images/a_dot_burr.jpeg
|
||||||
|