refactor(diary) Prepared front-end methods for API intergration

This commit is contained in:
2024-02-21 12:18:25 +03:00
parent 6d04d1a688
commit 65c465ab9d
5 changed files with 103 additions and 271 deletions

View File

@@ -69,37 +69,42 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
// Если текущее состояние уже загружено, обновляем его
var currentState = state as DiaryEditLoadedState;
emit((currentState).copyWith(
wakeupExpanded: currentState.wakeupExpanded,
moodExpanded: currentState.moodExpanded,
wakeupController: currentState.wakeupController,
retireController: currentState.retireController,
commentController: currentState.commentController,
mealTimeController: currentState.mealTimeController,
productNameController: currentState.productNameController,
selectedSatiety: currentState.selectedSatiety,
selectedMood: currentState.selectedMood,
diaryDate: currentState.diaryDate,
diaryId: currentState.diaryId,
productQuantityController:
currentState.productQuantityController,
));
wakeupExpanded: currentState.wakeupExpanded,
moodExpanded: currentState.moodExpanded,
token: currentState.token,
meals: currentState.meals,
wakeupController: currentState.wakeupController,
retireController: currentState.retireController,
commentController: currentState.commentController,
mealTimeController: currentState.mealTimeController,
productNameController: currentState.productNameController,
selectedSatiety: currentState.selectedSatiety,
selectedMood: currentState.selectedMood,
diaryDate: currentState.diaryDate,
diaryId: currentState.diaryId,
productQuantityController:
currentState.productQuantityController,
diaryEditModelObj: currentState.diaryEditModelObj));
} else {
// Если текущее состояние - начальное, создаем новое загруженное состояние
emit(DiaryEditLoadedState(
wakeupExpanded: true,
moodExpanded: true,
wakeupController: toTime(diary['wakeup']),
retireController: toTime(diary['retire']),
mealTimeController: TimeOfDay.now(),
selectedSatiety: 3,
selectedMood: 3,
commentController:
TextEditingController(text: diary['comment']),
productNameController: TextEditingController(),
productQuantityController: TextEditingController(),
diaryId: diaryId,
diaryDate: diaryDate,
));
wakeupExpanded: true,
moodExpanded: true,
token: token,
meals: diary['meals'],
wakeupController: toTime(diary['wakeup'] ?? "09:00"),
retireController: toTime(diary['retire'] ?? "23:00"),
mealTimeController: TimeOfDay.now(),
selectedSatiety: 3,
selectedMood: 3,
commentController:
TextEditingController(text: diary['comment']),
productNameController: TextEditingController(),
productQuantityController: TextEditingController(),
diaryId: diaryId,
diaryDate: diaryDate,
diaryEditModelObj: state.diaryEditModelObj
?.copyWith(mealList: fillMealList())));
}
} else {
// Ошибка при декодировании JSON
@@ -149,6 +154,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
emit(updatedState); // Передаем обновленное состояние в emit
currentState.selectedMood = event.selectedElement;
print(currentState.mealTimeController);
}
}
@@ -179,6 +185,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
emit(currentState.copyWith(wakeupController: event.selectedTime));
currentState.wakeupController = event.selectedTime;
print(currentState.wakeupController);
}
}
@@ -189,6 +196,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
emit(currentState.copyWith(retireController: event.selectedTime));
currentState.retireController = event.selectedTime;
print(currentState.retireController);
}
}
@@ -213,6 +221,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
emit(currentState.copyWith(mealTimeController: event.time));
currentState.mealTimeController = event.time;
print(currentState.mealTimeController);
}
}

View File

