assets/svg/ru.svg

@@ -1,19 +0,0 @@
-<?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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 512 512" xml:space="preserve">
-<path style="fill:#41479B;" d="M473.655,88.276H38.345C17.167,88.276,0,105.443,0,126.621V385.38
-	c0,21.177,17.167,38.345,38.345,38.345h435.31c21.177,0,38.345-17.167,38.345-38.345V126.621
-	C512,105.443,494.833,88.276,473.655,88.276z"/>
-<path style="fill:#F5F5F5;" d="M511.469,120.282c-3.022-18.159-18.797-32.007-37.814-32.007h-9.977l-163.54,107.147V88.276h-88.276
-	v107.147L48.322,88.276h-9.977c-19.017,0-34.792,13.847-37.814,32.007l139.778,91.58H0v88.276h140.309L0.531,391.717
-	c3.022,18.159,18.797,32.007,37.814,32.007h9.977l163.54-107.147v107.147h88.276V316.577l163.54,107.147h9.977
-	c19.017,0,34.792-13.847,37.814-32.007l-139.778-91.58H512v-88.276H371.691L511.469,120.282z"/>
-<g>
-	<polygon style="fill:#FF4B55;" points="282.483,88.276 229.517,88.276 229.517,229.517 0,229.517 0,282.483 229.517,282.483 
-		229.517,423.724 282.483,423.724 282.483,282.483 512,282.483 512,229.517 282.483,229.517 	"/>
-	<path style="fill:#FF4B55;" d="M24.793,421.252l186.583-121.114h-32.428L9.224,410.31
-		C13.377,415.157,18.714,418.955,24.793,421.252z"/>
-	<path style="fill:#FF4B55;" d="M346.388,300.138H313.96l180.716,117.305c5.057-3.321,9.277-7.807,12.287-13.075L346.388,300.138z"
-		/>
-	<path style="fill:#FF4B55;" d="M4.049,109.475l157.73,102.387h32.428L15.475,95.842C10.676,99.414,6.749,104.084,4.049,109.475z"/>
-	<path style="fill:#FF4B55;" d="M332.566,211.862l170.035-110.375c-4.199-4.831-9.578-8.607-15.699-10.86L300.138,211.862H332.566z"
-		/>
-</g>
-</svg>

l10n.yaml

@@ -1,6 +0,0 @@
-arb-dir: l10n
-template-arb-file: app_ru.arb
-output-localization-file: app_locale.dart
-output-dir: lib/components/locale/l10n
-output-class: AppLocale
-synthetic-package: false

l10n/app_en.arb

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

l10n/app_ru.arb

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

lib/components/extensions/context_x.dart

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

lib/components/locale/l10n/app_locale.dart

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

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

lib/components/locale/l10n/app_locale_ru.dart

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

lib/components/resources.g.dart

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

lib/main.dart

@@ -1,14 +1,8 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:laba1/presentation/home_page/bloc/bloc.dart';
 import 'package:laba1/presentation/home_page/home_page.dart';
-import 'package:laba1/presentation/like_bloc/like_bloc.dart';
-import 'package:laba1/presentation/locale_bloc/locale_bloc.dart';
-import 'package:laba1/presentation/locale_bloc/locale_state.dart';
 
-import 'components/locale/l10n/app_locale.dart';
 import 'data/repositories/potter_repository.dart';
 
 void main() {
@@ -20,37 +14,20 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider<LocaleBloc>(
-      lazy: false,
-      create: (context) => LocaleBloc(Locale(Platform.localeName)),
-      child: BlocBuilder<LocaleBloc, LocaleState>(
-        builder: (context, state) {
     return MaterialApp(
       title: 'Flutter Demo',
-            locale: state.currentLocale,
-            localizationsDelegates: AppLocale.localizationsDelegates,
-            supportedLocales: AppLocale.supportedLocales,
-            debugShowCheckedModeBanner: false,
       theme: ThemeData(
-              colorScheme: ColorScheme.fromSeed(seedColor: Colors.amber),
+        primarySwatch: Colors.amber,
-              useMaterial3: true,
       ),
       home: RepositoryProvider<PotterRepository>(
         lazy: true,
         create: (_) => PotterRepository(),
-              child: BlocProvider<LikeBloc>(
-                lazy: false,
-                create: (context) => LikeBloc(),
         child: BlocProvider<HomeBloc>(
           lazy: false,
           create: (context) => HomeBloc(context.read<PotterRepository>()),
           child: const MyHomePage(title: 'Кувшинов Тимур Александрович'),
         ),
       ),
-            ),
-          );
-        },
-      ),
     );
   }
 }

