oleg 4 päivää sitten
vanhempi
commit
e11144a5c9

+ 1 - 1
.idea/deploymentTargetSelector.xml

@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-20T05:08:34.946870500Z">
+        <DropdownSelection timestamp="2024-11-20T18:21:16.121058200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=128c7b10" />

+ 0 - 329
.idea/other.xml

@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="Lenovo" />
-          <option name="codename" value="TB370FU" />
-          <option name="id" value="TB370FU" />
-          <option name="manufacturer" value="Lenovo" />
-          <option name="name" value="Tab P12" />
-          <option name="screenDensity" value="340" />
-          <option name="screenX" value="1840" />
-          <option name="screenY" value="2944" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="id" value="e1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q6q" />
-          <option name="id" value="q6q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1856" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>

+ 6 - 2
app/build.gradle.kts

@@ -65,6 +65,7 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.runtime.livedata)
     implementation(libs.androidx.tools.core)
+    implementation(libs.androidx.runtime.saved.instance.state)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -72,8 +73,11 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-
-
+    implementation("androidx.compose.material:material:1.7.5")
+    implementation("androidx.navigation:navigation-compose:2.8.4")
+    implementation("androidx.compose.material3:material3:1.0.0")
+    implementation("androidx.compose.ui:ui:1.0.0")
+    implementation("androidx.compose.ui:ui-tooling:1.7.5")
 
     implementation(platform(libs.bom))
     implementation(libs.supabase.postgrest.kt)

+ 5 - 0
app/src/main/java/com/example/lectionsupabase/navigation/Navigation.kt

@@ -13,6 +13,7 @@ import com.example.lectionsupabase.view.mainActivity.components.DealersList
 import com.example.lectionsupabase.view.mainActivity.components.Exhibition
 import com.example.lectionsupabase.view.mainActivity.components.InsertCar
 import com.example.lectionsupabase.view.mainActivity.components.Maps
+import com.example.lectionsupabase.view.mainActivity.components.Panel
 import com.example.lectionsupabase.view.mainActivity.components.Restaurants
 import com.example.lectionsupabase.view.mainActivity.components.reg
 import com.example.lectionsupabase.view.mainActivity.components.slide1
@@ -46,6 +47,10 @@ fun Navigation() {
             Restaurants(navController)
         }
 
+        composable("Panel"){
+            Panel(navController)
+        }
+
         composable("Cinema") {
             Cinema(navController)
         }

+ 2 - 2
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Benchs.kt

@@ -149,8 +149,7 @@ fun Benchs(navHost: NavHostController) {
         } else {
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxHeight()
-                    .padding(bottom = 8.dp),
+                    .weight(1f),
                 verticalArrangement = Arrangement.spacedBy(10.dp)
             ) {
                 items(benchs, key = { bench -> bench.id }) { bench ->
@@ -223,5 +222,6 @@ fun Benchs(navHost: NavHostController) {
                 }
             }
         }
+        Panel(navHost)
     }
 }

+ 3 - 2
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Cinema.kt

@@ -146,8 +146,8 @@ fun Cinema(navHost: NavHostController) {
             // Список ресторанов
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxHeight() // Оставляем немного места для кнопки
-                    .padding(bottom = 16.dp),
+                    .weight(1f),// Оставляем немного места для кнопки
+
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
                 items(movies, key = { movie -> movie.id }) { movie ->
@@ -228,5 +228,6 @@ fun Cinema(navHost: NavHostController) {
                 }
             }
         }
+        Panel(navHost)
     }
 }

+ 4 - 2
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Concerts.kt

@@ -147,8 +147,8 @@ fun Concerts(navHost: NavHostController) {
             // Список ресторанов
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxHeight() // Оставляем немного места для кнопки
-                    .padding(bottom = 16.dp),
+                    .weight(1f), // Оставляем немного места для кнопки
+
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
                 items(concerts, key = { concert -> concert.id }) { concert ->
@@ -228,6 +228,8 @@ fun Concerts(navHost: NavHostController) {
                     }
                 }
             }
+            Panel(navHost)
         }
+
     }
 }

+ 2 - 2
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Exhibition.kt

@@ -147,8 +147,7 @@ fun Exhibition(navHost: NavHostController) {
             // Список ресторанов
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxHeight() // Оставляем немного места для кнопки
-                    .padding(bottom = 16.dp),
+                    .weight(1f),
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
                 items(ex, key = { exx -> exx.id }) { exx ->
@@ -229,5 +228,6 @@ fun Exhibition(navHost: NavHostController) {
                 }
             }
         }
+        Panel(navHost)
     }
 }

+ 99 - 0
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Panel.kt

