From 04e38825242836f45b6b6fa05d9f951054e0ae7b Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Mon, 23 Sep 2024 21:47:43 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[chore]=20#270=20=EB=A1=9C=ED=8B=B0=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/component/view/DateRoadLoadingView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt index bc90d429..99174bcb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt @@ -1,5 +1,6 @@ package org.sopt.dateroad.presentation.ui.component.view +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable @@ -18,6 +19,8 @@ import com.airbnb.lottie.compose.rememberLottieComposition import org.sopt.dateroad.presentation.util.LoadingView.CLIPMAX import org.sopt.dateroad.presentation.util.LoadingView.CLIPMIN import org.sopt.dateroad.presentation.util.LoadingView.LOTTIE +import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.dateroad.ui.theme.White @Composable fun DateRoadLoadingView() { @@ -36,7 +39,7 @@ fun DateRoadLoadingView() { } Box( - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().background(color = DateRoadTheme.colors.white), contentAlignment = Alignment.Center ) { LottieAnimation( From 2323c5ac04510d5fabb4f70af263b64f3e079453 Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Mon, 23 Sep 2024 21:50:08 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[chore]=20#270=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EC=88=98=EC=A0=95=20=ED=83=9C=EA=B7=B8=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/component/view/DateRoadLoadingView.kt | 1 - .../org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt index 99174bcb..a44f2425 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt @@ -20,7 +20,6 @@ import org.sopt.dateroad.presentation.util.LoadingView.CLIPMAX import org.sopt.dateroad.presentation.util.LoadingView.CLIPMIN import org.sopt.dateroad.presentation.util.LoadingView.LOTTIE import org.sopt.dateroad.ui.theme.DateRoadTheme -import org.sopt.dateroad.ui.theme.White @Composable fun DateRoadLoadingView() { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt index 7de82f39..bb961fe0 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt @@ -179,7 +179,7 @@ fun ProfileRoute( } ProfileType.EDIT -> { - if (uiState.currentProfile.toEditProfile() != uiState.editProfile || uiState.nicknameValidateResult == TextFieldValidateResult.Success && (uiState.editProfile.tags.isNotEmpty())) { + if ((uiState.editProfile.tags.isNotEmpty()) && uiState.currentProfile.toEditProfile() != uiState.editProfile || uiState.nicknameValidateResult == TextFieldValidateResult.Success) { viewModel.setEvent(ProfileContract.ProfileEvent.CheckEnrollButtonEnable(true)) } else { viewModel.setEvent(ProfileContract.ProfileEvent.CheckEnrollButtonEnable(false)) From 261f0c832c61f1bde0c93c834213c90e066d696b Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Mon, 23 Sep 2024 22:09:21 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[chore]=20#270=20=EC=BD=94=EC=8A=A4,?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=20index=20=EB=A1=9C=EC=A7=81=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt | 2 +- .../sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt index 688f1939..5ff7ff0b 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt +++ b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt @@ -12,7 +12,7 @@ fun Enroll.toTimelineData(): RequestTimelineDto = RequestTimelineDto( tags = this.tags.map { tag -> tag.toData() }, country = this.country?.title.orEmpty(), city = this.city.toAreaTitle(), - places = places.mapIndexed { index, place -> place.toData(sequence = index) } + places = places.mapIndexed { index, place -> place.toData(sequence = index + 1) } ) fun Enroll.toCourseData(): RequestCourseDto = RequestCourseDto( diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt b/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt index b176eb96..18946243 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt @@ -62,7 +62,7 @@ class CourseRepositoryImpl @Inject constructor( courseRemoteDataSource.postCourse( images = enroll.images.map { image -> ContentUriRequestBody(contentResolver = contentResolver, uri = Uri.parse(image)).toFormData() }, course = Json.encodeToString(enroll.toCourseData()).toRequestBody("application/json".toMediaType()), - places = Json.encodeToString(enroll.places.mapIndexed { index, place -> place.toData(sequence = index) }).toRequestBody("application/json".toMediaType()), + places = Json.encodeToString(enroll.places.mapIndexed { index, place -> place.toData(sequence = index + 1) }).toRequestBody("application/json".toMediaType()), tags = Json.encodeToString(enroll.tags.map { tag -> tag.toData() }).toRequestBody("application/json".toMediaType()) ) } From c7a6bc0de386745c06a11efb9df05dd8dbb2f263 Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Mon, 23 Sep 2024 22:14:37 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[chore]=20#270=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=ED=81=B4=EB=A6=AD=20=ED=95=B4=EA=B2=B0!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt index 9aa05bb6..52dda626 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt @@ -283,7 +283,6 @@ fun EnrollRoute( onCostValueChange = { cost -> viewModel.setEvent(EnrollContract.EnrollEvent.OnCostValueChange(cost = cost)) }, onEnrollSuccessDialogButtonClick = { viewModel.setSideEffect(EnrollContract.EnrollSideEffect.PopBackStack) - viewModel.setEvent(EnrollContract.EnrollEvent.SetIsEnrollSuccessDialogOpen(isEnrollSuccessDialogOpen = false)) } )