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

242 Commits

Author SHA1 Message Date
Roland Geider
5beedf05b3 Merge branch 'fix/terminology' 
# Conflicts:
#	lib/widgets/routines/day.dart
#	lib/widgets/routines/forms.dart
#	lib/widgets/routines/log.dart
#	lib/widgets/routines/routines_list.dart
#	lib/widgets/routines/workout_logs.dart
#	test/routine/gym_mode_screen_test.mocks.dart
#	test/routine/repetition_unit_form_widget_test.mocks.dart
#	test/routine/weight_unit_form_widget_test.mocks.dart
#	test/routine/workout_day_form_test.mocks.dart
#	test/routine/workout_form_test.mocks.dart
#	test/routine/workout_plan_screen_test.mocks.dart
#	test/routine/workout_plans_screen_test.mocks.dart
#	test/routine/workout_provider_test.mocks.dart
#	test/routine/workout_set_form_test.mocks.dart
 2023-11-09 20:44:02 +01:00
Github-actions
ca27faf9e2 Automatic linting 2023-11-09 19:26:45 +00:00
Roland Geider
7659d06ea6 Merge branch 'master' into 12people_maintenance 
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/core/charts.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/charts.dart
#	lib/widgets/workouts/charts.dart
#	pubspec.lock
#	pubspec.yaml
#	test_driver/screenshot_driver.dart
 2023-11-09 20:24:01 +01:00
Roland Geider
09f60fe432 Fix tests and recreate generated files 2023-11-09 19:07:38 +01:00
Miroslav Mazel
15923aea10 Camel-case variables 2023-11-05 23:22:42 +01:00
Miroslav Mazel
50b634d78a Single quotes instead of double 2023-11-05 23:12:39 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
5c2e1a98fd Rename workout to routine 
See https://github.com/wger-project/wger/issues/651
 2023-10-21 21:37:12 +02:00
Roland Geider
53a00cca63 Move another charts to fl charts 
These *really* need to get some kind of native time series support....
 2023-10-08 21:27:55 +02:00
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
Roland Geider
84ccc67c37 Merge branch 'master' into fix/replace-chart-lib 
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
 2023-10-01 12:14:17 +02:00
Github-actions
8c809ad8cb Automatic linting 2023-08-08 09:14:27 +00:00
Roland Geider
aecbcfe663 Update models to work with new keys 
creation_date was renamed to created and
update_date to last_updated
 2023-08-08 11:12:55 +02:00
Github-actions
3003409c57 Automatic linting 2023-06-08 14:15:55 +00:00
Roland Geider
481ff898fa The field creation date in ingredients is now a datetime 2023-06-08 16:14:25 +02:00
Roland Geider
237b4daaba Further work on pie chart for the nutritional plan 2023-05-19 20:59:37 +02:00
Roland Geider
8460d2fc0f Merge pull request #367 from 12people/master 
Linux/macOS support
 2023-04-15 12:20:52 +02:00
Roland Geider
2d7e35c0db Fix JSON response 2023-04-09 12:03:24 +02:00
Roland Geider
d79645a6f5 The ingredient ID is an integer, not a string 2023-04-09 11:40:40 +02:00
Roland Geider
525fc8efd3 Fix typo 2023-04-09 11:29:55 +02:00
Roland Geider
f7ac8b716b Merge branch 'master' into 12people-master 
# Conflicts:
#	lib/widgets/nutrition/widgets.dart
#	pubspec.lock
 2023-04-09 10:57:43 +02:00
Roland Geider
65dd284f8f Fix test 2023-04-08 23:44:47 +02:00
Miroslav Mazel
7aeed3bde5 Prep Linux/macOS support: package_info_plus package + env variables instead of AndroidMetadata 2023-03-21 21:06:37 +01:00
Roland Geider
984df49c41 Add switch to search for ingredients in English as well 2023-03-20 17:14:12 +01:00
Roland Geider
fa8dd7e46f Fix merge errors 2023-03-20 14:19:29 +01:00
Roland Geider
b60e19cb16 Merge branch 'master' into feature/ingredient-images 
# Conflicts:
#	lib/main.dart
#	lib/providers/nutrition.dart
#	pubspec.yaml
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart
 2023-03-20 13:58:31 +01:00
Roland Geider
1d896c6c4a Allow searching for exercise names in English as well 
See wger-project/wger/issues/1238
 2023-03-16 11:15:39 +01:00
Roland Geider
8e6eadf1b9 Annotate the needed mocks for each test 
This makes it clear where they are loaded from
 2023-02-11 13:50:42 +01:00
Roland Geider
fcfa1ceabf Annotate the needed mocks for each test 
This makes it clear where they are loaded from
 2023-02-11 13:45:42 +01:00
Roland Geider
b9d6641c87 Pass BaseProvider as an argument to workout provider 2023-02-11 13:45:42 +01:00
Roland Geider
9630e2b16b Recreate generated files 2023-02-08 12:51:36 +01:00
Roland Geider
7bb9ac28fd Merge branch 'master' into feature/ingredient-images 
# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.g.dart
#	lib/widgets/core/core.dart
#	pubspec.lock
#	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
 2023-02-08 12:48:00 +01:00
Roland Geider
a977d4ec48 Refactor add_exercise_screen.dart 
Use the is_trustworthy flag from the server, which also takes the account's age
into account. The widgets in the screen are split so it's easier to test and read
 2023-02-07 20:30:09 +01:00
Github-actions
90501ad35c Automatic linting 2023-02-06 19:35:13 +00:00
Roland Geider
4f4f6f553a Add paginated fetches 
This allows the app to fetch all available items from an enpoint, without
having to hope that the ?limit=999 is enough

Closes #133
 2023-02-06 20:33:39 +01:00
Roland Geider
28091ad0e4 Fix tests 2023-02-05 22:44:30 +01:00
Github-actions
1370a7a666 Automatic linting 2023-02-05 21:39:05 +00:00
Roland Geider
a90a304124 Fix tests 2023-02-05 21:28:53 +01:00
Roland Geider
f68afd91fd Rename exercise object to translation 
This is what they are now anyway and makes it more clear
 2023-02-05 21:24:28 +01:00
Roland Geider
0ff3717ebb Fix tests 2023-01-30 13:02:00 +01:00
Roland Geider
021e06dfee Fix some tests 
Flutter 3.7 seems to need an explicit Scrollable widget
 2023-01-27 22:34:46 +01:00
Roland Geider
32e3c0f3b9 Move fixtures to their own folders for better overview 2022-12-05 21:10:20 +01:00
Roland Geider
cd137888d3 Merge branch 'master' into tests 2022-12-01 13:59:25 +01:00
Github-actions
ceae6985fc Automatic linting 2022-11-29 16:27:47 +00:00
Roland Geider
a004192ed3 Correctly pass the base ID to render log charts 
See https://github.com/wger-project/wger/issues/1180
 2022-11-29 17:25:45 +01:00
Github-actions
280b5c0c43 Automatic linting 2022-11-24 10:25:48 +00:00
Roland Geider
18b6903513 Create more and more realistic screenshots for the app store 
Now these test use the regular test data, which has been updated and is used in
the rest of the tests as well.
 2022-11-24 11:24:09 +01:00
Bujdy
d606f596c3 added workout and gallery provider tests 2022-11-12 17:38:52 +01:00
amannegi
1afb3ef47d Merge branch 'master' of https://github.com/AmanNegi/flutter into auth_redesign 2022-10-20 23:35:23 +05:30