diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..04ad12c --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,28 @@ +{ + // 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" + } + ] +} \ No newline at end of file diff --git a/flutter_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/flutter_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index f321bfd..3d10965 100644 Binary files a/flutter_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/flutter_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/flutter_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/flutter_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 7edd394..98b84f0 100644 Binary files a/flutter_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/flutter_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/flutter_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/flutter_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 50de5f2..97e9fc8 100644 Binary files a/flutter_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/flutter_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/flutter_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flutter_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index fbd5ac8..5ba4bdd 100644 Binary files a/flutter_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/flutter_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/flutter_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/flutter_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f753d60..94f4c83 100644 Binary files a/flutter_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/flutter_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/flutter_app/devtools_options.yaml b/flutter_app/devtools_options.yaml new file mode 100644 index 0000000..fa0b357 --- /dev/null +++ b/flutter_app/devtools_options.yaml @@ -0,0 +1,3 @@ +description: This file stores settings for Dart & Flutter DevTools. +documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states +extensions: diff --git a/flutter_app/ios/Runner.xcodeproj/project.pbxproj b/flutter_app/ios/Runner.xcodeproj/project.pbxproj index 38a6f19..44e7630 100644 --- a/flutter_app/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_app/ios/Runner.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -484,7 +484,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index dc9ada4..9132580 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 7353c41..06736bb 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452..4d04955 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d93..9fe4e4f 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4cd7b00..0fe0dbd 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe73094..7e4b37a 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773c..73285f5 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452..4d04955 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463..af7bcf9 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec3034..c29d428 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 0000000..3bbf22a Binary files /dev/null and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 0000000..5c2877f Binary files /dev/null and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 0000000..246160a Binary files /dev/null and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 0000000..ca99712 Binary files /dev/null and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec3034..c29d428 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea..a1a0a50 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 0000000..3d10965 Binary files /dev/null and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 0000000..5ba4bdd Binary files /dev/null and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 84ac32a..d6e67f2 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba..e68ed05 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf1..a9a31b3 100644 Binary files a/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/flutter_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/flutter_app/l10n.yaml b/flutter_app/l10n.yaml new file mode 100644 index 0000000..d26d702 --- /dev/null +++ b/flutter_app/l10n.yaml @@ -0,0 +1,6 @@ +arb-dir: l10n +template-arb-file: app_ru.arb +output-localization-file: app_locale.dart +output-dir: lib/components/locale/l10n +output-class: AppLocale +synthetic-package: false \ No newline at end of file diff --git a/flutter_app/l10n/app_en.arb b/flutter_app/l10n/app_en.arb new file mode 100644 index 0000000..a01051c --- /dev/null +++ b/flutter_app/l10n/app_en.arb @@ -0,0 +1,9 @@ +{ + "@@locale": "en", + + "search": "Search", + "liked": "liked!", + "disliked": "disliked :(", + + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" +} \ No newline at end of file diff --git a/flutter_app/l10n/app_ru.arb b/flutter_app/l10n/app_ru.arb new file mode 100644 index 0000000..c00dd02 --- /dev/null +++ b/flutter_app/l10n/app_ru.arb @@ -0,0 +1,9 @@ +{ + "@@locale": "ru", + + "search": "Поиск", + "liked": "Добавлено в понравившиеся :)", + "disliked": "Удалено из понравившегося :(", + + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" +} \ No newline at end of file diff --git a/flutter_app/lib/components/extensions/context_x.dart b/flutter_app/lib/components/extensions/context_x.dart new file mode 100644 index 0000000..8b813c2 --- /dev/null +++ b/flutter_app/lib/components/extensions/context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter_app/components/locale/l10n/app_locale.dart'; +import 'package:flutter/cupertino.dart'; + +extension LocalContextX on BuildContext { + AppLocale get locale => AppLocale.of(this)!; +} \ No newline at end of file diff --git a/flutter_app/lib/components/locale/l10n/app_locale.dart b/flutter_app/lib/components/locale/l10n/app_locale.dart new file mode 100644 index 0000000..dc004b6 --- /dev/null +++ b/flutter_app/lib/components/locale/l10n/app_locale.dart @@ -0,0 +1,165 @@ +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:intl/intl.dart' as intl; + +import 'app_locale_en.dart'; +import 'app_locale_ru.dart'; + +// ignore_for_file: type=lint + +/// Callers can lookup localized strings with an instance of AppLocale +/// returned by `AppLocale.of(context)`. +/// +/// Applications need to include `AppLocale.delegate()` in their app's +/// `localizationDelegates` list, and the locales they support in the app's +/// `supportedLocales` list. For example: +/// +/// ```dart +/// import 'l10n/app_locale.dart'; +/// +/// return MaterialApp( +/// localizationsDelegates: AppLocale.localizationsDelegates, +/// supportedLocales: AppLocale.supportedLocales, +/// home: MyApplicationHome(), +/// ); +/// ``` +/// +/// ## Update pubspec.yaml +/// +/// Please make sure to update your pubspec.yaml to include the following +/// packages: +/// +/// ```yaml +/// dependencies: +/// # Internationalization support. +/// flutter_localizations: +/// sdk: flutter +/// intl: any # Use the pinned version from flutter_localizations +/// +/// # Rest of dependencies +/// ``` +/// +/// ## iOS Applications +/// +/// iOS applications define key application metadata, including supported +/// locales, in an Info.plist file that is built into the application bundle. +/// To configure the locales supported by your app, you’ll need to edit this +/// file. +/// +/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file. +/// Then, in the Project Navigator, open the Info.plist file under the Runner +/// project’s Runner folder. +/// +/// Next, select the Information Property List item, select Add Item from the +/// Editor menu, then select Localizations from the pop-up menu. +/// +/// Select and expand the newly-created Localizations item then, for each +/// locale your application supports, add a new item and select the locale +/// you wish to add from the pop-up menu in the Value field. This list should +/// be consistent with the languages listed in the AppLocale.supportedLocales +/// property. +abstract class AppLocale { + AppLocale(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString()); + + final String localeName; + + static AppLocale? of(BuildContext context) { + return Localizations.of(context, AppLocale); + } + + static const LocalizationsDelegate delegate = _AppLocaleDelegate(); + + /// A list of this localizations delegate along with the default localizations + /// delegates. + /// + /// Returns a list of localizations delegates containing this delegate along with + /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate, + /// and GlobalWidgetsLocalizations.delegate. + /// + /// Additional delegates can be added by appending to this list in + /// MaterialApp. This list does not have to be used at all if a custom list + /// of delegates is preferred or required. + static const List> localizationsDelegates = >[ + delegate, + GlobalMaterialLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + ]; + + /// A list of this localizations delegate's supported locales. + static const List supportedLocales = [ + Locale('en'), + Locale('ru') + ]; + + /// No description provided for @search. + /// + /// In ru, this message translates to: + /// **'Поиск'** + String get search; + + /// No description provided for @liked. + /// + /// In ru, this message translates to: + /// **'Добавлено в понравившиеся :)'** + String get liked; + + /// No description provided for @disliked. + /// + /// In ru, this message translates to: + /// **'Удалено из понравившегося :('** + String get disliked; + + /// No description provided for @location. + /// + /// In ru, this message translates to: + /// **'Местоположение'** + String get location; + + /// No description provided for @species. + /// + /// In ru, this message translates to: + /// **'Вид'** + String get species; + + /// No description provided for @arbEnding. + /// + /// In ru, this message translates to: + /// **'Чтобы не забыть про отсутствие запятой :)'** + String get arbEnding; +} + +class _AppLocaleDelegate extends LocalizationsDelegate { + const _AppLocaleDelegate(); + + @override + Future load(Locale locale) { + return SynchronousFuture(lookupAppLocale(locale)); + } + + @override + bool isSupported(Locale locale) => ['en', 'ru'].contains(locale.languageCode); + + @override + bool shouldReload(_AppLocaleDelegate old) => false; +} + +AppLocale lookupAppLocale(Locale locale) { + + + // Lookup logic when only language code is specified. + switch (locale.languageCode) { + case 'en': return AppLocaleEn(); + case 'ru': return AppLocaleRu(); + } + + throw FlutterError( + 'AppLocale.delegate failed to load unsupported locale "$locale". This is likely ' + 'an issue with the localizations generation tool. Please file an issue ' + 'on GitHub with a reproducible sample app and the gen-l10n configuration ' + 'that was used.' + ); +} diff --git a/flutter_app/lib/components/locale/l10n/app_locale_en.dart b/flutter_app/lib/components/locale/l10n/app_locale_en.dart new file mode 100644 index 0000000..8c0b4d3 --- /dev/null +++ b/flutter_app/lib/components/locale/l10n/app_locale_en.dart @@ -0,0 +1,26 @@ +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 location => 'Местоположение'; + + @override + String get species => 'Вид'; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} diff --git a/flutter_app/lib/components/locale/l10n/app_locale_ru.dart b/flutter_app/lib/components/locale/l10n/app_locale_ru.dart new file mode 100644 index 0000000..309e9df --- /dev/null +++ b/flutter_app/lib/components/locale/l10n/app_locale_ru.dart @@ -0,0 +1,26 @@ +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 location => 'Location'; + + @override + String get species => 'Species'; + + @override + String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; +} diff --git a/flutter_app/lib/components/utils/debounce.dart b/flutter_app/lib/components/utils/debounce.dart index b4e1f35..6e1c470 100644 --- a/flutter_app/lib/components/utils/debounce.dart +++ b/flutter_app/lib/components/utils/debounce.dart @@ -10,11 +10,11 @@ class Debounce { static Timer? _timer; - static void run ( - VoidCallback action, { - Duration delay = const Duration(milliseconds: 500), - }) { + static void run( + VoidCallback action, { + Duration delay = const Duration(milliseconds: 500), + }) { _timer?.cancel(); _timer = Timer(delay, action); } -} \ No newline at end of file +} diff --git a/flutter_app/lib/data/dtos/thrones_character_dto.dart b/flutter_app/lib/data/dtos/thrones_character_dto.dart index 277f44a..942ee60 100644 --- a/flutter_app/lib/data/dtos/thrones_character_dto.dart +++ b/flutter_app/lib/data/dtos/thrones_character_dto.dart @@ -24,5 +24,6 @@ class ThronesCharacterDto { required this.imageUrl, }); - factory ThronesCharacterDto.fromJson(Map json) => _$ThronesCharacterDtoFromJson(json); -} \ No newline at end of file + factory ThronesCharacterDto.fromJson(Map json) => + _$ThronesCharacterDtoFromJson(json); +} diff --git a/flutter_app/lib/data/mappers/characters_mapper.dart b/flutter_app/lib/data/mappers/characters_mapper.dart index 9910fac..9debd36 100644 --- a/flutter_app/lib/data/mappers/characters_mapper.dart +++ b/flutter_app/lib/data/mappers/characters_mapper.dart @@ -7,23 +7,25 @@ const _imagePlaceholder = extension ThronesCharacterDtoToModel on ThronesCharacterDto { CardData toDomain() => CardData( - descriptionText: _makeDescriptionText(title, family), - firstName: firstName, - lastName: lastName, - title: title, - family: family, - fullName: fullName, - imageUrl: imageUrl, - text: '', - ); + descriptionText: _makeDescriptionText(title, family), + firstName: firstName, + lastName: lastName, + title: title, + family: family, + fullName: fullName, + imageUrl: imageUrl, + text: '', + speciesText: species ?? 'unknown', + locationText: location?.name ?? 'unknown', + ); String _makeDescriptionText(String? title, String? family) { return title != null && family != null ? '$title of $family' : title != null - ? 'Title: $title' - : family != null - ? 'Family: $family' - : ''; + ? 'Title: $title' + : family != null + ? 'Family: $family' + : ''; } } diff --git a/flutter_app/lib/data/repositories/api_interface.dart b/flutter_app/lib/data/repositories/api_interface.dart index 2edb0ef..217b472 100644 --- a/flutter_app/lib/data/repositories/api_interface.dart +++ b/flutter_app/lib/data/repositories/api_interface.dart @@ -5,4 +5,4 @@ typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { Future loadData({OnErrorCallback? onError}); -} \ No newline at end of file +} diff --git a/flutter_app/lib/data/repositories/got_repository.dart b/flutter_app/lib/data/repositories/got_repository.dart index 4964cb4..929ea7f 100644 --- a/flutter_app/lib/data/repositories/got_repository.dart +++ b/flutter_app/lib/data/repositories/got_repository.dart @@ -20,14 +20,15 @@ class ThronesRepository extends ApiInterface { try { const String url = '$_baseUrl/api/v2/Characters'; - final Response response = await _dio.get>(url); + final Response response = await _dio.get>(url); final List characters = (response.data as List) .map((e) => ThronesCharacterDto.fromJson(e as Map)) .toList(); final List data = characters - .where((character) => q == null || character.fullName.toLowerCase().contains(q.toLowerCase())) + .where((character) => + q == null || character.fullName.toLowerCase().contains(q.toLowerCase())) .map((e) => e.toDomain()) .toList(); @@ -42,4 +43,4 @@ class ThronesRepository extends ApiInterface { return null; } } -} \ No newline at end of file +} diff --git a/flutter_app/lib/data/repositories/mock_repository.dart b/flutter_app/lib/data/repositories/mock_repository.dart index 113e1ff..b4197a5 100644 --- a/flutter_app/lib/data/repositories/mock_repository.dart +++ b/flutter_app/lib/data/repositories/mock_repository.dart @@ -11,7 +11,7 @@ import 'package:flutter_app/domain/models/card.dart'; // descriptionText: 'Mother of Dragons', // icon: Icons.favorite, // imageUrl: -// 'https://thronesapi.com/assets/images/daenerys.jpg', +// 'https://thronesapi.com/assets/images/daenerys.jpg', // text: '', firstName: '', lastName: '', title: '', family: '', // ), // CardData( @@ -72,4 +72,4 @@ import 'package:flutter_app/domain/models/card.dart'; // ), // ]; // } -// } \ No newline at end of file +// } diff --git a/flutter_app/lib/domain/models/card.dart b/flutter_app/lib/domain/models/card.dart index 76301a3..91e612b 100644 --- a/flutter_app/lib/domain/models/card.dart +++ b/flutter_app/lib/domain/models/card.dart @@ -10,6 +10,9 @@ class CardData { final String? fullName; final String? title; final String? family; + final int? id; + final String locationText; + final String speciesText; CardData({ required this.text, @@ -21,5 +24,8 @@ class CardData { required this.fullName, required this.title, required this.family, + this.id, + required this.locationText, + required this.speciesText, }); -} \ No newline at end of file +} diff --git a/flutter_app/lib/domain/models/home.dart b/flutter_app/lib/domain/models/home.dart index 8898182..ba8c472 100644 --- a/flutter_app/lib/domain/models/home.dart +++ b/flutter_app/lib/domain/models/home.dart @@ -5,4 +5,4 @@ class HomeData { final int? nextPage; HomeData({required this.data, this.nextPage}); -} \ No newline at end of file +} diff --git a/flutter_app/lib/main.dart b/flutter_app/lib/main.dart index 5643e54..a61e127 100644 --- a/flutter_app/lib/main.dart +++ b/flutter_app/lib/main.dart @@ -1,7 +1,12 @@ import 'package:flutter/material.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/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_app/components/locale/l10n/app_locale.dart'; import 'presentation/home_page/home_page.dart'; void main() { @@ -11,23 +16,54 @@ void main() { class MyApp extends StatelessWidget { const MyApp({super.key}); - @override + @override Widget build(BuildContext context) { - return MaterialApp( - title: '7 Kingdoms', - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: const Color.fromARGB(255, 20, 40, 150)), - useMaterial3: true, + // return MaterialApp( + // title: '7 Kingdoms', + // theme: ThemeData( + // colorScheme: ColorScheme.fromSeed(seedColor: const Color.fromARGB(255, 20, 40, 150)), + // useMaterial3: true, + // ), + // home: RepositoryProvider( + // lazy: true, + // create: (_) => ThronesRepository(), + // child: BlocProvider( + // lazy: false, + // create: (context) => HomeBloc(context.read()), + // child: const MyHomePage(title: '7 Kingdoms'), + // ), + // )); + + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc((Locale(Platform.localeName))), + child: BlocBuilder( + builder: (context, state) { + return MaterialApp( + title: '7 Kingdoms', + locale: state.currentLocale, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + debugShowCheckedModeBanner: false, + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: const Color.fromARGB(255, 20, 40, 150)), + useMaterial3: true, + ), + home: RepositoryProvider( + lazy: true, + create: (_) => ThronesRepository(), + child: BlocProvider( + lazy: false, + create: (context) => LikeBloc(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage(title: "Федоренко Галина Юрьевна"), + ), + ), + )); + } ), - home: RepositoryProvider( - lazy: true, - create: (_) => ThronesRepository(), - child: BlocProvider( - lazy: false, - create: (context) => HomeBloc(context.read()), - child: const MyHomePage(title: '7 Kingdoms'), - ), - ) ); } } diff --git a/flutter_app/lib/presentation/common/svg_object.dart b/flutter_app/lib/presentation/common/svg_object.dart new file mode 100644 index 0000000..6e12729 --- /dev/null +++ b/flutter_app/lib/presentation/common/svg_object.dart @@ -0,0 +1,34 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:flutter_app/components/resources.g.dart'; + +abstract class SvgObjects { + static void init() { + final pics = [ + R.ASSETS_SVG_FLAG_GB_SVGREPO_COM_SVG, + R.ASSETS_SVG_FLAG_RU_SVGREPO_COM_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_FLAG_RU_SVGREPO_COM_SVG); + } +} + +class SvgUk extends StatelessWidget { + const SvgUk({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_FLAG_GB_SVGREPO_COM_SVG); + } +} diff --git a/flutter_app/lib/presentation/details_page/details_page.dart b/flutter_app/lib/presentation/details_page/details_page.dart index e9a4c64..23e0590 100644 --- a/flutter_app/lib/presentation/details_page/details_page.dart +++ b/flutter_app/lib/presentation/details_page/details_page.dart @@ -35,17 +35,17 @@ class DetailsPage extends StatelessWidget { child: Text( data.fullName ?? 'Default Name', style: Theme.of(context).textTheme.bodyLarge?.copyWith( - fontSize: 27.0, - fontFamily: 'Times New Roman', - ), + fontSize: 27.0, + fontFamily: 'Times New Roman', + ), ), ), Text( data.descriptionText, style: Theme.of(context).textTheme.bodyLarge?.copyWith( - fontSize: 20.0, - fontFamily: 'Times New Roman', - ), + fontSize: 20.0, + fontFamily: 'Times New Roman', + ), ), const SizedBox(height: 16.0), Text( @@ -74,4 +74,4 @@ class DetailsPage extends StatelessWidget { ), ); } -} \ No newline at end of file +} diff --git a/flutter_app/lib/presentation/home_page/bloc/bloc.dart b/flutter_app/lib/presentation/home_page/bloc/bloc.dart index 8245b5c..f068dcb 100644 --- a/flutter_app/lib/presentation/home_page/bloc/bloc.dart +++ b/flutter_app/lib/presentation/home_page/bloc/bloc.dart @@ -36,4 +36,4 @@ class HomeBloc extends Bloc { error: error, )); } -} \ No newline at end of file +} diff --git a/flutter_app/lib/presentation/home_page/bloc/events.dart b/flutter_app/lib/presentation/home_page/bloc/events.dart index 4cd4a6b..cefba70 100644 --- a/flutter_app/lib/presentation/home_page/bloc/events.dart +++ b/flutter_app/lib/presentation/home_page/bloc/events.dart @@ -6,5 +6,5 @@ class HomeLoadDataEvent extends HomeEvent { final String? search; final int? nextPage; - const HomeLoadDataEvent({this.search, this.nextPage}); -} \ No newline at end of file + const HomeLoadDataEvent({this.search, this.nextPage}); +} diff --git a/flutter_app/lib/presentation/home_page/card.dart b/flutter_app/lib/presentation/home_page/card.dart index 44df693..31483fb 100644 --- a/flutter_app/lib/presentation/home_page/card.dart +++ b/flutter_app/lib/presentation/home_page/card.dart @@ -1,8 +1,8 @@ part of 'home_page.dart'; -typedef OnLikeCallback = void Function(String title, bool isLiked)?; +typedef OnLikeCallback = void Function(int? id, String title, bool isLiked)?; -class _Card extends StatefulWidget { +class _Card extends StatelessWidget { final String text; final String descriptionText; final String? fullName; @@ -10,22 +10,27 @@ class _Card extends StatefulWidget { final String? imageUrl; final OnLikeCallback onLike; final VoidCallback? onTap; + final int? id; + final bool isLiked; const _Card( - this.text, { - this.icon = Icons.catching_pokemon, - required this.descriptionText, - required this.fullName, - this.imageUrl, - this.onLike, - this.onTap, - }); + this.text, { + this.icon = Icons.catching_pokemon, + required this.descriptionText, + required this.fullName, + this.imageUrl, + this.onLike, + this.onTap, + this.id, + this.isLiked = false, + }); factory _Card.fromData( - CardData data, { - OnLikeCallback onLike, - VoidCallback? onTap, - }) => + CardData data, { + OnLikeCallback onLike, + VoidCallback? onTap, + bool isLiked = false, + }) => _Card( data.text, descriptionText: data.descriptionText, @@ -34,19 +39,14 @@ class _Card extends StatefulWidget { imageUrl: data.imageUrl, onLike: onLike, onTap: onTap, + isLiked: isLiked, + id: data.id, ); - @override - State<_Card> createState() => _CardState(); -} - -class _CardState extends State<_Card> { - bool isLiked = false; - @override Widget build(BuildContext context) { return GestureDetector( - onTap: widget.onTap, + onTap: onTap, child: Card( margin: const EdgeInsets.all(8.0), child: Column( @@ -58,7 +58,7 @@ class _CardState extends State<_Card> { height: 250, width: double.infinity, child: Image.network( - widget.imageUrl ?? '', + imageUrl ?? '', fit: BoxFit.cover, errorBuilder: (_, __, ___) => const Placeholder(), ), @@ -70,14 +70,14 @@ class _CardState extends State<_Card> { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - widget.fullName ?? 'Default Name', + fullName ?? 'Default Name', style: Theme.of(context).textTheme.bodyLarge?.copyWith( - fontSize: 20.0, - fontFamily: 'Times New Roman', - ), + fontSize: 20.0, + fontFamily: 'Times New Roman', + ), ), Text( - widget.descriptionText, + descriptionText, style: Theme.of(context).textTheme.bodyMedium, ), ], @@ -92,12 +92,7 @@ class _CardState extends State<_Card> { bottom: 16.0, ), child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - widget.onLike?.call(widget.fullName ?? 'Default Name', isLiked); - }, + onTap: () => onLike?.call(id, text, isLiked), child: AnimatedSwitcher( duration: const Duration(milliseconds: 300), child: isLiked @@ -119,4 +114,4 @@ class _CardState extends State<_Card> { ), ); } -} \ No newline at end of file +} diff --git a/flutter_app/lib/presentation/home_page/home_page.dart b/flutter_app/lib/presentation/home_page/home_page.dart index 6e14671..8f647f2 100644 --- a/flutter_app/lib/presentation/home_page/home_page.dart +++ b/flutter_app/lib/presentation/home_page/home_page.dart @@ -1,11 +1,19 @@ import 'package:flutter/cupertino.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/data/repositories/got_repository.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/events.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 '../details_page/details_page.dart'; @@ -42,6 +50,7 @@ class _BodyState extends State { void initState() { WidgetsBinding.instance.addPostFrameCallback((_) { context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); }); scrollController.addListener(_onNextPageListener); @@ -73,44 +82,78 @@ class _BodyState extends State { padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top), child: Column( children: [ - Padding( - padding: const EdgeInsets.all(12), - child: CupertinoSearchTextField( - controller: searchController, - onChanged: (search) { - Debounce.run(() => context.read().add(HomeLoadDataEvent(search: search))); - }, - ), - ), - BlocBuilder( - builder: (context, state) => state.error != null - ? Text( - state.error ?? '', - style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), - ) - : state.isLoading - ? const CircularProgressIndicator() - : Expanded( - child: RefreshIndicator( - onRefresh: _onRefresh, - child: ListView.builder( - controller: scrollController, - padding: EdgeInsets.zero, - itemCount: state.data?.data?.length ?? 0, - itemBuilder: (context, index) { - final data = state.data?.data?[index]; - return data != null - ? _Card.fromData( - data, - onLike: (title, isLiked) => - _showSnackBar(context, title, isLiked), - onTap: () => _navToDetails(context, data), - ) - : const SizedBox.shrink(); - }, + Row( + children: [ + Expanded( + flex: 4, + child: Padding( + padding: const EdgeInsets.all(12), + child: CupertinoSearchTextField( + controller: searchController, + placeholder: context.locale.search, + onChanged: (search) { + Debounce.run(() => context + .read() + .add(HomeLoadDataEvent(search: search))); + }, + ), ), ), - ), + GestureDetector( + onTap: () => + context.read().add(const ChangeLocaleEvent()), + child: SizedBox.square( + dimension: 50, + child: Padding( + padding: const EdgeInsets.only(right: 12), + child: BlocBuilder( + builder: (context, state) { + return state.currentLocale.languageCode == 'ru' + ? const SvgRu() + : const SvgUk(); + } + ), + ), + ), + ) + ], + ), + BlocBuilder( + builder: (context, state) => state.error != null + ? Text( + state.error ?? '', + style: Theme.of(context) + .textTheme + .headlineSmall + ?.copyWith(color: Colors.red), + ) + : state.isLoading + ? const CircularProgressIndicator() + : BlocBuilder( + builder: (context, likeState) { + return Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.builder( + controller: scrollController, + padding: EdgeInsets.zero, + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + return data != null + ? _Card.fromData( + data, + onLike: _onLike, + isLiked: likeState.likedIds?.contains(data.id) == true, + onTap: () => _navToDetails(context, data), + ) + : const SizedBox.shrink(); + }, + ), + ), + ); + } + ), ), BlocBuilder( builder: (context, state) => state.isPaginationLoading @@ -138,7 +181,7 @@ class _BodyState extends State { WidgetsBinding.instance.addPostFrameCallback((_) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( - '$title ${isLiked ? 'liked!' : 'disliked :('}', + '$title ${isLiked ? context.locale.liked : context.locale.disliked}', style: Theme.of(context).textTheme.bodyLarge, ), backgroundColor: Colors.brown.shade300, @@ -146,4 +189,12 @@ class _BodyState extends State { )); }); } -} \ No newline at end of file + + void _onLike(int? id, String title, bool isLiked) { + if (id != null){ + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, title, isLiked); + + } + } +} diff --git a/flutter_app/lib/presentation/like_bloc/like_bloc.dart b/flutter_app/lib/presentation/like_bloc/like_bloc.dart new file mode 100644 index 0000000..23a80ca --- /dev/null +++ b/flutter_app/lib/presentation/like_bloc/like_bloc.dart @@ -0,0 +1,41 @@ +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 { + LikeBloc() : super(const LikeState(likedIds: [])) { + on(_onChangeLike); + on(_onLoadLikes); + } + + FutureOr _onLoadLikes(LoadLikesEvent event, Emitter emit) async { + final prefs = await SharedPreferences.getInstance(); + final data = prefs.getStringList(_likedPrefsKey); + + emit(state.copyWith(likedIds: data)); + } + + FutureOr _onChangeLike(ChangeLikeEvent event, Emitter emit) async{ + final updatedListInt = List.from(state.likedIds ?? []); + print(updatedListInt); + final updatedList = updatedListInt.map((int number) => number.toString()).toList(); + print(updatedList); + + 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)); + } +} \ No newline at end of file diff --git a/flutter_app/lib/presentation/like_bloc/like_events.dart b/flutter_app/lib/presentation/like_bloc/like_events.dart new file mode 100644 index 0000000..32db4da --- /dev/null +++ b/flutter_app/lib/presentation/like_bloc/like_events.dart @@ -0,0 +1,13 @@ +abstract class LikeEvent { + const LikeEvent(); +} + +class LoadLikesEvent extends LikeEvent { + const LoadLikesEvent(); +} + +class ChangeLikeEvent extends LikeEvent { + final int id; + + const ChangeLikeEvent(this.id); +} \ No newline at end of file diff --git a/flutter_app/lib/presentation/like_bloc/like_state.dart b/flutter_app/lib/presentation/like_bloc/like_state.dart new file mode 100644 index 0000000..5cc73e7 --- /dev/null +++ b/flutter_app/lib/presentation/like_bloc/like_state.dart @@ -0,0 +1,15 @@ +import 'package:equatable/equatable.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:copy_with_extension/copy_with_extension.dart'; + +part 'like_state.g.dart'; + +@CopyWith() +class LikeState extends Equatable { + final List? likedIds; + + const LikeState({required this.likedIds}); + + @override + List get props => [likedIds]; +} \ No newline at end of file diff --git a/flutter_app/lib/presentation/like_bloc/like_state.g.dart b/flutter_app/lib/presentation/like_bloc/like_state.g.dart new file mode 100644 index 0000000..0888cf2 --- /dev/null +++ b/flutter_app/lib/presentation/like_bloc/like_state.g.dart @@ -0,0 +1,56 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'like_state.dart'; + +// ************************************************************************** +// CopyWithGenerator +// ************************************************************************** + +abstract class _$LikeStateCWProxy { + LikeState likedIds(List? likedIds); + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// LikeState(...).copyWith(id: 12, name: "My name") + /// ```` + LikeState call({ + List? likedIds, + }); +} + +/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLikeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLikeState.copyWith.fieldName(...)` +class _$LikeStateCWProxyImpl implements _$LikeStateCWProxy { + const _$LikeStateCWProxyImpl(this._value); + + final LikeState _value; + + @override + LikeState likedIds(List? likedIds) => this(likedIds: likedIds); + + @override + + /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. + /// + /// Usage + /// ```dart + /// LikeState(...).copyWith(id: 12, name: "My name") + /// ```` + LikeState call({ + Object? likedIds = const $CopyWithPlaceholder(), + }) { + return LikeState( + likedIds: likedIds == const $CopyWithPlaceholder() + ? _value.likedIds + // ignore: cast_nullable_to_non_nullable + : likedIds as List?, + ); + } +} + +extension $LikeStateCopyWith on LikeState { + /// Returns a callable class that can be used as follows: `instanceOfLikeState.copyWith(...)` or like so:`instanceOfLikeState.copyWith.fieldName(...)`. + // ignore: library_private_types_in_public_api + _$LikeStateCWProxy get copyWith => _$LikeStateCWProxyImpl(this); +} diff --git a/flutter_app/lib/presentation/locale_bloc/locale_bloc.dart b/flutter_app/lib/presentation/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..fe14490 --- /dev/null +++ b/flutter_app/lib/presentation/locale_bloc/locale_bloc.dart @@ -0,0 +1,19 @@ +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 { + LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) { + on(_onChangeLocale); + } + + FutureOr _onChangeLocale(ChangeLocaleEvent event, Emitter emit) async { + final toChange = AppLocale.supportedLocales + .firstWhere((e) => e.languageCode != state.currentLocale.languageCode); + emit(state.copyWith(currentLocale: toChange)); + } +} \ No newline at end of file diff --git a/flutter_app/lib/presentation/locale_bloc/locale_events.dart b/flutter_app/lib/presentation/locale_bloc/locale_events.dart new file mode 100644 index 0000000..f345ef9 --- /dev/null +++ b/flutter_app/lib/presentation/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent { + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent { + const ChangeLocaleEvent(); +} \ No newline at end of file diff --git a/flutter_app/lib/presentation/locale_bloc/locale_state.dart b/flutter_app/lib/presentation/locale_bloc/locale_state.dart new file mode 100644 index 0000000..9c26abe --- /dev/null +++ b/flutter_app/lib/presentation/locale_bloc/locale_state.dart @@ -0,0 +1,15 @@ +import 'package:equatable/equatable.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:copy_with_extension/copy_with_extension.dart'; + +part 'locale_state.g.dart'; + +@CopyWith() +class LocaleState extends Equatable { + final Locale currentLocale; + + const LocaleState({required this.currentLocale}); + + @override + List get props => [currentLocale]; +} \ No newline at end of file diff --git a/flutter_app/lib/presentation/locale_bloc/locale_state.g.dart b/flutter_app/lib/presentation/locale_bloc/locale_state.g.dart new file mode 100644 index 0000000..e374db6 --- /dev/null +++ b/flutter_app/lib/presentation/locale_bloc/locale_state.g.dart @@ -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); +} diff --git a/flutter_app/macos/Flutter/GeneratedPluginRegistrant.swift b/flutter_app/macos/Flutter/GeneratedPluginRegistrant.swift index cccf817..724bb2a 100644 --- a/flutter_app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/flutter_app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,8 @@ import FlutterMacOS import Foundation +import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/flutter_app/makefile b/flutter_app/makefile new file mode 100644 index 0000000..ae69000 --- /dev/null +++ b/flutter_app/makefile @@ -0,0 +1,21 @@ +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 \ No newline at end of file diff --git a/flutter_app/pubspec.lock b/flutter_app/pubspec.lock index 66c079e..fbd4d3d 100644 --- a/flutter_app/pubspec.lock +++ b/flutter_app/pubspec.lock @@ -22,6 +22,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.7.0" + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" args: dependency: transitive description: @@ -134,6 +142,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" + source: hosted + version: "0.4.2" clock: dependency: transitive description: @@ -238,6 +254,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" file: dependency: transitive description: @@ -267,6 +291,14 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.6" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -275,11 +307,29 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" + source: hosted + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" frontend_server_client: dependency: transitive description: @@ -304,6 +354,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + http: + dependency: transitive + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -320,6 +378,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + url: "https://pub.dev" + source: hosted + version: "4.3.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + url: "https://pub.dev" + source: hosted + version: "0.19.0" io: dependency: transitive description: @@ -456,6 +530,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" pool: dependency: transitive description: @@ -496,6 +626,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" + source: hosted + version: "2.2.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "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: dependency: transitive description: @@ -605,6 +791,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "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: dependency: transitive description: @@ -653,6 +863,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" yaml: dependency: transitive description: @@ -663,4 +889,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.3 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.24.0" diff --git a/flutter_app/pubspec.yaml b/flutter_app/pubspec.yaml index 0f29eaf..83e4e8e 100644 --- a/flutter_app/pubspec.yaml +++ b/flutter_app/pubspec.yaml @@ -37,19 +37,35 @@ dependencies: flutter_bloc: ^8.1.6 equatable: ^2.0.5 copy_with_extension_gen: ^5.0.4 + flutter_svg: 2.0.7 + flutter_localizations: + sdk: flutter + intl: ^0.19.0 + shared_preferences: 2.2.3 dev_dependencies: flutter_test: sdk: flutter + build_runner: ^2.4.9 json_serializable: ^6.7.1 + flutter_lints: ^4.0.0 + + flutter_launcher_icons: 0.13.1 + +flutter_icons: + android: "ic_launcher" + ios: true + image_path: "assets/icon.jpg" + min_sdk_android: 11 + # The "flutter_lints" package below contains a set of recommended lints to # 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 # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^4.0.0 + # flutter_lints: ^4.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec @@ -92,3 +108,6 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/to/font-from-package + generate: true + assets: + - assets/svg/