feat(gift): 선물 상세와 운송장 화면을 연결한다

This commit is contained in:
2026-10-02 18:32:15 +09:00
parent 851adc5541
commit 63b598b521
4 changed files with 869 additions and 0 deletions
+7
View File
@@ -118,6 +118,13 @@
<activity
android:name=".v2.gift.GiftInboxActivity"
android:exported="false" />
<activity
android:name=".v2.gift.GiftDetailActivity"
android:exported="false" />
<activity
android:name=".v2.gift.GiftTrackingActivity"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
<activity
android:name=".v2.gift.GiftSendRequestActivity"
android:exported="false"
@@ -0,0 +1,268 @@
package kr.co.vividnext.sodalive.v2.gift
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.widget.LinearLayout
import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.view.isVisible
import androidx.recyclerview.widget.GridLayoutManager
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.databinding.ActivityGiftDetailBinding
import kr.co.vividnext.sodalive.v2.components.modal.V2ModalDialog
import kr.co.vividnext.sodalive.v2.gift.GiftDetailText.Key
import kr.co.vividnext.sodalive.v2.gift.ui.GiftInfoRows
import kr.co.vividnext.sodalive.v2.gift.ui.GiftStatusTimelineAdapter
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 var cancelDialog: V2ModalDialog? = null
private var hasChanged = false
private val timelineAdapter = GiftStatusTimelineAdapter()
private val trackingLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode == Activity.RESULT_OK) {
markChanged()
val canceled = GiftCancelResult.fromIntent(result.data, intent.getStringExtra(EXTRA_APPLICATION_NO).orEmpty())
if (canceled != null) viewModel.applyCancellation(canceled) else reload()
}
}
override fun onCreate(savedInstanceState: Bundle?) {
hasChanged = savedInstanceState?.getBoolean(STATE_CHANGED) == true
super.onCreate(savedInstanceState)
if (hasChanged) setResult(Activity.RESULT_OK)
}
override fun onSaveInstanceState(outState: Bundle) {
outState.putBoolean(STATE_CHANGED, hasChanged)
super.onSaveInstanceState(outState)
}
override fun setupView() {
binding.btnBack.setOnClickListener { finish() }
binding.close.setOnClickListener { finish() }
binding.retry.setOnClickListener { viewModel.retry() }
binding.inquiry.setOnClickListener { viewModel.onInquiryClick() }
binding.undeliverableInquiry.setOnClickListener { viewModel.onInquiryClick() }
binding.timeline.layoutManager = GridLayoutManager(this, 4)
binding.timeline.adapter = timelineAdapter
binding.tracking.setOnClickListener {
trackingLauncher.launch(GiftTrackingActivity.newIntent(this, intent.getStringExtra(EXTRA_APPLICATION_NO).orEmpty()))
}
binding.cancel.setText(R.string.gift_cancel_title)
binding.cancel.setOnClickListener { showCancelDialog() }
observeCancellation()
observe()
viewModel.loadInitial(intent.getStringExtra(EXTRA_APPLICATION_NO).orEmpty())
}
private fun reload() = viewModel.retry()
private fun showCancelDialog() {
val detail = (viewModel.state.value as? GiftDetailUiState.Content)?.detail ?: return
if (detail.direction != "SENT" || detail.status != "RECEIVED" || cancelDialog != null) return
cancelDialog = giftCancelDialog(detail.giftInfo.recipientCreatorNickname, onConfirm = {
(viewModel.state.value as? GiftDetailUiState.Content)?.detail?.let(cancelViewModel::cancelGift)
}, onExit = { cancelDialog = null }).also { it.show(screenWidth) }
}
private fun observeCancellation() {
cancelViewModel.isSubmitting.observe(this) { submitting ->
cancelDialog?.dialogView?.tvConfirm?.isEnabled = !submitting
cancelDialog?.dialogView?.tvCancel?.isEnabled = !submitting
binding.cancel.isEnabled = !submitting
}
cancelViewModel.toastLiveData.observe(this) { toast ->
if (toast != null) {
cancelViewModel.consumeToast()?.let {
showToast(it.resId?.let(::getString) ?: it.message.orEmpty())
}
}
}
cancelViewModel.cancelSuccessLiveData.observe(this) { response ->
if (response != null) {
cancelViewModel.consumeCancelSuccessEvent()?.let {
cancelDialog?.dismiss()
cancelDialog = null
viewModel.applyCancellation(it)
markChanged()
showToast(getString(R.string.gift_cancel_success))
}
}
}
}
override fun onDestroy() {
cancelDialog?.dismiss()
super.onDestroy()
}
private fun observe() {
viewModel.state.observe(this, ::render)
viewModel.finishErrorLiveData.observe(this) { event ->
if (event != null) {
viewModel.consumeFinishError()?.let { error ->
showToast(error.resId?.let(::getString) ?: error.message.orEmpty())
finish()
}
}
}
viewModel.inquiryLiveData.observe(this) { requested ->
if (requested) viewModel.consumeInquiryIntent()?.let(::startActivity)
}
}
private fun render(state: GiftDetailUiState) {
binding.progress.isVisible = state == GiftDetailUiState.Loading
binding.error.isVisible = state is GiftDetailUiState.Error
binding.content.isVisible = state is GiftDetailUiState.Content || state is GiftDetailUiState.Canceled
binding.tracking.isVisible = GiftDetailPresenter.showsTrackingAction(state)
when (state) {
GiftDetailUiState.Loading -> Unit
is GiftDetailUiState.Error -> {
binding.errorMessage.text = state.message?.takeIf { it.isNotBlank() }
?: getString(R.string.common_error_unknown)
}
is GiftDetailUiState.Content -> bind(GiftDetailPresenter.present(state.detail))
is GiftDetailUiState.Canceled -> {
if (state.cancel != null) markChanged()
bind(GiftDetailPresenter.present(state.detail, state.cancel))
}
}
}
private fun markChanged() {
hasChanged = true
setResult(Activity.RESULT_OK)
}
private fun bind(model: GiftDetailUiModel) {
val canceled = model.cancellation != null
val received = model.status == "RECEIVED"
val undeliverable = model.undeliverable != null
binding.header.setText(if (canceled) R.string.gift_detail_canceled_header else R.string.gift_detail_title)
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
}
)
)
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
binding.inquiry.isVisible = !undeliverable && GiftDetailAction.INQUIRY in model.actions
binding.undeliverableInquiry.isVisible = undeliverable && GiftDetailAction.INQUIRY in model.actions
binding.normalSections.isVisible = !canceled
binding.canceledCompletion.root.isVisible = canceled
GiftInfoRows.bind(binding.giftInfo, giftInfoRows(model))
binding.senderSection.isVisible = model.senderInfo != null
binding.mailboxSection.isVisible = model.mailbox != null
binding.recipientSection.isVisible = model.recipientAddress != null
bindAddress(binding.senderInfo, model.senderInfo)
bindAddress(binding.mailbox, model.mailbox)
bindAddress(binding.recipientAddress, model.recipientAddress)
binding.normalSections.removeView(binding.mailboxSection)
binding.normalSections.addView(
binding.mailboxSection,
if (received) 1 else binding.normalSections.indexOfChild(binding.giftInfo) + 1
)
binding.registrationGuidance.isVisible = received && model.mailbox != null
binding.sectionSeparator.isVisible = received || undeliverable || model.showProgress
binding.undeliverable.isVisible = undeliverable
binding.undeliverableReason.bindText(model.undeliverable?.title)
binding.undeliverableGuidance.bindText(model.undeliverable?.guidance)
GiftInfoRows.bind(
binding.canceledCompletion.details,
model.cancellationRows.map {
it.label to resolveGiftDetailText(it.value)
}
)
}
private fun giftInfoRows(model: GiftDetailUiModel): List<Pair<Int, String?>> = with(model.giftInfo) {
listOf(
R.string.gift_detail_counterpart to counterpartNickname,
R.string.gift_send_size to sizeName,
R.string.gift_send_category to categoryName,
R.string.gift_detail_application_no to model.applicationNo,
R.string.gift_detail_paid_can to paidCan?.let { getString(R.string.gift_detail_can_amount, it) },
R.string.gift_detail_tracking to tracking,
R.string.gift_detail_shipping_date to shippingRequestedDate,
R.string.gift_detail_inspection_date to inspectionDate,
R.string.gift_detail_delivered_date to deliveredDate,
R.string.gift_detail_canceled_date to canceledDate
)
}
private fun bindAddress(view: LinearLayout, address: GiftDetailAddress?) {
GiftInfoRows.bind(
view,
listOf(
R.string.gift_send_name to address?.name,
R.string.gift_send_phone to address?.phoneNumber,
R.string.gift_send_address to address?.address
),
labelWidth = 72
)
}
private fun TextView.bindText(value: GiftDetailText?) {
isVisible = value != null
text = value?.let(::resolveGiftDetailText)
}
companion object {
const val EXTRA_APPLICATION_NO = "EXTRA_APPLICATION_NO"
private const val STATE_CHANGED = "STATE_CHANGED"
fun newIntent(context: Context, applicationNo: String): Intent =
Intent(context, GiftDetailActivity::class.java).putExtra(EXTRA_APPLICATION_NO, applicationNo)
}
}
internal fun Context.resolveGiftDetailText(text: GiftDetailText): String = when (text) {
is GiftDetailText.Raw -> text.value
is GiftDetailText.CanAmount -> getString(R.string.gift_detail_can_amount, text.amount)
is GiftDetailText.CancellationBody -> getString(
R.string.gift_detail_canceled_body,
text.creatorNickname?.takeIf { it.isNotBlank() } ?: getString(R.string.gift_detail_creator),
text.applicationNo
)
is Key -> getString(
when (text) {
Key.RECEIVED_LABEL -> R.string.gift_detail_received_label
Key.RECEIVED_TITLE -> R.string.gift_detail_received_title
Key.RECEIVED_BODY -> R.string.gift_detail_received_body
Key.TRACKING_REGISTERED_LABEL -> R.string.gift_inbox_sent_confirmed
Key.TRACKING_REGISTERED_TITLE -> R.string.gift_detail_tracking_title
Key.ARRIVED_AT_MAILBOX_LABEL -> R.string.gift_inbox_arrived
Key.ARRIVED_AT_MAILBOX_TITLE -> R.string.gift_detail_arrived_title
Key.INSPECTION_COMPLETED_LABEL -> R.string.gift_detail_inspected_label
Key.INSPECTION_COMPLETED_TITLE -> R.string.gift_detail_inspected_title
Key.DELIVERED_LABEL -> R.string.gift_inbox_delivered
Key.DELIVERED_TITLE -> R.string.gift_detail_delivered_title
Key.UNDELIVERABLE_LABEL -> R.string.gift_inbox_undeliverable
Key.UNDELIVERABLE_TITLE -> R.string.gift_detail_undeliverable_title
Key.UNDELIVERABLE_BODY -> R.string.gift_detail_undeliverable_body
Key.CANCELED_LABEL -> R.string.gift_inbox_canceled
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
}
)
}
@@ -0,0 +1,218 @@
package kr.co.vividnext.sodalive.v2.gift
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.view.View
import android.widget.AdapterView
import androidx.core.content.ContextCompat
import androidx.core.view.WindowCompat
import androidx.core.view.isVisible
import androidx.core.widget.addTextChangedListener
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.databinding.ActivityGiftTrackingBinding
import kr.co.vividnext.sodalive.v2.components.modal.V2ModalDialog
import kr.co.vividnext.sodalive.v2.gift.ui.GiftInfoRows
import org.koin.androidx.viewmodel.ext.android.viewModel
class GiftTrackingActivity : BaseActivity<ActivityGiftTrackingBinding>(ActivityGiftTrackingBinding::inflate) {
private val viewModel: GiftTrackingViewModel by viewModel()
private val cancelViewModel: GiftCancelViewModel by viewModel()
private var cancelDialog: V2ModalDialog? = null
private val applicationNo: String by lazy { intent.getStringExtra(EXTRA_APPLICATION_NO).orEmpty() }
private var loadingDialog: LoadingDialog? = null
override fun setupView() {
WindowCompat.getInsetsController(window, binding.root).apply {
isAppearanceLightStatusBars = false
isAppearanceLightNavigationBars = false
}
binding.btnBack.setOnClickListener { finish() }
binding.retry.setOnClickListener { viewModel.retry() }
binding.cancel.setText(R.string.gift_cancel_title)
binding.cancel.setOnClickListener { showCancelDialog() }
binding.courier.adapter = GiftCategoryAdapter(
this,
listOf(getString(R.string.gift_tracking_courier_hint)) + giftCourierCompanyNames
).apply { setDropDownViewResource(R.layout.item_gift_send_category) }
binding.courier.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
updateCtaState()
}
override fun onNothingSelected(parent: AdapterView<*>?) {
updateCtaState()
}
}
binding.trackingNumber.addTextChangedListener { updateCtaState() }
binding.submit.setOnClickListener {
if (cancelViewModel.isSubmitting.value != true) {
viewModel.submitTracking(selectedCourier(), binding.trackingNumber.text.toString())
}
}
observeCancellation()
observe()
viewModel.loadInitial(applicationNo)
}
private fun showCancelDialog() {
val detail = viewModel.loadedDetail ?: return
if (
detail.direction != "SENT" || detail.status != "RECEIVED" || cancelDialog != null ||
viewModel.isSubmitting.value == true
) {
return
}
cancelDialog = giftCancelDialog(detail.giftInfo.recipientCreatorNickname, onConfirm = {
viewModel.loadedDetail?.let(cancelViewModel::cancelGift)
}, onExit = { cancelDialog = null }).also { it.show(screenWidth) }
}
private fun observeCancellation() {
cancelViewModel.isSubmitting.observe(this) { submitting ->
cancelDialog?.dialogView?.tvConfirm?.isEnabled = !submitting
cancelDialog?.dialogView?.tvCancel?.isEnabled = !submitting
updateCtaState()
}
cancelViewModel.toastLiveData.observe(this) { toast ->
if (toast != null) {
cancelViewModel.consumeToast()?.let {
showToast(it.resId?.let(::getString) ?: it.message.orEmpty())
}
}
}
cancelViewModel.cancelSuccessLiveData.observe(this) { response ->
if (response != null) {
cancelViewModel.consumeCancelSuccessEvent()?.let {
cancelDialog?.dismiss()
cancelDialog = null
showToast(getString(R.string.gift_cancel_success))
setResult(Activity.RESULT_OK, GiftCancelResult.toIntent(applicationNo, it))
finish()
}
}
}
}
private fun observe() {
viewModel.state.observe(this, ::render)
viewModel.isSubmitting.observe(this) { submitting ->
if (submitting) {
val dialog = loadingDialog ?: LoadingDialog(this, layoutInflater).also { loadingDialog = it }
dialog.show(screenWidth)
} else {
loadingDialog?.dismiss()
}
binding.courier.isEnabled = !submitting
binding.trackingNumber.isEnabled = !submitting
updateCtaState()
}
viewModel.toastLiveData.observe(this) { toast ->
if (toast != null) {
viewModel.consumeToast()?.let { showToast(it.resId?.let(::getString) ?: it.message.orEmpty()) }
}
}
viewModel.ineligibleLiveData.observe(this) { requested ->
if (requested && viewModel.consumeIneligibleEvent()) {
val detail = (viewModel.state.value as? GiftTrackingUiState.Content)?.detail
showToast(
getString(
if (detail != null && detail.mailbox == null) {
R.string.gift_tracking_missing_mailbox
} else {
R.string.gift_tracking_ineligible
}
)
)
finish()
}
}
viewModel.submitSuccessLiveData.observe(this) { success ->
if (success && viewModel.consumeSubmitSuccessEvent()) {
showToast(getString(R.string.gift_tracking_success))
setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_APPLICATION_NO, applicationNo))
finish()
}
}
}
private fun render(state: GiftTrackingUiState) {
binding.progress.isVisible = state == GiftTrackingUiState.Loading
binding.error.isVisible = state is GiftTrackingUiState.Error
binding.content.isVisible = state is GiftTrackingUiState.Content
binding.actions.isVisible = state is GiftTrackingUiState.Content
when (state) {
GiftTrackingUiState.Loading -> Unit
is GiftTrackingUiState.Error -> binding.errorMessage.text = state.message?.takeIf { it.isNotBlank() }
?: getString(R.string.common_error_unknown)
is GiftTrackingUiState.Content -> bind(state.detail)
}
updateCtaState()
}
private fun bind(model: GiftTrackingUiModel) {
GiftInfoRows.bind(
binding.summary,
listOf(
R.string.gift_send_recipient to model.recipientCreatorNickname,
R.string.gift_detail_application_no to model.applicationNo,
R.string.gift_send_size to model.sizeName,
R.string.gift_send_category to model.categoryName,
R.string.gift_detail_paid_can to model.paidCan?.let { getString(R.string.gift_detail_can_amount, it) },
R.string.gift_tracking_application_date to model.applicationDate
)
)
GiftInfoRows.bind(
binding.mailbox,
listOf(
R.string.gift_send_name to model.mailbox?.name,
R.string.gift_send_phone to model.mailbox?.phoneNumber,
R.string.gift_send_address to model.mailbox?.address
),
labelWidth = 72
)
}
private fun selectedCourier(): String? = giftCourierCompanyNames.getOrNull(binding.courier.selectedItemPosition - 1)
private fun updateCtaState() {
val trackingNumber = binding.trackingNumber.text.toString()
val hasError = GiftTrackingPresenter.hasTrackingNumberError(trackingNumber)
binding.trackingNumberError.isVisible = hasError
binding.trackingNumber.setBackgroundResource(
if (hasError) R.drawable.bg_gift_send_input_error else R.drawable.bg_creator_channel_fantalk_reply
)
val detail = viewModel.loadedDetail
val idle = viewModel.isSubmitting.value != true && cancelViewModel.isSubmitting.value != true
binding.cancel.isVisible = detail?.direction == "SENT" && detail.status == "RECEIVED"
binding.cancel.isEnabled = idle
binding.cancel.setTextColor(ContextCompat.getColor(this, if (idle) R.color.white else R.color.gray_500))
val eligible = (viewModel.state.value as? GiftTrackingUiState.Content)?.detail?.isEligible == true
val enabled = eligible && idle &&
GiftTrackingPresenter.isSubmitEnabled(selectedCourier(), trackingNumber)
binding.submit.isEnabled = enabled
binding.submit.setTextColor(ContextCompat.getColor(this, if (enabled) R.color.white else R.color.gray_500))
binding.submit.setBackgroundResource(
if (enabled) {
R.drawable.bg_creator_channel_fantalk_write_send_enabled
} else {
R.drawable.bg_creator_channel_fantalk_write_send_disabled
}
)
}
override fun onDestroy() {
cancelDialog?.dismiss()
loadingDialog?.dismiss()
super.onDestroy()
}
companion object {
const val EXTRA_APPLICATION_NO = GiftDetailActivity.EXTRA_APPLICATION_NO
fun newIntent(context: Context, applicationNo: String): Intent =
Intent(context, GiftTrackingActivity::class.java).putExtra(EXTRA_APPLICATION_NO, applicationNo)
}
}