Conditional Visibility #2843

JZDesign · 2025-11-14T16:38:14Z

Checklist

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

Motivation

Users want a way to control when to show or hide certain elements of their paywall. Commonly this is based on screen size, but there are other reasons this may occur as well.

Description

Josh wrote the majority of the iOS PR months ago. I picked it up and added the selected package bit, then I had codex look at those changes and replicate them here in the android project.

… into jzdesign/conditional-visibility-2

...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverride.kt

purchases/src/main/kotlin/com/revenuecat/purchases/UiConfig.kt

...c/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/ScreenConditionSnapshot.kt

emerge-tools · 2025-11-20T01:56:49Z

📸 Snapshot Test

570 unchanged

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

🛸 Powered by Emerge Tools

… into jzdesign/conditional-visibility-2

codecov · 2025-11-21T14:30:28Z

Codecov Report

❌ Patch coverage is 71.05263% with 11 lines in your changes missing coverage. Please review.
✅ Project coverage is 78.22%. Comparing base (c37276b) to head (95c4589).
⚠️ Report is 6 commits behind head on main.

Files with missing lines	Patch %	Lines
...c/main/kotlin/com/revenuecat/purchases/UiConfig.kt	11.11%	8 Missing ⚠️
...es/paywalls/components/common/ComponentOverride.kt	88.88%	0 Missing and 3 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2843      +/-   ##
==========================================
- Coverage   78.28%   78.22%   -0.07%     
==========================================
  Files         330      330              
  Lines       12753    12785      +32     
  Branches     1739     1747       +8     
==========================================
+ Hits         9984    10001      +17     
- Misses       2038     2046       +8     
- Partials      731      738       +7

☔ 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.

#2843 renamed a key from `intro_offer` to `introductory_offer` which would break current paywalls that use `intro_offer` for "Text field for an introductory offer" section in the builder.

...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverride.kt

We noticed that phones get categorized as tablets in landscape, and tablets as desktops. I changed the calculation to use the width in portrait (the shortest dimension) instead. But we still need to discuss if this is what we want.

tonidero

Still reviewing but posting what I have so far

tonidero · 2025-12-02T08:15:14Z

...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverride.kt

+
+        @Serializable
+        enum class EqualityOperatorType {
+            @SerialName("=") // WIP… Should we make this human language from the server like in and not_in?


Hmm could be eq and not_eq to have the same style as the other operators indeed... but not a strong preference.

Turns out, Khepri requires this. It's used a lot in other areas.

...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverride.kt

...c/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/ScreenConditionSnapshot.kt

tonidero · 2025-12-02T08:34:40Z

...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverride.kt

        "selected" to { Condition.Selected.serializer() },
+        "orientation" to { Condition.Orientation.serializer() },
+        "screen_size" to { Condition.ScreenSize.serializer() },
+        "selected_package" to { Condition.SelectedPackage.serializer() },


What's the difference between selected and selected_package? And also between intro_offer and introductory_offer_available + multiple_intro_offers and multiple_intro_offers_available? Feels like a rename to support the new condition system, but basically this also means it would default to unsupported in older versions of the SDK... Not sure if that's worth it?

If I'm wrong and they are supposed to be different conditions, we might want to document the difference

Good questions. Long story short, our foresight was only kind of right when we started this work many months ago. As development continued, other scenarios came up, and the use case for the keys that were already in the code could have been clearer but these are the meanings. I have a doc on this that I can throw into notion, or perhaps this is a safe enough one that could live in the repo… though it would be duplicated.

Key Purpose

selected The component itself is selected, like a tab, a package, a switch, etc.,

selected_package The selected package matches the given array conditions

intro_offer The selected package includes an intro offer you are eligible for

introductory_offer_available any package in the paywall includes an introductory offer you are eligible for, selected or not

multiple_intro_offers The selected package has multiple intro offers that you are eligible for

multiple_intro_offers_available any package in the paywall includes multiple intro offers you are eligible for, selected or not

app_version The consuming application version matches the given comparison

Note
Edited, adding application version to allow for fine tuned control for various reasons like being able to add new conditions that are not supported by older SDKs and giving the user the ability to ensure the paywall renders appropriately for their use case.

Ohh thanks for the explanation. That makes sense! Then, I would indeed add that as docs to the repo, I think it should be fine, and could help understand the difference between them.

...main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/stack/StackComponentState.kt

...otlin/com/revenuecat/purchases/ui/revenuecatui/components/carousel/CarouselComponentState.kt

tonidero · 2025-12-02T09:04:06Z

.../src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/ScreenConditionState.kt

+    var snapshot by mutableStateOf(ScreenConditionSnapshot())
+        private set
+
+    fun updateLayoutSize(widthDp: Float, heightDp: Float) {


Hmm I'm not in love with making all these methods available to callers, since they could potentially be called somewhere else, when they are only intended to be called by the rememberScreenConditionState and trackScreenCondition below... But I'm not sure what would be the best approach...

We could make rememberScreenConditionState a companion object function, and would allow us to make some of these private, but wouldn't work for trackScreenCondition since that's an extension function of Modifier... So I think it's ok to leave as is for now...

...main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/video/VideoComponentState.kt

.../src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/ScreenConditionState.kt

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallState.kt

...atui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/PresentedPartial.kt

tonidero

Only that last VideoComponentState question, but it's looking great!

tonidero · 2025-12-04T08:34:27Z

...otlin/com/revenuecat/purchases/ui/revenuecatui/components/timeline/TimelineComponentState.kt

    selectedPackageProvider: () -> Package?,
    selectedTabIndexProvider: () -> Int,
+    screenConditionProvider: () -> ScreenCondition,
+    introOfferAvailability: IntroOfferAvailability = IntroOfferAvailability(),


Same here. We probably should remove the default IntroOfferAvailability, probably a leftover? :)

tonidero · 2025-12-04T08:39:20Z

...main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/video/VideoComponentState.kt


    @JvmSynthetic
    fun update(
-        windowSize: WindowWidthSizeClass? = null,


Hmm I'm not sure this is right... in the other components states, the update method includes the screenCondition, so we can update it, but not for the VideoComponentState. Is there a reason for that difference? This also means that we will keep using the initialScreenCondition for the PresentedPartial even if the screen changes, so not sure if that's right... Maybe we're handling that in the view layer?

Ah, this here isn't actually the issue but I'm glad it flagged things for you, because there was an issue that I fixed where build partial was called

JZDesign added 2 commits November 14, 2025 09:37

codex first pass

f805b2e

detekt

5bac47d

JZDesign added pr:RevenueCatUI feat:PaywallV2 paywalls_v2 labels Nov 14, 2025

Merge branch 'main' of https://github.com//RevenueCat/purchases-android…

4e89d7c

… into jzdesign/conditional-visibility-2

JayShortway reviewed Nov 17, 2025

View reviewed changes

JZDesign added 7 commits November 18, 2025 12:38

clean up old sizes and tests

75d6fc4

add some missing tests

36ac0cd

PR feedback

47d43e2

update tests

d8f9a46

fix serialization and intro offer eligibility

7e7d58d

fix tests

5a74973

detekt

e525a82

JZDesign added the pr:feat A new feature label Nov 20, 2025

JZDesign added 6 commits November 19, 2025 20:49

add new test cases

69f27b7

update to include multiple intro offers

1d9fdca

add conditions for any package having offers

5e51895

detekt

91fcafd

remove unused properties

a898973

Merge branch 'main' of https://github.com//RevenueCat/purchases-android…

0166981

… into jzdesign/conditional-visibility-2

Merge branch 'main' into jzdesign/conditional-visibility-2

68886a1

vegaro mentioned this pull request Nov 26, 2025

Conditional Visibility Fixes #2877

Merged

Conditional Visibility Fixes (#2877)

132b43e

#2843 renamed a key from `intro_offer` to `introductory_offer` which would break current paywalls that use `intro_offer` for "Text field for an introductory offer" section in the builder.

vegaro reviewed Nov 27, 2025

View reviewed changes

...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverride.kt Show resolved Hide resolved

vegaro added 2 commits November 28, 2025 10:10

Merge branch 'main' into jzdesign/conditional-visibility-2

5482e2c

Determine device size using shortest dimension (#2888)

ee6b6e3

We noticed that phones get categorized as tablets in landscape, and tablets as desktops. I changed the calculation to use the width in portrait (the shortest dimension) instead. But we still need to discuss if this is what we want.

JZDesign requested a review from JayShortway December 1, 2025 19:56

JZDesign requested a review from vegaro December 1, 2025 19:56

JZDesign marked this pull request as ready for review December 1, 2025 19:56

JZDesign requested a review from a team as a code owner December 1, 2025 19:56

tonidero reviewed Dec 2, 2025

View reviewed changes

JZDesign added 3 commits December 2, 2025 07:58

remove legacy screen condition

095f176

Stop defaulting partial visibility to true

03b4da9

remove default argument

d9fb783

vegaro reviewed Dec 2, 2025

View reviewed changes

JZDesign added 8 commits December 2, 2025 09:03

Rename and document for clarity

5886e80

remove unnecessary assignment

e6785d1

delete and replace irrelevant screen condtion

cc998ac

rename

93d00b1

whitespace

21cbc70

simplify allAvailablePackages

af40404

ignore unsupported condition

7e3724b

update test to show that unsupported doesn't hide, but ignores

95c4589

tonidero reviewed Dec 4, 2025

View reviewed changes

JZDesign marked this pull request as draft December 4, 2025 18:40

Key	Purpose
`selected`	The component itself is selected, like a tab, a package, a switch, etc.,
`selected_package`	The selected package matches the given array conditions
`intro_offer`	The selected package includes an intro offer you are eligible for
`introductory_offer_available`	any package in the paywall includes an introductory offer you are eligible for, selected or not
`multiple_intro_offers`	The selected package has multiple intro offers that you are eligible for
`multiple_intro_offers_available`	any package in the paywall includes multiple intro offers you are eligible for, selected or not
`app_version`	The consuming application version matches the given comparison

Conditional Visibility #2843

Are you sure you want to change the base?

Conditional Visibility #2843

Uh oh!

Conversation

JZDesign commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Motivation

Description

Uh oh!

Uh oh!

Uh oh!

Uh oh!

emerge-tools bot commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📸 Snapshot Test

570 unchanged

Uh oh!

codecov bot commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JZDesign Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

JZDesign commented Nov 14, 2025 •

edited

Loading

emerge-tools bot commented Nov 20, 2025 •

edited

Loading

codecov bot commented Nov 21, 2025 •

edited

Loading

JZDesign Dec 2, 2025 •

edited

Loading