Bloc is now global and responsible for all dates

1. Show PerDate widgets inside of an PageView
2. Introduce GoRouter so we can intercept back button taps with
   BackButtonListener
3. Implement rudimentary navigation
4. Fix bug that still showed a spinner event when the barcode was not
   found.

.gitignore

@@ -41,3 +41,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+assets/icon_base.xcf

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <application
         android:label="Calorimeter"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

lib/food_entry/enter_food_widget.dart

@@ -1,12 +1,10 @@
-import 'package:calorimeter/utils/enter_food_controller.dart';
 import 'package:calorimeter/storage/storage.dart';
 import 'package:flutter/material.dart';
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/utils/row_with_spacers_widget.dart';
-import 'package:provider/provider.dart';
 
 class EnterFoodWidget extends StatefulWidget {
-  final Function(BuildContext context, FoodEntry entry) onAdd;
+  final Function(BuildContext context, FoodEntryState entry) onAdd;
 
   const EnterFoodWidget({super.key, required this.onAdd});
 
@@ -18,7 +16,7 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
   late TextEditingController nameController;
   late TextEditingController massController;
   late TextEditingController kcalPerMassController;
-  late Map<String, double> suggestions;
+  late Map<String, int> suggestions;
 
   @override
   void initState() {
@@ -32,88 +30,80 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<EnterFoodController>(
+    return Padding(
-      builder: (context, food, child) {
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
-        nameController.text = food.name;
+      child: RowWidget(
-        kcalPerMassController.text = food.kcalPer100g;
+        Autocomplete<String>(
+            optionsViewOpenDirection: OptionsViewOpenDirection.down,
+            fieldViewBuilder: (context, controller, focusNode, onSubmitted) {
+              nameController = controller;
+              return TextFormField(
+                controller: controller,
+                focusNode: focusNode,
+                decoration: const InputDecoration(
+                  label: Text("Name"),
+                ),
+              );
+            },
+            optionsBuilder: (TextEditingValue textEditingValue) {
+              if (textEditingValue.text == '') {
+                return const Iterable<String>.empty();
+              }
 
-        return Padding(
+              return suggestions.keys.where(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                (name) {
-          child: RowWidget(
+                  return name
-            Autocomplete<String>(
+                      .toLowerCase()
-                optionsViewOpenDirection: OptionsViewOpenDirection.down,
+                      .contains(textEditingValue.text.toLowerCase());
-                fieldViewBuilder:
-                    (context, controller, focusNode, onSubmitted) {
-                  nameController = controller;
-                  return TextFormField(
-                    controller: controller,
-                    focusNode: focusNode,
-                    decoration: const InputDecoration(
-                      label: Text("Name"),
-                    ),
-                  );
                 },
-                optionsBuilder: (TextEditingValue textEditingValue) {
+              );
-                  if (textEditingValue.text == '') {
+            },
-                    return const Iterable<String>.empty();
+            onSelected: (selectedFood) {
-                  }
+              int kcalPerMassForSelectedFood = suggestions[selectedFood]!;
-
+              setState(() {
-                  return suggestions.keys.where(
+                nameController.text = selectedFood;
-                    (name) {
+                kcalPerMassController.text =
-                      return name
+                    kcalPerMassForSelectedFood.toString();
-                          .toLowerCase()
+              });
-                          .contains(textEditingValue.text.toLowerCase());
+            }),
-                    },
+        TextField(
-                  );
+          textAlign: TextAlign.end,
-                },
+          decoration: const InputDecoration(
-                onSelected: (selectedFood) {
+            label:
-                  double kcalPerMassForSelectedFood =
+                Align(alignment: Alignment.centerRight, child: Text("Menge")),
-                      suggestions[selectedFood]!;
-                  context
-                      .read<EnterFoodController>()
-                      .set(selectedFood, kcalPerMassForSelectedFood.toString());
-                }),
-            TextField(
-              textAlign: TextAlign.end,
-              decoration: const InputDecoration(
-                label: Align(
-                    alignment: Alignment.centerRight, child: Text("Menge")),
-              ),
-              keyboardType: TextInputType.number,
-              controller: massController,
-              onSubmitted: (value) => onSubmitAction(),
-            ),
-            TextField(
-              textAlign: TextAlign.end,
-              decoration: const InputDecoration(
-                  label: Align(
-                      alignment: Alignment.centerRight,
-                      child: Text("kcal pro"))),
-              keyboardType: TextInputType.number,
-              controller: kcalPerMassController,
-              onSubmitted: (value) => onSubmitAction(),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(left: 16.0),
-              child: ElevatedButton(
-                  style: ElevatedButton.styleFrom(
-                    padding: EdgeInsets.zero,
-                  ),
-                  onPressed: () => onSubmitAction(),
-                  child: const Icon(Icons.add)),
-            ),
           ),
-        );
+          keyboardType: TextInputType.number,
-      },
+          controller: massController,
+          onSubmitted: (value) => onSubmitAction(),
+        ),
+        TextField(
+          textAlign: TextAlign.end,
+          decoration: const InputDecoration(
+              label: Align(
+                  alignment: Alignment.centerRight, child: Text("kcal pro"))),
+          keyboardType: TextInputType.number,
+          controller: kcalPerMassController,
+          onSubmitted: (value) => onSubmitAction(),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(left: 16.0),
+          child: ElevatedButton(
+              style: ElevatedButton.styleFrom(
+                padding: EdgeInsets.zero,
+              ),
+              onPressed: () => onSubmitAction(),
+              child: const Icon(Icons.add)),
+        ),
+      ),
     );
   }
 
   void onSubmitAction() {
-    double massAsNumber = 0.0;
+    int massAsNumber = 0;
-    double kcalPerMassAsNumber = 0.0;
+    int kcalPerMassAsNumber = 0;
 
     try {
-      massAsNumber = double.parse(massController.text.replaceAll(",", "."));
+      massAsNumber = int.parse(massController.text.replaceAll(",", "."));
     } catch (e) {
       var snackbar = const SnackBar(content: Text("Menge muss eine Zahl sein"));
       ScaffoldMessenger.of(context).clearSnackBars();
@@ -123,21 +113,28 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
 
     try {
       kcalPerMassAsNumber =
-          double.parse(kcalPerMassController.text.replaceAll(",", "."));
+          int.parse(kcalPerMassController.text.replaceAll(",", "."));
     } catch (e) {
       var snackbar =
           const SnackBar(content: Text("'kcal pro 100g' muss eine Zahl sein"));
-      ScaffoldMessenger.of(context).clearSnackBars();
+      ScaffoldMessenger.of(context).removeCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(snackbar);
       return;
     }
 
-    var entry = FoodEntry(
+    var entry = FoodEntryState(
-        name: nameController.text,
+      name: nameController.text,
-        mass: massAsNumber,
+      mass: massAsNumber,
-        kcalPerMass: kcalPerMassAsNumber);
+      kcalPer100: kcalPerMassAsNumber,
+      waitingForNetwork: false,
+      isSelected: false,
+    );
 
     widget.onAdd(context, entry);
-    context.read<EnterFoodController>().set("", "");
+    setState(() {
+      nameController.text = "";
+      massController.text = "";
+      kcalPerMassController.text = "";
+    });
   }
 }

lib/food_entry/food_entry_bloc.dart

@@ -1,102 +1,305 @@
+import 'package:barcode_scan2/barcode_scan2.dart';
+import 'package:calorimeter/food_scan/food_fact_lookup.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:calorimeter/storage/storage.dart';
 import 'package:uuid/uuid.dart';
 
-class FoodEntryBloc extends Bloc<FoodEvent, FoodEntryState> {
+class FoodEntryBloc extends Bloc<FoodEvent, GlobalEntryState> {
-  final FoodEntryState initialState;
+  final GlobalEntryState initialState;
   final FoodStorage storage;
-  final DateTime forDate;
 
-  FoodEntryBloc(
+  FoodEntryBloc({required this.initialState, required this.storage})
-      {required this.initialState,
-      required this.forDate,
-      required this.storage})
       : super(initialState) {
+    on<PageBeingInitialized>(handlePageBeingInitialized);
     on<FoodEntryEvent>(handleFoodEntryEvent);
-    on<FoodDeletionEvent>(deleteFood);
+    on<FoodChangedEvent>(handleFoodChangedEvent);
-    on<PageChangedEvent>(updateEntries);
+    on<FoodDeletionEvent>(handleDeleteFoodEvent);
+    on<BarcodeScanned>(handleBarcodeScannedEvent);
+    on<FoodEntryTapped>(handleFoodEntryTapped);
+  }
+  void handlePageBeingInitialized(
+      PageBeingInitialized event, Emitter<GlobalEntryState> emit) async {
+    var newList = await storage.getEntriesForDate(event.forDate);
+    state.foodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: state.foodEntries));
   }
 
   void handleFoodEntryEvent(
-      FoodEntryEvent event, Emitter<FoodEntryState> emit) async {
+      FoodEntryEvent event, Emitter<GlobalEntryState> emit) async {
-    FoodEntryState newState = FoodEntryState.from(state);
+    var entriesForDate = state.foodEntries[event.forDate];
-    newState.addEntry(event.entry);
+    entriesForDate ??= [];
 
-    await storage.writeEntriesForDate(forDate, newState.foodEntries);
+    entriesForDate.add(event.entry);
+
+    await storage.writeEntriesForDate(event.forDate, entriesForDate);
     storage.addFoodEntryToLookupDatabase(event.entry);
 
-    emit(newState);
+    // this is just checking if writing to the database worked
+    // can be optimized out by just emitting newState
+    var newList = await storage.getEntriesForDate(event.forDate);
+
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
   }
 
-  void deleteFood(FoodDeletionEvent event, Emitter<FoodEntryState> emit) async {
+  void handleFoodChangedEvent(
-    state.foodEntries.removeWhere((entry) => entry.id == event.entryID);
+      FoodChangedEvent event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
 
-    await storage.writeEntriesForDate(forDate, state.foodEntries);
+    var index = entriesForDate.indexWhere((entry) {
+      return entry.id == event.newEntry.id;
+    });
 
-    emit(FoodEntryState.from(state));
+    entriesForDate.removeAt(index);
+    entriesForDate.insert(index, event.newEntry);
+
+    await storage.writeEntriesForDate(event.forDate, entriesForDate);
+    storage.addFoodEntryToLookupDatabase(event.newEntry);
+
+    // this is just checking if writing to the database worked
+    // can be optimized out by just emitting newState
+    var newList = await storage.getEntriesForDate(event.forDate);
+
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
   }
 
-  void updateEntries(
+  void handleDeleteFoodEvent(
-      PageChangedEvent event, Emitter<FoodEntryState> emit) async {
+      FoodDeletionEvent event, Emitter<GlobalEntryState> emit) async {
-    var entries = await storage.getEntriesForDate(event.changedToDate);
+    var entriesForDate = state.foodEntries[event.forDate];
-    var newState = FoodEntryState(foodEntries: entries);
+    if (entriesForDate == null) return;
-    emit(newState);
+
+    entriesForDate.removeWhere((entry) => entry.id == event.entryID);
+
+    await storage.writeEntriesForDate(event.forDate, entriesForDate);
+
+    // this is just checking if writing to the database worked
+    // can be optimized out by just emitting newState
+    var newList = await storage.getEntriesForDate(event.forDate);
+
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
+  }
+
+  void handleBarcodeScannedEvent(
+      BarcodeScanned event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
+
+    var client = FoodFactLookupClient();
+    var scanResult = await event.scanResultFuture;
+
+    if (scanResult.type == ResultType.Cancelled) {
+      return;
+    }
+    if (scanResult.type == ResultType.Error) {
+      emit(GlobalEntryState(
+          foodEntries: state.foodEntries,
+          errorString: "Fehler beim Scannen des Barcodes"));
+      return;
+    }
+    var responseFuture = client.retrieveFoodInfo(scanResult.rawContent);
+
+    var newEntryWaiting = FoodEntryState(
+      kcalPer100: 0,
+      name: "",
+      mass: 0,
+      waitingForNetwork: true,
+      isSelected: false,
+    );
+    entriesForDate.add(newEntryWaiting);
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: entriesForDate});
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
+
+    await responseFuture.then((response) async {
+      var index = entriesForDate
+          .indexWhere((entryState) => entryState.id == newEntryWaiting.id);
+
+      // element not found (was deleted previously)
+      if (index == -1) {
+        return;
+      }
+
+      if (response.status == FoodFactResponseStatus.barcodeNotFound) {
+        entriesForDate.removeWhere((entry) => entry.id == newEntryWaiting.id);
+        var newFoodEntries = state.foodEntries;
+        newFoodEntries.addAll({event.forDate: entriesForDate});
+
+        emit(GlobalEntryState(
+            foodEntries: newFoodEntries,
+            errorString: "Barcode konnte nicht gefunden werden."));
+        return;
+      }
+      if (response.status ==
+          FoodFactResponseStatus.foodFactServerNotReachable) {
+        entriesForDate.removeWhere((entry) => entry.id == newEntryWaiting.id);
+        var newFoodEntries = state.foodEntries;
+        newFoodEntries.addAll({event.forDate: entriesForDate});
+
+        emit(GlobalEntryState(
+            foodEntries: newFoodEntries,
+            errorString: "OpenFoodFacts-Server konnte nicht erreicht werden."));
+        return;
+      }
+
+      var newEntryFinishedWaiting = FoodEntryState(
+        name: response.food?.name ?? "",
+        mass: response.food?.mass ?? 0,
+        kcalPer100: response.food?.kcalPer100g ?? 0,
+        waitingForNetwork: false,
+        isSelected: false,
+      );
+
+      entriesForDate.removeAt(index);
+      entriesForDate.insert(index, newEntryFinishedWaiting);
+
+      await storage.writeEntriesForDate(event.forDate, entriesForDate);
+      storage.addFoodEntryToLookupDatabase(newEntryFinishedWaiting);
+
+      var entriesFromStorage = await storage.getEntriesForDate(event.forDate);
+      var newFoodEntries = state.foodEntries;
+      newFoodEntries.addAll({event.forDate: entriesFromStorage});
+
+      emit(GlobalEntryState(foodEntries: newFoodEntries));
+    });
+  }
+
+  void handleFoodEntryTapped(
+      FoodEntryTapped event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
+
+    var oldStateOfTappedEntry = event.entry.isSelected;
+
+    for (var entry in entriesForDate) {
+      entry.isSelected = false;
+    }
+
+    var selectedEntry = entriesForDate.firstWhere((entry) {
+      return entry.id == event.entry.id;
+    });
+
+    selectedEntry.isSelected = !oldStateOfTappedEntry;
+
+    emit(GlobalEntryState(foodEntries: state.foodEntries));
   }
 }
 
-class FoodEvent {}
+class FoodEvent {
+  final DateTime forDate;
+
+  FoodEvent({required this.forDate});
+}
+
+class PageBeingInitialized extends FoodEvent {
+  PageBeingInitialized({required super.forDate});
+}
 
 class FoodEntryEvent extends FoodEvent {
-  final FoodEntry entry;
+  final FoodEntryState entry;
 
-  FoodEntryEvent({required this.entry});
+  FoodEntryEvent({required this.entry, required super.forDate});
+}
+
+class FoodChangedEvent extends FoodEvent {
+  final FoodEntryState newEntry;
+
+  FoodChangedEvent({required this.newEntry, required super.forDate});
 }
 
 class FoodDeletionEvent extends FoodEvent {
   final String entryID;
 
-  FoodDeletionEvent({required this.entryID});
+  FoodDeletionEvent({required this.entryID, required super.forDate});
 }
 
-class PageChangedEvent extends FoodEvent {
+class BarcodeScanned extends FoodEvent {
-  final DateTime changedToDate;
+  final Future<ScanResult> scanResultFuture;
 
-  PageChangedEvent({required this.changedToDate});
+  BarcodeScanned({required this.scanResultFuture, required super.forDate});
+}
+
+class FoodEntryTapped extends FoodEvent {
+  final FoodEntryState entry;
+
+  FoodEntryTapped({required this.entry, required super.forDate});
+}
+
+/// This is the state for one date/page
+class GlobalEntryState {
+  final Map<DateTime, List<FoodEntryState>> foodEntries;
+  final String? errorString;
+
+  GlobalEntryState({required this.foodEntries, this.errorString});
+
+  factory GlobalEntryState.init() {
+    return GlobalEntryState(foodEntries: {});
+  }
+
+  static from(GlobalEntryState state) {
+    return GlobalEntryState(foodEntries: state.foodEntries);
+  }
+
+  bool addEntry(FoodEntryState entry, DateTime date) {
+    var list = foodEntries[date];
+
+    if (list == null) {
+      return false;
+    }
+
+    list.add(entry);
+
+    return true;
+  }
 }
 
 class FoodEntryState {
-  final List<FoodEntry> foodEntries;
-
-  FoodEntryState({required this.foodEntries});
-
-  factory FoodEntryState.init() {
-    return FoodEntryState(foodEntries: []);
-  }
-
-  static from(FoodEntryState state) {
-    List<FoodEntry> newList = List.from(state.foodEntries);
-    return FoodEntryState(foodEntries: newList);
-  }
-
-  void addEntry(FoodEntry entry) {
-    foodEntries.add(entry);
-  }
-}
-
-class FoodEntry {
-  final String name;
-  final double mass;
-  final double kcalPerMass;
   final String id;
+  final String name;
+  final int mass;
+  final int kcalPer100;
+  final bool waitingForNetwork;
+  bool isSelected;
 
-  FoodEntry({
+  factory FoodEntryState({
+    required name,
+    required mass,
+    required kcalPer100,
+    required waitingForNetwork,
+    required isSelected,
+  }) {
+    return FoodEntryState.withID(
+      id: const Uuid().v1(),
+      name: name,
+      mass: mass,
+      kcalPer100: kcalPer100,
+      waitingForNetwork: waitingForNetwork,
+      isSelected: isSelected,
+    );
+  }
+
+  FoodEntryState.withID({
+    required this.id,
     required this.name,
     required this.mass,
-    required this.kcalPerMass,
+    required this.kcalPer100,
-  }) : id = const Uuid().v1();
+    required this.waitingForNetwork,
+    required this.isSelected,
+  });
 
   @override
   String toString() {
-    return '$id,$name,$mass,$kcalPerMass';
+    //we use quotation marks around the name because the name might contain
+    //commas and we want to store it in a csv file
+    return '$id,"$name",$mass,$kcalPer100';
   }
 }

lib/food_entry/food_entry_widget.dart

@@ -3,33 +3,33 @@ import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/utils/row_with_spacers_widget.dart';
 
 class FoodEntryWidget extends StatefulWidget {
-  final FoodEntry entry;
+  final FoodEntryState entry;
   final Function(BuildContext context, String id) onDelete;
+  final Function(BuildContext context, FoodEntryState entry) onChange;
+  final Function(BuildContext context, FoodEntryState entry) onTap;
 
-  const FoodEntryWidget(
+  const FoodEntryWidget({
-      {super.key, required this.entry, required this.onDelete});
+    super.key,
+    required this.entry,
+    required this.onDelete,
+    required this.onChange,
+    required this.onTap,
+  });
 
   @override
   State<FoodEntryWidget> createState() => _FoodEntryWidgetState();
 }
 
 class _FoodEntryWidgetState extends State<FoodEntryWidget> {
-  late bool showCancelAndDelete;
-
   @override
   void initState() {
-    showCancelAndDelete = false;
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () {
+      onTap: () => widget.onTap(context, widget.entry),
-        setState(() {
-          showCancelAndDelete = !showCancelAndDelete;
-        });
-      },
       child: Stack(
         children: [
           Positioned.fill(
@@ -38,43 +38,65 @@ class _FoodEntryWidgetState extends State<FoodEntryWidget> {
                 child: Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 8.0),
                   child: RowWidget(
-                    Text(widget.entry.name),
+                    widget.entry.waitingForNetwork
-                    Text(widget.entry.mass.ceil().toString(),
+                        ? const Center(child: CircularProgressIndicator())
-                        textAlign: TextAlign.end),
+                        : Text(widget.entry.name),
-                    Text(widget.entry.kcalPerMass.ceil().toString(),
+                    widget.entry.waitingForNetwork
-                        textAlign: TextAlign.end),
+                        ? Container()
+                        : Text(widget.entry.mass.ceil().toString(),
+                            textAlign: TextAlign.end),
                     Opacity(
-                      opacity: showCancelAndDelete ? 0.0 : 1.0,
+                      opacity: widget.entry.isSelected ? 0.0 : 1.0,
-                      child: Text(
+                      child: widget.entry.waitingForNetwork
-                          (widget.entry.mass * widget.entry.kcalPerMass / 100)
+                          ? Container()
-                              .ceil()
+                          : Text(widget.entry.kcalPer100.ceil().toString(),
-                              .toString(),
+                              textAlign: TextAlign.end),
-                          textAlign: TextAlign.end),
+                    ),
+                    Opacity(
+                      opacity: widget.entry.isSelected ? 0.0 : 1.0,
+                      child: widget.entry.waitingForNetwork
+                          ? Container()
+                          : Text(
+                              (widget.entry.mass *
+                                      widget.entry.kcalPer100 /
+                                      100)
+                                  .ceil()
+                                  .toString(),
+                              textAlign: TextAlign.end),
                     ),
                   ),
                 ),
               ),
               Opacity(
-                  opacity: showCancelAndDelete ? 0.66 : 0.0,
+                  opacity: widget.entry.isSelected ? 0.66 : 0.0,
                   child: Container(
                       color: Theme.of(context).colorScheme.secondary)),
             ]),
           ),
           Opacity(
-            opacity: showCancelAndDelete ? 1.0 : 0.0,
+            opacity: widget.entry.isSelected ? 1.0 : 0.0,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
                 SizedBox(
                   child: IconButton(
-                    padding: const EdgeInsets.all(0.0),
+                      padding: const EdgeInsets.all(0.0),
-                    icon: const Icon(Icons.cancel),
+                      icon: const Icon(Icons.edit),
-                    onPressed: showCancelAndDelete
+                      onPressed: widget.entry.isSelected
-                        ? () => setState(() {
+                          ? () async {
-                              showCancelAndDelete = false;
+                              widget.onTap(context, widget.entry);
-                            })
+                              await showDialog(
-                        : null,
+                                context: context,
-                  ),
+                                builder: (dialogContext) {
+                                  return FoodEntryChangeDialog(
+                                      entry: widget.entry,
+                                      onChange: (context, entry) {
+                                        widget.onChange(context, entry);
+                                      });
+                                },
+                              );
+                            }
+                          : null),
                 ),
                 SizedBox(
                   child: IconButton(
@@ -82,7 +104,7 @@ class _FoodEntryWidgetState extends State<FoodEntryWidget> {
                       iconSize: 24,
                       icon: const Icon(Icons.delete),
                       color: Colors.redAccent,
-                      onPressed: showCancelAndDelete
+                      onPressed: widget.entry.isSelected
                           ? () => widget.onDelete(context, widget.entry.id)
                           : null),
                 ),
@@ -94,3 +116,125 @@ class _FoodEntryWidgetState extends State<FoodEntryWidget> {
     );
   }
 }
+
+class FoodEntryChangeDialog extends StatefulWidget {
+  final FoodEntryState entry;
+  final Function(BuildContext context, FoodEntryState entry) onChange;
+
+  const FoodEntryChangeDialog(
+      {required this.entry, super.key, required this.onChange});
+
+  @override
+  State<FoodEntryChangeDialog> createState() => _FoodEntryChangeDialogState();
+}
+
+class _FoodEntryChangeDialogState extends State<FoodEntryChangeDialog> {
+  late TextEditingController nameController;
+  late TextEditingController massController;
+  late TextEditingController kcalPer100Controller;
+
+  static const textFieldVerticalPadding = 16.0;
+  static const textFieldHorizontalPadding = 16.0;
+
+  @override
+  void initState() {
+    nameController = TextEditingController();
+    nameController.text = widget.entry.name;
+
+    massController = TextEditingController();
+    massController.text = widget.entry.mass.toString();
+
+    kcalPer100Controller = TextEditingController();
+    kcalPer100Controller.text = widget.entry.kcalPer100.toString();
+
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(
+                vertical: textFieldVerticalPadding,
+                horizontal: textFieldHorizontalPadding),
+            child: TextField(
+              onSubmitted: (val) => _onSubmitAction(),
+              controller: nameController,
+              decoration: const InputDecoration(
+                label: Text("Name"),
+              ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(
+                vertical: textFieldVerticalPadding,
+                horizontal: textFieldHorizontalPadding),
+            child: TextField(
+              onSubmitted: (val) => _onSubmitAction(),
+              controller: massController,
+              decoration: const InputDecoration(
+                label: Text("Menge"),
+              ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(
+                vertical: textFieldVerticalPadding,
+                horizontal: textFieldHorizontalPadding),
+            child: TextField(
+              onSubmitted: (val) => _onSubmitAction(),
+              controller: kcalPer100Controller,
+              decoration: const InputDecoration(
+                label: Text("kcal pro Menge"),
+              ),
+            ),
+          )
+        ],
+      ),
+      actions: [
+        IconButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            icon: const Icon(Icons.cancel)),
+        IconButton(
+          onPressed: () => _onSubmitAction(),
+          icon: const Icon(Icons.check),
+        )
+      ],
+    );
+  }
+
+  void _onSubmitAction() {
+    int mass;
+    int kcalPer100;
+
+    try {
+      mass = int.parse(massController.text);
+    } catch (e) {
+      mass = 0;
+    }
+
+    try {
+      kcalPer100 = int.parse(kcalPer100Controller.text);
+    } catch (e) {
+      kcalPer100 = 0;
+    }
+
+    var newEntry = FoodEntryState.withID(
+      id: widget.entry.id,
+      name: nameController.text,
+      mass: mass,
+      kcalPer100: kcalPer100,
+      waitingForNetwork: widget.entry.waitingForNetwork,
+      isSelected: false,
+    );
+
+    widget.onChange(context, newEntry);
+
+    Navigator.of(context).pop();
+  }
+}

lib/food_scan/food_fact_lookup.dart

@@ -45,13 +45,28 @@ class FoodFactLookupClient {
 class FoodFactModel {
   final String name;
   final int kcalPer100g;
+  final int mass;
 
-  FoodFactModel({required this.name, required this.kcalPer100g});
+  FoodFactModel({
+    required this.name,
+    required this.mass,
+    required this.kcalPer100g,
+  });
 
   factory FoodFactModel.fromJson(Map<String, dynamic> json) {
+    String quantityString = json['product']['product_quantity'] ?? "0";
+    int quantity;
+
+    try {
+      quantity = int.parse(quantityString);
+    } catch (e) {
+      quantity = 0;
+    }
+
     return FoodFactModel(
         name: json['product']['product_name'],
-        kcalPer100g: json['product']['nutriments']['energy-kcal_100g']);
+        kcalPer100g: json['product']['nutriments']['energy-kcal_100g'],
+        mass: quantity);
   }
 }
 

lib/main.dart

@@ -1,15 +1,33 @@
-import 'package:calorimeter/perdate/perdate_widget.dart';
+import 'package:calorimeter/food_entry/food_entry_bloc.dart';
+import 'package:calorimeter/perdate/perdate_pageview.dart';
 import 'package:calorimeter/storage/storage.dart';
 import 'package:calorimeter/utils/settings_bloc.dart';
 import 'package:calorimeter/utils/theme_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:go_router/go_router.dart';
+
+List<FoodEntryState> entriesForToday = [];
+DateTime timeNow = DateTime.now();
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+
+  WidgetsFlutterBinding.ensureInitialized();
+
   var storage = await FoodStorage.create();
   await storage.buildFoodLookupDatabase();
+  timeNow = DateTime.now().copyWith(
+      hour: 0,
+      isUtc: true,
+      minute: 0,
+      second: 0,
+      millisecond: 0,
+      microsecond: 0);
+
+  entriesForToday = await storage.getEntriesForDate(timeNow);
+
   var kcalLimit = await storage.readLimit();
   var brightness = await storage.readBrightness();
 
@@ -38,6 +56,13 @@ class MainApp extends StatelessWidget {
     return SafeArea(
       child: MultiBlocProvider(
         providers: [
+          BlocProvider(
+            create: (context) => FoodEntryBloc(
+              storage: storage,
+              initialState:
+                  GlobalEntryState(foodEntries: {timeNow: entriesForToday}),
+            ),
+          ),
           BlocProvider(
             create: (context) => SettingsDataBloc(
                 SettingsState(kcalLimit: kcalLimit),
@@ -56,8 +81,25 @@ class MainApp extends StatelessWidget {
               newBrightness = Brightness.dark;
             }
 
-            return MaterialApp(
+            return MaterialApp.router(
-              home: PerDateWidget(date: DateTime.now()),
+              routerConfig: GoRouter(
+                routes: [
+                  GoRoute(
+                    path: '/',
+                    builder: (context, state) {
+                      return PerDatePageview(
+                        initalDate: DateTime.now().copyWith(
+                          hour: 0,
+                          minute: 0,
+                          second: 0,
+                          millisecond: 0,
+                          microsecond: 0,
+                        ),
+                      );
+                    },
+                  ),
+                ],
+              ),
               localizationsDelegates: const [
                 GlobalMaterialLocalizations.delegate,
                 GlobalWidgetsLocalizations.delegate,

lib/perdate/entry_list.dart

@@ -5,10 +5,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class FoodEntryList extends StatelessWidget {
-  final List<FoodEntry> entries;
+  final List<FoodEntryState> entries;
+  final DateTime date;
 
   const FoodEntryList({
     required this.entries,
+    required this.date,
     super.key,
   });
 
@@ -17,6 +19,7 @@ class FoodEntryList extends StatelessWidget {
     return ListView.builder(
       itemCount: entries.length + 1,
       itemBuilder: (BuildContext itemBuilderContext, int listIndex) {
+        //last item in list is the widget to enter food
         if (listIndex == entries.length) {
           return Column(
             children: [
@@ -24,7 +27,7 @@ class FoodEntryList extends StatelessWidget {
                 onAdd: (context, entry) {
                   context
                       .read<FoodEntryBloc>()
-                      .add(FoodEntryEvent(entry: entry));
+                      .add(FoodEntryEvent(entry: entry, forDate: date));
                 },
               ),
               const SizedBox(height: 75),
@@ -38,10 +41,20 @@ class FoodEntryList extends StatelessWidget {
             FoodEntryWidget(
               key: ValueKey(entries[entryIndex].id),
               entry: entries[entryIndex],
-              onDelete: (callbackContext, id) {
+              onDelete: (_, id) {
-                callbackContext.read<FoodEntryBloc>().add(FoodDeletionEvent(
+                context
-                      entryID: id,
+                    .read<FoodEntryBloc>()
-                    ));
+                    .add(FoodDeletionEvent(entryID: id, forDate: date));
+              },
+              onChange: (_, changedEntry) {
+                context.read<FoodEntryBloc>().add(
+                      FoodChangedEvent(newEntry: changedEntry, forDate: date),
+                    );
+              },
+              onTap: (_, tappedEntry) {
+                context.read<FoodEntryBloc>().add(
+                      FoodEntryTapped(entry: tappedEntry, forDate: date),
+                    );
               },
             ),
             const Divider(),

lib/perdate/perdate_pageview.dart

@@ -0,0 +1,76 @@
+import 'package:calorimeter/perdate/perdate_widget.dart';
+import 'package:flutter/material.dart';
+
+class PerDatePageview extends StatefulWidget {
+  // this is the date for which the PerDate widget will be shown on screen
+  // left of it will be yesterday's PerDate widget
+  // right of it will be tomorrow's PerDate widget
+  final DateTime initalDate;
+  const PerDatePageview({required this.initalDate, super.key});
+
+  @override
+  State<PerDatePageview> createState() => _PerDatePageviewState();
+}
+
+class _PerDatePageviewState extends State<PerDatePageview> {
+  late PageController pageController;
+  late DateTime displayedDate;
+  late List<int> visitedIndexes = [];
+  final int initialOffset = 36500000;
+
+  //TODO: that is just ugly
+  bool backButtonWasPressed = false;
+
+  @override
+  void initState() {
+    super.initState();
+    pageController = PageController(initialPage: initialOffset);
+    displayedDate = widget.initalDate;
+    visitedIndexes.add(initialOffset);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BackButtonListener(
+      onBackButtonPressed: () async {
+        if (visitedIndexes.length == 1) {
+          return false;
+        }
+
+        visitedIndexes.removeLast();
+
+        backButtonWasPressed = true;
+        pageController.jumpToPage(visitedIndexes.last);
+
+        return true;
+      },
+      child: PageView.builder(
+          reverse: true,
+          controller: pageController,
+          onPageChanged: (value) {
+            if (backButtonWasPressed) {
+              backButtonWasPressed = false;
+              return;
+            }
+
+            visitedIndexes.add(value);
+          },
+          itemBuilder: (context, index) {
+            var dateToBuildWidgetFor =
+                displayedDate.subtract(Duration(days: index - initialOffset));
+
+            return PerDateWidget(
+                key: ValueKey(dateToBuildWidgetFor.toString()),
+                date: dateToBuildWidgetFor.copyWith(isUtc: true),
+                onDateSelected: (dateSelected) {
+                  if (dateSelected == null) return;
+
+                  var diff = dateSelected.difference(dateToBuildWidgetFor);
+                  var newIndex = index - diff.inDays;
+
+                  pageController.jumpToPage(newIndex);
+                });
+          }),
+    );
+  }
+}

lib/perdate/perdate_widget.dart

@@ -1,6 +1,4 @@
 import 'package:barcode_scan2/barcode_scan2.dart';
-import 'package:calorimeter/food_scan/food_fact_lookup.dart';
-import 'package:calorimeter/utils/enter_food_controller.dart';
 import 'package:calorimeter/utils/scan_food_floating_button.dart';
 import 'package:calorimeter/utils/app_drawer.dart';
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
@@ -13,135 +11,97 @@ import 'package:calorimeter/utils/theme_switcher_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
 
 class PerDateWidget extends StatefulWidget {
   final DateTime date;
-  const PerDateWidget({super.key, required this.date});
+  final Function(DateTime?) onDateSelected;
+  const PerDateWidget(
+      {super.key, required this.date, required this.onDateSelected});
 
   @override
   State<PerDateWidget> createState() => _PerDateWidgetState();
 }
 
-class _PerDateWidgetState extends State<PerDateWidget> {
+class _PerDateWidgetState extends State<PerDateWidget>
+    with AutomaticKeepAliveClientMixin<PerDateWidget> {
   late FoodStorage storage;
-  late Future<List<FoodEntry>> entriesFuture;
+  List<FoodEntryState> entries = [];
-  List<FoodEntry> entries = [];
 
   @override
   void initState() {
-    storage = FoodStorage.getInstance();
+    context
-    entriesFuture = storage.getEntriesForDate(widget.date);
+        .read<FoodEntryBloc>()
-    entriesFuture.then((val) {
+        .add(PageBeingInitialized(forDate: widget.date));
-      entries = val;
-    });
     super.initState();
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
+    super.build(context);
-        future: entriesFuture,
+
-        builder: (context, snapshot) {
+    return BlocConsumer<FoodEntryBloc, GlobalEntryState>(
-          return snapshot.connectionState != ConnectionState.done
+      listener: (context, pageState) {
-              ? const Center(child: CircularProgressIndicator())
+        if (pageState.errorString != null) {
-              : MultiProvider(
+          showNewSnackbarWith(context, pageState.errorString!);
-                  providers: [
+        }
-                    ChangeNotifierProvider(
+      },
-                        create: (context) => EnterFoodController()),
+      builder: (context, globalState) {
-                    BlocProvider(
+        return Scaffold(
-                      create: (context) => FoodEntryBloc(
+            appBar: AppBar(
-                        initialState: FoodEntryState(foodEntries: entries),
+              title: Text(DateFormat.yMMMMd('de').format(widget.date)),
-                        storage: storage,
+              actions: const [ThemeSwitcherButton()],
-                        forDate: widget.date,
+            ),
-                      ),
+            body: FoodEntryList(
-                    )
+                entries: globalState.foodEntries[widget.date] ?? [],
-                  ],
+                date: widget.date),
-                  child: BlocBuilder<FoodEntryBloc, FoodEntryState>(
+            bottomNavigationBar: BottomAppBar(
-                      builder: (context, state) {
+                shape: const RectangularNotchShape(),
-                    return Scaffold(
+                color: Theme.of(context).colorScheme.secondary,
-                        appBar: AppBar(
+                child: SumWidget(
-                          title:
+                    foodEntries: globalState.foodEntries[widget.date] ?? [])),
-                              Text(DateFormat.yMMMMd('de').format(widget.date)),
+            drawer: const AppDrawer(),
-                          actions: const [ThemeSwitcherButton()],
+            floatingActionButton: OverflowBar(children: [
+              ScanFoodFloatingButton(
+                onPressed: () {
+                  var result = BarcodeScanner.scan();
+                  context.read<FoodEntryBloc>().add(
+                        BarcodeScanned(
+                          scanResultFuture: result,
+                          forDate: widget.date,
                         ),
-                        body: FoodEntryList(entries: state.foodEntries),
+                      );
-                        bottomNavigationBar: BottomAppBar(
+                },
-                            shape: const RectangularNotchShape(),
+              ),
-                            color: Theme.of(context).colorScheme.secondary,
+              const SizedBox(width: 8),
-                            child: SumWidget(foodEntries: state.foodEntries)),
+              CalendarFloatingButton(
-                        drawer: const AppDrawer(),
+                startFromDate: widget.date,
-                        floatingActionButton: OverflowBar(children: [
+                onDateSelected: (dateSelected) {
-                          ScanFoodFloatingButton(
+                  widget.onDateSelected(dateSelected);
-                            onPressed: () async {
+                },
-                              var client = FoodFactLookupClient();
+              ),
-
+            ]),
-                              var scanResult = await BarcodeScanner.scan();
+            floatingActionButtonLocation:
-
+                FloatingActionButtonLocation.endDocked);
-                              if (scanResult.type == ResultType.Cancelled) {
+      },
-                                return;
+    );
-                              }
-
-                              if (!context.mounted) return;
-
-                              if (scanResult.type == ResultType.Error) {
-                                showNewSnackbarWith(context,
-                                    "Fehler beim Scannen des Barcodes.");
-                              }
-                              var response = await client
-                                  .retrieveFoodInfo(scanResult.rawContent);
-
-                              if (!context.mounted) return;
-
-                              if (response.status ==
-                                  FoodFactResponseStatus.barcodeNotFound) {
-                                showNewSnackbarWith(context,
-                                    "Barcode konnte nicht gefunden werden.");
-                                return;
-                              }
-
-                              if (response.status ==
-                                  FoodFactResponseStatus
-                                      .foodFactServerNotReachable) {
-                                showNewSnackbarWith(context,
-                                    "OpenFoodFacts-Server konnte nicht erreicht werden.");
-                                return;
-                              }
-
-                              context.read<EnterFoodController>().set(
-                                    response.food!.name,
-                                    response.food!.kcalPer100g.toString(),
-                                  );
-                            },
-                          ),
-                          const SizedBox(width: 8),
-                          CalendarFloatingButton(
-                            startFromDate: widget.date,
-                            onDateSelected: (dateSelected) {
-                              Navigator.of(context).push(
-                                MaterialPageRoute(
-                                  builder: (context) {
-                                    return PerDateWidget(date: dateSelected);
-                                  },
-                                ),
-                              );
-                            },
-                          ),
-                        ]),
-                        floatingActionButtonLocation:
-                            FloatingActionButtonLocation.endDocked);
-                  }),
-                );
-        });
   }
 
   void showNewSnackbarWith(BuildContext context, String text) {
     var snackbar =
         ErrorSnackbar(colorScheme: Theme.of(context).colorScheme, text: text);
 
-    ScaffoldMessenger.of(context).clearSnackBars();
+    ScaffoldMessenger.of(context)
-    ScaffoldMessenger.of(context).showSnackBar(snackbar);
+      ..removeCurrentSnackBar()
+      ..showSnackBar(snackbar);
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }
 
 class ErrorSnackbar extends SnackBar {

lib/storage/storage.dart

@@ -1,4 +1,3 @@
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
@@ -8,7 +7,7 @@ import 'package:universal_platform/universal_platform.dart';
 class FoodStorage {
   static late FoodStorage _instance;
   late String path;
-  final Map<String, double> _foodLookupDatabase = {};
+  final Map<String, int> _foodLookupDatabase = {};
 
   FoodStorage._create();
 
@@ -31,8 +30,8 @@ class FoodStorage {
 
   static FoodStorage getInstance() => _instance;
 
-  Future<List<FoodEntry>> getEntriesForDate(DateTime date) async {
+  Future<List<FoodEntryState>> getEntriesForDate(DateTime date) async {
-    List<FoodEntry> entries = [];
+    List<FoodEntryState> entries = [];
     var filePath = '$path/${date.year}/${date.month}/${date.day}';
 
     var file = File(filePath);
@@ -43,11 +42,29 @@ class FoodStorage {
     var lines = await file.readAsLines();
 
     for (var line in lines) {
-      var fields = line.split(',');
+      var fields = line.splitWithIgnore(',', ignoreIn: '"');
-      var entry = FoodEntry(
+      int mass = 0;
-          name: fields[1],
+      int kcalPerMass = 0;
-          mass: double.parse(fields[2]),
+
-          kcalPerMass: double.parse(fields[3]));
+      try {
+        mass = int.parse(fields[2]);
+      } catch (e) {
+        mass = double.parse(fields[2]).toInt();
+      }
+
+      try {
+        kcalPerMass = int.parse(fields[3]);
+      } catch (e) {
+        kcalPerMass = double.parse(fields[3]).toInt();
+      }
+
+      var entry = FoodEntryState(
+        name: fields[1].replaceAll('"', ""),
+        mass: mass,
+        kcalPer100: kcalPerMass,
+        waitingForNetwork: false,
+        isSelected: false,
+      );
       entries.add(entry);
     }
 
@@ -55,7 +72,7 @@ class FoodStorage {
   }
 
   Future<void> writeEntriesForDate(
-      DateTime date, List<FoodEntry> foodEntries) async {
+      DateTime date, List<FoodEntryState> foodEntries) async {
     var filePath = '$path/${date.year}/${date.month}/${date.day}';
     var file = File(filePath);
 
@@ -139,11 +156,11 @@ class FoodStorage {
   Future<void> buildFoodLookupDatabase() async {
     // get a list of dates of the last 365 days
     var dates = List<DateTime>.generate(365, (idx) {
-      var pastDay = Duration(days: idx);
+      var durationToPast = Duration(days: idx);
-      return DateTime.now().subtract(pastDay);
+      return DateTime.now().subtract(durationToPast);
     });
 
-    for (var date in dates) {
+    for (var date in dates.reversed) {
       addFoodEntryToLookupDatabaseFor(date);
     }
   }
@@ -152,15 +169,52 @@ class FoodStorage {
     var entriesForDate = await getEntriesForDate(date);
 
     for (var entry in entriesForDate) {
-      _foodLookupDatabase[entry.name] = entry.kcalPerMass;
+      _foodLookupDatabase[entry.name] = entry.kcalPer100;
-      log("Added entry: ${entry.name}/${entry.kcalPerMass}");
     }
   }
 
-  void addFoodEntryToLookupDatabase(FoodEntry entry) {
+  void addFoodEntryToLookupDatabase(FoodEntryState entry) {
-    _foodLookupDatabase[entry.name] = entry.kcalPerMass;
+    _foodLookupDatabase[entry.name] = entry.kcalPer100;
-    log("Added entry: ${entry.name}/${entry.kcalPerMass}");
   }
 
-  Map<String, double> get getFoodEntryLookupDatabase => _foodLookupDatabase;
+  Map<String, int> get getFoodEntryLookupDatabase => _foodLookupDatabase;
+}
+
+extension SplitWithIgnore on String {
+  List<String> splitWithIgnore(String delimiter, {String? ignoreIn}) {
+    List<String> parts = [];
+
+    if (ignoreIn == null) {
+      return split(delimiter);
+    }
+
+    int index = -1;
+    int indexCharAfterDelimiter = 0;
+    bool inIgnore = false;
+    for (var rune in runes) {
+      var char = String.fromCharCode(rune);
+
+      index += 1;
+
+      if (char == ignoreIn) {
+        inIgnore = !inIgnore;
+        continue;
+      }
+
+      if (inIgnore) {
+        continue;
+      }
+
+      if (char == delimiter) {
+        parts.add(substring(indexCharAfterDelimiter, index));
+        indexCharAfterDelimiter = index + 1;
+      }
+
+      if (index + 1 == length) {
+        parts.add(substring(indexCharAfterDelimiter, length));
+      }
+    }
+
+    return parts;
+  }
 }

lib/utils/calendar_floating_button.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 class CalendarFloatingButton extends StatelessWidget {
   final DateTime startFromDate;
-  final Function(DateTime) onDateSelected;
+  final Function(DateTime?) onDateSelected;
 
   const CalendarFloatingButton(
       {super.key, required this.startFromDate, required this.onDateSelected});
@@ -17,12 +17,12 @@ class CalendarFloatingButton extends StatelessWidget {
           initialDate: startFromDate,
           currentDate: DateTime.now(),
           firstDate: DateTime.now().subtract(const Duration(days: 365 * 10)),
-          lastDate: DateTime.now(),
+          lastDate: DateTime.now().add(const Duration(days: 365 * 10)),
         );
 
         if (!context.mounted) return;
 
-        onDateSelected(datePicked ?? DateTime.now());
+        onDateSelected(datePicked);
       },
       heroTag: "calendarFAB",
       child: const Icon(Icons.today),

lib/utils/enter_food_controller.dart

@@ -1,12 +0,0 @@
-import 'package:flutter/material.dart';
-
-class EnterFoodController extends ChangeNotifier {
-  String name = "";
-  String kcalPer100g = "";
-
-  void set(String newName, String newKcal) {
-    name = newName;
-    kcalPer100g = newKcal;
-    notifyListeners();
-  }
-}

lib/utils/sum_widget.dart

@@ -4,7 +4,7 @@ import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/utils/settings_bloc.dart';
 
 class SumWidget extends StatelessWidget {
-  final List<FoodEntry> foodEntries;
+  final List<FoodEntryState> foodEntries;
   const SumWidget({required this.foodEntries, super.key});
 
   @override
@@ -13,7 +13,7 @@ class SumWidget extends StatelessWidget {
       builder: (context, state) {
         var sum = 0.0;
         for (var entry in foodEntries) {
-          sum += entry.kcalPerMass / 100 * entry.mass;
+          sum += entry.kcalPer100 / 100 * entry.mass;
         }
         var diff = state.kcalLimit - sum;
         var diffLimit = state.kcalLimit ~/ 4;

pubspec.lock

@@ -1,6 +1,43 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      url: "https://pub.dev"
+    source: hosted
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.7.0"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.6.1"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.0"
   async:
     dependency: transitive
     description:
@@ -41,6 +78,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
   clock:
     dependency: transitive
     description:
@@ -57,6 +110,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.18.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.2"
   crypto:
     dependency: transitive
     description:
@@ -81,6 +150,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
@@ -102,14 +179,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.1.6"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.1"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -120,6 +205,59 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: "6f1b756f6e863259a99135ff3c95026c3cdca17d10ebef2bba2261a25ddc8bbc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.3.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
   intl:
     dependency: "direct main"
     description:
@@ -128,6 +266,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.19.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.1"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -156,10 +318,26 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
@@ -184,6 +362,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.15.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   nested:
     dependency: transitive
     description:
@@ -192,6 +378,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
@@ -212,10 +414,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
+      sha256: f7544c346a0742aee1450f9e5c0f5269d7c602b9c95fdbcd9fb8f5b1df13b1cc
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.10"
+    version: "2.2.11"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -248,6 +450,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
@@ -264,6 +474,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
   protobuf:
     dependency: transitive
     description:
@@ -280,6 +498,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
   settings_ui:
     dependency: "direct main"
     description:
@@ -288,11 +514,59 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
@@ -341,6 +615,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  test:
+    dependency: "direct main"
+    description:
+      name: test
+      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.25.7"
   test_api:
     dependency: transitive
     description:
@@ -349,6 +631,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.2"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.4"
   typed_data:
     dependency: transitive
     description:
@@ -369,10 +659,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.5.1"
   vector_math:
     dependency: transitive
     description:
@@ -389,14 +679,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.5"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
 sdks:
-  dart: ">=3.5.2 <4.0.0"
+  dart: ">=3.5.3 <4.0.0"
-  flutter: ">=3.22.0"
+  flutter: ">=3.24.0"

pubspec.yaml

@@ -1,10 +1,10 @@
 name: calorimeter
 description: "A new Flutter project."
 publish_to: 'none'
-version: 0.1.0
+version: 1.1.0
 
 environment:
-  sdk: ^3.5.2
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -19,11 +19,20 @@ dependencies:
   uuid: ^4.5.0
   barcode_scan2: ^4.3.3
   provider: ^6.1.2
+  test: ^1.25.7
+  go_router: ^14.3.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
+  flutter_launcher_icons: ^0.14.1
 
 flutter:
   uses-material-design: true
+
+flutter_launcher_icons:
+  android: "launcher_icon"
+  image_path: "assets/icon.png"
+  adaptive_icon_background: "assets/icon_background.png"
+  adaptive_icon_foreground: "assets/icon.png"

test/split_with_ignore_test.dart

@@ -0,0 +1,59 @@
+import 'package:calorimeter/storage/storage.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group(
+    'Test custom split with ignore',
+    () {
+      test('string without ignoring', () {
+        var testString = 'This is a test string';
+        var resultingList = testString.splitWithIgnore(' ');
+
+        expect(resultingList[0], equals('This'));
+        expect(resultingList[1], equals('is'));
+        expect(resultingList[2], equals('a'));
+        expect(resultingList[3], equals('test'));
+        expect(resultingList[4], equals('string'));
+      });
+
+      test('string that does not contain the ignored character', () {
+        var testString = 'This is a test string';
+        var resultingList = testString.splitWithIgnore(' ', ignoreIn: '"');
+
+        expect(resultingList[0], equals('This'));
+        expect(resultingList[1], equals('is'));
+        expect(resultingList[2], equals('a'));
+        expect(resultingList[3], equals('test'));
+        expect(resultingList[4], equals('string'));
+      });
+
+      test(
+        'string that contains ignored character',
+        () {
+          var testString = 'This is "a test" string';
+          var resultingList = testString.splitWithIgnore(' ', ignoreIn: '"');
+
+          expect(resultingList[0], equals('This'));
+          expect(resultingList[1], equals('is'));
+          expect(resultingList[2], equals('"a test"'));
+          expect(resultingList[3], equals('string'));
+        },
+      );
+
+      test(
+        'string that contains commas that should be ignored',
+        () {
+          var testString =
+              'f9a96b80-71f9-11ef-8df4-f3628a737a16,"Erdnüsse, geröstet",120.0,100.0';
+          var resultingList = testString.splitWithIgnore(',', ignoreIn: '"');
+
+          expect(
+              resultingList[0], equals('f9a96b80-71f9-11ef-8df4-f3628a737a16'));
+          expect(resultingList[1], equals('"Erdnüsse, geröstet"'));
+          expect(resultingList[2], equals('120.0'));
+          expect(resultingList[3], equals('100.0'));
+        },
+      );
+    },
+  );
+}