diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt index 0f2f101e..14e91820 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.v2.gift import android.app.Activity import android.content.Context import android.content.Intent +import android.content.res.ColorStateList import android.os.Bundle import android.widget.LinearLayout import android.widget.TextView @@ -96,6 +97,8 @@ class GiftDetailActivity : BaseActivity(ActivityGiftD updateRecipientForm() } } + cbTerms.setRequiredLink(::onTermsRequiredClick) + cbPrivacy.setRequiredLink(::onPrivacyRequiredClick) btnPostcodeSearch.setOnClickListener { postcodeLauncher.launch(KakaoPostcodeSearchActivity.newIntent(this@GiftDetailActivity)) } @@ -128,6 +131,10 @@ class GiftDetailActivity : BaseActivity(ActivityGiftD } } + private fun onTermsRequiredClick() = openGiftAgreementPage() + + private fun onPrivacyRequiredClick() = openGiftAgreementPage() + private fun updateRecipientForm() = with(binding) { if (bindingRecipientForm) return recipientViewModel.updateForm( @@ -263,19 +270,14 @@ class GiftDetailActivity : BaseActivity(ActivityGiftD if (received) binding.header.text = "" binding.btnBack.isVisible = !received binding.close.isVisible = received - binding.heroChip.bindText(model.hero.chip) - binding.heroChip.setTextColor( - getColor( - when { - canceled -> R.color.gray_400 - undeliverable -> R.color.red_400 - else -> R.color.soda_400 - } - ) - ) + val badge = model.hero.badge + binding.heroChip.bindText(badge?.label) + badge?.style?.let { style -> + binding.heroChip.setTextColor(getColor(style.textColor)) + binding.heroChip.backgroundTintList = ColorStateList.valueOf(getColor(style.backgroundColor)) + } binding.heroTitle.bindText(model.hero.title) binding.heroBody.bindText(model.hero.body) - binding.heroIllustration.isVisible = model.showProgress binding.timeline.isVisible = model.showProgress timelineAdapter.submitList(model.progressSegments) binding.cancel.isVisible = GiftDetailAction.CANCEL in model.actions diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailModels.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailModels.kt index 5e02f4f0..9c235211 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailModels.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailModels.kt @@ -1,5 +1,7 @@ package kr.co.vividnext.sodalive.v2.gift +import kr.co.vividnext.sodalive.R + sealed interface GiftDetailText { enum class Key : GiftDetailText { RECEIVED_LABEL, @@ -48,7 +50,27 @@ data class GiftDetailUiModel( val received: GiftDetailReceived? ) -data class GiftDetailHero(val chip: GiftDetailText?, val title: GiftDetailText, val body: GiftDetailText?) +data class GiftDetailHero(val chip: GiftDetailText?, val title: GiftDetailText, val body: GiftDetailText?) { + val badge: GiftDetailBadge? + get() = chip?.let { label -> + GiftDetailBadge( + label, + when (label) { + GiftDetailText.Key.UNDELIVERABLE_LABEL -> GiftDetailBadgeStyle.UNDELIVERABLE + GiftDetailText.Key.CANCELED_LABEL -> GiftDetailBadgeStyle.CANCELED + else -> GiftDetailBadgeStyle.NORMAL + } + ) + } +} + +data class GiftDetailBadge(val label: GiftDetailText, val style: GiftDetailBadgeStyle) + +enum class GiftDetailBadgeStyle(val backgroundColor: Int, val textColor: Int) { + NORMAL(R.color.white, R.color.black), + UNDELIVERABLE(R.color.red_400, R.color.black), + CANCELED(R.color.gray_700, R.color.white) +} data class GiftDetailInfoRow(val label: Int, val value: GiftDetailText) diff --git a/app/src/main/res/layout/activity_gift_detail.xml b/app/src/main/res/layout/activity_gift_detail.xml index bfc3cf5b..8c6768a6 100644 --- a/app/src/main/res/layout/activity_gift_detail.xml +++ b/app/src/main/res/layout/activity_gift_detail.xml @@ -63,13 +63,6 @@ android:text="@string/gift_recipient_privacy_notice" android:textColor="@color/gray_300" android:visibility="gone" /> - + assertEquals(status, style, present(status).hero.badge?.style) + } + assertEquals(R.color.white, GiftDetailBadgeStyle.NORMAL.backgroundColor) + assertEquals(R.color.black, GiftDetailBadgeStyle.NORMAL.textColor) + assertEquals(R.color.red_400, GiftDetailBadgeStyle.UNDELIVERABLE.backgroundColor) + assertEquals(R.color.black, GiftDetailBadgeStyle.UNDELIVERABLE.textColor) + assertEquals(R.color.gray_700, GiftDetailBadgeStyle.CANCELED.backgroundColor) + assertEquals(R.color.white, GiftDetailBadgeStyle.CANCELED.textColor) + listOf("DELIVERED", "UNDELIVERABLE", "CANCELED").forEach { status -> + val hero = GiftDetailPresenter.present(receivedDetail(status)).hero + assertEquals(styles.getValue(status), hero.badge?.style) + assertEquals(hero.chip, hero.badge?.label) + } + } + + @Test + fun `라벨이 없는 접수 미지원 배송지 입력과 입력완료는 배지 모델이 없다`() { + listOf("RECEIVED", "FUTURE").forEach { assertNull(present(it).hero.badge) } + assertNull(GiftDetailPresenter.present(receivedDetail(recipientAddressRequired = true)).hero.badge) + normalStates.drop(1).dropLast(1).forEach { + assertNull(GiftDetailPresenter.present(receivedDetail(it)).hero.badge) + } + } + @Test fun `일곱 상태의 칩 제목 본문을 지역화 키로 매핑한다`() { val heroes = mapOf(