Merge pull request 'course_work' (#3) from course_work into master

Reviewed-on: #3

Makefile

@@ -0,0 +1,22 @@
+gen:
+	flutter pub run build_runner build --delete-conflicting-outputs
+
+icon:
+    flutter pub run flutter_launcher_icons:main
+
+init_res:
+	dart pub global activate flutter_asset_generator
+
+format:
+	dart format . --line-length 100
+
+activate_fgen:
+	flutter pub global activate fgen
+
+res:
+	fgen --output lib/components/resources.g.dart --no-watch --no-preview; \
+    make format
+
+loc:
+	flutter gen-l10n && \
+	make format

assets/svg/ru.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 -4 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_503_2726)">
+<rect x="0.25" y="0.25" width="27.5" height="19.5" rx="1.75" fill="white" stroke="#F5F5F5" stroke-width="0.5"/>
+<mask id="mask0_503_2726" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="28" height="20">
+<rect x="0.25" y="0.25" width="27.5" height="19.5" rx="1.75" fill="white" stroke="white" stroke-width="0.5"/>
+</mask>
+<g mask="url(#mask0_503_2726)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13.3333H28V6.66667H0V13.3333Z" fill="#0C47B7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 20H28V13.3333H0V20Z" fill="#E53B35"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_503_2726">
+<rect width="28" height="20" rx="2" fill="white"/>
+</clipPath>
+</defs>
+</svg>

assets/svg/uk.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--twemoji" preserveAspectRatio="xMidYMid meet"><path fill="#00247D" d="M0 9.059V13h5.628zM4.664 31H13v-5.837zM23 25.164V31h8.335zM0 23v3.941L5.63 23zM31.337 5H23v5.837zM36 26.942V23h-5.631zM36 13V9.059L30.371 13zM13 5H4.664L13 10.837z"></path><path fill="#CF1B2B" d="M25.14 23l9.712 6.801a3.977 3.977 0 0 0 .99-1.749L28.627 23H25.14zM13 23h-2.141l-9.711 6.8c.521.53 1.189.909 1.938 1.085L13 23.943V23zm10-10h2.141l9.711-6.8a3.988 3.988 0 0 0-1.937-1.085L23 12.057V13zm-12.141 0L1.148 6.2a3.994 3.994 0 0 0-.991 1.749L7.372 13h3.487z"></path><path fill="#EEE" d="M36 21H21v10h2v-5.836L31.335 31H32a3.99 3.99 0 0 0 2.852-1.199L25.14 23h3.487l7.215 5.052c.093-.337.158-.686.158-1.052v-.058L30.369 23H36v-2zM0 21v2h5.63L0 26.941V27c0 1.091.439 2.078 1.148 2.8l9.711-6.8H13v.943l-9.914 6.941c.294.07.598.116.914.116h.664L13 25.163V31h2V21H0zM36 9a3.983 3.983 0 0 0-1.148-2.8L25.141 13H23v-.943l9.915-6.942A4.001 4.001 0 0 0 32 5h-.663L23 10.837V5h-2v10h15v-2h-5.629L36 9.059V9zM13 5v5.837L4.664 5H4a3.985 3.985 0 0 0-2.852 1.2l9.711 6.8H7.372L.157 7.949A3.968 3.968 0 0 0 0 9v.059L5.628 13H0v2h15V5h-2z"></path><path fill="#CF1B2B" d="M21 15V5h-6v10H0v6h15v10h6V21h15v-6z"></path></svg>

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

l10n/app_en.arb

@@ -0,0 +1,7 @@
+{
+  "@@locale": "en",
+  "search": "Search",
+  "liked": "liked!",
+  "disliked": "disliked :(",
+  "arbEnding": "Чтобы не забыть про отсутствие запятой :)"
+}

l10n/app_ru.arb

@@ -0,0 +1,7 @@
+{
+  "@@locale": "ru",
+  "search": "Поиск",
+  "liked": "понравился!",
+  "disliked": "разонравился :(",
+  "arbEnding": "Чтобы не забыть про отсутствие запятой :)"
+}

lib/components/extensions/context_x.dart

@@ -0,0 +1,6 @@
+import 'package:flutter/widgets.dart';
+import 'package:pmd_lab/components/locale/l10n/app_locale.dart';
+
+extension LocalContextX on BuildContext {
+  AppLocale get locale => AppLocale.of(this)!;
+}

lib/components/locale/l10n/app_locale.dart

@@ -0,0 +1,153 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:intl/intl.dart' as intl;
+
+import 'app_locale_en.dart';
+import 'app_locale_ru.dart';
+
+// ignore_for_file: type=lint
+
+/// Callers can lookup localized strings with an instance of AppLocale
+/// returned by `AppLocale.of(context)`.
+///
+/// Applications need to include `AppLocale.delegate()` in their app's
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
+///
+/// ```dart
+/// import 'l10n/app_locale.dart';
+///
+/// return MaterialApp(
+///   localizationsDelegates: AppLocale.localizationsDelegates,
+///   supportedLocales: AppLocale.supportedLocales,
+///   home: MyApplicationHome(),
+/// );
+/// ```
+///
+/// ## Update pubspec.yaml
+///
+/// Please make sure to update your pubspec.yaml to include the following
+/// packages:
+///
+/// ```yaml
+/// dependencies:
+///   # Internationalization support.
+///   flutter_localizations:
+///     sdk: flutter
+///   intl: any # Use the pinned version from flutter_localizations
+///
+///   # Rest of dependencies
+/// ```
+///
+/// ## iOS Applications
+///
+/// iOS applications define key application metadata, including supported
+/// locales, in an Info.plist file that is built into the application bundle.
+/// To configure the locales supported by your app, you’ll need to edit this
+/// file.
+///
+/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
+/// Then, in the Project Navigator, open the Info.plist file under the Runner
+/// project’s Runner folder.
+///
+/// Next, select the Information Property List item, select Add Item from the
+/// Editor menu, then select Localizations from the pop-up menu.
+///
+/// Select and expand the newly-created Localizations item then, for each
+/// locale your application supports, add a new item and select the locale
+/// you wish to add from the pop-up menu in the Value field. This list should
+/// be consistent with the languages listed in the AppLocale.supportedLocales
+/// property.
+abstract class AppLocale {
+  AppLocale(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+
+  final String localeName;
+
+  static AppLocale? of(BuildContext context) {
+    return Localizations.of<AppLocale>(context, AppLocale);
+  }
+
+  static const LocalizationsDelegate<AppLocale> delegate = _AppLocaleDelegate();
+
+  /// A list of this localizations delegate along with the default localizations
+  /// delegates.
+  ///
+  /// Returns a list of localizations delegates containing this delegate along with
+  /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
+  /// and GlobalWidgetsLocalizations.delegate.
+  ///
+  /// Additional delegates can be added by appending to this list in
+  /// MaterialApp. This list does not have to be used at all if a custom list
+  /// of delegates is preferred or required.
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
+    delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+  ];
+
+  /// A list of this localizations delegate's supported locales.
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('en'),
+    Locale('ru')
+  ];
+
+  /// No description provided for @search.
+  ///
+  /// In ru, this message translates to:
+  /// **'Поиск'**
+  String get search;
+
+  /// No description provided for @liked.
+  ///
+  /// In ru, this message translates to:
+  /// **'понравился!'**
+  String get liked;
+
+  /// No description provided for @disliked.
+  ///
+  /// In ru, this message translates to:
+  /// **'разонравился :('**
+  String get disliked;
+
+  /// No description provided for @arbEnding.
+  ///
+  /// In ru, this message translates to:
+  /// **'Чтобы не забыть про отсутствие запятой :)'**
+  String get arbEnding;
+}
+
+class _AppLocaleDelegate extends LocalizationsDelegate<AppLocale> {
+  const _AppLocaleDelegate();
+
+  @override
+  Future<AppLocale> load(Locale locale) {
+    return SynchronousFuture<AppLocale>(lookupAppLocale(locale));
+  }
+
+  @override
+  bool isSupported(Locale locale) => <String>['en', 'ru'].contains(locale.languageCode);
+
+  @override
+  bool shouldReload(_AppLocaleDelegate old) => false;
+}
+
+AppLocale lookupAppLocale(Locale locale) {
+
+
+  // Lookup logic when only language code is specified.
+  switch (locale.languageCode) {
+    case 'en': return AppLocaleEn();
+    case 'ru': return AppLocaleRu();
+  }
+
+  throw FlutterError(
+    'AppLocale.delegate failed to load unsupported locale "$locale". This is likely '
+    'an issue with the localizations generation tool. Please file an issue '
+    'on GitHub with a reproducible sample app and the gen-l10n configuration '
+    'that was used.'
+  );
+}

lib/components/locale/l10n/app_locale_en.dart

@@ -0,0 +1,20 @@
+import 'app_locale.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for English (`en`).
+class AppLocaleEn extends AppLocale {
+  AppLocaleEn([String locale = 'en']) : super(locale);
+
+  @override
+  String get search => 'Search';
+
+  @override
+  String get liked => 'liked!';
+
+  @override
+  String get disliked => 'disliked :(';
+
+  @override
+  String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)';
+}

lib/components/locale/l10n/app_locale_ru.dart

@@ -0,0 +1,20 @@
+import 'app_locale.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for Russian (`ru`).
+class AppLocaleRu extends AppLocale {
+  AppLocaleRu([String locale = 'ru']) : super(locale);
+
+  @override
+  String get search => 'Поиск';
+
+  @override
+  String get liked => 'понравился!';
+
+  @override
+  String get disliked => 'разонравился :(';
+
+  @override
+  String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)';
+}

lib/components/resources.g.dart

@@ -0,0 +1,12 @@
+/// Generate by [asset_generator](https://github.com/fluttercandies/flutter_asset_generator) library.
+/// PLEASE DO NOT EDIT MANUALLY.
+// ignore_for_file: constant_identifier_names
+class R {
+  const R._();
+
+  /// ![preview](file://C:\Users\Natalia\Desktop\5semestr\PMD\pmd_lab\assets\svg\ru.svg)
+  static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg';
+
+  /// ![preview](file://C:\Users\Natalia\Desktop\5semestr\PMD\pmd_lab\assets\svg\uk.svg)
+  static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg';
+}

lib/components/utils/debounce.dart

