-
Notifications
You must be signed in to change notification settings - Fork 728
Display errors in NFC scanning flow #13391
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.
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
Draft
samer-stripe
wants to merge
1
commit into
master
Choose a base branch
from
samer/improve-errors-nfc-card-reader
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
221 changes: 221 additions & 0 deletions
221
paymentsheet/src/main/java/com/stripe/android/common/nfcscan/ui/NfcCoilTextLayout.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| package com.stripe.android.common.nfcscan.ui | ||
|
|
||
| import androidx.compose.animation.AnimatedVisibility | ||
| import androidx.compose.animation.fadeIn | ||
| import androidx.compose.animation.fadeOut | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.text.appendInlineContent | ||
| import androidx.compose.material.Icon | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.layout.Layout | ||
| import androidx.compose.ui.layout.Measurable | ||
| import androidx.compose.ui.layout.MeasureResult | ||
| import androidx.compose.ui.layout.MeasureScope | ||
| import androidx.compose.ui.layout.Placeable | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.PlaceholderVerticalAlign | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.unit.Constraints | ||
| import androidx.compose.ui.unit.Dp | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import com.stripe.android.common.nfcscan.tapzone.TapZone | ||
| import com.stripe.android.common.ui.InlineContentTemplateBuilder | ||
| import com.stripe.android.core.strings.ResolvableString | ||
| import com.stripe.android.paymentsheet.R | ||
| import com.stripe.android.uicore.strings.resolve | ||
| import kotlin.math.roundToInt | ||
| import com.stripe.payments.model.R as PaymentsModelR | ||
|
|
||
| private val TopTextOffset = (-55).dp | ||
| private val BottomTextOffset = 30.dp | ||
| private val InstructionTextEdgePadding = 20.dp | ||
| private val ErrorTextTopSpacing = 8.dp | ||
|
|
||
| @Composable | ||
| internal fun NfcCoilTextLayout( | ||
| containerWidth: Dp, | ||
| containerHeight: Dp, | ||
| tapZone: TapZone, | ||
| coilSize: Dp, | ||
| shouldRenderTextAboveCoil: Boolean, | ||
| canShow: Boolean, | ||
| error: ResolvableString?, | ||
| ) { | ||
| Layout( | ||
| content = { | ||
| NfcCoilInstructionText(canShow = canShow) | ||
| if (error != null) { | ||
| NfcCoilErrorText( | ||
| message = error, | ||
| canShow = canShow, | ||
| ) | ||
| } | ||
| }, | ||
| ) { measurables, constraints -> | ||
| placeCoilTextElements( | ||
| containerWidth = containerWidth, | ||
| containerHeight = containerHeight, | ||
| tapZone = tapZone, | ||
| coilSize = coilSize, | ||
| shouldRenderTextAboveCoil = shouldRenderTextAboveCoil, | ||
| measurables = measurables, | ||
| constraints = constraints, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun MeasureScope.placeCoilTextElements( | ||
| containerWidth: Dp, | ||
| containerHeight: Dp, | ||
| tapZone: TapZone, | ||
| coilSize: Dp, | ||
| measurables: List<Measurable>, | ||
| constraints: Constraints, | ||
| shouldRenderTextAboveCoil: Boolean, | ||
| ): MeasureResult { | ||
| val horizontalBias = tapZone.xBias * 2 - 1 | ||
| val verticalBias = tapZone.yBias * 2 - 1 | ||
|
|
||
| val containerWidthPx = containerWidth.roundToPx() | ||
| val containerHeightPx = containerHeight.roundToPx() | ||
|
|
||
| if (measurables.isEmpty()) { | ||
| return layout(containerWidthPx, containerHeightPx) {} | ||
| } | ||
|
|
||
| val coilSizePx = coilSize.roundToPx() | ||
| val edgePaddingPx = InstructionTextEdgePadding.roundToPx() | ||
| val textConstraints = constraints.copy( | ||
| maxWidth = (containerWidthPx - edgePaddingPx * 2).coerceAtLeast(0), | ||
| ) | ||
|
|
||
| val instructionPlaceable = measurables[0].measure(textConstraints) | ||
| val errorPlaceable = measurables.getOrNull(1)?.measure(textConstraints) | ||
|
|
||
| val coilBoxLeft = ((containerWidthPx - coilSizePx) / 2f * (1f + horizontalBias)).roundToInt() | ||
| val coilBoxTop = ((containerHeightPx - coilSizePx) / 2f * (1f + verticalBias)).roundToInt() | ||
| val coilCenterX = coilBoxLeft + coilSizePx / 2 | ||
|
|
||
| val instructionY = if (shouldRenderTextAboveCoil) { | ||
| coilBoxTop + TopTextOffset.roundToPx() | ||
| } else { | ||
| coilBoxTop + coilSizePx + BottomTextOffset.roundToPx() | ||
| } | ||
|
|
||
| return layout(containerWidthPx, containerHeightPx) { | ||
| if (instructionPlaceable.width > 0 && instructionPlaceable.height > 0) { | ||
| instructionPlaceable.placeRelative( | ||
| x = clampedTextX( | ||
| placeable = instructionPlaceable, | ||
| coilCenterX = coilCenterX, | ||
| containerWidthPx = containerWidthPx, | ||
| edgePaddingPx = edgePaddingPx, | ||
| ), | ||
| y = instructionY, | ||
| ) | ||
| } | ||
|
|
||
| errorPlaceable?.let { placeable -> | ||
| if (placeable.width > 0 && placeable.height > 0) { | ||
| val errorY = instructionY + | ||
| instructionPlaceable.height + | ||
| ErrorTextTopSpacing.roundToPx() | ||
|
|
||
| placeable.placeRelative( | ||
| x = clampedTextX( | ||
| placeable = placeable, | ||
| coilCenterX = coilCenterX, | ||
| containerWidthPx = containerWidthPx, | ||
| edgePaddingPx = edgePaddingPx, | ||
| ), | ||
| y = errorY, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun clampedTextX( | ||
| placeable: Placeable, | ||
| coilCenterX: Int, | ||
| containerWidthPx: Int, | ||
| edgePaddingPx: Int, | ||
| ): Int { | ||
| val desiredTextStartX = coilCenterX - placeable.width / 2 | ||
| return desiredTextStartX.coerceIn( | ||
| edgePaddingPx, | ||
| (containerWidthPx - edgePaddingPx - placeable.width).coerceAtLeast(edgePaddingPx), | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun NfcCoilInstructionText( | ||
| canShow: Boolean, | ||
| ) { | ||
| AnimatedVisibility( | ||
| visible = canShow, | ||
| enter = fadeIn(), | ||
| exit = fadeOut(), | ||
| ) { | ||
| Text( | ||
| text = stringResource(R.string.stripe_nfc_scan_hold_card_behind_phone), | ||
| color = MaterialTheme.colors.onSurface, | ||
| style = MaterialTheme.typography.h4.copy(fontWeight = FontWeight.Bold), | ||
| textAlign = TextAlign.Center, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun NfcCoilErrorText( | ||
| message: ResolvableString, | ||
| canShow: Boolean, | ||
| ) { | ||
| AnimatedVisibility( | ||
| visible = canShow, | ||
| enter = fadeIn(), | ||
| exit = fadeOut(), | ||
| ) { | ||
| val textStyle = MaterialTheme.typography.body1 | ||
| val fontSize = textStyle.fontSize | ||
|
|
||
| Text( | ||
| text = buildAnnotatedString { | ||
| appendInlineContent(ERROR_ICON_ID) | ||
| appendInlineContent(ERROR_SPACER_ID) | ||
| append(message.resolve()) | ||
| }, | ||
| inlineContent = InlineContentTemplateBuilder() | ||
| .add( | ||
| id = ERROR_ICON_ID, | ||
| width = fontSize, | ||
| height = fontSize, | ||
| align = PlaceholderVerticalAlign.TextCenter | ||
| ) { | ||
| Icon( | ||
| painter = painterResource(PaymentsModelR.drawable.stripe_ic_error), | ||
| contentDescription = null, | ||
| tint = MaterialTheme.colors.error, | ||
| modifier = Modifier.fillMaxSize() | ||
| ) | ||
| } | ||
| .addSpacer(ERROR_SPACER_ID, ERROR_SPACER_WIDTH) | ||
| .build(), | ||
| color = MaterialTheme.colors.error, | ||
| style = textStyle, | ||
| textAlign = TextAlign.Center, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private const val ERROR_SPACER_ID = "ERROR_SPACER" | ||
| private val ERROR_SPACER_WIDTH = 5.sp | ||
|
|
||
| private const val ERROR_ICON_ID = "ERROR_ICON_ID" |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will also output an error code that will be sent alongside our analytics in a follow-up.