Skip to content

Commit

Permalink
[chore] #188 삭제, 신고 다이얼로그 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
@t1nm1ksun
t1nm1ksun committed Aug 26, 2024
1 parent 9faaee0 commit 4f941d4
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 3 deletions.
13 changes: 13 additions & 0 deletions app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ enum class TwoButtonDialogWithDescriptionType(
confirmButtonTextRes = R.string.dialog_delete,
dismissButtonTextRes = R.string.dialog_cancel
),
DELETE_COURSE(
titleRes = R.string.two_button_dialog_with_description_delete_timeline_title,
descriptionRes = R.string.two_button_dialog_with_description_delete_course_description,
confirmButtonTextRes = R.string.dialog_delete,
dismissButtonTextRes = R.string.dialog_cancel
),
DELETE_PAST(
titleRes = R.string.two_button_dialog_with_description_delete_past_title,
descriptionRes = R.string.dialog_delete_schedule,
Expand All @@ -44,5 +50,12 @@ enum class TwoButtonDialogWithDescriptionType(
descriptionRes = R.string.two_button_dialog_with_description_withdrawal_description,
confirmButtonTextRes = R.string.dialog_cancel,
dismissButtonTextRes = R.string.withdrawal
),

REPORT_COURSE(
titleRes = R.string.two_button_dialog_with_description_report_course_title,
descriptionRes = R.string.two_button_dialog_with_description_report_course_description,
confirmButtonTextRes = R.string.dialog_report,
dismissButtonTextRes = R.string.dialog_cancel
)
}
6 changes: 6 additions & 0 deletions app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailContract.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class CourseDetailContract {
val isPointReadDialogOpen: Boolean = false,
val isPointLackDialogOpen: Boolean = false,
val isFreeReadDialogOpen: Boolean = false,
val isDeleteCourseDialogOpen: Boolean = false,
val isReportCourseDialogOpen: Boolean = false,
val isLikedButtonChecked: Boolean = false,
val courseDetail: CourseDetail = CourseDetail(),
val currentImagePage: Int = 0,
Expand All @@ -37,6 +39,10 @@ class CourseDetailContract {
data object DismissDialogLookedForFree : CourseDetailEvent()
data object OnDialogPointLack : CourseDetailEvent()
data object DismissDialogPointLack : CourseDetailEvent()
data object OnDialogDeleteCourse : CourseDetailEvent()
data object DismissDialogDeleteCourse : CourseDetailEvent()
data object OnDialogReportCourse : CourseDetailEvent()
data object DismissDialogReportCourse : CourseDetailEvent()
data object OnDeleteCourseBottomSheet : CourseDetailEvent()
data object DismissDeleteCourseBottomSheet : CourseDetailEvent()
data object OnReportCourseBottomSheet : CourseDetailEvent()
Expand Down
42 changes: 39 additions & 3 deletions app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ fun CourseDetailRoute(
onDialogLookedForFree = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.OnDialogLookedForFree) },
dismissDialogLookedForFree = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.DismissDialogLookedForFree) },
onDialogLookedByPoint = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.OnDialogLookedByPoint) },
onDialogDeleteCourse = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.OnDialogDeleteCourse) },
onDialogReportCourse = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.OnDialogReportCourse) },
dismissDialogDeleteCourse = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.DismissDialogDeleteCourse) },
dismissDialogReportCourse = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.DismissDialogReportCourse) },
dismissDialogLookedByPoint = { viewModel.setEvent(CourseDetailContract.CourseDetailEvent.DismissDialogLookedByPoint) },
onLikeButtonClicked = {
when (uiState.courseDetail.isUserLiked) {
Expand Down Expand Up @@ -140,6 +144,10 @@ fun CourseDetailScreen(
dismissDialogLookedForFree: () -> Unit,
onDialogLookedByPoint: () -> Unit,
dismissDialogLookedByPoint: () -> Unit,
onDialogDeleteCourse: () -> Unit,
dismissDialogDeleteCourse: () -> Unit,
onDialogReportCourse: () -> Unit,
dismissDialogReportCourse: () -> Unit,
onLikeButtonClicked: () -> Unit,
onDeleteButtonClicked: () -> Unit,
onDeleteCourseBottomSheet: () -> Unit,
Expand Down Expand Up @@ -283,14 +291,38 @@ fun CourseDetailScreen(
)
}

if (courseDetailUiState.isDeleteCourseDialogOpen) {
DateRoadTwoButtonDialogWithDescription(
twoButtonDialogWithDescriptionType = TwoButtonDialogWithDescriptionType.DELETE_COURSE,
onDismissRequest = { dismissDialogDeleteCourse() },
onClickConfirm = {
dismissDialogDeleteCourse()
onDeleteButtonClicked()
},
onClickDismiss = { dismissDialogDeleteCourse() }
)
}

if (courseDetailUiState.isReportCourseDialogOpen) {
DateRoadTwoButtonDialogWithDescription(
twoButtonDialogWithDescriptionType = TwoButtonDialogWithDescriptionType.REPORT_COURSE,
onDismissRequest = { dismissDialogReportCourse() },
onClickConfirm = {
dismissDialogReportCourse()
onReportButtonClicked()
},
onClickDismiss = { dismissDialogReportCourse() }
)
}

DateRoadBasicBottomSheet(
isBottomSheetOpen = courseDetailUiState.isDeleteCourseBottomSheetOpen,
title = stringResource(id = R.string.course_detail_bottom_sheet_title),
isButtonEnabled = false,
buttonText = stringResource(id = R.string.course_detail_bottom_sheet_delete),
itemList = listOf(
stringResource(id = R.string.course_detail_bottom_sheet_confirm) to {
onDeleteButtonClicked()
onDialogDeleteCourse()
}
),
onDismissRequest = { dismissDeleteCourseBottomSheet() },
Expand All @@ -306,7 +338,7 @@ fun CourseDetailScreen(
buttonText = stringResource(id = R.string.course_detail_bottom_sheet_delete),
itemList = listOf(
stringResource(id = R.string.course_detail_bottom_sheet_report) to {
onReportButtonClicked()
onDialogReportCourse()
}
),
onDismissRequest = { dismissReportCourseBottomSheet() },
Expand Down Expand Up @@ -375,7 +407,11 @@ fun CourseDetailScreenPreview() {
onTopBarIconClicked = {},
openCourseDetail = {},
onReportButtonClicked = {},
onReportWebViewClose = {}
onReportWebViewClose = {},
onDialogDeleteCourse = {},
onDialogReportCourse = {},
dismissDialogDeleteCourse = {},
dismissDialogReportCourse = {}
)
}
}
4 changes: 4 additions & 0 deletions app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ class CourseDetailViewModel @Inject constructor(
is CourseDetailContract.CourseDetailEvent.DismissDialogPointLack -> setState { copy(isPointLackDialogOpen = false) }
is CourseDetailContract.CourseDetailEvent.OnDialogLookedForFree -> setState { copy(isFreeReadDialogOpen = true) }
is CourseDetailContract.CourseDetailEvent.DismissDialogLookedForFree -> setState { copy(isFreeReadDialogOpen = false) }
is CourseDetailContract.CourseDetailEvent.OnDialogDeleteCourse -> setState { copy(isDeleteCourseDialogOpen = true) }
is CourseDetailContract.CourseDetailEvent.DismissDialogDeleteCourse -> setState { copy(isDeleteCourseDialogOpen = false) }
is CourseDetailContract.CourseDetailEvent.OnDialogReportCourse -> setState { copy(isReportCourseDialogOpen = true) }
is CourseDetailContract.CourseDetailEvent.DismissDialogReportCourse -> setState { copy(isReportCourseDialogOpen = false) }
is CourseDetailContract.CourseDetailEvent.OnDialogLookedByPoint -> setState { copy(isPointReadDialogOpen = true) }
is CourseDetailContract.CourseDetailEvent.DismissDialogLookedByPoint -> setState { copy(isPointReadDialogOpen = false) }
is CourseDetailContract.CourseDetailEvent.OnLikeButtonClicked -> setState { copy(isLikedButtonChecked = !isLikedButtonChecked) }
Expand Down
2 changes: 2 additions & 0 deletions ...ain/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.sopt.dateroad.R
import org.sopt.dateroad.domain.model.Place
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<string name="dialog_check">확인</string>
<string name="dialog_checked">확인했어요</string>
<string name="dialog_delete">삭제</string>
<string name="dialog_report">신고</string>
<string name="dialog_delete_schedule">삭제된 일정은 복구하실 수 없어요</string>

<!-- AdvertisementTitleType -->
Expand Down Expand Up @@ -167,9 +168,14 @@
<string name="two_button_dialog_with_description_free_read_title">무료 열람 기회를 사용해 보시겠어요?</string>
<string name="two_button_dialog_with_description_free_read_description">무료 열람 기회는 한 번 사용하면 취소할 수 없어요</string>
<string name="two_button_dialog_with_description_delete_timeline_title">데이트 일정을 삭제하시겠어요?</string>
<string name="two_button_dialog_with_description_delete_course_title">데이트 코스를 삭제하시겠어요?</string>
<string name="two_button_dialog_with_description_report_course_title">데이트 코스를 신고하시겠어요?</string>
<string name="two_button_dialog_with_description_delete_past_title">지난 데이트를 삭제하시겠어요?</string>
<string name="two_button_dialog_with_description_withdrawal_title">정말로 탈퇴하시겠어요?</string>
<string name="two_button_dialog_with_description_withdrawal_description">삭제된 계정은 복구하실 수 없어요</string>
<string name="two_button_dialog_with_description_delete_course_description">삭제된 코스는 복구하실 수 없어요</string>
<string name="two_button_dialog_with_description_report_course_description">신고된 게시물은 확인 후 서비스의 운영원칙에\n따라 조치 예정이에요</string>


<!-- Top Bar Title -->
<string name="top_bar_title_point_history">포인트 내역</string>
Expand Down

0 comments on commit 4f941d4

Please sign in to comment.