Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package com.yapp.ndgl.core.ui.designsystem

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.SnackbarData
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarVisuals
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.yapp.ndgl.core.ui.theme.NDGLTheme
import com.yapp.ndgl.core.ui.util.dropShadow

@Composable
fun NDGLSnackbar(
modifier: Modifier = Modifier,
snackbarData: SnackbarData,
) {
val message = snackbarData.visuals.message

Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 24.dp)
.dropShadow(shape = RoundedCornerShape(8.dp), color = Color.Black.copy(alpha = 0.12f), offsetY = 3.dp, blur = 8.dp)
.clip(RoundedCornerShape(8.dp))
.background(NDGLTheme.colors.black500)
.padding(vertical = 14.dp, horizontal = 20.dp),
) {
Text(
text = message,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
style = NDGLTheme.typography.bodyMdSemiBold,
color = NDGLTheme.colors.white,
)
}
}

@Preview(showBackground = true)
@Composable
private fun NDGLSnackbarPreview() {
NDGLTheme {
NDGLSnackbar(
snackbarData = object : SnackbarData {
override val visuals: SnackbarVisuals = object : SnackbarVisuals {
override val actionLabel = null
override val duration = SnackbarDuration.Short
override val message = "교통수단이 변경되었습니다"
override val withDismissAction = false
}

override fun dismiss() { /* No-op */ }
override fun performAction() { /* No-op */ }
},
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@ data class AddPlaceEvent(
val address: String?,
val phoneNumber: String?,
val googleMapsUri: String?,
val websiteUrl: String?,
val rating: Double?,
val userRatingCount: Int?,
val estimatedDuration: Int, // 분 단위
)
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,6 @@ class AddItineraryViewModel @AssistedInject constructor(
address = placeInfo.address,
phoneNumber = placeInfo.phoneNumber,
googleMapsUri = placeInfo.googleMapsUri,
websiteUrl = placeInfo.websiteUrl,
rating = placeInfo.rating,
userRatingCount = placeInfo.userRatingCount,
estimatedDuration = placeInfo.estimatedDuration.inWholeMinutes.toInt(),
),
)
postSideEffect(AddItinerarySideEffect.NavigateBack)
Expand Down Expand Up @@ -327,10 +323,6 @@ class AddItineraryViewModel @AssistedInject constructor(
phoneNumber = placeDetail.place.nationalPhoneNumber
?: placeDetail.place.internationalPhoneNumber,
googleMapsUri = placeDetail.place.googleMapsUri,
websiteUrl = placeDetail.place.websiteUri,
rating = placeDetail.place.rating,
userRatingCount = placeDetail.place.userRatingCount,
estimatedDuration = 60, // 기본값 60분
),
)
postSideEffect(AddItinerarySideEffect.NavigateBack)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ data class TravelDetailState(
?.let { LatLng(it.placeInfo.latitude, it.placeInfo.longitude) } ?: LatLng(37.5665, 126.9780) // FIXME: 모든 일차가 비어 있다면 '서울' 좌표 반환
}

// 헤더(0) + stickyHeader(1) + 맵 아이템(2) = 3개가 장소 아이템 앞에 위치
val placesOffset: Int
get() = 3
companion object {
// 헤더(0) + stickyHeader(1) + 맵 아이템(2) = 3개가 장소 아이템 앞에 위치
const val PLACES_OFFSET = 3
}
}

