Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to material 3 #451

Merged
merged 38 commits into from
Nov 18, 2023
Merged

Move to material 3 #451

merged 38 commits into from
Nov 18, 2023

Conversation

rolandgeider
Copy link
Member

Update widgets and theme to use material 3, also adds a dark theme

@rolandgeider
Start moving to material 3
80ec0e8 
Also dark mode at last
@rolandgeider
Remove more hard coded colors and use the theme data
8de51ab
@rolandgeider
Add high contrast themes as well
8478ec4
@rolandgeider
Remove more hard coded colors
95cf21a
@rolandgeider
Set the color of the bottom navigation bar statically to the main color
f16a8da
@rolandgeider
Some polishing
07671b7
@rolandgeider
Use icon from font awesome
baa4d17 
No need to keep our own images around
@rolandgeider
Use same order for parameters
1bd2109
@rolandgeider
Re-add hard coded color to FAB
187cae9 
This is a bit more cheerful
@rolandgeider
More polishing
1ea3c2e
@rolandgeider
Merge branch 'master' into feature/material-3
656a508 
# Conflicts:
#	lib/theme/theme.dart
#	pubspec.lock
#	pubspec.yaml
@rolandgeider
Manually bump version
626c834
@rolandgeider
Use better branch and commit message
f3ece0c
@rolandgeider
Merge branch 'master' into feature/material-3
43d61ec 
# Conflicts:
#	pubspec.yaml
@rolandgeider
Bump version
6314a8c
@rolandgeider
Merge branch 'master' into feature/material-3
a046cb1
@rolandgeider
Merge branch 'master' into feature/material-3
81ed85c 
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/nutritional_plan_detail.dart
@rolandgeider
Add prefix to application id during debug
1b09cfd 
This allows to install the application side by side on a real device where the
production app is installed as well
@rolandgeider
Remove unused color
9dd9c56
@rolandgeider
Make the calendar theme dynamic based on the current theme (light/dar…
9e85745 
…k mode)
@rolandgeider
Make chips a bit smaller and give them a bit of color
6a1f231
@rolandgeider
Don't make the chart square...
6d84cf7
@rolandgeider
Set the color of the categories card
abca70a 
While this still doesn't completely blend in with the surrounding widgets in
the dashboard, it's at least an improvement
@rolandgeider
Update theme
969c643 
This is now created with flex_color_scheme, which makes tweaking this
much much easier
@rolandgeider
Simplify some of the widgets since these values are set in the theme now
5845e70
@rolandgeider
Remove toList in spreads
dc940c3
@rolandgeider
Don't fill text inputs
e287e6a
@rolandgeider rolandgeider linked an issue Nov 10, 2023 that may be closed by this pull request
Move theme to material 3 and add dark theme #335
Closed
@rolandgeider
Merge branch 'master' into feature/material-3
95f863a 
# Conflicts:
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/workouts/day.dart
@rolandgeider
Import font awesome flutter package
d78ec46
@rolandgeider rolandgeider merged commit 884dfe4 into master Nov 18, 2023
4 checks passed
@rolandgeider rolandgeider deleted the feature/material-3 branch November 18, 2023 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move theme to material 3 and add dark theme
1 participant
@rolandgeider