Bogdan Kotikov 741199d84d Merge remote-tracking branch 'origin/main' into feature/optimize-search-page ... # Conflicts: # .dart_tool/package_config.json # .dart_tool/package_config_subset # .flutter-plugins-dependencies # lib/android/pages/nav_pages/main_page.dart # pubspec.yaml		2023-06-03 00:48:17 +02:00
..
main_page.dart	Merge remote-tracking branch 'origin/main' into feature/optimize-search-page	2023-06-03 00:48:17 +02:00
meal_plan_page.dart	optimierung	2023-06-02 01:42:56 +02:00
progress_page.dart	feat: add goal line to progress chart	2023-06-02 20:21:16 +02:00
search_food.dart	feat: add loading spinner for search component, adjust filtering and add success toast	2023-06-02 18:18:08 +02:00
today_page.dart	feat: styling adjustments	2023-06-02 19:21:06 +02:00