data class Itinerary(
Expand Down Expand Up @@ -158,4 +159,12 @@ sealed interface TravelDetailSideEffect : UiSideEffect {
data object NavigateToMyTravel : TravelDetailSideEffect
data class ScrollToPlace(val placeId: Long) : TravelDetailSideEffect
data class AnimatePlaceChange(val googlePlaceId: String) : TravelDetailSideEffect
data class ShowSnackbar(val message: String) : TravelDetailSideEffect

companion object {
const val SNACKBAR_ADDED_TO_MY_TRAVEL = "내 여행에 추가되었습니다"
const val SNACKBAR_PLACE_CHANGED = "장소가 변경되었습니다"
const val SNACKBAR_TRANSPORT_CHANGED = "교통수단이 변경되었습니다"
const val SNACKBAR_PLACE_DELETED = "장소가 삭제되었습니다"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.itemsIndexed
Expand All @@ -26,6 +25,9 @@ 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.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
Expand Down Expand Up @@ -62,6 +64,7 @@ import com.yapp.ndgl.core.ui.designsystem.NDGLModal
import com.yapp.ndgl.core.ui.designsystem.NDGLNavigationBar
import com.yapp.ndgl.core.ui.designsystem.NDGLNavigationBarAttr
import com.yapp.ndgl.core.ui.designsystem.NDGLNavigationIcon
import com.yapp.ndgl.core.ui.designsystem.NDGLSnackbar
import com.yapp.ndgl.core.ui.theme.NDGLTheme
import com.yapp.ndgl.core.ui.util.dropShadow
import com.yapp.ndgl.core.ui.util.launchBrowser
Expand Down Expand Up @@ -106,6 +109,7 @@ internal fun TravelDetailRoute(
val context = LocalContext.current
val listState = rememberLazyListState()
val coroutineScope = rememberCoroutineScope()
val snackbarHostState = remember { SnackbarHostState() }

viewModel.collectSideEffect { sideEffect ->
when (sideEffect) {
Expand Down Expand Up @@ -144,7 +148,7 @@ internal fun TravelDetailRoute(
val placeIndex = places.indexOfFirst { it.id == sideEffect.placeId }

if (placeIndex >= 0) {
val targetIndex = state.placesOffset + placeIndex
val targetIndex = TravelDetailState.PLACES_OFFSET + placeIndex
delay(100)
listState.animateScrollToItem(targetIndex)
}
Expand All @@ -158,60 +162,77 @@ internal fun TravelDetailRoute(
val placeIndex = places.indexOfFirst { it.placeInfo.googlePlaceId == sideEffect.googlePlaceId }

if (placeIndex >= 0) {
val targetIndex = state.placesOffset + placeIndex
val targetIndex = TravelDetailState.PLACES_OFFSET + placeIndex
delay(100)
listState.animateScrollToItem(targetIndex)
}
}
}

is TravelDetailSideEffect.ShowSnackbar -> {
coroutineScope.launch {
snackbarHostState.showSnackbar(sideEffect.message)
}
}
}
}

TravelDetailScreen(
state = state,
listState = listState,
clickBack = { viewModel.onIntent(TravelDetailIntent.ClickBack) },
selectDay = { viewModel.onIntent(TravelDetailIntent.SelectDay(it)) },
clickStartTimeSetting = { viewModel.onIntent(TravelDetailIntent.ClickStartTimeSetting) },
clickEditTravel = { viewModel.onIntent(TravelDetailIntent.ClickEditTravel) },
clickAddScheduleButton = { viewModel.onIntent(TravelDetailIntent.ClickAddScheduleButton) },
checkPlaceItem = { placeId ->
viewModel.onIntent(TravelDetailIntent.CheckPlaceItem(placeId))
},
checkSelectAll = { viewModel.onIntent(TravelDetailIntent.CheckSelectAll) },
clickDeleteSelectedPlaces = { viewModel.onIntent(TravelDetailIntent.ClickDeleteSelectedPlaces) },
confirmDeleteSelectedPlaces = { viewModel.onIntent(TravelDetailIntent.ConfirmDeleteSelectedPlaces) },
dismissDeleteModal = { viewModel.onIntent(TravelDetailIntent.DismissDeleteModal) },
confirmCancelEditMode = { viewModel.onIntent(TravelDetailIntent.ConfirmCancelEditMode) },
dismissCancelEditModal = { viewModel.onIntent(TravelDetailIntent.DismissCancelEditModal) },
longClickPlaceItem = { viewModel.onIntent(TravelDetailIntent.LongClickPlaceItem) },
dismissStartTimeSettingBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissStartTimeSettingBottomSheet) },
confirmStartTimeSetting = { startTime -> viewModel.onIntent(TravelDetailIntent.ConfirmStartTimeSetting(startTime)) },
reorderPlaces = { dayIndex, fromIndex, toIndex -> viewModel.onIntent(TravelDetailIntent.ReorderPlaces(dayIndex, fromIndex, toIndex)) },
clickTransportSegment = { place -> viewModel.onIntent(TravelDetailIntent.ClickTransportSegment(place)) },
confirmChangeTransport = { segment -> viewModel.onIntent(TravelDetailIntent.ConfirmChangeTransportSegment(segment)) },
dismissTransportBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissTransportBottomSheet) },
confirmEditMode = { viewModel.onIntent(TravelDetailIntent.ConfirmEditMode) },
clickPlaceItem = { viewModel.onIntent(TravelDetailIntent.ClickPlaceItem(it)) },
dismissPlaceBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissPlaceBottomSheet) },
navigateToTravelPlaceDetail = { viewModel.onIntent(TravelDetailIntent.NavigateToTravelPlaceDetail(it)) },
clickAddTime = { viewModel.onIntent(TravelDetailIntent.ClickAddTime(it)) },
clickAddMemo = { viewModel.onIntent(TravelDetailIntent.ClickAddMemo(it)) },
clickAddCost = { viewModel.onIntent(TravelDetailIntent.ClickAddCost(it)) },
clickFindRoute = { viewModel.onIntent(TravelDetailIntent.ClickFindRoute(it)) },
dismissTimeBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissTimeBottomSheet) },
confirmDuration = {
viewModel.onIntent(TravelDetailIntent.ConfirmDuration(it))
Scaffold(
modifier = Modifier.fillMaxSize(),
snackbarHost = {
SnackbarHost(snackbarHostState) { data ->
NDGLSnackbar(modifier = Modifier.padding(bottom = 106.dp), snackbarData = data)
}
},
dismissCostModal = { viewModel.onIntent(TravelDetailIntent.DismissCostModal) },
confirmCost = { viewModel.onIntent(TravelDetailIntent.ConfirmCost(it)) },
dismissMemoModal = { viewModel.onIntent(TravelDetailIntent.DismissMemoModal) },
confirmMemo = { viewModel.onIntent(TravelDetailIntent.ConfirmMemo(it)) },
)
) { innerPadding ->
TravelDetailScreen(
innerPadding = innerPadding,
state = state,
listState = listState,
clickBack = { viewModel.onIntent(TravelDetailIntent.ClickBack) },
selectDay = { viewModel.onIntent(TravelDetailIntent.SelectDay(it)) },
clickStartTimeSetting = { viewModel.onIntent(TravelDetailIntent.ClickStartTimeSetting) },
clickEditTravel = { viewModel.onIntent(TravelDetailIntent.ClickEditTravel) },
clickAddScheduleButton = { viewModel.onIntent(TravelDetailIntent.ClickAddScheduleButton) },
checkPlaceItem = { placeId ->
viewModel.onIntent(TravelDetailIntent.CheckPlaceItem(placeId))
},
checkSelectAll = { viewModel.onIntent(TravelDetailIntent.CheckSelectAll) },
clickDeleteSelectedPlaces = { viewModel.onIntent(TravelDetailIntent.ClickDeleteSelectedPlaces) },
confirmDeleteSelectedPlaces = { viewModel.onIntent(TravelDetailIntent.ConfirmDeleteSelectedPlaces) },
dismissDeleteModal = { viewModel.onIntent(TravelDetailIntent.DismissDeleteModal) },
confirmCancelEditMode = { viewModel.onIntent(TravelDetailIntent.ConfirmCancelEditMode) },
dismissCancelEditModal = { viewModel.onIntent(TravelDetailIntent.DismissCancelEditModal) },
longClickPlaceItem = { viewModel.onIntent(TravelDetailIntent.LongClickPlaceItem) },
dismissStartTimeSettingBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissStartTimeSettingBottomSheet) },
confirmStartTimeSetting = { startTime -> viewModel.onIntent(TravelDetailIntent.ConfirmStartTimeSetting(startTime)) },
reorderPlaces = { dayIndex, fromIndex, toIndex -> viewModel.onIntent(TravelDetailIntent.ReorderPlaces(dayIndex, fromIndex, toIndex)) },
clickTransportSegment = { place -> viewModel.onIntent(TravelDetailIntent.ClickTransportSegment(place)) },
confirmChangeTransport = { segment -> viewModel.onIntent(TravelDetailIntent.ConfirmChangeTransportSegment(segment)) },
dismissTransportBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissTransportBottomSheet) },
confirmEditMode = { viewModel.onIntent(TravelDetailIntent.ConfirmEditMode) },
clickPlaceItem = { viewModel.onIntent(TravelDetailIntent.ClickPlaceItem(it)) },
dismissPlaceBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissPlaceBottomSheet) },
navigateToTravelPlaceDetail = { viewModel.onIntent(TravelDetailIntent.NavigateToTravelPlaceDetail(it)) },
clickAddTime = { viewModel.onIntent(TravelDetailIntent.ClickAddTime(it)) },
clickAddMemo = { viewModel.onIntent(TravelDetailIntent.ClickAddMemo(it)) },
clickAddCost = { viewModel.onIntent(TravelDetailIntent.ClickAddCost(it)) },
clickFindRoute = { viewModel.onIntent(TravelDetailIntent.ClickFindRoute(it)) },
dismissTimeBottomSheet = { viewModel.onIntent(TravelDetailIntent.DismissTimeBottomSheet) },
confirmDuration = {
viewModel.onIntent(TravelDetailIntent.ConfirmDuration(it))
},
dismissCostModal = { viewModel.onIntent(TravelDetailIntent.DismissCostModal) },
confirmCost = { viewModel.onIntent(TravelDetailIntent.ConfirmCost(it)) },
dismissMemoModal = { viewModel.onIntent(TravelDetailIntent.DismissMemoModal) },
confirmMemo = { viewModel.onIntent(TravelDetailIntent.ConfirmMemo(it)) },
)
}
}

