Фикс #10 #15
2 changed files with 6 additions and 9 deletions
|
@ -66,9 +66,7 @@ fun MainScreen(outerNavController: NavController) {
|
||||||
Modifier.padding(it)
|
Modifier.padding(it)
|
||||||
) {
|
) {
|
||||||
composable(MainScreenSealed.Sensors.route) {
|
composable(MainScreenSealed.Sensors.route) {
|
||||||
SensorsScreen(navController) {
|
SensorsScreen(outerNavController)
|
||||||
outerNavController.navigate("settings")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
composable(MainScreenSealed.Webcams.route) { WebCamsScreen(navController) }
|
composable(MainScreenSealed.Webcams.route) { WebCamsScreen(navController) }
|
||||||
composable(MainScreenSealed.Messages.route) { }
|
composable(MainScreenSealed.Messages.route) { }
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package ru.nm17.narodmon.ui.sensorsScreen
|
package ru.nm17.narodmon.ui.sensorsScreen
|
||||||
|
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
import androidx.compose.animation.ExperimentalAnimationApi
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
|
@ -29,7 +28,6 @@ import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
@ -48,13 +46,14 @@ import ru.nm17.narodmon.ui.elements.TileMap
|
||||||
import ru.nm17.narodmon.ui.entities.SensorEntity
|
import ru.nm17.narodmon.ui.entities.SensorEntity
|
||||||
import ru.nm17.narodmon.ui.entities.SensorSortingUiEntity
|
import ru.nm17.narodmon.ui.entities.SensorSortingUiEntity
|
||||||
import ru.nm17.narodmon.ui.entities.SortingTypes
|
import ru.nm17.narodmon.ui.entities.SortingTypes
|
||||||
|
import ru.nm17.narodmon.ui.navHost.MainScreenSealed
|
||||||
import ru.nm17.narodmon.ui.theme.NarodMonTheme
|
import ru.nm17.narodmon.ui.theme.NarodMonTheme
|
||||||
import ru.nm17.narodmon.ui.toChipTitle
|
import ru.nm17.narodmon.ui.toChipTitle
|
||||||
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun SensorsScreen(navController: NavController, onSettingsClick: () -> Unit) {
|
fun SensorsScreen(outerNavController: NavController) {
|
||||||
|
|
||||||
var searchQuery by remember { mutableStateOf("") }
|
var searchQuery by remember { mutableStateOf("") }
|
||||||
var searchActive by remember { mutableStateOf(false) }
|
var searchActive by remember { mutableStateOf(false) }
|
||||||
|
@ -213,7 +212,7 @@ fun SensorsScreen(navController: NavController, onSettingsClick: () -> Unit) {
|
||||||
onSearch = { searchActive = false },
|
onSearch = { searchActive = false },
|
||||||
placeholder = { Text(stringResource(R.string.search_sensors)) },
|
placeholder = { Text(stringResource(R.string.search_sensors)) },
|
||||||
trailingIcon = {
|
trailingIcon = {
|
||||||
IconButton(onClick = { onSettingsClick.invoke() }) {
|
IconButton(onClick = { outerNavController.navigate(MainScreenSealed.Settings.route) }) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Outlined.Settings,
|
Icons.Outlined.Settings,
|
||||||
contentDescription = stringResource(R.string.settings)
|
contentDescription = stringResource(R.string.settings)
|
||||||
|
@ -256,6 +255,6 @@ fun SensorsScreen(navController: NavController, onSettingsClick: () -> Unit) {
|
||||||
@Composable
|
@Composable
|
||||||
fun PreviewNewSensors() {
|
fun PreviewNewSensors() {
|
||||||
NarodMonTheme {
|
NarodMonTheme {
|
||||||
SensorsScreen(rememberNavController()) {}
|
SensorsScreen(rememberNavController())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue