lib/components/utils/debounce.dart

@@ -1,18 +0,0 @@
-import 'dart:async';
-import 'dart:ui';
-
-class Debounce {
-  factory Debounce() => _instance;
-
-  Debounce._();
-  static final Debounce _instance = Debounce._();
-  static Timer? _timer;
-
-  static void run(
-      VoidCallback action, {
-        Duration delay = const Duration(milliseconds: 500),
-      }) {
-    _timer?.cancel();
-    _timer = Timer(delay, action);
-  }
-}

lib/data/dtos/characters_dto.dart

@@ -6,8 +6,7 @@ part 'characters_dto.g.dart';
 @JsonSerializable(createToJson: false)
 class CharactersDto{
   final List<CharactersDataDto>? data;
-  final MetaDto? meta;
+  const CharactersDto({this.data});
-  const CharactersDto({this.data, this.meta});
   factory CharactersDto.fromJson(Map<String, dynamic> json) => _$CharactersDtoFromJson(json);
 }
 
@@ -29,24 +28,4 @@ class CharasterAttributesDataDto{
 
   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

@@ -11,9 +11,6 @@ CharactersDto _$CharactersDtoFromJson(Map<String, dynamic> json) =>
       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) =>
@@ -34,16 +31,3 @@ CharasterAttributesDataDto _$CharasterAttributesDataDtoFromJson(
       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/mappes/characters_mapper.dart

@@ -1,6 +1,5 @@
 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';
@@ -12,6 +11,7 @@ extension CharacterDataDtoToModel on CharactersDataDto {
     imgUrl: attributes?.image ?? _imagePlaceholder,
     description: _makeDescription(attributes?.born, attributes?.died),
   );
+
   String _makeDescription(String? born, String? died){
     return born != null && died != null
         ? '$born - $died'
@@ -21,11 +21,4 @@ extension CharacterDataDtoToModel on CharactersDataDto {
             ? 'died: $died'
             : '';
   }
-}
+}
-
-extension CharactersDtoToModel on CharactersDto {
-  HomeData toDomain() => HomeData(
-    data: data?.map((e) => e.toDomain()).toList(),
-    nextPage: meta?.pagination?.next,
-  );
-}

lib/domain/models/home.dart

@@ -1,8 +0,0 @@
-import 'card.dart';
-
-class HomeData {
-  final List<CardData>? data;
-  final int? nextPage;
-
-  HomeData({this.data, this.nextPage});
-}

lib/main.dart

@@ -1,8 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.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';
 
 void main() {
   runApp(const MyApp());
@@ -19,15 +16,7 @@ class MyApp extends StatelessWidget {
         // colorScheme: ColorScheme.fromSeed(seedColor: Colors.black),                                                                                                                  colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
         useMaterial3: true,
       ),
-      home: RepositoryProvider<PotterRepository>(
+      home: const MyHomePage(title: 'Flutter rocks!'),
-        lazy: true,
-        create: (_) => PotterRepository(),
-        child: BlocProvider<HomeBloc>(
-            lazy: true,
-            create: (context) => HomeBloc(context.read<PotterRepository>()),
-            child: const MyHomePage(title: 'Potter API'),
-        ),
-      )
     );
   }
 }

lib/presentation/home_page/bloc/bloc.dart

@@ -1,41 +0,0 @@
-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';
-
-class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  final PotterRepository 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(
-      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 +0,0 @@
-
-class HomeEvent {
-  const HomeEvent();
-}
-
-class HomeLoadDataEvent extends HomeEvent{
-  final String? search;
-  final int? nextPage;
-  const HomeLoadDataEvent({this.search, this.nextPage});
-
-}

lib/presentation/home_page/bloc/state.dart

@@ -1,44 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:copy_with_extension/copy_with_extension.dart';
-import 'package:pmd_lab/domain/models/card.dart';
-import 'package:pmd_lab/domain/models/home.dart';
-
-part 'state.g.dart';
-
-@CopyWith()
-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,
-  ];
-}
-
-

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

