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

[fix] 2차 QA사항 반영 #271

Merged
merged 4 commits into from
Sep 24, 2024
Merged

[fix] 2차 QA사항 반영 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e3882
[chore] #270 로티 배경색 설정
t1nm1ksun Sep 23, 2024
2323c5a
[chore] #270 프로필 수정 태그관련로직 수정
t1nm1ksun Sep 23, 2024
261f0c8
[chore] #270 코스,일정 index 로직 변경
t1nm1ksun Sep 23, 2024
c7a6bc0
[chore] #270 버튼 중복 클릭 해결!
t1nm1ksun Sep 23, 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
2 changes: 1 addition & 1 deletion app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
)
}
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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() {
Expand All @@ -36,7 +38,7 @@ fun DateRoadLoadingView() {
}

Box(
modifier = Modifier.fillMaxSize(),
modifier = Modifier.fillMaxSize().background(color = DateRoadTheme.colors.white),
contentAlignment = Alignment.Center
) {
LottieAnimation(
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
)

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading