wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,871 Commits 30 Branches 39 Tags
23b8b5e2e0036f961663a27b040488982a66a4d4
Commit Graph

90 Commits

Author SHA1 Message Date
Roland Geider
779926bc98 Move nutritional plan diary chart to fl charts 2023-10-01 20:38:24 +02:00
Roland Geider
ef5a7081a0 Make MeasurementChartWidgetFl work 
This still doesn't look completely nice, but it's a good start
 2023-10-01 14:27:02 +02:00
artchiee
cf35cea913 Unfinished work on Charts replacement 2023-08-22 12:12:41 +01:00
Roland Geider
237b4daaba Further work on pie chart for the nutritional plan 2023-05-19 20:59:37 +02:00
Roland Geider
90edf0f100 Start replacing the charts with fl_chart 2023-04-25 20:54:47 +02:00
Roland Geider
d7a27bd35c Merge branch 'master' into feature/dashboard-with-measurements 2022-10-11 21:51:32 +02:00
Roland Geider
a8e4fdb4e0 Merge branch 'master' into feature/exercise-crowdsourcing 
# Conflicts:
#	lib/models/workouts/log.dart
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
 2022-10-10 15:50:50 +02:00
Bujdy
ad83cfb20d changed weight layout, added option to add measurement category, added navigation to measurement 2022-10-06 11:27:18 +02:00
Bujdy
1b724f3b10 removed onPressed 2022-10-06 00:04:42 +02:00
Bujdy
a659fcc24a fixed typo, added translation, fixed empty list state, added elevation parameter to card 2022-10-05 23:52:50 +02:00
Bujdy
5cc6413f0d addded measurements to dashboard, categories card refactor 2022-10-05 17:09:59 +02:00
Aditya
3e8e1c8f16 Removed Deprecated Code 2022-10-02 08:41:57 +05:30
Roland Geider
0711e199da Merge branch 'master' into feature/exercise-crowdsourcing 
# Conflicts:
#	lib/models/exercises/exercise.g.dart
#	pubspec.lock
#	pubspec.yaml
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
 2022-07-01 09:47:52 +02:00
Roland Geider
ca2fd8e9ef Add a consumer to the body weight card 
Closes #144
 2022-05-20 19:08:13 +02:00
Roland Geider
9d554b391d Some further fixes for migration to exercise bases 2022-05-10 17:07:06 +02:00
Roland Geider
f834950cec Workout logs and settings now have a reference to an exercise base 
This puts this code in sync with the backend and is logically better, since
the translations can be displayed when needed and are not hard coded
 2022-05-10 16:53:44 +02:00
yaseenagwan
d7b216d57a fix: Render Overflow issue in Dashboard screen 2022-01-09 13:30:03 +05:30
Roland Geider
a77a0cc5db Show last logged items for quick access 2021-11-08 10:37:57 +01:00
Roland Geider
9d6d3fcc25 Add quick link to log to diary on dashboard 2021-11-03 20:04:19 +01:00
Marvin M
6fac7455c5 Merge branch 'master' into better-linting-rules-1 2021-10-09 00:05:45 +02:00
Sandi Milohanić
bed7da48c6 New language keys have been added for some short names of macronutrients (energy, fats, carbohydrates, proteins) 2021-10-08 13:14:02 +02:00
Marvin M
1e8080cc02 always_declare_return_types 2021-10-07 20:43:55 +02:00
Marvin M
9d479e89b0 const_constructors 
info: Prefer const with constant constructors. prefer_const_constructors
 2021-10-07 20:40:09 +02:00
Sandi Milohanić
0c1e80e660 Optimization code lines 2021-10-07 13:35:46 +02:00
Sandi Milohanić
7deef06b1d Consistenly display nutritional values 
Additional: Removed macronutrients sugars and saturated fats
 2021-10-07 11:36:19 +02:00
Github-actions
1a84fec097 Automatic linting 2021-10-02 10:58:18 +00:00
Marvin M
eae34f0b36 Fixes pt 2 2021-10-01 17:32:31 +02:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
3874a49fe0 Add measurement entries in the dashboard calendar 2021-09-06 18:33:54 +02:00
Roland Geider
8ed9bdb6e0 Add shortcut to weight overview from dashboard 
This makes the behaviour more consistent and is more useful
 2021-08-30 19:55:09 +02:00
Roland Geider
93b159b3b9 Show chart with measurement entries values in detail view 2021-08-28 22:07:54 +02:00
Roland Geider
5b5feca8b8 Refactor weight chart to be used with the measurement entries 2021-08-25 17:19:47 +02:00
Prakash Shekhar
3193bfd3ca Fixes #68 2021-08-15 11:28:02 -04:00
Roland Geider
51422b3053 Use correct label when there are no nutritional plans 2021-08-11 13:28:37 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
7e416383b5 Use string as a key for dates in the calendar 
Fixes #33
 2021-06-12 17:19:00 +02:00
Roland Geider
b915c764ef Don't check AppLocalizations for null values 
This is not needed in flutter 2.2 anymore
 2021-05-19 11:50:43 +02:00
Roland Geider
0e7f50c2dd Use font awesome icons for weight 2021-05-18 11:49:10 +02:00
Roland Geider
09ed4dc402 Refactor calendar on dashboard 
The scrollable list view is now removed. There can't be that many different
types of events for a single day anyway.
 2021-05-17 18:22:37 +02:00
Roland Geider
6c4a09bf97 Refactor dashboard.dart 
This design should be cleaner and more compact
 2021-05-17 18:07:29 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
6ab3e26db4 Rename workout description to name 2021-05-06 13:18:32 +02:00
Roland Geider
0edb4c1373 Always show exercises, show reps for details 2021-05-01 15:32:56 +02:00
Roland Geider
9ec1898cfc Show repetitions in a column 
If there are e.g. four different ones, the resulting line is really ugly
 2021-04-30 10:58:08 +02:00
Roland Geider
e9a0615775 Use local date as key 
This hopefully fixes an error where no logs would be shown in the calendar when
running the app on a real device
 2021-04-25 16:59:36 +02:00
Roland Geider
7c7829f473 Handle ingredient name overflowing in the dashboard 2021-04-25 16:19:06 +02:00
Roland Geider
809d5ab51f Mute the repetitions of exercises in the dashboard 2021-04-25 15:01:02 +02:00
Roland Geider
f67cb1797b Calculates reps for a set locally 
This saves us unneeded round trips to the server

See #14
 2021-04-24 13:58:14 +02:00
Roland Geider
2424199e09 Add tests for PlanForm 2021-04-23 12:47:12 +02:00