lib/presentation/comon/svg_objects.dart

@@ -1,36 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_svg/svg.dart';
-
-import '../../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, fit: BoxFit.fill,);
-  }
-}
-
-class SvgUk extends StatelessWidget {
-  const SvgUk({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SvgPicture.asset(R.ASSETS_SVG_UK_SVG, fit: BoxFit.fill,);
-  }
-}

lib/presentation/header.dart

@@ -1,65 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:laba1/components/extensions/context_x.dart';
-
-import '../components/utils/debounce.dart';
-import 'comon/svg_objects.dart';
-import 'home_page/bloc/bloc.dart';
-import 'locale_bloc/locale_bloc.dart';
-import 'locale_bloc/locale_events.dart';
-import 'locale_bloc/locale_state.dart';
-
-class Header extends StatelessWidget {
-  final TextEditingController searchController;
-  final String placeholder;
-  final ValueChanged<String> onChanged;
-
-  const Header({
-    Key? key,
-    required this.searchController,
-    required this.placeholder,
-    required this.onChanged,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.only(left: 8.0, right: 8),
-            child: CupertinoSearchTextField(
-              borderRadius: const BorderRadius.only(
-                bottomLeft: Radius.circular(20),
-                bottomRight: Radius.circular(20),
-              ),
-              backgroundColor: Colors.amberAccent,
-              controller: searchController,
-              placeholder: placeholder,
-              onChanged: onChanged,
-            ),
-          ),
-        ),
-        GestureDetector(
-          onTap: () =>
-              context.read<LocaleBloc>().add(const ChangeLocaleEvent()),
-          child: SizedBox.square(
-            dimension: 40,
-            child: Padding(
-              padding: const EdgeInsets.only(right: 8),
-              child: BlocBuilder<LocaleBloc, LocaleState>(
-                builder: (context, state) {
-                  return state.currentLocale.languageCode == 'ru'
-                      ? const SvgRu()
-                      : const SvgUk();
-                },
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/presentation/home_page/card.dart

@@ -1,8 +1,8 @@
 part of 'home_page.dart';
 
-typedef OnLikeCallback = void Function(String id, String title, bool isLiked)?;
+typedef OnLikeCallback = void Function(String title, bool isLiked)?;
 
-class _Card extends StatelessWidget {
+class _Card extends StatefulWidget {
   final String _text;
   final String? description;
   List<String>? descriptionByLines;
@@ -10,12 +10,8 @@ class _Card extends StatelessWidget {
   final String? imageUrl;
   final OnLikeCallback onLike;
   final VoidCallback? onTap;
-  final String id;
-  final bool isLiked;
 
-  _Card(this._text,  this.id, {Key? key, this.imageUrl, this.description, this.onLike, this.onTap,
+  _Card(this._text, {Key? key, this.imageUrl, this.description, this.onLike, this.onTap})
-
-    this.isLiked = false,})
       : super(key: key){
     descriptionByLines = (description ?? '').split('\n');
   }
@@ -24,21 +20,26 @@ class _Card extends StatelessWidget {
     CardData data, {
     OnLikeCallback onLike,
     VoidCallback? onTap,
-        bool isLiked = false,
   }) =>
       _Card(
-        data.text,data.id,
+        data.text,
         imageUrl: data.imageUrl,
         description: data.description,
         onLike: onLike,
         onTap: onTap,
-        isLiked: isLiked,
       );
 
+  @override
+  State<_Card> createState() => _CardState();
+}
+
+class _CardState extends State<_Card> {
+  bool isLiked = false;
+
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: onTap,
+      onTap: widget.onTap,
       child: Container(
         margin: const EdgeInsets.all(10),
         constraints: const BoxConstraints(minHeight: 140, maxHeight: 255),
@@ -65,7 +66,7 @@ class _Card extends StatelessWidget {
                   height: double.infinity,
                   width: 120,
                   child: Image.network(
-                    imageUrl ?? '',
+                    widget.imageUrl ?? '',
                     fit: BoxFit.cover,
                     errorBuilder: (_, __, ___) => const Placeholder(),
                   ),
@@ -78,12 +79,12 @@ class _Card extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                        _text,
+                        widget._text,
                         style: Theme.of(context).textTheme.headlineMedium,
                         overflow: TextOverflow.ellipsis,
                         maxLines: 2,
                       ),
-                      ...(descriptionByLines ?? ['']).map((e) => Text(
+                      ...(widget.descriptionByLines ?? ['']).map((e) => Text(
                           e,
                           style: Theme.of(context).textTheme.bodyLarge,
                           overflow: TextOverflow.ellipsis,
@@ -96,7 +97,11 @@ class _Card extends StatelessWidget {
               Padding(
                 padding: const EdgeInsets.all(8.0),
                 child: GestureDetector(
-                  onTap: () => onLike?.call(id, _text, isLiked),
+                  onTap: () {
+                    isLiked = !isLiked;
+                    setState(() {});
+                    widget.onLike?.call(widget._text, isLiked);
+                  },
                   child: AnimatedSwitcher(
                     duration: const Duration(milliseconds: 100),
                     child: isLiked

lib/presentation/home_page/home_page.dart

@@ -1,22 +1,13 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:laba1/components/extensions/context_x.dart';
 import 'package:laba1/data/repositories/potter_repository.dart';
 import 'package:laba1/presentation/details_page/details_page.dart';
-import 'package:laba1/presentation/header.dart';
 
 import '../../components/utils/debounce.dart';
 import '../../data/repositories/mock_repository.dart';
 import '../../domain/models/card.dart';
-import '../comon/svg_objects.dart';
 import '../dialogs/show_dialog.dart';
-import '../like_bloc/like_bloc.dart';
-import '../like_bloc/like_event.dart';
-import '../like_bloc/like_state.dart';
-import '../locale_bloc/locale_bloc.dart';
-import '../locale_bloc/locale_events.dart';
-import '../locale_bloc/locale_state.dart';
 import 'bloc/bloc.dart';
 import 'bloc/events.dart';
 import 'bloc/state.dart';
@@ -58,10 +49,8 @@ class _BodyState extends State<_Body> {
 
   @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();
@@ -103,7 +92,8 @@ class _BodyState extends State<_Body> {
                   )
                 : state.isLoading
                     ? Center(child: CircularProgressIndicator())
-                    : RefreshIndicator(
+                    : Expanded(
+                        child: RefreshIndicator(
                           onRefresh: _onRefresh,
                           child: ListView.builder(
                             controller: scrollController,
@@ -111,37 +101,47 @@ class _BodyState extends State<_Body> {
                             itemCount: (state.data?.data?.length ?? 0) + 1,
                             itemBuilder: (context, index) {
                               if (index == 0) {
-                              return SizedBox(height: 40);
+                                return Padding(
+                                    padding: const EdgeInsets.only(
+                                        left: 8.0, right: 8),
+                                    child: CupertinoSearchTextField(
+                                      borderRadius: BorderRadius.only(
+                                        bottomLeft: Radius.circular(20),
+                                        bottomRight: Radius.circular(20),
+                                      ),
+                                      backgroundColor: Colors.amberAccent,
+                                    ));
                               }
                               final data = state.data?.data?[index - 1];
                               return data != null
-                                ? BlocBuilder<LikeBloc, LikeState>(
+                                  ? _Card.fromData(
-                                    builder: (context, likeState) {
-                                    return _Card.fromData(
                                       data,
-                                      onLike: _onLike,
+                                      onLike: (title, isLiked) => _showSnackBar(
-                                      isLiked: likeState.likedIds
+                                          context, title, isLiked),
-                                              ?.contains(data.id) ==
-                                          true,
                                       onTap: () => _navToDetails(context, data),
-                                    );
+                                    )
-                                  })
                                   : const SizedBox.expand();
                             },
                           ),
                         ),
                       ),
-          Align(
+          ),
-              alignment: Alignment.topCenter,
+          Padding(
-              child: Header(
+            padding: const EdgeInsets.only(left: 8.0, right: 8),
-                searchController: searchController,
+            child: CupertinoSearchTextField(
-                placeholder: context.locale.search,
+              borderRadius: BorderRadius.only(
+                bottomLeft: Radius.circular(20),
+                bottomRight: Radius.circular(20),
+              ),
+              backgroundColor: Colors.amberAccent,
+              controller: searchController,
               onChanged: (search) {
                 Debounce.run(() => context
                     .read<HomeBloc>()
                     .add(HomeLoadDataEvent(search: search)));
               },
-              )),
+            ),
+          ),
           Align(
             alignment: Alignment.bottomCenter,
             child: Padding(
@@ -162,13 +162,6 @@ class _BodyState extends State<_Body> {
     );
   }
 
-  void _onLike(String? id, String title, bool isLiked) {
-    if (id != null) {
-      context.read<LikeBloc>().add(ChangeLikeEvent(id));
-      _showSnackBar(context, title, !isLiked);
-    }
-  }
-
   Future<void> _onRefresh() {
     context
         .read<HomeBloc>()
@@ -187,7 +180,7 @@ class _BodyState extends State<_Body> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(
-          '$title ${isLiked ? context.locale.liked : context.locale.unliked}',
+          '$title ${isLiked ? 'liked' : 'unliked'}',
           style: Theme.of(context).textTheme.bodyLarge,
         ),
         backgroundColor: Colors.orangeAccent,

lib/presentation/like_bloc/like_bloc.dart

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

lib/presentation/like_bloc/like_event.dart

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

lib/presentation/like_bloc/like_state.dart

@@ -1,14 +0,0 @@
-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

@@ -1,56 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'like_state.dart';
-
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$LikeStateCWProxy {
-  LikeState likedIds(List<String>? likedIds);
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// LikeState(...).copyWith(id: 12, name: "My name")
-  /// ````
-  LikeState call({
-    List<String>? likedIds,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLikeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLikeState.copyWith.fieldName(...)`
-class _$LikeStateCWProxyImpl implements _$LikeStateCWProxy {
-  const _$LikeStateCWProxyImpl(this._value);
-
-  final LikeState _value;
-
-  @override
-  LikeState likedIds(List<String>? likedIds) => this(likedIds: likedIds);
-
-  @override
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// LikeState(...).copyWith(id: 12, name: "My name")
-  /// ````
-  LikeState call({
-    Object? likedIds = const $CopyWithPlaceholder(),
-  }) {
-    return LikeState(
-      likedIds: likedIds == const $CopyWithPlaceholder()
-          ? _value.likedIds
-          // ignore: cast_nullable_to_non_nullable
-          : likedIds as List<String>?,
-    );
-  }
-}
-
-extension $LikeStateCopyWith on LikeState {
-  /// Returns a callable class that can be used as follows: `instanceOfLikeState.copyWith(...)` or like so:`instanceOfLikeState.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$LikeStateCWProxy get copyWith => _$LikeStateCWProxyImpl(this);
-}

lib/presentation/locale_bloc/locale_bloc.dart

@@ -1,18 +0,0 @@
-import 'dart:ui';
-
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../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

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

lib/presentation/locale_bloc/locale_state.dart

@@ -1,16 +0,0 @@
-import 'dart:ui';
-
-import 'package:copy_with_extension/copy_with_extension.dart';
-import 'package:equatable/equatable.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

@@ -1,58 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'locale_state.dart';
-
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$LocaleStateCWProxy {
-  LocaleState currentLocale(Locale currentLocale);
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// LocaleState(...).copyWith(id: 12, name: "My name")
-  /// ````
-  LocaleState call({
-    Locale? currentLocale,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLocaleState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLocaleState.copyWith.fieldName(...)`
-class _$LocaleStateCWProxyImpl implements _$LocaleStateCWProxy {
-  const _$LocaleStateCWProxyImpl(this._value);
-
-  final LocaleState _value;
-
-  @override
-  LocaleState currentLocale(Locale currentLocale) =>
-      this(currentLocale: currentLocale);
-
-  @override
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// LocaleState(...).copyWith(id: 12, name: "My name")
-  /// ````
-  LocaleState call({
-    Object? currentLocale = const $CopyWithPlaceholder(),
-  }) {
-    return LocaleState(
-      currentLocale:
-          currentLocale == const $CopyWithPlaceholder() || currentLocale == null
-              ? _value.currentLocale
-              // ignore: cast_nullable_to_non_nullable
-              : currentLocale as Locale,
-    );
-  }
-}
-
-extension $LocaleStateCopyWith on LocaleState {
-  /// Returns a callable class that can be used as follows: `instanceOfLocaleState.copyWith(...)` or like so:`instanceOfLocaleState.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$LocaleStateCWProxy get copyWith => _$LocaleStateCWProxyImpl(this);
-}

makefile

@@ -1,18 +0,0 @@
-gen:
-	flutter pub run build_runner build --delete-conflicting-outputs
-hello:
-	echo "Hi!"; \
-	echo "I'm makefile"; \
-	echo "^_^"
-icon:
-	flutter pub run flutter_launcher_icons:main
-init_res:
-	dart pub global activate flutter_asset_generator
-format:
-	dart format . --line-length 100
-res:
-	fgen --output lib/components/resources.g.dart --no-watch --no-preview; \
-	make format
-loc:
-	flutter gen-l10n; \
-	make format

pubspec.lock

@@ -22,14 +22,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.9.0"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.1"
   args:
     dependency: transitive
     description:
@@ -142,14 +134,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.1"
   clock:
     dependency: transitive
     description:
@@ -254,14 +238,6 @@ 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:
@@ -291,14 +267,6 @@ 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:
@@ -307,29 +275,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.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:
@@ -354,14 +304,6 @@ 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:
@@ -378,22 +320,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
-  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:
@@ -530,62 +456,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      sha256: "45f7d6bba1128761de5540f39d5ca000ea8a1f22f06b76b61094a60a2997bd0e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  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:
@@ -626,62 +496,6 @@ 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:
@@ -791,30 +605,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
-  vector_graphics:
-    dependency: transitive
-    description:
-      name: vector_graphics
-      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.11+1"
-  vector_graphics_codec:
-    dependency: transitive
-    description:
-      name: vector_graphics_codec
-      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.11+1"
-  vector_graphics_compiler:
-    dependency: transitive
-    description:
-      name: vector_graphics_compiler
-      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.11+1"
   vector_math:
     dependency: transitive
     description:
@@ -863,22 +653,6 @@ 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:
@@ -889,4 +663,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.6.0-0 <4.0.0"
-  flutter: ">=3.24.0"
+  flutter: ">=3.18.0-18.0.pre.54"

pubspec.yaml

@@ -35,9 +35,7 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  # Виджеты
   cupertino_icons: ^1.0.2
-  flutter_svg: 2.0.7
 
   # Сетевое взаимодействие
   json_annotation: ^4.8.1
@@ -49,13 +47,6 @@ dependencies:
   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
@@ -71,28 +62,17 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^5.0.0
 
-  # Иконки
-  flutter_launcher_icons: 0.13.1
-flutter_icons:
-  android: "ic_launcher"
-  ios: true
-  image_path: "assets/launcher.jpeg"
-  min_sdk_android: 21
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
 # The following section is specific to Flutter packages.
 flutter:
-  generate: true
+
   # 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.
   uses-material-design: true
 
-  assets:
-    - assets/svg/
-
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg