Add button to hide floors (#10383)

- Allowing to pass null to selectFloor, to effecitvely drop any
selection. This was previously allowed, but then dropped as not needed
at the momemt.
- Add button to hide indoor floors, on iOS it uses pre-existing system
icons
- A bit of cleanup in IndoorSelectorView, but real changes are small
there as well

https://github.com/user-attachments/assets/d17d3c3e-2a5d-4c6e-a311-c16dfec33e2d

https://github.com/user-attachments/assets/3a84b0a2-f638-4659-9924-a52919b6c3d1

GitOrigin-RevId: ffde7cb5a76d8cba1fdef7b891c9c75e5df58b3c

Author: aleksproger

app/src/main/java/com/mapbox/maps/testapp/examples/IndoorExampleActivity.kt

@@ -3,7 +3,6 @@ package com.mapbox.maps.testapp.examples
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.mapbox.geojson.Point
-import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.MapInitOptions
 import com.mapbox.maps.MapView
 import com.mapbox.maps.MapboxExperimental
@@ -73,15 +72,6 @@ class IndoorExampleActivity : AppCompatActivity() {
                 enabled = true
                 puckBearingEnabled = true
                 locationPuck = createDefault2DPuck(withBearing = true)
-
-                addOnIndicatorPositionChangedListener { point ->
-                    mapView.mapboxMap.setCamera(
-                        CameraOptions.Builder()
-                            .center(point)
-                            .zoom(18.0)
-                            .build()
-                    )
-                }
             }
         }
     }

plugin-indoorselector/src/main/java/com/mapbox/maps/plugin/indoorselector/IndoorSelectorPluginImpl.kt

@@ -193,6 +193,16 @@ internal class IndoorSelectorPluginImpl(
     }
   }
 
+  /**
+   * Called when the building button is tapped by the user via the UI.
+   * Clears the active floor selection so the map shows buildings.
+   */
+  fun onBuildingSelected() {
+    selectedFloorId = null
+    indoorManager.selectFloor(null)
+    indoorSelectorView.updateFloors(currentFloors, null)
+  }
+
   /**
    * Update the list of available floors.
    * Call this method when indoor data becomes available or changes.

plugin-indoorselector/src/main/java/com/mapbox/maps/plugin/indoorselector/IndoorSelectorViewImpl.kt

@@ -56,9 +56,11 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
 
   private val topArrow: ImageView
   private val bottomArrow: ImageView
+  private val buildingButton: ImageView
 
   private var indoorFloors: List<IndoorFloor> = emptyList()
   private var selectedFloorId: String? = null
+  private var isBuildingSelected = false
   private lateinit var presenter: IndoorSelectorPluginImpl
 
   init {
@@ -75,11 +77,20 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
       cornerRadius = cornerRadiusPx
     }
 
-    addView(scrollView, LayoutParams(itemHeightPx, LayoutParams.WRAP_CONTENT))
+    buildingButton = createBuildingButton()
+    addView(buildingButton)
+
+    val scrollParams = LayoutParams(itemHeightPx, LayoutParams.WRAP_CONTENT).apply {
+      topMargin = itemHeightPx
+    }
+    addView(scrollView, scrollParams)
 
     topArrow = createArrowButton(isUp = true)
     bottomArrow = createArrowButton(isUp = false)
 
+    (topArrow.layoutParams as LayoutParams).topMargin = itemHeightPx
+    (bottomArrow.layoutParams as LayoutParams).topMargin = itemHeightPx
+
     addView(topArrow)
     addView(bottomArrow)
 
@@ -141,6 +152,10 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
         setTextSize(TypedValue.COMPLEX_UNIT_SP, FLOOR_LABEL_TEXT_SIZE_SP)
 
         setOnClickListener {
+          if (isBuildingSelected) {
+            isBuildingSelected = false
+            updateBuildingButtonStyle()
+          }
           if (::presenter.isInitialized) {
             presenter.onFloorSelected(level.id)
           }
@@ -165,7 +180,8 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
     for (i in 0 until containerLayout.childCount) {
       val view = containerLayout.getChildAt(i) as TextView
       val level = indoorFloors.getOrNull(i) ?: continue
-      val isActive = level.id == activeId
+      // When building button is active, no floor appears highlighted
+      val isActive = !isBuildingSelected && level.id == activeId
 
       view.setBackgroundColor(if (isActive) selectedBg else Color.TRANSPARENT)
       view.setTextColor(if (isActive) selectedTxt else normalTxt)
@@ -174,7 +190,8 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
 
   private fun updateContainerHeight() {
     val visibleCount = indoorFloors.size.coerceAtMost(MAX_VISIBLE_ITEMS)
-    val targetHeight = visibleCount * itemHeightPx
+    // Add 1 for the building button
+    val targetHeight = (visibleCount + 1) * itemHeightPx
 
     updateLayoutParams {
       it.height = targetHeight
@@ -217,6 +234,45 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
     }
   }
 
+  private fun createBuildingButton() = ImageView(context).apply {
+    scaleType = ImageView.ScaleType.CENTER_INSIDE
+    setBackgroundColor(ContextCompat.getColor(context, R.color.mapbox_indoor_bg))
+    setImageResource(R.drawable.mapbox_indoor_selector_building)
+    contentDescription = context.getString(R.string.mapbox_indoorselector_building)
+    setColorFilter(ContextCompat.getColor(context, R.color.mapbox_indoor_text), PorterDuff.Mode.SRC_IN)
+
+    layoutParams = LayoutParams(itemHeightPx, itemHeightPx).apply {
+      gravity = Gravity.TOP
+    }
+
+    setOnClickListener { onBuildingButtonTapped() }
+  }
+
+  private fun onBuildingButtonTapped() {
+    if (isBuildingSelected) return
+    isBuildingSelected = true
+    updateBuildingButtonStyle()
+    if (::presenter.isInitialized) {
+      presenter.onBuildingSelected()
+    }
+  }
+
+  private fun updateBuildingButtonStyle() {
+    val bgColor = if (isBuildingSelected) {
+      ContextCompat.getColor(context, R.color.mapbox_indoor_selected_bg)
+    } else {
+      ContextCompat.getColor(context, R.color.mapbox_indoor_bg)
+    }
+    val iconColor = if (isBuildingSelected) {
+      ContextCompat.getColor(context, R.color.mapbox_indoor_selected_text)
+    } else {
+      ContextCompat.getColor(context, R.color.mapbox_indoor_text)
+    }
+    buildingButton.setBackgroundColor(bgColor)
+    buildingButton.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
+    updateSelectionHighlight(selectedFloorId)
+  }
+
   private inline fun updateLayoutParams(block: (LayoutParams) -> Unit) {
     (layoutParams as? LayoutParams)?.let {
       block(it)

plugin-indoorselector/src/main/res/drawable/mapbox_indoor_selector_building.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
+</vector>

plugin-indoorselector/src/main/res/values/strings.xml

@@ -3,4 +3,5 @@
     <!-- Indoor selector accessibility strings -->
     <string name="mapbox_indoorselector_scroll_up">Scroll up</string>
     <string name="mapbox_indoorselector_scroll_down">Scroll down</string>
+    <string name="mapbox_indoorselector_building">Show building</string>
 </resources>