feat(gift): 선물 정책 링크를 연결한다
This commit is contained in:
@@ -69,7 +69,7 @@ class GiftDetailActivity : BaseActivity<ActivityGiftDetailBinding>(ActivityGiftD
|
||||
binding.inquiry.setOnClickListener { viewModel.onInquiryClick() }
|
||||
binding.undeliverableInquiry.setOnClickListener { viewModel.onInquiryClick() }
|
||||
binding.receivedInquiry.setOnClickListener { viewModel.onInquiryClick() }
|
||||
binding.policy.setOnClickListener { viewModel.onPolicyClick() }
|
||||
binding.policy.setOnClickListener { openGiftAgreementPage() }
|
||||
setupRecipientForm()
|
||||
binding.timeline.layoutManager = GridLayoutManager(this, 4)
|
||||
binding.timeline.adapter = timelineAdapter
|
||||
@@ -224,13 +224,6 @@ 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) {
|
||||
|
||||
@@ -28,8 +28,6 @@ class GiftDetailViewModel(private val repository: GiftRepository) : BaseViewMode
|
||||
val finishErrorLiveData: LiveData<ToastMessage?> = mutableFinishError
|
||||
private val mutableInquiry = MutableLiveData(false)
|
||||
val inquiryLiveData: LiveData<Boolean> = mutableInquiry
|
||||
private val mutableToast = MutableLiveData<ToastMessage?>()
|
||||
val toastLiveData: LiveData<ToastMessage?> = mutableToast
|
||||
private var applicationNo: String? = null
|
||||
private var pendingCancellation: GiftCancelResponse? = null
|
||||
|
||||
@@ -72,12 +70,6 @@ class GiftDetailViewModel(private val repository: GiftRepository) : BaseViewMode
|
||||
mutableInquiry.value = true
|
||||
}
|
||||
|
||||
fun onPolicyClick() {
|
||||
mutableToast.value = ToastMessage(resId = R.string.creator_channel_more_ready)
|
||||
}
|
||||
|
||||
fun consumeToast(): ToastMessage? = mutableToast.value.also { mutableToast.value = null }
|
||||
|
||||
fun consumeInquiryIntent(): Intent? {
|
||||
if (mutableInquiry.value != true) return null
|
||||
mutableInquiry.value = false
|
||||
|
||||
@@ -13,7 +13,6 @@ import io.reactivex.rxjava3.subjects.SingleSubject
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.v2.gift.data.GiftApi
|
||||
import kr.co.vividnext.sodalive.v2.gift.data.GiftCancelResponse
|
||||
import kr.co.vividnext.sodalive.v2.gift.data.GiftDeliveryResponse
|
||||
@@ -245,18 +244,6 @@ class GiftDetailViewModelTest {
|
||||
assertEquals(GiftDetailUiState.Content(detail("TRACKING_REGISTERED")), viewModel.state.value)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `선물 정책 action은 외부 intent 없이 준비 중 toast를 한 번만 보낸다`() {
|
||||
assertNull(viewModel.consumeToast())
|
||||
|
||||
viewModel.onPolicyClick()
|
||||
|
||||
assertEquals(ToastMessage(resId = R.string.creator_channel_more_ready), viewModel.toastLiveData.value)
|
||||
assertEquals(ToastMessage(resId = R.string.creator_channel_more_ready), viewModel.consumeToast())
|
||||
assertNull(viewModel.consumeToast())
|
||||
assertNull(viewModel.consumeInquiryIntent())
|
||||
}
|
||||
|
||||
private fun detail(status: String = "RECEIVED") = GiftDetailResponse(
|
||||
applicationNo = "test-gift", direction = "SENT", status = status, statusName = "상태",
|
||||
giftInfo = GiftDetailInfoResponse("가상 크리에이터", null, "소형", "도서", "test-gift", 100, null, null),
|
||||
|
||||
@@ -564,7 +564,7 @@ class GiftNavigationTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `받은 선물 전달 불가 정책은 토스트만 표시하고 문의는 기존 경로로 이동한다`() {
|
||||
fun `받은 선물 전달 불가 정책과 문의는 각각 지정된 외부 경로로 이동한다`() {
|
||||
api.direction = "RECEIVED"
|
||||
api.detailStatus = "UNDELIVERABLE"
|
||||
val controller = Robolectric.buildActivity(
|
||||
@@ -573,9 +573,13 @@ class GiftNavigationTest {
|
||||
).setup()
|
||||
val activity = controller.get()
|
||||
activity.binding.policy.performClick()
|
||||
assertEquals(activity.getString(R.string.creator_channel_more_ready), ShadowToast.getTextOfLatestToast())
|
||||
assertNull(shadowOf(activity).nextStartedActivity)
|
||||
assertNull(ViewModelProvider(activity)[GiftDetailViewModel::class.java].toastLiveData.value)
|
||||
val policyIntent = shadowOf(activity).nextStartedActivity
|
||||
assertEquals(Intent.ACTION_VIEW, policyIntent.action)
|
||||
assertEquals(
|
||||
"https://app.notion.com/p/3eb27b359673802b937ae741ab7b4ad3",
|
||||
policyIntent.data.toString()
|
||||
)
|
||||
assertNull(ShadowToast.getTextOfLatestToast())
|
||||
activity.binding.receivedInquiry.performClick()
|
||||
assertEquals("http://pf.kakao.com/_lkxgxhG/chat", shadowOf(activity).nextStartedActivity.data.toString())
|
||||
controller.pause().stop().destroy()
|
||||
|
||||
Reference in New Issue
Block a user