Add an API to toggle the visibility of Landmark icons (#3889)

GitOrigin-RevId: addc012cd9e4c62064a6c9578edbff101121426b

Author: kediarov

CHANGELOG.md

@@ -13,6 +13,7 @@ Mapbox welcomes participation and contributions from everyone.
   * Add common `MapInteraction` APIs to `StandardStyleInteractionsState`: `.onFeaturesetClicked`, `.onLayerClicked`, `.onFeaturesetLongClicked`, `.onLayerLongClicked`, `.onMapClicked`, `.onMapLongClicked`.
   * Add `StyleInteractionsState` to `MapboxStandardSatelliteStyle` so interactions can be used with the satellite style.
 * [compose] Rename experimental `ExperimentalStandardStyleState` to `StandardStyleState`, rename experimental `MapboxStandardStyleExperimental` to `MapboxStandardStyle(styleImportsContent, topSlot, middleSlot, bottomSlot, standardStyleState)`, and deprecate previous `MapboxStandardStyle` composable functions.
+* [compose] Add config option `showLandmarkIcons` to `MapboxStandardStyle`.
 * Expose new experimental camera event `MapboxMap.subscribeCameraChangedCoalesced`, `MapboxMap.cameraChangedCoalescedEvents`.
 * [compose] Expose new camera event `MapState.cameraChangedCoalescedEvents`
 

app/src/main/assets/fragment-realestate-NY.json

@@ -6,6 +6,7 @@
             "config": {
                 "font": "Montserrat",
                 "lightPreset": "dusk",
+                "showLandmarkIcons": true,
                 "showPointOfInterestLabels": true,
                 "showTransitLabels": false,
                 "showPlaceLabels": true,

compose-app/src/main/assets/fragment-realestate-NY.json

@@ -6,6 +6,7 @@
             "config": {
                 "font": "Montserrat",
                 "lightPreset": "dusk",
+                "showLandmarkIcons": true,
                 "showPointOfInterestLabels": true,
                 "showTransitLabels": false,
                 "showPlaceLabels": true,

compose-app/src/main/java/com/mapbox/maps/compose/testapp/examples/style/StandardStyleActivity.kt

@@ -47,6 +47,9 @@ public class StandardStyleActivity : ComponentActivity() {
       var isStandardSatellite by remember {
         mutableStateOf(false)
       }
+      var enableLandmarkIcons by remember {
+        mutableStateOf(false)
+      }
       var enablePlaceLabels by remember {
         mutableStateOf(true)
       }
@@ -84,6 +87,30 @@ public class StandardStyleActivity : ComponentActivity() {
             Column(
               modifier = Modifier.width(IntrinsicSize.Max)
             ) {
+              Row(
+                modifier = Modifier.fillMaxWidth()
+              ) {
+                FloatingActionButton(
+                  modifier = Modifier
+                    .defaultMinSize(
+                      minWidth = ButtonDefaults.MinWidth,
+                      minHeight = ButtonDefaults.MinHeight
+                    )
+                    .padding(end = 4.dp),
+                  onClick = {
+                    if (!isStandardSatellite) {
+                      enableLandmarkIcons = !enableLandmarkIcons
+                    }
+                  },
+                  shape = RoundedCornerShape(16.dp),
+                  backgroundColor = if (isStandardSatellite) Color.Gray else MaterialTheme.colors.secondary,
+                ) {
+                  Text(
+                    modifier = Modifier.padding(6.dp),
+                    text = "showLandmarkIcons: $enableLandmarkIcons"
+                  )
+                }
+              }
               Row(
                 modifier = Modifier.fillMaxWidth()
               ) {
@@ -364,6 +391,7 @@ public class StandardStyleActivity : ComponentActivity() {
                       enablePlacementTransitions(true)
                     }
                     configurationsState.apply {
+                      showLandmarkIcons = BooleanValue(enableLandmarkIcons)
                       showPlaceLabels = BooleanValue(enablePlaceLabels)
                       showRoadLabels = BooleanValue(enableRoadLabels)
                       showPointOfInterestLabels = BooleanValue(enablePointOfInterestLabels)

extension-compose/api/Release/metalava.txt

@@ -5092,10 +5092,13 @@ package com.mapbox.maps.extension.compose.style.standard {
   @androidx.compose.runtime.Stable public final class StandardStyleConfigurationState extends com.mapbox.maps.extension.compose.style.standard.BaseStyleConfigurationState {
     ctor public StandardStyleConfigurationState();
     method public com.mapbox.maps.extension.compose.style.BooleanValue getShow3dObjects();
+    method public com.mapbox.maps.extension.compose.style.BooleanValue getShowLandmarkIcons();
     method public com.mapbox.maps.extension.compose.style.standard.ThemeValue getTheme();
     method public void setShow3dObjects(com.mapbox.maps.extension.compose.style.BooleanValue);
+    method public void setShowLandmarkIcons(com.mapbox.maps.extension.compose.style.BooleanValue);
     method public void setTheme(com.mapbox.maps.extension.compose.style.standard.ThemeValue);
     property public final com.mapbox.maps.extension.compose.style.BooleanValue show3dObjects;
+    property public final com.mapbox.maps.extension.compose.style.BooleanValue showLandmarkIcons;
     property public final com.mapbox.maps.extension.compose.style.standard.ThemeValue theme;
   }
 

extension-compose/api/extension-compose.api

@@ -4314,8 +4314,10 @@ public final class com/mapbox/maps/extension/compose/style/standard/StandardSate
 public final class com/mapbox/maps/extension/compose/style/standard/StandardStyleConfigurationState : com/mapbox/maps/extension/compose/style/standard/BaseStyleConfigurationState {
 	public fun <init> ()V
 	public final fun getShow3dObjects ()Lcom/mapbox/maps/extension/compose/style/BooleanValue;
+	public final fun getShowLandmarkIcons ()Lcom/mapbox/maps/extension/compose/style/BooleanValue;
 	public final fun getTheme ()Lcom/mapbox/maps/extension/compose/style/standard/ThemeValue;
 	public final fun setShow3dObjects (Lcom/mapbox/maps/extension/compose/style/BooleanValue;)V
+	public final fun setShowLandmarkIcons (Lcom/mapbox/maps/extension/compose/style/BooleanValue;)V
 	public final fun setTheme (Lcom/mapbox/maps/extension/compose/style/standard/ThemeValue;)V
 }
 

extension-compose/src/main/java/com/mapbox/maps/extension/compose/style/standard/MapboxStandardStyle.kt

@@ -65,6 +65,9 @@ public fun MapboxStandardStyle(
       styleImportsConfig = styleImportsConfig {
         importConfig(importId = "basemap") {
           with(standardStyleConfigurationState) {
+            if (showLandmarkIcons.isNotInitial()) {
+              config(StandardStyleConfigurationState.CONFIG_SHOW_LANDMARK_ICON, showLandmarkIcons.value)
+            }
             if (showPlaceLabels.isNotInitial()) {
               config(BaseStyleConfigurationState.CONFIG_SHOW_PLACE_LABELS, showPlaceLabels.value)
             }
@@ -184,6 +187,9 @@ public fun MapboxStandardStyle(
       styleImportsConfig = styleImportsConfig {
         importConfig(importId = "basemap") {
           with(standardStyleState.configurationsState) {
+            if (showLandmarkIcons.isNotInitial()) {
+              config(StandardStyleConfigurationState.CONFIG_SHOW_LANDMARK_ICON, showLandmarkIcons.value)
+            }
             if (showPlaceLabels.isNotInitial()) {
               config(BaseStyleConfigurationState.CONFIG_SHOW_PLACE_LABELS, showPlaceLabels.value)
             }

extension-compose/src/main/java/com/mapbox/maps/extension/compose/style/standard/StandardStyleConfigurationState.kt

@@ -81,7 +81,8 @@ public data class ThemeValue(public val value: Value) {
 @Stable
 public class StandardStyleConfigurationState private constructor(
   initialTheme: ThemeValue,
-  initialShow3dObjects: BooleanValue
+  initialShow3dObjects: BooleanValue,
+  initialShowLandmarkIcons: BooleanValue,
 ) : BaseStyleConfigurationState() {
 
   /**
@@ -90,6 +91,7 @@ public class StandardStyleConfigurationState private constructor(
   public constructor() : this(
     initialTheme = ThemeValue.INITIAL,
     initialShow3dObjects = BooleanValue.INITIAL,
+    initialShowLandmarkIcons = BooleanValue.INITIAL,
   )
 
   /**
@@ -102,7 +104,13 @@ public class StandardStyleConfigurationState private constructor(
    */
   public var show3dObjects: BooleanValue by mutableStateOf(initialShow3dObjects)
 
+  /**
+   * Shows or hides Landmark Icons, default to false.
+   */
+  public var showLandmarkIcons: BooleanValue by mutableStateOf(initialShowLandmarkIcons)
+
   internal companion object {
+    internal const val CONFIG_SHOW_LANDMARK_ICON = "showLandmarkIcons"
     internal const val CONFIG_THEME = "theme"
     internal const val CONFIG_SHOW_3D_OBJECTS = "show3dObjects"
   }