Move constrcutor to private

Author: kmadsen

libnavui-androidauto/src/main/java/com/mapbox/androidauto/MapboxCarApp.kt

@@ -26,12 +26,6 @@ object MapboxCarApp {
     fun carAppLocationService(): CarAppLocation =
         MapboxNavigationApp.getObserver(CarAppLocation::class)
 
-    /**
-     * Audio guidance service available to the car and app.
-     */
-    fun carAppAudioGuidanceService(): MapboxAudioGuidance =
-        MapboxNavigationApp.getObserver(MapboxAudioGuidance::class)
-
     /**
      * Keep your car and app in sync with CarAppState.
      */
@@ -44,9 +38,6 @@ object MapboxCarApp {
      */
     @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
     fun setup() {
-        if (MapboxNavigationApp.getObservers(MapboxAudioGuidance::class).isEmpty()) {
-            MapboxNavigationApp.registerObserver(MapboxAudioGuidance())
-        }
         if (MapboxNavigationApp.getObservers(CarAppLocation::class).isEmpty()) {
             MapboxNavigationApp.registerObserver(CarAppLocationImpl())
         }

libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.mapbox.androidauto.MapboxCarApp
+import com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance
 import com.mapbox.navigation.ui.voice.api.MapboxAudioGuidanceState
 import com.mapbox.navigation.ui.voice.view.MapboxSoundButton
 import kotlinx.coroutines.flow.collect
@@ -17,7 +18,7 @@ fun Fragment.attachAudioGuidance(
     mapboxSoundButton: MapboxSoundButton
 ) {
     val lifecycleOwner = viewLifecycleOwner
-    val flow = MapboxCarApp.carAppAudioGuidanceService().stateFlow()
+    val flow = MapboxAudioGuidance.getInstance().stateFlow()
     lifecycleOwner.lifecycleScope.launch {
         lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
             flow.collect { state ->
@@ -31,7 +32,7 @@ fun Fragment.attachAudioGuidance(
         }
     }
     mapboxSoundButton.setOnClickListener {
-        MapboxCarApp.carAppAudioGuidanceService().toggle()
+        MapboxAudioGuidance.getInstance().toggle()
     }
 }
 
@@ -42,15 +43,15 @@ fun Lifecycle.muteAudioGuidance() {
     addObserver(object : DefaultLifecycleObserver {
         lateinit var initialState: MapboxAudioGuidanceState
         override fun onResume(owner: LifecycleOwner) {
-            with(MapboxCarApp.carAppAudioGuidanceService()) {
+            with(MapboxAudioGuidance.getInstance()) {
                 initialState = stateFlow().value
                 mute()
             }
         }
 
         override fun onPause(owner: LifecycleOwner) {
             if (!initialState.isMuted) {
-                MapboxCarApp.carAppAudioGuidanceService().unMute()
+                MapboxAudioGuidance.getInstance().unMute()
             }
         }
     })

libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/CarAudioGuidanceUi.kt

@@ -12,6 +12,7 @@ import com.mapbox.androidauto.MapboxCarApp
 import com.mapbox.androidauto.R
 import com.mapbox.androidauto.car.MainActionStrip
 import com.mapbox.androidauto.car.action.MapboxActionProvider
+import com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
@@ -28,7 +29,7 @@ class CarAudioGuidanceUi : MapboxActionProvider.ScreenActionProvider {
      * Attach this to the screen while navigating.
      */
     private fun buildSoundButtonAction(screen: Screen): Action {
-        val audioGuidance = MapboxCarApp.carAppAudioGuidanceService()
+        val audioGuidance = MapboxAudioGuidance.getInstance()
         val state = audioGuidance.stateFlow().value
         return if (!state.isMuted) {
             buildIconAction(screen, R.drawable.mapbox_car_ic_volume_on) {
@@ -45,7 +46,7 @@ class CarAudioGuidanceUi : MapboxActionProvider.ScreenActionProvider {
         screen.lifecycle.apply {
             coroutineScope.launch {
                 repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    MapboxCarApp.carAppAudioGuidanceService().stateFlow()
+                    MapboxAudioGuidance.getInstance().stateFlow()
                         .distinctUntilChanged { old, new ->
                             old.isMuted == new.isMuted && old.isPlayable == new.isPlayable
                         }

libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/api/MapboxAudioGuidance.kt

@@ -40,8 +40,6 @@ internal constructor(
     dispatcher: CoroutineDispatcher,
 ) : MapboxNavigationObserver {
 
-    constructor() : this(MapboxAudioGuidanceServices(), Dispatchers.Main)
-
     private var dataStoreOwner: NavigationDataStoreOwner? = null
     private var configOwner: NavigationConfigOwner? = null
     private var mutedStateFlow = MutableStateFlow(false)
@@ -197,9 +195,14 @@ internal constructor(
         dataStoreOwner?.write(STORE_AUDIO_GUIDANCE_MUTED, muted)
     }
 
-    private companion object {
+    companion object {
         private val STORE_AUDIO_GUIDANCE_MUTED =
             booleanDataStoreKey("audio_guidance_muted", false)
         private const val DEFAULT_DATA_STORE_NAME = "mapbox_navigation_preferences"
+
+        fun getInstance(): MapboxAudioGuidance = MapboxNavigationApp
+            .getObservers(MapboxAudioGuidance::class)
+            .firstOrNull() ?: MapboxAudioGuidance(MapboxAudioGuidanceServices(), Dispatchers.Main)
+            .also { MapboxNavigationApp.registerObserver(it) }
     }
 }

libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/installer/ComponentInstaller.kt

@@ -1,7 +1,6 @@
 package com.mapbox.navigation.ui.voice.installer
 
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
-import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 import com.mapbox.navigation.ui.base.installer.ComponentInstaller
 import com.mapbox.navigation.ui.base.installer.Installation
 import com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance
@@ -17,13 +16,5 @@ import com.mapbox.navigation.ui.voice.view.MapboxAudioGuidanceButton
  */
 @ExperimentalPreviewMapboxNavigationAPI
 fun ComponentInstaller.audioGuidanceButton(button: MapboxAudioGuidanceButton): Installation {
-    ensureAudioGuidanceRegistered()
     return component(AudioGuidanceButtonComponent(button))
 }
-
-@ExperimentalPreviewMapboxNavigationAPI
-private fun ensureAudioGuidanceRegistered() {
-    if (MapboxNavigationApp.getObservers(MapboxAudioGuidance::class).isEmpty()) {
-        MapboxNavigationApp.registerObserver(MapboxAudioGuidance())
-    }
-}

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

@@ -3,7 +3,6 @@ package com.mapbox.navigation.ui.voice.internal.ui
 import androidx.core.view.isVisible
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.core.MapboxNavigation
-import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 import com.mapbox.navigation.ui.base.lifecycle.UIComponent
 import com.mapbox.navigation.ui.utils.internal.Provider
 import com.mapbox.navigation.ui.utils.internal.extensions.slice
@@ -53,10 +52,7 @@ class AudioGuidanceButtonComponent(
 
     init {
         this.contractProvider = contractProvider ?: Provider {
-            val audioGuidance = MapboxNavigationApp
-                .getObservers(MapboxAudioGuidance::class).firstOrNull()
-                ?: MapboxAudioGuidance().also { MapboxNavigationApp.registerObserver(it) }
-            MapboxAudioComponentContract(coroutineScope, audioGuidance)
+            MapboxAudioComponentContract(coroutineScope, MapboxAudioGuidance.getInstance())
         }
     }