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

Jump to bottom

Paywalls: Support footer in template 3 #1367

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Paywalls: Support footer in template 3 #1367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 35 additions & 14 deletions ...enuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/templates/Template3.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand All @@ -26,6 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.revenuecat.purchases.paywalls.PaywallData
import com.revenuecat.purchases.ui.revenuecatui.InternalPaywall
import com.revenuecat.purchases.ui.revenuecatui.PaywallMode
import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions
import com.revenuecat.purchases.ui.revenuecatui.UIConstant
import com.revenuecat.purchases.ui.revenuecatui.composables.Footer
Expand All @@ -37,6 +37,7 @@ import com.revenuecat.purchases.ui.revenuecatui.composables.PaywallIconName
import com.revenuecat.purchases.ui.revenuecatui.composables.PurchaseButton
import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
import com.revenuecat.purchases.ui.revenuecatui.data.PaywallViewModel
import com.revenuecat.purchases.ui.revenuecatui.data.isInFullScreenMode
import com.revenuecat.purchases.ui.revenuecatui.data.processed.TemplateConfiguration
import com.revenuecat.purchases.ui.revenuecatui.data.selectedLocalization
import com.revenuecat.purchases.ui.revenuecatui.data.testdata.MockViewModel
Expand All @@ -56,20 +57,22 @@ internal fun Template3(
viewModel: PaywallViewModel,
) {
Column(
modifier = Modifier.fillMaxSize(),
modifier = Modifier.fillMaxWidth(),
) {
Column(
modifier = Modifier
.weight(1f)
.fillMaxWidth()
.padding(
horizontal = UIConstant.defaultHorizontalPadding,
vertical = UIConstant.defaultVerticalSpacing,
),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(UIConstant.defaultVerticalSpacing, Alignment.Top),
) {
Template3MainContent(state)
if (state.isInFullScreenMode) {
Column(
modifier = Modifier
.weight(1f)
.fillMaxWidth()
.padding(
horizontal = UIConstant.defaultHorizontalPadding,
vertical = UIConstant.defaultVerticalSpacing,
),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(UIConstant.defaultVerticalSpacing, Alignment.Top),
) {
Template3MainContent(state)
}
}
OfferDetails(state)
PurchaseButton(state, viewModel)
Expand Down Expand Up @@ -183,3 +186,21 @@ private fun Template3Preview() {
viewModel = MockViewModel(offering = TestData.template3Offering),
)
}

@Preview(showBackground = true)
@Composable
private fun Template3FooterPreview() {
InternalPaywall(
options = PaywallOptions.Builder().build(),
viewModel = MockViewModel(mode = PaywallMode.FOOTER, offering = TestData.template3Offering),
)
}

@Preview(showBackground = true)
@Composable
private fun Template3CondensedFooterPreview() {
InternalPaywall(
options = PaywallOptions.Builder().build(),
viewModel = MockViewModel(mode = PaywallMode.FOOTER_CONDENSED, offering = TestData.template3Offering),
)
}