aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-20 07:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve RSCS view

Browse Source
This commit is contained in:
Sylwester Zieliński
2021-12-01 12:33:29 +01:00
parent e670b9a6ac
commit 1eeeedcdad
4 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt
View File

@@ -5,16 +5,11 @@ import androidx.activity.OnBackPressedCallback
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -96,7 +91,7 @@ fun HomeView(callback: (NavDestination) -> Unit) {
(context as? Activity)?.finish()
}
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())) {
FeatureButton(R.drawable.ic_csc, R.string.csc_module) { callback(NavDestination.CSC) }
Spacer(modifier = Modifier.height(1.dp))
FeatureButton(R.drawable.ic_hrs, R.string.hrs_module) { callback(NavDestination.HRS) }

0
profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCConnectedView.kt → profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
View File

5
profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSContentView.kt
View File

@@ -13,6 +13,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import no.nordicsemi.android.rscs.R
import no.nordicsemi.android.rscs.data.RSCSData
import no.nordicsemi.android.theme.view.BatteryLevelView
@Composable
internal fun RSCSContentView(state: RSCSData, onEvent: (RSCScreenViewEvent) -> Unit) {
@@ -25,6 +26,10 @@ internal fun RSCSContentView(state: RSCSData, onEvent: (RSCScreenViewEvent) -> U
Spacer(modifier = Modifier.height(16.dp))
BatteryLevelView(state.batteryLevel)
Spacer(modifier = Modifier.height(16.dp))
Button(
onClick = { onEvent(DisconnectEvent) }
) {

33
profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/SensorsReadingView.kt
View File

@@ -1,6 +1,5 @@
package no.nordicsemi.android.rscs.view
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.runtime.Composable
@@ -10,30 +9,28 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import no.nordicsemi.android.rscs.R
import no.nordicsemi.android.rscs.data.RSCSData
import no.nordicsemi.android.theme.view.BatteryLevelView
import no.nordicsemi.android.theme.view.KeyValueField
import no.nordicsemi.android.theme.view.ScreenSection
import no.nordicsemi.android.theme.view.SectionTitle
@Composable
internal fun SensorsReadingView(state: RSCSData) {
ScreenSection {
Column {
KeyValueField(stringResource(id = R.string.rscs_activity), state.displayActivity())
Spacer(modifier = Modifier.height(4.dp))
KeyValueField(stringResource(id = R.string.rscs_pace), state.displayPace())
Spacer(modifier = Modifier.height(4.dp))
KeyValueField(stringResource(id = R.string.rscs_cadence), state.displayCadence())
Spacer(modifier = Modifier.height(4.dp))
KeyValueField(
stringResource(id = R.string.rscs_number_of_steps),
state.displayNumberOfSteps()
)
}
SectionTitle(resId = R.drawable.ic_records, title = "Records")
Spacer(modifier = Modifier.height(16.dp))
KeyValueField(stringResource(id = R.string.rscs_activity), state.displayActivity())
Spacer(modifier = Modifier.height(4.dp))
KeyValueField(stringResource(id = R.string.rscs_pace), state.displayPace())
Spacer(modifier = Modifier.height(4.dp))
KeyValueField(stringResource(id = R.string.rscs_cadence), state.displayCadence())
Spacer(modifier = Modifier.height(4.dp))
KeyValueField(
stringResource(id = R.string.rscs_number_of_steps),
state.displayNumberOfSteps()
)
}
Spacer(modifier = Modifier.height(16.dp))
BatteryLevelView(state.batteryLevel)
}
@Preview