@@ -9,9 +9,9 @@ class Debounce {
   static Timer? _timer;
 
   static void run(
-      VoidCallback action, {
-        Duration delay = const Duration(milliseconds: 500),
-      }) {
+    VoidCallback action, {
+    Duration delay = const Duration(milliseconds: 500),
+  }) {
     _timer?.cancel();
     _timer = Timer(delay, action);
   }

lib/data/dtos/characters_dto.dart

@@ -1,52 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'characters_dto.g.dart';
-
-
-@JsonSerializable(createToJson: false)
-class CharactersDto{
-  final List<CharactersDataDto>? data;
-  final MetaDto? meta;
-  const CharactersDto({this.data, this.meta});
-  factory CharactersDto.fromJson(Map<String, dynamic> json) => _$CharactersDtoFromJson(json);
-}
-
-@JsonSerializable(createToJson: false)
-class CharactersDataDto{
-  final String? id;
-  final String? type;
-  final CharasterAttributesDataDto? attributes;
-  const CharactersDataDto({this.id, this.type, this.attributes});
-  factory CharactersDataDto.fromJson(Map<String, dynamic> json) => _$CharactersDataDtoFromJson(json);
-}
-
-@JsonSerializable(createToJson: false)
-class CharasterAttributesDataDto{
-  final String? name;
-  final String? born;
-  final String? died;
-  final String? image;
-
-  const CharasterAttributesDataDto({this.name, this.born, this.died, this.image});
-  factory CharasterAttributesDataDto.fromJson(Map<String, dynamic> json) => _$CharasterAttributesDataDtoFromJson(json);
-}
-
-@JsonSerializable(createToJson: false)
-class MetaDto {
-  final PaginationDto? pagination;
-
-  const MetaDto({this.pagination});
-
-  factory MetaDto.fromJson(Map<String, dynamic> json) => _$MetaDtoFromJson(json);
-}
-
-@JsonSerializable(createToJson: false)
-class PaginationDto {
-  final int? current;
-  final int? next;
-  final int? last;
-
-  const PaginationDto({this.current, this.next, this.last});
-
-  factory PaginationDto.fromJson(Map<String, dynamic> json) => _$PaginationDtoFromJson(json);
-}

lib/data/dtos/characters_dto.g.dart

@@ -1,49 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'characters_dto.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-CharactersDto _$CharactersDtoFromJson(Map<String, dynamic> json) =>
-    CharactersDto(
-      data: (json['data'] as List<dynamic>?)
-          ?.map((e) => CharactersDataDto.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      meta: json['meta'] == null
-          ? null
-          : MetaDto.fromJson(json['meta'] as Map<String, dynamic>),
-    );
-
-CharactersDataDto _$CharactersDataDtoFromJson(Map<String, dynamic> json) =>
-    CharactersDataDto(
-      id: json['id'] as String?,
-      type: json['type'] as String?,
-      attributes: json['attributes'] == null
-          ? null
-          : CharasterAttributesDataDto.fromJson(
-              json['attributes'] as Map<String, dynamic>),
-    );
-
-CharasterAttributesDataDto _$CharasterAttributesDataDtoFromJson(
-        Map<String, dynamic> json) =>
-    CharasterAttributesDataDto(
-      name: json['name'] as String?,
-      born: json['born'] as String?,
-      died: json['died'] as String?,
-      image: json['image'] as String?,
-    );
-
-MetaDto _$MetaDtoFromJson(Map<String, dynamic> json) => MetaDto(
-      pagination: json['pagination'] == null
-          ? null
-          : PaginationDto.fromJson(json['pagination'] as Map<String, dynamic>),
-    );
-
-PaginationDto _$PaginationDtoFromJson(Map<String, dynamic> json) =>
-    PaginationDto(
-      current: (json['current'] as num?)?.toInt(),
-      next: (json['next'] as num?)?.toInt(),
-      last: (json['last'] as num?)?.toInt(),
-    );

lib/data/dtos/titans_dto.dart

@@ -0,0 +1,23 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'titans_dto.g.dart';
+
+@JsonSerializable(createToJson: false)
+class TitansDto {
+  final List<TitansResultsDto>? results;
+  const TitansDto({this.results});
+  factory TitansDto.fromJson(Map<String, dynamic> json) => _$TitansDtoFromJson(json);
+}
+
+@JsonSerializable(createToJson: false)
+class TitansResultsDto {
+  final int? id;
+  final String? name;
+  final String? height;
+  final List<String>? abilities;
+  final String? allegiance;
+  final String? img;
+  const TitansResultsDto({this.id, this.name, this.height, this.abilities, this.allegiance, this.img});
+  factory TitansResultsDto.fromJson(Map<String, dynamic> json) =>
+      _$TitansResultsDtoFromJson(json);
+}

lib/data/dtos/titans_dto.g.dart

@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'titans_dto.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+TitansDto _$TitansDtoFromJson(Map<String, dynamic> json) => TitansDto(
+      results: (json['results'] as List<dynamic>?)
+          ?.map((e) => TitansResultsDto.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+TitansResultsDto _$TitansResultsDtoFromJson(Map<String, dynamic> json) =>
+    TitansResultsDto(
+      id: (json['id'] as num?)?.toInt(),
+      name: json['name'] as String?,
+      height: json['height'] as String?,
+      abilities: (json['abilities'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList(),
+      allegiance: json['allegiance'] as String?,
+      img: json['img'] as String?,
+    );

lib/data/mappes/characters_mapper.dart

@@ -1,31 +0,0 @@
-import 'package:pmd_lab/data/dtos/characters_dto.dart';
-import 'package:pmd_lab/domain/models/card.dart';
-import 'package:pmd_lab/domain/models/home.dart';
-
-
-const _imagePlaceholder = 'https://cdn-icons-png.flaticon.com/512/4054/4054617.png';
-
-
-extension CharacterDataDtoToModel on CharactersDataDto {
-  CardData toDomain() => CardData(
-    attributes?.name ?? 'UNKNOWN',
-    imgUrl: attributes?.image ?? _imagePlaceholder,
-    description: _makeDescription(attributes?.born, attributes?.died),
-  );
-  String _makeDescription(String? born, String? died){
-    return born != null && died != null
-        ? '$born - $died'
-        : born != null
-          ? 'born: $born'
-          : died != null
-            ? 'died: $died'
-            : '';
-  }
-}
-
-extension CharactersDtoToModel on CharactersDto {
-  HomeData toDomain() => HomeData(
-    data: data?.map((e) => e.toDomain()).toList(),
-    nextPage: meta?.pagination?.next,
-  );
-}

lib/data/mappes/titans_mapper.dart

@@ -0,0 +1,34 @@
+import 'package:pmd_lab/data/dtos/titans_dto.dart';
+import 'package:pmd_lab/domain/models/card.dart';
+import 'package:pmd_lab/domain/models/home.dart';
+
+const _imagePlaceholder = 'https://cdn-icons-png.flaticon.com/512/4054/4054617.png';
+
+extension TitansDtoToModel on TitansDto {
+  HomeData toDomain() => HomeData(
+    data: results?.map((e) => e.toDomain()).toList(),
+  );
+}
+
+extension TitanResultsDtoToModel on TitansResultsDto {
+  CardData toDomain() => CardData(
+        name ?? 'UNKNOWN',
+        img: img ?? _imagePlaceholder,
+        description: _makeDescription(height, abilities, allegiance),
+        id: id.toString(),
+      );
+  String _makeDescription(String? height, List<String>? abilities, String? allegiance) {
+    List<String> descriptionParts = [];
+    if (height != null && height.isNotEmpty) {
+      descriptionParts.add('Height: $height');
+    }
+    if (allegiance != null && allegiance.isNotEmpty) {
+      descriptionParts.add('Allegiance: $allegiance');
+    }
+    if (abilities != null && abilities.isNotEmpty) {
+      final abilitiesStr = abilities.join(', ');
+      descriptionParts.add('Abilities: $abilitiesStr.');
+    }
+    return descriptionParts.join('\n');
+  }
+}

lib/domain/models/card.dart

@@ -1,11 +1,13 @@
 class CardData {
-  final String text;
+  final String name;
   final String description;
-  final String? imgUrl;
+  final String? img;
+  final String id;
 
   CardData(
-      this.text, {
-        required this.description,
-        this.imgUrl,
-      });
+    this.name, {
+    required this.description,
+    this.img,
+    required this.id,
+  });
 }

lib/domain/models/home.dart

@@ -1,8 +1,7 @@
-import 'card.dart';
+import 'package:pmd_lab/domain/models/card.dart';
 
 class HomeData {
   final List<CardData>? data;
-  final int? nextPage;
 
-  HomeData({this.data, this.nextPage});
+  HomeData({this.data});
 }

lib/main.dart

@@ -1,8 +1,15 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:pmd_lab/components/locale/l10n/app_locale.dart';
 import 'package:pmd_lab/presentation/home_page/bloc/bloc.dart';
+
 import 'package:pmd_lab/presentation/home_page/home_page.dart';
-import 'package:pmd_lab/repositories/potter_repository.dart';
+import 'package:pmd_lab/presentation/like_bloc/like_bloc.dart';
+import 'package:pmd_lab/presentation/locale_bloc/locale_bloc.dart';
+import 'package:pmd_lab/presentation/locale_bloc/locale_state.dart';
+import 'package:pmd_lab/repositories/titans_repository.dart';
 
 void main() {
   runApp(const MyApp());
@@ -13,21 +20,37 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Flutter Demo',
-      theme: ThemeData(
-        // colorScheme: ColorScheme.fromSeed(seedColor: Colors.black),                                                                                                                  colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
-        useMaterial3: true,
+    return BlocProvider<LocaleBloc>(
+      lazy: false,
+      create: (context) => LocaleBloc(Locale(Platform.localeName)),
+      child: BlocBuilder<LocaleBloc, LocaleState>(
+        builder: (context, state) {
+          return MaterialApp(
+            locale: state.currentLocale,
+            localizationsDelegates: AppLocale.localizationsDelegates,
+            supportedLocales: AppLocale.supportedLocales,
+            debugShowCheckedModeBanner: false,
+            theme: ThemeData(
+              primarySwatch: Colors.orange,
+              scaffoldBackgroundColor: Color(0x33BDBCBC),
+              useMaterial3: true,
+            ),
+            home: RepositoryProvider<TitansRepository>(
+              lazy: true,
+              create: (_) => TitansRepository(),
+              child: BlocProvider<LikeBloc>(
+                lazy: false,
+                create: (context) => LikeBloc(),
+                child: BlocProvider<HomeBloc>(
+                  lazy: false,
+                  create: (context) => HomeBloc(context.read<TitansRepository>()),
+                  child: const MyHomePage(),
+                ),
+              ),
+            ),
+          );
+        },
       ),
-      home: RepositoryProvider<PotterRepository>(
-        lazy: true,
-        create: (_) => PotterRepository(),
-        child: BlocProvider<HomeBloc>(
-            lazy: true,
-            create: (context) => HomeBloc(context.read<PotterRepository>()),
-            child: const MyHomePage(title: 'Potter API'),
-        ),
-      )
     );
   }
 }

lib/presentation/common/svg_objects.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:pmd_lab/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);
+  }
+}

lib/presentation/details_page/details_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:pmd_lab/domain/models/card.dart';
 
 class DetailsPage extends StatelessWidget {
@@ -9,27 +10,59 @@ class DetailsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(),
-      body:Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(bottom: 16),
-            child: Image.network(data.imgUrl ?? '',),
+        backgroundColor: Color(0xFF272727),
+        appBar: AppBar(
+          backgroundColor: const Color(0xFF272727), // Тёмный фон AppBar
+          iconTheme: const IconThemeData(
+            color: Colors.white,
           ),
-          Padding(
-            padding: const EdgeInsets.only(bottom: 4),
-            child: Text(
-                data.text,
-                style: Theme.of(context).textTheme.headlineLarge,
+          title: Text(
+            data.name,
+            style: TextStyle(
+              color: Colors.white,
             ),
           ),
-          Text(
-              data.description,
-              style: Theme.of(context).textTheme.bodyLarge,
-          )
-        ],
-      )
+          elevation: 0,
+          systemOverlayStyle: SystemUiOverlayStyle.light,
+        ),
+        body: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+              Stack(children: [
+                    ClipRRect(
+                        child: Image.network(
+                          data.img ?? '',
+                          errorBuilder: (_, __, ___) => const Placeholder(),
+                          height: 370,
+                          alignment: Alignment.topCenter,
+                          fit: BoxFit.cover,
+                          width: double.infinity,
+                        ),
+                  ),
+              ]),
+              Padding(
+                padding: const EdgeInsets.only(bottom: 4, top: 16, right: 20, left: 20),
+                child: Text(
+                  data.name,
+                  style: const TextStyle(
+                    color: Colors.white70,
+                    fontSize: 30,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+              Padding(
+              padding: const EdgeInsets.only(bottom: 4, top: 16, right: 20, left: 20),
+              child: Text(
+                data.description,
+                style: const TextStyle(
+                  color: Colors.white70,
+                  fontSize: 20,
+                  fontWeight: FontWeight.normal,
+                ),
+              ),
+            )
+        ])
     );
   }
 }

