Commit Graph

60 Commits (6085297b1c00e46f7771bbdbfafab45bdc03109d)

Author SHA1 Message Date
Bogdan Kotikov 6085297b1c settings page 2023-06-03 00:40:40 +02:00
Bogdan Kotikov a989878cca optimierung 2023-06-02 01:42:56 +02:00
Bogdan Kotikov c91f3901dd Merge pull request 'feature/show-only-today-meals-on-today-page' (#4) from feature/show-only-today-meals-on-today-page into main
Reviewed-on: #4
2023-06-02 00:41:57 +02:00
Bogdan Kotikov 4fbb5f58a5 woche, monat kalorien, fett, kohlenhydrate, etc, bug fixes 2023-06-02 00:39:40 +02:00
Bogdan Kotikov 947ab18251 Merge remote-tracking branch 'origin/feature/show-only-today-meals-on-today-page' into feature/show-only-today-meals-on-today-page 2023-06-02 00:38:48 +02:00
Bogdan Kotikov be6609837c woche, monat kalorien, fett, kohlenhydrate, etc, bug fixes 2023-06-02 00:38:19 +02:00
98spag 851fc0e44d feat: show only food list from today on today page - test with mock data 2023-06-01 14:58:33 +02:00
98spag a56fed5450 feat: show only food list from today on today page - test with mock data 2023-06-01 14:58:12 +02:00
98spag 795de496cd feat: show only food list from today on today page 2023-06-01 13:59:12 +02:00
98spag 8d33371966 feat: adjust chart styling 2023-06-01 13:19:55 +02:00
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 b0ca2ada88 Merge pull request 'welcome' (#2) from welcome into main
Reviewed-on: #2
2023-05-31 23:27:40 +02:00
Bogdan Kotikov 69420489ec Onboarding Screen 2023-05-31 23:22:38 +02:00
98spag 7a97f99496 add first draft of progress page chart 2023-05-31 13:36:44 +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 1f5b6e18ff bugfix: add filter bug 2023-05-30 18:02:13 +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 6631c7766a cleanup: remove unnecessary method 2023-05-30 14:53:02 +02:00
98spag 722dff965b bugfix: remove box contains check due to regulary cleaning box before update 2023-05-30 14:50:27 +02:00
98spag 1f52c7971a small cleanup 2023-05-30 14:40:39 +02:00
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
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
98spag 475996facf adjust gitignore 2023-05-29 11:58:58 +02:00
Bogdan Kotikov 873819dea1 Progress Page und Meal Page das Design fertig gemacht 2023-05-26 00:59:09 +02:00
98spag 558ad030c7 bugfix: adjust timestamp / 1000 2023-05-14 09:27:23 +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
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
98spag 345a9e0d4e feat: add app bar with dynamic header 2023-04-19 19:56:35 +02:00
Bogdan Kotikov 78c2415391 Merge pull request 'swiper-bottom-nav-bar' (#1) from swiper-bottom-nav-bar into main
Reviewed-on: #1
2023-04-19 19:32:37 +02:00
Bogdan Kotikov 75ea3ed6f3 WelcomeScreen und Navigation zusammen verknüpft 2023-04-19 16:24:14 +02:00