From 2a318d551c1fa8782257a0b2846c3ac74c7f336e Mon Sep 17 00:00:00 2001
From: DarkCat09 <a.chechkenev@yandex.ru>
Date: Tue, 6 Jun 2023 17:50:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=B2=20BottomSheet=20=D1=84=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/nm17/narodmon/ui/pages/Sensors.kt | 38 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ru/nm17/narodmon/ui/pages/Sensors.kt b/app/src/main/java/ru/nm17/narodmon/ui/pages/Sensors.kt
index d016d78..07da696 100644
--- a/app/src/main/java/ru/nm17/narodmon/ui/pages/Sensors.kt
+++ b/app/src/main/java/ru/nm17/narodmon/ui/pages/Sensors.kt
@@ -1,12 +1,16 @@
 package ru.nm17.narodmon.ui.pages
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.AssistChip
+import androidx.compose.material3.Card
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.ModalBottomSheet
@@ -21,6 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import ru.nm17.narodmon.R
 import ru.nm17.narodmon.ui.elements.GenericNavScaffold
@@ -39,7 +44,7 @@ fun SensorsPage(navController: NavController) {
     var filterShown by remember { mutableStateOf(false) }
     var filterMine by remember { mutableStateOf(false) }
 
-    val filterItems = listOf<String>(
+    val filterItems = listOf(
         stringResource(R.string.filter_temp),
         stringResource(R.string.filter_temp_water),
         stringResource(R.string.filter_temp_ground),
@@ -82,9 +87,7 @@ fun SensorsPage(navController: NavController) {
                 onQueryChange = { query -> searchQuery = query },
                 onSearch = { searchActive = false },
                 placeholder = { Text(stringResource(R.string.search)) },
-                modifier = Modifier
-                    //.padding(horizontal = 8.dp)
-                    .fillMaxWidth()
+                modifier = Modifier.fillMaxWidth()
             ) {}
 
             Row(
@@ -112,7 +115,32 @@ fun SensorsPage(navController: NavController) {
 
     if (filterShown) {
         ModalBottomSheet(onDismissRequest = { filterShown = false }) {
-            Text(text = "Hello")
+            Text(
+                text = stringResource(R.string.sensors_filter_title),
+                fontSize = 26.sp,
+            )
+
+            LazyColumn(
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.padding(horizontal = 4.dp),
+            ) {
+                items(filterItems) {
+                    Card(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable { }
+                    ) {
+                        Text(
+                            text = it,
+                            fontSize = 18.sp,
+                            modifier = Modifier.padding(
+                                horizontal = 8.dp,
+                                vertical = 16.dp,
+                            ),
+                        )
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5db243f..4661411 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,4 +42,5 @@
     <string name="filter_signal">Сигнал в dBm</string>
     <string name="filter_water_meter">Счётчик воды</string>
     <string name="filter_time">Время работы</string>
+    <string name="sensors_filter_title">Тип датчиков</string>
 </resources>
\ No newline at end of file