@Composable
private fun TravelDetailScreen(
innerPadding: PaddingValues = PaddingValues(),
state: TravelDetailState,
listState: LazyListState,
clickBack: () -> Unit,
Expand Down Expand Up @@ -274,7 +295,7 @@ private fun TravelDetailScreen(
val reorderableState = rememberReorderableState(
list = tempPlaces,
lazyListState = listState,
offset = state.placesOffset,
offset = TravelDetailState.PLACES_OFFSET,
isReorderable = { key -> key is String && key.startsWith("place_") },
)
var isDragMode by remember { mutableStateOf(false) }
Expand All @@ -283,7 +304,7 @@ private fun TravelDetailScreen(
modifier = Modifier
.fillMaxSize()
.background(NDGLTheme.colors.white)
.navigationBarsPadding(),
.padding(bottom = innerPadding.calculateBottomPadding()),
) {
LazyColumn(
state = listState,
Expand All @@ -295,7 +316,7 @@ private fun TravelDetailScreen(
if (state.isEditMode) {
Modifier.reorderable(reorderableState) { from, to ->
if (from != null && to != null && from != to) {
reorderPlaces(state.selectedDay - 1, from - state.placesOffset, to - state.placesOffset)
reorderPlaces(state.selectedDay - 1, from - TravelDetailState.PLACES_OFFSET, to - TravelDetailState.PLACES_OFFSET)
}
}
} else {
Expand All @@ -309,7 +330,7 @@ private fun TravelDetailScreen(
.fillMaxWidth()
.clip(shape = RoundedCornerShape(bottomStart = 16.dp, bottomEnd = 16.dp))
.background(NDGLTheme.colors.black50)
.statusBarsPadding(),
.padding(top = innerPadding.calculateTopPadding()),
) {
NDGLNavigationBar(
textAlignType = NDGLNavigationBarAttr.TextAlignType.START,
Expand All @@ -333,9 +354,7 @@ private fun TravelDetailScreen(
.background(NDGLTheme.colors.white)
.then(
if (isHeaderSticky) {
Modifier
.statusBarsPadding()
.padding(top = 10.dp)
Modifier.padding(top = innerPadding.calculateTopPadding() + 10.dp)
} else {
Modifier.padding(top = 22.dp)
},
Expand Down Expand Up @@ -416,7 +435,7 @@ private fun TravelDetailScreen(
items = tempPlaces,
key = { _, place -> "place_${state.selectedDay}_${place.id}" },
) { index, place ->
val isDragging = reorderableState.currentIndex == index + state.placesOffset
val isDragging = reorderableState.currentIndex == index + TravelDetailState.PLACES_OFFSET
Box(
modifier = Modifier
.animateItem()
Expand Down
Loading