7 lab check 3

2024-10-17 11:02:31 +04:00 · 2024-10-17 11:02:31 +04:00 · a784c2d9ed
commit a784c2d9ed
parent 5add92307a
9 changed files with 171 additions and 62 deletions
--- a/assets/icon.jpg
+++ b/assets/icon.jpg
--- a/assets/svg/ru.svg
+++ b/assets/svg/ru.svg
@ -0,0 +1,19 @@
+<?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>
--- a/assets/svg/us.svg
+++ b/assets/svg/us.svg
@ -0,0 +1,34 @@
+<?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_3486)">
+<rect width="28" height="20" rx="2" fill="white"/>
+<mask id="mask0_503_3486" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="28" height="20">
+<rect width="28" height="20" rx="2" fill="white"/>
+</mask>
+<g mask="url(#mask0_503_3486)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28 0H0V1.33333H28V0ZM28 2.66667H0V4H28V2.66667ZM0 5.33333H28V6.66667H0V5.33333ZM28 8H0V9.33333H28V8ZM0 10.6667H28V12H0V10.6667ZM28 13.3333H0V14.6667H28V13.3333ZM0 16H28V17.3333H0V16ZM28 18.6667H0V20H28V18.6667Z" fill="#D02F44"/>
+<rect width="12" height="9.33333" fill="#46467F"/>
+<g filter="url(#filter0_d_503_3486)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.66665 1.99999C2.66665 2.36818 2.36817 2.66666 1.99998 2.66666C1.63179 2.66666 1.33331 2.36818 1.33331 1.99999C1.33331 1.63181 1.63179 1.33333 1.99998 1.33333C2.36817 1.33333 2.66665 1.63181 2.66665 1.99999ZM5.33331 1.99999C5.33331 2.36818 5.03484 2.66666 4.66665 2.66666C4.29846 2.66666 3.99998 2.36818 3.99998 1.99999C3.99998 1.63181 4.29846 1.33333 4.66665 1.33333C5.03484 1.33333 5.33331 1.63181 5.33331 1.99999ZM7.33331 2.66666C7.7015 2.66666 7.99998 2.36818 7.99998 1.99999C7.99998 1.63181 7.7015 1.33333 7.33331 1.33333C6.96512 1.33333 6.66665 1.63181 6.66665 1.99999C6.66665 2.36818 6.96512 2.66666 7.33331 2.66666ZM10.6666 1.99999C10.6666 2.36818 10.3682 2.66666 9.99998 2.66666C9.63179 2.66666 9.33331 2.36818 9.33331 1.99999C9.33331 1.63181 9.63179 1.33333 9.99998 1.33333C10.3682 1.33333 10.6666 1.63181 10.6666 1.99999ZM3.33331 3.99999C3.7015 3.99999 3.99998 3.70152 3.99998 3.33333C3.99998 2.96514 3.7015 2.66666 3.33331 2.66666C2.96512 2.66666 2.66665 2.96514 2.66665 3.33333C2.66665 3.70152 2.96512 3.99999 3.33331 3.99999ZM6.66665 3.33333C6.66665 3.70152 6.36817 3.99999 5.99998 3.99999C5.63179 3.99999 5.33331 3.70152 5.33331 3.33333C5.33331 2.96514 5.63179 2.66666 5.99998 2.66666C6.36817 2.66666 6.66665 2.96514 6.66665 3.33333ZM8.66665 3.99999C9.03484 3.99999 9.33331 3.70152 9.33331 3.33333C9.33331 2.96514 9.03484 2.66666 8.66665 2.66666C8.29846 2.66666 7.99998 2.96514 7.99998 3.33333C7.99998 3.70152 8.29846 3.99999 8.66665 3.99999ZM10.6666 4.66666C10.6666 5.03485 10.3682 5.33333 9.99998 5.33333C9.63179 5.33333 9.33331 5.03485 9.33331 4.66666C9.33331 4.29847 9.63179 3.99999 9.99998 3.99999C10.3682 3.99999 10.6666 4.29847 10.6666 4.66666ZM7.33331 5.33333C7.7015 5.33333 7.99998 5.03485 7.99998 4.66666C7.99998 4.29847 7.7015 3.99999 7.33331 3.99999C6.96512 3.99999 6.66665 4.29847 6.66665 4.66666C6.66665 5.03485 6.96512 5.33333 7.33331 5.33333ZM5.33331 4.66666C5.33331 5.03485 5.03484 5.33333 4.66665 5.33333C4.29846 5.33333 3.99998 5.03485 3.99998 4.66666C3.99998 4.29847 4.29846 3.99999 4.66665 3.99999C5.03484 3.99999 5.33331 4.29847 5.33331 4.66666ZM1.99998 5.33333C2.36817 5.33333 2.66665 5.03485 2.66665 4.66666C2.66665 4.29847 2.36817 3.99999 1.99998 3.99999C1.63179 3.99999 1.33331 4.29847 1.33331 4.66666C1.33331 5.03485 1.63179 5.33333 1.99998 5.33333ZM3.99998 5.99999C3.99998 6.36819 3.7015 6.66666 3.33331 6.66666C2.96512 6.66666 2.66665 6.36819 2.66665 5.99999C2.66665 5.6318 2.96512 5.33333 3.33331 5.33333C3.7015 5.33333 3.99998 5.6318 3.99998 5.99999ZM5.99998 6.66666C6.36817 6.66666 6.66665 6.36819 6.66665 5.99999C6.66665 5.6318 6.36817 5.33333 5.99998 5.33333C5.63179 5.33333 5.33331 5.6318 5.33331 5.99999C5.33331 6.36819 5.63179 6.66666 5.99998 6.66666ZM9.33331 5.99999C9.33331 6.36819 9.03484 6.66666 8.66665 6.66666C8.29846 6.66666 7.99998 6.36819 7.99998 5.99999C7.99998 5.6318 8.29846 5.33333 8.66665 5.33333C9.03484 5.33333 9.33331 5.6318 9.33331 5.99999ZM9.99998 8C10.3682 8 10.6666 7.70152 10.6666 7.33333C10.6666 6.96514 10.3682 6.66666 9.99998 6.66666C9.63179 6.66666 9.33331 6.96514 9.33331 7.33333C9.33331 7.70152 9.63179 8 9.99998 8ZM7.99998 7.33333C7.99998 7.70152 7.7015 8 7.33331 8C6.96512 8 6.66665 7.70152 6.66665 7.33333C6.66665 6.96514 6.96512 6.66666 7.33331 6.66666C7.7015 6.66666 7.99998 6.96514 7.99998 7.33333ZM4.66665 8C5.03484 8 5.33331 7.70152 5.33331 7.33333C5.33331 6.96514 5.03484 6.66666 4.66665 6.66666C4.29846 6.66666 3.99998 6.96514 3.99998 7.33333C3.99998 7.70152 4.29846 8 4.66665 8ZM2.66665 7.33333C2.66665 7.70152 2.36817 8 1.99998 8C1.63179 8 1.33331 7.70152 1.33331 7.33333C1.33331 6.96514 1.63179 6.66666 1.99998 6.66666C2.36817 6.66666 2.66665 6.96514 2.66665 7.33333Z" fill="url(#paint0_linear_503_3486)"/>
+</g>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_503_3486" x="1.33331" y="1.33333" width="9.33331" height="7.66667" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.06 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_503_3486"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_503_3486" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_503_3486" x1="1.33331" y1="1.33333" x2="1.33331" y2="7.99999" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F0F0F0"/>
+</linearGradient>
+<clipPath id="clip0_503_3486">
+<rect width="28" height="20" rx="2" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/lib/components/locale/l10n/app_locale.dart
+++ b/lib/components/locale/l10n/app_locale.dart
@ -8,6 +8,8 @@ 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)`.
 ///
@ -80,8 +82,7 @@ abstract class AppLocale {
  /// 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>>[
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
    delegate,
    GlobalMaterialLocalizations.delegate,
    GlobalCupertinoLocalizations.delegate,
@ -89,7 +90,10 @@ abstract class AppLocale {
  ];

  /// A list of this localizations delegate's supported locales.
-  static const List<Locale> supportedLocales = <Locale>[Locale('en'), Locale('ru')];
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('en'),
+    Locale('ru')
+  ];

  /// No description provided for @search.
  ///
@ -107,7 +111,7 @@ abstract class AppLocale {
  ///
  /// In ru, this message translates to:
  /// **'разонравился'**
-  String get unliked;
+  String get disliked;
 }

 class _AppLocaleDelegate extends LocalizationsDelegate<AppLocale> {
@ -126,17 +130,18 @@ class _AppLocaleDelegate extends LocalizationsDelegate<AppLocale> {
 }

 AppLocale lookupAppLocale(Locale locale) {
+
+
  // Lookup logic when only language code is specified.
  switch (locale.languageCode) {
-    case 'en':
-      return AppLocaleEn();
-    case 'ru':
-      return AppLocaleRu();
+    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.');
+    '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.'
+  );
 }
--- a/lib/components/locale/l10n/app_locale_en.dart
+++ b/lib/components/locale/l10n/app_locale_en.dart
@ -1,5 +1,7 @@
 import 'app_locale.dart';

+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class AppLocaleEn extends AppLocale {
  AppLocaleEn([String locale = 'en']) : super(locale);
@ -11,6 +13,5 @@ class AppLocaleEn extends AppLocale {
  String get liked => 'liked!';

  @override
-  String get unliked => 'disliked';
-
+  String get disliked => 'разонравился';
 }
--- a/lib/components/locale/l10n/app_locale_ru.dart
+++ b/lib/components/locale/l10n/app_locale_ru.dart
@ -1,5 +1,7 @@
 import 'app_locale.dart';

+// ignore_for_file: type=lint
+
 /// The translations for Russian (`ru`).
 class AppLocaleRu extends AppLocale {
  AppLocaleRu([String locale = 'ru']) : super(locale);
@ -11,5 +13,5 @@ class AppLocaleRu extends AppLocale {
  String get liked => 'понравился!';

  @override
-  String get unliked => 'разонравился';
+  String get disliked => 'разонравился';
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,9 +1,16 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_app/data/repositories/manga_repository.dart';
 import 'package:flutter_app/presentation/home_page/bloc/bloc.dart';
 import 'package:flutter_app/presentation/home_page/home_page.dart';
+import 'package:flutter_app/presentation/like_bloc/like_bloc.dart';
+import 'package:flutter_app/presentation/locale_bloc/locale_bloc.dart';
+import 'package:flutter_app/presentation/locale_bloc/locale_state.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

+import 'components/locale/l10n/app_locale.dart';
+
 void main() {
  runApp(const MyApp());
 }
@ -14,27 +21,36 @@ class MyApp extends StatelessWidget {
  // This widget is the root of your application.
  @override
  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Flutter Demo',
-      theme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
-        useMaterial3: true,
-      ),
-      home: RepositoryProvider<MangaRepository>(
-        lazy: true,
-        create: (_) => MangaRepository(),
-        child: BlocProvider<HomeBloc>(
-          lazy: false,
-          create: (context) => HomeBloc(context.read<MangaRepository>()),
-          child: const HomePage(),
-        ),
-      )
-    );
+    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.deepPurple),
+                  useMaterial3: true,
+                ),
+                home: RepositoryProvider<MangaRepository>(
+                    lazy: true,
+                    create: (_) => MangaRepository(),
+                    child: BlocProvider<LikeBloc>(
+                      lazy: false,
+                      create: (context) => LikeBloc(),
+                      child: BlocProvider<HomeBloc>(
+                        lazy: false,
+                        create: (context) =>
+                            HomeBloc(context.read<MangaRepository>()),
+                        child: const HomePage(),
+                      ),
+                    )));
+          },
+        ));
  }
 }
-
-
-
-
-
-
--- a/lib/presentation/home_page/home_page.dart
+++ b/lib/presentation/home_page/home_page.dart
@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app/components/utils/debounce.dart';
 import 'package:flutter_app/data/repositories/manga_repository.dart';
-import 'package:flutter_app/data/repositories/mock_repository.dart';
 import 'package:flutter_app/presentation/details_page/details_page.dart';
 import 'package:flutter_app/presentation/home_page/bloc/bloc.dart';
 import 'package:flutter_app/presentation/home_page/bloc/events.dart';
@ -10,6 +9,13 @@ import 'package:flutter_app/presentation/home_page/bloc/state.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

 import '../../domain/models/carddata.dart';
+import '../common/svg_objects.dart';
+import '../like_bloc/like_bloc.dart';
+import '../like_bloc/like_event.dart';
+import '../like_bloc/like_state.dart';
+import '../locale_bloc/locale_bloc.dart';
+import '../locale_bloc/locale_events.dart';
+import '../locale_bloc/locale_state.dart';

 part 'card.dart';

@ -45,8 +51,11 @@ 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);

@ -74,7 +83,14 @@ class _BodyState extends State<Body> {
  final MangaRepository repo = MangaRepository();
  var data = MangaRepository().loadData();

-  void _showSnackbar(BuildContext context, String title, bool isLiked) {
+  void _onLike(String? id, String title, bool isLiked) {
+    if (id != null) {
+      context.read<LikeBloc>().add(ChangeLikeEvent(id));
+      _showSnackBar(context, title, !isLiked);
+    }
+  }
+
+  void _showSnackBar(BuildContext context, String title, bool isLiked) {
    WidgetsBinding.instance.addPostFrameCallback((_) {
      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
        content: Text(
@ -114,31 +130,47 @@ class _BodyState extends State<Body> {
                          .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.isLoading
                    ? CircularProgressIndicator()
-                    : Expanded(
-                        child: RefreshIndicator(
-                          onRefresh: _onRefresh,
-                          child: ListView.builder(
-                              controller: scrollController,
-                              padding: EdgeInsets.zero,
-                              itemCount: state.data?.data?.length ?? 0,
-                              itemBuilder: (context, index) {
-                                final data = state.data?.data?[index];
-                                return data != null
-                                    ? _Card.fromData(
-                                        data,
-                                        onLike: (title, isLiked) =>
-                                            _showSnackbar(
-                                                context, title, isLiked),
-                                        onTap: () =>
-                                            _navToDetails(context, data),
-                                      )
-                                    : const SizedBox.shrink();
-                              }),
-                        ),
-                      )),
+                    : BlocBuilder<LikeBloc, LikeState>(
+                        builder: (context, likeState) => Expanded(
+                              child: RefreshIndicator(
+                                onRefresh: _onRefresh,
+                                child: ListView.builder(
+                                    controller: scrollController,
+                                    padding: EdgeInsets.zero,
+                                    itemCount: state.data?.data?.length ?? 0,
+                                    itemBuilder: (context, index) {
+                                      final data = state.data?.data?[index];
+                                      return data != null
+                                          ? _Card.fromData(
+                                              data,
+                                              onLike: _onLike,
+                                              onTap: () =>
+                                                  _navToDetails(context, data),
+                                            )
+                                          : const SizedBox.shrink();
+                                    }),
+                              ),
+                            ))),
            BlocBuilder<HomeBloc, HomeState>(
                builder: (context, state) => state.isPaginationLoading
                    ? const CircularProgressIndicator()
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -47,7 +47,7 @@ dev_dependencies:
 flutter_icons:
  android: "ic_launcher"
  ios: true
-  image_path: "assets/launcher.jpeg"
+  image_path: "assets/icon.jpeg"
  min_sdk_android: 21

 flutter: