[del] #244 데이트 일정 상세 데이트 코스 올리고 100P 받기 버튼 삭제

TeamDATEROAD · Sep 10, 2024 · 308dea0 · 308dea0
1 parent 5c4ac37
commit 308dea0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 37 deletions.
diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt
@@ -143,9 +143,7 @@ fun MainNavHost(
             )
 
             timelineDetailGraph(
-                padding = padding,
-                popBackStack = navigator::popBackStackIfNotHome,
-                navigateToEnroll = navigator::navigateToEnroll
+                popBackStack = navigator::popBackStackIfNotHome
             )
         }
     }

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt
@@ -19,7 +19,6 @@ class TimelineDetailContract {
 
     sealed interface TimelineDetailSideEffect : UiSideEffect {
         data object PopBackStack : TimelineDetailSideEffect
-        data class NavigateToEnroll(val id: Int) : TimelineDetailSideEffect
     }
 
     sealed class TimelineDetailEvent : UiEvent {

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt
@@ -39,7 +39,6 @@ import org.sopt.dateroad.R
 import org.sopt.dateroad.domain.model.Place
 import org.sopt.dateroad.domain.model.TimelineDetail
 import org.sopt.dateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName
-import org.sopt.dateroad.presentation.type.EnrollType
 import org.sopt.dateroad.presentation.type.PlaceCardType
 import org.sopt.dateroad.presentation.type.TagType
 import org.sopt.dateroad.presentation.type.TimelineType
@@ -63,7 +62,6 @@ import org.sopt.dateroad.ui.theme.DateRoadTheme
 @Composable
 fun TimelineDetailRoute(
     popBackStack: () -> Unit,
-    navigateToEnroll: (EnrollType, Int) -> Unit,
     timelineId: Int,
     timelineType: TimelineType
 ) {
@@ -81,7 +79,6 @@ fun TimelineDetailRoute(
             .collect { sideEffect ->
                 when (sideEffect) {
                     is TimelineDetailContract.TimelineDetailSideEffect.PopBackStack -> popBackStack()
-                    is TimelineDetailContract.TimelineDetailSideEffect.NavigateToEnroll -> navigateToEnroll(EnrollType.COURSE, sideEffect.id)
                 }
             }
     }
@@ -102,7 +99,6 @@ fun TimelineDetailRoute(
                 setShowDeleteBottomSheet = { showDeleteBottomSheet -> viewModel.setEvent(TimelineDetailContract.TimelineDetailEvent.SetShowDeleteBottomSheet(showDeleteBottomSheet)) },
                 setShowDeleteDialog = { showDeleteDialog -> viewModel.setEvent(TimelineDetailContract.TimelineDetailEvent.SetShowDeleteDialog(showDeleteDialog)) },
                 onDeleteConfirm = { viewModel.deleteTimeline(timelineId = timelineId) },
-                onEnrollButtonClick = { id -> viewModel.setSideEffect(TimelineDetailContract.TimelineDetailSideEffect.NavigateToEnroll(id = id)) },
                 onKakaoShareConfirm = { viewModel.setEvent(TimelineDetailContract.TimelineDetailEvent.ShareKakao(context, uiState.timelineDetail)) }
             )
         }
@@ -127,8 +123,7 @@ fun TimelineDetailScreen(
     setShowDeleteBottomSheet: (Boolean) -> Unit,
     setShowDeleteDialog: (Boolean) -> Unit,
     onDeleteConfirm: () -> Unit,
-    onKakaoShareConfirm: () -> Unit,
-    onEnrollButtonClick: (Int) -> Unit
+    onKakaoShareConfirm: () -> Unit
 ) {
     Column(
         modifier = Modifier
@@ -282,27 +277,10 @@ fun TimelineDetailScreen(
                         )
                     }
                 }
-            } else {
-                Column(
-                    modifier = Modifier
-                        .align(Alignment.BottomCenter)
-                        .padding(vertical = 16.dp, horizontal = 70.dp)
-                        .background(DateRoadTheme.colors.purple600, CircleShape)
-                        .noRippleClickable(onClick = { onEnrollButtonClick(uiState.timelineDetail.timelineId) })
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.timeline_detail_point),
-                        style = DateRoadTheme.typography.bodyBold15,
-                        color = DateRoadTheme.colors.white,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 16.dp, horizontal = 24.dp)
-                    )
-                }
             }
         }
     }
+
     if (uiState.showKakaoDialog) {
         DateRoadTwoButtonDialog(
             twoButtonDialogType = TwoButtonDialogType.OPEN_KAKAOTALK,
@@ -378,8 +356,7 @@ fun TimelineDetailScreenPreview() {
             setShowDeleteBottomSheet = {},
             setShowDeleteDialog = {},
             onDeleteConfirm = {},
-            onKakaoShareConfirm = {},
-            onEnrollButtonClick = {}
+            onKakaoShareConfirm = {}
         )
     }
 }
diff --git a/...a/org/sopt/dateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt b/...a/org/sopt/dateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt
@@ -1,13 +1,11 @@
 package org.sopt.dateroad.presentation.ui.timelinedetail.navigation
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
-import org.sopt.dateroad.presentation.type.EnrollType
 import org.sopt.dateroad.presentation.type.TimelineType
 import org.sopt.dateroad.presentation.ui.timelinedetail.TimelineDetailRoute
 
@@ -16,9 +14,7 @@ fun NavController.navigateToTimelineDetail(timelineType: TimelineType, timelineI
 }
 
 fun NavGraphBuilder.timelineDetailGraph(
-    padding: PaddingValues,
-    popBackStack: () -> Unit,
-    navigateToEnroll: (EnrollType, Int) -> Unit
+    popBackStack: () -> Unit
 ) {
     composable(
         route = TimelineDetailRoutes.ROUTE_WITH_ARGUMENT,
@@ -29,11 +25,11 @@ fun NavGraphBuilder.timelineDetailGraph(
     ) { backStackEntry ->
         val timelineType = TimelineType.valueOf(backStackEntry.arguments?.getString(TimelineDetailRoutes.TIMELINE_TYPE) ?: TimelineType.PINK.name)
         val timelineId = backStackEntry.arguments?.getInt(TimelineDetailRoutes.TIMELINE_ID) ?: 1
+
         TimelineDetailRoute(
             popBackStack = popBackStack,
             timelineId = timelineId,
-            timelineType = timelineType,
-            navigateToEnroll = navigateToEnroll
+            timelineType = timelineType
         )
     }
 }