Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

refactor(blog_post): Refactoring blog post create and conflict resolve

Browse Source
This commit is contained in:
maxxkim
2024-07-01 16:57:43 +03:00
parent beaaecad3c
commit a022d87adb
13 changed files with 23 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
View File

@@ -190,12 +190,12 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
final recommendedChartValues =
jsonDecode(responseChart.body)['dailyNutritionRecommendation']
.values
.map<int>((value) => value as int)
.map<double>((value) => value as double)
.toList();
final consumedChartValues =
jsonDecode(responseChart.body)['dailyNutritionIntake']
.values
.map<int>((value) => value as int)
.map<double>((value) => value as double)
.toList();
return [recommendedChartValues, consumedChartValues];
} else {
@@ -275,10 +275,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
moderationExpanded: false,
token: token,
recommendedChartValues: recommendedChartValues.values
.map<int>((value) => value as int)
.map<double>((value) => value as double)
.toList(),
consumedChartValues: consumedChartValues.values
.map<int>((value) => value as int)
.map<double>((value) => value as double)
.toList(),
meals: diary['meals'],
portions: diary['meals'][0]['portions'],

8
lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart
View File

@@ -57,8 +57,8 @@ class DiaryEditLoadedState extends DiaryEditState {
List<dynamic>? portions;
List<dynamic>? photos;
List<dynamic>? autocompleteList;
List<int> recommendedChartValues;
List<int> consumedChartValues;
List<double> recommendedChartValues;
List<double> consumedChartValues;
SelectionPopupModel? currentMeal;
SelectionPopupModel? portionController;
TimeOfDay? wakeupController;
@@ -117,8 +117,8 @@ class DiaryEditLoadedState extends DiaryEditState {
SelectionPopupModel? portionController,
String? diaryDate,
String? token,
List<int>? recommendedChartValues,
List<int>? consumedChartValues,
List<double>? recommendedChartValues,
List<double>? consumedChartValues,
List<dynamic>? meals,
List<dynamic>? portions,
List<dynamic>? photos,

6
lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
View File

@@ -720,8 +720,8 @@ class DiaryEditScreen extends StatelessWidget {
}
_buildNutritionChart(BuildContext context, DiaryEditLoadedState state) {
final List<int> recommendedValues = state.recommendedChartValues; // Рекомендуемые значения: калории, жиры, белки, углеводы
final List<int> consumedValues = state.consumedChartValues; //
final List<double> recommendedValues = state.recommendedChartValues; // Рекомендуемые значения: калории, жиры, белки, углеводы
final List<double> consumedValues = state.consumedChartValues; //
return Container(
margin: EdgeInsets.symmetric(horizontal: 16.h),
padding: EdgeInsets.symmetric(
@@ -1196,7 +1196,7 @@ class DiaryEditScreen extends StatelessWidget {
}
}
bool checkConsumedValues(List<int> recommendedValues, List<int> consumedValues) {
bool checkConsumedValues(List<double> recommendedValues, List<double> consumedValues) {
for (int i = 0; i < recommendedValues.length; i++) {
if (consumedValues[i] > recommendedValues[i]) {
// Если хотя бы одно потребленное значение превышает рекомендованное