Commit Graph

25 Commits (ae7f64ac1eebcc202f5ddff2d2e0f953fbd4c386)

Author SHA1 Message Date
98spag ae7f64ac1e merge feature branch 2023-06-01 12:22:43 +02:00
98spag 2580b8f1f7 merge main 2023-06-01 12:17:04 +02:00
98spag f25de45f7c feat: adjustments 2023-06-01 12:14:23 +02:00
Bogdan Kotikov b93bf41961 bug fixing 2023-06-01 11:46:53 +02:00
Bogdan Kotikov 237e8ffa4e Merge remote-tracking branch 'origin/main' into feature/chart-progress-page
# Conflicts:
#	.flutter-plugins-dependencies
2023-05-31 23:48:21 +02:00
Bogdan Kotikov 69420489ec Onboarding Screen 2023-05-31 23:22:38 +02:00
98spag fcc607043e feat: add weeekly ranking list and average calories 2023-05-30 22:09:16 +02:00
98spag cc1ea62d2d feat: add observable values for charts 2023-05-30 21:03:46 +02:00
98spag b201a6758b feat: add ingredient progress bars to page 2023-05-30 17:28:16 +02:00
98spag 77023ad118 feat: format helper 2023-05-30 17:15:35 +02:00
98spag 0fd7def1e4 feat: format helper 2023-05-30 17:12:42 +02:00
98spag 53d69b22d5 bugfix: fix string capitalization errror 2023-05-30 17:10:53 +02:00
Bogdan Kotikov a5d132aee6 bugfix: fix type error 2023-05-30 16:42:01 +02:00
98spag d05683e0a6 add auto gen files to vcs 2023-05-30 16:17:51 +02:00
98spag 6aadf7bbfa feat: adjust foodname list: shorten names, show count and calories 2023-05-30 15:15:22 +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
98spag 5d3f12c9a1 feat: add statistics service 2023-05-14 09:22:26 +02:00
98spag 0fd124bf5c feat: add meal prep page, dynmic titles, layout fixes 2023-05-13 13:13:40 +02:00
Bogdan Kotikov 2dd5e9a18d Android App in Android Ordner bewegt, Gericht / Speisen suchen und auswählen, Kalorien zählen und summieren, Daten in der DB speichern 2023-05-13 13:02:42 +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