feat(portion_input): fixed portion input sizes

This commit is contained in:
misha
2026-08-14 13:46:00 +03:00
parent 6d7419c283
commit 90ac4e750d
2 changed files with 145 additions and 133 deletions

View File

@@ -59,43 +59,47 @@ class _AddMealWidgetState extends State<AddMealWidget> {
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SizedBox( Expanded(
width: MediaQuery.of(context).size.width * 0.8 - 32, flex: 2,
child: CustomTextFormField( child: SizedBox(
controller: productNameController, child: CustomTextFormField(
autofocus: true, controller: productNameController,
hintText: 'Введите название продукта/блюда', autofocus: true,
onChanged: (query) { hintText: 'Введите название продукта/блюда',
EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async { onChanged: (query) {
selectedGlossary = null; EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async {
if (query.isEmpty) {
glossariesList = [];
selectedGlossary = null; selectedGlossary = null;
if (query.isEmpty) {
glossariesList = [];
selectedGlossary = null;
setState(() {});
return;
}
glossariesList = await widget.createDietCubit.getGlossaryListByQuery(query);
setState(() {}); setState(() {});
return; });
} },
glossariesList = await widget.createDietCubit.getGlossaryListByQuery(query); ),
setState(() {});
});
},
), ),
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
SizedBox( Expanded(
width: MediaQuery.of(context).size.width * 0.2 - 4, flex: 1,
child: CustomTextFormField( child: SizedBox(
controller: quantityController, child: CustomTextFormField(
keyboardType: TextInputType.number, controller: quantityController,
hintText: selectedGlossary == null keyboardType: TextInputType.number,
? '100' hintText: selectedGlossary == null
: selectedGlossary!.grInPortion == 0 ? '100'
? '100' : selectedGlossary!.grInPortion == 0
: '1', ? '100'
suffixText: selectedGlossary == null : '1',
? 'гр' suffixText: selectedGlossary == null
: selectedGlossary?.grInPortion == 0 ? 'гр'
? 'гр' : selectedGlossary?.grInPortion == 0
: 'шт', ? 'гр'
: 'шт',
),
), ),
), ),
], ],
@@ -149,17 +153,19 @@ class _AddMealWidgetState extends State<AddMealWidget> {
), ),
), ),
if (widget.portionIndex != null) const SizedBox(width: 8), if (widget.portionIndex != null) const SizedBox(width: 8),
InkWell( Expanded(
onTap: addPortion, child: InkWell(
borderRadius: BorderRadius.circular(20), onTap: addPortion,
child: Ink( borderRadius: BorderRadius.circular(20),
width: MediaQuery.of(context).size.width - (widget.portionIndex == null ? 32 : 92), child: Ink(
height: 52, width: MediaQuery.of(context).size.width - (widget.portionIndex == null ? 32 : 92),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400), height: 52,
child: Center( decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
child: Text( child: Center(
widget.portionIndex == null ? 'Добавить' : 'Сохранить', child: Text(
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white), widget.portionIndex == null ? 'Добавить' : 'Сохранить',
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
),
), ),
), ),
), ),

View File

