Skip to content

fix(edit_meal): prevent keyboard drop; scope rebuilds; correct unit suffix; safe conversions & controller disposal #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LGKentang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(edit_meal): prevent keyboard drop; scope rebuilds; correct unit suffix; safe conversions & controller disposal #271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 88 additions & 56 deletions lib/features/edit_meal/presentation/edit_meal_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,16 @@ class _EditMealScreenState extends State<EditMealScreen> {
final _proteinTextController = TextEditingController();

final _units = ['g', 'ml', 'g/ml'];
late String? selectedUnit;
String? selectedUnit;

// late List<DropdownMenuItem> _mealUnitDropdownItems;
late List<ButtonSegment<String>> _mealUnitButtonSegment;

// TODO: Add base quantity and unit
String baseQuantity = "100";
String baseQuantityUnit = " g/ml";

@override
void initState() {
_editMealBloc = locator<EditMealBloc>();
super.initState();

_baseQuantityTextController.addListener(() {
setState(() {
baseQuantity = _baseQuantityTextController.text;
});
});
// Initialize once, not during build.
_editMealBloc = locator<EditMealBloc>();
_editMealBloc.add(InitializeEditMealEvent());
}

@override
Expand Down Expand Up @@ -116,6 +107,21 @@ class _EditMealScreenState extends State<EditMealScreen> {
super.didChangeDependencies();
}

@override
void dispose() {
_nameTextController.dispose();
_brandsTextController.dispose();
_mealQuantityTextController.dispose();
_servingQuantityTextController.dispose();
_baseQuantityTextController.dispose();
_kcalTextController.dispose();
_carbsTextController.dispose();
_fatTextController.dispose();
_proteinTextController.dispose();
// Do not close _editMealBloc here if provided as a singleton by locator.
super.dispose();
}

@override
Widget build(BuildContext context) {
return SafeArea(
Expand All @@ -132,7 +138,7 @@ class _EditMealScreenState extends State<EditMealScreen> {
],
),
body: BlocBuilder<EditMealBloc, EditMealState>(
bloc: locator<EditMealBloc>()..add(InitializeEditMealEvent()),
bloc: _editMealBloc,
builder: (BuildContext context, EditMealState state) {
if (state is EditMealLoadingState) {
return _getLoadingContent();
Expand Down Expand Up @@ -223,49 +229,68 @@ class _EditMealScreenState extends State<EditMealScreen> {
decoration: InputDecoration(
labelText: S.of(context).baseQuantityLabel,
border: const OutlineInputBorder()),
keyboardType: TextInputType.number,
keyboardType: const TextInputType.numberWithOptions(decimal: true),
),
const SizedBox(height: 48),
TextFormField(
controller: _kcalTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText:
S.of(context).mealKcalLabel + baseQuantity + baseQuantityUnit,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),

ValueListenableBuilder<TextEditingValue>(
valueListenable: _baseQuantityTextController,
builder: (context, value, _) {
final base = (value.text.isEmpty ? '100' : value.text) + _unitSuffixForSelected(context);
return TextFormField(
controller: _kcalTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealKcalLabel + base,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
);
},
),
const SizedBox(height: 16),
TextFormField(
controller: _carbsTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealCarbsLabel +
baseQuantity +
baseQuantityUnit,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
ValueListenableBuilder<TextEditingValue>(
valueListenable: _baseQuantityTextController,
builder: (context, value, _) {
final base = (value.text.isEmpty ? '100' : value.text) + _unitSuffixForSelected(context);
return TextFormField(
controller: _carbsTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealCarbsLabel + base,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
);
},
),
const SizedBox(height: 16),
TextFormField(
controller: _fatTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText:
S.of(context).mealFatLabel + baseQuantity + baseQuantityUnit,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
ValueListenableBuilder<TextEditingValue>(
valueListenable: _baseQuantityTextController,
builder: (context, value, _) {
final base = (value.text.isEmpty ? '100' : value.text) + _unitSuffixForSelected(context);
return TextFormField(
controller: _fatTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealFatLabel + base,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
);
},
),
const SizedBox(height: 16),
TextFormField(
controller: _proteinTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealProteinLabel +
baseQuantity +
baseQuantityUnit,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
ValueListenableBuilder<TextEditingValue>(
valueListenable: _baseQuantityTextController,
builder: (context, value, _) {
final base = (value.text.isEmpty ? '100' : value.text) + _unitSuffixForSelected(context);
return TextFormField(
controller: _proteinTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealProteinLabel + base,
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
);
},
),
],
);
Expand All @@ -274,9 +299,9 @@ class _EditMealScreenState extends State<EditMealScreen> {
void _onSavePressed(bool usesImperialUnits) {
try {
// Convert meal size back to metric units if necessary
final mealUnitForConversion = selectedUnit ?? _mealEntity.mealUnit ?? '0';
final mealQuantity = usesImperialUnits
? _convertToMetric(
_mealQuantityTextController.text, _mealEntity.mealUnit ?? "0")
? _convertToMetric(_mealQuantityTextController.text, mealUnitForConversion)
: _mealQuantityTextController.text;

final newMealEntity = _editMealBloc.createNewMealEntity(
Expand Down Expand Up @@ -307,13 +332,20 @@ class _EditMealScreenState extends State<EditMealScreen> {
}

String? _switchButtonUnit(String? unit) {
String? selectedUnit;
if (!_units.contains(unit)) {
selectedUnit = _units[2]; // Default to g/ml
} else {
selectedUnit = unit;
return _units[2]; // Default to g/ml
}
return unit;
}

String _unitSuffixForSelected(BuildContext context) {
final u = selectedUnit ?? _units[2];
if (u == 'g') {
return _usesImperialUnits ? ' ' + S.of(context).ozUnit : ' ' + S.of(context).gramUnit;
} else if (u == 'ml') {
return _usesImperialUnits ? ' ' + S.of(context).flOzUnit : ' ' + S.of(context).milliliterUnit;
}
return selectedUnit;
return ' ' + S.of(context).gramMilliliterUnit;
}

String _convertToImperial(String value, String unit) {
Expand Down