@@ -16,7 +16,10 @@ class DiaryEditInitialEvent extends DiaryEditEvent {
}
class ChangeSatiety extends DiaryEditEvent {
ChangeSatiety(this.mealId, this.selectedElement);
ChangeSatiety(
this.selectedElement,
this.mealId,
);
final int selectedElement;
final int mealId;
@@ -25,7 +28,10 @@ class ChangeSatiety extends DiaryEditEvent {
}
class ChangeMood extends DiaryEditEvent {
ChangeMood(this.diaryId, this.selectedElement);
ChangeMood(
this.selectedElement,
this.diaryId,
);
final int selectedElement;
final int diaryId;

View File

@@ -21,6 +21,8 @@ class DiaryEditLoadedState extends DiaryEditState {
DiaryEditLoadedState(
{this.diaryEditModelObj,
this.diaryDate,
this.token,
this.meals,
this.wakeupController,
this.retireController,
this.commentController,
@@ -37,6 +39,8 @@ class DiaryEditLoadedState extends DiaryEditState {
DiaryEditModel? diaryEditModelObj;
String? diaryDate;
String? token;
List<dynamic>? meals;
SelectionPopupModel? currentMeal;
TimeOfDay? wakeupController;
TimeOfDay? retireController;
@@ -53,6 +57,7 @@ class DiaryEditLoadedState extends DiaryEditState {
List<Object?> get props => [
diaryEditModelObj,
diaryDate,
token,
wakeupController,
retireController,
mealTimeController,
@@ -70,6 +75,8 @@ class DiaryEditLoadedState extends DiaryEditState {
DiaryEditModel? diaryEditModelObj,
SelectionPopupModel? currentMeal,
String? diaryDate,
String? token,
List<dynamic>? meals,
TimeOfDay? wakeupController,
TimeOfDay? retireController,
TimeOfDay? mealTimeController,
@@ -85,6 +92,8 @@ class DiaryEditLoadedState extends DiaryEditState {
return DiaryEditLoadedState(
diaryEditModelObj: diaryEditModelObj ?? this.diaryEditModelObj,
diaryDate: diaryDate ?? this.diaryDate,
token: token ?? this.token,
meals: meals ?? this.meals,
wakeupController: wakeupController ?? this.wakeupController,
retireController: retireController ?? this.retireController,
mealTimeController: mealTimeController ?? this.mealTimeController,

View File

@@ -93,6 +93,7 @@ class DiaryEditScreen extends StatelessWidget {
/// Section Widget
Widget _buildHeaderRow(BuildContext context, DiaryEditLoadedState state) {
final day = state.diaryId;
return Container(
margin: EdgeInsets.symmetric(horizontal: 16.h, vertical: 16.h),
padding: EdgeInsets.symmetric(
@@ -126,7 +127,7 @@ class DiaryEditScreen extends StatelessWidget {
Align(
alignment: Alignment.centerRight,
child: Text(
"10 день",
"$day день",
style: CustomTextStyles.titleMediumBlack,
),
),
@@ -238,7 +239,7 @@ class DiaryEditScreen extends StatelessWidget {
maxWidth: MediaQuery.of(context).size.width - 260,
),
child: GestureDetector(
onTap: () => _selectTime(context, state),
onTap: () => _selectMealTime(context, state),
child: AbsorbPointer(
child: CustomTextFormField(
hintText: state.mealTimeController
@@ -780,22 +781,23 @@ class DiaryEditScreen extends StatelessWidget {
children: [
SizedBox(height: 20.v),
GestureDetector(
onTap: () => _selectTime(context, state),
onTap: () => _selectWakeupTime(context, state),
child: AbsorbPointer(
child: CustomTextFormField(
hintText: state.wakeupController
hintText: state.wakeupController
?.format(context)
.toString(),
prefix: Icon(Icons.sunny),
autofocus: false,
/*initialValue: state.wakeupController
?.format(context)
.toString(),
prefix: Icon(Icons.sunny),
autofocus: false,
initialValue: state.wakeupController
?.format(context)
.toString()),
.toString()*/
),
),
),
SizedBox(height: 20.v),
GestureDetector(
onTap: () => _selectTime(context, state),
onTap: () => _selectRetireTime(context, state),
child: AbsorbPointer(
child: CustomTextFormField(
hintText: state.retireController
@@ -803,9 +805,9 @@ class DiaryEditScreen extends StatelessWidget {
.toString(),
prefix: Icon(Icons.bed),
autofocus: false,
initialValue: state.retireController
/*initialValue: state.retireController
?.format(context)
.toString(),
.toString(),*/
),
),
),
@@ -939,7 +941,7 @@ class DiaryEditScreen extends StatelessWidget {
])));
}
Future<void> _selectTime(
Future<void> _selectWakeupTime(
BuildContext context, DiaryEditLoadedState state) async {
final TimeOfDay? pickedTime = await showTimePicker(
context: context,
@@ -947,236 +949,40 @@ class DiaryEditScreen extends StatelessWidget {
);
if (pickedTime != null && pickedTime != state.wakeupController) {
state.wakeupController = pickedTime;
context.read<DiaryEditBloc>().add(ChangeMealTime(
context.read<DiaryEditBloc>().add(WakeupEvent(
state.diaryId,
pickedTime,
));
}
}
/*Widget _buildImageStack(BuildContext context) {
return Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
),
decoration: AppDecoration.outlinePrimary.copyWith(
borderRadius: BorderRadiusStyle.roundedBorder12,
),
child: Stack(
alignment: Alignment.bottomCenter,
children: [
Align(
alignment: Alignment.center,
child: Container(
margin: EdgeInsets.symmetric(horizontal: 10.h),
padding: EdgeInsets.symmetric(
horizontal: 10.h,
vertical: 13.v,
),
decoration: AppDecoration.outlinePrimary.copyWith(
borderRadius: BorderRadiusStyle.roundedBorder12,
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 10.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"Время приема пищи",
style: CustomTextStyles.bodyMediumBlack900,
),
_buildMealTime(context),
],
),
),
SizedBox(height: 20.v),
Padding(
padding: EdgeInsets.symmetric(horizontal: 10.h),
child: CustomDropDown(
hintText: "Прием пищи",
items: dropdownItemList1,
contentPadding: EdgeInsets.symmetric(
horizontal: 15.h,
vertical: 9.v,
),
onChanged: (value) {},
),
),
SizedBox(height: 20.v),
_buildEnterProductName(context),
SizedBox(height: 20.v),
Padding(
padding: EdgeInsets.symmetric(horizontal: 10.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
_buildQuantity(context),
Padding(
padding: EdgeInsets.only(left: 10.h),
child: CustomDropDown(
width: 146.h,
hintText: "Порция",
items: dropdownItemList2,
contentPadding: EdgeInsets.symmetric(
horizontal: 15.h,
vertical: 9.v,
),
onChanged: (value) {},
),
),
],
),
),
SizedBox(height: 30.v),
Container(
margin: EdgeInsets.symmetric(horizontal: 10.h),
padding: EdgeInsets.symmetric(
horizontal: 8.h,
vertical: 6.v,
),
decoration: AppDecoration.fillGray.copyWith(
borderRadius: BorderRadiusStyle.roundedBorder5,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: EdgeInsets.only(
left: 7.h,
top: 5.v,
),
child: Text(
"Сырный суп",
style: CustomTextStyles.titleMedium16,
),
),
Padding(
padding: EdgeInsets.only(
left: 20.h,
top: 3.v,
bottom: 3.v,
),
child: Text(
"400мл",
style: CustomTextStyles.titleMedium16,
),
),
Spacer(),
CustomImageView(
imagePath: ImageConstant.imgSearch,
height: 24.adaptSize,
width: 24.adaptSize,
),
CustomImageView(
imagePath: ImageConstant.imgClose,
height: 28.adaptSize,
width: 28.adaptSize,
margin: EdgeInsets.only(left: 10.h),
),
],
),
),
SizedBox(height: 30.v),
_buildAddProduct(context),
SizedBox(height: 249.v),
_buildAddPhoto(context),
SizedBox(height: 29.v),
Text(
"Ваша сытость после приёма пищи",
style: CustomTextStyles.bodyMediumBlack900,
),
SizedBox(height: 15.v),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
CustomImageView(
imagePath: ImageConstant.imgEdit,
height: 30.adaptSize,
width: 30.adaptSize,
),
CustomImageView(
height: 13.v,
width: 243.h,
margin: EdgeInsets.only(
left: 10.h,
top: 9.v,
bottom: 8.v,
),
),
CustomImageView(
height: 30.adaptSize,
width: 30.adaptSize,
margin: EdgeInsets.only(left: 10.h),
),
],
),
SizedBox(height: 7.v),
],
),
),
),
Align(
alignment: Alignment.bottomCenter,
child: Container(
height: 203.v,
width: 303.h,
margin: EdgeInsets.only(bottom: 178.v),
child: Stack(
alignment: Alignment.topRight,
children: [
CustomImageView(
height: 203.v,
width: 303.h,
radius: BorderRadius.circular(
5.h,
),
alignment: Alignment.center,
),
Align(
alignment: Alignment.topRight,
child: Padding(
padding: EdgeInsets.only(
left: 265.h,
top: 10.v,
right: 10.h,
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
CustomIconButton(
height: 18.adaptSize,
width: 18.adaptSize,
padding: EdgeInsets.all(4.h),
alignment: Alignment.centerRight,
child: CustomImageView(
imagePath: ImageConstant.imgCloseBlueGray900,
),
),
SizedBox(height: 60.v),
CustomIconButton(
height: 28.adaptSize,
width: 28.adaptSize,
padding: EdgeInsets.all(9.h),
decoration: IconButtonStyleHelper.fillBlueA,
child: CustomImageView(
imagePath: ImageConstant.imageNotFound,
),
),
],
),
),
),
],
),
),
),
],
),
Future<void> _selectRetireTime(
BuildContext context, DiaryEditLoadedState state) async {
final TimeOfDay? pickedTime = await showTimePicker(
context: context,
initialTime: state.retireController ?? TimeOfDay.now(),
);
}*/
if (pickedTime != null && pickedTime != state.retireController) {
state.retireController = pickedTime;
context.read<DiaryEditBloc>().add(RetireEvent(
pickedTime,
state.diaryId,
));
}
}
Future<void> _selectMealTime(
BuildContext context, DiaryEditLoadedState state) async {
final TimeOfDay? pickedTime = await showTimePicker(
context: context,
initialTime: state.mealTimeController ?? TimeOfDay.now(),
);
if (pickedTime != null && pickedTime != state.mealTimeController) {
state.mealTimeController = pickedTime;
context.read<DiaryEditBloc>().add(ChangeMealTime(
state.diaryId,
pickedTime,
));
}
}
}

View File

@@ -9,9 +9,11 @@ class DiaryEditModel extends Equatable {
DiaryEditModel({this.mealList = const []});
List<SelectionPopupModel> mealList;
DiaryEditModel copyWith() {
DiaryEditModel copyWith({
List<SelectionPopupModel>? mealList,
}) {
return DiaryEditModel(
mealList: mealList,
mealList: mealList ?? this.mealList,
);
}