added diets to diary

lib/features/diary/presentation/widgets/calendar_widget.dart

@@ -49,12 +49,13 @@ class _CalendarWidgetState extends State<CalendarWidget> {
                   leftChevronVisible: false,
                   rightChevronVisible: false,
                 ),
-                onDaySelected: (selectedDay, focusedDay) {
+                onDaySelected: (selectedDay, focusedDay) async {
                   if (!isSameDay(_selectedDay, selectedDay)) {
                     final today = DateTime.now();
                     if (selectedDay.isAfter(today)) {
                       if ((state is DiaryStateLoaded)) {
-                        if (!state.diary.typeOfDiary.hasChosenDiet) {
+                        final result = await context.read<DiaryCubit>().setSelectedDay(_selectedDay, forDietOnly: true);
+                        if (result == false && context.mounted) {
                           showErrorDialog(context, title: s.want_to_see_tomorrow, description: s.can_not_see_next_day);
                           return;
                         }
@@ -62,11 +63,11 @@ class _CalendarWidgetState extends State<CalendarWidget> {
                           _selectedDay = selectedDay;
                           _focusedDay = focusedDay;
                         });
-                        context.read<DiaryCubit>().setSelectedDay(_selectedDay, forDietOnly: true);
                         return;
                       }
                       if (state is DiaryStateLoadedTomorrowWithDiet) {
-                        if (!state.diary.typeOfDiary.hasChosenDiet) {
+                        final result = await context.read<DiaryCubit>().setSelectedDay(_selectedDay, forDietOnly: true);
+                        if (result == false && context.mounted) {
                           showErrorDialog(context, title: s.want_to_see_tomorrow, description: s.can_not_see_next_day);
                           return;
                         }
@@ -74,7 +75,6 @@ class _CalendarWidgetState extends State<CalendarWidget> {
                           _selectedDay = selectedDay;
                           _focusedDay = focusedDay;
                         });
-                        context.read<DiaryCubit>().setSelectedDay(_selectedDay, forDietOnly: true);
                         return;
                       }
                     }

lib/features/diary/presentation/widgets/chosen_diet_widget.dart

@@ -0,0 +1,82 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_divider.dart';
+import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
+import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class ChosenDietWidget extends StatelessWidget {
+  const ChosenDietWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<DiaryCubit, DiaryState>(builder: (context, state) {
+      if (state is DiaryStateLoaded) {
+        if (state.diary.typeOfDiary.hasChosenDiet) {
+          return ChosenDietWidgetContent(
+            currentDietDay: state.diary.dayOfChosenDiet ?? 0,
+            dietName: state.diary.diet?.name ?? '',
+            dietDuration: state.diary.diet?.duration ?? 0,
+          );
+        }
+      }
+      if (state is DiaryStateLoadedTomorrowWithDiet) {
+        if (state.diary.typeOfDiary.hasChosenDiet) {
+          return Column(
+            children: [
+              const CustomDivider(),
+              const SizedBox(height: 16),
+              ChosenDietWidgetContent(
+                currentDietDay: state.diary.dayOfChosenDiet ?? 0,
+                dietName: state.diary.diet?.name ?? '',
+                dietDuration: state.diary.diet?.duration ?? 0,
+              ),
+            ],
+          );
+        }
+      }
+
+      return const SizedBox.shrink();
+    });
+  }
+}
+
+class ChosenDietWidgetContent extends StatelessWidget {
+  const ChosenDietWidgetContent({
+    super.key,
+    required this.currentDietDay,
+    required this.dietName,
+    required this.dietDuration,
+  });
+  final int currentDietDay;
+  final String dietName;
+  final int dietDuration;
+  @override
+  Widget build(BuildContext context) {
+    final size = MediaQuery.sizeOf(context);
+    final s = S.of(context);
+    return Column(
+      children: [
+        Row(
+          children: [
+            SizedBox(
+              width: size.width * 0.4,
+              child: Text(dietName, style: TextStyles.textLMedium.copyWith(color: appTheme.black)),
+            ),
+            const Spacer(),
+            Container(
+              decoration: BoxDecoration(color: appTheme.dividerColor, borderRadius: BorderRadius.circular(12)),
+              padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
+              child: Text('${s.day} $currentDietDay из $dietDuration', style: TextStyles.textMSemibold.copyWith(color: appTheme.gray)),
+            )
+          ],
+        ),
+        const SizedBox(
+          height: 16,
+        )
+      ],
+    );
+  }
+}

lib/features/diary/presentation/widgets/meal_widget.dart

@@ -4,6 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/add_product_button_widget.dart';
+import 'package:eatvio_app/features/diary/presentation/widgets/chosen_diet_widget.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/comment_container.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/meal_button_widget.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/meal_comment_widget.dart';
@@ -57,7 +58,8 @@ class _MealWidgetState extends State<MealWidget> {
             ),
             const SizedBox(height: 12),
             const TimeOfMealPickerWidget(),
-            const SizedBox(height: 12),
+            
+            const ChosenDietWidget(),
             const ProductsListWidget(),
             if (widget.showAddButton) ...[
               const SizedBox(height: 12),

lib/features/diary/presentation/widgets/product_widget.dart

@@ -67,7 +67,7 @@ class _ProductWidgetState extends State<ProductWidget> {
         if (state is DiaryStateLoadedTomorrowWithDiet) {
           return ListTile(
             horizontalTitleGap: 0,
-            contentPadding: widget.portion.fromDiet ? const EdgeInsets.only(right: 24, left: 4) : null,
+            contentPadding: widget.portion.fromDiet ? const EdgeInsets.only(right: 24, left: 12) : null,
             title: Text(widget.portion.productName),
             subtitle: Text('${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}'),
             shape: RoundedRectangleBorder(

lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart

@@ -124,6 +124,7 @@ class _TimeOfMealPickerWidgetState extends State<TimeOfMealPickerWidget> {
                 ),
               ),
               const CustomDivider(),
+              const SizedBox(height: 12),
             ],
           );
         }