Move audio guidance out of shared app

Author: kmadsen

libnavui-app/src/main/java/com/mapbox/navigation/ui/app/internal/SharedApp.kt

@@ -16,7 +16,6 @@ import com.mapbox.navigation.ui.app.internal.controller.StateResetController
 import com.mapbox.navigation.ui.app.internal.controller.TripSessionStarterStateController
 import com.mapbox.navigation.ui.maps.internal.ui.RouteAlternativeComponent
 import com.mapbox.navigation.ui.maps.internal.ui.RouteAlternativeContract
-import com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance
 import java.util.concurrent.atomic.AtomicBoolean
 
 @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
@@ -64,12 +63,6 @@ object SharedApp {
             }
         )
         MapboxNavigationApp.lifecycleOwner.attachCreated(*navigationObservers)
-
-        // TODO Remove this from SharedApp. The components that use `MapboxAudioGuidance`
-        //   will "ensureAudioGuidanceRegistered". See the `ComponentInstaller.audioGuidanceButton`
-        if (MapboxNavigationApp.getObservers(MapboxAudioGuidance::class).isEmpty()) {
-            MapboxNavigationApp.registerObserver(MapboxAudioGuidance())
-        }
     }
 
     fun tripSessionTransaction(updateSession: () -> Unit) {

libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponent.kt

@@ -53,7 +53,9 @@ class AudioGuidanceButtonComponent(
 
     init {
         this.contractProvider = contractProvider ?: Provider {
-            val audioGuidance = MapboxNavigationApp.getObserver(MapboxAudioGuidance::class)
+            val audioGuidance = MapboxNavigationApp
+                .getObservers(MapboxAudioGuidance::class).firstOrNull()
+                ?: MapboxAudioGuidance().also { MapboxNavigationApp.registerObserver(it) }
             MapboxAudioComponentContract(coroutineScope, audioGuidance)
         }
     }

libnavui-voice/src/test/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponentTest.kt

@@ -13,6 +13,7 @@ import com.mapbox.navigation.ui.voice.view.MapboxAudioGuidanceButton
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
+import io.mockk.slot
 import io.mockk.spyk
 import io.mockk.unmockkAll
 import io.mockk.verify
@@ -21,6 +22,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.junit.After
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -112,8 +114,8 @@ class AudioGuidanceButtonComponentTest {
             every { toggle() } returns Unit
         }
         every {
-            MapboxNavigationApp.getObserver(MapboxAudioGuidance::class)
-        } returns mockAudioGuidance
+            MapboxNavigationApp.getObservers(MapboxAudioGuidance::class)
+        } returns listOf(mockAudioGuidance)
 
         val sut = AudioGuidanceButtonComponent(button)
         sut.onAttached(mapboxNavigation)
@@ -122,6 +124,23 @@ class AudioGuidanceButtonComponentTest {
         verify { mockAudioGuidance.mute() }
     }
 
+    @Test
+    fun `onAttach - create MapboxAudioGuidance if none exists`() {
+        val slotAudioGuidance = slot<MapboxAudioGuidance>()
+        every {
+            MapboxNavigationApp.getObservers(MapboxAudioGuidance::class)
+        } returns emptyList()
+        every {
+            MapboxNavigationApp.registerObserver(capture(slotAudioGuidance))
+        } returns MapboxNavigationApp
+
+        val sut = AudioGuidanceButtonComponent(button)
+        sut.onAttached(mapboxNavigation)
+        button.performClick()
+
+        assertTrue(slotAudioGuidance.isCaptured)
+    }
+
     @Test
     fun `onDetached - should not handle button on click events`() {
         sut.onAttached(mapboxNavigation)