merge fromdiary to main

lib/presentation/auth/auth_screen/auth_screen.dart

@@ -1,3 +1,5 @@
+import 'package:go_router/go_router.dart';
+
 import 'bloc/auth_bloc.dart';
 import 'models/auth_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
@@ -19,7 +21,9 @@ class AuthScreen extends StatelessWidget {
         AuthState(
           authModelObj: AuthModel(),
         ),
-      )..add(AuthInitialEvent()),
+      )..add(
+          AuthInitialEvent(),
+        ),
       child: AuthScreen(),
     );
   }
@@ -27,72 +31,82 @@ class AuthScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     mediaQueryData = MediaQuery.of(context);
-    return BlocBuilder<AuthBloc, AuthState>(builder: (context, state) {
-      return Scaffold(
-          resizeToAvoidBottomInset: false,
-          appBar: _buildAppBar(context),
-          body: Container(
-            width: double.maxFinite,
-            padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v),
-            child: Column(children: [
-              SizedBox(height: 36.v),
-              Text("user_authorization".tr,
-                  style: theme.textTheme.headlineSmall),
-              SizedBox(height: 60.v),
-              Text("email".tr, style: theme.textTheme.bodyLarge),
-              SizedBox(height: 3.v),
-              CustomTextFormField(
-                  controller: state.emailController,
-                  textInputAction: TextInputAction.done),
-              SizedBox(height: 22.v),
-              Text("password".tr, style: theme.textTheme.bodyLarge),
-              SizedBox(height: 5.v),
-              CustomTextFormField(
-                obscureText: true,
-                controller: state.passwordController,
-              ),
-              SizedBox(height: 50.v),
-              NextStepButton(
-                  text: "no_account".tr.toUpperCase(),
+    return Scaffold(
+        resizeToAvoidBottomInset: false,
+        appBar: _buildAppBar(context),
+        body: GestureDetector(
+            onTap: () => FocusScope.of(context).unfocus(),
+            child: Container(
+                width: double.maxFinite,
+                padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v),
+                child: Column(children: [
+                  SizedBox(height: 36.v),
+                  Text("user_authorization".tr, style: theme.textTheme.headlineSmall),
+                  SizedBox(height: 60.v),
+                  Text("email".tr, style: theme.textTheme.bodyLarge),
+                  SizedBox(height: 3.v),
+                  BlocSelector<AuthBloc, AuthState, TextEditingController?>(
+                      selector: (state) => state.emailController,
+                      builder: (context, emailController) {
+                        return CustomTextFormField(controller: emailController, textInputAction: TextInputAction.done);
+                      }),
+                  SizedBox(height: 22.v),
+                  Text("password".tr, style: theme.textTheme.bodyLarge),
+                  SizedBox(height: 5.v),
+                  BlocSelector<AuthBloc, AuthState, TextEditingController?>(
+                      selector: (state) => state.passwordController,
+                      builder: (context, passwordController) {
+                        return CustomTextFormField(
+                          obscureText: true,
+                          controller: passwordController,
+                        );
+                      }),
+                  SizedBox(height: 50.v),
+                  NextStepButton(
+                    text: "no_account".tr.toUpperCase(),
+                    margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
+                    buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                    onPressed: onTapNoAccount(context),
+                  ),
+                  /*NextStepButton(
+                  text: "Тест дневника".toUpperCase(),
                   margin:
                       EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
                   buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                  onPressed: onTapNoAccount(context)),
+                  onPressed: onTapDiaryTest(context)),
               NextStepButton(
                   text: "authentificate".tr.toUpperCase(),
                   margin:
                       EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
                   buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                  onPressed: onTapAuth(state, context)),
-            ]),
-          ));
-    });
+                  onPressed: onTapProfileTest(context)),*/
+                  BlocBuilder<AuthBloc, AuthState>(builder: (context, state) {
+                    return NextStepButton(
+                        text: "authentificate".tr.toUpperCase(),
+                        margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
+                        buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                        onPressed: onTapAuth(state, context));
+                  }),
+                ]))));
   }
 
   onTapAuth(AuthState state, BuildContext context) {
     return () async {
-      List<String> errors = validateFields(
-          state.emailController!.text, state.passwordController!.text);
+      List<String> errors = validateFields(state.emailController!.text, state.passwordController!.text);
       if (errors.isEmpty) {
         final Map<String, dynamic> credentials = {
           'email': state.emailController!.text,
           'password': state.passwordController!.text,
         };
-        final response = await http.post(
-            Uri.parse(dotenv.env['SERVER_ROOT']! + '/login'),
-            headers: {'Content-Type': 'application/json'},
-            body: json.encode(credentials),
-            encoding: utf8);
+        final response = await http.post(Uri.parse(dotenv.env['SERVER_ROOT']! + '/login'),
+            headers: {'Content-Type': 'application/json'}, body: json.encode(credentials), encoding: utf8);
         print(response.statusCode);
         if (response.statusCode == 200) {
           var res = await jsonDecode(response.body);
           final box = await Hive.openBox('token');
           final token = res['token'];
           box.put('token', token);
-          Navigator.pushNamed(
-            context,
-            AppRoutes.myProfile,
-          );
+          GoRouter.of(context).go('/my-profile-screen');
         } else {
           showDialog(
             context: context,
@@ -134,34 +148,37 @@ class AuthScreen extends StatelessWidget {
 
   onTapOk(BuildContext context) {
     return () {
-      Navigator.pop(context);
+      GoRouter.of(context).pop(context);
     };
   }
 
   onTapDiaryTest(BuildContext context) {
     return () {
-      Navigator.pushNamed(context, AppRoutes.diaryEdit);
+      GoRouter.of(context).goNamed('diaryScreen');
     };
   }
 
   onTapProfileTest(BuildContext context) {
     return () {
-      Navigator.pushNamed(context, AppRoutes.mySettings);
+      GoRouter.of(context).goNamed('mySettingsScreen');
     };
   }
 
   onTapNoAccount(BuildContext context) {
     return () {
-      Navigator.pushNamed(context, AppRoutes.languageSelectScreen);
+      GoRouter.of(context).goNamed('languageSelectScreen');
     };
   }
 
   /// Section Widget
   _buildAppBar(BuildContext context) {
     return CustomAppBar(
-        leadingWidth: 29.h,
-        centerTitle: true,
-        title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio));
+      leadingWidth: 29.h,
+      centerTitle: true,
+      title: AppbarTitleImage(
+        imagePath: ImageConstant.imgLogoEatvio,
+      ),
+    );
   }
 
   List<String> validateFields(String email, String password) {

lib/presentation/auth/auth_screen/bloc/auth_bloc.dart

@@ -2,7 +2,9 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import '/core/app_export.dart';
 import 'package:eatvio_app/presentation/auth/auth_screen/models/auth_model.dart';
+
 part 'auth_event.dart';
+
 part 'auth_state.dart';
 
 /// A bloc that manages the state of a Auth according to the event that is dispatched to it.
@@ -15,8 +17,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     AuthInitialEvent event,
     Emitter<AuthState> emit,
   ) async {
-    emit(state.copyWith(
+    emit(
+      state.copyWith(
         emailController: TextEditingController(),
-        passwordController: TextEditingController()));
+        passwordController: TextEditingController(),
+      ),
+    );
   }
 }