Commit Graph

1943 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
Roland Geider
10bfb787ff Remove flutter_launcher_icons
Better icons have been added manually
2023-11-09 20:31:33 +01:00
Roland Geider
345a99e215 Merge pull request #445 from 12people/master
Maintenance PR
2023-11-09 20:30:27 +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
Roland Geider
1684288f09 Finally update flutter version 🥳 2023-11-09 19:07:09 +01:00
Roland Geider
e49b571bf2 Merge pull request #449 from wger-project/fix/replace-chart-lib
Replace chart lib
2023-11-09 18:44:12 +01:00
Roland Geider
ccc10b0426 Don't run the test twice on PRs 2023-11-09 18:41:13 +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
b4686978f2 Remove getRandomColor, wasn't being used 2023-11-08 19:59:12 +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
Roland Geider
fead739d8e Merge pull request #446 from wger-project/dependabot/pub/rive-0.12.2
Bump rive from 0.11.4 to 0.12.2
2023-11-08 12:00:19 +01:00
Abhishek Saini
f2f9582031 fix: tooltip and legend in workout chart 2023-11-08 16:27:25 +05:30
Miroslav Mazel
02e88310dc Remove unused logo_adaptive 2023-11-06 01:36:59 +01:00
Miroslav Mazel
7e9f4c5ce1 Fix accidental flutter_icons indent 2023-11-06 01:25:21 +01:00
Miroslav Mazel
a6a141c6fa flutter_launcher_icons: disable generation 2023-11-06 01:18:31 +01:00
dependabot[bot]
533a22e574 Bump rive from 0.11.4 to 0.12.2
Bumps [rive](https://github.com/rive-app/rive-flutter) from 0.11.4 to 0.12.2.
- [Release notes](https://github.com/rive-app/rive-flutter/releases)
- [Changelog](https://github.com/rive-app/rive-flutter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rive-app/rive-flutter/commits)

---
updated-dependencies:
- dependency-name: rive
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-06 00:17:53 +00:00
Miroslav Mazel
734525b2bb Vector Android icon, also as monochrome variant 2023-11-06 01:16:21 +01:00
Miroslav Mazel
fc90cd30a2 Squircle macOS icons 2023-11-06 00:31:28 +01:00
Miroslav Mazel
c9e9aa0de4 Sharper iOS icons 2023-11-06 00:30:34 +01:00
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
15923aea10 Camel-case variables 2023-11-05 23:22:42 +01:00
Miroslav Mazel
420b06a661 Organize imports / remove unnecessary ones 2023-11-05 23:22:34 +01:00
Miroslav Mazel
f0930ba84a Ignore specific unused field warning 2023-11-05 23:17:11 +01:00
Miroslav Mazel
c655c3e86e Stricter mixin rules: with -> implements 2023-11-05 23:16:53 +01:00
Miroslav Mazel
50b634d78a Single quotes instead of double 2023-11-05 23:12:39 +01:00
Miroslav Mazel
46e35e0467 Updating screenshot driver 2023-11-05 23:12:07 +01:00
Miroslav Mazel
c81c467d7a Dependency bump + replacing deprecated lib 2023-11-05 23:11:46 +01:00
Abhishek Saini
8e443a5d13 Merge branch 'fix/replace-chart-lib' of https://github.com/wger-project/flutter into fix/replace-chart-lib 2023-11-05 22:23:37 +05:30
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
4fcccf2f61 Change tester to findsWidgets
For some reason this tests behaves differently on github actions vs locally
2023-11-05 15:20:01 +01:00
Roland Geider
2ff02c0935 Fix test 2023-11-05 15:14:19 +01:00
Roland Geider
6a9ebadb73 Correctly set the colors for the training logs 2023-11-05 15:12:32 +01:00
Roland Geider
67f727867c Some improvements to interval handling 2023-11-05 14:52:35 +01:00
Roland Geider
005f4d3db7 Better intervals
While this still doesn't look as nice and centered as I would like to,
it is at least an improvement
2023-11-05 11:56:38 +01:00
Roland Geider
511cde1669 Remove fl_chart_line.dart, not used 2023-11-05 11:07:35 +01:00
Roland Geider
3a075e2915 Merge branch 'master' into fix/replace-chart-lib 2023-11-05 10:49:09 +01:00
Milo Ivir
4761c6c142 Translated using Weblate (Croatian)
Currently translated at 100.0% (4 of 4 strings)

Translation: wger Workout Manager/Play Store
Translate-URL: https://hosted.weblate.org/projects/wger/play-store/hr/
2023-10-22 21:04:42 +00:00
Roland Geider
3b44d29692 Remove debug code 2023-10-21 21:41:37 +02:00
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
6303f607c2 Merge pull request #441 from Abhisheksainii/patch-2
Update AUTHORS.md
2023-10-21 19:40:40 +02:00
Roland Geider
0820cf8d37 Merge pull request #440 from Abhisheksainii/patch-1
Update pull_request_template.md
2023-10-21 19:39:07 +02:00
Abhishek Saini
e47ee4e3ab Update pull_request_template.md
Changes :
1. Tests message updated
2. Improved bullet points structure in checklist
2023-10-21 23:07:26 +05:30