Paywall Components Initial Commit #4224

jamesrb1 · 2024-08-26T21:00:36Z

Initial components merge. Notes:

Linting enabled except for public documentation which will come as the API matures and stabilizes.
Took out unused files (tier-related ones), which will come back in a future version. The comments were useful and will be referenced when they come back so thank you for the comments on these.
Left in tvOS and watchOS availability checks for now - may revisit this later.
Everything is codable.
Features added:
- Layout components allow other components to be laid out along x/y/z axes.
- Text component supports font weight. (Changing actual font will come later.)
- LinkButton component links out to external website of choice.
- RemoteImage allows the image to be arbitrarily styled by the calling code by passing the image back in a closure.
- Image component supports corner rounding an overlaid gradient. (These will likely be pulled out into common code somewhere in a future PR.)
- Support for OfferingResponse that includes a separate PaywallComponentsData structure, which is separate from PaywallData used for template-based paywalls.

# Conflicts: # RevenueCatUI/Data/TemplateViewConfiguration.swift # RevenueCatUI/Templates/TemplateViewType.swift # Sources/Paywalls/PaywallData.swift # Tests/TestingApps/PaywallsTester/PaywallsTester/Config/Configuration.swift

# Conflicts: # Tests/TestingApps/PurchaseTesterSwiftUI/Core/ConfiguredPurchases.swift

Removes code we won't be using for some time and splits up some large files into component files.

…alues for stack layouts

Co-authored-by: Josh Holtz <me@joshholtz.com>

…uses on Images I think we may need a compon properties modifier.

joshdholtz

This is looking really good! I left a bunch of comments (sorry 🙊)

The biggest thing I think is some modification of PaywallData and case templateComponents = "components". Since we added that early checkin PaywallView specifically for components, PaywallData should never anything to do with components anymore.

I might be wrong so please tell me if I am 😇

joshdholtz · 2024-08-27T12:05:12Z

RevenueCatUI/PaywallView.swift

