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

fix: Transportation Component Icon and title color is not compatible #1494

Merged
merged 16 commits into from
Apr 9, 2022
Merged

fix: Transportation Component Icon and title color is not compatible #1494

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0f14011
chore(develop): release 1.0.0
github-actions[bot] Apr 4, 2022
d5a71e3
Merge pull request #1 from bhattabhi013/release-please--branches--dev…
bhattabhi013 Apr 4, 2022
85785da
fix: Transportation Component Icon and title color is not compatible …
bhattabhi013 Apr 4, 2022
ddb4947
removed extra variable
bhattabhi013 Apr 4, 2022
cd9547b
Merge branch 'openfoodfacts:develop' into develop
bhattabhi013 Apr 5, 2022
e5f8fae
chore(develop): release 1.1.0
github-actions[bot] Apr 5, 2022
e91c6c0
Merge pull request #2 from bhattabhi013/release-please--branches--dev…
bhattabhi013 Apr 5, 2022
9e8016c
Merge branch 'develop' into issue#1347
bhattabhi013 Apr 5, 2022
70d46ec
remoed additional variable
bhattabhi013 Apr 5, 2022
0bbd6eb
removed additional files
bhattabhi013 Apr 5, 2022
3d4f4b6
added CHANGELOG.md file
bhattabhi013 Apr 5, 2022
5b8ec5e
Merge branch 'develop' into issue#1347
bhattabhi013 Apr 6, 2022
f7c7a5a
resolve commit
bhattabhi013 Apr 6, 2022
e949e13
added set for dark mode
bhattabhi013 Apr 8, 2022
6e01e6a
color design fixes
bhattabhi013 Apr 9, 2022
a81a260
removed unused code
bhattabhi013 Apr 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/smooth_app/lib/cards/product_cards/knowledge_panels/knowledge_panel_title_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@ class KnowledgePanelTitleCard extends StatelessWidget {

final TitleElement knowledgePanelTitleElement;
final Evaluation? evaluation;

@override
Widget build(BuildContext context) {
final ThemeData themeData = Theme.of(context);
final ColorScheme colorScheme = themeData.colorScheme;
bhattabhi013 marked this conversation as resolved.
Show resolved Hide resolved
Color? colorFromEvaluation;
bhattabhi013 marked this conversation as resolved.
Show resolved Hide resolved
Color? iconColorFromEvaluation;
if (evaluation != null &&
bhattabhi013 marked this conversation as resolved.
Show resolved Hide resolved
(knowledgePanelTitleElement.iconColorFromEvaluation ?? false)) {
colorFromEvaluation = _getColorFromEvaluation(evaluation!);
iconColorFromEvaluation = _getColorFromEvaluation(evaluation!);
}
if (evaluation != null &&
_getColorFromEvaluation(evaluation!) == null &&
themeData.brightness == Brightness.dark) {
colorFromEvaluation = Colors.white;
iconColorFromEvaluation = colorScheme.primary;
}
bhattabhi013 marked this conversation as resolved.
Show resolved Hide resolved
List<Widget> iconWidget;
if (knowledgePanelTitleElement.iconUrl != null) {
Expand All @@ -37,7 +41,7 @@ class KnowledgePanelTitleCard extends StatelessWidget {
iconUrl: knowledgePanelTitleElement.iconUrl,
width: 36,
height: 36,
color: colorFromEvaluation,
color: iconColorFromEvaluation,
bhattabhi013 marked this conversation as resolved.
Show resolved Hide resolved
),
),
),
Expand Down Expand Up @@ -84,7 +88,7 @@ class KnowledgePanelTitleCard extends StatelessWidget {
case Evaluation.BAD:
return RED_COLOR;
case Evaluation.NEUTRAL:
return GREY_COLOR;
return PRIMARY_GREY_COLOR;
bhattabhi013 marked this conversation as resolved.
Show resolved Hide resolved
case Evaluation.AVERAGE:
return LIGHT_ORANGE_COLOR;
case Evaluation.GOOD:
Expand Down