From a58c965e7bce9394e67c04de1767bd7c4c6cb079 Mon Sep 17 00:00:00 2001 From: Tomasz Trela <153635094+TTomaszPWR@users.noreply.github.com> Date: Tue, 17 Sep 2024 21:09:39 +0200 Subject: [PATCH 1/2] feat/change-arrows-and-fav-colors --- .../parkings_view/widgets/parking_favourite.dart | 11 ++++++++--- .../widgets/parking_wide_tile_card.dart | 13 ++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/features/parkings_view/widgets/parking_favourite.dart b/lib/features/parkings_view/widgets/parking_favourite.dart index 132d3609..236d57d4 100644 --- a/lib/features/parkings_view/widgets/parking_favourite.dart +++ b/lib/features/parkings_view/widgets/parking_favourite.dart @@ -19,27 +19,32 @@ class FavouriteParkingWidget extends ConsumerWidget { visualDensity: VisualDensity.compact, onPressed: favController.toggle, icon: isFavorite == null - ? const FavouriteIcon( + ? FavouriteIcon( icon: Icons.error, + color: context.colorTheme.whiteSoap, ) : FavouriteIcon( icon: isFavorite ? Icons.favorite_rounded : Icons.favorite_border_outlined, + color: isFavorite + ? context.colorTheme.orangePomegranade + : context.colorTheme.whiteSoap, ), ); } } class FavouriteIcon extends StatelessWidget { - const FavouriteIcon({super.key, required this.icon}); + const FavouriteIcon({super.key, required this.icon, required this.color}); final IconData icon; + final Color color; @override Widget build(BuildContext context) { return Icon( icon, - color: context.colorTheme.whiteSoap, + color: color, size: 22, shadows: iparkingShadows, ); diff --git a/lib/features/parkings_view/widgets/parking_wide_tile_card.dart b/lib/features/parkings_view/widgets/parking_wide_tile_card.dart index bd4fd1fb..fd3dd7cc 100644 --- a/lib/features/parkings_view/widgets/parking_wide_tile_card.dart +++ b/lib/features/parkings_view/widgets/parking_wide_tile_card.dart @@ -147,7 +147,7 @@ class _RightColumn extends StatelessWidget { ), Icon( parking.trend.arrowIcon, - color: context.colorTheme.whiteSoap, + color: arrowColor(parking.trend, context), size: 21, ), ], @@ -156,3 +156,14 @@ class _RightColumn extends StatelessWidget { ); } } + +Color arrowColor(String trend, BuildContext context) { + switch (trend) { + case "1": + return const Color(0xFF28a745); + case "-1": + return const Color(0xFFdc3545); + default: + return context.colorTheme.whiteSoap; + } + } From cd927c96e5f07bcbb91712c5545e7d3201ccf4a9 Mon Sep 17 00:00:00 2001 From: Tomasz Trela <153635094+TTomaszPWR@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:19:38 +0200 Subject: [PATCH 2/2] refactor/ arow color --- .../widgets/parking_wide_tile_card.dart | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/features/parkings_view/widgets/parking_wide_tile_card.dart b/lib/features/parkings_view/widgets/parking_wide_tile_card.dart index fd3dd7cc..ea50ad6b 100644 --- a/lib/features/parkings_view/widgets/parking_wide_tile_card.dart +++ b/lib/features/parkings_view/widgets/parking_wide_tile_card.dart @@ -147,7 +147,9 @@ class _RightColumn extends StatelessWidget { ), Icon( parking.trend.arrowIcon, - color: arrowColor(parking.trend, context), + color: isActive + ? arrowColor(parking.trend, context) + : context.colorTheme.whiteSoap, size: 21, ), ], @@ -158,12 +160,12 @@ class _RightColumn extends StatelessWidget { } Color arrowColor(String trend, BuildContext context) { - switch (trend) { - case "1": - return const Color(0xFF28a745); - case "-1": - return const Color(0xFFdc3545); - default: - return context.colorTheme.whiteSoap; - } + switch (trend) { + case "1": + return const Color(0xFF28a745); //green arrow + case "-1": + return const Color(0xFFdc3545); //red arrow + default: + return context.colorTheme.whiteSoap; } +}