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

Improve views

Browse Source
This commit is contained in:
Sylwester Zieliński
2021-12-02 13:22:26 +01:00
parent 10b0573d6e
commit 4d15ada6eb
14 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
View File

@@ -3,6 +3,9 @@ package no.nordicsemi.android.csc.view
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -14,6 +17,7 @@ import androidx.compose.ui.unit.dp
import no.nordicsemi.android.csc.R
import no.nordicsemi.android.csc.data.CSCData
import no.nordicsemi.android.theme.view.ScreenSection
import no.nordicsemi.android.theme.view.SectionTitle
import no.nordicsemi.android.theme.view.SelectItemRadioGroup
@Composable
@@ -23,7 +27,8 @@ internal fun CSCContentView(state: CSCData, onEvent: (CSCViewEvent) -> Unit) {
}
Column(
horizontalAlignment = Alignment.CenterHorizontally
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.padding(horizontal = 16.dp)
) {
Spacer(modifier = Modifier.height(16.dp))
@@ -49,6 +54,10 @@ private fun SettingsSection(state: CSCData, onEvent: (CSCViewEvent) -> Unit) {
Column(
horizontalAlignment = Alignment.CenterHorizontally
) {
SectionTitle(icon = Icons.Default.Settings, title = stringResource(R.string.csc_settings))
Spacer(modifier = Modifier.height(16.dp))
WheelSizeView(state, onEvent)
Spacer(modifier = Modifier.height(16.dp))

5
profile_csc/src/main/java/no/nordicsemi/android/csc/view/SensorsReadingView.kt
View File

@@ -13,10 +13,15 @@ import no.nordicsemi.android.csc.data.CSCData
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: CSCData) {
ScreenSection {
SectionTitle(resId = R.drawable.ic_records, title = "Records")
Spacer(modifier = Modifier.height(16.dp))
Column {
KeyValueField(stringResource(id = R.string.csc_field_speed), state.displaySpeed())
Spacer(modifier = Modifier.height(4.dp))

2
profile_csc/src/main/res/values/strings.xml
View File

@@ -12,6 +12,8 @@
<string name="csc_field_wheel_size">Wheel size</string>
<string name="csc_settings">Settings</string>
<string-array name="wheel_entries">
<item>60&#8211;622</item>
<item>50&#8211;622</item>