[Backport release/v0.19] Update Android indoor example (#9840)

Backport 9e1cb02532b1d5d56f7214bef053ec060da2b46b from #9819.

cc @mapbox/maps-ios
cc @mapbox/maps-android

Co-authored-by: Aleksei Sapitskii <45671572+aleksproger@users.noreply.github.com>
GitOrigin-RevId: d4fc030c0892307abcadd88b22f3c5305fb75afe

Author: 2 people

Sources/Examples/All Examples/Lab/IndoorExample.swift

@@ -4,32 +4,94 @@ import UIKit
 // EXPERIMENTAL: Not intended for usage in current stata. Subject to change or deletion.
 final class IndoorExample: UIViewController, ExampleProtocol {
     private var mapView: MapView!
-    // Set indoor style. Do not commit staging style URIs.
     private var styleURI: String?
     private var cancellables = Set<AnyCancelable>()
+    private let styleTextField = UITextField()
+    private let loadStyleButton = UIButton(type: .system)
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
         let cameraOptions = CameraOptions(
-            center: CLLocationCoordinate2D(latitude: 40.6441, longitude: -73.7824),
+            center: CLLocationCoordinate2D(latitude: 35.5483, longitude: 139.7780),
             zoom: 16,
             bearing: 12,
             pitch: 60)
-        let options = MapInitOptions(cameraOptions: cameraOptions)
 
+        let options = MapInitOptions(cameraOptions: cameraOptions)
         mapView = MapView(frame: view.bounds, mapInitOptions: options)
-        mapView.mapboxMap.styleURI = StyleURI(rawValue: styleURI!)!
 
-        mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         mapView.ornaments.options.scaleBar.visibility = .visible
-        // EXPERIMENTAL: Not intended for usage in current stata. Subject to change or deletion.
-        mapView.mapboxMap.indoor.selectFloor(selectedFloorId: "b937e2aa3423453ab0552d9f")
-        mapView.mapboxMap.indoor.onIndoorUpdated.sink { indoorState in
-             print(indoorState)
+        mapView.ornaments.options.indoorSelector.visibility = .visible
+
+        var puckConfiguration = Puck2DConfiguration.makeDefault(showBearing: true)
+        puckConfiguration.pulsing = nil
+        mapView.location.options.puckType = .puck2D(puckConfiguration)
+
+        mapView.location.onLocationChange.observeNext { [weak mapView] newLocation in
+            guard let mapView, let location = newLocation.last else { return }
+            mapView.mapboxMap.setCamera(to: .init(center: location.coordinate, zoom: 18))
         }.store(in: &cancellables)
 
+        mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+
+        mapView.mapboxMap.indoor.onIndoorUpdated.sink { indoorState in
+             print("Selected floor id: \(indoorState.selectedFloorId)")
+        }.store(in: &cancellables)
         view.addSubview(mapView)
+
+        setupStyleInputUI()
+    }
+
+    private func setupStyleInputUI() {
+        styleTextField.borderStyle = .roundedRect
+        styleTextField.backgroundColor = .white
+        styleTextField.autocapitalizationType = .none
+        styleTextField.autocorrectionType = .no
+        styleTextField.text = "mapbox://styles/mapbox/standard"
+        styleTextField.placeholder = "Enter Style URI or JSON"
+        styleTextField.translatesAutoresizingMaskIntoConstraints = false
+
+        loadStyleButton.setTitle("Load Style", for: .normal)
+        loadStyleButton.backgroundColor = .systemBlue
+        loadStyleButton.setTitleColor(.white, for: .normal)
+        loadStyleButton.layer.cornerRadius = 5
+        loadStyleButton.addTarget(self, action: #selector(loadStyleTapped), for: .touchUpInside)
+        loadStyleButton.translatesAutoresizingMaskIntoConstraints = false
+
+        let stackView = UIStackView(arrangedSubviews: [styleTextField, loadStyleButton])
+        stackView.axis = .horizontal
+        stackView.spacing = 8
+        stackView.translatesAutoresizingMaskIntoConstraints = false
+        stackView.layoutMargins = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)
+        stackView.isLayoutMarginsRelativeArrangement = true
+        stackView.backgroundColor = UIColor.white.withAlphaComponent(0.8)
+
+        view.addSubview(stackView)
+
+        NSLayoutConstraint.activate([
+            stackView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            stackView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            stackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor),
+            loadStyleButton.widthAnchor.constraint(equalToConstant: 100)
+        ])
+    }
+
+    @objc private func loadStyleTapped() {
+        guard let text = styleTextField.text, !text.isEmpty else { return }
+        loadStyle(from: text)
+        styleTextField.resignFirstResponder()
+    }
+
+    private func loadStyle(from text: String) {
+        let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
+        if let url = URL(string: trimmed), url.scheme != nil {
+             if let styleURI = StyleURI(rawValue: trimmed) {
+                 mapView.mapboxMap.styleURI = styleURI
+             }
+        } else {
+            mapView.mapboxMap.styleJSON = trimmed
+        }
     }
 
     override func viewDidAppear(_ animated: Bool) {

Sources/MapboxMaps/Documentation.docc/API Catalogs/Indoor.md

@@ -7,3 +7,4 @@
 - ``IndoorFloor``
 - ``IndoorState``
 - ``IndoorManager``
+- ``IndoorSelectorViewOptions``

Sources/MapboxMaps/Ornaments/IndoorSelectorView.swift

@@ -95,8 +95,9 @@ final class IndoorSelectorView: UIView {
     }
 
     private func updateVisibility() {
-        guard isHidden != model.isHidden else { return }
-        isHidden = model.isHidden
+        let newOpacity: Float = model.isHidden ? 0 : 1
+        guard layer.opacity != newOpacity else { return }
+        layer.opacity = newOpacity
         if !isHidden {
             invalidateIntrinsicContentSize()
             collectionView.reloadData()
@@ -208,7 +209,7 @@ extension IndoorSelectorView {
 
         isUserInteractionEnabled = true
         isExclusiveTouch = true
-        isHidden = model.isHidden
+        layer.opacity =  model.isHidden ? 0 : 1
 
         addSubview(containerView)
         containerView.addSubview(collectionView)

Sources/MapboxMaps/Ornaments/OrnamentOptions.swift

@@ -35,7 +35,9 @@ public struct OrnamentOptions: Equatable, Sendable {
     // MARK: - Indoor Selector
 
     /// The ornament options for the map's indoor selector view.
-    var indoorSelector: IndoorSelectorViewOptions
+    @_spi(Experimental)
+    @_documentation(visibility: public)
+    public var indoorSelector: IndoorSelectorViewOptions
 
     /// Initializes an `OrnamentOptions`.
     /// - Parameters:
@@ -272,33 +274,35 @@ public struct LogoViewOptions: Equatable, Sendable {
 }
 
 /// Used to configure position, margin, and visibility for the map's indoor selector view.
-struct IndoorSelectorViewOptions: Equatable, Sendable {
+@_spi(Experimental)
+@_documentation(visibility: public)
+public struct IndoorSelectorViewOptions: Equatable, Sendable {
 
     /// The position of the indoor selector view.
     ///
     /// The default value for this property is `.topTrailing`.
-    var position: OrnamentPosition
+    public var position: OrnamentPosition
 
     /// The margins of the indoor selector view.
     ///
     /// The default value for this property is `CGPoint(x: 8.0, y: 0.0)`.
-    var margins: CGPoint
+    public var margins: CGPoint
 
     /// The visibility of the indoor selector view.
     ///
     /// The default value for this property is `.adaptive`. When set to `.adaptive`,
     /// the indoor selector is visible only when indoor floor data is available.
-    var visibility: OrnamentVisibility
+    public var visibility: OrnamentVisibility
 
     /// Initializes an `IndoorSelectorViewOptions`.
     /// - Parameters:
     ///   - position: The position of the indoor selector view.
     ///   - margins: The margins of the indoor selector view.
     ///   - visibility: The visibility of the indoor selector view.
-    init(
+    public init(
         position: OrnamentPosition = .topTrailing,
         margins: CGPoint = .init(x: 8.0, y: 0.0),
-        visibility: OrnamentVisibility = .adaptive
+        visibility: OrnamentVisibility = .hidden
     ) {
         self.position = position
         self.margins = margins

Sources/MapboxMaps/Ornaments/OrnamentsManager.swift

@@ -266,7 +266,7 @@ public final class OrnamentsManager {
         case .hidden:
             _indoorSelectorView.isHidden = true
         case .adaptive:
-            break // Adaptive visibility is handled by the IndoorSelectorView itself based on floor data
+            indoorSelectorView.isHidden = false // Handled by the IndoorSelectorView itself based on floor data and uses opacity
         }
     }
 

Tests/MapboxMapsTests/Ornaments/OrnamentManagerTests.swift

@@ -303,20 +303,6 @@ final class OrnamentManagerTests: XCTestCase {
         XCTAssertTrue(indoorSelector.isHidden, "Indoor selector should be hidden initially when model has no floors")
     }
 
-    func testIndoorSelectorVisibility() throws {
-        let mockModel = MockIndoorSelectorModel()
-        let testIndoorSelector = IndoorSelectorView(model: mockModel)
-
-        view.addSubview(testIndoorSelector)
-
-        XCTAssertTrue(testIndoorSelector.isHidden, "Indoor selector should be hidden when no floors")
-
-        mockModel.isHidden = false
-        mockModel.onVisibilityChanged?()
-
-        XCTAssertFalse(testIndoorSelector.isHidden, "Indoor selector should be visible when model is not hidden")
-    }
-
     func testIndoorSelectorIntrinsicContentSizeUpdates() throws {
         let mockModel = MockIndoorSelectorModel()
         let testIndoorSelector = IndoorSelectorView(model: mockModel)