Prices in accept promotional offer button by vegaro · Pull Request #2104 · RevenueCat/purchases-android

vegaro · 2025-01-31T13:41:15Z

Checklist

If applicable, unit tests
If applicable, create follow-up issues for purchases-ios and hybrids

Motivation

Description

emerge-tools · 2025-01-31T13:55:35Z

📸 Snapshot Test

1 modified, 186 unchanged

Name	Added	Removed	Modified	Renamed	Unchanged	Errored	Approval
TestPurchasesUIAndroidCompatibility com.revenuecat.testpurchasesuiandroidcompatibility	0	0	1	0	186	5	✅ Approved

🛸 Powered by Emerge Tools

tonidero

LGTM! Just some comments and questions

tonidero · 2025-02-03T09:47:14Z

+@file:JvmSynthetic
+@file:OptIn(ExperimentalPreviewRevenueCatPurchasesAPI::class)
+
+package com.revenuecat.purchases.ui.revenuecatui.customercenter.extensions


Hmm I wonder if it makes sense to move this outside the customercenter package, and make it more generic in case we want to use them for paywalls... (I'm honestly not sure if we would like to use these extensions in Paywalls though cc @JayShortway)

Thanks for pinging! They do seem very Customer Center specific. Also, the variables are different from paywalls. So I think it's fine to leave them here for now.

tonidero · 2025-02-03T09:54:30Z

+import com.revenuecat.purchases.models.toRecurrenceMode
+
+@SuppressWarnings("LongParameterList")
+internal fun stubSubscriptionOption(


Additionally, what do you think about naming this previewSubscriptionOption? And the file could also be something like PreviewDataFactory or something like that. I feel that's a better naming than stub so we don't confuse this with test code

I am actually using stubPricingPhase in tests (SubscriptionOptionExtensionsTest) as well, to avoid duplication. What do you think?

Right, I think it makes sense! But I still think it feels weird to add "stubs" to production code, which is why I would like to use the "preview" naming, which can still be used in tests I think.

…show-prices # Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/views/PromotionalOfferView.kt

codecov · 2025-02-03T19:18:14Z

Codecov Report

Attention: Patch coverage is 26.31579% with 14 lines in your changes missing coverage. Please review.

Project coverage is 80.90%. Comparing base (68449fc) to head (0b5563b).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
...rchases/customercenter/CustomerCenterConfigData.kt	26.31%	14 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2104      +/-   ##
==========================================
- Coverage   81.01%   80.90%   -0.12%     
==========================================
  Files         272      272              
  Lines        9023     9042      +19     
  Branches     1276     1276              
==========================================
+ Hits         7310     7315       +5     
- Misses       1178     1192      +14     
  Partials      535      535

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@greenietea

**This is an automatic release.** ## RevenueCat SDK ### 🐞 Bugfixes * fix: Add prepaid as a period type (#2141) via Greenie (@greenietea) ## RevenueCatUI SDK ### Paywalls v2 #### ✨ New Features * [Paywalls V2] Adds support for Paywalls V2! (#2127) via JayShortway (@JayShortway) ### Customer Center #### ✨ New Features * Adds support for `CustomerCenter` (#2156) via Cesar de la Vega (@vegaro) ### 🔄 Other Changes * [Paywalls V2] Deprecate PaywallFooter in favor of OriginalTemplatePaywallFooter (#2111) via Toni Rico (@tonidero) * feat: Filter CANCEL from help path if lifetime (#2140) via Facundo Menzella (@facumenzella) * fix: Localize Restore Purchases Dialog (#2139) via Facundo Menzella (@facumenzella) * fix: Hide contact support if there's no email (#2135) via Facundo Menzella (@facumenzella) * feat: Track IMPRESSION and SURVER_OPTION_CHOSEN for CustomerCenter (#2124) via Facundo Menzella (@facumenzella) * fix: Use TextButton instead of outline for Promotionals (#2138) via Facundo Menzella (@facumenzella) * Rename carousel slide to page (#2144) via Josh Holtz (@joshdholtz) * [Paywalls V2] Make border draw on top of the image overlay (#2165) via Toni Rico (@tonidero) * [Paywalls V2] Gradients Reloaded: Makes linear gradients match CSS even more closely (#2166) via JayShortway (@JayShortway) * [Paywalls V2] Fix wrong spacers in Stack when some children are Fill (#2164) via Toni Rico (@tonidero) * chore: Unify Json encoding with JsonHelper (#2160) via Facundo Menzella (@facumenzella) * [Paywalls V2] Fixes the top system bar padding being applied to all children in a vertical container (#2162) via JayShortway (@JayShortway) * [Paywalls V2] Refactor to use a single ImageLoader singleton in RevenueCatUI (#2161) via Toni Rico (@tonidero) * [Paywalls V2] Apply stack margins to overlay badges (#2158) via Toni Rico (@tonidero) * [Paywalls V2] Disables the click handler for the selected package (#2159) via JayShortway (@JayShortway) * [Paywalls V2] Change stack distribution system to use spacers instead of custom arrangements (#2154) via Toni Rico (@tonidero) * [Paywalls V2] Fixes empty stacks not showing up. (#2157) via JayShortway (@JayShortway) * Explicitly sets the `defaults` flavor as the default. (#2155) via JayShortway (@JayShortway) * Updates on no active purchases screen (#2150) via Cesar de la Vega (@vegaro) * [Paywalls V2] Fix issue with sizing of stacks with nested badges (#2152) via Toni Rico (@tonidero) * [Paywalls V2] Fix issue with shadows overlapping long edgeToEdge badges (#2149) via Toni Rico (@tonidero) * [Paywalls V2] Adjusts the convex/concave offset to 10% of the image height (#2151) via JayShortway (@JayShortway) * [Paywalls V2] Fixes variables for multi month periods (#2148) via JayShortway (@JayShortway) * [Paywalls V2] Correctly handles variables for lifetime products (#2145) via JayShortway (@JayShortway) * [Paywalls V2] Add shadows to badge previews (#2147) via Toni Rico (@tonidero) * [Paywalls V2] Predownload paywall low res images (#2143) via Toni Rico (@tonidero) * [Paywalls V2] Makes linear gradients consistent with CSS (#2142) via JayShortway (@JayShortway) * [Paywalls V2] Adds edge-to-edge support (#2137) via JayShortway (@JayShortway) * [Paywalls V2] Make root stack component use all the available space by default (#2136) via Toni Rico (@tonidero) * [Paywalls V2] Avoids a crash if a package is missing (#2130) via JayShortway (@JayShortway) * [Paywalls V2] Fix stack clipping issues (#2126) via Toni Rico (@tonidero) * fix: Address typo and wrong doc for CustomerCenter events (#2133) via Facundo Menzella (@facumenzella) * [Paywalls V2] Fix merge conflict (#2134) via Toni Rico (@tonidero) * [Paywalls V2] Actually ignores the font provider for V2. (#2129) via JayShortway (@JayShortway) * Rename `PromotionalOfferView` to `PromotionalOfferScreen` (#2132) via Cesar de la Vega (@vegaro) * [Paywalls V2] Support background images in StackComponent, CarouselComponent, TabsComponent (#2131) via Toni Rico (@tonidero) * [Paywalls V2] Support scroll orientation in StackComponent (#2108) via Toni Rico (@tonidero) * [Paywalls V2] Correctly selects packages on tabs (#2122) via JayShortway (@JayShortway) * Revamp UI in Customer Center (#2123) via Cesar de la Vega (@vegaro) * [Paywalls V2] Remove cursive as a generic font (#2118) via Josh Holtz (@joshdholtz) * Publishes PaywallsTester to Internal testing track on every commit to `main` (#2100) via JayShortway (@JayShortway) * Fixes `X` in promo offer not dismissing the promo (#2110) via Cesar de la Vega (@vegaro) * [Paywalls V2] Published version of PaywallTester now uses the Paywalls V2 Alpha RC project (#2093) via JayShortway (@JayShortway) * [Paywalls V2] New overrides structure (#2120) via Toni Rico (@tonidero) * [Paywalls V2] Adds `TabsComponent` samples and tests (#2115) via JayShortway (@JayShortway) * Ignores `RestorePurchasesDialog` previews using `IgnoreEmergeSnapshot` (#2116) via Cesar de la Vega (@vegaro) * [Paywalls V2] Adds `TabsComponentView` (#2114) via JayShortway (@JayShortway) * Fixes "View field header collides with a variable" data binding error in PurchaseTester (#2119) via JayShortway (@JayShortway) * feat: Add support for tracking customer center events (#2117) via Facundo Menzella (@facumenzella) * [Paywalls V2] Adds `TabsComponentStyle` (#2113) via JayShortway (@JayShortway) * [Paywalls V2] Adds deserialization of `TabsComponent` (#2101) via JayShortway (@JayShortway) * [Paywalls V2] Implements Variables V2 (#2099) via JayShortway (@JayShortway) * refactor: Introduce EventsManager to track events for different features (#2096) via Facundo Menzella (@facumenzella) * Rename to Web Billing (#2094) via Antonio Borrero Granell (@antoniobg) * [Paywalls V2] Fixes shadows drawing behind transparent components (#2112) via JayShortway (@JayShortway) * Fix title not being reset after closing Feedback Survey (#2109) via Cesar de la Vega (@vegaro) * Support for opening custom urls in Customer Center (#2107) via Cesar de la Vega (@vegaro) * Prices in accept promotional offer button (#2104) via Cesar de la Vega (@vegaro) * Customer Center use remote appearance config (#2102) via Cesar de la Vega (@vegaro) * [Paywalls V2] Use original paywall fallback when trying to use Footer modes in a Components paywall (#2106) via Toni Rico (@tonidero) * [Paywalls V2] Add more `ImageComponentView` preview tests (#2103) via Toni Rico (@tonidero) * [Paywalls V2] Add CarouselComponent page indicator animation (#2105) via Toni Rico (@tonidero) * [Paywalls V2] Add `CarouselComponentView` (#2095) via Toni Rico (@tonidero) * [Paywalls V2] Add `CarouselComponent` infrastructure (#2092) via Toni Rico (@tonidero) * [Paywalls V2] Adds new price calculations needed for Variables V2 (#2098) via JayShortway (@JayShortway) * [Paywalls V2] Preparation for Variables V2 (#2097) via JayShortway (@JayShortway) * Promotional offers (#2011) via Cesar de la Vega (@vegaro) * [Paywalls V2] No longer provides the entire `UiConfig` to `StyleFactory` (#2091) via JayShortway (@JayShortway) * [Paywalls V2] Adds support for custom fonts (#2090) via JayShortway (@JayShortway) * feat: Add basic customer center events (#2075) via Facundo Menzella (@facumenzella) * Add support to manage non-Google purchases in Customer Center (#2067) via Cesar de la Vega (@vegaro) * [Paywalls V2] Add `TimelineComponentView` (#2083) via Toni Rico (@tonidero) * [Paywalls V2] Process `TimelineComponent` overrides and state (#2082) via Toni Rico (@tonidero) * [Paywalls V2] Cleans up after implementing color aliases (#2087) via JayShortway (@JayShortway) * [Paywalls V2] Implements color aliases for backgrounds (#2086) via JayShortway (@JayShortway) * `PaywallTesterApp` is no longer wrapped in a `Surface` (#2089) via JayShortway (@JayShortway) * [Paywalls V2] Implements color aliases for shadows (#2085) via JayShortway (@JayShortway) * [Paywalls V2] Implements color aliases for borders (#2084) via JayShortway (@JayShortway) * [Paywalls V2] Implements color aliases for `TextComponent` (#2080) via JayShortway (@JayShortway) * [Paywalls V2] Add `TimelineComponent` network parsing (#2047) via Toni Rico (@tonidero) * [Paywalls V2] Implements color aliases for `ImageComponent` (#2079) via JayShortway (@JayShortway) * [Paywalls V2] Implements color aliases for `IconComponent` (#2078) via JayShortway (@JayShortway) * Build `SubscriptionDetailsView` using `CustomerInfo` (#2057) via Cesar de la Vega (@vegaro) * Some Material 3 updates to the `ManageSubscriptionsView` (#2072) via JayShortway (@JayShortway) * [Paywalls V2] Implements color aliases for `StackComponent` (#2076) via JayShortway (@JayShortway) * Fixes compilation of `IconComponentView`. (#2073) via JayShortway (@JayShortway) * [Paywalls V2] Make `edgeToEdge` top/bottom badge extend to entire stack background (#2070) via Toni Rico (@tonidero) * [Paywalls V2] Parses `UiConfig` (#2068) via JayShortway (@JayShortway) * [Paywalls V2] Add `IconComponent` (#2071) via Toni Rico (@tonidero) * [Paywalls V2] Badge: Handle main stack border width correctly in overlay and nested badge styles (#2069) via Toni Rico (@tonidero) * [Paywalls V2] Add `edgeToEdge` badge trailing/leading style layout (#2054) via Toni Rico (@tonidero) * [Paywalls V2] Adds support for fallback components (#2064) via JayShortway (@JayShortway) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Toni Rico <toni.rico.diez@revenuecat.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com> Co-authored-by: Cesar de la Vega <cesarvegaro@gmail.com>

prices in accept offer button

0c3669a

vegaro added pr:RevenueCatUI feat:Customer Center labels Jan 31, 2025

RevenueCat deleted a comment from RevenueCat-Danger-Bot Jan 31, 2025

vegaro added 2 commits January 31, 2025 16:13

use localization and templates

d833011

tests and fixes

94b2043

vegaro added the pr:other label Jan 31, 2025

fix backend test

458397b

vegaro marked this pull request as ready for review January 31, 2025 17:22

vegaro requested review from a team and facumenzella January 31, 2025 17:22

tonidero approved these changes Feb 3, 2025

View reviewed changes

vegaro added 5 commits February 3, 2025 12:56

@JvmSynthetic PriceExtensions

1c9f976

JvmSynthetic Stubs

fd437b9

rename stubs to preview

3173945

fix colors in preview

221d9b7

Merge branch 'main' into cc-278-cta-in-promotional-offer-view-should-…

0b5563b

…show-prices # Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/views/PromotionalOfferView.kt

vegaro enabled auto-merge (squash) February 3, 2025 19:09

vegaro merged commit 1fef01c into main Feb 3, 2025

vegaro deleted the cc-278-cta-in-promotional-offer-view-should-show-prices branch February 3, 2025 19:18

This was referenced Feb 12, 2025

[AUTOMATIC] Release/8.12.0 #2153

Closed

[AUTOMATIC] Release/8.12.0 #2167

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Prices in accept promotional offer button#2104

Prices in accept promotional offer button#2104
vegaro merged 9 commits into
mainfrom
cc-278-cta-in-promotional-offer-view-should-show-prices

vegaro commented Jan 31, 2025

Uh oh!

emerge-tools Bot commented Jan 31, 2025 •

edited

Loading

Uh oh!

tonidero left a comment

Uh oh!

tonidero Feb 3, 2025

Uh oh!

JayShortway Feb 4, 2025

Uh oh!

Uh oh!

Uh oh!

tonidero Feb 3, 2025

Uh oh!

vegaro Feb 3, 2025

Uh oh!

tonidero Feb 3, 2025

Uh oh!

codecov Bot commented Feb 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

vegaro commented Jan 31, 2025

Checklist

Motivation

Description

Uh oh!

emerge-tools Bot commented Jan 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📸 Snapshot Test

1 modified, 186 unchanged

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

tonidero Feb 3, 2025

Choose a reason for hiding this comment

Uh oh!

JayShortway Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tonidero Feb 3, 2025

Choose a reason for hiding this comment

Uh oh!

vegaro Feb 3, 2025

Choose a reason for hiding this comment

Uh oh!

tonidero Feb 3, 2025

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Feb 3, 2025

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

emerge-tools Bot commented Jan 31, 2025 •

edited

Loading