Commit Graph

269 Commits

Author SHA1 Message Date
Roland Geider
396c98dbd9 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/widgets/add_exercise/steps/step2variations.dart
#	pubspec.lock
2024-01-11 11:20:31 +01:00
Github-actions
0bc5e8e9e6 Automatic linting 2024-01-10 14:45:21 +00:00
Roland Geider
cd1caa0126 Fix merge problems 2024-01-09 15:56:57 +01:00
Roland Geider
d51b6d7d87 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/main.dart
#	lib/providers/exercises.dart
#	lib/widgets/workouts/day.dart
#	pubspec.lock
#	pubspec.yaml
2024-01-09 15:37:48 +01:00
Milksheyke
7fe9b645fd Remove unnecessary comment 2024-01-06 00:59:54 -05:00
Milksheyke
d0bc72fdef Add "Contribute an exercise" to "No matching exercise" suggestion
Created noItemsFoundBuilder callback for typeAheadFormField in exercise search form.
2024-01-06 00:41:57 -05:00
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +01:00
Roland Geider
c5cbb4f851 Rework exercise database
This is now separated into individual tables and methods so that they can be
tested separately
2023-12-26 17:03:20 +01:00
Roland Geider
65ba2275ae Run "dart format --line-length=100 ." to make the diff smaller 2023-12-23 16:40:05 +01:00
Abhishek Saini
c69c639fac fix(drift): built a model for exercise and fixes in fromSql type converter 2023-12-23 14:28:38 +05:30
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Abhishek Saini
c21b278e36 test cases fixes 2023-11-19 16:56:49 +05:30
Roland Geider
bcbfa8ed5e Show exercise names instead of their UUIDs
closes #297
closes #300
2023-11-19 11:08:42 +01:00
Abhishek Saini
82a49f6cac Merge branch 'master' into feat/data-persistence 2023-11-18 23:23:30 +05:30
Roland Geider
c514842b59 Lint the code with a line length of 100
This makes it easier to understand the diffs
2023-11-16 21:36:21 +01:00
Abhishek Saini
582bc611a4 feat(drift-database): Shifted from shared prefs to drift for Exercises 2023-11-16 22:34:40 +05:30
Miroslav Mazel
8d3f03953d Smaller rep setting heading variant 2023-11-11 18:01:22 +01:00
Miroslav Mazel
89caf4616d Adding much-needed padding 2023-11-11 17:59:55 +01:00
Miroslav Mazel
d445283cf7 Different fonts + tweaked icons 2023-11-11 12:33:19 +01:00
Roland Geider
95f863a0b6 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/workouts/day.dart
2023-11-10 19:27:27 +01:00
Roland Geider
dc940c314d Remove toList in spreads 2023-11-10 19:09:57 +01:00
Roland Geider
5845e70a6b Simplify some of the widgets since these values are set in the theme now 2023-11-10 19:08:42 +01: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
9e85745c2f Make the calendar theme dynamic based on the current theme (light/dark mode) 2023-11-09 19:50:05 +01:00
Roland Geider
81ed85c2f2 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/nutritional_plan_detail.dart
2023-11-09 19:16:17 +01:00
Roland Geider
77249de6bd Fix bug in tooltips
It is not possible to get the reps just from the weight (and the date for that
matter), since it's very possible that there are collisions here. Luckily we can
access the number of the series so we can get the reps by going through the
original data

Why so much manual work 😭
2023-11-08 21:22:31 +01:00
Roland Geider
08cc1a30ea Add some padding to the chart 2023-11-08 19:55:39 +01:00
Roland Geider
221a1505e7 Dynamically generate a legend for the training logs
Why don't can't you provide this fl_chart, why!!!!!
2023-11-08 19:50:54 +01:00
Abhishek Saini
f2f9582031 fix: tooltip and legend in workout chart 2023-11-08 16:27:25 +05:30
Miroslav Mazel
5f7bc96f8b Don't use BuildContext across async gaps 2023-11-05 23:34:37 +01:00
Miroslav Mazel
9a34eac395 isEmpty instead of ==0 2023-11-05 23:27:37 +01:00
Miroslav Mazel
d86ee692bb Children at the bottom + consistent variable names + BuildContext async gaps 2023-11-05 23:24:50 +01:00
Miroslav Mazel
420b06a661 Organize imports / remove unnecessary ones 2023-11-05 23:22:34 +01:00
Miroslav Mazel
c655c3e86e Stricter mixin rules: with -> implements 2023-11-05 23:16:53 +01:00
Miroslav Mazel
c81c467d7a Dependency bump + replacing deprecated lib 2023-11-05 23:11:46 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
bedd65e5b1 Mucking around with interval duration 2023-10-10 14:05:53 +02:00
Roland Geider
70b63b1b26 Add first version of the repetition chart and finally remove old chart library 2023-10-09 20:22:12 +02:00
Roland Geider
07671b7273 Some polishing 2023-04-23 13:10:17 +02:00
Roland Geider
95cf21a74c Remove more hard coded colors 2023-04-23 13:05:21 +02:00
Roland Geider
8de51abb9a Remove more hard coded colors and use the theme data 2023-04-22 14:30:31 +02:00
Roland Geider
80ec0e80fb Start moving to material 3
Also dark mode at last
2023-04-22 13:38:13 +02:00
Freddy Cunningham
5e17cdee1a Create text prompt for empty screens [issue 306] 2023-04-17 10:49:04 +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
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
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
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
Roland Geider
48ec2edbb3 Cleanup app bars
The dashboard has the main app bar that allows to change the settings, while
each screen has its own with custom actions
2022-04-15 13:03:35 +02:00
Roland Geider
bf710bc5d5 Translate categories and equipment in other parts of the application 2022-04-13 12:08:46 +02:00