feat(calendar): Calendar to diary transition

This commit is contained in:
2024-08-06 14:28:03 +03:00
parent 5ddaf42a5f
commit 45e796152c
6 changed files with 346 additions and 116 deletions

View File

@@ -96,106 +96,199 @@ class CalendarScreen extends StatelessWidget {
Map<String, dynamic> diary = {}; Map<String, dynamic> diary = {};
if (state.calendarList[index].diary is List<dynamic>) { if (state.calendarList[index].diary is List<dynamic>) {
diary['status'] = 'Скоро'; diary['status'] = 'Скоро';
} else if (state.calendarList[index].diary is Map<String, dynamic>) { return InkWell(
diary = state.calendarList[index].diary as Map<String, dynamic>; borderRadius: BorderRadiusStyle.circleBorder8,
} child: Ink(
return InkWell( padding: EdgeInsets.all(8),
borderRadius: BorderRadiusStyle.circleBorder8, decoration: BoxDecoration(
onTap: () => GoRouter.of(context).go( borderRadius: BorderRadiusStyle.circleBorder8,
'/diary-screen', color: getBackgroundColor(diary['state']),
extra: diary['id'].toString(), ),
), child: Row(
child: Ink( mainAxisAlignment: MainAxisAlignment.center,
padding: EdgeInsets.all(8), crossAxisAlignment: CrossAxisAlignment.start,
decoration: BoxDecoration( children: [
borderRadius: BorderRadiusStyle.circleBorder8, Expanded(
color: getBackgroundColor(diary['state']), child: Column(
), crossAxisAlignment: CrossAxisAlignment.start,
child: Row( children: [
mainAxisAlignment: MainAxisAlignment.center, Text(
crossAxisAlignment: CrossAxisAlignment.start, formatDate(state.calendarList[index].date),
children: [ style: theme.textTheme.titleMedium,
Expanded( ),
child: Column( SizedBox(height: 2.v),
crossAxisAlignment: CrossAxisAlignment.start, if (diary['state'] != null)
children: [ Row(children: [
Text( Container(
formatDate(state.calendarList[index].date), padding: EdgeInsets.all(
style: theme.textTheme.titleMedium, 4.0), // Отступы внутри контейнера
), decoration: BoxDecoration(
SizedBox(height: 2.v), color: diary['state'] == 'finished'
if (diary['state'] != null) ? Color.fromRGBO(1, 154, 62, 1)
Row(children: [ : Color.fromRGBO(154, 74, 1, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
_getStateText(diary['state'] ?? ''),
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
SizedBox(width: 4),
if (diary['state'] == 'started')
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Заполнить отчет',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
if (diary['state'] == 'finished')
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Изменить отчет',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
]),
if (state.calendarList[index].diary is List<dynamic>)
Container( Container(
padding: EdgeInsets.all( padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера 4.0), // Отступы внутри контейнера
decoration: BoxDecoration( decoration: BoxDecoration(
color: diary['state'] == 'finished' color: Color.fromRGBO(108, 117, 125, 1),
? Color.fromRGBO(1, 154, 62, 1)
: Color.fromRGBO(154, 74, 1, 1),
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
24.0), // Закругленные углы 24.0), // Закругленные углы
), ),
child: Text( child: Text(
_getStateText(diary['state'] ?? ''), 'Cкоро',
style: CustomTextStyles style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый .titleSmallBold, // Предполагается, что текст белый
), ),
), ),
SizedBox(width: 4), ],
if (diary['state'] == 'started') ),
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Заполнить отчет',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
if (diary['state'] == 'finished')
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Изменить отчет',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
]),
if (state.calendarList[index].diary is List<dynamic>)
Container(
padding:
EdgeInsets.all(4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(108, 117, 125, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Cкоро',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
],
), ),
), ],
], ),
), ),
), );
); } else {
diary = state.calendarList[index].diary as Map<String, dynamic>;
return InkWell(
borderRadius: BorderRadiusStyle.circleBorder8,
onTap: () => GoRouter.of(context).go(
'/diary-screen',
extra: diary['id'].toString(),
),
child: Ink(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadiusStyle.circleBorder8,
color: getBackgroundColor(diary['state']),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
formatDate(state.calendarList[index].date),
style: theme.textTheme.titleMedium,
),
SizedBox(height: 2.v),
if (diary['state'] != null)
Row(children: [
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: diary['state'] == 'finished'
? Color.fromRGBO(1, 154, 62, 1)
: Color.fromRGBO(154, 74, 1, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
_getStateText(diary['state'] ?? ''),
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
SizedBox(width: 4),
if (diary['state'] == 'started')
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Заполнить отчет',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
if (diary['state'] == 'finished')
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Изменить отчет',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
]),
if (state.calendarList[index].diary is List<dynamic>)
Container(
padding: EdgeInsets.all(
4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(108, 117, 125, 1),
borderRadius: BorderRadius.circular(
24.0), // Закругленные углы
),
child: Text(
'Cкоро',
style: CustomTextStyles
.titleSmallBold, // Предполагается, что текст белый
),
),
],
),
),
],
),
),
);
}
}, },
); );
} }

