-
Notifications
You must be signed in to change notification settings - Fork 651
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add animation to remove button on UpdatePaymentMethodUI (#9633)
* Add animation to remove button on UpdatePaymentMethodUI * Update screenshots * Clear manual testing change * Fix lint issue * Ensure loading indicator stays until removing is complete * Fix compilation issue * Update screenshots
- Loading branch information
1 parent
72208d3
commit 701bcb0
Showing
23 changed files
with
322 additions
and
179 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
108 changes: 108 additions & 0 deletions
108
paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/RemoveButton.kt
This file contains 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,108 @@ | ||
| package com.stripe.android.paymentsheet.ui | ||
|
|
||
| import androidx.compose.foundation.BorderStroke | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.ContentAlpha | ||
| import androidx.compose.material.ExperimentalMaterialApi | ||
| import androidx.compose.material.LocalContentAlpha | ||
| import androidx.compose.material.LocalMinimumInteractiveComponentEnforcement | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.material.TextButton | ||
| import androidx.compose.material.ripple.LocalRippleTheme | ||
| import androidx.compose.material.ripple.RippleAlpha | ||
| import androidx.compose.material.ripple.RippleTheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.CompositionLocalProvider | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.platform.testTag | ||
| import androidx.compose.ui.res.dimensionResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.stripe.android.common.ui.LoadingIndicator | ||
| import com.stripe.android.core.strings.ResolvableString | ||
| import com.stripe.android.paymentsheet.R | ||
| import com.stripe.android.uicore.StripeTheme | ||
| import com.stripe.android.uicore.getBorderStrokeWidth | ||
| import com.stripe.android.uicore.getComposeTextStyle | ||
| import com.stripe.android.uicore.stripeShapes | ||
|
|
||
| @OptIn(ExperimentalMaterialApi::class) | ||
| @Composable | ||
| internal fun RemoveButton( | ||
| title: ResolvableString, | ||
| borderColor: Color, | ||
| idle: Boolean, | ||
| removing: Boolean, | ||
| onRemove: () -> Unit, | ||
| testTag: String, | ||
| ) { | ||
| CompositionLocalProvider( | ||
| LocalContentAlpha provides if (removing) ContentAlpha.disabled else ContentAlpha.high, | ||
| LocalRippleTheme provides ErrorRippleTheme | ||
| ) { | ||
| Box( | ||
| modifier = Modifier | ||
| .testTag(testTag) | ||
| .fillMaxWidth() | ||
| ) { | ||
| CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) { | ||
| TextButton( | ||
| modifier = Modifier | ||
| .align(Alignment.Center) | ||
| .fillMaxWidth() | ||
| .height(height = dimensionResource(id = R.dimen.stripe_paymentsheet_primary_button_height)), | ||
| border = BorderStroke( | ||
| width = MaterialTheme.getBorderStrokeWidth(isSelected = false), | ||
| color = borderColor, | ||
| ), | ||
| shape = MaterialTheme.stripeShapes.roundedCornerShape, | ||
| enabled = idle && !removing, | ||
| onClick = onRemove, | ||
| ) { | ||
| Text( | ||
| text = title.resolve(LocalContext.current), | ||
| color = MaterialTheme.colors.error.copy( | ||
| LocalContentAlpha.current | ||
| ), | ||
| style = StripeTheme.primaryButtonStyle.getComposeTextStyle(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| if (removing) { | ||
| LoadingIndicator( | ||
| modifier = Modifier.align(Alignment.CenterEnd) | ||
| .padding( | ||
| start = 8.dp, | ||
| end = 8.dp | ||
| ), | ||
| color = MaterialTheme.colors.error, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private object ErrorRippleTheme : RippleTheme { | ||
| @Composable | ||
| override fun defaultColor(): Color { | ||
| return RippleTheme.defaultRippleColor( | ||
| MaterialTheme.colors.error, | ||
| lightTheme = MaterialTheme.colors.isLight | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| override fun rippleAlpha(): RippleAlpha { | ||
| return RippleTheme.defaultRippleAlpha( | ||
| MaterialTheme.colors.error.copy(alpha = 0.25f), | ||
| lightTheme = MaterialTheme.colors.isLight | ||
| ) | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.