@@ -1,92 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'state.dart';
-
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$HomeStateCWProxy {
-  HomeState data(HomeData? data);
-
-  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.
-  ///
-  /// Usage
-  /// ```dart
-  /// HomeState(...).copyWith(id: 12, name: "My name")
-  /// ````
-  HomeState call({
-    HomeData? data,
-    bool? isLoading,
-    bool? isPaginationLoading,
-    String? error,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfHomeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfHomeState.copyWith.fieldName(...)`
-class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy {
-  const _$HomeStateCWProxyImpl(this._value);
-
-  final HomeState _value;
-
-  @override
-  HomeState data(HomeData? data) => this(data: data);
-
-  @override
-  HomeState isLoading(bool isLoading) => this(isLoading: isLoading);
-
-  @override
-  HomeState isPaginationLoading(bool isPaginationLoading) =>
-      this(isPaginationLoading: isPaginationLoading);
-
-  @override
-  HomeState error(String? error) => this(error: error);
-
-  @override
-
-  /// 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.
-  ///
-  /// Usage
-  /// ```dart
-  /// HomeState(...).copyWith(id: 12, name: "My name")
-  /// ````
-  HomeState call({
-    Object? data = const $CopyWithPlaceholder(),
-    Object? isLoading = const $CopyWithPlaceholder(),
-    Object? isPaginationLoading = const $CopyWithPlaceholder(),
-    Object? error = const $CopyWithPlaceholder(),
-  }) {
-    return HomeState(
-      data: data == const $CopyWithPlaceholder()
-          ? _value.data
-          // ignore: cast_nullable_to_non_nullable
-          : data as HomeData?,
-      isLoading: isLoading == const $CopyWithPlaceholder() || isLoading == null
-          ? _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
-          : error as String?,
-    );
-  }
-}
-
-extension $HomeStateCopyWith on HomeState {
-  /// Returns a callable class that can be used as follows: `instanceOfHomeState.copyWith(...)` or like so:`instanceOfHomeState.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$HomeStateCWProxy get copyWith => _$HomeStateCWProxyImpl(this);
-}

lib/presentation/home_page/home_page.dart

@@ -1,12 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:pmd_lab/components/utils/debounce.dart';
 import 'package:pmd_lab/domain/models/card.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';
@@ -79,36 +74,14 @@ class Body extends StatefulWidget {
 }
 
 class _BodyState extends State<Body> {
-  final searchController = TextEditingController();
-  final scrollController = ScrollController();
   final ApiInterface repo = PotterRepository();
-  late Future<List<CardData>?> data;
+  late Future<List<CardData>?> data = repo.loadData(q: null);
+  final TextEditingController searchController = TextEditingController();
 
   @override
   void initState() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      context.read<HomeBloc>().add(const HomeLoadDataEvent());
-    });
-    scrollController.addListener(_onNextPageListener);
     super.initState();
-  }
+    data = repo.loadData(q: null);
-  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();
-
-    super.dispose();
   }
 
   @override
@@ -123,43 +96,34 @@ class _BodyState extends State<Body> {
             child: CupertinoSearchTextField(
               controller: searchController,
               onChanged: (search) {
-                Debounce.run(() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
+                setState(() {
+                  data = repo.loadData(q: search.isNotEmpty ? search : null);
+                });
               },
             ),
           ),
-
+          Expanded(
-          BlocBuilder<HomeBloc, HomeState>(
+              child: FutureBuilder<List<CardData>?>(
-            builder: (context, state) => state.error != null
+                future: data,
-              ? Text(
+                builder: (context, snapshot) =>
-                  state.error ?? '',
+                    SingleChildScrollView(
-                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red),
+                        padding: const EdgeInsets.only(
-                )
+                            left: 20, right: 20, top: 20),
-              : state.isLoading
+                        child: snapshot.hasData
-                ? const CircularProgressIndicator()
+                            ? Column(
-                : Expanded(
+                          children: snapshot.data?.map((data) {
-                  child: RefreshIndicator(
+                            return _Card.fromData(
-                    onRefresh: _onRefresh,
+                              data,
-                    child: ListView.builder(
+                              onLike: (text, isLiked) =>
-                      padding: EdgeInsets.zero,
+                                  _showSnackBar(context, text, isLiked),
-                      itemCount: state.data?.data?.length ?? 0,
+                              onTap: () => _navToDetails(context, data),
-                      itemBuilder: (context, index) {
+                            );
-                        final data = state.data?.data?[index];
+                          }).toList() ??
-                        return data != null
+                              [],
-                            ? _Card.fromData(
-                          data,
-                          onLike: (title, isLiked) => _showSnackBar(context, title, isLiked),
-                          onTap: () => _navToDetails(context, data),
                         )
-                            : const SizedBox.shrink();
+                            : const CircularProgressIndicator()
-                  },
+                    ),
-                ), // ListView.builder
+              )
-              ), // RefreshIndicator
-            ), // Expanded
-          ), // BlocBuilder
-          BlocBuilder<HomeBloc, HomeState>(
-            builder: (context, state) => state.isPaginationLoading
-                ? const CircularProgressIndicator()
-                : const SizedBox.shrink(),
           )
         ],
       ),
