feat(gift): 받은 선물 상세 화면을 연결한다

This commit is contained in:
2026-10-02 23:55:14 +09:00
parent 8d7a632d64
commit 8ef6fdc7a6
3 changed files with 504 additions and 4 deletions
@@ -94,6 +94,7 @@ import kr.co.vividnext.sodalive.home.pushnotification.PushNotificationListViewMo
import kr.co.vividnext.sodalive.v2.gift.GiftSendRequestViewModel
import kr.co.vividnext.sodalive.v2.gift.GiftInboxViewModel
import kr.co.vividnext.sodalive.v2.gift.GiftDetailViewModel
import kr.co.vividnext.sodalive.v2.gift.GiftRecipientAddressViewModel
import kr.co.vividnext.sodalive.v2.gift.GiftTrackingViewModel
import kr.co.vividnext.sodalive.v2.gift.GiftCancelViewModel
import kr.co.vividnext.sodalive.v2.gift.data.GiftApi
@@ -482,6 +483,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
viewModel { GiftSendRequestViewModel(get()) }
viewModel { GiftInboxViewModel(get()) }
viewModel { GiftDetailViewModel(get()) }
viewModel { GiftRecipientAddressViewModel(get()) }
viewModel { GiftTrackingViewModel(get()) }
viewModel { GiftCancelViewModel(get()) }
viewModel { HomeOnAirLiveViewModel(get()) }
@@ -8,6 +8,7 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.view.isVisible
import androidx.core.widget.addTextChangedListener
import androidx.recyclerview.widget.GridLayoutManager
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseActivity
@@ -21,6 +22,22 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftDetailBinding::inflate) {
private val viewModel: GiftDetailViewModel by viewModel()
private val cancelViewModel: GiftCancelViewModel by viewModel()
private val recipientViewModel: GiftRecipientAddressViewModel by viewModel()
private var bindingRecipientForm = false
private var isRecipientFormRendered = false
private val postcodeLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode == Activity.RESULT_OK) {
recipientViewModel.formState.value?.let { form ->
recipientViewModel.updateForm(
form.copy(
recipientZipCode = result.data?.getStringExtra(KakaoPostcodeSearchActivity.EXTRA_ZONE_CODE).orEmpty(),
recipientAddress = result.data?.getStringExtra(KakaoPostcodeSearchActivity.EXTRA_ADDRESS).orEmpty()
)
)
binding.etDetailAddress.requestFocus()
}
}
}
private var cancelDialog: V2ModalDialog? = null
private var hasChanged = false
private val timelineAdapter = GiftStatusTimelineAdapter()
@@ -49,6 +66,9 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
binding.retry.setOnClickListener { viewModel.retry() }
binding.inquiry.setOnClickListener { viewModel.onInquiryClick() }
binding.undeliverableInquiry.setOnClickListener { viewModel.onInquiryClick() }
binding.receivedInquiry.setOnClickListener { viewModel.onInquiryClick() }
binding.policy.setOnClickListener { viewModel.onPolicyClick() }
setupRecipientForm()
binding.timeline.layoutManager = GridLayoutManager(this, 4)
binding.timeline.adapter = timelineAdapter
binding.tracking.setOnClickListener {
@@ -63,6 +83,81 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
private fun reload() = viewModel.retry()
private fun setupRecipientForm() = with(binding) {
etRecipientName.filters = arrayOf(GiftSendInputFilters.senderName())
etPhoneNumber.filters = arrayOf(GiftSendInputFilters.phoneNumber())
listOf(etRecipientName, etPhoneNumber, etDetailAddress).forEach { input ->
input.addTextChangedListener { updateRecipientForm() }
}
listOf(cbTerms, cbPrivacy).forEach { agreement ->
agreement.append(getString(R.string.gift_send_required))
agreement.setOnCheckedChangeListener { button, checked ->
button.isSelected = checked
updateRecipientForm()
}
}
btnPostcodeSearch.setOnClickListener {
postcodeLauncher.launch(KakaoPostcodeSearchActivity.newIntent(this@GiftDetailActivity))
}
receive.setOnClickListener {
if (isRecipientFormRendered) recipientViewModel.submit(intent.getStringExtra(EXTRA_APPLICATION_NO).orEmpty())
}
recipientViewModel.formState.observe(this@GiftDetailActivity) { form ->
bindingRecipientForm = true
listOf(
etRecipientName to form.recipientName,
etPhoneNumber to form.recipientPhoneNumber,
etDetailAddress to form.recipientAddressDetail
).forEach { (input, value) -> if (input.text.toString() != value) input.setText(value) }
tvPostcode.text = form.recipientZipCode
tvAddress.text = form.recipientAddress
cbTerms.isChecked = form.recipientTermsAgreed
cbPrivacy.isChecked = form.recipientPrivacyAgreed
bindingRecipientForm = false
updateReceiveButton()
}
recipientViewModel.isSubmitting.observe(this@GiftDetailActivity) {
updateReceiveButton()
}
recipientViewModel.toastLiveData.observe(this@GiftDetailActivity) { toast ->
if (toast != null) {
recipientViewModel.consumeToast()?.let {
showToast(it.resId?.let(::getString) ?: it.message.orEmpty())
}
}
}
}
private fun updateRecipientForm() = with(binding) {
if (bindingRecipientForm) return
recipientViewModel.updateForm(
GiftRecipientAddressFormState(
etRecipientName.text.toString(),
etPhoneNumber.text.toString(),
tvPostcode.text.toString(),
tvAddress.text.toString(),
etDetailAddress.text.toString(),
cbTerms.isChecked,
cbPrivacy.isChecked
)
)
}
private fun updateReceiveButton() = with(binding.receive) {
isVisible = isRecipientFormRendered
binding.receiveProgress.isVisible = isRecipientFormRendered && recipientViewModel.isSubmitting.value == true
isEnabled = isRecipientFormRendered && recipientViewModel.formState.value?.isSubmitEnabled == true &&
recipientViewModel.isSubmitting.value != true
setTextColor(getColor(if (isEnabled) R.color.white else R.color.gray_500))
setBackgroundResource(
if (isEnabled) {
R.drawable.bg_creator_channel_fantalk_write_send_enabled
} else {
R.drawable.bg_creator_channel_fantalk_write_send_disabled
}
)
}
private fun showCancelDialog() {
val detail = (viewModel.state.value as? GiftDetailUiState.Content)?.detail ?: return
if (detail.direction != "SENT" || detail.status != "RECEIVED" || cancelDialog != null) return
@@ -104,6 +199,12 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
private fun observe() {
viewModel.state.observe(this, ::render)
recipientViewModel.recipientAddressSuccessLiveData.observe(this) { succeeded ->
if (succeeded && recipientViewModel.consumeRecipientAddressSuccessEvent()) {
markChanged()
viewModel.reloadAfterRecipientAddressSuccess()
}
}
viewModel.finishErrorLiveData.observe(this) { event ->
if (event != null) {
viewModel.consumeFinishError()?.let { error ->
@@ -115,9 +216,17 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
viewModel.inquiryLiveData.observe(this) { requested ->
if (requested) viewModel.consumeInquiryIntent()?.let(::startActivity)
}
viewModel.toastLiveData.observe(this) { toast ->
if (toast != null) {
viewModel.consumeToast()?.let {
showToast(it.resId?.let(::getString) ?: it.message.orEmpty())
}
}
}
}
private fun render(state: GiftDetailUiState) {
isRecipientFormRendered = false
binding.progress.isVisible = state == GiftDetailUiState.Loading
binding.error.isVisible = state is GiftDetailUiState.Error
binding.content.isVisible = state is GiftDetailUiState.Content || state is GiftDetailUiState.Canceled
@@ -134,6 +243,7 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
bind(GiftDetailPresenter.present(state.detail, state.cancel))
}
}
updateReceiveButton()
}
private fun markChanged() {
@@ -142,6 +252,10 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
}
private fun bind(model: GiftDetailUiModel) {
binding.giftInfoTitle.isVisible = true
binding.giftInfo.isVisible = true
binding.normalSections.removeView(binding.sectionSeparator)
binding.normalSections.addView(binding.sectionSeparator, binding.normalSections.indexOfChild(binding.giftInfoTitle))
val canceled = model.cancellation != null
val received = model.status == "RECEIVED"
val undeliverable = model.undeliverable != null
@@ -192,6 +306,54 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
it.label to resolveGiftDetailText(it.value)
}
)
bindReceived(model)
}
private fun bindReceived(model: GiftDetailUiModel) = with(binding) {
val received = model.received
val form = received is GiftDetailReceived.AddressForm
isRecipientFormRendered = form
recipientForm.isVisible = form
privacyNotice.isVisible = form
receivedActions.isVisible = received != null && !form
receivedInquiry.isVisible = received != null && GiftDetailAction.INQUIRY in model.actions
policy.isVisible = GiftDetailAction.POLICY in model.actions
undeliverableDivider.isVisible = received is GiftDetailReceived.Undeliverable
undeliverableReasonHeader.isVisible = received is GiftDetailReceived.Undeliverable
recipientGuidance.bindText((received as? GiftDetailReceived.Delivered)?.recipientAddressGuidance)
if (received == null) return
header.setText(if (form) R.string.gift_recipient_receive else R.string.gift_recipient_detail_title)
btnBack.isVisible = true
close.isVisible = false
inquiry.isVisible = false
undeliverableInquiry.isVisible = false
val rows = when (received) {
is GiftDetailReceived.AddressForm -> received.pendingGiftRows
is GiftDetailReceived.AddressCompleted -> received.giftInfoRows
is GiftDetailReceived.Delivered -> received.giftInfoRows
is GiftDetailReceived.Undeliverable -> emptyList()
}
giftInfoTitle.isVisible = rows.isNotEmpty()
giftInfo.isVisible = rows.isNotEmpty()
GiftInfoRows.bind(giftInfo, rows.map { it.label to resolveGiftDetailText(it.value) })
sectionSeparator.isVisible = received is GiftDetailReceived.Delivered || received is GiftDetailReceived.Undeliverable
if (received is GiftDetailReceived.Undeliverable) {
normalSections.removeView(sectionSeparator)
normalSections.addView(sectionSeparator, normalSections.indexOfChild(undeliverableReasonHeader))
}
if (form) {
heroChip.isVisible = false
heroTitle.isVisible = false
heroBody.isVisible = false
}
val address = when (received) {
is GiftDetailReceived.AddressCompleted -> received.recipientAddress
is GiftDetailReceived.Delivered -> received.recipientAddress
else -> null
}
recipientSection.isVisible = address != null
receivedAddressSeparator.isVisible = address != null
bindAddress(recipientAddress, address)
}
private fun giftInfoRows(model: GiftDetailUiModel): List<Pair<Int, String?>> = with(model.giftInfo) {
@@ -263,6 +425,9 @@ internal fun Context.resolveGiftDetailText(text: GiftDetailText): String = when
Key.CANCELED_TITLE -> R.string.gift_detail_canceled_title
Key.CANCELED_BODY -> R.string.gift_detail_canceled_body
Key.DISPOSAL_NON_RETURN_GUIDANCE -> R.string.gift_detail_disposal_guidance
Key.RECIPIENT_ADDRESS_COMPLETED_TITLE -> R.string.gift_recipient_address_completed_title
Key.RECIPIENT_DELIVERED_TITLE -> R.string.gift_recipient_delivered_title
Key.RECIPIENT_ADDRESS_REMOVAL_GUIDANCE -> R.string.gift_recipient_address_removal_guidance
}
)
}