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

feat(diary): new layouts for diary

Browse Source
This commit is contained in:
maxxkim
2024-08-08 13:34:35 +03:00
parent a2ea8dd2ba
commit 1e8b94c6f6
4 changed files with 151 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/features/diary/presentation/bloc/diary_bloc.dart
View File

@@ -110,7 +110,8 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
portionList: portionList,
portionController: portionList[0],
mealList: mealList,
chartData: chartDataCounted,
chartData: chartData,
chartDataCounted: chartDataCounted,
selectedMood: currentMeal.mood,
selectedSatiety: currentMeal.satiety,
wakeupController: TimeOfDay.now(),
@@ -200,7 +201,8 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
portionList: portionList,
portionController: portionList[0],
mealList: mealList,
chartData: chartDataCounted,
chartData: chartData,
chartDataCounted: chartDataCounted,
selectedMood: currentMeal.mood,
selectedSatiety: currentMeal.satiety,
wakeupController: TimeOfDay.now(),

3
lib/features/diary/presentation/bloc/diary_state.dart
View File

@@ -26,6 +26,7 @@ abstract class DiaryState with _$DiaryState {
required List<SelectionPopupModel> mealList,
required List<SelectionPopupModel> portionList,
required List<Product> autocompleteList,
required Map<String, dynamic> chartData,
required Meal currentMeal,
required SelectionPopupModel portionController,
required TimeOfDay wakeupController,
@@ -45,7 +46,7 @@ abstract class DiaryState with _$DiaryState {
required bool moodExpanded,
required bool isLoading,
required bool isAdded,
List<NutritionData>? chartData,
List<NutritionData>? chartDataCounted,
}) = DiaryStateLoaded;
const factory DiaryState.error({

108
lib/features/diary/presentation/bloc/diary_state.freezed.dart
View File

@@ -29,6 +29,7 @@ mixin _$DiaryState {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -48,7 +49,7 @@ mixin _$DiaryState {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)
List<NutritionData>? chartDataCounted)
loaded,
required TResult Function(String errorMessage) error,
}) =>
@@ -66,6 +67,7 @@ mixin _$DiaryState {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -85,7 +87,7 @@ mixin _$DiaryState {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult? Function(String errorMessage)? error,
}) =>
@@ -103,6 +105,7 @@ mixin _$DiaryState {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -122,7 +125,7 @@ mixin _$DiaryState {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -222,6 +225,7 @@ class _$DiaryStateImpl implements _DiaryState {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -241,7 +245,7 @@ class _$DiaryStateImpl implements _DiaryState {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)
List<NutritionData>? chartDataCounted)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -262,6 +266,7 @@ class _$DiaryStateImpl implements _DiaryState {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -281,7 +286,7 @@ class _$DiaryStateImpl implements _DiaryState {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -302,6 +307,7 @@ class _$DiaryStateImpl implements _DiaryState {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -321,7 +327,7 @@ class _$DiaryStateImpl implements _DiaryState {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -450,6 +456,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -469,7 +476,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)
List<NutritionData>? chartDataCounted)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -490,6 +497,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -509,7 +517,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -530,6 +538,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -549,7 +558,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -622,6 +631,7 @@ abstract class _$$DiaryStateLoadedImplCopyWith<$Res> {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -641,7 +651,7 @@ abstract class _$$DiaryStateLoadedImplCopyWith<$Res> {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData});
List<NutritionData>? chartDataCounted});
$DiaryModelCopyWith<$Res> get diary;
$MealCopyWith<$Res> get currentMeal;
@@ -667,6 +677,7 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res>
Object? mealList = null,
Object? portionList = null,
Object? autocompleteList = null,
Object? chartData = null,
Object? currentMeal = null,
Object? portionController = null,
Object? wakeupController = null,
@@ -686,7 +697,7 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res>
Object? moodExpanded = null,
Object? isLoading = null,
Object? isAdded = null,
Object? chartData = freezed,
Object? chartDataCounted = freezed,
}) {
return _then(_$DiaryStateLoadedImpl(
diary: null == diary
@@ -721,6 +732,10 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res>
? _value._autocompleteList
: autocompleteList // ignore: cast_nullable_to_non_nullable
as List<Product>,
chartData: null == chartData
? _value._chartData
: chartData // ignore: cast_nullable_to_non_nullable
as Map<String, dynamic>,
currentMeal: null == currentMeal
? _value.currentMeal
: currentMeal // ignore: cast_nullable_to_non_nullable
@@ -797,9 +812,9 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res>
? _value.isAdded
: isAdded // ignore: cast_nullable_to_non_nullable
as bool,
chartData: freezed == chartData
? _value._chartData
: chartData // ignore: cast_nullable_to_non_nullable
chartDataCounted: freezed == chartDataCounted
? _value._chartDataCounted
: chartDataCounted // ignore: cast_nullable_to_non_nullable
as List<NutritionData>?,
));
}
@@ -842,6 +857,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
required final List<SelectionPopupModel> mealList,
required final List<SelectionPopupModel> portionList,
required final List<Product> autocompleteList,
required final Map<String, dynamic> chartData,
required this.currentMeal,
required this.portionController,
required this.wakeupController,
@@ -861,14 +877,15 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
required this.moodExpanded,
required this.isLoading,
required this.isAdded,
final List<NutritionData>? chartData})
final List<NutritionData>? chartDataCounted})
: _recommendedChartValues = recommendedChartValues,
_consumedChartValues = consumedChartValues,
_portions = portions,
_mealList = mealList,
_portionList = portionList,
_autocompleteList = autocompleteList,
_chartData = chartData;
_chartData = chartData,
_chartDataCounted = chartDataCounted;
@override
final DiaryModel diary;
@@ -925,6 +942,14 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
return EqualUnmodifiableListView(_autocompleteList);
}
final Map<String, dynamic> _chartData;
@override
Map<String, dynamic> get chartData {
if (_chartData is EqualUnmodifiableMapView) return _chartData;
// ignore: implicit_dynamic_type
return EqualUnmodifiableMapView(_chartData);
}
@override
final Meal currentMeal;
@override
@@ -963,19 +988,20 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
final bool isLoading;
@override
final bool isAdded;
final List<NutritionData>? _chartData;
final List<NutritionData>? _chartDataCounted;
@override
List<NutritionData>? get chartData {
final value = _chartData;
List<NutritionData>? get chartDataCounted {
final value = _chartDataCounted;
if (value == null) return null;
if (_chartData is EqualUnmodifiableListView) return _chartData;
if (_chartDataCounted is EqualUnmodifiableListView)
return _chartDataCounted;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(value);
}
@override
String toString() {
return 'DiaryState.loaded(diary: $diary, diaryDate: $diaryDate, recommendedChartValues: $recommendedChartValues, consumedChartValues: $consumedChartValues, portions: $portions, mealList: $mealList, portionList: $portionList, autocompleteList: $autocompleteList, currentMeal: $currentMeal, portionController: $portionController, wakeupController: $wakeupController, retireController: $retireController, mealTimeController: $mealTimeController, commentController: $commentController, product_nameController: $product_nameController, productQuantityController: $productQuantityController, caloriesController: $caloriesController, fatsController: $fatsController, proteinsController: $proteinsController, carbsController: $carbsController, selectedMood: $selectedMood, selectedSatiety: $selectedSatiety, wakeupExpanded: $wakeupExpanded, moderationExpanded: $moderationExpanded, moodExpanded: $moodExpanded, isLoading: $isLoading, isAdded: $isAdded, chartData: $chartData)';
return 'DiaryState.loaded(diary: $diary, diaryDate: $diaryDate, recommendedChartValues: $recommendedChartValues, consumedChartValues: $consumedChartValues, portions: $portions, mealList: $mealList, portionList: $portionList, autocompleteList: $autocompleteList, chartData: $chartData, currentMeal: $currentMeal, portionController: $portionController, wakeupController: $wakeupController, retireController: $retireController, mealTimeController: $mealTimeController, commentController: $commentController, product_nameController: $product_nameController, productQuantityController: $productQuantityController, caloriesController: $caloriesController, fatsController: $fatsController, proteinsController: $proteinsController, carbsController: $carbsController, selectedMood: $selectedMood, selectedSatiety: $selectedSatiety, wakeupExpanded: $wakeupExpanded, moderationExpanded: $moderationExpanded, moodExpanded: $moodExpanded, isLoading: $isLoading, isAdded: $isAdded, chartDataCounted: $chartDataCounted)';
}
@override
@@ -996,6 +1022,8 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
.equals(other._portionList, _portionList) &&
const DeepCollectionEquality()
.equals(other._autocompleteList, _autocompleteList) &&
const DeepCollectionEquality()
.equals(other._chartData, _chartData) &&
(identical(other.currentMeal, currentMeal) ||
other.currentMeal == currentMeal) &&
(identical(other.portionController, portionController) ||
@@ -1035,7 +1063,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
other.isLoading == isLoading) &&
(identical(other.isAdded, isAdded) || other.isAdded == isAdded) &&
const DeepCollectionEquality()
.equals(other._chartData, _chartData));
.equals(other._chartDataCounted, _chartDataCounted));
}
@override
@@ -1049,6 +1077,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
const DeepCollectionEquality().hash(_mealList),
const DeepCollectionEquality().hash(_portionList),
const DeepCollectionEquality().hash(_autocompleteList),
const DeepCollectionEquality().hash(_chartData),
currentMeal,
portionController,
wakeupController,
@@ -1068,7 +1097,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
moodExpanded,
isLoading,
isAdded,
const DeepCollectionEquality().hash(_chartData)
const DeepCollectionEquality().hash(_chartDataCounted)
]);
@JsonKey(ignore: true)
@@ -1092,6 +1121,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -1111,7 +1141,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)
List<NutritionData>? chartDataCounted)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -1124,6 +1154,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
mealList,
portionList,
autocompleteList,
chartData,
currentMeal,
portionController,
wakeupController,
@@ -1143,7 +1174,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
moodExpanded,
isLoading,
isAdded,
chartData);
chartDataCounted);
}
@override
@@ -1160,6 +1191,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -1179,7 +1211,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -1192,6 +1224,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
mealList,
portionList,
autocompleteList,
chartData,
currentMeal,
portionController,
wakeupController,
@@ -1211,7 +1244,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
moodExpanded,
isLoading,
isAdded,
chartData);
chartDataCounted);
}
@override
@@ -1228,6 +1261,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -1247,7 +1281,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -1262,6 +1296,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
mealList,
portionList,
autocompleteList,
chartData,
currentMeal,
portionController,
wakeupController,
@@ -1281,7 +1316,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
moodExpanded,
isLoading,
isAdded,
chartData);
chartDataCounted);
}
return orElse();
}
@@ -1334,6 +1369,7 @@ abstract class DiaryStateLoaded implements DiaryState {
required final List<SelectionPopupModel> mealList,
required final List<SelectionPopupModel> portionList,
required final List<Product> autocompleteList,
required final Map<String, dynamic> chartData,
required final Meal currentMeal,
required final SelectionPopupModel portionController,
required final TimeOfDay wakeupController,
@@ -1353,7 +1389,7 @@ abstract class DiaryStateLoaded implements DiaryState {
required final bool moodExpanded,
required final bool isLoading,
required final bool isAdded,
final List<NutritionData>? chartData}) = _$DiaryStateLoadedImpl;
final List<NutritionData>? chartDataCounted}) = _$DiaryStateLoadedImpl;
DiaryModel get diary;
String? get diaryDate;
@@ -1363,6 +1399,7 @@ abstract class DiaryStateLoaded implements DiaryState {
List<SelectionPopupModel> get mealList;
List<SelectionPopupModel> get portionList;
List<Product> get autocompleteList;
Map<String, dynamic> get chartData;
Meal get currentMeal;
SelectionPopupModel get portionController;
TimeOfDay get wakeupController;
@@ -1382,7 +1419,7 @@ abstract class DiaryStateLoaded implements DiaryState {
bool get moodExpanded;
bool get isLoading;
bool get isAdded;
List<NutritionData>? get chartData;
List<NutritionData>? get chartDataCounted;
@JsonKey(ignore: true)
_$$DiaryStateLoadedImplCopyWith<_$DiaryStateLoadedImpl> get copyWith =>
throw _privateConstructorUsedError;
@@ -1465,6 +1502,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -1484,7 +1522,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)
List<NutritionData>? chartDataCounted)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -1505,6 +1543,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -1524,7 +1563,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -1545,6 +1584,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
List<SelectionPopupModel> mealList,
List<SelectionPopupModel> portionList,
List<Product> autocompleteList,
Map<String, dynamic> chartData,
Meal currentMeal,
SelectionPopupModel portionController,
TimeOfDay wakeupController,
@@ -1564,7 +1604,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
bool moodExpanded,
bool isLoading,
bool isAdded,
List<NutritionData>? chartData)?
List<NutritionData>? chartDataCounted)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),