diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin index 0cd62196..851c228b 100644 Binary files a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin and b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin differ diff --git a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin index b7632e36..877a18cb 100644 Binary files a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin and b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin differ diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar index ba756a72..c2c6e1ac 100644 Binary files a/buildSrc/build/libs/buildSrc.jar and b/buildSrc/build/libs/buildSrc.jar differ diff --git a/data/src/main/java/com/dpm/data/model/response/viewfinder/ResponseBlockReviewDto.kt b/data/src/main/java/com/dpm/data/model/response/viewfinder/ResponseBlockReviewDto.kt index c9f8695d..0f3476ca 100644 --- a/data/src/main/java/com/dpm/data/model/response/viewfinder/ResponseBlockReviewDto.kt +++ b/data/src/main/java/com/dpm/data/model/response/viewfinder/ResponseBlockReviewDto.kt @@ -101,7 +101,7 @@ data class ResponseBlockReviewDto( @SerialName("profileImage") val profileImage: String?, @SerialName("nickname") - val nickname: String, + val nickname: String?, @SerialName("level") val level: Int, ) @@ -231,7 +231,7 @@ fun ResponseBlockReviewDto.ResponseReviewDto.ResponseReviewKeywordDto.toReviewKe fun ResponseBlockReviewDto.ResponseReviewDto.ResponseReviewMemberDto.toReviewMemberResponse() = ResponseBlockReview.ResponseReview.ResponseReviewMember( - profileImage = profileImage ?: "", nickname = nickname, level = level + profileImage = profileImage ?: "", nickname = nickname?:"", level = level ) fun ResponseBlockReviewDto.ResponseReviewDto.ResponseReviewStadiumDto.toReviewStadiumResponse() = diff --git a/presentation/src/main/java/com/dpm/presentation/seatreview/ReviewActivity.kt b/presentation/src/main/java/com/dpm/presentation/seatreview/ReviewActivity.kt index bd7a60e0..29d6e106 100644 --- a/presentation/src/main/java/com/dpm/presentation/seatreview/ReviewActivity.kt +++ b/presentation/src/main/java/com/dpm/presentation/seatreview/ReviewActivity.kt @@ -376,9 +376,9 @@ class ReviewActivity : BaseActivity({ with(binding.tvUploadBtn) { val isReadyToUpload = isSelectedDateFilled && isSelectedImageFilled && - (isSelectedGoodBtnFilled || isSelectedBadBtnFilled) && - isSelectedBlockFilled && - (isSelectedColumnFilled || isSelectedNumberFilled) + (isSelectedGoodBtnFilled || isSelectedBadBtnFilled) && + isSelectedBlockFilled && + (isSelectedColumnFilled || isSelectedNumberFilled) if (isReadyToUpload) { setBackgroundResource(R.drawable.rect_action_enabled_fill_8) @@ -425,10 +425,6 @@ class ReviewActivity : BaseActivity({ makeSpotImageAppbar("좌석을 선택해주세요") } - ((!isSelectedGoodBtnFilled && !isSelectedBadBtnFilled) || !(isSelectedBlockFilled && (isSelectedColumnFilled || isSelectedNumberFilled))) -> { - binding.tvUploadBtn.setBackgroundResource(R.drawable.rect_action_disabled_fill_8) - } - else -> { val uniqueImageUris = selectedImageUris.distinct() uniqueImageUris.forEach { imageUriString ->