Commit Graph

79 Commits

Author SHA1 Message Date
Dieter Plaetinck
6e1d3f9568 dart format --line-length=100 .
(except auto generated files)
2024-06-20 15:44:35 +03:00
Dieter Plaetinck
8db1a7c960 dcm fix --only-rules=unnecessary-trailing-comma lib 2024-06-07 14:59:00 +03:00
Dieter Plaetinck
7f74bff32c dcm fix --only-rules=prefer-trailing-comma lib 2024-06-07 14:59:00 +03:00
Roland Geider
5003c00b32 Small tweaks 2024-01-23 15:23:06 +01:00
Roland Geider
190f47f76b Merge branch 'master' into ux_fixes 2024-01-12 14:54:25 +01: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
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +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
Miroslav Mazel
814acd14c7 Meals + workouts: Removing Dismissible 2023-11-24 13:01:30 +01:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +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
5845e70a6b Simplify some of the widgets since these values are set in the theme now 2023-11-10 19:08:42 +01:00
Miroslav Mazel
d86ee692bb Children at the bottom + consistent variable names + BuildContext async gaps 2023-11-05 23:24:50 +01:00
Roland Geider
07671b7273 Some polishing 2023-04-23 13:10:17 +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
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
a4e381e4c8 Make order of sets a required attribute
Closes #109
2021-10-28 11:43:32 +02:00
Marvin M
32a306f75a prefer_typing_uninitialized_variables 2021-10-08 15:26:06 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
Marvin M
923b44ba97 Marked as '@immutable'
This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: WorkoutForm._plan
2021-10-07 19:58:40 +02:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
6646640b9c Show set notes on the workout and the gym mode
https://github.com/wger-project/wger/issues/702
2021-07-17 13:25:04 +02:00
Roland Geider
8999b9bc27 Add drag handles to reorderable sets
This makes it more obvious that the order can be changed
2021-07-08 08:17:55 +02:00
Github-actions
bc21e44a30 Automatic linting 2021-07-01 15:10:27 +00:00
Arun Muralidharan
7eb26da243 Reorder Sets
Now updates order upon deletion as well. Order will be set to length of sets upon adding a new one.
2021-06-28 21:56:25 +02:00
Arun Muralidharan
22993a0151 Reorder List
Change in order now reflects in DB as well.
2021-06-28 14:59:43 +02:00
Arun Muralidharan
db04964f20 Reorder Sets
Progress PR for Issue #41. Currently you can edit the order (long press to reorder) in the workout plan screen. The order change is only local; it persists only for the current session. However, I have not figured out how to reflect the changed order in the DB using the API. Does Day even store the order of its Sets in the DB? Or is it dynamically populated into the model in the app?
2021-06-27 23:36:53 +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
ab10b987b1 Only show action icons when there is data to work with 2021-05-24 14:27:24 +02:00
Roland Geider
d5d6c7a1ba Make actions more discoverable for plans
Plans now show regular icons when expanding the panel. While it is not obvious
at all that the header of a workout day or nutritional plan is swipeable, it
provides a quick way to perform commonly used actions, so it will stay for the
users that have found it
2021-05-24 14:13:36 +02:00
Roland Geider
45a404586e Move workout detail switcher to toggle buttons
This makes it more obvious that the page is part of the current workout
2021-05-21 12:39:29 +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
0b13e8260e Give the add set form a cleanup 2021-05-18 15:00:40 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
cceefdf397 Use material translations for common words 2021-04-30 18:51:38 +02:00
Roland Geider
2c0e1ef05b Change icons used for expanding panels in workout and nutritional plans 2021-04-30 12:19:11 +02:00
Roland Geider
414f2eb234 Show exercise details from workout page 2021-04-28 10:26:47 +02:00
Roland Geider
fc4e9c45df Add drag indicator to dismissibles 2021-04-25 15:28:06 +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
3c21650003 Translate week day names in workout screens 2021-04-24 12:31:08 +02:00
Roland Geider
ad7507c8b7 Update license header as well 2021-04-13 10:28:15 +02:00
Roland Geider
5557686ff7 Polish the gym mode and other widgets 2021-04-06 20:41:44 +02:00
Roland Geider
110579aeb7 Some cleanup work on exercise images 2021-04-02 21:01:47 +02:00
Roland Geider
bf9abea7aa Render forms in own scaffold
This eliminates many of the overflow problems from the bottom sheet
2021-04-02 17:35:31 +02:00
Roland Geider
ecd2773a87 Upgrade packages and move application to null safety 2021-03-25 22:20:16 +01:00
Roland Geider
5b06a86576 Add overflow behaviour for workout day descriptions 2021-03-20 00:05:16 +01:00