[Paywalls v2] Adds a default case to most enums and sealed types by JayShortway · Pull Request #2346 · RevenueCat/purchases-android

JayShortway · 2025-04-09T13:51:18Z

This is part 2/3:

Description

This uses the EnumDeserializerWithDefault and SealedDeserializerWithDefault to add default cases to all enums and sealed types, except Background and ButtonComponent. Those 2 will be done in the next PR, as they have some cascading effects.

tonidero

Just some questions, but looks great!!

tonidero · 2025-04-09T15:00:08Z

 }
+
+@OptIn(InternalRevenueCatAPI::class)
+internal object HorizontalAlignmentDeserializer : EnumDeserializerWithDefault<HorizontalAlignment>(


Hmm do we need to make all these @JvmSynthetic?

@JvmSynthetic is not applicable to classes unfortunately.

tonidero · 2025-04-09T15:03:10Z

+        "rectangle" to { MaskShape.Rectangle.serializer() },
+        "concave" to { MaskShape.Concave.serializer() },
+        "convex" to { MaskShape.Convex.serializer() },
+        "circle" to { MaskShape.Circle.serializer() },


I'm wondering if there is a way for us to not forget to add a new value here 🤔. I guess the tests you added would catch these, so it's probably ok 👍

Yea agreed. So far I don't think there's any other option other than tests, because sealed types don't have a values() function or entries property to list all cases. So it's impossible (?) to build a mapping with an exhaustive when.

tonidero · 2025-04-09T15:04:37Z

 ) : PartialComponent
