Promotional offers by vegaro · Pull Request #2011 · RevenueCat/purchases-android

vegaro · 2024-12-24T15:19:11Z

Please note the CTA button is still just showing "Accept offer", it should have information about the price but that will come in a different PR since the logic is a bit complex.

…ck-surveys

# Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/viewmodel/CustomerCenterViewModel.kt

# Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/InternalCustomerCenter.kt # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/actions/CustomerCenterAction.kt # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/data/CustomerCenterState.kt # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/viewmodel/CustomerCenterViewModel.kt

codecov · 2025-01-28T15:38:03Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.13%. Comparing base (d68cda4) to head (792cfe3).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2011   +/-   ##
=======================================
  Coverage   81.13%   81.13%           
=======================================
  Files         268      268           
  Lines        8932     8932           
  Branches     1266     1266           
=======================================
  Hits         7247     7247           
  Misses       1159     1159           
  Partials      526      526

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

vegaro · 2025-01-29T19:46:28Z

+        _actionError.value = null
+    }
+
+    override fun loadAndDisplayPromotionalOffer(


One thing I haven't found a way of accomplishing is checking if the user is currently subscribed to that particular offer. I don't think we have a way :/

Just checking but the CustomerInfo.activeSubscriptions id doesn't contain this info right?

Hmm yeah I think we can only know the base plan they are subscribed to, but not the particular offer I believe... I'm not sure how we can do this... We might need Catforms's help and try to store some of this info in the backend...

Another thing to consider is pending purchases and/or deferred updates, since those might be delayed... We probably need a way to expose all this info from the backend...

JayShortway

Looking good! Just a few suggestions on reusing existing things.

JayShortway · 2025-01-29T21:27:40Z

+        _actionError.value = null
+    }
+
+    override fun loadAndDisplayPromotionalOffer(


Just checking but the CustomerInfo.activeSubscriptions id doesn't contain this info right?

tonidero

Looking good! Left some comments but lmk what you think!

tonidero · 2025-01-30T08:35:34Z

+        _actionError.value = null
+    }
+
+    override fun loadAndDisplayPromotionalOffer(


Hmm yeah I think we can only know the base plan they are subscribed to, but not the particular offer I believe... I'm not sure how we can do this... We might need Catforms's help and try to store some of this info in the backend...

Another thing to consider is pending purchases and/or deferred updates, since those might be delayed... We probably need a way to expose all this info from the backend...

tonidero

LGTM!

@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>

vegaro added 30 commits December 23, 2024 15:38

add manage subscriptions

f93a30e

temporary build of the PurchaseInformation

46a12cb

remove printStackTrace

b1eff15

Merge branch 'main' into cc-50-cancellation-and-change-plans

d2c36c4

create FeedbackSurveyView

a164cef

display feedback surveys

58106b6

fix compilation

11f3753

Merge branch 'main' into cc-50-cancellation-and-change-plans

43a605f

Merge branch 'cc-50-cancellation-and-change-plans' into cc-215-feedba…

5dfb54a

…ck-surveys

create PromotionalOfferView

b509543

FeedbackSurveyView

0a953e6

Merge branch 'cc-215-feedback-surveys' into cc-45-promotional-offer-view

f0334e2

WIP

afd46f8

bump emerge

d20b581

check for null entitlement

d021198

Merge branch 'main' into cc-50-cancellation-and-change-plans

fb296b5

Merge branch 'cc-50-cancellation-and-change-plans' into cc-215-feedba…

ad8ecad

…ck-surveys

Merge branch 'cc-215-feedback-surveys' into cc-45-promotional-offer-view

b370497

Merge branch 'main' into cc-215-feedback-surveys

71a20cf

# Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/viewmodel/CustomerCenterViewModel.kt

Merge branch 'cc-215-feedback-surveys' into cc-45-promotional-offer-view

b1b4c9c

# Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/customercenter/viewmodel/CustomerCenterViewModel.kt

add top app bar

4bfcdc4

fix navigation issues

07d29f7

fix compilation and detekt

0b8fca4

Merge branch 'cc-215-feedback-surveys' into cc-45-promotional-offer-view

0775143

pass whole product and fix buttons

895d978

cascaded return

6e69d65

cleanup update

013c18b

onAnswerSubmitted

beb6313

clean up opt ins

7de1520

fix compilation

792cfe3

vegaro added 2 commits January 28, 2025 21:08

wraps up building offer

4d52f23

add rc-customer-center tag and ErrorDialog

02576c0

vegaro commented Jan 29, 2025

View reviewed changes

vegaro marked this pull request as ready for review January 29, 2025 19:46

vegaro requested review from JayShortway, facumenzella and tonidero January 29, 2025 19:47

JayShortway approved these changes Jan 29, 2025

View reviewed changes

tonidero reviewed Jan 30, 2025

View reviewed changes

vegaro added 10 commits January 30, 2025 10:45

add @get:JvmSynthetic to CustomerCenterState

3f8cadf

inline promotionalOfferOrMainPathAction

649af93

add !!

1d9c2ac

Merge branch 'main' into cc-45-promotional-offer-view

1f940f2

reuse AppIcon

f081f8e

ErrorDialog synthetic

516ddb5

add TODO for making the button display the price of the offer

0339a82

getActivtiy feedback

f9e25f0

fix not going back to main if cancelled purchase

4000c13

detekt

d1cfe54

vegaro requested review from JayShortway and tonidero January 30, 2025 13:17

tonidero approved these changes Jan 30, 2025

View reviewed changes

vegaro enabled auto-merge (squash) January 30, 2025 13:20

vegaro merged commit 6de7f34 into main Jan 30, 2025

vegaro deleted the cc-45-promotional-offer-view branch January 30, 2025 13:44

This was referenced Feb 12, 2025

[AUTOMATIC] Release/8.12.0 #2153

Closed

[AUTOMATIC] Release/8.12.0 #2167

Merged

Uh oh!

Conversation

vegaro commented Dec 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Jan 28, 2025

Codecov Report

Uh oh!

vegaro Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

JayShortway Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

tonidero Jan 30, 2025

Choose a reason for hiding this comment

Uh oh!

JayShortway left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JayShortway Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tonidero Jan 30, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vegaro commented Dec 24, 2024 •

edited

Loading