@purchasely/cordova-plugin-purchasely 2.3.1 → 4.1.0

package/example/package.json

@@ -14,15 +14,16 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@purchasely/cordova-plugin-puchasely-google": "file:../../purchasely-google",
-    "cordova-android": "^11.0.0",
-    "cordova-ios": "^6.2.0",
+    "@purchasely/cordova-plugin-purchasely": "file:..",
+    "cordova-android": "^12.0.1",
+    "cordova-ios": "^7.0.1",
     "cordova-plugin-puchasely-google": "file:../../purchasely-google",
     "cordova-plugin-purchasely": "file:.."
   },
   "cordova": {
     "plugins": {
-      "cordova-plugin-puchasely-google": {},
-      "@purchasely/cordova-plugin-puchasely-google": {}
+      "@purchasely/cordova-plugin-puchasely-google": {},
+      "@purchasely/cordova-plugin-purchasely": {}
     },
     "platforms": [
       "android",

package/example/www/index.html

@@ -47,9 +47,21 @@
             <div style="margin-top: 20px;">
                 <button id="openPresentation">Open Presentation</button>
             </div>
+            <div style="margin-top: 20px;">
+                <button id="fetchPresentation">Fetch Presentation</button>
+            </div>
             <div style="margin-top: 20px;">
                 <button id="processToPayment">Continue payment</button>
             </div>
+            <div style="margin-top: 20px;">
+                <button id="showPresentation">Show hidden presentation</button>
+            </div>
+            <div style="margin-top: 20px;">
+                <button id="hidePresentation">Hide presentation</button>
+            </div>
+            <div style="margin-top: 20px;">
+                <button id="closePresentation">Close presentation</button>
+            </div>
             <div style="margin-top: 20px;">
                 <button id="presentSubscriptions">Open Subscriptions</button>
             </div>

package/example/www/js/index.js

@@ -27,13 +27,10 @@ function onDeviceReady() {
 	console.log('Running cordova-' + cordova.platformId + '@' + cordova.version);
 	document.getElementById('deviceready').classList.add('ready');
 
-	Purchasely.setLanguage('en');
-
-	Purchasely.userDidConsumeSubscriptionContent();
-
-	Purchasely.startWithAPIKey(
+	Purchasely.start(
 		'fcb39be4-2ba4-4db7-bde3-2a5a1e20745d',
 		['Google'],
+		false,
 		null,
 		Purchasely.LogLevel.DEBUG,
 		Purchasely.RunningMode.full,
@@ -44,8 +41,14 @@ function onDeviceReady() {
 			console.log(error);
 		});
 
+	Purchasely.setLanguage('en');
+
 	document.getElementById("openPresentation").addEventListener("click", openPresentation);
+	document.getElementById("fetchPresentation").addEventListener("click", fetchPresentation);
 	document.getElementById("presentSubscriptions").addEventListener("click", presentSubscriptions);
+	document.getElementById("showPresentation").addEventListener("click", showPresentation);
+	document.getElementById("hidePresentation").addEventListener("click", hidePresentation);
+	document.getElementById("closePresentation").addEventListener("click", closePresentation);
 	document.getElementById("purchaseWithPlanVendorId").addEventListener("click", purchaseWithPlanVendorId);
 	document.getElementById("restore").addEventListener("click", restore);
 	document.getElementById("silentRestore").addEventListener("click", silentRestore);
@@ -86,7 +89,7 @@ function onPuchaselySdkReady() {
 	Purchasely.setAttribute(Purchasely.Attribute.FIREBASE_APP_INSTANCE_ID, "1");
 	Purchasely.setAttribute(Purchasely.Attribute.BATCH_INSTALLATION_ID, "testBatch1");
 
-	Purchasely.isReadyToPurchase(true);
+	Purchasely.readyToOpenDeeplink(true);
 
 	Purchasely.planWithIdentifier('PURCHASELY_PLUS_MONTHLY', (plan) => {
 		console.log(' ==> Plan');
@@ -100,7 +103,6 @@ function onPuchaselySdkReady() {
 		console.log(plan.introPrice);
 		console.log(plan.introAmount);
 		console.log(plan.introDuration);
-		console.log('Eligible for intro offer ? ' + plan.isEligibleForIntroOffer);
 	}, (error) => {
 		console.log(error);
 	});
@@ -117,6 +119,42 @@ function onPuchaselySdkReady() {
 		console.log("Error with purchase : " + error);
 	});
 
+	Purchasely.setUserAttributeWithString("key_string", "value_string");
+	Purchasely.setUserAttributeWithBoolean("key_boolean", true);
+	Purchasely.setUserAttributeWithInt("key_int", 7);
+	Purchasely.setUserAttributeWithDouble("key_double", 4.5);
+	Purchasely.setUserAttributeWithDate("key_date", new Date().toISOString());
+
+	Purchasely.userAttribute("key_string", value => {
+		console.log("User attribute string " + value);
+	});
+
+	Purchasely.userAttribute("key_boolean", value => {
+		console.log("User attribute boolean " + value);
+	});
+
+	Purchasely.userAttribute("key_int", value => {
+		console.log("User attribute int " + value);
+	});
+
+	Purchasely.userAttribute("key_double", value => {
+		console.log("User attribute double " + value);
+	});
+
+	Purchasely.userAttribute("key_date", value => {
+		console.log("User attribute date " + value);
+
+		Purchasely.clearUserAttribute("key_string");
+		Purchasely.userAttribute("key_string",{}, error => {
+			console.log("User attribute string cleared ? " + error);
+
+			Purchasely.clearUserAttributes();
+			Purchasely.userAttribute("key_double", {}, error => {
+				console.log("User attribute double empty? " + error);
+			});
+		});
+	});
+
 	Purchasely.setPaywallActionInterceptor((result) => {
 		console.log(result);
 		console.log('Received action from paywall ' + result.info.presentationId);
@@ -146,7 +184,7 @@ function onPuchaselySdkReady() {
 		} else if (result.action === Purchasely.PaywallAction.purchase) {
 			console.log('User wants to purchase');
 			//If you want to intercept it, close paywall and display your screen
-			Purchasely.closePaywall();
+			Purchasely.hidePresentation();
 		} else if (result.action === Purchasely.PaywallAction.restore) {
 			console.log('User wants to restore his purchases');
 			Purchasely.onProcessAction(true);
@@ -176,6 +214,30 @@ function openPresentation() {
 	);
 }
 
+function fetchPresentation() {
+	Purchasely.fetchPresentationForPlacement(
+		'onboarding', //placementId
+		null, //contentId
+		(presentation) => {
+			console.log(presentation);
+			Purchasely.presentPresentation(presentation, false, null,
+				(callback) => {
+					console.log(callback);
+					if(callback.result == Purchasely.PurchaseResult.CANCELLED) {
+						console.log("User cancelled purchased");
+					} else {
+						console.log("User purchased " + callback.plan.name);
+					}
+				}, (error) => {
+					console.log("Error with present : " + error);
+				});
+		},
+		(error) => {
+			console.log("Error with purchase : " + error);
+		}
+	);
+}
+
 function presentSubscriptions() {
 	Purchasely.presentSubscriptions();
 }
@@ -185,10 +247,25 @@ function purchaseWithPlanVendorId() {
 }
 
 function processToPayment() {
+	// Call this method open paywall again
+	Purchasely.showPresentation();
+
 	// Call this method to process to payment
 	Purchasely.onProcessAction(true);
 }
 
+function showPresentation() {
+	Purchasely.showPresentation();
+}
+
+function hidePresentation() {
+	Purchasely.hidePresentation();
+}
+
+function closePresentation() {
+	Purchasely.closePresentation();
+}
+
 function restore() {
 	Purchasely.restoreAllProducts(
 		(plan) => {
@@ -213,8 +290,35 @@ function silentRestore() {
 	);
 }
 
+function isEligibleForIntroOffer() {
+	console.log("isEligibleForIntroOffer");
+	Purchasely.isEligibleForIntroOffer(
+		'PURCHASELY_PLUS_YEARLY', // planVendorId
+		(isEligible) => {
+			console.log("isEligibleForIntroOffer result: " + isEligible);
+		},
+		(error) => {
+			console.log("Error with isEligibleForIntroOffer : " + error);
+		}
+	);
+}
+
+function signPromotionalOffer() {
+	console.log("signPromotionalOffer");
+	Purchasely.signPromotionalOffer(
+		'com.purchasely.plus.yearly', // storeProductId
+		'com.purchasely.plus.yearly.winback.test', // storeOfferId
+		(signature) => {
+			console.log("signPromotionalOffer result: " + signature);
+		},
+		(error) => {
+			console.log("Error with signPromotionalOffer : " + error);
+		}
+	);
+}
+
 function openDeeplink() {
-	Purchasely.handle(
+	Purchasely.isDeeplinkHandled(
 		"purchasely://ply/presentations/CAROUSEL",
 		isHandled => {
 			console.log("Deeplink is handled ? " + isHandled)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "2.3.1",
+  "version": "4.1.0",
   "description": "Purchasely is a solution to ease the integration and boost your In-App Purchases & Subscriptions on the App Store, Google Play Store, Amazon Appstore and Huawei App Gallery.",
   "cordova": {
     "id": "@purchasely/cordova-plugin-purchasely",
@@ -30,6 +30,14 @@
     "hms",
     "amazon"
   ],
+  "engines": {
+    "cordovaDependencies": {
+      "1.0.0": {
+        "cordova": ">=11.0.0",
+        "cordova-android": ">=12.0.0"
+      }
+    }
+  },
   "author": "Purchasely",
   "license": "ISC",
   "main": "index.js",

package/plugin.xml

@@ -1,9 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@purchasely/cordova-plugin-purchasely" version="2.3.1" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@purchasely/cordova-plugin-purchasely" version="4.1.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Purchasely</name>
     <js-module name="Purchasely" src="www/Purchasely.js">
         <clobbers target="Purchasely" />
     </js-module>
+    <engines>
+        <engine name="cordova" version=">=11.0.0"/>
+        <engine name="cordova-android" version=">=12.0.0"/>
+   </engines>
     <platform name="ios">
         <config-file parent="/*" target="config.xml">
             <feature name="Purchasely">
@@ -23,12 +27,16 @@
         <source-file src="src/ios/Hybrid/PLYPlan+Hybrid.m" />
         <header-file src="src/ios/Hybrid/PLYSubscription+Hybrid.h" />
         <source-file src="src/ios/Hybrid/PLYSubscription+Hybrid.m" />
+        <header-file src="src/ios/Hybrid/PLYPresentationPlan+Hybrid.h" />
+        <source-file src="src/ios/Hybrid/PLYPresentationPlan+Hybrid.m" />
+        <header-file src="src/ios/Hybrid/UIColor+PLYHelper.h" />
+        <source-file src="src/ios/Hybrid/UIColor+PLYHelper.m" />
         <podspec>
             <config>
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="Purchasely" spec="3.3.3"/>
+                <pod name="Purchasely" spec="4.1.4"/>
             </pods>
         </podspec>
     </platform>
@@ -38,6 +46,8 @@
                 <param name="android-package" value="cordova.plugin.purchasely.PurchaselyPlugin" />
             </feature>
             <preference name="AndroidXEnabled" value="true" />
+            <preference name="GradlePluginKotlinEnabled" value="true" />
+            <preference name="GradlePluginKotlinCodeStyle" value="official" />
         </config-file>
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <activity
@@ -51,11 +61,12 @@
                 android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             </activity>
         </config-file>
-        <framework src="io.purchasely:core:3.3.2" />
-        <source-file src="src/android/PurchaselyPlugin.java" target-dir="src/cordova/plugin/purchasely" />
-        <source-file src="src/android/PLYProductActivity.java" target-dir="src/cordova/plugin/purchasely" />
+        <framework src="io.purchasely:core:4.1.1" />
+        <source-file src="src/android/PurchaselyPlugin.kt" target-dir="java/cordova/plugin/purchasely" />
+        <source-file src="src/android/PLYProductActivity.kt" target-dir="java/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYSubscriptionsActivity.java" target-dir="src/cordova/plugin/purchasely" />
         <source-file src="src/android/activity_ply_product_activity.xml" target-dir="res/layout"/>
+        <source-file src="src/android/activity_ply_subscriptions_activity.xml" target-dir="res/layout"/>
         <source-file src="src/android/theme_purchasely_fullscreen.xml" target-dir="res/values"/>
         <source-file src="src/android/theme_purchasely_fullscreen_v23_light_status_bar.xml" target-dir="res/values-v23"/>
         <source-file src="src/android/theme_purchasely_fullscreen_v23.xml" target-dir="res/values-v23"/>

package/purchasely.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/android" isTestSource="false" packagePrefix="cordova.plugin.purchasely" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/src/android/PLYProductActivity.kt

@@ -0,0 +1,171 @@
+package cordova.plugin.purchasely
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import cordova.plugin.purchasely.PurchaselyPlugin.ProductActivity
+import io.purchasely.ext.PLYPresentation
+import io.purchasely.ext.PLYPresentationViewProperties
+import io.purchasely.ext.PLYProductViewResult
+import io.purchasely.ext.Purchasely
+import io.purchasely.models.PLYPlan
+import io.purchasely.views.parseColor
+import java.lang.ref.WeakReference
+
+class PLYProductActivity : AppCompatActivity() {
+
+    private var presentationId: String? = null
+    private var placementId: String? = null
+    private var productId: String? = null
+    private var planId: String? = null
+    private var contentId: String? = null
+
+    private var presentation: PLYPresentation? = null
+
+    private var isFullScreen: Boolean = false
+    private var backgroundColor: String? = null
+
+    private var paywallView: View? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        isFullScreen = intent.extras?.getBoolean("isFullScreen") ?: false
+        backgroundColor = intent.extras?.getString("background_color")
+
+        if(isFullScreen) {
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+        }
+
+        val package_name = application.packageName
+
+        setContentView(
+            application.resources
+                .getIdentifier(
+                    "activity_ply_product_activity",
+                    "layout",
+                    package_name
+                )
+        )
+
+        val container = findViewById<View>(
+            resources.getIdentifier(
+                "container",
+                "id",
+                package_name
+            )
+        ) as FrameLayout
+
+        try {
+            val loadingBackgroundColor = backgroundColor.parseColor(Color.WHITE)
+            container.setBackgroundColor(loadingBackgroundColor)
+        } catch (e: Exception) {
+            //do nothing
+        }
+
+        presentationId = intent.extras?.getString("presentationId")
+        placementId = intent.extras?.getString("placementId")
+        productId = intent.extras?.getString("productId")
+        planId = intent.extras?.getString("planId")
+        contentId = intent.extras?.getString("contentId")
+
+        presentation = intent.extras?.getParcelable("presentation")
+
+        paywallView = if(presentation != null) {
+            presentation?.buildView(this, viewProperties = PLYPresentationViewProperties(onClose = {
+                container.removeAllViews()
+                supportFinishAfterTransition()
+            }), callback)
+        } else {
+            Purchasely.presentationView(
+                this@PLYProductActivity,
+                PLYPresentationViewProperties(
+                    placementId = placementId,
+                    contentId = contentId,
+                    presentationId = presentationId,
+                    planId = planId,
+                    productId = productId,
+                    onLoaded = { isLoaded ->
+                        if(!isLoaded) return@PLYPresentationViewProperties
+
+                        val backgroundPaywall = paywallView?.findViewById<FrameLayout>(io.purchasely.R.id.content)?.background
+                        if(backgroundPaywall != null) {
+                            container.background = backgroundPaywall
+                        }
+                    },
+                    onClose = {
+                        container.removeAllViews()
+                        supportFinishAfterTransition()
+                    }
+                ),
+                callback
+            )
+        }
+
+        if(paywallView == null) {
+            finish()
+            return
+        }
+
+        container.addView(paywallView)
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        val productActivity = ProductActivity()
+        productActivity.presentation = presentation
+        productActivity.presentationId = presentationId
+        productActivity.placementId = placementId
+        productActivity.productId = productId
+        productActivity.planId = planId
+        productActivity.contentId = contentId
+        productActivity.isFullScreen = isFullScreen
+        productActivity.loadingBackgroundColor = backgroundColor
+        productActivity.activity = WeakReference(this)
+        PurchaselyPlugin.productActivity = productActivity
+    }
+
+    override fun onDestroy() {
+        PurchaselyPlugin.productActivity?.activity = null
+        super.onDestroy()
+    }
+
+    private val callback: (PLYProductViewResult, PLYPlan?) -> Unit = { result, plan ->
+        PurchaselyPlugin.sendPurchaseResult(
+            result,
+            plan
+        )
+        //supportFinishAfterTransition()
+    }
+
+    companion object {
+        @JvmStatic
+        fun newIntent(activity: Activity?,
+                      properties: PLYPresentationViewProperties = PLYPresentationViewProperties(),
+                      isFullScreen: Boolean = false,
+                      backgroundColor: String? = null) = Intent(activity, PLYProductActivity::class.java).apply {
+            //remove old activity if still referenced to avoid issues
+            val oldActivity = PurchaselyPlugin.productActivity?.activity?.get()
+            oldActivity?.finish()
+            PurchaselyPlugin.productActivity?.activity = null
+            PurchaselyPlugin.productActivity = null
+            //flags = Intent.FLAG_ACTIVITY_NEW_TASK xor Intent.FLAG_ACTIVITY_MULTIPLE_TASK
+
+            putExtra("background_color", backgroundColor)
+            putExtra("isFullScreen", isFullScreen)
+
+            putExtra("presentationId", properties.presentationId)
+            putExtra("contentId", properties.contentId)
+            putExtra("placementId", properties.placementId)
+            putExtra("productId", properties.productId)
+            putExtra("planId", properties.planId)
+        }
+    }
+
+}

package/src/android/PLYSubscriptionsActivity.java

@@ -14,7 +14,7 @@ public class PLYSubscriptionsActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         String package_name = getApplication().getPackageName();
         setContentView(getApplication().getResources()
-                .getIdentifier("activity_ply_product_activity",
+                .getIdentifier("activity_ply_subscriptions_activity",
                         "layout",
                         package_name)
         );