Вынес data классы в отдельные файлы. Так принято делать. По крайней мере у себя я так стараюсь делать :)
This commit is contained in:
parent
9d024a0c69
commit
d82a4b28b7
6 changed files with 103 additions and 86 deletions
|
@ -0,0 +1,21 @@
|
||||||
|
package ru.nm17.narodmon.ui.entities
|
||||||
|
|
||||||
|
import ru.nm17.narodmon.db.entities.SensorType
|
||||||
|
|
||||||
|
|
||||||
|
data class SensorEntity(
|
||||||
|
// TODO: Вынести в отдельный класс, и явно не в директорию `ui`
|
||||||
|
val id: Int,
|
||||||
|
val type: SensorType,
|
||||||
|
val deviceName: String,
|
||||||
|
val deviceOwner: Int,
|
||||||
|
val name: String,
|
||||||
|
val favorite: Boolean,
|
||||||
|
val public: Boolean,
|
||||||
|
val mine: Boolean,
|
||||||
|
val location: String,
|
||||||
|
val distance: Double, // километры
|
||||||
|
val value: Double,
|
||||||
|
val unit: String,
|
||||||
|
val changed: Int,
|
||||||
|
)
|
|
@ -0,0 +1,11 @@
|
||||||
|
package ru.nm17.narodmon.ui.entities
|
||||||
|
|
||||||
|
import androidx.compose.runtime.MutableState
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
|
||||||
|
data class SensorFilterUiEntity(
|
||||||
|
// TODO: Можно попробовать объединить с db/SensorType.kt
|
||||||
|
val stringRes: Int,
|
||||||
|
val code: Int,
|
||||||
|
var enabled: MutableState<Boolean> = mutableStateOf(false),
|
||||||
|
)
|
|
@ -0,0 +1,7 @@
|
||||||
|
package ru.nm17.narodmon.ui.entities
|
||||||
|
|
||||||
|
|
||||||
|
data class SensorSortingUiEntity(
|
||||||
|
val stringRes: Int,
|
||||||
|
val sortingType: SortingTypes,
|
||||||
|
)
|
|
@ -0,0 +1 @@
|
||||||
|
package ru.nm17.narodmon.ui.entities
|
|
@ -0,0 +1,13 @@
|
||||||
|
package ru.nm17.narodmon.ui.entities
|
||||||
|
|
||||||
|
enum class SortingTypes {
|
||||||
|
DISTANCE,
|
||||||
|
DISTANCE_DESC,
|
||||||
|
TYPE,
|
||||||
|
TYPE_DESC,
|
||||||
|
UPD_TIME,
|
||||||
|
NAME,
|
||||||
|
NAME_DESC,
|
||||||
|
VALUE,
|
||||||
|
VALUE_DESC
|
||||||
|
}
|
|
@ -16,13 +16,12 @@ import androidx.compose.material3.Divider
|
||||||
import androidx.compose.material3.ElevatedCard
|
import androidx.compose.material3.ElevatedCard
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.FilterChip
|
import androidx.compose.material3.FilterChip
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.ListItem
|
import androidx.compose.material3.ListItem
|
||||||
import androidx.compose.material3.ModalBottomSheet
|
|
||||||
import androidx.compose.material3.RadioButton
|
import androidx.compose.material3.RadioButton
|
||||||
import androidx.compose.material3.SearchBar
|
import androidx.compose.material3.SearchBar
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.MutableState
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
@ -31,6 +30,7 @@ import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.RectangleShape
|
import androidx.compose.ui.graphics.RectangleShape
|
||||||
import androidx.compose.ui.platform.LocalConfiguration
|
import androidx.compose.ui.platform.LocalConfiguration
|
||||||
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
@ -38,43 +38,15 @@ import androidx.compose.ui.unit.sp
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
import ru.nm17.narodmon.R
|
import ru.nm17.narodmon.R
|
||||||
import ru.nm17.narodmon.db.entities.SensorType
|
import ru.nm17.narodmon.db.entities.SensorType
|
||||||
|
import ru.nm17.narodmon.ui.bottomSheets.FilterSensorsBottomSheet
|
||||||
|
import ru.nm17.narodmon.ui.bottomSheets.SortSensorsBottomSheet
|
||||||
import ru.nm17.narodmon.ui.elements.GenericNavScaffold
|
import ru.nm17.narodmon.ui.elements.GenericNavScaffold
|
||||||
import ru.nm17.narodmon.ui.elements.TileMap
|
import ru.nm17.narodmon.ui.elements.TileMap
|
||||||
|
import ru.nm17.narodmon.ui.entities.SensorEntity
|
||||||
|
import ru.nm17.narodmon.ui.entities.SensorFilterUiEntity
|
||||||
|
import ru.nm17.narodmon.ui.entities.SortingTypes
|
||||||
import ru.nm17.narodmon.ui.iosevkaFamily
|
import ru.nm17.narodmon.ui.iosevkaFamily
|
||||||
|
|
||||||
data class Sensor(
|
|
||||||
// TODO: Вынести в отдельный класс, и явно не в директорию `ui`
|
|
||||||
val id: Int,
|
|
||||||
val type: SensorType,
|
|
||||||
val deviceName: String,
|
|
||||||
val deviceOwner: Int,
|
|
||||||
val name: String,
|
|
||||||
val favorite: Boolean,
|
|
||||||
val public: Boolean,
|
|
||||||
val mine: Boolean,
|
|
||||||
val location: String,
|
|
||||||
val distance: Double, // километры
|
|
||||||
val value: Double,
|
|
||||||
val unit: String,
|
|
||||||
val changed: Int,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class SensorFilter(
|
|
||||||
// TODO: Можно попробовать объединить с db/SensorType.kt
|
|
||||||
val stringRes: Int,
|
|
||||||
val code: Int,
|
|
||||||
var enabled: MutableState<Boolean> = mutableStateOf(false),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class SensorSortingItem(
|
|
||||||
val stringRes: Int,
|
|
||||||
val sortingType: SortingType,
|
|
||||||
)
|
|
||||||
|
|
||||||
enum class SortingType {
|
|
||||||
DISTANCE, TYPE, UPD_TIME,
|
|
||||||
NAME, VALUE,
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExperimentalMaterial3Api
|
@ExperimentalMaterial3Api
|
||||||
@Composable
|
@Composable
|
||||||
|
@ -82,21 +54,9 @@ fun SensorsPage(navController: NavController) {
|
||||||
var searchQuery by remember { mutableStateOf("") }
|
var searchQuery by remember { mutableStateOf("") }
|
||||||
var searchActive by remember { mutableStateOf(false) }
|
var searchActive by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
var sortingShow by remember { mutableStateOf(false) }
|
|
||||||
var sortingType by remember { mutableStateOf(SortingType.DISTANCE) }
|
|
||||||
var sortingDesc by remember { mutableStateOf(false) }
|
|
||||||
var sortingMine by remember { mutableStateOf(false) }
|
|
||||||
var sortingFav by remember { mutableStateOf(false) }
|
|
||||||
|
|
||||||
val sortingTypes = remember {
|
var sortingShow by remember { mutableStateOf(false) }
|
||||||
listOf(
|
var sortingType by remember { mutableStateOf(SortingTypes.DISTANCE) }
|
||||||
SensorSortingItem(R.string.sort_distance, SortingType.DISTANCE),
|
|
||||||
SensorSortingItem(R.string.sort_type, SortingType.TYPE),
|
|
||||||
SensorSortingItem(R.string.sort_update_time, SortingType.UPD_TIME),
|
|
||||||
SensorSortingItem(R.string.sort_name, SortingType.NAME),
|
|
||||||
SensorSortingItem(R.string.sort_value, SortingType.VALUE),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
var filterShow by remember { mutableStateOf(false) }
|
var filterShow by remember { mutableStateOf(false) }
|
||||||
var filterMine by remember { mutableStateOf(false) }
|
var filterMine by remember { mutableStateOf(false) }
|
||||||
|
@ -107,36 +67,36 @@ fun SensorsPage(navController: NavController) {
|
||||||
* Заменить `code` на настоящее значение
|
* Заменить `code` на настоящее значение
|
||||||
* либо динамически его подгружать из ответа АПИ
|
* либо динамически его подгружать из ответа АПИ
|
||||||
* (см. /appInit, ключ в жсоне: types.type) */
|
* (см. /appInit, ключ в жсоне: types.type) */
|
||||||
SensorFilter(R.string.filter_temp, 0),
|
SensorFilterUiEntity(R.string.filter_temp, 0),
|
||||||
SensorFilter(R.string.filter_temp_water, 1),
|
SensorFilterUiEntity(R.string.filter_temp_water, 1),
|
||||||
SensorFilter(R.string.filter_temp_ground, 2),
|
SensorFilterUiEntity(R.string.filter_temp_ground, 2),
|
||||||
SensorFilter(R.string.filter_temp_dew_point, 3),
|
SensorFilterUiEntity(R.string.filter_temp_dew_point, 3),
|
||||||
SensorFilter(R.string.filter_humidity, 4),
|
SensorFilterUiEntity(R.string.filter_humidity, 4),
|
||||||
SensorFilter(R.string.filter_pressure, 5),
|
SensorFilterUiEntity(R.string.filter_pressure, 5),
|
||||||
SensorFilter(R.string.filter_lightness, 6),
|
SensorFilterUiEntity(R.string.filter_lightness, 6),
|
||||||
SensorFilter(R.string.filter_uv, 7),
|
SensorFilterUiEntity(R.string.filter_uv, 7),
|
||||||
SensorFilter(R.string.filter_radiation, 8),
|
SensorFilterUiEntity(R.string.filter_radiation, 8),
|
||||||
SensorFilter(R.string.filter_rainfall, 9),
|
SensorFilterUiEntity(R.string.filter_rainfall, 9),
|
||||||
SensorFilter(R.string.filter_dust, 10),
|
SensorFilterUiEntity(R.string.filter_dust, 10),
|
||||||
SensorFilter(R.string.filter_wind_speed, 11),
|
SensorFilterUiEntity(R.string.filter_wind_speed, 11),
|
||||||
SensorFilter(R.string.filter_wind_direction, 12),
|
SensorFilterUiEntity(R.string.filter_wind_direction, 12),
|
||||||
SensorFilter(R.string.filter_concentration, 13),
|
SensorFilterUiEntity(R.string.filter_concentration, 13),
|
||||||
SensorFilter(R.string.filter_power, 14),
|
SensorFilterUiEntity(R.string.filter_power, 14),
|
||||||
SensorFilter(R.string.filter_voltage, 15),
|
SensorFilterUiEntity(R.string.filter_voltage, 15),
|
||||||
SensorFilter(R.string.filter_amperage, 16),
|
SensorFilterUiEntity(R.string.filter_amperage, 16),
|
||||||
SensorFilter(R.string.filter_energy, 17),
|
SensorFilterUiEntity(R.string.filter_energy, 17),
|
||||||
SensorFilter(R.string.filter_battery, 18),
|
SensorFilterUiEntity(R.string.filter_battery, 18),
|
||||||
SensorFilter(R.string.filter_rxtx, 19),
|
SensorFilterUiEntity(R.string.filter_rxtx, 19),
|
||||||
SensorFilter(R.string.filter_signal, 20),
|
SensorFilterUiEntity(R.string.filter_signal, 20),
|
||||||
SensorFilter(R.string.filter_water_meter, 21),
|
SensorFilterUiEntity(R.string.filter_water_meter, 21),
|
||||||
SensorFilter(R.string.filter_time, 22),
|
SensorFilterUiEntity(R.string.filter_time, 22),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val sensors = remember {
|
val sensorEntities = remember {
|
||||||
mutableListOf(
|
mutableListOf(
|
||||||
// TODO: загружать датчики с сервера. Этот список -- для макета
|
// TODO: загружать датчики с сервера. Этот список -- для макета
|
||||||
Sensor(
|
SensorEntity(
|
||||||
0,
|
0,
|
||||||
SensorType(0, "temp", "C"),
|
SensorType(0, "temp", "C"),
|
||||||
"device0", 0,
|
"device0", 0,
|
||||||
|
@ -145,7 +105,7 @@ fun SensorsPage(navController: NavController) {
|
||||||
"Москва", 0.4,
|
"Москва", 0.4,
|
||||||
20.0, "C", 1686142800,
|
20.0, "C", 1686142800,
|
||||||
),
|
),
|
||||||
Sensor(
|
SensorEntity(
|
||||||
1,
|
1,
|
||||||
SensorType(4, "humidity", "%"),
|
SensorType(4, "humidity", "%"),
|
||||||
"device1", 0,
|
"device1", 0,
|
||||||
|
@ -154,7 +114,7 @@ fun SensorsPage(navController: NavController) {
|
||||||
"Подмосковье", 1.1,
|
"Подмосковье", 1.1,
|
||||||
39.0, "%", 1686142800,
|
39.0, "%", 1686142800,
|
||||||
),
|
),
|
||||||
Sensor(
|
SensorEntity(
|
||||||
2,
|
2,
|
||||||
SensorType(11, "wind speed", "m/s"),
|
SensorType(11, "wind speed", "m/s"),
|
||||||
"device2", 1,
|
"device2", 1,
|
||||||
|
@ -183,7 +143,9 @@ fun SensorsPage(navController: NavController) {
|
||||||
onQueryChange = { query -> searchQuery = query },
|
onQueryChange = { query -> searchQuery = query },
|
||||||
onSearch = { searchActive = false },
|
onSearch = { searchActive = false },
|
||||||
placeholder = { Text(stringResource(R.string.search)) },
|
placeholder = { Text(stringResource(R.string.search)) },
|
||||||
modifier = Modifier.fillMaxWidth().padding(horizontal = if(!searchActive) 8.dp else 0.dp)
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(horizontal = if (!searchActive) 8.dp else 0.dp)
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
|
@ -212,7 +174,7 @@ fun SensorsPage(navController: NavController) {
|
||||||
LazyColumn(
|
LazyColumn(
|
||||||
modifier = Modifier.fillMaxHeight(),
|
modifier = Modifier.fillMaxHeight(),
|
||||||
) {
|
) {
|
||||||
items(sensors) { sensor ->
|
items(sensorEntities) { sensor ->
|
||||||
SensorItem(sensor)
|
SensorItem(sensor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -238,21 +200,21 @@ fun SensorsPage(navController: NavController) {
|
||||||
|
|
||||||
@ExperimentalMaterial3Api
|
@ExperimentalMaterial3Api
|
||||||
@Composable
|
@Composable
|
||||||
fun SensorItem(sensor: Sensor) {
|
fun SensorItem(sensorEntity: SensorEntity) {
|
||||||
ListItem(
|
ListItem(
|
||||||
overlineContent = { Text(text = "${sensor.deviceName} от ${sensor.deviceOwner}") },
|
overlineContent = { Text(text = "${sensorEntity.deviceName} от ${sensorEntity.deviceOwner}") },
|
||||||
headlineContent = { Text(text = sensor.type.name) },
|
headlineContent = { Text(text = sensorEntity.type.name) },
|
||||||
supportingContent = { Text(text = sensor.name) },
|
supportingContent = { Text(text = sensorEntity.name) },
|
||||||
trailingContent = {
|
trailingContent = {
|
||||||
Column(
|
Column(
|
||||||
horizontalAlignment = Alignment.End,
|
horizontalAlignment = Alignment.End,
|
||||||
) {
|
) {
|
||||||
Text(text = "${sensor.distance} km")
|
Text(text = "${sensorEntity.distance} km")
|
||||||
ElevatedCard(
|
ElevatedCard(
|
||||||
shape = RectangleShape,
|
shape = RectangleShape,
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "${sensor.value} ${sensor.unit}",
|
text = "${sensorEntity.value} ${sensorEntity.unit}",
|
||||||
fontFamily = iosevkaFamily,
|
fontFamily = iosevkaFamily,
|
||||||
fontWeight = FontWeight.Medium,
|
fontWeight = FontWeight.Medium,
|
||||||
fontSize = 14.sp,
|
fontSize = 14.sp,
|
||||||
|
@ -269,7 +231,9 @@ fun SensorItem(sensor: Sensor) {
|
||||||
fun FilterCheckbox(checked: Boolean, stringRes: Int, onCheckedChange: () -> Unit) {
|
fun FilterCheckbox(checked: Boolean, stringRes: Int, onCheckedChange: () -> Unit) {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
modifier = Modifier.fillMaxWidth().clickable { onCheckedChange() }
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clickable { onCheckedChange() }
|
||||||
) {
|
) {
|
||||||
Checkbox(
|
Checkbox(
|
||||||
checked = checked,
|
checked = checked,
|
||||||
|
|
Loading…
Add table
Reference in a new issue