Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace references to identity cards with identity document (fixes #9829) #9829

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Replace references to identity cards with identity document (fixes #9829) #9829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62a4146
Replace references to identity cards with identity document
kentwilliams-stripe Dec 24, 2024
3de6e68
Revert "Replace references to identity cards with identity document"
kentwilliams-stripe Dec 24, 2024
ef4b555
Use stripe_front_of_id_document / stripe_back_of_id_document
kentwilliams-stripe Dec 25, 2024
0224a4a
Style
kentwilliams-stripe Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions identity/src/main/java/com/stripe/android/identity/ui/DocumentScanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ private fun DocumentCaptureScreen(
}

val title = if (targetScanType.isNullOrFront()) {
stringResource(id = R.string.stripe_front_of_id)
stringResource(id = R.string.stripe_front_of_id_document)
} else {
stringResource(id = R.string.stripe_back_of_id)
stringResource(id = R.string.stripe_back_of_id_document)
}

Column(
Expand Down
10 changes: 8 additions & 2 deletions identity/src/main/java/com/stripe/android/identity/ui/UploadScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ internal fun UploadImageDialog(
end = 24.dp
),
text = stringResource(
id = if (isFront) R.string.stripe_front_of_id else R.string.stripe_back_of_id
id = if (isFront) R.string.stripe_front_of_id_document else R.string.stripe_back_of_id_document
),
style = MaterialTheme.typography.subtitle1,
fontWeight = FontWeight.Bold
Expand Down Expand Up @@ -389,7 +389,13 @@ private fun SingleSideUploadRow(
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
text = stringResource(id = if (isFront) R.string.stripe_front_of_id else R.string.stripe_back_of_id),
text = stringResource(
id = if (isFront) {
R.string.stripe_front_of_id_document
} else {
R.string.stripe_back_of_id_document
}
),
modifier = Modifier.align(CenterVertically)
)
when (uploadUiState) {
Expand Down
8 changes: 4 additions & 4 deletions identity/src/test/java/com/stripe/android/identity/ui/DocumentScanScreenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class DocumentScanScreenTest {
testDocumentScanScreen(
scannerState = IdentityScanViewModel.State.Scanning(),
) {
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_front_of_id))
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_front_of_id_document))
onNodeWithTag(SCAN_MESSAGE_TAG).assertTextEquals(context.getString(R.string.stripe_position_id_front))
onNodeWithTag(CHECK_MARK_TAG).assertDoesNotExist()
onNodeWithTag(CONTINUE_BUTTON_TAG).onChildAt(0).assertIsNotEnabled()
Expand All @@ -116,7 +116,7 @@ class DocumentScanScreenTest {
eq(IdentityScanState.ScanType.DOC_FRONT),
any()
)
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_front_of_id))
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_front_of_id_document))
onNodeWithTag(SCAN_MESSAGE_TAG).assertTextEquals(context.getString(R.string.stripe_hold_still))
onNodeWithTag(CHECK_MARK_TAG).assertDoesNotExist()
onNodeWithTag(CONTINUE_BUTTON_TAG).onChildAt(0).assertIsNotEnabled()
Expand All @@ -135,7 +135,7 @@ class DocumentScanScreenTest {
eq(IdentityScanState.ScanType.DOC_BACK),
any()
)
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_back_of_id))
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_back_of_id_document))
onNodeWithTag(SCAN_MESSAGE_TAG).assertTextEquals(context.getString(R.string.stripe_hold_still))
onNodeWithTag(CHECK_MARK_TAG).assertDoesNotExist()
onNodeWithTag(CONTINUE_BUTTON_TAG).onChildAt(0).assertIsNotEnabled()
Expand All @@ -156,7 +156,7 @@ class DocumentScanScreenTest {
messageId = R.string.stripe_scanned
) {
verify(mockDocumentScanViewModel).stopScan(any())
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_front_of_id))
onNodeWithTag(SCAN_TITLE_TAG).assertTextEquals(context.getString(R.string.stripe_front_of_id_document))
onNodeWithTag(SCAN_MESSAGE_TAG).assertTextEquals(context.getString(R.string.stripe_scanned))
onNodeWithTag(CHECK_MARK_TAG).assertExists()
onNodeWithTag(CONTINUE_BUTTON_TAG).onChildAt(0).assertIsEnabled()
Expand Down
Loading