+
+@OptIn(InternalRevenueCatAPI::class)
+internal object CarouselPageControlPositionDeserializer : EnumDeserializerWithDefault<PageControl.Position>(


i'm wondering, can these serializers be private?

Unfortunately not. I tried that first, but then objects containing these objects cannot be deserialized. For example, if BackgroundDeserializer is private, PaywallComponentsConfig cannot be deserialized because its auto-generated serializer cannot instantiate BackgroundDeserializer.

skydoves

Overall looks good to me! 👍

…d-enum-cases-2

emerge-tools · 2025-04-10T08:24:03Z

📸 Snapshot Test

416 unchanged

Name	Added	Removed	Modified	Renamed	Unchanged	Errored	Approval
TestPurchasesUIAndroidCompatibility Paparazzi com.revenuecat.testpurchasesuiandroidcompatibility.paparazzi	0	0	0	0	149	0	N/A
TestPurchasesUIAndroidCompatibility com.revenuecat.testpurchasesuiandroidcompatibility	0	0	0	0	267	0	N/A

🛸 Powered by Emerge Tools

#2345) This is part 1/3: 1. 👉 #2345 2. #2346 3. #2347 --------------- ## Description Adds 2 abstract serializers that will be used in the follow-up PRs to deserialize enums and sealed types with a default case.

codecov · 2025-04-10T13:03:37Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.27%. Comparing base (e1daf5c) to head (71e8cb9).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2346      +/-   ##
==========================================
+ Coverage   79.93%   80.27%   +0.34%     
==========================================
  Files         284      284              
  Lines       10051    10104      +53     
  Branches     1422     1423       +1     
==========================================
+ Hits         8034     8111      +77     
+ Misses       1405     1378      -27     
- Partials      612      615       +3

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

…t` (#2347) This is part 3/3: 1. #2345 2. #2346 3. 👉 #2347 --------------- ## Description Adds a new `Unknown` default case to: - `Background` - `ButtonComponent.Action` - `ButtonComponent.Destination` - `ButtonComponent.UrlMethod` And handles this new case in code: - An unknown background type will cause the paywall to fail to render, as we can't infer colors and content colors in this case. - Any unknown button action/destination/method type will cause the button to be hidden.

@vegaro

**This is an automatic release.** ## RevenueCat SDK ### 🐞 Bugfixes * Add missing response fields to `CustomerInfo`. Including transaction Prices (#2128) via Cesar de la Vega (@vegaro) ## RevenueCatUI SDK ### Paywallv2 #### 🐞 Bugfixes * [Paywalls v2] Fixes timeline layout when width is Fit (#2354) via JayShortway (@JayShortway) * [Paywalls V2] Improves fuzzy matching locale when the region doesn't match (#2355) via JayShortway (@JayShortway) * [Paywalls V2] Norwegian Bokmål and Norwegian Nynorsk fall back to Norwegian. (#2329) via JayShortway (@JayShortway) ### Customer Center #### 🐞 Bugfixes * Clean up on restoring functionality in customer center (#2316) via Cesar de la Vega (@vegaro) ### 🔄 Other Changes * [Paywalls v2] Adds the unsupported Background type to the error message (#2350) via JayShortway (@JayShortway) * [Paywalls v2] Uses a fixed date for template previews to avoid daily changes. (#2351) via JayShortway (@JayShortway) * [Paywalls v2] Adds a default case to `Background` and `ButtonComponent` (#2347) via JayShortway (@JayShortway) * [Paywalls v2] Improves `PaywallComponentsTemplatePreviewRecorder` stability (#2352) via JayShortway (@JayShortway) * [Paywalls v2] Adds a default case to most enums and sealed types (#2346) via JayShortway (@JayShortway) * Adds `EnumDeserializerWithDefault` and `SealedDeserializerWithDefault` (#2345) via JayShortway (@JayShortway) * [Paywalls V2] Renders template previews in a fixed resolution using Paparazzi (#2214) via JayShortway (@JayShortway) * Bump fastlane from 2.227.0 to 2.227.1 (#2344) via dependabot[bot] (@dependabot[bot]) * Migrate root gradle file to KTS (#2343) via Jaewoong Eum (@skydoves) * Migrate tester modules to KTS format (#2340) via Jaewoong Eum (@skydoves) * Introduce purchases-bom package (#2339) via Jaewoong Eum (@skydoves) * [AUTOMATIC][Paywalls V2] Updates paywall-preview-resources submodule (#2338) via RevenueCat Git Bot (@RCGitBot) * [Diagnostics] Removes Android 7 requirement (#2335) via JayShortway (@JayShortway) * [Paywalls v2] Fixes `update-paywall-preview-resources-submodule` CI job (#2337) via JayShortway (@JayShortway) * Make purchases module to transitive dependency for the ui module (#2334) via Jaewoong Eum (@skydoves) * Migrate settings.gradle to KTS and add the dependency resolutions (#2328) via Jaewoong Eum (@skydoves) Co-authored-by: revenuecat-ops <ops@revenuecat.com>

JayShortway added 3 commits April 9, 2025 14:13

Adds EnumDeserializerWithDefault and SealedDeserializerWithDefault.

d668b15

Adds failing tests.

d2c09ef

Fixes the tests by adding default values.

41895a1

JayShortway added pr:RevenueCatUI pr:other feat:PaywallV2 labels Apr 9, 2025

JayShortway self-assigned this Apr 9, 2025

This was referenced Apr 9, 2025

[Paywalls v2] Adds a default case to Background and ButtonComponent #2347

Merged

Adds EnumDeserializerWithDefault and SealedDeserializerWithDefault #2345

Merged

JayShortway requested a review from a team April 9, 2025 14:02

JayShortway marked this pull request as ready for review April 9, 2025 14:02

tonidero approved these changes Apr 9, 2025

View reviewed changes

skydoves approved these changes Apr 10, 2025

View reviewed changes

JayShortway added 2 commits April 10, 2025 10:08

Merge branch 'main' into pw2-default-sealed-enum-cases-1

629ce04

Merge branch 'pw2-default-sealed-enum-cases-1' into pw2-default-seale…

95227a0

…d-enum-cases-2

Base automatically changed from pw2-default-sealed-enum-cases-1 to main April 10, 2025 11:03

Merge branch 'main' into pw2-default-sealed-enum-cases-2

71e8cb9

JayShortway enabled auto-merge April 10, 2025 11:24

JayShortway disabled auto-merge April 10, 2025 11:31

JayShortway enabled auto-merge April 10, 2025 11:31

JayShortway added this pull request to the merge queue Apr 10, 2025

Merged via the queue into main with commit fb04e0c Apr 10, 2025

JayShortway deleted the pw2-default-sealed-enum-cases-2 branch April 10, 2025 13:34

RCGitBot mentioned this pull request Apr 15, 2025

[AUTOMATIC] Release/8.16.1 #2359

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Paywalls v2] Adds a default case to most enums and sealed types#2346

[Paywalls v2] Adds a default case to most enums and sealed types#2346
JayShortway merged 6 commits into
mainfrom
pw2-default-sealed-enum-cases-2

JayShortway commented Apr 9, 2025 •

edited

Loading

Uh oh!

tonidero left a comment

Uh oh!

tonidero Apr 9, 2025

Uh oh!

JayShortway Apr 10, 2025

Uh oh!

tonidero Apr 9, 2025

Uh oh!

JayShortway Apr 10, 2025

Uh oh!

tonidero Apr 9, 2025

Uh oh!

JayShortway Apr 10, 2025

Uh oh!

skydoves left a comment

Uh oh!

emerge-tools Bot commented Apr 10, 2025 •

edited

Loading

Uh oh!

codecov Bot commented Apr 10, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

JayShortway commented Apr 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

tonidero Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

JayShortway Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

tonidero Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

JayShortway Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

tonidero Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

JayShortway Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

skydoves left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

📸 Snapshot Test

416 unchanged

Uh oh!

codecov Bot commented Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

JayShortway commented Apr 9, 2025 •

edited

Loading

emerge-tools Bot commented Apr 10, 2025 •

edited

Loading

codecov Bot commented Apr 10, 2025 •

edited

Loading