[NDGL-86] design: NDGLBottomSheet 자연스럽게 내려가도록 변경

mj010504 · mj010504 · commit 4c05dd949554 · 2026-02-16T17:13:25.000+09:00
diff --git a/core/ui/src/main/java/com/yapp/ndgl/core/ui/designsystem/NDGLBottomSheet.kt b/core/ui/src/main/java/com/yapp/ndgl/core/ui/designsystem/NDGLBottomSheet.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package com.yapp.ndgl.core.ui.designsystem
 
 import androidx.compose.foundation.clickable
@@ -14,9 +16,11 @@ import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -25,17 +29,24 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yapp.ndgl.core.ui.R
 import com.yapp.ndgl.core.ui.theme.NDGLTheme
+import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun NDGLBottomSheet(
     modifier: Modifier = Modifier,
     onDismissRequest: () -> Unit,
+    sheetState: SheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
     showDragHandle: Boolean = true,
     title: String? = null,
     content: @Composable ColumnScope.() -> Unit,
 ) {
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val coroutineScope = rememberCoroutineScope()
+    val hideSheet: () -> Unit = {
+        coroutineScope.launch {
+            sheetState.hide()
+            onDismissRequest()
+        }
+    }
 
     ModalBottomSheet(
         modifier = modifier,
@@ -55,7 +66,11 @@ fun NDGLBottomSheet(
                     .fillMaxWidth()
                     .padding(vertical = 18.dp, horizontal = 24.dp),
             ) {
-                Text(title, color = NDGLTheme.colors.black400, style = NDGLTheme.typography.bodyLgMedium)
+                Text(
+                    title,
+                    color = NDGLTheme.colors.black400,
+                    style = NDGLTheme.typography.bodyLgMedium,
+                )
                 Spacer(Modifier.weight(1f))
                 Icon(
                     imageVector = ImageVector.vectorResource(R.drawable.ic_24_close),
@@ -64,9 +79,7 @@ fun NDGLBottomSheet(
                     modifier = Modifier
                         .size(24.dp)
                         .clip(shape = CircleShape)
-                        .clickable {
-                            onDismissRequest()
-                        },
+                        .clickable { hideSheet() },
                 )
             }
         }
@@ -99,6 +112,7 @@ private fun NDGLBottomSheetWithHandlePreview() {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Preview(showBackground = true)
 @Composable
 private fun NDGLBottomSheetWithoutHandlePreview() {
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailScreen.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailScreen.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package com.yapp.ndgl.feature.travel.traveldetail
 
 import androidx.activity.compose.BackHandler
@@ -21,6 +23,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailViewModel.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailViewModel.kt
@@ -411,7 +411,7 @@ class TravelDetailViewModel @AssistedInject constructor(
                     dayItinerary
                 }
             }
-            copy(itineraries = updatedItineraries)
+            copy(itineraries = updatedItineraries, selectedPlace = null, showTransportBottomSheet = false)
         }
     }
 
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/component/PlaceBottomSheet.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/component/PlaceBottomSheet.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package com.yapp.ndgl.feature.travel.traveldetail.component
 
 import androidx.compose.foundation.background
@@ -16,6 +18,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/component/TransportBottomSheet.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/component/TransportBottomSheet.kt
@@ -14,12 +14,15 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 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
@@ -43,8 +46,10 @@ import com.yapp.ndgl.core.util.formatDistance
 import com.yapp.ndgl.core.util.formatString
 import com.yapp.ndgl.feature.travel.traveldetail.TransportSegment
 import com.yapp.ndgl.feature.travel.traveldetail.TransportType
+import kotlinx.coroutines.launch
 import kotlin.time.Duration.Companion.minutes
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun TransportBottomSheet(
     initialTransport: TransportSegment,
@@ -53,6 +58,8 @@ internal fun TransportBottomSheet(
     onConfirm: (TransportSegment) -> Unit,
 ) {
     var selectedTransport by remember { mutableStateOf(initialTransport) }
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val coroutineScope = rememberCoroutineScope()
     val itemHeight = 56.dp
     val nestedScrollConnection = remember {
         object : NestedScrollConnection {
@@ -68,6 +75,7 @@ internal fun TransportBottomSheet(
 
     NDGLBottomSheet(
         onDismissRequest = onDismissRequest,
+        sheetState = sheetState,
         showDragHandle = false,
         title = stringResource(R.string.transport_bottom_sheet_title),
     ) {
@@ -138,8 +146,10 @@ internal fun TransportBottomSheet(
                 status = NDGLCTAButtonAttr.Status.ACTIVE,
                 label = stringResource(R.string.transport_bottom_sheet_button),
                 onClick = {
-                    onConfirm(selectedTransport)
-                    onDismissRequest()
+                    coroutineScope.launch {
+                        onConfirm(selectedTransport)
+                        sheetState.hide()
+                    }
                 },
             )
         }

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ class TravelDetailViewModel @AssistedInject constructor(`
`411`	`411`	`dayItinerary`
`412`	`412`	`}`
`413`	`413`	`}`
`414`		`- copy(itineraries = updatedItineraries)`
	`414`	`+ copy(itineraries = updatedItineraries, selectedPlace = null, showTransportBottomSheet = false)`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`