lib/presentation/home_page/bloc/bloc.dart

@@ -1,41 +1,29 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:pmd_lab/presentation/home_page/bloc/events.dart';
 import 'package:pmd_lab/presentation/home_page/bloc/state.dart';
-import 'package:pmd_lab/repositories/potter_repository.dart';
+import 'package:pmd_lab/repositories/titans_repository.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  final PotterRepository repo;
+  final TitansRepository repo;
 
   HomeBloc(this.repo) : super(const HomeState()) {
     on<HomeLoadDataEvent>(_onLoadData);
   }
 
   Future<void> _onLoadData(HomeLoadDataEvent event, Emitter<HomeState> emit) async {
-    if (event.nextPage == null) {
       emit(state.copyWith(isLoading: true));
-    } else {
-      emit(state.copyWith(isPaginationLoading: true));
-    }
 
     String? error;
 
-    final data = await repo.loadData(
+    final data = await repo.loadResults(
       q: event.search,
-      page: event.nextPage ?? 1,
       onError: (e) => error = e,
     );
 
-    if (event.nextPage != null) {
-      data?.data?.insertAll(0, state.data?.data ?? []);
-    }
-
     emit(state.copyWith(
       isLoading: false,
-      isPaginationLoading: false,
       data: data,
       error: error,
     ));
   }
-
 }
-

lib/presentation/home_page/bloc/events.dart

@@ -1,11 +1,8 @@
-
 class HomeEvent {
   const HomeEvent();
 }
 
-class HomeLoadDataEvent extends HomeEvent{
+class HomeLoadDataEvent extends HomeEvent {
   final String? search;
-  final int? nextPage;
-  const HomeLoadDataEvent({this.search, this.nextPage});
-
+  const HomeLoadDataEvent({this.search});
 }

lib/presentation/home_page/bloc/state.dart

@@ -9,36 +9,29 @@ part 'state.g.dart';
 class HomeState extends Equatable {
   final HomeData? data;
   final bool isLoading;
-  final bool isPaginationLoading;
   final String? error;
 
   const HomeState({
     this.data,
     this.isLoading = false,
-    this.isPaginationLoading = false,
     this.error,
   });
 
   HomeState copyWith({
     HomeData? data,
     bool? isLoading,
-    bool? isPaginationLoading,
     String? error,
   }) =>
       HomeState(
         data: data ?? this.data,
         isLoading: isLoading ?? this.isLoading,
-        isPaginationLoading: isPaginationLoading ?? this.isPaginationLoading,
         error: error ?? this.error,
       );
 
   @override
   List<Object?> get props => [
-    data,
-    isLoading,
-    isPaginationLoading,
-    error,
-  ];
+        data,
+        isLoading,
+        error,
+      ];
 }
