Fix calories calculations for entries - 1.0.23 🚀

I am clinically insane! Hahahahahahahahah

fastlane/metadata/android/en-US/changelogs/243.txt

@@ -0,0 +1,2 @@
+- Fix calories calculations for entries
+- Fix entering amounts other than serving

lib/utils.dart

@@ -19,49 +19,36 @@ EntriesCompanion calculateEntry({
     unit: Value(unit),
   );
 
-  double quantity100G;
-  if (unit == 'kilojoules') {
-    final grams = quantity / 4.184;
-    quantity100G = grams / 100;
-  } else if (unit == 'serving') {
-    quantity100G = quantity;
-  } else {
-    quantity100G = convertToGrams(quantity, unit) / 100;
-  }
-
-  double servingWeight;
-  if (food.servingWeight1G != null) {
-    servingWeight = food.servingWeight1G!;
-    if (food.servingUnit != 'grams') {
-      servingWeight =
-          convertToGrams(servingWeight, food.servingUnit ?? 'grams');
-    }
-  } else {
-    servingWeight = 100;
-  }
+  final servingG = convertToGrams(
+    food.servingWeight1G ?? 100,
+    food.servingUnit ?? 'grams',
+  );
 
-  final servingQuantity = quantity100G * servingWeight;
+  var quantityG = 0.0;
+  if (unit == 'serving')
+    quantityG = quantity * (food.servingWeight1G ?? 100);
+  else
+    quantityG = convertToGrams(quantity, unit);
 
-  final kCalories = servingQuantity * (food.calories ?? 100) / servingWeight;
-  final proteinG = servingQuantity * (food.proteinG ?? 0) / servingWeight;
-  final fatG = servingQuantity * (food.fatG ?? 0) / servingWeight;
-  final carbG = servingQuantity * (food.carbohydrateG ?? 0) / servingWeight;
+  final caloriesG = (food.calories ?? 0) / servingG;
+  final proteinG = (food.proteinG ?? 0) / servingG;
+  final fatG = (food.fatG ?? 0) / servingG;
+  final carbG = (food.carbohydrateG ?? 0) / servingG;
 
-  entry = entry.copyWith(
-    kCalories: Value(kCalories),
-    fatG: Value(fatG),
-    carbG: Value(carbG),
-    proteinG: Value(proteinG),
+  return entry.copyWith(
+    kCalories: Value(quantityG * caloriesG),
+    fatG: Value(quantityG * fatG),
+    carbG: Value(quantityG * carbG),
+    proteinG: Value(quantityG * proteinG),
   );
-
-  return entry;
 }
 
 double convertToGrams(double quantity, String unit) {
   double quantityInGrams;
 
   switch (unit) {
     case 'grams':
+    case 'milliliters':
       quantityInGrams = quantity;
       break;
     case 'milligrams':
@@ -85,8 +72,8 @@ double convertToGrams(double quantity, String unit) {
     case 'liters':
       quantityInGrams = quantity * 1000; // Approximate conversion for water
       break;
-    case 'milliliters':
-      quantityInGrams = quantity; // Approximate conversion for water
+    case 'kilojoules':
+      quantityInGrams = quantity / 4.184;
       break;
     default:
       throw Exception('Unit not recognized');

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fit_book
 description: Track your calories - Completely offline!
 publish_to: none
-version: 1.0.22+23
+version: 1.0.23+24
 environment:
   sdk: '>=3.3.3 <4.0.0'
 dependencies: