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

Improve HTS screen

Browse Source
This commit is contained in:
Sylwester Zieliński
2021-12-01 12:20:58 +01:00
parent b3f630e082
commit 5013236d24
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib_theme/src/main/res/drawable/ic_thermometer.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M15,13V5A3,3 0,0 0,9 5V13A5,5 0,1 0,15 13M12,4A1,1 0,0 1,13 5V8H11V5A1,1 0,0 1,12 4Z"/>
</vector>

20
profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt
View File

@@ -1,6 +1,9 @@
package no.nordicsemi.android.hts.view
import androidx.compose.foundation.layout.*
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.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -11,10 +14,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import no.nordicsemi.android.hts.R
import no.nordicsemi.android.hts.data.HTSData
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.SelectItemRadioGroup
import no.nordicsemi.android.theme.view.*
@Composable
internal fun HTSContentView(state: HTSData, onEvent: (HTSScreenViewEvent) -> Unit) {
@@ -25,16 +25,22 @@ internal fun HTSContentView(state: HTSData, onEvent: (HTSScreenViewEvent) -> Uni
Spacer(modifier = Modifier.height(16.dp))
ScreenSection {
Box(modifier = Modifier.padding(16.dp)) {
SectionTitle(resId = R.drawable.ic_thermometer, title = "Settings")
Spacer(modifier = Modifier.height(16.dp))
SelectItemRadioGroup(state.temperatureUnit, state.temperatureSettingsItems()) {
onEvent(OnTemperatureUnitSelected(it.unit))
}
}
}
Spacer(modifier = Modifier.height(16.dp))
ScreenSection {
SectionTitle(resId = R.drawable.ic_records, title = "Records")
Spacer(modifier = Modifier.height(16.dp))
KeyValueField(
stringResource(id = R.string.hts_temperature),
state.displayTemperature()