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
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
7c1dc05d81
Only render the FlNutritionalDiaryChartWidget chart if there is data for it
2023-11-09 18:37:34 +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
b2e7f65d29
Remove debug code and unused files
2023-11-08 20:05:25 +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
f31bcc770d
Consts and finals where possible
2023-11-05 23:27:22 +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
5c2e1a98fd
Rename workout to routine
...
See https://github.com/wger-project/wger/issues/651
2023-10-21 21:37:12 +02:00
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
268d1d945f
Render units in the measurements charts
...
Note that the reserved size is probably too small if the unit or the values
are longer
2023-10-09 19:22:19 +02:00
Roland Geider
af9b733060
Cleanup
2023-10-09 19:16:03 +02:00
Roland Geider
d1af7acb32
Correctly format the date according to the current locale
2023-10-09 19:08:56 +02:00
Roland Geider
6bd448f17a
Correctly format the date according to the current locale
2023-10-08 21:56:46 +02:00
Roland Geider
03f6b555af
Fix order of log entries
2023-10-08 21:52:07 +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
23b8b5e2e0
Translate the macronutrient's names
2023-10-07 13:01: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
artchiee
cf35cea913
Unfinished work on Charts replacement
2023-08-22 12:12:41 +01:00
Github-actions
f58f61e4bc
Automatic linting
2023-06-26 14:53:02 +00:00
artchiee
72e9f4bef6
null check fixed whene poping back from scanner
2023-06-23 12:13:51 +01:00
Roland Geider
c0bc830bb9
Merge branch 'master' into google_play_dependency
2023-06-20 11:06:16 +02:00
artchiee
5ec43b65ef
bar code scanner is replaced
2023-06-19 18:33:29 +01:00
Roland Geider
237b4daaba
Further work on pie chart for the nutritional plan
2023-05-19 20:59:37 +02:00
tejasbirsingh
090abe923f
Add icons, merge email and its verify fields
2023-05-09 21:49:21 +05:30
Roland Geider
90edf0f100
Start replacing the charts with fl_chart
2023-04-25 20:54:47 +02: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
