Commit Graph

77 Commits (2623e97718a97d0eb85a7d301b3bee29175d5ea3)

Author SHA1 Message Date
98spag 2623e97718 feat: remove web componetns 2023-06-16 11:46:32 +02:00
98spag 29b16918c0 feat: changes 2023-06-16 11:44:42 +02:00
Bogdan Kotikov 8a3d6808a3 bug fix 2023-06-16 08:34:41 +02:00
Bogdan Kotikov c9d65c04f7 bug fix 2023-06-07 00:01:26 +02:00
Bogdan Kotikov 1b9d8b693f bug fix 2023-06-06 23:45:02 +02:00
Bogdan Kotikov 30cf45bd35 bug 2023-06-03 01:06:38 +02:00
Bogdan Kotikov ca5f610dcb speed up main page 2023-06-03 00:51:26 +02:00
Bogdan Kotikov 6505c9948c Merge pull request 'feature/optimize-search-page' (#5) from feature/optimize-search-page into main
Reviewed-on: #5
2023-06-03 00:49:56 +02:00
Bogdan Kotikov 1641c7accb merge 2023-06-03 00:49:19 +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 5335625c99 settings page 2023-06-03 00:46:54 +02:00
Bogdan Kotikov 6085297b1c settings page 2023-06-03 00:40:40 +02:00
2211260 67da75fb3e feat: add goal line to progress chart 2023-06-02 20:21:16 +02:00
2211260 fd4e07fc8c feat: adjust list logic on today page 2023-06-02 20:02:32 +02:00
2211260 5553a521d1 feat: styling adjustments 2023-06-02 19:21:06 +02:00
2211260 af5a4384c6 feat: make page title black 2023-06-02 18:38:19 +02:00
2211260 6ebdb39760 feat: adjust search styling 2023-06-02 18:35:07 +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 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