`RevenueCatUI` initial support #549

NachoSoto · 2023-11-06T18:47:54Z

No description provided.

Depends on RevenueCat/purchases-hybrid-common#549

android/build.gradle

tonidero · 2023-11-08T08:39:05Z

android/src/main/java/com/revenuecat/purchases/hybridcommon/paywalls.kt

+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+
+fun presentPaywallFromFragment(fragment: FragmentActivity, requiredEntitlementIdentifier: String?) {


Should requiredEntitlementIdentifier have a default value?

I guess the main problem with this approach is that we can't share the result of the fragment (whether the user purchased/cancelled mostly) back to the caller... But I guess we can ask the developers to use getCustomerInfo directly if they need to know the result for now.

Yeah I was going to work on that next. I was planning on passing an observer type here?

That probably won't work, it's not easy to pass information back from a fragment/activity unfortunately: I recommend reading this, it's dense, but it explains some of the options available: https://developer.android.com/guide/fragments/communicate.

The most common ways to share information between fragments are:

Use the underlying activity, but we don't have a good way to store data there since we are not the owners.

Use the fragment result APIs, but again, that will depend on the caller to make sure they handle the result correctly.
I'm not sure how this is handled in RN TBH, so maybe they have another recommended way...

tonidero · 2023-11-08T08:41:38Z

android/build.gradle


    api "com.revenuecat.purchases:purchases:$purchases_version"
+    api "com.revenuecat.purchases:purchases-ui:$purchases_version"


Mentioned it over slack, but this is causing issues since it's API 24+ but this module is 19+.

NachoSoto · 2023-11-08T22:15:51Z

android/build.gradle

@@ -45,7 +45,8 @@ android {
    buildToolsVersion "32.0.0"

    defaultConfig {
-        minSdkVersion 19
+        // TODO: revert this to 19
+        minSdkVersion 24


TODO: remove!

Merged commit main at 7774b8a into `paywalls` --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com> Co-authored-by: Toni Rico <toni.rico.diez@revenuecat.com> Co-authored-by: RevenueCat Git Bot <72824662+RCGitBot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

NachoSoto · 2023-12-13T17:42:16Z

ios/PurchasesHybridCommon/PurchasesHybridCommon/PaywallProxy.swift

+
+    public func paywallViewController(_ controller: PaywallViewController,
+                                      didFinishPurchasingWith customerInfo: CustomerInfo) {
+        controller.dismiss(animated: true)


We can remove this now, it's done automatically by PaywallView (and works for PaywallViewController): RevenueCat/purchases-ios#3517

This merges latest main with current paywalls branch. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com> Co-authored-by: RevenueCat Git Bot <72824662+RCGitBot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cesar de la Vega <cesarvegaro@gmail.com>

This allows to set a `PaywallViewControllerDelegate` to the `PaywallProxy` to allow to receive purchase events in the hybrids. This is a first step to fix: RevenueCat/purchases-flutter#886 ### TODO - [x] Expose a delegate method that gets called when the PaywallViewController gets dismissed.

…ity (#602)

This is a pretty big change in terms of changes, but it's mostly moving files around. Until now, the `android` folder was both a module and a project. That's against how gradle projects are usually structured, where you have a root project and one or more modules. In this PR, we change this organization to use the proper one of having a root project with multiple modules. Now, we have a project with 2 modules: - api-tests - hybridcommon Some advantages of this: - Api tests are now actually separated from the library module, so they can more accurately reflect what API is really available to consumers. - Now we can separate the revenuecat ui library much more easily by creating a different module (Will be added in a followup PR)

This PR separates paywalls code into a different module. This way we don't force users of the main hybrid common sdk to have to bump their min version, which is a breaking change. This new dependency can be used with `implementation "com.revenuecat.purchases:purchases-hybrid-common-ui:$phc_version"`

@tonidero

### RevenueCatUI * Separate paywalls into a different module (#604) via Toni Rico (@tonidero) * Add PaywallFragmentViewModel to share data with caller fragment/activity (#602) via Toni Rico (@tonidero) * Paywalls: Expose delegate in PaywallProxy to receive events (#586) via Toni Rico (@tonidero) ### Other Changes * Update paywalls branch with main (#592) via Cesar de la Vega (@vegaro) * Re-organize android library (#603) via Toni Rico (@tonidero) * Update paywalls with latest main (#601) via Toni Rico (@tonidero) * Actually set delegate via NachoSoto (@NachoSoto) * Dismiss paywall automatically via NachoSoto (@NachoSoto) * `displayCloseButton` via NachoSoto (@NachoSoto) * Lint via NachoSoto (@NachoSoto) * [remove me] change `minSdkVersion` via NachoSoto (@NachoSoto) * Fix other platforms via NachoSoto (@NachoSoto) * Optional parameter via NachoSoto (@NachoSoto) * Lint via NachoSoto (@NachoSoto) * Revert SDK version change via NachoSoto (@NachoSoto) * Finished API via NachoSoto (@NachoSoto) * [WIP] `RevenueCatUI` support via NachoSoto (@NachoSoto)

This dependency was added by Android Studio's wizard and I didn't check whether it was needed (it wasn't). It actually caused a breaking change, since this dependency requires apps to target Android 34. For some reason I didn't encounter this when I was testing in flutter using `includeBuild` but was able to repro after publishing 8.1.3-beta.5. I tested this again by publishing to maven local and can confirm the fix now.

This updates the paywalls branch to the latest android version which includes this fix: RevenueCat/purchases-android#1532

@tonidero

### RevenueCatUI * Update purchases android to 7.3.0 (#609) via Toni Rico (@tonidero) ### Dependency Updates * Remove core-ktx dependency (#608) via Toni Rico (@tonidero)

Add shouldDisplayDismissButton to launchPaywall so we can add this parameter to the hybrids

Based off #606

Updating paywalls branch with main at 3920db6 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com> Co-authored-by: Toni Rico <toni.rico.diez@revenuecat.com> Co-authored-by: RevenueCat Git Bot <72824662+RCGitBot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

@vegaro

### RevenueCatUI * Add offering parameter for launching paywalls (#612) via Cesar de la Vega (@vegaro) * Add shouldDisplayDismissButton (#606) via Cesar de la Vega (@vegaro) ### Dependency Updates * Android 7.3.0 => 7.3.1 * iOS 4.31.5 => 4.31.6

If the `shouldDisplayDismissButtonKey` was missing, the button wasn't being displayed

Added a function to create a `PaywallFooterViewController`

@vegaro

### RevenueCatUI * Fix dismiss button not showing in Android when not specified (#622) via Cesar de la Vega (@vegaro) * Add createFooterPaywallView to PaywallProxy (#624) via Cesar de la Vega (@vegaro)

This supports having a listener for the result of presenting a paywall which can be used by the hybrids. Currently it's sent as a string, both in iOS and android and possible values are: - `NOT_PRESENTED` - `CANCELLED` - `PURCHASED` - `RESTORED` - `ERROR` (only in android right now)

This will be used by the `presentPaywall`/`presentPaywallIfNeeded` methods.

We didn't add api tests for the new enum added in #634. This adds those.

@tonidero

### RevenueCatUI * Add `PAYWALL_RESULT` to typescript enums (#634) via Toni Rico (@tonidero) * Support result present paywall (#628) via Toni Rico (@tonidero)

Avoid updating hybrids automatically whenever we make a new prerelease. We should only update the hybrids automatically on stable releases. For prereleases, I believe the bump should be performed manually

Only trigger dependent updates on stable releases

I didn't test all ways of presenting a paywall conditionally in #628. This makes sure we return `NOT_PRESENTED` in all cases where appropriate in android. In iOS we were also missing to return a value in `presentPaywallIfNeeded`.

Updating paywalls branch with 6441719 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com> Co-authored-by: Toni Rico <toni.rico.diez@revenuecat.com> Co-authored-by: RevenueCat Git Bot <72824662+RCGitBot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

@tonidero

### RevenueCatUI * Add API tests for paywall result enum in typescript (#636) via Toni Rico (@tonidero) * Fix paywall result not being returned (#639) via Toni Rico (@tonidero) ### Dependency Updates * [AUTOMATIC] iOS 4.31.6 => 4.31.7 (#640) via RevenueCat Git Bot (@RCGitBot) * [AUTOMATIC] Android 7.3.1 => 7.3.2 (#632) via RevenueCat Git Bot (@RCGitBot)

NachoSoto · 2024-01-10T19:13:57Z

.version

We need to revert this before merging.

I wonder, are we releasing this as 8.10.0?

We can manually bump the version after. I was worried that the script that updates the version might miss something if we have inconsistent versions. I think it's better if this PR is just the "feature" change without version changes, etc. and use the regular flow to bump it after.

NachoSoto · 2024-01-10T19:14:13Z

CHANGELOG.md

+* [AUTOMATIC] iOS 4.30.5 => 4.31.1 Android 7.2.4 => 7.2.6 (#584) via RevenueCat Git Bot (@RCGitBot)
+* Bump cocoapods from 1.14.2 to 1.14.3 (#576) via dependabot[bot] (@dependabot[bot])
+
+## 8.0.0


We need to rebase to remove these changes here.

NachoSoto · 2024-01-10T19:14:32Z

PurchasesHybridCommon.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name             = "PurchasesHybridCommon"
-  s.version          = "7.3.3"
+  s.version          = "8.10.0-beta.10"


Revert this

NachoSoto · 2024-01-10T19:14:43Z

PurchasesHybridCommon.podspec

+  s.dependency 'RevenueCat', '4.31.7'
+  s.dependency 'RevenueCatUI', '4.31.7'


Let's rebase and make sure these are up-to-date.

NachoSoto · 2024-01-10T19:15:36Z

android/gradle.properties

-POM_NAME=purchases-hybrid-common
-POM_PACKAGING=aar
-POM_ARTIFACT_ID=purchases-hybrid-common
+VERSION_NAME=8.10.0-beta.10


Revert this before merging.

NachoSoto · 2024-01-10T19:17:47Z

ios/PurchasesHybridCommon/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.3.3</string>
+	<string>8.10.0</string>


Revert this before merging

NachoSoto · 2024-01-10T19:18:00Z

ios/PurchasesHybridCommon/Podfile

+  pod 'RevenueCat', '4.31.7'
+  pod 'RevenueCatUI', '4.31.7'


Need to make sure these are up-to-date before merging

NachoSoto · 2024-01-10T19:18:09Z

ios/PurchasesHybridCommon/Podfile.lock

@@ -1,24 +1,29 @@
 PODS:
  - Nimble (10.0.0)
  - Quick (5.0.1)
-  - RevenueCat (4.30.5)
+  - RevenueCat (4.31.6)


And re-generate these

NachoSoto · 2024-01-10T19:19:13Z

ios/PurchasesHybridCommon/PurchasesHybridCommonTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.3.3</string>
+	<string>8.10.0</string>


Revert before merging

NachoSoto · 2024-01-10T19:19:33Z

typescript/package.json

@@ -1,7 +1,7 @@
 {
  "name": "@revenuecat/purchases-typescript-internal",
  "title": "Purchases typescript internal shared code",
-  "version": "7.3.3",
+  "version": "8.10.0-beta.10",


Revert before merging

NachoSoto · 2024-01-10T19:27:54Z

Re-opened after merging: #647

NachoSoto added the pr:RevenueCatUI label Nov 6, 2023

NachoSoto requested a review from a team November 6, 2023 18:47

NachoSoto added a commit to RevenueCat/react-native-purchases that referenced this pull request Nov 6, 2023

[WIP] RevenueCatUI support

e1f1bae

Depends on RevenueCat/purchases-hybrid-common#549

NachoSoto mentioned this pull request Nov 6, 2023

Paywalls: new react-native-purchases-ui for cross-platform paywalls RevenueCat/react-native-purchases#766

Closed

NachoSoto commented Nov 6, 2023

View reviewed changes

android/build.gradle Outdated Show resolved Hide resolved

NachoSoto force-pushed the paywalls branch from 064e294 to b9e6a56 Compare November 7, 2023 22:10

NachoSoto changed the title ~~[WIP] RevenueCatUI support~~ RevenueCatUI initial support Nov 7, 2023

NachoSoto marked this pull request as ready for review November 7, 2023 22:31

tonidero reviewed Nov 8, 2023

View reviewed changes

NachoSoto mentioned this pull request Nov 8, 2023

RevenueCatUI initial support RevenueCat/purchases-flutter#852

Closed

3 tasks

NachoSoto force-pushed the paywalls branch from 2ab73c9 to b390088 Compare November 8, 2023 20:32

NachoSoto commented Nov 8, 2023

View reviewed changes

NachoSoto force-pushed the paywalls branch 2 times, most recently from f996dc2 to fc31d95 Compare November 8, 2023 23:10

NachoSoto added 9 commits November 15, 2023 11:18

[WIP] RevenueCatUI support

5cba8ba

Finished API

cb24018

Revert SDK version change

e6996d1

Lint

405db7e

Optional parameter

780b4ca

Fix other platforms

ac1baf2

[remove me] change minSdkVersion

ba38b3c

Lint

1b0a095

displayCloseButton

09fb5c0

NachoSoto force-pushed the paywalls branch from 7adf1d3 to 09fb5c0 Compare November 15, 2023 19:19

Dismiss paywall automatically

6190aeb

NachoSoto force-pushed the paywalls branch from 4dcd675 to 6190aeb Compare November 23, 2023 01:01

NachoSoto and others added 2 commits November 23, 2023 09:29

Actually set delegate

165a02f

vegaro force-pushed the paywalls branch from dccaddb to 47866a0 Compare December 11, 2023 14:02

NachoSoto commented Dec 13, 2023

View reviewed changes

tonidero and others added 16 commits December 20, 2023 11:51

Add PaywallFragmentViewModel to share data with caller fragment/activ…

b3a4631

…ity (#602)

Update purchases android to 7.3.0 (#609)

4bbad2c

This updates the paywalls branch to the latest android version which includes this fix: RevenueCat/purchases-android#1532

Release/8.1.3-beta.6 (#610)

3e86121

### RevenueCatUI * Update purchases android to 7.3.0 (#609) via Toni Rico (@tonidero) ### Dependency Updates * Remove core-ktx dependency (#608) via Toni Rico (@tonidero)

Add shouldDisplayDismissButton (#606)

850e7a6

Add shouldDisplayDismissButton to launchPaywall so we can add this parameter to the hybrids

Add offering parameter for launching paywalls (#612)

e93b7a0

Based off #606

Release 8.10.0-beta.7 (#620)

de03d04

### RevenueCatUI * Add offering parameter for launching paywalls (#612) via Cesar de la Vega (@vegaro) * Add shouldDisplayDismissButton (#606) via Cesar de la Vega (@vegaro) ### Dependency Updates * Android 7.3.0 => 7.3.1 * iOS 4.31.5 => 4.31.6

Fix dismiss button not showing in Android when not specified (#622)

d126fc3

If the `shouldDisplayDismissButtonKey` was missing, the button wasn't being displayed

Add createFooterPaywallView to PaywallProxy (#624)

de7ab29

Added a function to create a `PaywallFooterViewController`

Release 8.10.0-beta.8 (#625)

845ec01

### RevenueCatUI * Fix dismiss button not showing in Android when not specified (#622) via Cesar de la Vega (@vegaro) * Add createFooterPaywallView to PaywallProxy (#624) via Cesar de la Vega (@vegaro)

tonidero mentioned this pull request Jan 5, 2024

Fix update hybrid versions file job with new PHC android architecture RevenueCat/fastlane-plugin-revenuecat_internal#57

Merged

1 task

tonidero and others added 9 commits January 8, 2024 09:24

Add PAYWALL_RESULT to typescript enums (#634)

bead1f4

This will be used by the `presentPaywall`/`presentPaywallIfNeeded` methods.

Add API tests for paywall result enum in typescript (#636)

53de168

We didn't add api tests for the new enum added in #634. This adds those.

Release/8.10.0-beta.9 (#635)

dd6fd05

### RevenueCatUI * Add `PAYWALL_RESULT` to typescript enums (#634) via Toni Rico (@tonidero) * Support result present paywall (#628) via Toni Rico (@tonidero)

Do not update hybrids automatically on prereleases (#637)

0d9e479

Avoid updating hybrids automatically whenever we make a new prerelease. We should only update the hybrids automatically on stable releases. For prereleases, I believe the bump should be performed manually

Don't trigger updates on dependents on non-stable releases (#638)

1c931e4

Only trigger dependent updates on stable releases

Fix paywall result not being returned (#639)

033a872

I didn't test all ways of presenting a paywall conditionally in #628. This makes sure we return `NOT_PRESENTED` in all cases where appropriate in android. In iOS we were also missing to return a value in `presentPaywallIfNeeded`.

NachoSoto commented Jan 10, 2024

View reviewed changes

NachoSoto closed this Jan 11, 2024

NachoSoto deleted the paywalls branch January 11, 2024 19:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`RevenueCatUI` initial support #549

`RevenueCatUI` initial support #549

NachoSoto commented Nov 6, 2023

tonidero Nov 8, 2023

tonidero Nov 8, 2023

NachoSoto Nov 8, 2023

tonidero Nov 8, 2023

tonidero Nov 8, 2023

NachoSoto Nov 8, 2023

NachoSoto Dec 13, 2023

NachoSoto Jan 10, 2024

tonidero Jan 11, 2024

NachoSoto Jan 11, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto Jan 10, 2024

NachoSoto commented Jan 10, 2024


		api "com.revenuecat.purchases:purchases:$purchases_version"
		api "com.revenuecat.purchases:purchases-ui:$purchases_version"

		s.dependency 'RevenueCat', '4.31.7'
		s.dependency 'RevenueCatUI', '4.31.7'

RevenueCatUI initial support #549

RevenueCatUI initial support #549

Conversation

NachoSoto commented Nov 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NachoSoto commented Jan 10, 2024

`RevenueCatUI` initial support #549

`RevenueCatUI` initial support #549