-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PaywallsV2] Improve
ButtonComponentView to handle disabling the bu…
…tton and add `PurchasePackage` action (#1984) ### Description This PR does 2 things: - Makes `ButtonComponentStyle`'s `actionHandler` a suspendable function, and disables the button clickability until previous taps have finished processing. - Adds `PurchasePackage` to the available `PaywallAction` sealed interface.
- Loading branch information
Showing
4 changed files
with
126 additions
and
3 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
108 changes: 108 additions & 0 deletions
108
...in/com/revenuecat/purchases/ui/revenuecatui/components/button/ButtonComponentViewTests.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.revenuecat.purchases.ui.revenuecatui.components.button | ||
|
|
||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.toArgb | ||
| import androidx.compose.ui.test.junit4.createComposeRule | ||
| import androidx.compose.ui.test.onNodeWithText | ||
| import androidx.compose.ui.test.performClick | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import com.revenuecat.purchases.paywalls.components.properties.ColorInfo | ||
| import com.revenuecat.purchases.paywalls.components.properties.ColorScheme | ||
| import com.revenuecat.purchases.paywalls.components.properties.Dimension | ||
| import com.revenuecat.purchases.paywalls.components.properties.FlexDistribution.START | ||
| import com.revenuecat.purchases.paywalls.components.properties.FontSize | ||
| import com.revenuecat.purchases.paywalls.components.properties.FontWeight | ||
| import com.revenuecat.purchases.paywalls.components.properties.HorizontalAlignment | ||
| import com.revenuecat.purchases.paywalls.components.properties.Padding | ||
| import com.revenuecat.purchases.paywalls.components.properties.Size | ||
| import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint.Fill | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.PaywallAction | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.properties.BackgroundStyle | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.properties.BorderStyle | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyle.Solid | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.properties.ShadowStyle | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.style.ButtonComponentStyle | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.style.StackComponentStyle | ||
| import com.revenuecat.purchases.ui.revenuecatui.components.style.TextComponentStyle | ||
| import kotlinx.coroutines.CompletableDeferred | ||
| import kotlinx.coroutines.delay | ||
| import org.assertj.core.api.Assertions.assertThat | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class ButtonComponentViewTests { | ||
|
|
||
| @get:Rule | ||
| val composeTestRule = createComposeRule() | ||
|
|
||
| @Test | ||
| fun `onClick ignores further clicks until processing current click is done`() { | ||
| var actionHandleCalledCount = 0 | ||
| val completable = CompletableDeferred<Unit>() | ||
|
|
||
| composeTestRule.setContent { | ||
| val style = ButtonComponentStyle( | ||
| stackComponentStyle = StackComponentStyle( | ||
| visible = true, | ||
| children = listOf( | ||
| TextComponentStyle( | ||
| visible = true, | ||
| text = "Purchase", | ||
| color = ColorScheme( | ||
| light = ColorInfo.Hex(Color.Black.toArgb()), | ||
| ), | ||
| fontSize = FontSize.BODY_M, | ||
| fontWeight = FontWeight.REGULAR, | ||
| fontFamily = null, | ||
| textAlign = HorizontalAlignment.CENTER, | ||
| horizontalAlignment = HorizontalAlignment.CENTER, | ||
| backgroundColor = ColorScheme( | ||
| light = ColorInfo.Hex(Color.Yellow.toArgb()), | ||
| ), | ||
| size = Size(width = Fill, height = Fill), | ||
| padding = Padding(top = 8.0, bottom = 8.0, leading = 8.0, trailing = 8.0), | ||
| margin = Padding(top = 0.0, bottom = 24.0, leading = 0.0, trailing = 24.0), | ||
| ), | ||
| ), | ||
| dimension = Dimension.Vertical(alignment = HorizontalAlignment.CENTER, distribution = START), | ||
| size = Size(width = Fill, height = Fill), | ||
| spacing = 16.dp, | ||
| background = BackgroundStyle.Color(Solid(Color.Red)), | ||
| padding = PaddingValues(all = 16.dp), | ||
| margin = PaddingValues(all = 16.dp), | ||
| shape = RoundedCornerShape(size = 20.dp), | ||
| border = BorderStyle(width = 2.dp, color = Solid(Color.Blue)), | ||
| shadow = ShadowStyle(color = Solid(Color.Black), radius = 10.dp, x = 0.dp, y = 3.dp), | ||
| ), | ||
| action = PaywallAction.PurchasePackage, | ||
| actionHandler = { | ||
| actionHandleCalledCount++ | ||
| completable.await() | ||
| } | ||
| ) | ||
| ButtonComponentView(style = style) | ||
| } | ||
|
|
||
| val purchaseButton = composeTestRule.onNodeWithText("Purchase") | ||
| purchaseButton.assertExists() | ||
| purchaseButton.performClick() | ||
| purchaseButton.performClick() | ||
| purchaseButton.performClick() | ||
|
|
||
| assertThat(actionHandleCalledCount).isEqualTo(1) | ||
|
|
||
| completable.complete(Unit) | ||
|
|
||
| assertThat(actionHandleCalledCount).isEqualTo(1) | ||
|
|
||
| purchaseButton.performClick() | ||
|
|
||
| assertThat(actionHandleCalledCount).isEqualTo(2) | ||
| } | ||
|
|
||
| } |