Switch to new navigation.

profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt

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

profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMViewState.kt

@@ -2,11 +2,6 @@ package no.nordicsemi.android.cgms.view
 
 import no.nordicsemi.android.cgms.data.CGMData
 
-internal data class CGMState(
-    val viewState: CGMViewState,
-    val isActive: Boolean = true
-)
-
 internal sealed class CGMViewState
 
 internal object LoadingState : CGMViewState()

profile_cgms/src/main/java/no/nordicsemi/android/cgms/viewmodel/CGMScreenViewModel.kt

@@ -5,31 +5,42 @@ 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.cgms.data.CGMRepository
 import no.nordicsemi.android.cgms.data.CGMServiceCommand
-import no.nordicsemi.android.cgms.view.CGMState
 import no.nordicsemi.android.cgms.view.CGMViewEvent
 import no.nordicsemi.android.cgms.view.DisconnectEvent
 import no.nordicsemi.android.cgms.view.DisplayDataState
 import no.nordicsemi.android.cgms.view.LoadingState
 import no.nordicsemi.android.cgms.view.OnWorkingModeSelected
+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 CGMScreenViewModel @Inject constructor(
-    private val repository: CGMRepository
+    private val repository: CGMRepository,
+    private val navigationManager: NavigationManager
 ) : ViewModel() {
 
     val state = repository.data.combine(repository.status) { data, status ->
         when (status) {
-            BleManagerStatus.CONNECTING -> CGMState(LoadingState)
-            BleManagerStatus.OK -> CGMState(DisplayDataState(data))
-            BleManagerStatus.DISCONNECTED -> CGMState(DisplayDataState(data), false)
+            BleManagerStatus.CONNECTING -> LoadingState
+            BleManagerStatus.OK,
+            BleManagerStatus.DISCONNECTED -> DisplayDataState(data)
         }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, CGMState(LoadingState))
+    }.stateIn(viewModelScope, SharingStarted.Lazily, LoadingState)
+
+    init {
+        repository.status.onEach {
+            if (it == BleManagerStatus.DISCONNECTED) {
+                navigationManager.navigateUp()
+            }
+        }.launchIn(viewModelScope)
+    }
 
     fun onEvent(event: CGMViewEvent) {
         when (event) {