merge fromdiary to main

lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart

@@ -1,6 +1,7 @@
 //import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart';
 import 'dart:async';
 
+import 'package:eatvio_app/app_router.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import '/core/app_export.dart';
@@ -10,6 +11,7 @@ import 'dart:convert';
 import 'package:hive/hive.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:go_router/go_router.dart';
 
 part 'plan_select_event.dart';
 part 'plan_select_state.dart';
@@ -28,9 +30,7 @@ class PlanSelectBloc extends Bloc<PlanSelectEvent, PlanSelectState> {
       final box = await Hive.openBox('token');
       final token = box.get('token');
       if (token == null) {
-        NavigatorService.popAndPushNamed(
-          AppRoutes.authScreen,
-        ); // Если токен есть, запускаем приложение
+        AppRouter.navigatorKey.currentContext?.goNamed('authScreen');
       }
       final response = await http.get(
         Uri.parse(dotenv.env['SERVER_ROOT']! + '/plans/index'),

lib/presentation/plans/plan_select_screen/plan_select_screen.dart

@@ -1,10 +1,11 @@
+import 'package:go_router/go_router.dart';
+
 import 'bloc/plan_select_bloc.dart';
 import 'models/plan_select_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
-import 'package:eatvio_app/widgets/custom_bottom_bar.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter/material.dart';
@@ -12,10 +13,7 @@ import 'package:flutter/material.dart';
 class PlanSelectScreen extends StatelessWidget {
   static Widget builder(BuildContext context) {
     return BlocProvider<PlanSelectBloc>(
-        create: (context) => PlanSelectBloc(
-            PlanSelectState(myProfileModelObj: PlanSelectModel()))
-          ..add(PlanSelectInitialEvent()),
-        child: PlanSelectScreen());
+        create: (context) => PlanSelectBloc(PlanSelectState(myProfileModelObj: PlanSelectModel()))..add(PlanSelectInitialEvent()), child: PlanSelectScreen());
   }
 
   Widget build(BuildContext context) {
@@ -23,90 +21,92 @@ class PlanSelectScreen extends StatelessWidget {
       builder: (context, state) {
         if (state is PlanSelectInitialState) {
           // Это начальное состояние, данные ещё не загружены.
-          return CircularProgressIndicator(
-            color: Colors.white,
-            backgroundColor: Colors.white,
+          return Scaffold(
+            body: Center(
+              child: CircularProgressIndicator(),
+            ),
           );
         } else if (state is PlanSelectLoadedState) {
           // Данные загружены, можно строить экран.
           return _buildSetingsScreen(context, state);
         } else {
           // Другие состояния, если они есть.
-          return Container(); // Пустой контейнер для необработанных состояний.
+          return Scaffold(
+            body: Center(
+              child: CircularProgressIndicator(),
+            ),
+          );
         }
       },
     );
   }
 
   _buildSetingsScreen(BuildContext context, PlanSelectLoadedState state) {
-    mediaQueryData = MediaQuery.of(context);
     return Scaffold(
-        backgroundColor: Colors.grey[200],
-        resizeToAvoidBottomInset: true,
-        body: SafeArea(
-        child: SingleChildScrollView(
-          child: Container(
-            width: double.maxFinite,
-            decoration: BoxDecoration(color: Colors.grey[200]),
-            child: Padding(
-              padding: EdgeInsets.all(16),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  SizedBox(height: 10),
-                  Container(
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: const BorderRadius.all(Radius.circular(12)),
-                      boxShadow: [
-                        BoxShadow(
-                          color: Colors.grey.withOpacity(0.5),
-                          spreadRadius: 2,
-                          blurRadius: 5,
-                          offset: Offset(0, 3),
-                        ),
-                      ],
-                    ),
-                    child: CustomAppBar(
-                      height: 54.v,
-                      leadingWidth: 28.h,
-                      leading: AppbarLeadingImage(
-                        imagePath: ImageConstant.imgArrowLeft,
-                        margin: EdgeInsets.only(
-                            left: 16.h, top: 15.v, bottom: 15.v),
-                        onTap: onTapBack(context),
+      appBar: AppBar(
+        toolbarHeight: 0,
+        automaticallyImplyLeading: false,
+      ),
+      backgroundColor: Colors.grey[200],
+      resizeToAvoidBottomInset: true,
+      body: SingleChildScrollView(
+        child: Container(
+          width: double.maxFinite,
+          decoration: BoxDecoration(color: Colors.grey[200]),
+          child: Padding(
+            padding: EdgeInsets.all(16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                SizedBox(height: 10),
+                Container(
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: const BorderRadius.all(Radius.circular(12)),
+                    boxShadow: [
+                      BoxShadow(
+                        color: Colors.grey.withOpacity(0.5),
+                        spreadRadius: 2,
+                        blurRadius: 5,
+                        offset: Offset(0, 3),
                       ),
-                      title: Padding(
-                        padding: EdgeInsets.only(left: 20.h),
-                        child: Row(
-                          children: [
-                            AppbarSubtitle(
-                              text: "Планы",
-                              margin: EdgeInsets.only(
-                                  left: 80.h, top: 12.v, bottom: 9.v),
+                    ],
+                  ),
+                  child: CustomAppBar(
+                    height: 54.v,
+                    leadingWidth: 28.h,
+                    leading: AppbarLeadingImage(
+                      imagePath: ImageConstant.imgArrowLeft,
+                      margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
+                      onTap: () => GoRouter.of(context).pop(),
+                    ),
+                    title: Padding(
+                      padding: EdgeInsets.only(left: 20.h),
+                      child: Row(
+                        children: [
+                          AppbarSubtitle(
+                            text: "Планы",
+                            margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v),
+                          ),
+                          Spacer(),
+                          Padding(
+                            padding: const EdgeInsets.only(right: 20.0),
+                            child: GestureDetector(
+                              onTap: () => GoRouter.of(context).goNamed('planCreateScreen'),
+                              child: Icon(Icons.create_outlined),
                             ),
-                            Spacer(),
-                            Padding(
-                              padding: const EdgeInsets.only(right: 20.0),
-                              child: GestureDetector(
-                                  onTap: () => Navigator.pushNamed(
-                                        context,
-                                        AppRoutes.planCreateScreen,
-                                      ),
-                                  child: Icon(Icons.create_outlined)),
-                            )
-                          ],
-                        ),
+                          )
+                        ],
                       ),
                     ),
                   ),
-                  SizedBox(height: 20),
-                  _buildPlanList(context, state)
-                ],
-              ),
+                ),
+                SizedBox(height: 20),
+                _buildPlanList(context, state)
+              ],
             ),
           ),
-       ),
+        ),
       ),
       bottomNavigationBar: _buildBottomBar(context),
     );
@@ -119,51 +119,51 @@ class PlanSelectScreen extends StatelessWidget {
       itemBuilder: (context, index) {
         final post = state.posts?[index];
         return Container(
-            margin: EdgeInsets.only(bottom: 10),
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: const BorderRadius.all(Radius.circular(12)),
-              boxShadow: [
-                BoxShadow(
-                  color: Colors.grey.withOpacity(0.5),
-                  spreadRadius: 2,
-                  blurRadius: 5,
-                  offset: Offset(0, 3),
-                ),
-              ],
+          margin: EdgeInsets.only(bottom: 10),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: const BorderRadius.all(Radius.circular(12)),
+            boxShadow: [
+              BoxShadow(
+                color: Colors.grey.withOpacity(0.5),
+                spreadRadius: 2,
+                blurRadius: 5,
+                offset: Offset(0, 3),
+              ),
+            ],
+          ),
+          child: ListTile(
+            leading: CachedNetworkImage(
+              imageUrl: dotenv.env['STORAGE_URL']! + post['image'],
+              imageBuilder: (context, imageProvider) => CircleAvatar(
+                backgroundImage: imageProvider,
+                radius: 25,
+              ),
+              placeholder: (context, url) => CircularProgressIndicator(),
+              errorWidget: (context, url, error) => CircleAvatar(
+                child: Icon(Icons.person),
+                backgroundColor: Colors.white,
+                radius: 25,
+              ),
             ),
-            child: ListTile(
-              leading: CachedNetworkImage(
-                imageUrl: dotenv.env['STORAGE_URL']! + post['image'],
-                imageBuilder: (context, imageProvider) => CircleAvatar(
-                  backgroundImage: imageProvider,
-                  radius: 25,
-                ),
-                placeholder: (context, url) => CircularProgressIndicator(),
-                errorWidget: (context, url, error) => CircleAvatar(
-                  child: Icon(Icons.person),
-                  backgroundColor: Colors.white,
-                  radius: 25,
-                ),
+            title: Text(
+              post?['name'] ?? '',
+              style: CustomTextStyles.titleMediumSemiBold,
+            ),
+            subtitle: Text(post?['details'] ?? ''),
+            onTap: () => GoRouter.of(context).goNamed(
+              'planScreen',
+              extra: post?['id'].toString(),
+            ),
+            trailing: GestureDetector(
+              onTap: () => GoRouter.of(context).goNamed(
+                'planEditScreen',
+                extra: post?['id'].toString(),
               ),
-              title: Text(
-                post?['name'] ?? '',
-                style: CustomTextStyles.titleMediumSemiBold,
-              ),
-              subtitle: Text(post?['details'] ?? ''),
-              onTap: () => Navigator.pushNamed(
-                context,
-                AppRoutes.planScreen,
-                arguments: post?['id'].toString(),
-              ),
-              trailing: GestureDetector(
-                  onTap: () => Navigator.pushNamed(
-                        context,
-                        AppRoutes.planEditScreen,
-                        arguments: post?['id'].toString(),
-                      ),
-                  child: Icon(Icons.edit)),
-            ));
+              child: Icon(Icons.edit),
+            ),
+          ),
+        );
       },
     );
   }
@@ -174,11 +174,7 @@ class PlanSelectScreen extends StatelessWidget {
     };
   }
 
-  _buildBottomBar(BuildContext context) {
-    return CustomBottomBar(onChanged: (BottomBarEnum type) {});
-  }
-
   onTapArrowLeft(BuildContext context) {
-    NavigatorService.goBack();
+    GoRouter.of(context).pop();
   }
 }