diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart index 37cab2b0..85a9bae9 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart @@ -19,6 +19,8 @@ class DiaryEditBloc extends Bloc { on(_onInitialize); on(_changeSatiety); // пользователь нажимает на шкалу сытости on(_changeMood); // пользователь нажимает на шкалу настроения + on( + _changeMealTime); // пользователь изменяет время приема пиши on(_changeWakeup); // пользователь выбирает время пробуждения on(_changeRetire); // пользователь выбирает время отхода ко сну on(_toggleMood); @@ -75,6 +77,7 @@ class DiaryEditBloc extends Bloc { selectedSatiety: currentState.selectedSatiety, selectedMood: currentState.selectedMood, diaryDate: currentState.diaryDate, + diaryId: currentState.diaryId, productQuantityController: currentState.productQuantityController, )); @@ -199,6 +202,16 @@ class DiaryEditBloc extends Bloc { } FutureOr _addComment(AddComment event, Emitter emit) {} + + FutureOr _changeMealTime( + ChangeMealTIme event, Emitter emit) { + if (state is DiaryEditLoadedState) { + var currentState = state as DiaryEditLoadedState; + + emit(currentState.copyWith(mealTimeController: event.time)); + currentState.mealTimeController = event.time; + } + } } Future uploadImageToServer(String imagePath) async { diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart index d010e840..e117d080 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart @@ -33,6 +33,15 @@ class ChangeMood extends DiaryEditEvent { List get props => [selectedElement, diaryId]; } +class ChangeMealTIme extends DiaryEditEvent { + ChangeMealTIme(this.mealId, this.time); + final int mealId; + final TimeOfDay time; + + @override + List get props => [mealId, time]; +} + class AddComment extends DiaryEditEvent { AddComment(this.diaryId, this.comment); final String comment; diff --git a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart index 7c33df93..396f8d14 100644 --- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart +++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart @@ -254,6 +254,7 @@ class DiaryEditScreen extends StatelessWidget { ?.format(context) .toString(), autofocus: false, + controller: state.mealTimeController, ), ), ), @@ -784,12 +785,14 @@ class DiaryEditScreen extends StatelessWidget { onTap: () => _selectTime(context, state), child: AbsorbPointer( child: CustomTextFormField( - hintText: state.wakeupController - ?.format(context) - .toString(), - prefix: Icon(Icons.sunny), - autofocus: false, - ), + hintText: state.wakeupController + ?.format(context) + .toString(), + prefix: Icon(Icons.sunny), + autofocus: false, + initialValue: state.wakeupController + ?.format(context) + .toString()), ), ), SizedBox(height: 20.v), @@ -802,6 +805,9 @@ class DiaryEditScreen extends StatelessWidget { .toString(), prefix: Icon(Icons.bed), autofocus: false, + initialValue: state.retireController + ?.format(context) + .toString(), ), ), ), @@ -943,6 +949,7 @@ class DiaryEditScreen extends StatelessWidget { ); if (pickedTime != null && pickedTime != state.wakeupController) { state.wakeupController = pickedTime; + context.read().add(ChangeMealTime(4, state.diaryId)); } } diff --git a/lib/widgets/custom_edit_text_form_field.dart b/lib/widgets/custom_edit_text_form_field.dart index 61f5b99c..5a5687fb 100644 --- a/lib/widgets/custom_edit_text_form_field.dart +++ b/lib/widgets/custom_edit_text_form_field.dart @@ -21,6 +21,7 @@ class CustomTextFormField extends StatelessWidget { this.prefixConstraints, this.suffix, this.suffixConstraints, + this.initialValue, this.contentPadding, this.inputFormatters, this.borderDecoration, @@ -77,6 +78,8 @@ class CustomTextFormField extends StatelessWidget { final TextInputType? keyboardType; + final String? initialValue; + final FormFieldValidator? validator; final void Function(String?)? onSaved; @@ -106,6 +109,7 @@ class CustomTextFormField extends StatelessWidget { keyboardType: keyboardType, onSaved: onSaved, inputFormatters: inputFormatters, + initialValue: initialValue, ), ); InputDecoration get decoration => InputDecoration(