Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[feat] 코스 신고하기 웹 뷰 연결 #189

Merged
merged 12 commits into from
Aug 27, 2024
Merged

[feat] 코스 신고하기 웹 뷰 연결 #189

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
21ea276
[feat] #188 코스 상세 신고하기 분기처리 및 웹뷰 연결
t1nm1ksun Aug 16, 2024
d1d052b
[chore] #188 웹뷰 visible setState 값 수정
t1nm1ksun Aug 16, 2024
1877e78
[chore] #188 동사형으로 네이밍 수정
t1nm1ksun Aug 17, 2024
0eabd54
Merge remote-tracking branch 'refs/remotes/origin/develop' into feat-…
t1nm1ksun Aug 26, 2024
45fb660
[chore] #188 바텀시트 네이밍 수정, 분기처리 적용
t1nm1ksun Aug 26, 2024
9faaee0
[chore] #188 ktlint Format
t1nm1ksun Aug 26, 2024
4f941d4
[chore] #188 삭제, 신고 다이얼로그 추가
t1nm1ksun Aug 26, 2024
01f6451
[chore] #188 ktlint Format
t1nm1ksun Aug 26, 2024
bf60700
[chore] #188 url object 생성
t1nm1ksun Aug 27, 2024
7e34b95
[chore] #188 코스 삭제 title string resource 수정
t1nm1ksun Aug 27, 2024
81187db
Merge remote-tracking branch 'refs/remotes/origin/develop' into feat-…
t1nm1ksun Aug 27, 2024
adcc2ce
[chore] #188 ktlint Format
t1nm1ksun Aug 27, 2024
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
13 changes: 13 additions & 0 deletions app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt
View file
Open in desktop
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,
t1nm1ksun marked this conversation as resolved.
Show resolved Hide resolved
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
),

t1nm1ksun marked this conversation as resolved.
Show resolved Hide resolved
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
Comment on lines +54 to +58
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 다이얼로그 다른 두 줄 + 버튼 2개짜리 다이얼로그랑 title이랑 description 사이 간격이 다른데 디자인 측에 확인해봐야할 것 같아요!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이건 만나서 말씀드릴게 있읍니다!

)
}
20 changes: 16 additions & 4 deletions app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@ import org.sopt.dateroad.presentation.util.view.LoadState
class CourseDetailContract {
data class CourseDetailUiState(
val loadState: LoadState = LoadState.Idle,
val isEditBottomSheetOpen: Boolean = false,
val isDeleteCourseBottomSheetOpen: Boolean = false,
val isRegionBottomSheetOpen: Boolean = false,
val isReportCourseBottomSheetOpen: Boolean = false,
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,
val deleteLoadState: LoadState = LoadState.Idle,
val usePointLoadState: LoadState = LoadState.Idle
val usePointLoadState: LoadState = LoadState.Idle,
var isWebViewOpened: Boolean = false
) : UiState

sealed interface CourseDetailSideEffect : UiSideEffect {
Expand All @@ -35,13 +39,21 @@ class CourseDetailContract {
data object DismissDialogLookedForFree : CourseDetailEvent()
data object OnDialogPointLack : CourseDetailEvent()
data object DismissDialogPointLack : CourseDetailEvent()
data object OnEditBottomSheet : CourseDetailEvent()
data object DismissEditBottomSheet : 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()
data object DismissReportCourseBottomSheet : CourseDetailEvent()
data object OpenCourse : CourseDetailEvent()
data class FetchCourseDetail(val loadState: LoadState, val courseDetail: CourseDetail) : CourseDetailEvent()
data class PostUsePoint(val usePointLoadState: LoadState) : CourseDetailEvent()
data class DeleteCourseLike(val courseDetail: CourseDetail) : CourseDetailEvent()
data class PostCourseLike(val courseDetail: CourseDetail) : CourseDetailEvent()
data class DeleteCourse(val loadState: LoadState, val deleteLoadState: LoadState) : CourseDetailEvent()
data object OnReportWebViewClicked : CourseDetailEvent()
data object DismissReportWebView : CourseDetailEvent()
}
}
Loading
Loading