PaywallData validation #1273

vegaro · 2023-09-20T18:54:14Z

Add validation to paywall data and creates default template if validation fails

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt

codecov · 2023-09-20T19:11:50Z

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (2ea162f) 85.46% compared to head (6ed190e) 85.46%.

Additional details and impacted files

@@            Coverage Diff            @@
##           paywalls    #1273   +/-   ##
=========================================
  Coverage     85.46%   85.46%           
=========================================
  Files           190      190           
  Lines          6385     6385           
  Branches        930      930           
=========================================
  Hits           5457     5457           
  Misses          568      568           
  Partials        360      360

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

NachoSoto · 2023-09-20T20:20:53Z

This is looking good 👍🏻

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/utils/Result.kt

tonidero · 2023-09-22T10:31:23Z

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/InternalPaywallView.kt

@@ -63,6 +64,7 @@ private fun getPaywallViewModel(offering: Offering?, listener: PaywallViewListen
            LocalContext.current.applicationContext.toAndroidContext(),
            offering,
            listener,
+            MaterialTheme.colors,


We should check if light/dark theme colors get automatically updated in the default paywall. My strong bet is that no. In that case, we should maybe store the last state in the view model so we can update the state when it changes, but we can do that in another PR.

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

tonidero · 2023-09-22T10:36:56Z

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt

        )
