Merge branch 'main' into main

lib/presentation/auth/auth_screen/auth_screen.dart

@@ -76,7 +76,7 @@ class AuthScreen extends StatelessWidget {
                   buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                   onPressed: onTapDiaryTest(context)),
               NextStepButton(
-                  text: "Тест чата".toUpperCase(),
+                  text: "authentificate".tr.toUpperCase(),
                   margin:
                       EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
                   buttonStyle: CustomButtonStyles.outlinePrimaryTL15,

lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart

@@ -90,7 +90,7 @@ class DiaryEditScreen extends StatelessWidget {
                   ],
                 ),
               ),
-            ),
+            bottomNavigationBar: _buildBottomBar(context) ),
           ),
           _buildEndDay(context),
         ],

lib/presentation/diets/diet_select_screen/diet_select_screen.dart

@@ -108,6 +108,7 @@ class DietSelectScreen extends StatelessWidget {
           ),
         ),
       ),
+      bottomNavigationBar: _buildBottomBar(context),
     );
   }
 

lib/presentation/plans/plan_select_screen/plan_select_screen.dart

@@ -108,6 +108,7 @@ class PlanSelectScreen extends StatelessWidget {
           ),
         ),
       ),
+      bottomNavigationBar: _buildBottomBar(context),
     );
   }
 

lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart

@@ -48,6 +48,10 @@ class MyProfileBloc extends Bloc<MyProfileEvent, MyProfileState> {
             data.containsKey('userDetails') &&
             data.containsKey('chartPoints') &&
             data.containsKey('circumferences')) {
+            final avatarBox = await Hive.openBox('avatar');
+            final avatar = data['user']['profile_photo_path'];
+            print(avatar);
+            avatarBox.put('avatar', avatar);
           if (state is MyProfileLoadedState) {
             var currentState = state as MyProfileLoadedState;
             var plans = []

lib/presentation/profile/my_profile_screen/my_profile_screen.dart

@@ -174,8 +174,7 @@ class MyProfileScreen extends StatelessWidget {
     );
   }
 
-  addImage(BuildContext context) {
-    return () async {
+  addImage(BuildContext context) async {
       final picker = ImagePicker();
       List<XFile>? images = await picker.pickMultiImage();
       if (images.isNotEmpty) {
@@ -183,7 +182,6 @@ class MyProfileScreen extends StatelessWidget {
           context.read<MyProfileBloc>().add(UploadAvatar(image));
         }
       }
-    };
   }
 
   onTapSettings(BuildContext context) {

lib/presentation/profile/my_profile_screen/my_settings_screen.dart

@@ -45,6 +45,7 @@ class MySettingsScreen extends StatelessWidget {
   }
 
   _buildSetingsScreen(BuildContext context, MyProfileLoadedState state) {
+
     return Scaffold(
       appBar: AppBar(
         toolbarHeight: 0,
@@ -169,6 +170,7 @@ class MySettingsScreen extends StatelessWidget {
           ),
         ),
       ),
+      bottomNavigationBar: _buildBottomBar(context),
     );
   }
 

lib/presentation/recipe/recipe_edit_screen/recipe_edit_screen.dart

@@ -62,7 +62,8 @@ class RecipeEditScreen extends StatelessWidget {
               automaticallyImplyLeading: false,
             ),
             resizeToAvoidBottomInset: false,
-            body: Container(
+            body: SafeArea(
+            child: Container(
               width: double.maxFinite,
               decoration: BoxDecoration(color: Colors.grey[200]),
               child: ListView(children: [

lib/presentation/recipe/recipe_select_screen/recipe_select_screen.dart

@@ -107,6 +107,7 @@ class RecipeSelectScreen extends StatelessWidget {
           ),
         ),
       ),
+      bottomNavigationBar: _buildBottomBar(context),
     );
   }