another fix

lib/data/mappers/characters_mapper.dart

@@ -15,7 +15,7 @@ extension FCharactersDataDtoToModel on FCharactersDataDto {
   HomeData toDomain() {
     int nextPage = 1;
     if (page != null && pages != null) {
-      nextPage = page! >= pages! ? page! : page! + 1;
+      nextPage = page! >= pages! ? -1 : page! + 1;
     }
 
     return HomeData(

lib/data/repositories/mock_repository.dart

@@ -18,6 +18,6 @@ class MockRepository extends ApiInterface {
           species: "Species 1",
           image:
               "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTtAT11wKgHrJBUYzIBFogucXg0a9fE0fQXDQ&s")
-    ]);
+    ], nextPage: -1);
   }
 }

lib/domain/models/home_data.dart

@@ -2,7 +2,7 @@ import 'package:lab/domain/models/card_data.dart';
 
 class HomeData {
   final List<CardData>? data;
-  final int? nextPage;
+  final int nextPage;
 
-  HomeData({this.data, this.nextPage});
+  HomeData({required this.nextPage, this.data});
 }

lib/presentation/pages/home_page/bloc/bloc.dart

@@ -12,6 +12,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future<void> _onLoadData(
       HomeLoadDataEvent event, Emitter<HomeState> emit) async {
+    if (event.nextPage == -1) return;
     if (event.nextPage == null) {
       emit(state.copyWith(isLoading: true));
     } else {

lib/presentation/pages/home_page/home_page.dart

@@ -53,22 +53,28 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   void _onNextPageListener() {
-    if (_scrollController.offset >= _scrollController.position.maxScrollExtent) {
+    if (_scrollController.offset >=
+        _scrollController.position.maxScrollExtent) {
       final bloc = context.read<HomeBloc>();
       if (!bloc.state.isPaginationLoading) {
-        bloc.add(
+        bloc.add(HomeLoadDataEvent(
-            HomeLoadDataEvent(search: _searchController.text, nextPage: bloc.state.data?.nextPage));
+            search: _searchController.text,
+            nextPage: bloc.state.data?.nextPage));
       }
     }
   }
 
   Future<void> _onRefresh() {
-    context.read<HomeBloc>().add(HomeLoadDataEvent(search: _searchController.text));
+    context
+        .read<HomeBloc>()
+        .add(HomeLoadDataEvent(search: _searchController.text));
     return Future.value(null);
   }
 
   void _onSearchInputChange(search) {
-    Debounce.run(action: () => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
+    Debounce.run(
+        action: () =>
+            context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
   }
 
   void _onLike(String? id, String text, bool isLiked) {
@@ -78,7 +84,8 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
-  void _showSnackBar(BuildContext context, String? id, String text, bool isLiked) {
+  void _showSnackBar(
+      BuildContext context, String? id, String text, bool isLiked) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(text),
@@ -109,7 +116,8 @@ class _MyHomePageState extends State<MyHomePage> {
       body: Column(
         children: [
           Padding(
-            padding: const EdgeInsets.only(right: 30, left: 30, top: 20, bottom: 20),
+            padding:
+                const EdgeInsets.only(right: 30, left: 30, top: 20, bottom: 20),
             child: Row(
               children: [
                 Expanded(
@@ -142,7 +150,10 @@ class _MyHomePageState extends State<MyHomePage> {
             builder: (context, state) => state.error != null
                 ? Text(
                     state.error ?? "",
-                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red),
+                    style: Theme.of(context)
+                        .textTheme
+                        .headlineSmall
+                        ?.copyWith(color: Colors.red),
                   )
                 : state.isLoading
                     ? const Padding(
@@ -156,8 +167,10 @@ class _MyHomePageState extends State<MyHomePage> {
                               onRefresh: _onRefresh,
                               child: ListView.separated(
                                 controller: _scrollController,
-                                padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 30),
+                                padding: const EdgeInsets.symmetric(
-                                separatorBuilder: (context, index) => const SizedBox(height: 20),
+                                    vertical: 20, horizontal: 30),
+                                separatorBuilder: (context, index) =>
+                                    const SizedBox(height: 20),
                                 itemCount: state.data?.data?.length ?? 0,
                                 itemBuilder: (context, index) {
                                   final data = state.data?.data?[index];
@@ -166,10 +179,14 @@ class _MyHomePageState extends State<MyHomePage> {
                                       ? const SizedBox.shrink()
                                       : Card.fromData(
                                           data,
-                                          isLiked: likeState.likedIds?.contains(data.id) == true,
+                                          isLiked: likeState.likedIds
-                                          onLike: (String? id, String text, bool isLiked) =>
+                                                  ?.contains(data.id) ==
+                                              true,
+                                          onLike: (String? id, String text,
+                                                  bool isLiked) =>
                                               _onLike(id, text, isLiked),
-                                          onTap: () => _navigateToDetailsPage(context, data),
+                                          onTap: () => _navigateToDetailsPage(
+                                              context, data),
                                         );
                                 },
                               ),
@@ -180,7 +197,10 @@ class _MyHomePageState extends State<MyHomePage> {
           ),
           BlocBuilder<HomeBloc, HomeState>(
             builder: (context, state) => state.isPaginationLoading
-                ? const CircularProgressIndicator()
+                ? const Padding(
+                    padding: EdgeInsets.symmetric(vertical: 10),
+                    child: CircularProgressIndicator(),
+                  )
                 : const SizedBox.shrink(),
           ),
         ],