-
-

lib/presentation/home_page/bloc/state.g.dart

@@ -11,8 +11,6 @@ abstract class _$HomeStateCWProxy {
 
   HomeState isLoading(bool isLoading);
 
-  HomeState isPaginationLoading(bool isPaginationLoading);
-
   HomeState error(String? error);
 
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `HomeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
@@ -24,7 +22,6 @@ abstract class _$HomeStateCWProxy {
   HomeState call({
     HomeData? data,
     bool? isLoading,
-    bool? isPaginationLoading,
     String? error,
   });
 }
@@ -41,10 +38,6 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy {
   @override
   HomeState isLoading(bool isLoading) => this(isLoading: isLoading);
 
-  @override
-  HomeState isPaginationLoading(bool isPaginationLoading) =>
-      this(isPaginationLoading: isPaginationLoading);
-
   @override
   HomeState error(String? error) => this(error: error);
 
@@ -59,7 +52,6 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy {
   HomeState call({
     Object? data = const $CopyWithPlaceholder(),
     Object? isLoading = const $CopyWithPlaceholder(),
-    Object? isPaginationLoading = const $CopyWithPlaceholder(),
     Object? error = const $CopyWithPlaceholder(),
   }) {
     return HomeState(
@@ -71,12 +63,6 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy {
           ? _value.isLoading
           // ignore: cast_nullable_to_non_nullable
           : isLoading as bool,
-      isPaginationLoading:
-          isPaginationLoading == const $CopyWithPlaceholder() ||
-                  isPaginationLoading == null
-              ? _value.isPaginationLoading
-              // ignore: cast_nullable_to_non_nullable
-              : isPaginationLoading as bool,
       error: error == const $CopyWithPlaceholder()
           ? _value.error
           // ignore: cast_nullable_to_non_nullable

lib/presentation/home_page/card.dart

@@ -1,13 +1,15 @@
 part of 'home_page.dart';
 
-typedef OnLikeCallBack = void Function(String title, bool isLiked)?;
+typedef OnLikeCallback = void Function(String? id, String title, bool isLiked)?;
 
-class _Card extends StatefulWidget {
+class _Card extends StatelessWidget {
   final String text;
   final String description;
   final String? imgUrl;
-  final OnLikeCallBack onLike;
+  final OnLikeCallback onLike;
   final VoidCallback? onTap;
+  final String? id;
+  final bool isLiked;
 
   const _Card(
       this.text, {
@@ -15,104 +17,103 @@ class _Card extends StatefulWidget {
         this.imgUrl,
         this.onLike,
         this.onTap,
+        this.id,
+        this.isLiked = false,
       });
 
-  factory _Card.fromData(CardData data, {OnLikeCallBack onLike, VoidCallback? onTap}) => _Card(
-    data.text,
-    description: data.description,
-    imgUrl: data.imgUrl,
-    onLike: onLike,
-    onTap: onTap,
-  );
-
-  @override
-  State<_Card> createState() => _CardState();
-}
-
-class _CardState extends State<_Card> {
-  bool isLiked = false;
+  factory _Card.fromData(
+      CardData data, {
+        OnLikeCallback onLike,
+        VoidCallback? onTap,
+        bool isLiked = false,
+      }) =>
+      _Card(
+        data.name,
+        description: data.description,
+        imgUrl: data.img,
+        onLike: onLike,
+        onTap: onTap,
+        isLiked: isLiked,
+        id: data.id,
+      );
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: widget.onTap,
-      child: Container(
-        margin: const EdgeInsets.only(bottom: 20),
-        decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(20),
-            boxShadow: [
-              BoxShadow(
-                color: Colors.black.withOpacity(0.1),
-                spreadRadius: 1,
-                offset: const Offset(0, 0),
-                blurRadius: 15,
-              )
-            ]),
-        child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              Stack(
-                children: [
-                  ClipRRect(
-                    borderRadius: const BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
-                    child: Image.network(
-                      widget.imgUrl ?? '',
-                      errorBuilder: (_, __, ___) => const Placeholder(),
-                      height: 370,
-                      alignment: Alignment.topCenter,
-                      fit: BoxFit.cover,
-                      width: double.infinity,
-                    ),
-                  ),
-                ]
-              ),
-              Padding(
-                padding: const EdgeInsets.all(20),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.only(bottom:10),
-                      child: Text(
-                        widget.text,
-                        style: const TextStyle(
-                          color: Color(0xff4c4c4c),
-                          fontSize: 30,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                    Text(
-                      widget.description,
-                      style: const TextStyle(
-                        color: Color(0xff9c9c9c),
-                        fontSize: 20,
-                        fontWeight: FontWeight.normal,
-                      ),
-                    ),
-                    Padding(
-                        padding: const EdgeInsets.only(top:10),
-                        child: GestureDetector(
-                          onTap:(){
-                            setState(() {
-                              isLiked = !isLiked;
-                            });
-                            widget.onLike?.call(widget.text, isLiked);
-                          },
-                          child: AnimatedSwitcher(
-                            duration: const Duration(milliseconds:  300),
-                            child: isLiked
-                                ? const Icon(Icons.favorite, color: Colors.redAccent,key: ValueKey<int>(0),)
-                                : const Icon(Icons.favorite_border, key:ValueKey<int>(1),),
-                          ),
-                        )
-                    )
-                  ],
+      return GestureDetector(
+        onTap: onTap,
+        child: Container(
+          margin: const EdgeInsets.only(bottom: 20),
+          decoration:
+            BoxDecoration(color: Color(0xFF272727), borderRadius: BorderRadius.circular(20),
+            border: Border.all( // Задаем рамку
+              color: Colors.white12, // Цвет рамки
+              width: 2, // Толщина рамки
+            ),
+          ),
+          child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
+            Stack(children: [
+              ClipRRect(
+                borderRadius: const BorderRadius.only(
+                    topLeft: Radius.circular(20), topRight: Radius.circular(20)),
+                child: Image.network(
+                  imgUrl ?? '',
+                  errorBuilder: (_, __, ___) => const Placeholder(),
+                  height: 370,
+                  alignment: Alignment.topCenter,
+                  fit: BoxFit.cover,
+                  width: double.infinity,
                 ),
               ),
             ]),
-      ),
-    );
-  }
+            Padding(
+              padding: const EdgeInsets.all(20),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(bottom: 10),
+                    child: Text(
+                      text,
+                      style: const TextStyle(
+                        color: Colors.white70,
+                        fontSize: 30,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  Text(
+                    description,
+                    style: const TextStyle(
+                      color: Colors.white70,
+                      fontSize: 20,
+                      fontWeight: FontWeight.normal,
+                    ),
+                  ),
+                  Padding(
+                      padding: const EdgeInsets.only(top: 10),
+                      child: GestureDetector(
+                        onTap: () => onLike?.call(id, text, isLiked),
+                        child: AnimatedSwitcher(
+                          duration: const Duration(milliseconds: 300),
+                          child: isLiked
+                              ? const Icon(
+                                  Icons.favorite,
+                                  color: Colors.redAccent,
+                                  key: ValueKey<int>(0),
+                                )
+                              : const Icon(
+                                  Icons.favorite_border,
+                                  color: Colors.white,
+                                  key: ValueKey<int>(1),
+                                ),
+                        ),
+                      )
+                  )
+                ],
+              ),
+            ),
+          ]),
+        ),
+      );
+    }
 }

lib/presentation/home_page/home_page.dart

@@ -1,166 +1,143 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:pmd_lab/components/extensions/context_x.dart';
 import 'package:pmd_lab/components/utils/debounce.dart';
 import 'package:pmd_lab/domain/models/card.dart';
+import 'package:pmd_lab/presentation/common/svg_objects.dart';
 import 'package:pmd_lab/presentation/details_page/details_page.dart';
 import 'package:pmd_lab/presentation/home_page/bloc/bloc.dart';
 import 'package:pmd_lab/presentation/home_page/bloc/events.dart';
 import 'package:pmd_lab/presentation/home_page/bloc/state.dart';
-import 'package:pmd_lab/repositories/api_interface.dart';
-import 'package:pmd_lab/repositories/mock_repository.dart';
-import 'package:pmd_lab/repositories/potter_repository.dart';
+import 'package:pmd_lab/presentation/like_bloc/like_bloc.dart';
+import 'package:pmd_lab/presentation/like_bloc/like_event.dart';
+import 'package:pmd_lab/presentation/like_bloc/like_state.dart';
+import 'package:pmd_lab/presentation/locale_bloc/locale_events.dart';
+import 'package:pmd_lab/presentation/locale_bloc/locale_state.dart';
+import 'package:pmd_lab/repositories/titans_repository.dart';
+import '../locale_bloc/locale_bloc.dart';
 part 'card.dart';
 
-void main() {
-  runApp(const MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Flutter Demo',
-      theme: ThemeData(
-        // colorScheme: ColorScheme.fromSeed(seedColor: Colors.black),                                                                                                                  colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
-        useMaterial3: true,
-      ),
-      home: const MyHomePage(title: 'Flutter rocks!'),
-    );
-  }
-}
-
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({super.key, required this.title});
-
-  final String title;
-
+  const MyHomePage({super.key});
   @override
   State<MyHomePage> createState() => _MyHomePageState();
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  final Color _color = Colors.orangeAccent;
-
-  @override
-  void initState(){
-    WidgetsBinding.instance.addPostFrameCallback( (_) {
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-        content: Text('Hello', style: Theme
-            .of(context)
-            .textTheme
-            .bodyLarge,),
-        backgroundColor: Colors.orangeAccent,
-        duration: const Duration(seconds: 1),
-      ));
-    });
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        backgroundColor: _color,
-        title: Text(widget.title),
-      ),
-      body: const Body(),
-    );
+    return const Scaffold(body: Body());
   }
 }
 
 class Body extends StatefulWidget {
   const Body({super.key});
-
   @override
   State<Body> createState() => _BodyState();
 }
 
 class _BodyState extends State<Body> {
   final searchController = TextEditingController();
-  final scrollController = ScrollController();
-  final ApiInterface repo = PotterRepository();
-  late Future<List<CardData>?> data;
-
   @override
   void initState() {
+    SvgObjects.init();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       context.read<HomeBloc>().add(const HomeLoadDataEvent());
+      context.read<LikeBloc>().add(const LoadLikesEvent());
     });
-    scrollController.addListener(_onNextPageListener);
     super.initState();
   }
-  void _onNextPageListener() {
-    if (scrollController.offset > scrollController.position.maxScrollExtent) {
-      final bloc = context.read<HomeBloc>();
-      if (!bloc.state.isPaginationLoading) {
-        bloc.add(HomeLoadDataEvent(
-          search: searchController.text,
-          nextPage: bloc.state.data?.nextPage,
-        ));
-      }
-    }
-  }
-  @override
-  void dispose(){
-    searchController.dispose();
-    scrollController.dispose();
 
+
+  @override
+  void dispose() {
+    searchController.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-
     return Padding(
       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<HomeBloc>().add(HomeLoadDataEvent(search: search)));
-              },
-            ),
+          Row(
+            children: [
+              Expanded(
+                flex: 4,
+                child: Padding(
+                  padding: const EdgeInsets.all(12),
+                  child: CupertinoSearchTextField(
+                    controller: searchController,
+                    placeholder: context.locale.search,
+                    backgroundColor: Colors.white12,
+                    placeholderStyle: TextStyle(
+                      color: Colors.white, // Задайте желаемый цвет плейсхолдера// (Необязательно) Задайте размер шрифта(Необязательно) Задайте стиль шрифта
+                    ),
+                    style: TextStyle(
+                      color: Colors.white,
+                    ),
+                    onChanged: (search) {
+                      Debounce.run(() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
+                    },
+                  ),
+                ),
+              ),
+              GestureDetector(
+                onTap: () => context.read<LocaleBloc>().add(const ChangeLocaleEvent()),
+                child: SizedBox.square(
+                  dimension: 50,
+                  child: Padding(
+                    padding: const EdgeInsets.only(right: 12),
+                    child: BlocBuilder<LocaleBloc, LocaleState>(
+                      builder: (context, state) {
+                        return state.currentLocale.languageCode == 'ru'
+                            ? const SvgRu()
+                            : const SvgUk();
+                      },
+                    ),
+                  ),
+                ),
+              ),
+            ],
           ),
 
           BlocBuilder<HomeBloc, HomeState>(
             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(
-                      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();
-                  },
-                ), // ListView.builder
-              ), // RefreshIndicator
-            ), // Expanded
-          ), // BlocBuilder
-          BlocBuilder<HomeBloc, HomeState>(
-            builder: (context, state) => state.isPaginationLoading
-                ? const CircularProgressIndicator()
-                : const SizedBox.shrink(),
-          )
+                ? Text(
+                    state.error ?? '',
+                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red),
+                  )
+                : state.isLoading
+                    ? const CircularProgressIndicator()
+                    : BlocBuilder<LikeBloc, LikeState>(
+                        builder: (context, likeState) {
+                          return Expanded(
+                            child: RefreshIndicator(
+                              onRefresh: _onRefresh,
+                              child: ListView.builder(
+                                physics: const BouncingScrollPhysics(),
+                                padding: const EdgeInsets.all(12),
+                                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();
+                                },
+                              ), // ListView.builder
+                            ), // RefreshIndicator
+                          );
+                        },
+                      ), // Expanded
+          ) // BlocBuilder
         ],
       ),
     );
@@ -170,12 +147,10 @@ class _BodyState extends State<Body> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(
-          'Article $title ${isLiked ? 'liked!' : 'disliked :('}',
-          style: Theme
-              .of(context)
-              .textTheme
-              .bodyLarge,),
-        backgroundColor: Colors.orangeAccent,
+          '$title ${isLiked ? context.locale.liked : context.locale.disliked}',
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        backgroundColor: Colors.white,
         duration: const Duration(seconds: 1),
       ));
     });
@@ -193,4 +168,10 @@ class _BodyState extends State<Body> {
     return Future.value(null);
   }
 
+  void _onLike(String? id, String title, bool isLiked) {
+    if (id != null) {
+      context.read<LikeBloc>().add(ChangeLikeEvent(id.toString()));
+      _showSnackBar(context, title, !isLiked);
+    }
+  }
 }

lib/presentation/like_bloc/like_bloc.dart

@@ -0,0 +1,35 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:pmd_lab/presentation/like_bloc/like_event.dart';
+import 'package:pmd_lab/presentation/like_bloc/like_state.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+const String _likedPrefsKey = 'liked';
+
+class LikeBloc extends Bloc<LikeEvent, LikeState> {
+  LikeBloc() : super(const LikeState(likedIds: [])) {
+    on<ChangeLikeEvent>(_onChangeLike);
+    on<LoadLikesEvent>(_onLoadLikes);
+  }
+
+  Future<void> _onLoadLikes(LoadLikesEvent event, Emitter<LikeState> emit) async {
+    final prefs = await SharedPreferences.getInstance();
+    final data = prefs.getStringList(_likedPrefsKey);
+
+    emit(state.copyWith(likedIds: data));
+  }
+
+  Future<void> _onChangeLike(ChangeLikeEvent event, Emitter<LikeState> emit) async {
+    final updatedList = List<String>.from(state.likedIds ?? []);
+
+    if (updatedList.contains(event.id)) {
+      updatedList.remove(event.id);
+    } else {
+      updatedList.add(event.id);
+    }
+
+    final prefs = await SharedPreferences.getInstance();
+    prefs.setStringList(_likedPrefsKey, updatedList);
+
+    emit(state.copyWith(likedIds: updatedList));
+  }
+}

lib/presentation/like_bloc/like_event.dart

@@ -0,0 +1,13 @@
+abstract class LikeEvent {
+  const LikeEvent();
+}
+
+class LoadLikesEvent extends LikeEvent {
+  const LoadLikesEvent();
+}
+
+class ChangeLikeEvent extends LikeEvent {
+  final String id;
+
+  const ChangeLikeEvent(this.id);
+}

lib/presentation/like_bloc/like_state.dart

@@ -0,0 +1,14 @@
+import 'package:copy_with_extension/copy_with_extension.dart';
+import 'package:equatable/equatable.dart';
+
+part 'like_state.g.dart';
+
+@CopyWith()
+class LikeState extends Equatable {
+  final List<String>? likedIds;
+
+  const LikeState({required this.likedIds});
+
+  @override
+  List<Object?> get props => [likedIds];
+}

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<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);
+}

lib/presentation/locale_bloc/locale_bloc.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:pmd_lab/components/locale/l10n/app_locale.dart';
+
+import 'locale_events.dart';
+import 'locale_state.dart';
+
+class LocaleBloc extends Bloc<LocaleEvent, LocaleState> {
+  LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) {
+    on<ChangeLocaleEvent>(_onChangeLocale);
+  }
+
+  Future<void> _onChangeLocale(ChangeLocaleEvent event, Emitter<LocaleState> emit) async {
+    final toChange = AppLocale.supportedLocales
+        .firstWhere((e) => e.languageCode != state.currentLocale.languageCode);
+    emit(state.copyWith(currentLocale: toChange));
+  }
+}

lib/presentation/locale_bloc/locale_events.dart

@@ -0,0 +1,7 @@
+abstract class LocaleEvent {
+  const LocaleEvent();
+}
+
+class ChangeLocaleEvent extends LocaleEvent {
+  const ChangeLocaleEvent();
+}

lib/presentation/locale_bloc/locale_state.dart

@@ -0,0 +1,15 @@
+import 'package:copy_with_extension/copy_with_extension.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+
+part 'locale_state.g.dart';
+
+@CopyWith()
+class LocaleState extends Equatable {
+  final Locale currentLocale;
+
+  const LocaleState({required this.currentLocale});
+
+  @override
+  List<Object?> get props => [currentLocale];
+}

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);
+}

lib/repositories/api_interface.dart

@@ -1,9 +1,8 @@
-
+import 'package:pmd_lab/domain/models/card.dart';
 import 'package:pmd_lab/domain/models/home.dart';
 
 typedef OnErrorCallback = void Function(String? error);
 
 abstract class ApiInterface {
-  Future<HomeData?> loadData({OnErrorCallback? onError});
+  Future<HomeData?> loadResults({OnErrorCallback? onError});
 }
-

lib/repositories/mock_repository.dart

@@ -1,30 +0,0 @@
-import 'package:pmd_lab/domain/models/home.dart';
-import 'package:pmd_lab/repositories/api_interface.dart';
-import 'package:pmd_lab/domain/models/card.dart';
-
-class MockRepository extends ApiInterface {
-  @override
-  Future <HomeData?> loadData({OnErrorCallback? onError}) async {
-  return HomeData();
-    // return [
-    // CardData(
-    //   'Какая-то новость',
-    //   description: 'В данном блоке рекомендуем разместить краткую информацию',
-    //   imgUrl:
-    //   'https://universal.revengel.ru/assets/cache_image/images/services/3_731x487_1cb.png',
-    // ),
-    // CardData(
-    //   'Ещё какая-то новость',
-    //   description: 'В данном блоке рекомендуем разместить краткую информацию',
-    //   imgUrl:
-    //   "https://universal.revengel.ru/assets/cache_image/images/services/2_731x487_1cb.png",
-    // ),
-    // CardData(
-    //   'Ещё одна новость',
-    //   description: 'В данном блоке рекомендуем разместить краткую информацию',
-    //   imgUrl:
-    //   "https://universal.revengel.ru/assets/cache_image/images/services/1_731x487_1cb.png",
-    // )
-  //];
-  }
-}

lib/repositories/potter_repository.dart

@@ -1,48 +0,0 @@
-import 'dart:developer';
-
-import 'package:dio/dio.dart';
-import 'package:pmd_lab/data/dtos/characters_dto.dart';
-import 'package:pmd_lab/data/mappes/characters_mapper.dart';
-import 'package:pmd_lab/domain/models/card.dart';
-import 'package:pmd_lab/domain/models/home.dart';
-import 'package:pmd_lab/repositories/api_interface.dart';
-import 'package:pretty_dio_logger/pretty_dio_logger.dart';
-
-class PotterRepository extends ApiInterface{
-  static final Dio _dio = Dio()
-    ..interceptors.add(PrettyDioLogger(
-      requestHeader: true,
-      requestBody: true,
-    ));
-
-  static const String _baseUrl = 'https://api.potterdb.com';
-
-  @override
-  Future<HomeData?> loadData({
-    OnErrorCallback? onError,
-    String? q,
-    int page = 1,
-    int pageSize = 25,
-  }) async {
-    try {
-      const String url = '$_baseUrl/v1/characters';
-
-      final Response<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(
-        url,
-        queryParameters: {
-          'filter[name_cont]': q,
-          'page[number]': page,
-          'page[size]': pageSize,
-        },
-      );
-
-      final CharactersDto dto = CharactersDto.fromJson(response.data as Map<String, dynamic>);
-      final HomeData data = dto.toDomain();
-      return data;
-
-    } on DioException catch (e) {
-      onError?.call(e.error?.toString());
-      return null;
-    }
-  }
-}

lib/repositories/titans_repository.dart

@@ -0,0 +1,39 @@
+import 'package:dio/dio.dart';
+import 'package:pmd_lab/data/dtos/titans_dto.dart';
+import 'package:pmd_lab/data/mappes/titans_mapper.dart';
+import 'package:pmd_lab/domain/models/card.dart';
+import 'package:pmd_lab/domain/models/home.dart';
+import 'package:pmd_lab/repositories/api_interface.dart';
+import 'package:pretty_dio_logger/pretty_dio_logger.dart';
+
+class TitansRepository extends ApiInterface {
+  static final Dio _dio = Dio()
+    ..interceptors.add(PrettyDioLogger(
+      requestHeader: true,
+      requestBody: true,
+    ));
+
+  static const String _baseUrl = 'https://api.attackontitanapi.com';
+
+  @override
+  Future<HomeData?> loadResults({
+    OnErrorCallback? onError,
+    String? q
+  }) async {
+    try {
+      const String url = '$_baseUrl/titans';
+
+      final Response<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(
+        url,
+        queryParameters: q != null ? {'name': q} : null,
+      );
+
+      final TitansDto dto = TitansDto.fromJson(response.data as Map<String, dynamic>);
+      final HomeData data = dto.toDomain();
+        return data;
+      } on DioException catch (e) {
+      onError?.call(e.error?.toString());
+      return null;
+    }
+  }
+}

pubspec.lock

@@ -5,23 +5,31 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
+    version: "76.0.0"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.11.0"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.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:
@@ -154,10 +170,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   convert:
     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,19 +291,45 @@ 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:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "2.0.3"
+  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: "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.0"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -356,18 +430,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -380,10 +454,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "2.1.1"
   logging:
     dependency: transitive
     description:
@@ -396,10 +470,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2-main.4"
+    version: "0.1.3-main.0"
   matcher:
     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:
@@ -464,6 +594,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
   pretty_dio_logger:
     dependency: "direct main"
     description:
@@ -496,6 +634,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: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  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:
@@ -516,7 +710,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_gen:
     dependency: transitive
     description:
@@ -545,10 +739,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -569,10 +763,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -585,10 +779,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   timing:
     dependency: transitive
     description:
@@ -605,6 +799,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.15"
+  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: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.16"
   vector_math:
     dependency: transitive
     description:
@@ -617,10 +835,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
   watcher:
     dependency: transitive
     description:
@@ -653,6 +871,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 +897,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"

pubspec.yaml

@@ -1,98 +1,55 @@
 name: pmd_lab
 description: "A new Flutter project."
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-# In Windows, build-name is used as the major, minor, and patch parts
-# of the product and file versions while build-number is used as the build suffix.
 version: 1.0.0+1
-
 environment:
   sdk: ^3.5.3
 
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
 
+  # Виджеты
+  cupertino_icons: ^1.0.2
+  flutter_svg: 2.0.7
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.8
+  # Сетевое взаимодействие
   json_annotation: ^4.8.1
   dio: ^5.4.2+1
   pretty_dio_logger: ^1.3.1
 
+  # BLoC
   equatable: ^2.0.5
   flutter_bloc: ^8.1.5
   copy_with_extension_gen: ^5.0.4
+
+  # Localization
+  flutter_localizations:
+    sdk: flutter
+  intl: ^0.19.0
+
+  shared_preferences: 2.2.3
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
+  flutter_lints: ^2.0.0
+
+  # Иконки
+  flutter_launcher_icons: 0.13.1
+
+  # Сетевое взаимодействие
   build_runner: ^2.4.9
   json_serializable: ^6.7.1
-  # 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
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
+flutter_icons:
+  android: "ic_launcher"
+  image_path: "assets/wp.png"
+  min_sdk_android: 21
 
-# The following section is specific to Flutter packages.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
+  generate: true
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/to/resolution-aware-images
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/to/asset-from-package
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/to/font-from-package
+  assets:
+    - assets/svg/