View File

@@ -19,6 +19,7 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
DiaryBloc({required this.diaryRepository}) DiaryBloc({required this.diaryRepository})
: super(const DiaryState.loading()) { : super(const DiaryState.loading()) {
on<LoadDiary>(loadDiary); on<LoadDiary>(loadDiary);
on<LoadDiaryById>(loadDiaryById);
on<ChangeSatiety>(_changeSatiety); // пользователь нажимает на шкалу сытости on<ChangeSatiety>(_changeSatiety); // пользователь нажимает на шкалу сытости
on<ChangeMood>(_changeMood); // пользователь нажимает на шкалу настроения on<ChangeMood>(_changeMood); // пользователь нажимает на шкалу настроения
on<ChangeMealTime>(_changeMealTime); // пользовательяет времяа пиши on<ChangeMealTime>(_changeMealTime); // пользовательяет времяа пиши
@@ -61,26 +62,25 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
final Map<String, dynamic> chartData = final Map<String, dynamic> chartData =
await diaryRepository.getChartData(diaryID ?? 45); await diaryRepository.getChartData(diaryID ?? 45);
print(chartData);
final Map<String, dynamic> dailyNutritionIntake = final Map<String, dynamic> dailyNutritionIntake =
chartData['dailyNutritionIntake']!; chartData['dailyNutritionIntake']!;
final Map<String, dynamic> dailyNutritionRecommendations = final Map<String, dynamic> dailyNutritionRecommendations =
chartData['dailyNutritionRecommendation']!; chartData['dailyNutritionRecommendation']!;
final double ccal = dailyNutritionIntake['energy']! / final double ccal = dailyNutritionIntake['energy']! /
dailyNutritionRecommendations['energy']! * dailyNutritionRecommendations['energy']! *
100; 50;
final double proteins = dailyNutritionIntake['proteins']! / final double proteins = dailyNutritionIntake['proteins']! /
dailyNutritionRecommendations['proteins']! * dailyNutritionRecommendations['proteins']! *
100; 50;
final double fats = dailyNutritionIntake['fats']! / final double fats = dailyNutritionIntake['fats']! /
dailyNutritionRecommendations['fats']! * dailyNutritionRecommendations['fats']! *
100; 50;
final double carbs = dailyNutritionIntake['carbohydrates']! / final double carbs = dailyNutritionIntake['carbohydrates']! /
dailyNutritionRecommendations['carbohydrates']! * dailyNutritionRecommendations['carbohydrates']! *
100; 50;
Color getColor(double value) { Color getColor(double value) {
if (value >= 49.1) { if (value >= 99.1) {
return Colors.red; return Colors.red;
} else { } else {
return Colors.blue; return Colors.blue;
@@ -102,6 +102,97 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
SelectionPopupModel(title: "Прием пищи 5", id: 5), SelectionPopupModel(title: "Прием пищи 5", id: 5),
SelectionPopupModel(title: "Прием пищи 6", id: 6), SelectionPopupModel(title: "Прием пищи 6", id: 6),
]; ];
emit(DiaryState.loaded(
diary: diary,
currentMeal: currentMeal,
portions: currentMeal.portions,
portionList: portionList,
portionController: portionList[0],
mealList: mealList,
chartData: chartDataCounted,
selectedMood: currentMeal.mood,
selectedSatiety: currentMeal.satiety,
wakeupController: TimeOfDay.now(),
retireController: TimeOfDay.now(),
commentController: TextEditingController(),
product_nameController: TextEditingController(),
productQuantityController: TextEditingController(),
caloriesController: TextEditingController(),
fatsController: TextEditingController(),
proteinsController: TextEditingController(),
carbsController: TextEditingController(),
wakeupExpanded: false,
moderationExpanded: false,
moodExpanded: false,
isLoading: false,
isAdded: false,
autocompleteList: [],
recommendedChartValues: [1, 1, 1, 1],
consumedChartValues: [1, 1, 1, 1]));
} catch (e) {
emit(DiaryState.error(errorMessage: e.toString()));
}
}
loadDiaryById(
LoadDiaryById event,
Emitter<DiaryState> emit,
) async {
emit(const DiaryState.loading());
try {
final int diaryID = int.parse(event.id ?? "0");
final DiaryModel diary = await diaryRepository.getDiary(diaryID);
final Meal currentMeal = diary.meals[0];
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;
Color getColor(double value) {
if (value >= 99.1) {
return Colors.red;
} else {
return Colors.blue;
}
}
final List<NutritionData> chartDataCounted = [
NutritionData('Калории', ccal, getColor(ccal)),
NutritionData('Белки', proteins, getColor(proteins)),
NutritionData('Жиры', fats, getColor(fats)),
NutritionData('Углеводы', carbs, getColor(carbs)),
];
List<SelectionPopupModel> mealList = [
SelectionPopupModel(title: "Прием пищи 1", id: 1),
SelectionPopupModel(title: "Прием пищи 2", id: 2),
SelectionPopupModel(title: "Прием пищи 3", id: 3),
SelectionPopupModel(title: "Прием пищи 4", id: 4),
SelectionPopupModel(title: "Прием пищи 5", id: 5),
SelectionPopupModel(title: "Прием пищи 6", id: 6),
];
emit(DiaryState.loaded( emit(DiaryState.loaded(
diary: diary, diary: diary,
currentMeal: currentMeal, currentMeal: currentMeal,

View File

@@ -15,6 +15,15 @@ class LoadDiary extends DiaryEvent {
List<Object?> get props => []; List<Object?> get props => [];
} }
class LoadDiaryById extends DiaryEvent {
LoadDiaryById(
this.id,
);
final String? id;
@override
List<Object?> get props => [];
}
class ChangeSatiety extends DiaryEvent { class ChangeSatiety extends DiaryEvent {
ChangeSatiety( ChangeSatiety(
this.selectedElement, this.selectedElement,

View File

@@ -13,7 +13,9 @@ part 'diary_state.freezed.dart';
abstract class DiaryState with _$DiaryState { abstract class DiaryState with _$DiaryState {
const factory DiaryState() = _DiaryState; const factory DiaryState() = _DiaryState;
const factory DiaryState.loading() = DiaryStateLoading; const factory DiaryState.loading({
int? id,
}) = DiaryStateLoading;
const factory DiaryState.loaded({ const factory DiaryState.loaded({
required DiaryModel diary, required DiaryModel diary,

View File

@@ -19,7 +19,7 @@ mixin _$DiaryState {
@optionalTypeArgs @optionalTypeArgs
TResult when<TResult extends Object?>( TResult when<TResult extends Object?>(
TResult Function() $default, { TResult Function() $default, {
required TResult Function() loading, required TResult Function(int? id) loading,
required TResult Function( required TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -56,7 +56,7 @@ mixin _$DiaryState {
@optionalTypeArgs @optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>( TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, { TResult? Function()? $default, {
TResult? Function()? loading, TResult? Function(int? id)? loading,
TResult? Function( TResult? Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -93,7 +93,7 @@ mixin _$DiaryState {
@optionalTypeArgs @optionalTypeArgs
TResult maybeWhen<TResult extends Object?>( TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, { TResult Function()? $default, {
TResult Function()? loading, TResult Function(int? id)? loading,
TResult Function( TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -212,7 +212,7 @@ class _$DiaryStateImpl implements _DiaryState {
@optionalTypeArgs @optionalTypeArgs
TResult when<TResult extends Object?>( TResult when<TResult extends Object?>(
TResult Function() $default, { TResult Function() $default, {
required TResult Function() loading, required TResult Function(int? id) loading,
required TResult Function( required TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -252,7 +252,7 @@ class _$DiaryStateImpl implements _DiaryState {
@optionalTypeArgs @optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>( TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, { TResult? Function()? $default, {
TResult? Function()? loading, TResult? Function(int? id)? loading,
TResult? Function( TResult? Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -292,7 +292,7 @@ class _$DiaryStateImpl implements _DiaryState {
@optionalTypeArgs @optionalTypeArgs
TResult maybeWhen<TResult extends Object?>( TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, { TResult Function()? $default, {
TResult Function()? loading, TResult Function(int? id)? loading,
TResult Function( TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -379,6 +379,8 @@ abstract class _$$DiaryStateLoadingImplCopyWith<$Res> {
factory _$$DiaryStateLoadingImplCopyWith(_$DiaryStateLoadingImpl value, factory _$$DiaryStateLoadingImplCopyWith(_$DiaryStateLoadingImpl value,
$Res Function(_$DiaryStateLoadingImpl) then) = $Res Function(_$DiaryStateLoadingImpl) then) =
__$$DiaryStateLoadingImplCopyWithImpl<$Res>; __$$DiaryStateLoadingImplCopyWithImpl<$Res>;
@useResult
$Res call({int? id});
} }
/// @nodoc /// @nodoc
@@ -388,32 +390,57 @@ class __$$DiaryStateLoadingImplCopyWithImpl<$Res>
__$$DiaryStateLoadingImplCopyWithImpl(_$DiaryStateLoadingImpl _value, __$$DiaryStateLoadingImplCopyWithImpl(_$DiaryStateLoadingImpl _value,
$Res Function(_$DiaryStateLoadingImpl) _then) $Res Function(_$DiaryStateLoadingImpl) _then)
: super(_value, _then); : super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? id = freezed,
}) {
return _then(_$DiaryStateLoadingImpl(
id: freezed == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int?,
));
}
} }
/// @nodoc /// @nodoc
class _$DiaryStateLoadingImpl implements DiaryStateLoading { class _$DiaryStateLoadingImpl implements DiaryStateLoading {
const _$DiaryStateLoadingImpl(); const _$DiaryStateLoadingImpl({this.id});
@override
final int? id;
@override @override
String toString() { String toString() {
return 'DiaryState.loading()'; return 'DiaryState.loading(id: $id)';
} }
@override @override
bool operator ==(Object other) { bool operator ==(Object other) {
return identical(this, other) || return identical(this, other) ||
(other.runtimeType == runtimeType && other is _$DiaryStateLoadingImpl); (other.runtimeType == runtimeType &&
other is _$DiaryStateLoadingImpl &&
(identical(other.id, id) || other.id == id));
} }
@override @override
int get hashCode => runtimeType.hashCode; int get hashCode => Object.hash(runtimeType, id);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$DiaryStateLoadingImplCopyWith<_$DiaryStateLoadingImpl> get copyWith =>
__$$DiaryStateLoadingImplCopyWithImpl<_$DiaryStateLoadingImpl>(
this, _$identity);
@override @override
@optionalTypeArgs @optionalTypeArgs
TResult when<TResult extends Object?>( TResult when<TResult extends Object?>(
TResult Function() $default, { TResult Function() $default, {
required TResult Function() loading, required TResult Function(int? id) loading,
required TResult Function( required TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -446,14 +473,14 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
loaded, loaded,
required TResult Function(String errorMessage) error, required TResult Function(String errorMessage) error,
}) { }) {
return loading(); return loading(id);
} }
@override @override
@optionalTypeArgs @optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>( TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, { TResult? Function()? $default, {
TResult? Function()? loading, TResult? Function(int? id)? loading,
TResult? Function( TResult? Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -486,14 +513,14 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
loaded, loaded,
TResult? Function(String errorMessage)? error, TResult? Function(String errorMessage)? error,
}) { }) {
return loading?.call(); return loading?.call(id);
} }
@override @override
@optionalTypeArgs @optionalTypeArgs
TResult maybeWhen<TResult extends Object?>( TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, { TResult Function()? $default, {
TResult Function()? loading, TResult Function(int? id)? loading,
TResult Function( TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -528,7 +555,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
required TResult orElse(), required TResult orElse(),
}) { }) {
if (loading != null) { if (loading != null) {
return loading(); return loading(id);
} }
return orElse(); return orElse();
} }
@@ -572,7 +599,12 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
} }
abstract class DiaryStateLoading implements DiaryState { abstract class DiaryStateLoading implements DiaryState {
const factory DiaryStateLoading() = _$DiaryStateLoadingImpl; const factory DiaryStateLoading({final int? id}) = _$DiaryStateLoadingImpl;
int? get id;
@JsonKey(ignore: true)
_$$DiaryStateLoadingImplCopyWith<_$DiaryStateLoadingImpl> get copyWith =>
throw _privateConstructorUsedError;
} }
/// @nodoc /// @nodoc
@@ -1050,7 +1082,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
@optionalTypeArgs @optionalTypeArgs
TResult when<TResult extends Object?>( TResult when<TResult extends Object?>(
TResult Function() $default, { TResult Function() $default, {
required TResult Function() loading, required TResult Function(int? id) loading,
required TResult Function( required TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -1118,7 +1150,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
@optionalTypeArgs @optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>( TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, { TResult? Function()? $default, {
TResult? Function()? loading, TResult? Function(int? id)? loading,
TResult? Function( TResult? Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -1186,7 +1218,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
@optionalTypeArgs @optionalTypeArgs
TResult maybeWhen<TResult extends Object?>( TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, { TResult Function()? $default, {
TResult Function()? loading, TResult Function(int? id)? loading,
TResult Function( TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -1423,7 +1455,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
@optionalTypeArgs @optionalTypeArgs
TResult when<TResult extends Object?>( TResult when<TResult extends Object?>(
TResult Function() $default, { TResult Function() $default, {
required TResult Function() loading, required TResult Function(int? id) loading,
required TResult Function( required TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -1463,7 +1495,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
@optionalTypeArgs @optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>( TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, { TResult? Function()? $default, {
TResult? Function()? loading, TResult? Function(int? id)? loading,
TResult? Function( TResult? Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,
@@ -1503,7 +1535,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
@optionalTypeArgs @optionalTypeArgs
TResult maybeWhen<TResult extends Object?>( TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, { TResult Function()? $default, {
TResult Function()? loading, TResult Function(int? id)? loading,
TResult Function( TResult Function(
DiaryModel diary, DiaryModel diary,
String? diaryDate, String? diaryDate,

View File

@@ -31,6 +31,9 @@ class DiaryScreen extends StatelessWidget {
}); });
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (diaryID != "0") {
context.read<DiaryBloc>().add(LoadDiaryById(diaryID));
}
return BlocBuilder<DiaryBloc, DiaryState>( return BlocBuilder<DiaryBloc, DiaryState>(
builder: (context, state) { builder: (context, state) {
if (state is DiaryStateLoaded) { if (state is DiaryStateLoaded) {