Switch to new navigation.

profile_hts/build.gradle

@@ -10,6 +10,7 @@ dependencies {
 
     implementation libs.nordic.log
     implementation libs.nordic.theme
+    implementation libs.nordic.navigation
 
     implementation libs.bundles.compose
     implementation libs.androidx.core

profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSManager.kt

@@ -32,7 +32,7 @@ import no.nordicsemi.android.hts.data.HTSRepository
 import no.nordicsemi.android.service.BatteryManager
 import java.util.*
 
-val HT_SERVICE_UUID: UUID = UUID.fromString("00001809-0000-1000-8000-00805f9b34fb")
+val HTS_SERVICE_UUID: UUID = UUID.fromString("00001809-0000-1000-8000-00805f9b34fb")
 private val HT_MEASUREMENT_CHARACTERISTIC_UUID = UUID.fromString("00002A1C-0000-1000-8000-00805f9b34fb")
 
 /**
@@ -81,7 +81,7 @@ internal class HTSManager internal constructor(
         }
 
         override fun isRequiredServiceSupported(gatt: BluetoothGatt): Boolean {
-            val service = gatt.getService(HT_SERVICE_UUID)
+            val service = gatt.getService(HTS_SERVICE_UUID)
             if (service != null) {
                 htCharacteristic = service.getCharacteristic(HT_MEASUREMENT_CHARACTERISTIC_UUID)
             }

profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt

@@ -16,21 +16,17 @@ import no.nordicsemi.android.theme.view.DeviceConnectingView
 import no.nordicsemi.android.utils.exhaustive
 
 @Composable
-fun HTSScreen(finishAction: () -> Unit) {
+fun HTSScreen() {
     val viewModel: HTSViewModel = hiltViewModel()
     val state = viewModel.state.collectAsState().value
 
     val context = LocalContext.current
-    LaunchedEffect(state.isActive) {
-        if (state.isActive) {
-            val intent = Intent(context, HTSService::class.java)
-            context.startService(intent)
-        } else {
-            finishAction()
-        }
+    LaunchedEffect(Unit) {
+        val intent = Intent(context, HTSService::class.java)
+        context.startService(intent)
     }
 
-    HTSView(state.viewState) { viewModel.onEvent(it) }
+    HTSView(state) { viewModel.onEvent(it) }
 }
 
 @Composable

profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSState.kt

@@ -2,11 +2,6 @@ package no.nordicsemi.android.hts.view
 
 import no.nordicsemi.android.hts.data.HTSData
 
-internal data class HTSState(
-    val viewState: HTSViewState,
-    val isActive: Boolean = true
-)
-
 internal sealed class HTSViewState
 
 internal object LoadingState : HTSViewState()

profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt

@@ -5,30 +5,41 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import no.nordicsemi.android.hts.data.HTSRepository
 import no.nordicsemi.android.hts.view.DisconnectEvent
 import no.nordicsemi.android.hts.view.DisplayDataState
 import no.nordicsemi.android.hts.view.HTSScreenViewEvent
-import no.nordicsemi.android.hts.view.HTSState
 import no.nordicsemi.android.hts.view.LoadingState
 import no.nordicsemi.android.hts.view.OnTemperatureUnitSelected
+import no.nordicsemi.android.navigation.NavigationManager
 import no.nordicsemi.android.service.BleManagerStatus
 import no.nordicsemi.android.utils.exhaustive
 import javax.inject.Inject
 
 @HiltViewModel
 internal class HTSViewModel @Inject constructor(
-    private val repository: HTSRepository
+    private val repository: HTSRepository,
+    private val navigationManager: NavigationManager
 ) : ViewModel() {
 
     val state = repository.data.combine(repository.status) { data, status ->
         when (status) {
-            BleManagerStatus.CONNECTING -> HTSState(LoadingState)
-            BleManagerStatus.OK -> HTSState(DisplayDataState(data))
-            BleManagerStatus.DISCONNECTED -> HTSState(DisplayDataState(data), false)
+            BleManagerStatus.CONNECTING -> LoadingState
+            BleManagerStatus.OK,
+            BleManagerStatus.DISCONNECTED -> DisplayDataState(data)
         }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, HTSState(LoadingState))
+    }.stateIn(viewModelScope, SharingStarted.Lazily, LoadingState)
+
+    init {
+        repository.status.onEach {
+            if (it == BleManagerStatus.DISCONNECTED) {
+                navigationManager.navigateUp()
+            }
+        }.launchIn(viewModelScope)
+    }
 
     fun onEvent(event: HTSScreenViewEvent) {
         when (event) {