Update map markers of shops

plante-app-team#69
blazern · Dec 22, 2021 · 3d0c737 · 3d0c737
1 parent 6951646
commit 3d0c737
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 83 deletions.
diff --git a/assets/map_marker_accented.svg b/assets/map_marker_accented.svg
diff --git a/assets/map_marker_empty.svg b/assets/map_marker_empty.svg
diff --git a/assets/map_marker_filled.svg b/assets/map_marker_filled.svg
diff --git a/assets/map_marker_group_accented.svg b/assets/map_marker_group_accented.svg
diff --git a/assets/map_marker_group_empty.svg b/assets/map_marker_group_empty.svg
diff --git a/assets/map_marker_group_filled.svg b/assets/map_marker_group_filled.svg
diff --git a/assets/map_marker_group_selected.svg b/assets/map_marker_group_selected.svg
diff --git a/assets/map_marker_group_suggestions.svg b/assets/map_marker_group_suggestions.svg
diff --git a/assets/map_marker_selected.svg b/assets/map_marker_selected.svg
diff --git a/assets/map_marker_suggestions.svg b/assets/map_marker_suggestions.svg
diff --git 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
@@ -194,15 +194,15 @@ 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,
           ),
           MapShopsFilterCheckbox(
             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
@@ -53,7 +53,7 @@ Future<BitmapDescriptor> _getMarkerBitmap(Iterable<Shop> 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<BitmapDescriptor> _getMarkerBitmap(Iterable<Shop> shops,
           context,
           'assets/map_marker_group_suggestions.svg',
           shops.length,
-          TextStyles.markerEmpty);
+          TextStyles.markerSuggestion);
     } else {
       return _bitmapDescriptorFromSvgAsset(
           context,
@@ -152,7 +152,7 @@ Future<BitmapDescriptor> _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));
   }