Skip to content

Commit

Permalink
Merge pull request #127 from depromeet/hotfix/#126-seat-review-ui-null
Browse files Browse the repository at this point in the history
[HOTFIX] 리뷰 등록 UI 수정 및 nickName nullable 처리
  • Loading branch information
minju1459 authored Aug 25, 2024
2 parents 81541da + bd62a52 commit 49a8700
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
Binary file modified buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
Binary file not shown.
Binary file not shown.
Binary file modified buildSrc/build/libs/buildSrc.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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() =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@ class ReviewActivity : BaseActivity<ActivityReviewBinding>({

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)
Expand Down Expand Up @@ -425,10 +425,6 @@ class ReviewActivity : BaseActivity<ActivityReviewBinding>({
makeSpotImageAppbar("좌석을 선택해주세요")
}

((!isSelectedGoodBtnFilled && !isSelectedBadBtnFilled) || !(isSelectedBlockFilled && (isSelectedColumnFilled || isSelectedNumberFilled))) -> {
binding.tvUploadBtn.setBackgroundResource(R.drawable.rect_action_disabled_fill_8)
}

else -> {
val uniqueImageUris = selectedImageUris.distinct()
uniqueImageUris.forEach { imageUriString ->
Expand Down

0 comments on commit 49a8700

Please sign in to comment.