@@ -70,42 +70,46 @@ class _AddProductModalState extends State<AddProductModal> {
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SizedBox( Expanded(
width: MediaQuery.of(context).size.width * 0.76 - 32, flex: 2,
child: CustomTextFormField( child: SizedBox(
controller: productNameController, child: CustomTextFormField(
autofocus: true, controller: productNameController,
hintText: 'Введите название продукта/блюда', autofocus: true,
onChanged: (query) { hintText: 'Введите название продукта/блюда',
EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async { onChanged: (query) {
selectedGlossary = null; EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async {
if (query.isEmpty) { selectedGlossary = null;
glossariesList = []; if (query.isEmpty) {
glossariesList = [];
setState(() {});
return;
}
glossariesList = await widget.diaryCubit.getGlossaryListByQuery(query);
setState(() {}); setState(() {});
return; });
} },
glossariesList = await widget.diaryCubit.getGlossaryListByQuery(query); ),
setState(() {});
});
},
), ),
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
SizedBox( Expanded(
width: MediaQuery.of(context).size.width * 0.24 - 4, flex: 1,
child: CustomTextFormField( child: SizedBox(
controller: quantityController, child: CustomTextFormField(
keyboardType: TextInputType.number, controller: quantityController,
hintText: selectedGlossary == null keyboardType: TextInputType.number,
? '100' hintText: selectedGlossary == null
: selectedGlossary!.grInPortion == 0 ? '100'
? '100' : selectedGlossary!.grInPortion == 0
: '1', ? '100'
suffixText: selectedGlossary == null : '1',
? 'гр' suffixText: selectedGlossary == null
: selectedGlossary?.grInPortion == 0 ? 'гр'
? 'гр' : selectedGlossary?.grInPortion == 0
: 'шт', ? 'гр'
: 'шт',
),
), ),
), ),
], ],
@@ -168,66 +172,68 @@ class _AddProductModalState extends State<AddProductModal> {
), ),
), ),
if (widget.portion != null) const SizedBox(width: 8), if (widget.portion != null) const SizedBox(width: 8),
InkWell( Expanded(
onTap: () { child: InkWell(
// Автоматически выбираем первый элемент, если текст точно совпадает onTap: () {
if (selectedGlossary == null && // Автоматически выбираем первый элемент, если текст точно совпадает
glossariesList.isNotEmpty && if (selectedGlossary == null &&
productNameController.text.trim().toLowerCase() == glossariesList[0].name.toLowerCase()) { glossariesList.isNotEmpty &&
selectedGlossary = glossariesList[0]; productNameController.text.trim().toLowerCase() == glossariesList[0].name.toLowerCase()) {
} selectedGlossary = glossariesList[0];
}
if (widget.portion == null) { if (widget.portion == null) {
widget.diaryCubit.addProductToMeal( widget.diaryCubit.addProductToMeal(
diaryId: widget.state.diary.id, diaryId: widget.state.diary.id,
mealId: widget.state.selectedMeal, mealId: widget.state.selectedMeal,
productName: productNameController.text, productName: productNameController.text,
portion: selectedGlossary == null portion: selectedGlossary == null
? 'gr' ? 'gr'
: selectedGlossary!.grInPortion == 0 : selectedGlossary!.grInPortion == 0
? 'gr' ? 'gr'
: 'pcs', : 'pcs',
quantity: int.parse(quantityController.text), quantity: int.parse(quantityController.text),
productNutritionalValueId: selectedGlossary?.id, productNutritionalValueId: selectedGlossary?.id,
); );
} else { } else {
widget.diaryCubit.updateProductInMeal( widget.diaryCubit.updateProductInMeal(
diaryId: widget.state.diary.id, diaryId: widget.state.diary.id,
mealId: widget.state.selectedMeal, mealId: widget.state.selectedMeal,
portionId: widget.portion!.id, portionId: widget.portion!.id,
productName: productNameController.text, productName: productNameController.text,
portion: selectedGlossary == null portion: selectedGlossary == null
? 'gr' ? 'gr'
: selectedGlossary!.grInPortion == 0 : selectedGlossary!.grInPortion == 0
? 'gr' ? 'gr'
: 'pcs', : 'pcs',
quantity: int.parse(quantityController.text), quantity: int.parse(quantityController.text),
productNutritionalValueId: selectedGlossary?.id, productNutritionalValueId: selectedGlossary?.id,
portionState: widget.portion!.portionState, portionState: widget.portion!.portionState,
); );
} }
Navigator.of(context).pop(); Navigator.of(context).pop();
if (selectedGlossary == null && _previousProductName != productNameController.text) { if (selectedGlossary == null && _previousProductName != productNameController.text) {
showModalBottomSheet( showModalBottomSheet(
isScrollControlled: true, isScrollControlled: true,
useRootNavigator: true, useRootNavigator: true,
context: context, context: context,
builder: (context) => Padding( builder: (context) => Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom), padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: GlossaryModerationRequestModalWidget(productName: productNameController.text, diaryCubit: widget.diaryCubit), child: GlossaryModerationRequestModalWidget(productName: productNameController.text, diaryCubit: widget.diaryCubit),
),
);
}
},
borderRadius: BorderRadius.circular(20),
child: Ink(
width: MediaQuery.of(context).size.width - (widget.portion == null ? 32 : 92),
height: 52,
decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
child: Center(
child: Text(
widget.portion == null ? 'Добавить' : 'Сохранить',
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
), ),
);
}
},
borderRadius: BorderRadius.circular(20),
child: Ink(
width: MediaQuery.of(context).size.width - (widget.portion == null ? 32 : 92),
height: 52,
decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
child: Center(
child: Text(
widget.portion == null ? 'Добавить' : 'Сохранить',
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
), ),
), ),
), ),