Merge remote-tracking branch 'refs/remotes/origin/feature/feed'

# Conflicts: # lib/features/calendar/presentation/pages/calendar_screen.dart # lib/features/diary/presentation/pages/diary_screen.dart
2024-08-14 11:35:33 +03:00
parent 750b9dcb15 919035a455
commit 7a88a7fffc
75 changed files with 3888 additions and 2634 deletions
--- a/lib/features/diary/presentation/bloc/diary_bloc.dart
+++ b/lib/features/diary/presentation/bloc/diary_bloc.dart
@@ -1,14 +1,16 @@
 import 'dart:async';
+
 import 'package:eatvio_app/features/diary/models/diary_model.dart';
 import 'package:eatvio_app/features/diary/models/meal.dart';
 import 'package:eatvio_app/features/diary/models/product.dart';
+import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
 import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
-import 'package:intl/intl.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import '/core/app_export.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
+import 'package:intl/intl.dart';
+
+import '/core/app_export.dart';

 part 'diary_event.dart';

@@ -16,8 +18,7 @@ part 'diary_event.dart';
 class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
  final DiaryRepository diaryRepository;

-  DiaryBloc({required this.diaryRepository})
-      : super(const DiaryState.loading()) {
+  DiaryBloc({required this.diaryRepository}) : super(const DiaryState.loading()) {
    on<LoadDiary>(loadDiary);
    on<LoadDiaryById>(loadDiaryById);
    on<ChangeSatiety>(_changeSatiety); // пользователь нажимает на шкалу сытости
@@ -55,29 +56,15 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
      final DiaryModel diary = await diaryRepository.getDiary(diaryID ?? 45);
      final Meal currentMeal = diary.meals[0];

-      List<SelectionPopupModel> portionList = [
-        SelectionPopupModel(title: "gr"),
-        SelectionPopupModel(title: "pcs")
-      ];
+      List<SelectionPopupModel> portionList = [SelectionPopupModel(title: "gr"), SelectionPopupModel(title: "pcs")];

-      final Map<String, dynamic> chartData =
-          await diaryRepository.getChartData(diaryID ?? 45);
-      final Map<String, dynamic> dailyNutritionIntake =
-          chartData['dailyNutritionIntake']!;
-      final Map<String, dynamic> dailyNutritionRecommendations =
-          chartData['dailyNutritionRecommendation']!;
-      final double ccal = dailyNutritionIntake['energy']! /
-          dailyNutritionRecommendations['energy']! *
-          50;
-      final double proteins = dailyNutritionIntake['proteins']! /
-          dailyNutritionRecommendations['proteins']! *
-          50;
-      final double fats = dailyNutritionIntake['fats']! /
-          dailyNutritionRecommendations['fats']! *
-          50;
-      final double carbs = dailyNutritionIntake['carbohydrates']! /
-          dailyNutritionRecommendations['carbohydrates']! *
-          50;
+      final Map<String, dynamic> chartData = await diaryRepository.getChartData(diaryID ?? 45);
+      final Map<String, dynamic> dailyNutritionIntake = chartData['dailyNutritionIntake']!;
+      final Map<String, dynamic> dailyNutritionRecommendations = chartData['dailyNutritionRecommendation']!;
+      final double ccal = dailyNutritionIntake['energy']! / dailyNutritionRecommendations['energy']! * 50;
+      final double proteins = dailyNutritionIntake['proteins']! / dailyNutritionRecommendations['proteins']! * 50;
+      final double fats = dailyNutritionIntake['fats']! / dailyNutritionRecommendations['fats']! * 50;
+      final double carbs = dailyNutritionIntake['carbohydrates']! / dailyNutritionRecommendations['carbohydrates']! * 50;

      Color getColor(double value) {
        if (value >= 99.1) {
@@ -146,29 +133,15 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
      final DiaryModel diary = await diaryRepository.getDiary(diaryID);
      final Meal currentMeal = diary.meals[0];

-      List<SelectionPopupModel> portionList = [
-        SelectionPopupModel(title: "gr"),
-        SelectionPopupModel(title: "pcs")
-      ];
+      List<SelectionPopupModel> portionList = [SelectionPopupModel(title: "gr"), SelectionPopupModel(title: "pcs")];

-      final Map<String, dynamic> chartData =
-          await diaryRepository.getChartData(diaryID);
-      final Map<String, dynamic> dailyNutritionIntake =
-          chartData['dailyNutritionIntake']!;
-      final Map<String, dynamic> dailyNutritionRecommendations =
-          chartData['dailyNutritionRecommendation']!;
-      final double ccal = dailyNutritionIntake['energy']! /
-          dailyNutritionRecommendations['energy']! *
-          50;
-      final double proteins = dailyNutritionIntake['proteins']! /
-          dailyNutritionRecommendations['proteins']! *
-          50;
-      final double fats = dailyNutritionIntake['fats']! /
-          dailyNutritionRecommendations['fats']! *
-          50;
-      final double carbs = dailyNutritionIntake['carbohydrates']! /
-          dailyNutritionRecommendations['carbohydrates']! *
-          50;
+      final Map<String, dynamic> chartData = await diaryRepository.getChartData(diaryID);
+      final Map<String, dynamic> dailyNutritionIntake = chartData['dailyNutritionIntake']!;
+      final Map<String, dynamic> dailyNutritionRecommendations = chartData['dailyNutritionRecommendation']!;
+      final double ccal = dailyNutritionIntake['energy']! / dailyNutritionRecommendations['energy']! * 50;
+      final double proteins = dailyNutritionIntake['proteins']! / dailyNutritionRecommendations['proteins']! * 50;
+      final double fats = dailyNutritionIntake['fats']! / dailyNutritionRecommendations['fats']! * 50;
+      final double carbs = dailyNutritionIntake['carbohydrates']! / dailyNutritionRecommendations['carbohydrates']! * 50;

      Color getColor(double value) {
        if (value >= 99.1) {
@@ -271,11 +244,9 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
  ) async {
    if (state is DiaryStateLoaded) {
      var currentState = state as DiaryStateLoaded;
-      var updatedState =
-          currentState.copyWith(wakeupController: event.selectedTime);
+      var updatedState = currentState.copyWith(wakeupController: event.selectedTime);
      final DateFormat formatter = DateFormat('HH:mm');
-      final String wakeupString = formatter.format(DateTime(
-          2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
+      final String wakeupString = formatter.format(DateTime(2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
      await diaryRepository.changeWakeup(
        currentState.diary.id,
        wakeupString,
@@ -290,11 +261,9 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
  ) async {
    if (state is DiaryStateLoaded) {
      var currentState = state as DiaryStateLoaded;
-      var updatedState =
-          currentState.copyWith(retireController: event.selectedTime);
+      var updatedState = currentState.copyWith(retireController: event.selectedTime);
      final DateFormat formatter = DateFormat('HH:mm');
-      final String retireString = formatter.format(DateTime(
-          2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
+      final String retireString = formatter.format(DateTime(2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
      await diaryRepository.changeRetire(
        currentState.diary.id,
        retireString,
@@ -320,8 +289,7 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
  ) async {
    if (state is DiaryStateLoaded) {
      final currentState = state as DiaryStateLoaded;
-      final Meal meal = currentState.diary.meals
-          .firstWhere((meal) => meal.type == event.value.id);
+      final Meal meal = currentState.diary.meals.firstWhere((meal) => meal.type == event.value.id);
      DiaryStateLoaded updatedState = currentState.copyWith(
        currentMeal: meal,
        portions: meal.portions,
@@ -340,12 +308,10 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
    if (state is DiaryStateLoaded) {
      var currentState = state as DiaryStateLoaded;

-      final Map<String, List<Product>> productNutritionalValues =
-          await diaryRepository.inputProduct(event.input);
+      final Map<String, List<Product>> productNutritionalValues = await diaryRepository.inputProduct(event.input);
      var updatedState = currentState.copyWith(
        product_nameController: TextEditingController(text: event.input),
-        autocompleteList:
-            productNutritionalValues['product_nutritional_value'] ?? [],
+        autocompleteList: productNutritionalValues['product_nutritional_value'] ?? [],
      );
      if (event.input.length > 3) {
        updatedState = updatedState.copyWith(moderationExpanded: true);
--- a/lib/features/diary/presentation/bloc/diary_event.dart
+++ b/lib/features/diary/presentation/bloc/diary_event.dart
@@ -19,7 +19,9 @@ class LoadDiaryById extends DiaryEvent {
  LoadDiaryById(
    this.id,
  );
+
  final String? id;
+
  @override
  List<Object?> get props => [];
 }
@@ -28,7 +30,9 @@ class ChangeSatiety extends DiaryEvent {
  ChangeSatiety(
    this.selectedElement,
  );
+
  final int selectedElement;
+
  @override
  List<Object> get props => [selectedElement];
 }
@@ -37,28 +41,35 @@ class ChangeMood extends DiaryEvent {
  ChangeMood(
    this.selectedElement,
  );
+
  final int selectedElement;
+
  @override
  List<Object> get props => [selectedElement];
 }

 class ChangeMealTime extends DiaryEvent {
  ChangeMealTime(this.time);
+
  final TimeOfDay time;
+
  @override
  List<Object> get props => [time];
 }

 class AddComment extends DiaryEvent {
  AddComment(this.diaryId, this.comment);
+
  final String comment;
  final int diaryId;
+
  @override
  List<Object> get props => [comment, diaryId];
 }

 class WakeupEvent extends DiaryEvent {
  WakeupEvent(this.selectedTime);
+
  final TimeOfDay selectedTime;

  @override
@@ -67,6 +78,7 @@ class WakeupEvent extends DiaryEvent {

 class RetireEvent extends DiaryEvent {
  RetireEvent(this.selectedTime);
+
  final TimeOfDay selectedTime;

  @override
@@ -85,62 +97,78 @@ class ToggleWakeupExpandedEvent extends DiaryEvent {

 class AddPortionEvent extends DiaryEvent {
  AddPortionEvent();
+
  @override
  List<Object> get props => [];
 }

 class RemovePortionEvent extends DiaryEvent {
  RemovePortionEvent(this.portionId);
+
  final int portionId;
+
  @override
  List<Object> get props => [portionId];
 }

 class UploadImages extends DiaryEvent {
  UploadImages(this.image);
+
  final XFile image;
+
  @override
  List<Object> get props => [image];
 }

 class RemoveImageEvent extends DiaryEvent {
  RemoveImageEvent(this.photoID, this.path);
+
  final String photoID;
  final String path;
+
  @override
  List<Object> get props => [photoID, path];
 }

 class ProductInput extends DiaryEvent {
  ProductInput(this.input);
+
  final String input;
+
  @override
  List<Object> get props => [input];
 }

 class ChangeMeal extends DiaryEvent {
  ChangeMeal({required this.value});
+
  SelectionPopupModel value;
+
  @override
  List<Object?> get props => [value];
 }

 class ClearInput extends DiaryEvent {
  ClearInput({required this.value});
+
  TextEditingController value;
+
  @override
  List<Object?> get props => [value];
 }

 class ChangePortion extends DiaryEvent {
  ChangePortion({required this.value});
+
  SelectionPopupModel value;
+
  @override
  List<Object?> get props => [value];
 }

 class FinishDay extends DiaryEvent {
  FinishDay();
+
  @override
  List<Object?> get props => [];
 }
@@ -160,12 +188,13 @@ class SendModeration extends DiaryEvent {
    required this.fatsOn100gr,
    required this.carbohydratesOn100gr,
  });
+
  String name;
  String energyOn100gr;
  String proteinsOn100gr;
  String fatsOn100gr;
  String carbohydratesOn100gr;
+
  @override
-  List<Object?> get props =>
-      [name, energyOn100gr, proteinsOn100gr, fatsOn100gr, carbohydratesOn100gr];
+  List<Object?> get props => [name, energyOn100gr, proteinsOn100gr, fatsOn100gr, carbohydratesOn100gr];
 }