Refactor state management

duddu · Oct 20, 2023 · e231fd4 · e231fd4
1 parent 34352cb
commit e231fd4
Show file tree

Hide file tree

Showing 14 changed files with 525 additions and 344 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.13
+1.8.0
diff --git a/integration_test/calculator.test.dart b/integration_test/calculator.test.dart
@@ -3,9 +3,10 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:sourdoc/constants/locale.dart' as locale;
 import 'package:sourdoc/main.dart';
+import 'package:sourdoc/methods/convert_temperature_unit.dart';
 
-void expectCalculatorValues({
- required String temperatureUnit,
+void _expectCalculatorValues({
+ required TemperatureUnit temperatureUnit,
  required String temperature,
  required String weight,
  required String hydration,
@@ -27,7 +28,8 @@ void expectCalculatorValues({
  widget is TextField &&
  widget.decoration!.prefixText ==
  '${locale.inputPrefixTemperature}:' &&
- widget.decoration!.suffixText == temperatureUnit &&
+ widget.decoration!.suffixText ==
+ temperatureUnitMap[temperatureUnit]?.unit &&
  widget.controller!.text == temperature),
  findsOneWidget);
  expect(
@@ -86,16 +88,27 @@ void expectCalculatorValues({
  findsOneWidget);
 }
 
+Future<void> _scrollUntilEnd(WidgetTester tester) async {
+ await tester.scrollUntilVisible(
+ find.byWidgetPredicate((Widget widget) =>
+ widget is Text &&
+ widget.semanticsLabel == locale.variableLabelDoughRise),
+ 50,
+ scrollable: find.byType(Scrollable).first);
+ await tester.pumpAndSettle();
+}
+
 void main() {
  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
  group('Calculator', () {
  testWidgets('should load initial default values', (tester) async {
  await tester.pumpWidget(const Sourdoc());
  await tester.pumpAndSettle();
+ await _scrollUntilEnd(tester);
 
- expectCalculatorValues(
- temperatureUnit: 'ºC',
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.celsius,
  temperature: '22',
  weight: '700',
  hydration: '70',
@@ -115,8 +128,10 @@ void main() {
  await tester.tap(find.byTooltip(locale.degreesFarenheit));
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºF',
+ await _scrollUntilEnd(tester);
+
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.farenheit,
  temperature: '71.6',
  weight: '700',
  hydration: '70',
@@ -142,8 +157,10 @@ void main() {
  '80');
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºF',
+ await _scrollUntilEnd(tester);
+
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.farenheit,
  temperature: '80',
  weight: '700',
  hydration: '70',
@@ -168,8 +185,10 @@ void main() {
  '1350');
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºF',
+ await _scrollUntilEnd(tester);
+
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.farenheit,
  temperature: '80',
  weight: '1350',
  hydration: '70',
@@ -195,8 +214,10 @@ void main() {
  '85');
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºF',
+ await _scrollUntilEnd(tester);
+
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.farenheit,
  temperature: '80',
  weight: '1350',
  hydration: '85',
@@ -220,8 +241,10 @@ void main() {
  '2.5');
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºF',
+ await _scrollUntilEnd(tester);
+
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.farenheit,
  temperature: '80',
  weight: '1350',
  hydration: '85',
@@ -241,8 +264,10 @@ void main() {
  await tester.tap(find.byTooltip(locale.degreesCelsius));
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºC',
+ await _scrollUntilEnd(tester);
+
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.celsius,
  temperature: '26.7',
  weight: '1350',
  hydration: '85',
@@ -258,9 +283,10 @@ void main() {
  testWidgets('should return the values to initial state', (tester) async {
  await tester.pumpWidget(const Sourdoc());
  await tester.pumpAndSettle();
+ await _scrollUntilEnd(tester);
 
- expectCalculatorValues(
- temperatureUnit: 'ºC',
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.celsius,
  temperature: '26.7',
  weight: '1350',
  hydration: '85',
@@ -296,8 +322,8 @@ void main() {
  '2');
  await tester.pumpAndSettle();
 
- expectCalculatorValues(
- temperatureUnit: 'ºC',
+ _expectCalculatorValues(
+ temperatureUnit: TemperatureUnit.celsius,
  temperature: '22',
  weight: '700',
  hydration: '70',

diff --git a/lib/models/calculator_model.dart b/lib/models/calculator_model.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/foundation.dart';
+import 'package:sourdoc/methods/convert_temperature_unit.dart';
+import 'package:sourdoc/methods/get_fermentation_values.dart';
+import 'package:sourdoc/methods/get_ingredients_values.dart';
+
+class CalculatorModel extends ChangeNotifier {
+ double _inoculation = 0;
+ double _bulkRise = 0;
+ double _flour = 0;
+ double _water = 0;
+ double _levain = 0;
+ double _salt = 0;
+
+ double get inoculation => _inoculation;
+ double get bulkRise => _bulkRise;
+ double get flour => _flour;
+ double get water => _water;
+ double get levain => _levain;
+ double get salt => _salt;
+
+ void updateFermentationValues(
+ double temperature, TemperatureUnit temperatureUnit) {
+ _inoculation = getInoculationValue(temperature, temperatureUnit);
+ _bulkRise = getBulkRiseValue(temperature, temperatureUnit);
+ notifyListeners();
+ }
+
+ void updateIngredientsValues(
+ double totalWeight, double hydration, double saltLevel) {
+ _flour = getFlourValue(totalWeight, hydration, saltLevel, _inoculation);
+ _water = getNonFlourIngredientValue(_flour, hydration);
+ _levain = getNonFlourIngredientValue(_flour, _inoculation);
+ _salt = getNonFlourIngredientValue(_flour, saltLevel);
+ notifyListeners();
+ }
+}
diff --git a/lib/models/temperature_unit_model.dart b/lib/models/temperature_unit_model.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/foundation.dart';
+import 'package:sourdoc/constants/form.dart' as form;
+import 'package:sourdoc/methods/convert_temperature_unit.dart';
+
+class TemperatureUnitModel extends ChangeNotifier {
+ TemperatureUnit _temperatureUnit = form.defaultTemperatureUnit;
+
+ TemperatureUnit get temperatureUnit => _temperatureUnit;
+ String get temperatureUnitToString =>
+ temperatureUnitMap[_temperatureUnit]!.unit;
+
+ void updateTemperatureUnit(TemperatureUnit newTemperatureUnit) {
+ if (newTemperatureUnit == _temperatureUnit) {
+ return;
+ }
+ _temperatureUnit = newTemperatureUnit;
+
+ notifyListeners();
+ }
+}