From 55c583ba6aa9b543a54791a5dd91ed7c219e9d20 Mon Sep 17 00:00:00 2001
From: mezhendosina <mensh.zheya@gmail.com>
Date: Thu, 22 Jun 2023 11:27:03 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2=20SensorsScreen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/nm17/narodmon/ui/navHost/MainScreen.kt    |  4 +---
 .../nm17/narodmon/ui/sensorsScreen/SensorsScreen.kt   | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ru/nm17/narodmon/ui/navHost/MainScreen.kt b/app/src/main/java/ru/nm17/narodmon/ui/navHost/MainScreen.kt
index b3b8e10..d2569b2 100644
--- a/app/src/main/java/ru/nm17/narodmon/ui/navHost/MainScreen.kt
+++ b/app/src/main/java/ru/nm17/narodmon/ui/navHost/MainScreen.kt
@@ -66,9 +66,7 @@ fun MainScreen(outerNavController: NavController) {
             Modifier.padding(it)
         ) {
             composable(MainScreenSealed.Sensors.route) {
-                SensorsScreen(navController) {
-                    outerNavController.navigate("settings")
-                }
+                SensorsScreen(outerNavController)
             }
             composable(MainScreenSealed.Webcams.route) { WebCamsScreen(navController) }
             composable(MainScreenSealed.Messages.route) { }
diff --git a/app/src/main/java/ru/nm17/narodmon/ui/sensorsScreen/SensorsScreen.kt b/app/src/main/java/ru/nm17/narodmon/ui/sensorsScreen/SensorsScreen.kt
index d2f24a6..8ded59d 100644
--- a/app/src/main/java/ru/nm17/narodmon/ui/sensorsScreen/SensorsScreen.kt
+++ b/app/src/main/java/ru/nm17/narodmon/ui/sensorsScreen/SensorsScreen.kt
@@ -1,7 +1,6 @@
 package ru.nm17.narodmon.ui.sensorsScreen
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -29,7 +28,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 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.SensorSortingUiEntity
 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.toChipTitle
 
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SensorsScreen(navController: NavController, onSettingsClick: () -> Unit) {
+fun SensorsScreen(outerNavController: NavController) {
 
     var searchQuery by remember { mutableStateOf("") }
     var searchActive by remember { mutableStateOf(false) }
@@ -213,7 +212,7 @@ fun SensorsScreen(navController: NavController, onSettingsClick: () -> Unit) {
                 onSearch = { searchActive = false },
                 placeholder = { Text(stringResource(R.string.search_sensors)) },
                 trailingIcon = {
-                    IconButton(onClick = { onSettingsClick.invoke() }) {
+                    IconButton(onClick = { outerNavController.navigate(MainScreenSealed.Settings.route) }) {
                         Icon(
                             Icons.Outlined.Settings,
                             contentDescription = stringResource(R.string.settings)
@@ -256,6 +255,6 @@ fun SensorsScreen(navController: NavController, onSettingsClick: () -> Unit) {
 @Composable
 fun PreviewNewSensors() {
     NarodMonTheme {
-        SensorsScreen(rememberNavController()) {}
+        SensorsScreen(rememberNavController())
     }
 }