@@ -0,0 +1,99 @@
+package com.example.lectionsupabase.view.mainActivity.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.gestures.snapping.SnapPosition
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.example.lectionsupabase.R
+
+@Composable
+fun Panel(navHost: NavHostController) {
+    val icons = listOf(
+        R.drawable.rest, // Restaurants
+        R.drawable.micro, // Concerts
+        R.drawable.films, // Movies
+        R.drawable.cartina, // Exhibitions
+        R.drawable.bench  // Benches
+    )
+
+    // Размеры и отступы
+    val iconSize = 20.dp // Уменьшенный размер иконок
+    val padding = 0.dp // Уменьшенные отступы
+    val panelHeight = 40.dp // Уменьшенная высота панели
+    val panelWidth = 257.dp // Уменьшенная ширина панели
+    val bottomPadding = 14.dp // Отступ снизу
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth() // Занимаем всю доступную площадь
+            .padding(bottom = bottomPadding) // Добавляем отступ снизу
+            .background(Color.Transparent) // Прозрачный фон для Box
+    ) {
+        Box(
+            modifier = Modifier
+                .width(panelWidth) // Задаем фиксированную ширину панели
+                .height(panelHeight) // Задаем фиксированную высоту панели
+                .align(Alignment.BottomCenter) // Центрируем панель в нижней части экрана
+                .background(Color.White, shape = RoundedCornerShape(30.dp)) // Более закругленная панель
+                .border(0.5.dp, Color.LightGray, shape = RoundedCornerShape(30.dp)) // Серый обвод
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxSize() // Занимаем всю площадь панели
+                    .padding(horizontal = padding),
+                horizontalArrangement = Arrangement.SpaceAround, // Центрируем иконки
+                verticalAlignment = Alignment.CenterVertically // Центрируем иконки по вертикали
+            ) {
+                icons.forEachIndexed { index, icon ->
+                    IconButton(
+                        onClick = {
+                            val screen = when (index) {
+                                0 -> "Restaurants"
+                                1 -> "Cinema"
+                                2 -> "Concerts"
+                                3 -> "Exhibition"
+                                4 -> "Benchs"
+                                else -> ""
+                            }
+                            navHost.navigate(screen) // Переход на экран
+                        },
+                        modifier = Modifier.padding(horizontal = 2.dp) // Равные отступы между иконками
+                    ) {
+                        Icon(
+                            painter = painterResource(id = icon),
+                            contentDescription = null,
+                            modifier = Modifier.size(iconSize),
+                            tint = if (navHost.currentDestination?.route == when (index) {
+                                    0 -> "Restaurants"
+                                    1 -> "Cinema"
+                                    2 -> "Concerts"
+                                    3 -> "Exhibition"
+                                    4 -> "Benchs"
+                                    else -> ""
+                                }) Color(0xFF72C3F1) else Color.Gray // Цвет иконок
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

+ 29 - 18
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Restaurants.kt

@@ -1,8 +1,13 @@
 package com.example.lectionsupabase.view.mainActivity.components
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.material.BottomNavigation
+import androidx.compose.material.BottomNavigationItem
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -10,14 +15,20 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.ArrowForward
+import androidx.compose.material.icons.filled.Email
+import androidx.compose.material.icons.filled.Person
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
@@ -35,14 +46,17 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import coil.compose.rememberImagePainter
 import com.example.lectionsupabase.R
@@ -57,14 +71,11 @@ import io.github.jan.supabase.postgrest.from
 fun Restaurants(navHost: NavHostController) {
     var restaurants by remember { mutableStateOf<List<Restaurants>>(listOf()) }
     var loadingRest by remember { mutableStateOf(true) }
-    var loadingUsers by remember { mutableStateOf(true) }
     var users by remember { mutableStateOf<List<Admin>>(listOf()) }
     val montserratSemiBold = FontFamily(Font(R.font.mon_semibold))
-    val montserratExtraBold = FontFamily(Font(R.font.mon_extrabold))
+    var selectedIndex by remember { mutableStateOf(0) }
     val montserratRegular = FontFamily(Font(R.font.mon_regular))
     val montserratMedium = FontFamily(Font(R.font.mon_medium))
-    val montserratLigth = FontFamily(Font(R.font.mon_light))
-
     // Загружаем список ресторанов
     LaunchedEffect(Unit) {
         try {
@@ -84,10 +95,8 @@ fun Restaurants(navHost: NavHostController) {
             users = Constants.supabase.from("Admin")
                 .select()
                 .decodeList<Admin>()
-            loadingUsers = false
         } catch (e: Exception) {
             println("Error loading users: ${e.message}")
-            loadingUsers = false
         }
     }
 
@@ -97,6 +106,7 @@ fun Restaurants(navHost: NavHostController) {
             .padding(16.dp)
             .padding(top = 20.dp),
     ) {
+        // Заголовок
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -105,7 +115,7 @@ fun Restaurants(navHost: NavHostController) {
         ) {
             // Стрелка влево
             IconButton(
-                onClick = { navHost.navigate("")},
+                onClick = { navHost.navigate("previous_screen") },
                 modifier = Modifier.padding(end = 8.dp)
             ) {
                 Icon(
@@ -126,10 +136,10 @@ fun Restaurants(navHost: NavHostController) {
                 modifier = Modifier.weight(1f)
             )
 
-            // Стрелка с отступом
+            // Стрелка вправо
             IconButton(
                 onClick = { navHost.navigate("Cinema") },
-                modifier = Modifier.padding(start = 8.dp) // Отступ слева для стрелки
+                modifier = Modifier.padding(start = 8.dp)
             ) {
                 Icon(
                     imageVector = Icons.Default.ArrowForward,
@@ -139,7 +149,6 @@ fun Restaurants(navHost: NavHostController) {
             }
         }
 
-
         // Загрузка ресторанов
         if (loadingRest) {
             Box(
@@ -152,8 +161,8 @@ fun Restaurants(navHost: NavHostController) {
             // Список ресторанов
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxHeight() // Оставляем немного места для кнопки
-                    .padding(bottom = 16.dp),
+                    .weight(1f),
+
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
                 items(restaurants, key = { restaurant -> restaurant.id }) { restaurant ->
@@ -164,7 +173,7 @@ fun Restaurants(navHost: NavHostController) {
                         elevation = CardDefaults.cardElevation(0.dp),
                         shape = RoundedCornerShape(20.dp),
                         colors = CardDefaults.cardColors(containerColor = Color.White),
-                        border = BorderStroke(0.5.dp, Color.LightGray) // Светло-серая окантовка
+                        border = BorderStroke(0.5.dp, Color.LightGray)
                     ) {
                         Column(modifier = Modifier.fillMaxWidth()) {
                             val painter = rememberImagePainter(
@@ -189,7 +198,7 @@ fun Restaurants(navHost: NavHostController) {
                                 style = MaterialTheme.typography.titleMedium,
                                 fontSize = 14.sp,
                                 modifier = Modifier.padding(horizontal = 10.dp)
-                                .padding(start = 3.dp),
+                                    .padding(start = 3.dp),
                                 fontFamily = montserratRegular
                             )
                             Text(
@@ -197,7 +206,7 @@ fun Restaurants(navHost: NavHostController) {
                                 style = MaterialTheme.typography.titleMedium,
                                 fontSize = 14.sp,
                                 modifier = Modifier.padding(horizontal = 10.dp)
-                                    .padding(start = 3.dp),
+                                    .padding(start =  3.dp),
                                 fontFamily = montserratRegular
                             )
                             Text(
@@ -206,8 +215,7 @@ fun Restaurants(navHost: NavHostController) {
                                 fontSize = 14.sp,
                                 modifier = Modifier.padding(horizontal = 10.dp)
                                     .padding(start = 3.dp),
-                                fontFamily = montserratRegular,
-
+                                fontFamily = montserratRegular
                             )
                             Text(
                                 text = "Посмотреть на карте",
@@ -225,8 +233,11 @@ fun Restaurants(navHost: NavHostController) {
                 }
             }
         }
+
+        Panel(navHost)
+        }
     }
-}
+
 
 
 //        val userId = Constants.supabase.auth.currentUserOrNull()?.id

+ 16 - 13
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/auth.kt

@@ -1,4 +1,5 @@
 import android.widget.Toast
+import androidx.activity.SystemBarStyle
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -25,15 +26,18 @@ import androidx.compose.material3.TextButton
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.savedinstancestate.savedInstanceState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -55,6 +59,7 @@ import androidx.navigation.NavController
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
+
     val email = remember { mutableStateOf("") }
     val password = remember { mutableStateOf("") }
     var passwordVisibility by remember { mutableStateOf(false) }
@@ -66,7 +71,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color(0xFFBCE1FB)) // Фон страницы
+            .background(Color(0xFFAAD4EE)) // Фон страницы
             .padding(8.dp),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
@@ -109,14 +114,14 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
                     label = { Text("Логин", color = Color.White, fontFamily = montserratMedium) },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(48.dp) // Фиксированная высота для поля
+                        .height(49.dp) // Фиксированная высота для поля
                         .clip(RoundedCornerShape(5.dp)), // Закругление полей
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
                     textStyle = TextStyle(fontSize = 17.sp, color = Color.White),
                     colors = TextFieldDefaults.textFieldColors(
                         focusedIndicatorColor = Color.Transparent,
                         unfocusedIndicatorColor = Color.Transparent,
-                        containerColor = Color(0xFF97CAEF)
+                        containerColor = Color(0xFF96C7E5)
                     )
                 )
                 Spacer(modifier = Modifier.height(16.dp))
@@ -128,7 +133,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
                     label = { Text("Пароль", color = Color.White, fontFamily = montserratMedium) },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(48.dp) // Фиксированная высота для поля
+                        .height(49.dp) // Фиксированная высота для поля
                         .clip(RoundedCornerShape(5.dp)), // Закругление полей
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
                     visualTransformation = if (passwordVisibility) VisualTransformation.None else PasswordVisualTransformation(),
@@ -147,12 +152,10 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
                     colors = TextFieldDefaults.textFieldColors(
                         focusedIndicatorColor = Color.Transparent,
                         unfocusedIndicatorColor = Color.Transparent,
-                        containerColor = Color(0xFF97CAEF)
+                        containerColor = Color(0xFF96C7E5)
                     )
                 )
-                Spacer(modifier = Modifier.height(36.dp)) // Увеличенный отступ между полем и кнопкой
-
-                // Кнопка
+                Spacer(modifier = Modifier.height(36.dp))
                 Button(
                     onClick = {
                         viewModel.onSignInEmailPassword(
@@ -163,10 +166,10 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
                     },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(46.dp),
+                        .height(49.dp),
                     shape = RoundedCornerShape(5.dp), // Закругление кнопки
                     colors = ButtonDefaults.buttonColors(
-                        containerColor = Color(0xFF97CAEF),
+                        containerColor = Color(0xFF7DBCDF),
                         contentColor = Color.White,
                     )
                 ) {
@@ -183,7 +186,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
         }
 
         // Кнопка регистрации вынесена за пределы Box
-        Spacer(modifier = Modifier.height(285.dp)) // Отступ перед кнопкой регистрации
+        Spacer(modifier = Modifier.height(240.dp)) // Отступ перед кнопкой регистрации
         TextButton(
             onClick = {
                 navHostController.navigate("reg")
@@ -193,9 +196,9 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
             Text(
                 text = "Еще нет аккаунта? Зарегистрируйтесь",
                 style = TextStyle(
-                    fontSize = 17.sp,
+                    fontSize = 15.sp,
                     color = Color.White,
-                    fontFamily = montserratMedium
+                    fontFamily = montserratRegular
                 )
             )
         }

+ 5 - 5
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/reg.kt

@@ -103,7 +103,7 @@ fun reg(navHostController: NavHostController, viewModel: MainViewModel) {
                     label = { Text("Логин", color = Color.White, fontFamily = montserratMedium) },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(46.dp) // Фиксированная высота для поля
+                        .height(49.dp) // Фиксированная высота для поля
                         .clip(RoundedCornerShape(5.dp)), // Закругление полей
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
                     textStyle = TextStyle(fontSize = 17.sp, color = Color.White),
@@ -122,7 +122,7 @@ fun reg(navHostController: NavHostController, viewModel: MainViewModel) {
                     label = { Text("Пароль", color = Color.White, fontFamily = montserratMedium) },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(48.dp) // Фиксированная высота для поля
+                        .height(49.dp) // Фиксированная высота для поля
                         .clip(RoundedCornerShape(5.dp)), // Закругление полей
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
                     visualTransformation = if (passwordVisibility) VisualTransformation.None else PasswordVisualTransformation(),
@@ -150,7 +150,7 @@ fun reg(navHostController: NavHostController, viewModel: MainViewModel) {
                     onClick = { viewModel.onSignUpEmail(email.value, password.value) },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(48.dp),
+                        .height(49.dp),
                     shape = RoundedCornerShape(5.dp), // Закругление кнопки
                     colors = ButtonDefaults.buttonColors(
                         containerColor = Color(0xFF7DBCDF),
@@ -166,7 +166,7 @@ fun reg(navHostController: NavHostController, viewModel: MainViewModel) {
         }
 
         // Кнопка регистрации вынесена за пределы Box
-        Spacer(modifier = Modifier.height(285.dp)) // Отступ перед кнопкой регистрации
+        Spacer(modifier = Modifier.height(240.dp)) // Отступ перед кнопкой регистрации
         TextButton(
             onClick = { navHostController.navigate("auth")
             },
@@ -174,7 +174,7 @@ fun reg(navHostController: NavHostController, viewModel: MainViewModel) {
         ) {
             Text(
                 text = "Уже есть аккаунт? Авторизируйтесь",
-                style = TextStyle(fontSize = 17.sp, color = Color.White, fontFamily = montserratMedium)
+                style = TextStyle(fontSize = 15.sp, color = Color.White, fontFamily = montserratRegular)
             )
         }
     }

+ 9 - 0
app/src/main/res/drawable/bench.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="5dp"
+    android:viewportWidth="14"
+    android:viewportHeight="5">
+  <path
+      android:pathData="M1,0C0,0 0,1.5 1,1.5H13C14,1.5 14,0 13,0H1ZM2,2V5H3.5V2H2ZM10.5,2V5H12V2H10.5Z"
+      android:fillColor="#000000"/>
+</vector>

+ 17 - 0
app/src/main/res/drawable/cartina.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="19dp" android:viewportHeight="16" android:viewportWidth="16" android:width="19dp">
+      
+    <group>
+            
+        <clip-path android:pathData="M0,0h16v16h-16z"/>
+            
+        <path android:fillColor="#000000" android:pathData="M13,13.5H3C2.602,13.5 2.221,13.342 1.939,13.061C1.658,12.779 1.5,12.398 1.5,12V4C1.5,3.602 1.658,3.221 1.939,2.939C2.221,2.658 2.602,2.5 3,2.5H13C13.398,2.5 13.779,2.658 14.061,2.939C14.342,3.221 14.5,3.602 14.5,4V12C14.5,12.398 14.342,12.779 14.061,13.061C13.779,13.342 13.398,13.5 13,13.5ZM3,3.5C2.867,3.5 2.74,3.553 2.646,3.646C2.553,3.74 2.5,3.867 2.5,4V12C2.5,12.133 2.553,12.26 2.646,12.354C2.74,12.447 2.867,12.5 3,12.5H13C13.133,12.5 13.26,12.447 13.354,12.354C13.447,12.26 13.5,12.133 13.5,12V4C13.5,3.867 13.447,3.74 13.354,3.646C13.26,3.553 13.133,3.5 13,3.5H3Z"/>
+            
+        <path android:fillColor="#000000" android:pathData="M10.5,7.5C10.203,7.5 9.913,7.412 9.667,7.247C9.42,7.082 9.228,6.848 9.114,6.574C9.001,6.3 8.971,5.998 9.029,5.707C9.087,5.416 9.23,5.149 9.439,4.939C9.649,4.73 9.916,4.587 10.207,4.529C10.498,4.471 10.8,4.501 11.074,4.614C11.348,4.728 11.582,4.92 11.747,5.167C11.912,5.413 12,5.703 12,6C12,6.398 11.842,6.779 11.561,7.061C11.279,7.342 10.898,7.5 10.5,7.5ZM10.5,5.5C10.401,5.5 10.304,5.529 10.222,5.584C10.14,5.639 10.076,5.717 10.038,5.809C10,5.9 9.99,6.001 10.01,6.098C10.029,6.195 10.076,6.284 10.146,6.354C10.216,6.423 10.306,6.471 10.403,6.49C10.499,6.51 10.6,6.5 10.691,6.462C10.783,6.424 10.861,6.36 10.916,6.278C10.971,6.196 11,6.099 11,6C11,5.867 10.947,5.74 10.854,5.646C10.76,5.553 10.633,5.5 10.5,5.5Z"/>
+            
+        <path android:fillColor="#000000" android:pathData="M13,13.5C12.918,13.5 12.837,13.479 12.764,13.44C12.692,13.4 12.63,13.344 12.585,13.275L10.415,10.025C10.369,9.957 10.307,9.901 10.235,9.863C10.163,9.824 10.082,9.804 10,9.804C9.918,9.804 9.837,9.824 9.765,9.863C9.693,9.901 9.631,9.957 9.585,10.025L9.415,10.275C9.337,10.372 9.225,10.436 9.102,10.455C8.979,10.474 8.853,10.447 8.749,10.378C8.646,10.309 8.571,10.204 8.541,10.083C8.51,9.963 8.526,9.835 8.585,9.725L8.75,9.47C8.887,9.264 9.073,9.095 9.291,8.977C9.509,8.86 9.752,8.799 10,8.799C10.248,8.799 10.491,8.86 10.709,8.977C10.927,9.095 11.113,9.264 11.25,9.47L13.415,12.725C13.487,12.835 13.513,12.97 13.487,13.099C13.461,13.228 13.385,13.342 13.275,13.415C13.194,13.471 13.098,13.501 13,13.5Z"/>
+            
+        <path android:fillColor="#000000" android:pathData="M3,13.5C2.904,13.5 2.81,13.472 2.73,13.42C2.619,13.348 2.541,13.235 2.512,13.106C2.484,12.977 2.509,12.841 2.58,12.73L5.695,7.92C5.83,7.711 6.015,7.539 6.233,7.42C6.452,7.3 6.696,7.237 6.945,7.235C7.192,7.235 7.436,7.296 7.654,7.413C7.872,7.53 8.058,7.699 8.195,7.905L11.405,12.725C11.464,12.835 11.48,12.963 11.449,13.083C11.419,13.204 11.344,13.309 11.241,13.378C11.137,13.447 11.011,13.474 10.888,13.455C10.765,13.436 10.653,13.372 10.575,13.275L7.36,8.46C7.315,8.391 7.253,8.335 7.181,8.295C7.108,8.256 7.027,8.235 6.945,8.235C6.862,8.236 6.781,8.257 6.708,8.298C6.636,8.338 6.575,8.395 6.53,8.465L3.42,13.27C3.375,13.34 3.313,13.398 3.239,13.439C3.166,13.479 3.084,13.5 3,13.5Z"/>
+          
+    </group>
+    
+</vector>

+ 15 - 0
app/src/main/res/drawable/films.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="17dp" android:viewportHeight="14" android:viewportWidth="14" android:width="17dp">
+      
+    <path android:fillColor="#000000" android:pathData="M2.866,2.096L4.018,4.182C4.051,4.241 4.098,4.289 4.155,4.323C4.212,4.357 4.278,4.375 4.344,4.375H5.642C5.67,4.375 5.697,4.368 5.722,4.354C5.746,4.34 5.766,4.32 5.78,4.296C5.795,4.272 5.802,4.245 5.802,4.217C5.803,4.189 5.795,4.161 5.782,4.137L4.522,1.857C4.507,1.825 4.483,1.799 4.454,1.78C4.424,1.761 4.39,1.75 4.355,1.75H3.48C3.323,1.75 3.167,1.765 3.012,1.794C2.98,1.799 2.949,1.812 2.923,1.832C2.896,1.852 2.875,1.877 2.861,1.907C2.846,1.936 2.839,1.969 2.84,2.002C2.841,2.035 2.85,2.067 2.866,2.096Z"/>
+      
+    <path android:fillColor="#000000" android:pathData="M9.818,4.375H11.156C11.19,4.375 11.223,4.366 11.253,4.349C11.282,4.333 11.307,4.309 11.324,4.279C11.341,4.25 11.351,4.217 11.351,4.183C11.352,4.149 11.343,4.116 11.327,4.086L10.1,1.857C10.083,1.825 10.059,1.798 10.028,1.78C9.998,1.761 9.963,1.75 9.927,1.75H8.582C8.548,1.75 8.514,1.759 8.485,1.776C8.456,1.792 8.431,1.816 8.414,1.846C8.397,1.875 8.387,1.908 8.387,1.942C8.386,1.976 8.395,2.009 8.411,2.039L9.647,4.274C9.664,4.305 9.688,4.33 9.718,4.348C9.748,4.366 9.783,4.375 9.818,4.375Z"/>
+      
+    <path android:fillColor="#000000" android:pathData="M0.875,4.287C0.875,4.299 0.877,4.31 0.881,4.32C0.885,4.331 0.891,4.34 0.898,4.348C0.906,4.357 0.915,4.363 0.926,4.368C0.936,4.372 0.947,4.375 0.958,4.375H2.783C2.817,4.375 2.851,4.365 2.881,4.348C2.912,4.331 2.937,4.306 2.954,4.276C2.972,4.246 2.981,4.212 2.982,4.177C2.983,4.142 2.974,4.108 2.958,4.077L2.065,2.457C2.05,2.429 2.03,2.406 2.004,2.388C1.979,2.371 1.95,2.359 1.92,2.354C1.889,2.349 1.858,2.351 1.829,2.36C1.799,2.369 1.772,2.385 1.75,2.406C1.485,2.645 1.271,2.934 1.121,3.258C0.97,3.581 0.887,3.931 0.875,4.287Z"/>
+      
+    <path android:fillColor="#000000" android:pathData="M11.751,1.75H11.43C11.388,1.746 11.347,1.754 11.31,1.773C11.273,1.792 11.242,1.821 11.221,1.857C11.2,1.892 11.189,1.934 11.19,1.975C11.192,2.017 11.205,2.057 11.229,2.091L12.425,4.257C12.444,4.294 12.473,4.324 12.509,4.345C12.544,4.366 12.585,4.376 12.626,4.375H12.906C12.964,4.375 13.02,4.352 13.061,4.311C13.102,4.27 13.125,4.214 13.125,4.156V3.124C13.124,2.76 12.979,2.411 12.721,2.154C12.464,1.896 12.115,1.751 11.751,1.75Z"/>
+      
+    <path android:fillColor="#000000" android:pathData="M5.591,1.982L6.869,4.294C6.882,4.318 6.901,4.338 6.924,4.352C6.947,4.366 6.973,4.374 7,4.375H8.431C8.458,4.375 8.484,4.368 8.508,4.354C8.532,4.341 8.551,4.321 8.565,4.298C8.579,4.275 8.587,4.248 8.587,4.221C8.588,4.194 8.581,4.167 8.568,4.143L7.311,1.857V1.838C7.298,1.81 7.276,1.786 7.25,1.771C7.223,1.755 7.193,1.748 7.162,1.75H5.729C5.702,1.75 5.675,1.757 5.652,1.771C5.628,1.784 5.609,1.804 5.595,1.827C5.581,1.85 5.573,1.877 5.573,1.904C5.572,1.931 5.578,1.958 5.591,1.982Z"/>
+      
+    <path android:fillColor="#000000" android:pathData="M12.863,5.25H0.875V9.651C0.877,10.34 1.152,10.999 1.639,11.486C2.126,11.973 2.785,12.248 3.474,12.25H10.526C11.215,12.248 11.874,11.973 12.361,11.486C12.848,10.999 13.123,10.34 13.125,9.651V5.512C13.125,5.443 13.097,5.376 13.048,5.327C12.999,5.278 12.932,5.25 12.863,5.25Z"/>
+    
+</vector>

+ 5 - 0
app/src/main/res/drawable/micro.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="13.846154dp" android:viewportHeight="15" android:viewportWidth="13" android:width="12dp">
+      
+    <path android:fillColor="#000000" android:pathData="M12.612,5.075C11.518,4.872 10.483,4.334 9.658,3.477C8.833,2.619 8.317,1.542 8.122,0.404C9.23,-0.318 10.836,-0.062 11.948,1.094C13.06,2.251 13.306,3.922 12.612,5.075ZM11.848,5.871C10.797,5.565 9.812,4.998 9.003,4.158C8.195,3.316 7.65,2.292 7.358,1.199C6.665,2.352 6.911,4.022 8.022,5.179C9.134,6.335 10.739,6.591 11.848,5.871ZM7.448,10.994C6.066,10.994 5.078,11.893 4.206,12.685C3.243,13.562 2.408,14.321 1.179,13.927C0.936,13.741 0.929,13.589 0.926,13.537C0.909,13.191 1.312,12.727 1.51,12.556C1.534,12.535 1.548,12.507 1.567,12.482C1.892,12.599 2.264,12.531 2.524,12.262L8.817,6.872C8.297,6.642 7.801,6.31 7.368,5.859C6.935,5.409 6.616,4.892 6.396,4.352L1.216,10.899C0.986,11.139 0.919,11.471 0.982,11.779C0.962,11.792 0.94,11.797 0.922,11.812C0.823,11.897 -0.041,12.662 0.002,13.582C0.017,13.906 0.152,14.373 0.714,14.764L0.825,14.821C1.185,14.946 1.521,15 1.836,15C3.067,15 3.985,14.165 4.815,13.41C5.637,12.663 6.413,11.957 7.448,11.957C9.833,11.957 11.679,14.616 11.698,14.642C11.845,14.861 12.135,14.91 12.342,14.756C12.551,14.602 12.6,14.302 12.453,14.085C12.367,13.959 10.315,10.994 7.448,10.994Z"/>
+    
+</vector>

+ 21 - 0
app/src/main/res/drawable/rest.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="15dp"
+    android:viewportWidth="14"
+    android:viewportHeight="15">
+  <path
+      android:pathData="M1.067,13.253C0.864,12.766 1.084,12.195 1.719,11.557L13.002,0.225C13.432,-0.126 13.818,-0.038 13.961,0.296C14.375,1.26 11.366,6.703 10.007,8.132C8.548,9.663 7.448,10.226 6.627,9.877C6.138,9.671 5.393,10.607 4.848,11.267C4.66,11.495 4.46,11.773 4.255,12.06C3.604,12.967 2.989,13.823 2.292,13.921C2.274,13.924 2.195,13.929 2.177,13.929C1.844,13.928 1.273,13.749 1.067,13.253ZM6.937,9.147C6.996,9.172 7.057,9.184 7.129,9.184C7.421,9.184 8.109,8.976 9.433,7.585C10.715,6.237 12.44,2.897 13.021,1.328L2.282,12.115C1.85,12.549 1.752,12.835 1.799,12.949C1.844,13.057 2.056,13.135 2.178,13.135L2.183,13.136C2.544,13.085 3.187,12.189 3.612,11.598C3.828,11.296 4.039,11.002 4.237,10.763C4.898,9.963 5.646,9.055 6.488,9.055C6.642,9.054 6.793,9.085 6.937,9.147Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M4.694,4.929C4.851,4.795 4.87,4.558 4.736,4.402L1.923,1.104C1.79,0.948 1.553,0.929 1.397,1.063C1.24,1.196 1.222,1.433 1.354,1.589L4.168,4.887C4.301,5.043 4.538,5.062 4.694,4.929Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M2.878,0.838L5.052,3.197C5.451,3.631 5.537,4.28 5.267,4.814C5.188,4.97 5.216,5.159 5.337,5.284L5.986,5.965C6.368,6.36 6.941,5.793 6.572,5.391L6.115,4.91C6.388,4.133 6.217,3.253 5.655,2.643L3.481,0.282C2.992,-0.196 2.394,0.37 2.876,0.836L2.878,0.838Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M12.656,11.693L10.191,9.125C9.812,8.792 9.266,9.341 9.632,9.726L12.069,12.265C12.516,12.719 12.616,13.017 12.567,13.133C12.521,13.245 12.301,13.325 12.175,13.325V13.735L12.166,13.325C11.79,13.189 10.509,11.81 9.098,10.211C8.754,9.767 8.092,10.269 8.414,10.681C9.873,12.343 11.46,14.05 12.05,14.136C12.069,14.139 12.155,14.144 12.175,14.144C12.519,14.144 13.11,13.96 13.323,13.45C13.533,12.949 13.309,12.358 12.656,11.693Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5.675,6.269C5.426,5.987 5.311,5.839 5.051,5.557C4.933,5.428 4.745,5.389 4.583,5.461C4.032,5.706 3.355,5.572 2.951,5.134L0.777,2.774L0.77,2.769C0.334,2.28 -0.307,2.782 0.167,3.322L2.347,5.689C2.767,6.145 3.366,6.407 3.991,6.407C4.211,6.407 4.425,6.376 4.633,6.315C4.837,6.539 4.892,6.621 5.089,6.843C5.436,7.191 5.98,6.647 5.675,6.269Z"
+      android:fillColor="#000000"/>
+</vector>

+ 3 - 0
bench.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="5" viewBox="0 0 14 5" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 0C0 0 0 1.5 1 1.5H13C14 1.5 14 0 13 0H1ZM2 2V5H3.5V2H2ZM10.5 2V5H12V2H10.5Z" fill="black"/>
+</svg>

+ 13 - 0
cartina.svg

@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_738_67)">
+<path d="M13 13.5H3C2.60218 13.5 2.22064 13.342 1.93934 13.0607C1.65804 12.7794 1.5 12.3978 1.5 12V4C1.5 3.60218 1.65804 3.22064 1.93934 2.93934C2.22064 2.65804 2.60218 2.5 3 2.5H13C13.3978 2.5 13.7794 2.65804 14.0607 2.93934C14.342 3.22064 14.5 3.60218 14.5 4V12C14.5 12.3978 14.342 12.7794 14.0607 13.0607C13.7794 13.342 13.3978 13.5 13 13.5ZM3 3.5C2.86739 3.5 2.74021 3.55268 2.64645 3.64645C2.55268 3.74021 2.5 3.86739 2.5 4V12C2.5 12.1326 2.55268 12.2598 2.64645 12.3536C2.74021 12.4473 2.86739 12.5 3 12.5H13C13.1326 12.5 13.2598 12.4473 13.3536 12.3536C13.4473 12.2598 13.5 12.1326 13.5 12V4C13.5 3.86739 13.4473 3.74021 13.3536 3.64645C13.2598 3.55268 13.1326 3.5 13 3.5H3Z" fill="black"/>
+<path d="M10.5 7.5C10.2033 7.5 9.91332 7.41203 9.66665 7.24721C9.41997 7.08238 9.22771 6.84811 9.11418 6.57403C9.00065 6.29994 8.97094 5.99834 9.02882 5.70737C9.0867 5.41639 9.22956 5.14912 9.43934 4.93934C9.64912 4.72956 9.91639 4.5867 10.2074 4.52882C10.4983 4.47094 10.7999 4.50065 11.074 4.61418C11.3481 4.72771 11.5824 4.91997 11.7472 5.16665C11.912 5.41332 12 5.70333 12 6C12 6.39783 11.842 6.77936 11.5607 7.06066C11.2794 7.34197 10.8978 7.5 10.5 7.5ZM10.5 5.5C10.4011 5.5 10.3044 5.52933 10.2222 5.58427C10.14 5.63921 10.0759 5.7173 10.0381 5.80866C10.0002 5.90002 9.99032 6.00056 10.0096 6.09755C10.0289 6.19454 10.0765 6.28363 10.1464 6.35355C10.2164 6.42348 10.3055 6.4711 10.4025 6.49039C10.4994 6.50969 10.6 6.49978 10.6913 6.46194C10.7827 6.4241 10.8608 6.36001 10.9157 6.27779C10.9707 6.19556 11 6.09889 11 6C11 5.86739 10.9473 5.74022 10.8536 5.64645C10.7598 5.55268 10.6326 5.5 10.5 5.5Z" fill="black"/>
+<path d="M13 13.5C12.9177 13.4996 12.8367 13.4788 12.7643 13.4396C12.6919 13.4003 12.6303 13.3438 12.585 13.275L10.415 10.025C10.3693 9.95695 10.3075 9.90118 10.2351 9.86262C10.1628 9.82406 10.082 9.80389 10 9.80389C9.91802 9.80389 9.83728 9.82406 9.76491 9.86262C9.69254 9.90118 9.63076 9.95695 9.58502 10.025L9.41502 10.275C9.33687 10.372 9.22532 10.4364 9.10221 10.4555C8.97909 10.4745 8.8533 10.447 8.74945 10.3782C8.6456 10.3093 8.57118 10.2042 8.54076 10.0834C8.51035 9.96261 8.52613 9.83479 8.58502 9.72501L8.75002 9.47001C8.88685 9.26373 9.0726 9.09453 9.2907 8.97747C9.50881 8.86042 9.75249 8.79916 10 8.79916C10.2476 8.79916 10.4912 8.86042 10.7093 8.97747C10.9274 9.09453 11.1132 9.26373 11.25 9.47001L13.415 12.725C13.4874 12.8352 13.5133 12.9696 13.4871 13.0988C13.4608 13.2281 13.3846 13.3417 13.275 13.415C13.1945 13.4714 13.0983 13.5011 13 13.5Z" fill="black"/>
+<path d="M3.00001 13.5C2.90421 13.4997 2.81049 13.472 2.73001 13.42C2.61877 13.3483 2.54051 13.2353 2.51239 13.106C2.48427 12.9766 2.50859 12.8414 2.58001 12.73L5.69501 7.91999C5.8302 7.71109 6.01524 7.5391 6.23345 7.41952C6.45166 7.29994 6.69619 7.23653 6.94501 7.23499C7.19246 7.23489 7.4361 7.29602 7.6542 7.41292C7.8723 7.52982 8.05809 7.69887 8.19501 7.90499L11.405 12.725C11.4639 12.8348 11.4797 12.9626 11.4493 13.0834C11.4189 13.2042 11.3444 13.3093 11.2406 13.3781C11.1367 13.4469 11.0109 13.4745 10.8878 13.4554C10.7647 13.4364 10.6532 13.372 10.575 13.275L7.36001 8.45999C7.31472 8.3912 7.25314 8.33468 7.18074 8.29543C7.10834 8.25617 7.02736 8.23541 6.94501 8.23498C6.8622 8.23595 6.78093 8.25748 6.70849 8.29762C6.63606 8.33777 6.57473 8.39528 6.53001 8.46499L3.42001 13.27C3.37484 13.3404 3.31271 13.3984 3.23934 13.4385C3.16596 13.4787 3.08367 13.4998 3.00001 13.5Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_738_67">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

+ 8 - 0
films.svg

@@ -0,0 +1,8 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.86562 2.09562L4.01844 4.1825C4.05055 4.24083 4.09774 4.28946 4.15508 4.32332C4.21241 4.35719 4.27779 4.37503 4.34437 4.375H5.64156C5.66958 4.37519 5.69715 4.36801 5.72151 4.35417C5.74587 4.34033 5.76616 4.32033 5.78035 4.29617C5.79453 4.27201 5.80211 4.24454 5.80233 4.21653C5.80254 4.18851 5.79538 4.16093 5.78156 4.13656L4.52156 1.85719C4.50674 1.82549 4.48328 1.79861 4.45387 1.77965C4.42446 1.76069 4.3903 1.75041 4.35531 1.75H3.48031C3.32326 1.75025 3.16656 1.7649 3.01219 1.79375C2.97976 1.79913 2.9491 1.8122 2.92277 1.83187C2.89644 1.85154 2.87521 1.87723 2.86086 1.9068C2.8465 1.93636 2.83945 1.96894 2.84028 2.00179C2.8411 2.03464 2.8498 2.06682 2.86562 2.09562Z" fill="black"/>
+<path d="M9.81751 4.375H11.1563C11.1901 4.37503 11.2234 4.36622 11.2528 4.34945C11.2823 4.33267 11.3068 4.30852 11.324 4.27936C11.3413 4.2502 11.3506 4.21705 11.3511 4.18318C11.3516 4.14931 11.3433 4.1159 11.3269 4.08625L10.0997 1.85719C10.0834 1.82529 10.0587 1.79844 10.0282 1.77955C9.99775 1.76067 9.96272 1.75045 9.92689 1.75H8.58157C8.54771 1.74997 8.51441 1.75878 8.48499 1.77555C8.45557 1.79233 8.43103 1.81648 8.41379 1.84564C8.39656 1.8748 8.38724 1.90795 8.38674 1.94182C8.38624 1.97569 8.39459 2.0091 8.41095 2.03875L9.64689 4.27438C9.66372 4.30488 9.68843 4.33031 9.71845 4.34801C9.74846 4.36571 9.78267 4.37503 9.81751 4.375Z" fill="black"/>
+<path d="M0.875029 4.2875C0.874738 4.2987 0.876657 4.30986 0.880678 4.32032C0.884699 4.33078 0.890741 4.34035 0.898461 4.34847C0.906181 4.3566 0.915426 4.36312 0.925668 4.36768C0.93591 4.37223 0.946949 4.37472 0.958154 4.375H2.78253C2.81728 4.3747 2.85137 4.3654 2.88146 4.34802C2.91156 4.33063 2.93663 4.30575 2.95426 4.27579C2.97188 4.24584 2.98144 4.21183 2.98201 4.17708C2.98259 4.14233 2.97415 4.10802 2.95753 4.0775L2.06503 2.45656C2.05032 2.42947 2.02959 2.40613 2.00443 2.38832C1.97926 2.37052 1.95035 2.35873 1.91991 2.35387C1.88948 2.34901 1.85833 2.3512 1.82887 2.36028C1.79942 2.36937 1.77244 2.38509 1.75003 2.40625C1.4851 2.64481 1.27104 2.93439 1.12069 3.25765C0.970338 3.5809 0.886783 3.93118 0.875029 4.2875Z" fill="black"/>
+<path d="M11.7513 1.75H11.4297C11.3884 1.74607 11.3467 1.75402 11.3097 1.7729C11.2726 1.79179 11.2418 1.82084 11.2206 1.85665C11.1995 1.89246 11.189 1.93355 11.1904 1.9751C11.1918 2.01665 11.205 2.05694 11.2285 2.09125L12.4251 4.25688C12.444 4.29356 12.473 4.32411 12.5086 4.34502C12.5442 4.36592 12.585 4.37632 12.6263 4.375H12.9063C12.9643 4.375 13.02 4.35196 13.061 4.31093C13.102 4.26991 13.1251 4.21427 13.1251 4.15625V3.12375C13.1239 2.75977 12.9788 2.41102 12.7214 2.15364C12.464 1.89626 12.1153 1.75116 11.7513 1.75Z" fill="black"/>
+<path d="M5.5913 1.98188L6.8688 4.29407C6.8819 4.31768 6.90086 4.33753 6.92384 4.3517C6.94683 4.36587 6.97307 4.3739 7.00005 4.37501H8.43068C8.45781 4.37483 8.48444 4.36765 8.50798 4.35415C8.53153 4.34066 8.55118 4.32131 8.56505 4.29798C8.57891 4.27465 8.58652 4.24814 8.58712 4.22101C8.58772 4.19388 8.5813 4.16705 8.56849 4.14313L7.31068 1.85719V1.83751C7.29755 1.80966 7.27634 1.78641 7.2498 1.77081C7.22327 1.7552 7.19264 1.74795 7.16193 1.75001H5.72911C5.70198 1.75018 5.67535 1.75737 5.6518 1.77086C5.62826 1.78436 5.6086 1.80371 5.59474 1.82703C5.58088 1.85036 5.57327 1.87688 5.57267 1.90401C5.57207 1.93114 5.57849 1.95796 5.5913 1.98188Z" fill="black"/>
+<path d="M12.8625 5.25H0.875V9.65125C0.877307 10.3398 1.15184 10.9994 1.6387 11.4863C2.12557 11.9732 2.78523 12.2477 3.47375 12.25H10.5262C11.2148 12.2477 11.8744 11.9732 12.3613 11.4863C12.8482 10.9994 13.1227 10.3398 13.125 9.65125V5.5125C13.125 5.44288 13.0973 5.37611 13.0481 5.32688C12.9989 5.27766 12.9321 5.25 12.8625 5.25Z" fill="black"/>
+</svg>

+ 2 - 0
gradle/libs.versions.toml

@@ -19,6 +19,7 @@ volley = "1.2.1"
 navigationCompose = "2.8.1"
 runtimeLivedata = "1.7.2"
 toolsCore = "1.0.0-alpha10"
+runtimeSavedInstanceState = "1.0.0-alpha11"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -51,6 +52,7 @@ volley = { group = "com.android.volley", name = "volley", version.ref = "volley"
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
 androidx-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "runtimeLivedata" }
 androidx-tools-core = { group = "androidx.privacysandbox.tools", name = "tools-core", version.ref = "toolsCore" }
+androidx-runtime-saved-instance-state = { group = "androidx.compose.runtime", name = "runtime-saved-instance-state", version.ref = "runtimeSavedInstanceState" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

+ 3 - 0
micro.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="15" viewBox="0 0 13 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.6124 5.07523C11.5182 4.87226 10.4825 4.33403 9.65751 3.47708C8.8334 2.61928 8.31663 1.54235 8.12222 0.403832C9.23004 -0.318197 10.836 -0.0624633 11.9483 1.09437C13.0599 2.25121 13.3056 3.92224 12.6124 5.07523ZM11.8479 5.87069C10.7971 5.56514 9.81203 4.99828 9.00327 4.15775C8.1954 3.31636 7.6504 2.29158 7.35817 1.19881C6.66509 2.3518 6.91087 4.02198 8.02196 5.17875C9.13432 6.33508 10.7392 6.59122 11.8479 5.87069ZM7.44806 10.9944C6.06599 10.9944 5.07781 11.8929 4.20586 12.6854C3.24253 13.5616 2.40753 14.3213 1.17903 13.9274C0.935957 13.7412 0.928756 13.589 0.92604 13.5373C0.908831 13.1913 1.31185 12.7269 1.50979 12.5558C1.5342 12.5351 1.54809 12.5069 1.56719 12.4816C1.89158 12.5991 2.26427 12.5312 2.52415 12.2616L8.81717 6.87229C8.29667 6.64243 7.80067 6.30968 7.36833 5.85929C6.93529 5.40896 6.61639 4.89238 6.39581 4.3519L1.21607 10.8994C0.985633 11.1391 0.918778 11.4709 0.981575 11.7792C0.962138 11.7915 0.940412 11.7971 0.922348 11.8122C0.823363 11.8968 -0.0413865 12.662 0.00154588 13.5824C0.0169246 13.9059 0.152496 14.373 0.714094 14.7642L0.824827 14.8205C1.18498 14.9455 1.52062 15 1.83607 15C3.06683 15 3.98495 14.1653 4.81497 13.4103C5.63682 12.6629 6.41345 11.9569 7.44809 11.9569C9.83299 11.9569 11.679 14.6156 11.698 14.6418C11.8452 14.8609 12.1355 14.9097 12.3424 14.7557C12.5512 14.6024 12.5999 14.3024 12.4526 14.0855C12.3667 13.9594 10.3146 10.9944 7.44806 10.9944Z" fill="black"/>
+</svg>

+ 7 - 0
rest.svg

@@ -0,0 +1,7 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.0666 13.2535C0.863979 12.7664 1.08405 12.1954 1.71941 11.5574L13.0025 0.225244C13.4319 -0.126313 13.8184 -0.0384426 13.9613 0.296346C14.3746 1.26049 11.3655 6.70312 10.0068 8.13155C8.54819 9.66329 7.44786 10.2262 6.62665 9.87667C6.13821 9.6707 5.39281 10.6067 4.84799 11.2675C4.66012 11.495 4.46019 11.7734 4.25487 12.0599C3.60408 12.967 2.98883 13.8232 2.29237 13.9211C2.27427 13.9238 2.19507 13.9285 2.17697 13.9285C1.84355 13.9278 1.27257 13.7486 1.0666 13.2535ZM6.93661 9.14668C6.99566 9.17219 7.05737 9.1836 7.12915 9.1836C7.42101 9.1836 8.10873 8.97626 9.43313 7.58475C10.7153 6.23749 12.4403 2.8969 13.0206 1.3276L2.28165 12.1149C1.84956 12.549 1.75162 12.8355 1.79857 12.9489C1.84352 13.0569 2.05622 13.1354 2.17766 13.1354L2.18302 13.1361C2.54397 13.0851 3.18674 12.1894 3.6121 11.5977C3.82814 11.2957 4.03947 11.0025 4.23742 10.763C4.89761 9.9626 5.6457 9.05481 6.48775 9.05481C6.64208 9.05409 6.79303 9.08497 6.93661 9.14668Z" fill="black"/>
+<path d="M4.6944 4.92853C4.85071 4.795 4.86953 4.55819 4.736 4.40184L1.92346 1.10418C1.78997 0.947869 1.55312 0.929048 1.39678 1.06258C1.24046 1.19608 1.22164 1.43292 1.35449 1.58927L4.16775 4.88693C4.30125 5.04325 4.53809 5.06203 4.6944 4.92853Z" fill="black"/>
+<path d="M2.87821 0.838476L5.05204 3.19748C5.45124 3.63089 5.53713 4.28036 5.26675 4.81442C5.18759 4.97009 5.21576 5.15861 5.33721 5.28408L5.98598 5.96506C6.36842 6.35959 6.94073 5.79263 6.57172 5.39142L6.11549 4.91036C6.38788 4.13276 6.21747 3.25314 5.65523 2.64257L3.48071 0.281597C2.99228 -0.196119 2.39448 0.369506 2.87619 0.836461L2.87821 0.838476Z" fill="black"/>
+<path d="M12.6564 11.6935L10.1907 9.12519C9.8123 8.79173 9.26614 9.34055 9.6318 9.72636L12.0693 12.2652C12.5162 12.7194 12.6161 13.0166 12.5671 13.1334C12.5208 13.2447 12.3008 13.3246 12.1746 13.3246V13.7346L12.1659 13.3246C11.7895 13.1891 10.5087 11.8103 9.09842 10.2108C8.75424 9.76728 8.092 10.2691 8.41405 10.6811C9.87268 12.343 11.4601 14.0499 12.0499 14.1358C12.0693 14.1385 12.1552 14.1445 12.1746 14.1445C12.5195 14.1445 13.1099 13.96 13.3233 13.4501C13.5333 12.9489 13.3092 12.3578 12.6564 11.6935Z" fill="black"/>
+<path d="M5.67529 6.26903C5.42636 5.98725 5.31096 5.83896 5.05065 5.55717C4.93256 5.42767 4.74473 5.38877 4.58302 5.46056C4.03218 5.70611 3.35454 5.57193 2.95063 5.13383L0.776801 2.77411L0.770109 2.76875C0.333989 2.28031 -0.306768 2.78217 0.166918 3.32228L2.34748 5.68934C2.76747 6.14489 3.36595 6.40656 3.99127 6.40656C4.21066 6.40656 4.42537 6.37569 4.63267 6.31466C4.83731 6.53877 4.89233 6.62059 5.08891 6.84336C5.43579 7.19089 5.97993 6.64675 5.67529 6.26903Z" fill="black"/>
+</svg>