diff --git a/assets/map_marker_accented.svg b/assets/map_marker_accented.svg index e36c4b0b..5714bb01 100644 --- a/assets/map_marker_accented.svg +++ b/assets/map_marker_accented.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/map_marker_empty.svg b/assets/map_marker_empty.svg index 91b90f84..b0d1b185 100644 --- a/assets/map_marker_empty.svg +++ b/assets/map_marker_empty.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/assets/map_marker_filled.svg b/assets/map_marker_filled.svg index 8db0ba3e..f688f84f 100644 --- a/assets/map_marker_filled.svg +++ b/assets/map_marker_filled.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/assets/map_marker_group_accented.svg b/assets/map_marker_group_accented.svg index e0fa7de0..86982fb3 100644 --- a/assets/map_marker_group_accented.svg +++ b/assets/map_marker_group_accented.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/assets/map_marker_group_empty.svg b/assets/map_marker_group_empty.svg index e2212cf9..2f0c10e0 100644 --- a/assets/map_marker_group_empty.svg +++ b/assets/map_marker_group_empty.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/assets/map_marker_group_filled.svg b/assets/map_marker_group_filled.svg index 90ac33d7..ca9925bd 100644 --- a/assets/map_marker_group_filled.svg +++ b/assets/map_marker_group_filled.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/assets/map_marker_group_selected.svg b/assets/map_marker_group_selected.svg index ba9bcca3..ef60ac63 100644 --- a/assets/map_marker_group_selected.svg +++ b/assets/map_marker_group_selected.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/assets/map_marker_group_suggestions.svg b/assets/map_marker_group_suggestions.svg index 21217d1b..0818a9d4 100644 --- a/assets/map_marker_group_suggestions.svg +++ b/assets/map_marker_group_suggestions.svg @@ -1,39 +1,6 @@ - - - - - - - + + + + + diff --git a/assets/map_marker_selected.svg b/assets/map_marker_selected.svg index 2f476593..068eec15 100644 --- a/assets/map_marker_selected.svg +++ b/assets/map_marker_selected.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/assets/map_marker_suggestions.svg b/assets/map_marker_suggestions.svg index dc3cc34f..b75d0228 100644 --- a/assets/map_marker_suggestions.svg +++ b/assets/map_marker_suggestions.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/lib/ui/base/text_styles.dart b/lib/ui/base/text_styles.dart index 2c4299ac..ad1aed63 100644 --- a/lib/ui/base/text_styles.dart +++ b/lib/ui/base/text_styles.dart @@ -5,6 +5,7 @@ import 'package:plante/ui/base/colors_plante.dart'; import 'package:plante/ui/base/safe_font_environment_detector.dart'; class TextStyles { + static const _MARKER_FONT_SIZE = 15.0; TextStyles._(); static const TextStyle normal = @@ -132,19 +133,25 @@ class TextStyles { static TextStyle markerFilled = TextStyle( fontFamily: montserrat, fontWeight: FontWeight.bold, - fontSize: 17, + fontSize: _MARKER_FONT_SIZE, color: ColorsPlante.primary); + static TextStyle markerSuggestion = TextStyle( + fontFamily: montserrat, + fontWeight: FontWeight.bold, + fontSize: _MARKER_FONT_SIZE, + color: const Color(0xFF255B55)); + static TextStyle markerAccented = TextStyle( fontFamily: montserrat, fontWeight: FontWeight.bold, - fontSize: 17, + fontSize: _MARKER_FONT_SIZE, color: const Color(0xFFF02222)); static TextStyle markerEmpty = TextStyle( fontFamily: montserrat, fontWeight: FontWeight.bold, - fontSize: 17, + fontSize: _MARKER_FONT_SIZE, color: ColorsPlante.grey); static TextStyle licenceMarker = TextStyle( diff --git a/lib/ui/map/map_page/map_page_mode_default.dart b/lib/ui/map/map_page/map_page_mode_default.dart index 0c2d9b21..7eeecd7e 100644 --- a/lib/ui/map/map_page/map_page_mode_default.dart +++ b/lib/ui/map/map_page/map_page_mode_default.dart @@ -194,7 +194,7 @@ class MapPageModeDefault extends MapPageModeShopsCardBase { key: const Key('filter_shops_with_rad_suggested_products'), text: context .strings.map_page_filter_shops_with_radius_suggested_products, - markerColor: const Color(0xFF61AB7B), + markerColor: const Color(0xFF3D948D), value: _showSuggestionsAtShop[SuggestionType.RADIUS]!.watch(ref), onChanged: _setShowRadSuggestedShops, ), @@ -202,7 +202,7 @@ class MapPageModeDefault extends MapPageModeShopsCardBase { key: const Key('filter_shops_with_off_suggested_products'), text: context .strings.map_page_filter_shops_with_off_suggested_products, - markerColor: const Color(0xFF61AB7B), + markerColor: const Color(0xFF3D948D), value: _showSuggestionsAtShop[SuggestionType.OFF]!.watch(ref), onChanged: _setShowOffSuggestedShops, ), diff --git a/lib/ui/map/map_page/markers_builder.dart b/lib/ui/map/map_page/markers_builder.dart index 5aa8d306..96616257 100644 --- a/lib/ui/map/map_page/markers_builder.dart +++ b/lib/ui/map/map_page/markers_builder.dart @@ -53,7 +53,7 @@ Future _getMarkerBitmap(Iterable shops, context, 'assets/map_marker_filled.svg', 1, TextStyles.markerFilled); } else if (shops.any(hasSuggestions)) { return _bitmapDescriptorFromSvgAsset(context, - 'assets/map_marker_suggestions.svg', 1, TextStyles.markerFilled); + 'assets/map_marker_suggestions.svg', 1, TextStyles.markerSuggestion); } else { return _bitmapDescriptorFromSvgAsset( context, 'assets/map_marker_empty.svg', 1, TextStyles.markerEmpty); @@ -85,7 +85,7 @@ Future _getMarkerBitmap(Iterable shops, context, 'assets/map_marker_group_suggestions.svg', shops.length, - TextStyles.markerEmpty); + TextStyles.markerSuggestion); } else { return _bitmapDescriptorFromSvgAsset( context, @@ -152,7 +152,7 @@ Future _bitmapDescriptorFromSvgAsset(BuildContext context, xOffset = 21.5 * devicePixelRatio; } - final yOffset = 10.5 * devicePixelRatio; + final yOffset = 11.5 * devicePixelRatio; _textPainter.paint( canvas, Offset(xOffset - _textPainter.width / 2, yOffset)); }