+        if let componentData = offering.paywallComponentsData {
+            TemplateComponentsView(paywallComponentsData: componentData)
+        } else {


Reviewer note: this will be reworked in future PR with proper loading and validation ☝️

RevenueCatUI/Templates/Components/StackComponentView.swift

RevenueCatUI/Templates/TemplateViewType.swift

RevenueCatUI/Views/PurchaseButton.swift

RevenueCatUI/Views/RemoteImage.swift

Sources/Paywalls/PaywallData.swift

Sources/Purchasing/Offering.swift

Tests/TestingApps/PaywallsTester/PaywallsTester/Config/SamplePaywalls.swift

RevenueCatUI/Data/PaywallTemplate.swift

joshdholtz

This looks good to me! I left one question about the version change on Products.storekit but besides that I think this is good 😊

I'd probably like a second pair of eyes looking over this (either @aboedo or somebody else from @RevenueCat/coresdk) but looks likes clean 😎

joshdholtz · 2024-08-27T21:35:51Z

Tests/TestingApps/PaywallsTester/PaywallsTester/Products.storekit

-    "major" : 2,
+    "major" : 3,


Is this going to break anything? Is this because of Xcode 16 or something else? 😅

I think we're good, it's working for me on 15.4.0 (or at least, Xcode doesn't complain but I can't fully test without an API key that has components since otherwise backend response doesn't fully decode)

I'm using Xcode 15, I'm not sure why it made this change, but this is used solely internally for testing, so I don't think there is any major risk here?

aboedo

Looks good for a merge behind feature flag. Only concern would be to move the swiftUI import to behind the flag for the main SDK, so that we're not forcing the import on anyone.
I do think we should find a way to remove the swiftUI dependency from the main SDK completely before shipping components, but that's a ways out anyway

aboedo · 2024-08-28T19:36:10Z

RevenueCatUI/PaywallView.swift

+                DebugErrorView(
+                    "\(error.description)\n" +
+                    "You can fix this by editing the paywall in the RevenueCat dashboard.\n" +
+                    "The displayed paywall contains default configuration.\n" +
+                    "This error will be hidden in production.",
+                    replacement: paywallView


[Not for this PR]
I was about to comment that we should move this to one of the strings files, and then I realized that that's part of the main SDK. Maybe we should start thinking about extracting a Core framework to be used by both RevenueCat and RevenueCatUI (we actually used to have one a few years back)

RevenueCatUI/Templates/Components/TemplateComponentsView.swift

RevenueCatUI/Templates/Components/StackComponentView.swift

Sources/Networking/Responses/OfferingsResponse.swift

Tests/TestingApps/PaywallsTester/PaywallsTester/Config/SamplePaywalls.swift

aboedo · 2024-08-28T20:25:09Z

Tests/TestingApps/PaywallsTester/PaywallsTester/Products.storekit

-    "major" : 2,
+    "major" : 3,


I think we're good, it's working for me on 15.4.0 (or at least, Xcode doesn't complain but I can't fully test without an API key that has components since otherwise backend response doesn't fully decode)

Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/SamplePaywallsList.swift

joshdholtz · 2024-08-28T21:05:28Z

Looks good for a merge behind feature flag. Only concern would be to move the swiftUI import to behind the flag for the main SDK, so that we're not forcing the import on anyone. I do think we should find a way to remove the swiftUI dependency from the main SDK completely before shipping components, but that's a ways out anyway

Big +1 on removing SwiftUI from the main SDK 💪 That is happening in a new branch that @jamesrb1 is working on right now 💪

@jamesrb1 Can you move the import SwiftUI behind the flag? And then once you do that... you can merge!

jamesrb1 · 2024-08-28T23:32:46Z

@RCGitBot please test

jamesrb1 · 2024-08-29T00:11:37Z

I've made changes for most of @aboedo comments (thank you!), and left conversations unresolved for the ones that are not resolved as part of this PR.

@vegaro

**This is an automatic release.** ### Bugfixes * Fix `compatibleTopBarTrailing` in MacOS and api tests (#4226) via Cesar de la Vega (@vegaro) * [Paywall] Fix restoreStarted not being called on `presentPaywallIfNeeded` when using `requiredEntitlementIdentifier` (#4223) via Josh Holtz (@joshdholtz) * [CustomerCenter] Move sheet and restore alert creation to `ManageSubscriptionsView` (#4220) via Cesar de la Vega (@vegaro) * [EXTERNAL] `Custom Entitlements Computation`: fix support display on debug screen (#4215) by @NachoSoto (#4218) via Toni Rico (@tonidero) * [Customer Center] Add padding to `No thanks` in promotional offer screen (#4221) via Cesar de la Vega (@vegaro) * Fix version number in plist files (#4213) via Cesar de la Vega (@vegaro) * fix mac os sandbox check slowness (#3879) via Andy Boedo (@aboedo) * [Customer Center] Fix `FeedbackSurveyView` not opening (#4208) via Cesar de la Vega (@vegaro) * Remove `unneeded_override` disable to fix linter (#4209) via Cesar de la Vega (@vegaro) ### Dependency Updates * Bump rexml from 3.3.3 to 3.3.6 in /Tests/InstallationTests/CocoapodsInstallation (#4210) via dependabot[bot] (@dependabot[bot]) * Bump rexml from 3.3.3 to 3.3.6 (#4211) via dependabot[bot] (@dependabot[bot]) ### Other Changes * Update readme wording (#3914) via James Borthwick (@jamesrb1) * Set a maximum duration for iOS 15 tests (#4229) via Cesar de la Vega (@vegaro) * Paywall Components Initial Commit (#4224) via James Borthwick (@jamesrb1) * [CustomerCenter] Open App Store when the user wants to update their app (#4199) via JayShortway (@JayShortway) * [Customer Center] Shows a warning when the app is not the latest version (#4193) via JayShortway (@JayShortway) * Fix integration tests simulator version (#4219) via Cesar de la Vega (@vegaro) * Pin swift-docc-plugin to 1.3.0 (#4216) via James Borthwick (@jamesrb1)

Initial components merge. Notes: - Linting enabled except for public documentation which will come as the API matures and stabilizes. - Took out unused files (tier-related ones), which will come back in a future version. The comments were useful and will be referenced when they come back so thank you for the comments on these. - Left in tvOS and watchOS availability checks for now - may revisit this later. - Everything is codable. - Features added: - Layout components allow other components to be laid out along x/y/z axes. - Text component supports font weight. (Changing actual font will come later.) - LinkButton component links out to external website of choice. - RemoteImage allows the image to be arbitrarily styled by the calling code by passing the image back in a closure. - Image component supports corner rounding an overlaid gradient. (These will likely be pulled out into common code somewhere in a future PR.) - Support for OfferingResponse that includes a separate `PaywallComponentsData` structure, which is separate from `PaywallData` used for template-based paywalls. --------- Co-authored-by: Josh Holtz <me@joshholtz.com>

@vegaro

**This is an automatic release.** ### Bugfixes * Fix `compatibleTopBarTrailing` in MacOS and api tests (#4226) via Cesar de la Vega (@vegaro) * [Paywall] Fix restoreStarted not being called on `presentPaywallIfNeeded` when using `requiredEntitlementIdentifier` (#4223) via Josh Holtz (@joshdholtz) * [CustomerCenter] Move sheet and restore alert creation to `ManageSubscriptionsView` (#4220) via Cesar de la Vega (@vegaro) * [EXTERNAL] `Custom Entitlements Computation`: fix support display on debug screen (#4215) by @NachoSoto (#4218) via Toni Rico (@tonidero) * [Customer Center] Add padding to `No thanks` in promotional offer screen (#4221) via Cesar de la Vega (@vegaro) * Fix version number in plist files (#4213) via Cesar de la Vega (@vegaro) * fix mac os sandbox check slowness (#3879) via Andy Boedo (@aboedo) * [Customer Center] Fix `FeedbackSurveyView` not opening (#4208) via Cesar de la Vega (@vegaro) * Remove `unneeded_override` disable to fix linter (#4209) via Cesar de la Vega (@vegaro) ### Dependency Updates * Bump rexml from 3.3.3 to 3.3.6 in /Tests/InstallationTests/CocoapodsInstallation (#4210) via dependabot[bot] (@dependabot[bot]) * Bump rexml from 3.3.3 to 3.3.6 (#4211) via dependabot[bot] (@dependabot[bot]) ### Other Changes * Update readme wording (#3914) via James Borthwick (@jamesrb1) * Set a maximum duration for iOS 15 tests (#4229) via Cesar de la Vega (@vegaro) * Paywall Components Initial Commit (#4224) via James Borthwick (@jamesrb1) * [CustomerCenter] Open App Store when the user wants to update their app (#4199) via JayShortway (@JayShortway) * [Customer Center] Shows a warning when the app is not the latest version (#4193) via JayShortway (@JayShortway) * Fix integration tests simulator version (#4219) via Cesar de la Vega (@vegaro) * Pin swift-docc-plugin to 1.3.0 (#4216) via James Borthwick (@jamesrb1)

joshdholtz and others added 30 commits August 17, 2024 14:46

Paywall components POC

9f4419a

# Conflicts: # RevenueCatUI/Data/TemplateViewConfiguration.swift # RevenueCatUI/Templates/TemplateViewType.swift # Sources/Paywalls/PaywallData.swift # Tests/TestingApps/PaywallsTester/PaywallsTester/Config/Configuration.swift

Added toggle

7d46bb2

Game controller support

1dd97de

# Conflicts: # Tests/TestingApps/PurchaseTesterSwiftUI/Core/ConfiguredPurchases.swift

Paywalls components/file split (#4200)

b70eef9

Removes code we won't be using for some time and splits up some large files into component files.

Initial Stack Component

f3bd65a

v, h and z stacks

31af70c

StackComponentView uses ComponentsView

ddc22d5

Stack spacing support

2a7b7a4

background stack color

bf3ce3d

Proper color implementation

5fd18f9

Add vertical alignment; extend horizontal alignment; add associated v…

84ac29a

…alues for stack layouts

Default alignments

a73c42d

typo

381b96b

Indentation

9c754ae

Update text font/size display

c2f461b

initial link button

232f392

Building it out

39d87fe

Custom fonts not supported for now

f048085

zstack alignment

4f3784e

Working out the demo paywall….

380a8e6

Decodable Dimension

6ede294

Code ordering

38c11e3

Decoding paywall components response, almost working

714f483

Co-authored-by: Josh Holtz <me@joshholtz.com>

Show component paywalls!

3574199

Todo encoder

a35aa7c

encoding

4fb295b

Re-enable test component view

5622854

Allow external modification of RemoteImage

edd55f5

Support for top-to-bottom gradients with arbitrary stops; corner radi…

77b3468

…uses on Images I think we may need a compon properties modifier.

ifdef out latest additions

0888b94

joshdholtz requested changes Aug 27, 2024

View reviewed changes

jamesrb1 added 5 commits August 27, 2024 10:48

Remove paywall components home in legacy paywalls

ee0ffbc

Remove unused file

1614d80

Add ability to show struct-created component paywalls

7222042

Remove unused PurchaseButton init

b5ff52c

Restore fade animation for images

48e50ac

joshdholtz approved these changes Aug 27, 2024

View reviewed changes

aboedo reviewed Aug 28, 2024

View reviewed changes

jamesrb1 added 6 commits August 28, 2024 16:04

No more hard coded strings for component types

5fa016d

Move #import SwiftUI behind a flag

dba53ef

Single line protocol definition

1a5961b

Make sample URLs vars

76f1ddb

typo

116dc9a

Lint

8d0bbc0

jamesrb1 merged commit d40eb11 into main Aug 29, 2024
33 checks passed

jamesrb1 deleted the paywalls-components/tidied-all-work branch August 29, 2024 00:11

RCGitBot mentioned this pull request Aug 29, 2024

[AUTOMATIC] Release/5.4.0 #4228

Closed

tonidero added refactor and removed pr:feat A new feature labels Aug 30, 2024

RCGitBot mentioned this pull request Aug 30, 2024

[AUTOMATIC] Release/5.3.1 #4232

Merged

vegaro added feat:Paywall Components pr:other and removed Paywalls Components labels Sep 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Paywall Components Initial Commit #4224

Paywall Components Initial Commit #4224

jamesrb1 commented Aug 26, 2024 •

edited

Loading

joshdholtz left a comment

joshdholtz Aug 27, 2024

joshdholtz left a comment

joshdholtz Aug 27, 2024

aboedo Aug 28, 2024

jamesrb1 Aug 28, 2024

aboedo left a comment

aboedo Aug 28, 2024

aboedo Aug 28, 2024

joshdholtz commented Aug 28, 2024

jamesrb1 commented Aug 28, 2024

jamesrb1 commented Aug 29, 2024

Paywall Components Initial Commit #4224

Paywall Components Initial Commit #4224

Conversation

jamesrb1 commented Aug 26, 2024 • edited Loading

joshdholtz left a comment

Choose a reason for hiding this comment

joshdholtz Aug 27, 2024

Choose a reason for hiding this comment

joshdholtz left a comment

Choose a reason for hiding this comment

joshdholtz Aug 27, 2024

Choose a reason for hiding this comment

aboedo Aug 28, 2024

Choose a reason for hiding this comment

jamesrb1 Aug 28, 2024

Choose a reason for hiding this comment

aboedo left a comment

Choose a reason for hiding this comment

aboedo Aug 28, 2024

Choose a reason for hiding this comment

aboedo Aug 28, 2024

Choose a reason for hiding this comment

joshdholtz commented Aug 28, 2024

jamesrb1 commented Aug 28, 2024

jamesrb1 commented Aug 29, 2024

jamesrb1 commented Aug 26, 2024 •

edited

Loading