Commit Graph

1968 Commits

Author SHA1 Message Date
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
e287e6a24f Don't fill text inputs 2023-11-10 19:14:37 +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
969c643e5c Update theme
This is now created with flex_color_scheme, which makes tweaking this
much much easier
2023-11-10 19:07:14 +01:00
Roland Geider
abca70a6f0 Set the color of the categories card
While this still doesn't completely blend in with the surrounding widgets in
the dashboard, it's at least an improvement
2023-11-10 15:18:53 +01:00
Roland Geider
6d84cf7348 Don't make the chart square... 2023-11-10 14:40:12 +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
6a1f231e48 Make chips a bit smaller and give them a bit of color 2023-11-09 20:19:19 +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
9dd9c568c2 Remove unused color 2023-11-09 19:49:38 +01:00
Roland Geider
1b09cfd73a Add prefix to application id during debug
This allows to install the application side by side on a real device where the
production app is installed as well
2023-11-09 19:37:59 +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
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