Commit Graph

13 Commits (1f52c7971a7164a34c52f6b703772ef29018e25d)

Author SHA1 Message Date
98spag 6ff338ad5e merge upstream 2023-05-30 09:41:01 +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
Bogdan Kotikov de561a4b90 Design angepasst 2023-05-29 22:04:44 +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 0fd124bf5c feat: add meal prep page, dynmic titles, layout fixes 2023-05-13 13:13:40 +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
Bogdan Kotikov ff74c58163 Navigation Bar 2023-04-23 13:08:04 +02:00
Bogdan Kotikov 75ea3ed6f3 WelcomeScreen und Navigation zusammen verknüpft 2023-04-19 16:24:14 +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