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()) ) } 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..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 @@ -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,7 @@ 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 @Composable fun DateRoadLoadingView() { @@ -36,7 +38,7 @@ fun DateRoadLoadingView() { } Box( - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().background(color = DateRoadTheme.colors.white), contentAlignment = Alignment.Center ) { LottieAnimation( 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)) } ) 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))