From 4df3eff3b1696b8ba5364f6c4e9d87a75139caa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Sun, 19 Nov 2023 23:09:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=92=D0=90=D0=97=D0=A5=D0=A9=D0=9F?= =?UTF-8?q?=D0=A5=D0=97=D0=92=D0=90=D0=A9=D0=97=D0=9F=D0=A5=D0=92=D0=90?= =?UTF-8?q?=D0=A5=D0=97=D0=9F=D0=A9=D0=92,=20=D0=AD=D0=A2=D0=9E=20=D0=A1?= =?UTF-8?q?=D0=90=D0=9C=D0=AB=D0=99=20=D0=96=D0=9E=D0=A1=D0=9A=D0=98=D0=99?= =?UTF-8?q?=20=D0=9A=D0=9E=D0=A1=D0=A2=D0=AB=D0=9B=D0=AC,=20=D0=9D=D0=9E?= =?UTF-8?q?=20=D0=9E=D0=9D=D0=9E=20=D0=A0=D0=90=D0=91=D0=9E=D0=A2=D0=90?= =?UTF-8?q?=D0=95=D0=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/labwork/button_navigation/Screens.kt | 5 +++-- .../com/example/labwork/button_navigation/SlideGraph.kt | 2 +- app/src/main/java/com/example/labwork/pages/ListProduct.kt | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/labwork/button_navigation/Screens.kt b/app/src/main/java/com/example/labwork/button_navigation/Screens.kt index 163f4ff..afd347a 100644 --- a/app/src/main/java/com/example/labwork/button_navigation/Screens.kt +++ b/app/src/main/java/com/example/labwork/button_navigation/Screens.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import androidx.navigation.NavHostController import com.example.labwork.database.DAO.BicycleDao import com.example.labwork.models.Bicycle import com.example.labwork.pages.ListInfo @@ -31,7 +32,7 @@ fun ScreenProfile() { @Composable -fun ScreenListProduct(bicycleDao: BicycleDao) { +fun ScreenListProduct(bicycleDao: BicycleDao, navHostController: NavHostController) { val bicycles = remember { mutableStateListOf() } LaunchedEffect(Unit) { @@ -45,7 +46,7 @@ fun ScreenListProduct(bicycleDao: BicycleDao) { modifier = Modifier.fillMaxHeight().padding(bottom = 65.dp) ) { items(bicycles) { item -> - ListProduct(item = item, bicycleDao = bicycleDao) + ListProduct(item = item, bicycleDao = bicycleDao, navHostController = navHostController) } } } diff --git a/app/src/main/java/com/example/labwork/button_navigation/SlideGraph.kt b/app/src/main/java/com/example/labwork/button_navigation/SlideGraph.kt index b9031ea..7e510df 100644 --- a/app/src/main/java/com/example/labwork/button_navigation/SlideGraph.kt +++ b/app/src/main/java/com/example/labwork/button_navigation/SlideGraph.kt @@ -24,7 +24,7 @@ fun SlideGraph( ScreenInfo() } composable("ListProduct"){ - ScreenListProduct(bicycleDao) + ScreenListProduct(bicycleDao, navHostController = navHostController) } } diff --git a/app/src/main/java/com/example/labwork/pages/ListProduct.kt b/app/src/main/java/com/example/labwork/pages/ListProduct.kt index 7f1eb1e..eaba399 100644 --- a/app/src/main/java/com/example/labwork/pages/ListProduct.kt +++ b/app/src/main/java/com/example/labwork/pages/ListProduct.kt @@ -35,6 +35,7 @@ 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.NavHostController import com.example.labwork.R import com.example.labwork.database.DAO.BicycleDao import com.example.labwork.database.DAO.UserDao @@ -45,7 +46,7 @@ import kotlinx.coroutines.launch @Composable -fun ListProduct(item: Bicycle, bicycleDao: BicycleDao) { +fun ListProduct(item: Bicycle, bicycleDao: BicycleDao, navHostController: NavHostController) { var isFullAbout by remember { mutableStateOf(false) } val scale by animateFloatAsState(if (isFullAbout) 1f else 0f) val textSize by animateDpAsState(if (isFullAbout) 18.dp else 24.dp) @@ -116,10 +117,11 @@ fun ListProduct(item: Bicycle, bicycleDao: BicycleDao) { .padding(start = 9.dp, bottom = 9.dp) .size(height = 32.dp, width = 40.dp), onClick = { - // Удаление выбранного велосипеда по нажатию на кнопку + // СУПЕР ЖОСКИЙ КОСТЫЛЬ ЭТО ВООБЩЕ ТРЕШ GlobalScope.launch { bicycleDao.deleteBicycle(item) } + navHostController.navigate("ListProduct") }, shape = RoundedCornerShape(15.dp) ) {