Commit Graph

18 Commits (2e22914cc2f1e537d64d6d4a05fabd3230448285)

Author SHA1 Message Date
Bogdan Kotikov 8a3d6808a3 bug fix 2023-06-16 08:34:41 +02:00
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
Bogdan Kotikov 6085297b1c settings page 2023-06-03 00:40:40 +02:00
2211260 d131e1263c feat: add loading spinner for search component, adjust filtering and add success toast 2023-06-02 18:18:08 +02:00
Bogdan Kotikov be6609837c woche, monat kalorien, fett, kohlenhydrate, etc, bug fixes 2023-06-02 00:38:19 +02:00
98spag 2580b8f1f7 merge main 2023-06-01 12:17:04 +02:00
Bogdan Kotikov 69420489ec Onboarding Screen 2023-05-31 23:22:38 +02:00
98spag b42f83ca27 Merge remote-tracking branch 'origin/lauritz-branch' into lauritz-branch
# Conflicts:
#	.dart_tool/package_config.json
#	.dart_tool/package_config_subset
#	.flutter-plugins-dependencies
#	lib/android/pages/nav_pages/today_page.dart
#	pubspec.lock
2023-05-30 09:40:30 +02:00
98spag b33cb8a8e3 feat: add statistics component logic with dedicated box and day,week,month filtering 2023-05-30 09:38:54 +02:00
Bogdan Kotikov de561a4b90 Design angepasst 2023-05-29 22:04:44 +02:00
98spag da079c7728 add necessary files to vcs 2023-05-29 12:08:46 +02:00
98spag bb44d8a05b add necessary files to vcs 2023-05-29 12:02:59 +02:00
Bogdan Kotikov 873819dea1 Progress Page und Meal Page das Design fertig gemacht 2023-05-26 00:59:09 +02:00
Bogdan Kotikov cf568e4fdd Android App in Android Ordner bewegt, Gericht / Speisen suchen und auswählen, Kalorien zählen und summieren, Daten in der DB speichern 2023-05-12 18:12:28 +02:00
Bogdan Kotikov fce201774e Gerichte hinzufügen und in der DB speichern, Kalorien aufzählen, 2023-05-10 00:04:33 +02:00
Bogdan Kotikov 8697d749c8 Bilder, Anzeigen der Kärtchen, usw hinzugefügt 2023-04-29 15:56:04 +02:00
98spag abcbce3e95 feat: swiper and bottom nav bar first draft 2023-04-16 12:38:21 +02:00
Bogdan Kotikov c43aa8a021 setup 2023-04-13 23:01:48 +02:00