@@ -188,9 +152,5 @@ class _BodyState extends State<Body> {
     );
   }
 
-  Future<void> _onRefresh() {
-    context.read<HomeBloc>().add(HomeLoadDataEvent(search: searchController.text));
-    return Future.value(null);
-  }
 
 }

lib/repositories/api_interface.dart

@@ -1,9 +1,5 @@
-
+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<List<CardData>?> loadData({String? q});
-}
+}
-

lib/repositories/mock_repository.dart

@@ -1,30 +1,28 @@
-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 {
+  Future <List<CardData>?> loadData({String? q}) async {
-  return HomeData();
+  return [
-    // return [
+    CardData(
-    // CardData(
+      'Какая-то новость',
-    //   'Какая-то новость',
+      description: 'В данном блоке рекомендуем разместить краткую информацию',
-    //   description: 'В данном блоке рекомендуем разместить краткую информацию',
+      imgUrl:
-    //   imgUrl:
+      'https://universal.revengel.ru/assets/cache_image/images/services/3_731x487_1cb.png',
-    //   'https://universal.revengel.ru/assets/cache_image/images/services/3_731x487_1cb.png',
+    ),
-    // ),
+    CardData(
-    // CardData(
+      'Ещё какая-то новость',
-    //   'Ещё какая-то новость',
+      description: 'В данном блоке рекомендуем разместить краткую информацию',
-    //   description: 'В данном блоке рекомендуем разместить краткую информацию',
+      imgUrl:
-    //   imgUrl:
+      "https://universal.revengel.ru/assets/cache_image/images/services/2_731x487_1cb.png",
-    //   "https://universal.revengel.ru/assets/cache_image/images/services/2_731x487_1cb.png",
+    ),
-    // ),
+    CardData(
-    // CardData(
+      'Ещё одна новость',
-    //   'Ещё одна новость',
+      description: 'В данном блоке рекомендуем разместить краткую информацию',
-    //   description: 'В данном блоке рекомендуем разместить краткую информацию',
+      imgUrl:
-    //   imgUrl:
+      "https://universal.revengel.ru/assets/cache_image/images/services/1_731x487_1cb.png",
-    //   "https://universal.revengel.ru/assets/cache_image/images/services/1_731x487_1cb.png",
+    )
-    // )
+  ];
-  //];
   }
 }

lib/repositories/potter_repository.dart

@@ -4,7 +4,6 @@ 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';
 
@@ -18,30 +17,22 @@ class PotterRepository extends ApiInterface{
   static const String _baseUrl = 'https://api.potterdb.com';
 
   @override
-  Future<HomeData?> loadData({
+  Future<List<CardData>?> loadData({String? q}) async {
-    OnErrorCallback? onError,
+    try{
-    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: {
+        queryParameters: q != null ? {"filter[name_cont]": q} : null,
-          '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();
+      final List<CardData>? data = dto.data?.map((e) => e.toDomain()).toList();
       return data;
 
-    } on DioException catch (e) {
+    }
-      onError?.call(e.error?.toString());
+    on DioException catch (e) {
+      log("DioException: $e");
       return null;
     }
   }

pubspec.lock

@@ -38,14 +38,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
-  bloc:
-    dependency: transitive
-    description:
-      name: bloc
-      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.4"
   boolean_selector:
     dependency: transitive
     description:
@@ -166,22 +158,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
-  copy_with_extension:
-    dependency: transitive
-    description:
-      name: copy_with_extension
-      sha256: fbcf890b0c34aedf0894f91a11a579994b61b4e04080204656b582708b5b1125
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.4"
-  copy_with_extension_gen:
-    dependency: "direct main"
-    description:
-      name: copy_with_extension_gen
-      sha256: "51cd11094096d40824c8da629ca7f16f3b7cea5fc44132b679617483d43346b0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.4"
   crypto:
     dependency: transitive
     description:
@@ -222,14 +198,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
@@ -259,14 +227,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -432,14 +392,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   package_config:
     dependency: transitive
     description:
@@ -472,14 +424,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:

pubspec.yaml

@@ -39,9 +39,6 @@ dependencies:
   dio: ^5.4.2+1
   pretty_dio_logger: ^1.3.1
 
-  equatable: ^2.0.5
-  flutter_bloc: ^8.1.5
-  copy_with_extension_gen: ^5.0.4
 dev_dependencies:
   flutter_test:
     sdk: flutter