-    } catch (e: Exception) {


Since we're not doing this anymore, it may crash in the TemplateConfigurationFactory.create since we require a that there is at least some packages. Should we perform that validation before to avoid the crash?

Right, I missed those require

ec1a4f4 (#1273) and 6bb5ebc (#1273)

NachoSoto

Just a few minor things left, but this is perfect 🎉

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

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

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/utils/Result.kt

…dation-2 # Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt

vegaro · 2023-09-26T12:41:51Z

Fixed the light/dark colors. We will default to the current color scheme now, when it changes, and we react to the change

vegaro · 2023-09-26T12:42:39Z

@tonidero I will do the icons validation in another PR so we can merge this one. Do you mind taking a look?

tonidero

Looks great!

tonidero · 2023-09-26T14:36:05Z

...tlin/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt

@@ -10,37 +10,35 @@ internal object TemplateConfigurationFactory {
    fun create(
        variableDataProvider: VariableDataProvider,
        mode: PaywallViewMode,
-        paywallData: PaywallData,
+        validatedPaywallData: PaywallData,


I'm wondering if this should keep being paywallData to not be confused with ValidatedPaywallResult... I think it's ok though.

vegaro added the pr:feat A new feature label Sep 20, 2023

NachoSoto reviewed Sep 20, 2023

View reviewed changes

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt Show resolved Hide resolved

vegaro force-pushed the cesar/pwl-193-implement-paywalldata-validation branch from 2d44608 to bb02408 Compare September 21, 2023 12:54

Base automatically changed from cesar/pwl-193-implement-paywalldata-validation to paywalls September 21, 2023 13:13

NachoSoto reviewed Sep 21, 2023

View reviewed changes

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt Show resolved Hide resolved

NachoSoto mentioned this pull request Sep 21, 2023

Paywalls: created LoadingPaywallView #1282

Merged

vegaro force-pushed the cesar/pwl-193-implement-paywalldata-validation-2 branch 2 times, most recently from bf8bb92 to a899d61 Compare September 22, 2023 09:51

vegaro changed the base branch from paywalls to cesar/pwl-192-create-default-paywalldata September 22, 2023 10:19

tonidero reviewed Sep 22, 2023

View reviewed changes

vegaro force-pushed the cesar/pwl-193-implement-paywalldata-validation-2 branch from c6d5e40 to 1f821dd Compare September 22, 2023 14:45

Base automatically changed from cesar/pwl-192-create-default-paywalldata to paywalls September 22, 2023 15:59

vegaro added 15 commits September 22, 2023 18:01

change visibility of defaults

98116b0

default image

844d42a

add test for PaywallColor constructor with ColorInt

26b8e16

fix icon

8c6b2fd

remove composable annotations

96ad182

rename to default_background

a1eb0d5

refactor in VariableProcessor to reuse REGEX

10af601

validateLocalization

842965b

adds validateTemplate

1ff5d62

refactor to use result instead of exceptions

a39821d

removes Composable from PaywallDataExtensions

20b78b0

finish creating state

4af06ad

fix PaywallViewModelImpl

9e348c3

fix TestData

481a38e

fix compilation

2f424c7

vegaro force-pushed the cesar/pwl-193-implement-paywalldata-validation-2 branch from a13c1f4 to 2f424c7 Compare September 22, 2023 16:13

vegaro added 3 commits September 22, 2023 18:32

if no packages, load error state

ec1a4f4

calculate package ids if empty

6bb5ebc

removed unused PaywallValidationResult rename and extract

0b144d0

vegaro marked this pull request as ready for review September 22, 2023 16:40

vegaro changed the title ~~[WIP] PaywallData validation~~ PaywallData validation Sep 22, 2023

vegaro added 4 commits September 22, 2023 18:43

rename to validateVariables

b5ce3ab

return PaywallViewState.Loaded and remove error

d075ee3

inline return

3e0ac5a

get package name from applicationcontext

f43bccc

NachoSoto reviewed Sep 22, 2023

View reviewed changes

vegaro added 7 commits September 25, 2023 14:17

fix TestData

8755ab1

create default using paywallData.config.packages

621db01

use of Kotlin's result

e145b8a

Merge branch 'paywalls' into cesar/pwl-193-implement-paywalldata-vali…

0eb5723

…dation-2 # Conflicts: # ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt

fix URL and remove packageName

082cbb5

fix by using color scheme

3616ae1

fix URL

78d3c0c

vegaro requested a review from tonidero September 26, 2023 12:42

tonidero approved these changes Sep 26, 2023

View reviewed changes

vegaro added 4 commits September 26, 2023 17:14

rename to paywallData

d5d8736

Validate icons (#1291)

28c3c8c

fix

535c0e5

fix test compilation

6ed190e

vegaro merged commit dc1d023 into paywalls Sep 26, 2023
7 checks passed

vegaro deleted the cesar/pwl-193-implement-paywalldata-validation-2 branch September 26, 2023 16:49

This was referenced Oct 16, 2023

[DO NOT MERGE] Release/7.1.0-beta.1 #1355

Closed

[DO NOT MERGE] Release/7.1.0-beta.2 #1373

Closed

tonidero pushed a commit that referenced this pull request Oct 31, 2023

PaywallData validation (#1273)

b1e58f3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PaywallData validation #1273

PaywallData validation #1273

vegaro commented Sep 20, 2023 •

edited

Loading

codecov bot commented Sep 20, 2023 •

edited

Loading

NachoSoto commented Sep 20, 2023

tonidero Sep 22, 2023

tonidero Sep 22, 2023

vegaro Sep 22, 2023

vegaro Sep 22, 2023

NachoSoto left a comment

vegaro commented Sep 26, 2023

vegaro commented Sep 26, 2023

tonidero left a comment

tonidero Sep 26, 2023

PaywallData validation #1273

PaywallData validation #1273

Conversation

vegaro commented Sep 20, 2023 • edited Loading

codecov bot commented Sep 20, 2023 • edited Loading

Codecov Report

NachoSoto commented Sep 20, 2023

tonidero Sep 22, 2023

Choose a reason for hiding this comment

tonidero Sep 22, 2023

Choose a reason for hiding this comment

vegaro Sep 22, 2023

Choose a reason for hiding this comment

vegaro Sep 22, 2023

Choose a reason for hiding this comment

NachoSoto left a comment

Choose a reason for hiding this comment

vegaro commented Sep 26, 2023

vegaro commented Sep 26, 2023

tonidero left a comment

Choose a reason for hiding this comment

tonidero Sep 26, 2023

Choose a reason for hiding this comment

vegaro commented Sep 20, 2023 •

edited

Loading

codecov bot commented Sep 20, 2023 •

edited

Loading