Switch to new navigation.

profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt

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

profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXState.kt

@@ -2,11 +2,6 @@ package no.nordicsemi.android.prx.view
 
 import no.nordicsemi.android.prx.data.PRXData
 
-internal data class PRXState(
-    val viewState: PRXViewState,
-    val isActive: Boolean = true
-)
-
 internal sealed class PRXViewState
 
 internal object LoadingState : PRXViewState()

profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt

@@ -5,7 +5,10 @@ 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.navigation.NavigationManager
 import no.nordicsemi.android.prx.data.DisableAlarm
 import no.nordicsemi.android.prx.data.Disconnect
 import no.nordicsemi.android.prx.data.EnableAlarm
@@ -14,7 +17,6 @@ import no.nordicsemi.android.prx.view.DisconnectEvent
 import no.nordicsemi.android.prx.view.DisplayDataState
 import no.nordicsemi.android.prx.view.LoadingState
 import no.nordicsemi.android.prx.view.PRXScreenViewEvent
-import no.nordicsemi.android.prx.view.PRXState
 import no.nordicsemi.android.prx.view.TurnOffAlert
 import no.nordicsemi.android.prx.view.TurnOnAlert
 import no.nordicsemi.android.service.BleManagerStatus
@@ -23,16 +25,25 @@ import javax.inject.Inject
 
 @HiltViewModel
 internal class PRXViewModel @Inject constructor(
-    private val repository: PRXRepository
+    private val repository: PRXRepository,
+    private val navigationManager: NavigationManager
 ) : ViewModel() {
 
     val state = repository.data.combine(repository.status) { data, status ->
         when (status) {
-            BleManagerStatus.CONNECTING -> PRXState(LoadingState)
-            BleManagerStatus.OK -> PRXState(DisplayDataState(data))
-            BleManagerStatus.DISCONNECTED -> PRXState(DisplayDataState(data), false)
+            BleManagerStatus.CONNECTING -> LoadingState
+            BleManagerStatus.OK,
+            BleManagerStatus.DISCONNECTED -> DisplayDataState(data)
         }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, PRXState(LoadingState))
+    }.stateIn(viewModelScope, SharingStarted.Lazily, LoadingState)
+
+    init {
+        repository.status.onEach {
+            if (it == BleManagerStatus.DISCONNECTED) {
+                navigationManager.navigateUp()
+            }
+        }.launchIn(viewModelScope)
+    }
 
     fun onEvent(event: PRXScreenViewEvent) {
         when (event) {