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,729 Commits 30 Branches 39 Tags
5ec43b65ef4fa238ede48d9c4272afabdb2fd253
Commit Graph

545 Commits

Author SHA1 Message Date
artchiee
5ec43b65ef bar code scanner is replaced 2023-06-19 18:33:29 +01:00
Github-actions
bbb564b189 Automatic linting 2023-04-22 10:34:38 +00:00
Roland Geider
5035140d75 Merge pull request #377 from DeveloperMalay/secondery_graph 
creating a secondary graph for energy value
 2023-04-22 12:33:12 +02:00
Freddy Cunningham
043fa29d6f Text prompt strings marked as translatable 2023-04-18 12:51:23 +01:00
Freddy Cunningham
5e17cdee1a Create text prompt for empty screens [issue 306] 2023-04-17 10:49:04 +01:00
Malay Pandit
b431d4f100 creating a secondary graph for energy value 2023-04-17 02:53:28 +05:30
Roland Geider
8460d2fc0f Merge pull request #367 from 12people/master 
Linux/macOS support
 2023-04-15 12:20:52 +02:00
Roland Geider
bf7e2e8956 Move platform check to helper 
Also, use TargetPlatform since it it better suited for tests (and seems to
be now the recommended way of checking this for UI elements)
 2023-04-15 12:17:08 +02:00
Roland Geider
0c7b80137e Link to ingredient product 2023-04-09 12:00:13 +02:00
Roland Geider
525fc8efd3 Fix typo 2023-04-09 11:29:55 +02:00
Roland Geider
fe957e4981 Fix variable name 2023-04-09 11:15:35 +02:00
Github-actions
f82ab0793e Automatic linting 2023-04-09 08:59:27 +00: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
Miroslav Mazel
e470b8809d Platform conditions for image_picker library 2023-03-22 11:55:36 +01:00
Miroslav Mazel
0613f6eb23 Platform check for flutter_barcode_scanner library 2023-03-21 21:22:23 +01:00
Miroslav Mazel
283605eb4b Platform check for videos library 2023-03-21 21:22:07 +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
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
fe59ddc9ac Add helper to get the nutritional plan's label 
Returns the name or the term "nutritional plan"
 2023-02-09 18:25:40 +01:00
Roland Geider
aa62c27cdb Add refresh indicators to the entry lists 
This allows the user to manually trigger an update if desired

See wger-project/wger/issues/1253
 2023-02-09 18:08:31 +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
57e7464d2d Some polishing 2023-02-06 22:31:35 +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
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
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
amannegi
e258b8f6c5 Added Localized Texts #265 2022-10-26 14:09:19 +05:30
amannegi
0fe738fac5 Change AboutDialog to separate page #265 2022-10-26 11:08:09 +05:30
Aaliya Ali
5aa658d030 Merge branch 'master' into master 2022-10-19 13:19:01 +05:30
Github-actions
e8337126b9 Automatic linting 2022-10-14 18:51:29 +00:00
Roland Geider
d7a27bd35c Merge branch 'master' into feature/dashboard-with-measurements 2022-10-11 21:51:32 +02:00
Roland Geider
cc9e3994a6 Update the value when updating removing entries via chips 2022-10-10 16:33:54 +02:00
Roland Geider
842cad802a Translate the muscle names for the secondary muscles dropdown 2022-10-10 16:30:03 +02:00
Roland Geider
123b80eb9f Use const keys 2022-10-10 16:20:30 +02:00
Roland Geider
b34882ccea Rename file for the AddExercise provider for more consistency 2022-10-10 16:08:06 +02:00
Roland Geider
ea792e70f0 Merge remote-tracking branch 'origin/feature/exercise-crowdsourcing' into feature/exercise-crowdsourcing 
# Conflicts:
#	pubspec.lock
 2022-10-10 15:56:44 +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
Roland Geider
c1dace1426 Merge pull request #236 from floodoo/add-measurement-unit-to-entry-form 
Add measurement unit to entry form
 2022-10-04 17:10:34 +02:00
Aditya
3e8e1c8f16 Removed Deprecated Code 2022-10-02 08:41:57 +05:30
Aaliya Ali
504b4a76c9 Add MasonryGridView to the Gallery 2022-10-01 23:15:19 +05:30
Roland Geider
6d1c259c85 Rename widgets and files 
These names are the same used in the react application
 2022-10-01 15:27:10 +02:00
Roland Geider
e6ea4e6053 Remove unused code 2022-10-01 13:50:58 +02:00
Florian Schmitz
21c6fcb4da Add measurement unit to MeasurementEntryForm 2022-09-27 14:37:20 +02:00
Roland Geider
db479cf4a2 Show exercise aliases 2022-09-10 23:48:05 +02:00
Roland Geider
515defe7f3 Fix merge conflicts 2022-09-07 20:12:21 +02:00