diff --git a/app/src/main/res/layout/activity_gift_detail.xml b/app/src/main/res/layout/activity_gift_detail.xml index 8c6768a6..db8002e9 100644 --- a/app/src/main/res/layout/activity_gift_detail.xml +++ b/app/src/main/res/layout/activity_gift_detail.xml @@ -307,7 +307,7 @@ style="@style/Typography.Body1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/gift_detail_recipient_address" + android:text="@string/gift_detail_recipient_address_input" android:textColor="@color/white" /> Delivery date Cancellation date SODALIVE mailbox - My delivery address + Delivery address + Enter delivery address Enter tracking information Cancellation details Cans refunded diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1ca95236..04907e0b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -55,7 +55,8 @@ お届け完了日 キャンセル日 SODALIVE私書箱 - 自分の配送先 + 受取住所 + 配送先を入力 追跡情報を入力する キャンセル詳細 返金される缶 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 10c91e60..17e74e3b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -55,7 +55,8 @@ 전달 완료일 취소일 소다라이브 사서함 - 내 배송지 + 받는 주소 + 배송지 입력 운송장 작성하기 취소 상세 환불 캔 diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt index f0d2c327..7534b186 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt @@ -274,18 +274,32 @@ class GiftDetailViewModelTest { } ) mapOf( - Locale.KOREAN to Triple("크리에이터", "취소 완료", "받는 사서함"), - Locale.ENGLISH to Triple("Creator", "Cancellation complete", "Receiving mailbox"), - Locale.JAPANESE to Triple("クリエイター", "キャンセル完了", "受取私書箱") + Locale.KOREAN to listOf("크리에이터", "취소 완료", "받는 사서함", "받는 주소", "배송지 입력"), + Locale.ENGLISH to listOf( + "Creator", + "Cancellation complete", + "Receiving mailbox", + "Delivery address", + "Enter delivery address" + ), + Locale.JAPANESE to listOf("クリエイター", "キャンセル完了", "受取私書箱", "受取住所", "配送先を入力") ).forEach { (locale, expected) -> val localized = context.createConfigurationContext( Configuration(context.resources.configuration).apply { setLocale(locale) } ) - assertEquals(expected.first, localized.getString(R.string.gift_detail_counterpart)) - assertEquals(expected.second, localized.resolveGiftDetailText(GiftDetailText.Key.CANCELED_LABEL)) - assertEquals(expected.third, localized.getString(R.string.gift_tracking_destination)) + assertEquals(expected[0], localized.getString(R.string.gift_detail_counterpart)) + assertEquals(expected[1], localized.resolveGiftDetailText(GiftDetailText.Key.CANCELED_LABEL)) + assertEquals(expected[2], localized.getString(R.string.gift_tracking_destination)) + assertEquals(expected[3], localized.getString(R.string.gift_detail_recipient_address)) + val inputId = localized.resources.getIdentifier( + "gift_detail_recipient_address_input", + "string", + localized.packageName + ) + assertTrue(inputId != 0) + assertEquals(expected[4], localized.getString(inputId)) GiftDetailText.Key.entries.forEach { key -> val text = localized.resolveGiftDetailText(key) assertTrue(text.isNotBlank()) diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftNavigationTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftNavigationTest.kt index 85aea8b5..9c392bef 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftNavigationTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftNavigationTest.kt @@ -398,6 +398,7 @@ class GiftNavigationTest { val recipient = ViewModelProvider(activity)[GiftRecipientAddressViewModel::class.java] with(activity.binding) { assertEquals(activity.getString(R.string.gift_recipient_receive), header.text.toString()) + assertEquals("배송지 입력", recipientForm.children.filterIsInstance().first().text.toString()) assertFalse(receive.isEnabled) etRecipientName.setText("수령인") etPhoneNumber.setText("01012345678") @@ -519,6 +520,7 @@ class GiftNavigationTest { } @Test + @Config(qualifiers = "ko") fun `받은 선물 완료 상태는 모델의 정보 행과 본인 주소 및 전달 안내를 연결한다`() { api.direction = "RECEIVED" api.recipientAddressRequired = false @@ -531,6 +533,12 @@ class GiftNavigationTest { GiftDetailActivity.newIntent(ApplicationProvider.getApplicationContext(), "completed-gift") ).setup() val activity = controller.get() + if (address != null) { + assertEquals( + "받는 주소", + activity.binding.recipientSection.children.filterIsInstance().first().text.toString() + ) + } val values = activity.binding.giftInfo.children.map { it.findViewById(R.id.value).text.toString() }.toList()