diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt index 10a796cb..828306ea 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt @@ -39,6 +39,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler @@ -72,7 +73,7 @@ private const val LOGGER_PACKAGE_NAME = "no.nordicsemi.android.log" @Composable fun HomeScreen() { val viewModel: HomeViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() Scaffold( topBar = { diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt index f573f7a4..4779355f 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun BPSScreen() { val viewModel: BPSViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(DisconnectEvent) } @@ -78,9 +79,9 @@ fun BPSScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state) { + when (val bpsState = state) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.result) { + is WorkingState -> when (bpsState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -88,7 +89,7 @@ fun BPSScreen() { is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS) { NavigateUpButton(navigateUp) } is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE) { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> BPSContentView(state.result.data) { viewModel.onEvent(it) } + is SuccessResult -> BPSContentView(bpsState.result.data) { viewModel.onEvent(it) } } } } diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt index 9b21d40f..bbaddaab 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun CGMScreen() { val viewModel: CGMViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUp) } @@ -78,9 +79,9 @@ fun CGMScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state) { + when (val cgmState = state) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.result) { + is WorkingState -> when (cgmState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -88,7 +89,7 @@ fun CGMScreen() { is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS) { NavigateUpButton(navigateUp) } is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE) { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> CGMContentView(state.result.data) { viewModel.onEvent(it) } + is SuccessResult -> CGMContentView(cgmState.result.data) { viewModel.onEvent(it) } } } } diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt index 8c628581..de62a528 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun CSCScreen() { val viewModel: CSCViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUp) } @@ -78,9 +79,9 @@ fun CSCScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state.cscManagerState) { + when (val cscState = state.cscManagerState) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.cscManagerState.result) { + is WorkingState -> when (cscState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -91,7 +92,7 @@ fun CSCScreen() { } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } is SuccessResult -> CSCContentView( - state.cscManagerState.result.data, + cscState.result.data, state.speedUnit ) { viewModel.onEvent(it) } } diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt index 2e98601d..015e192b 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt @@ -33,6 +33,7 @@ package no.nordicsemi.android.gls.details.view import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -43,7 +44,7 @@ import no.nordicsemi.android.ui.view.LoggerBackIconAppBar @Composable internal fun GLSDetailsScreen() { val viewModel: GLSDetailsViewModel = hiltViewModel() - val record = viewModel.record.collectAsStateWithLifecycle().value + val record by viewModel.record.collectAsStateWithLifecycle() Column { LoggerBackIconAppBar(stringResource(id = R.string.gls_title)) { diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt index c922e608..fdd46501 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun GLSScreen() { val viewModel: GLSViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(DisconnectEvent) } @@ -78,9 +79,9 @@ fun GLSScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state) { + when (val glsState = state) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.result) { + is WorkingState -> when (glsState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -90,7 +91,7 @@ fun GLSScreen() { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> GLSContentView(state.result.data) { viewModel.onEvent(it) } + is SuccessResult -> GLSContentView(glsState.result.data) { viewModel.onEvent(it) } } } } diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt index 303d9dda..c146e360 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun HRSScreen() { val viewModel: HRSViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUpEvent) } @@ -78,9 +79,9 @@ fun HRSScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state) { + when (val hrsState = state) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.result) { + is WorkingState -> when (hrsState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -88,7 +89,7 @@ fun HRSScreen() { is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS) { NavigateUpButton(navigateUp) } is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE) { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> HRSContentView(state.result.data, state.zoomIn) { viewModel.onEvent(it) } + is SuccessResult -> HRSContentView(hrsState.result.data, hrsState.zoomIn) { viewModel.onEvent(it) } } } } diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt index 4c725540..79141ca7 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun HTSScreen() { val viewModel: HTSViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUp) } @@ -78,9 +79,9 @@ fun HTSScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state.htsManagerState) { + when (val htsState = state.htsManagerState) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.htsManagerState.result) { + is WorkingState -> when (htsState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -88,7 +89,7 @@ fun HTSScreen() { is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS) { NavigateUpButton(navigateUp) } is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE) { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> HTSContentView(state.htsManagerState.result.data, state.temperatureUnit) { viewModel.onEvent(it) } + is SuccessResult -> HTSContentView(htsState.result.data, state.temperatureUnit) { viewModel.onEvent(it) } } } } diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt index a5875a46..1df40811 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun PRXScreen() { val viewModel: PRXViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUpEvent) } @@ -78,9 +79,9 @@ fun PRXScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state) { + when (val prxState = state) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.result) { + is WorkingState -> when (prxState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -88,7 +89,7 @@ fun PRXScreen() { is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS) { NavigateUpButton(navigateUp) } is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE) { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> ContentView(state.result.data) { viewModel.onEvent(it) } + is SuccessResult -> ContentView(prxState.result.data) { viewModel.onEvent(it) } } } } diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt index e6bcd9f2..f351c46f 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -65,7 +66,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun RSCSScreen() { val viewModel: RSCSViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUpEvent) } @@ -78,9 +79,9 @@ fun RSCSScreen() { .padding(16.dp) .verticalScroll(rememberScrollState()) ) { - when (state) { + when (val rscsState = state) { NoDeviceState -> DeviceConnectingView() - is WorkingState -> when (state.result) { + is WorkingState -> when (rscsState.result) { is IdleResult, is ConnectingResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } is ConnectedResult -> DeviceConnectingView { NavigateUpButton(navigateUp) } @@ -88,7 +89,7 @@ fun RSCSScreen() { is LinkLossResult -> DeviceDisconnectedView(Reason.LINK_LOSS) { NavigateUpButton(navigateUp) } is MissingServiceResult -> DeviceDisconnectedView(Reason.MISSING_SERVICE) { NavigateUpButton(navigateUp) } is UnknownErrorResult -> DeviceDisconnectedView(Reason.UNKNOWN) { NavigateUpButton(navigateUp) } - is SuccessResult -> RSCSContentView(state.result.data) { viewModel.onEvent(it) } + is SuccessResult -> RSCSContentView(rscsState.result.data) { viewModel.onEvent(it) } } } } diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt index fd0a960f..de5920d4 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt @@ -40,6 +40,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier @@ -73,7 +74,7 @@ import no.nordicsemi.android.ui.view.NavigateUpButton @Composable fun UARTScreen() { val viewModel: UARTViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() val navigateUp = { viewModel.onEvent(NavigateUp) } @@ -83,9 +84,9 @@ fun UARTScreen() { Column( modifier = Modifier.padding(it) ) { - when (state.uartManagerState) { + when (val uartState = state.uartManagerState) { NoDeviceState -> PaddingBox { DeviceConnectingView() } - is WorkingState -> when (state.uartManagerState.result) { + is WorkingState -> when (uartState.result) { is IdleResult, is ConnectingResult -> PaddingBox { DeviceConnectingView { NavigateUpButton(navigateUp) } } is ConnectedResult -> PaddingBox { DeviceConnectingView { NavigateUpButton(navigateUp) } } @@ -145,9 +146,9 @@ private fun SuccessScreen() { @Composable private fun KeyboardView() { val viewModel: UARTViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() (state.uartManagerState as? WorkingState)?.let { - (state.uartManagerState.result as? SuccessResult)?.let { + (it.result as? SuccessResult)?.let { UARTContentView(it.data) { viewModel.onEvent(it) } } } @@ -156,9 +157,9 @@ private fun KeyboardView() { @Composable private fun MacroView() { val viewModel: UARTViewModel = hiltViewModel() - val state = viewModel.state.collectAsStateWithLifecycle().value + val state by viewModel.state.collectAsStateWithLifecycle() (state.uartManagerState as? WorkingState)?.let { - (state.uartManagerState.result as? SuccessResult)?.let { + (it.result as? SuccessResult)?.let { MacroSection(state) { viewModel.onEvent(it) } } }