@purchasely/cordova-plugin-purchasely 2.0.0 → 2.0.1

package/README.md

@@ -11,10 +11,24 @@ cordova plugin add @purchasely/cordova-plugin-purchasely
 ## Usage
 
 ```js
-Purchasely.startWithAPIKey('API_KEY', ['Google'], null, Purchasely.LogLevel.DEBUG, false);
+Purchasely.startWithAPIKey(
+    'API_KEY',
+    ['Google'], // list of stores for Android, accepted values: Google, Huawei and Amazon
+    null, // your user id
+    Purchasely.LogLevel.DEBUG, // log level, should be warning or error in production
+    Purchasely.RunningMode.full, // running mode
+    (isConfigured) => {
+        if(isConfigured) // you can use the SDK like display a paywall or make a purchase
+    },
+    (error) => {
+        console.log(error);
+    }
+);
 
 Purchasely.presentPresentationWithIdentifier(
-    'my_presentation_id',
+    'my_presentation_id', // may be null
+    'my_content_id', // may be null
+    false, //display in fullscreen mode
     (callback) => {
         console.log(callback);
         if(callback.result == Purchasely.PurchaseResult.CANCELLED) {

package/VERSIONS.md

@@ -15,3 +15,4 @@ This file provides the underlying native SDK versions that the Cordova SDK relie
 | 1.1.8   | 2.7.3       | 2.7.6           |
 | 1.2.0   | 2.8.0       | 2.8.0           |
 | 2.0.0   | 3.0.0       | 3.0.1           |
+| 2.0.1   | 3.0.0       | 3.0.1           |

package/example/config.xml

@@ -18,6 +18,16 @@
     <platform name="android">
         <allow-intent href="market:*" />
         <preference name="AndroidXEnabled" value="true" />
+        <!--<edit-config
+            file="AndroidManifest.xml"
+            target="/manifest/application/activity[@android:name='cordova.plugin.purchasely.PLYProductActivity']"
+            mode="overwrite">
+            <activity
+                android:label="PLYProductActivity"
+                android:name="cordova.plugin.purchasely.PLYProductActivity"
+                android:theme="@style/Theme.Purchasely.Fullscreen">
+            </activity>
+        </edit-config>-->
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*" />

package/example/www/js/index.js

@@ -30,7 +30,7 @@ function onDeviceReady() {
 	console.log("Hi");
 
 	Purchasely.setLanguage('en')
-	
+
 	Purchasely.startWithAPIKey(
 		'afa96c76-1d8e-4e3c-a48f-204a3cd93a15',
 		['Google'],
@@ -160,6 +160,8 @@ function onPuchaselySdkReady() {
 function openPresentation() {
 	Purchasely.presentPresentationWithIdentifier(
 		null,
+		null,
+		true,
 		(callback) => {
 			console.log(callback);
 			if(callback.result == Purchasely.PurchaseResult.CANCELLED) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@purchasely/cordova-plugin-purchasely" version="2.0.0" 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="2.0.1" 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" />
@@ -56,5 +56,8 @@
         <source-file src="src/android/PLYProductActivity.java" target-dir="src/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/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"/>
     </platform>
 </plugin>

package/src/android/PLYProductActivity.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowCompat;
 import androidx.fragment.app.Fragment;
 
 import java.lang.ref.WeakReference;
@@ -18,6 +19,12 @@ public class PLYProductActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        boolean isFullScreen = getIntent().getExtras().getBoolean("isFullScreen");
+        if(isFullScreen) {
+            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+        }
+
         String package_name = getApplication().getPackageName();
         setContentView(getApplication().getResources()
                 .getIdentifier("activity_ply_product_activity",

package/src/android/PurchaselyPlugin.java

@@ -123,6 +123,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                     presentPresentationWithIdentifier(
                         args.getString(0),
                         args.getString(1),
+                        args.getBoolean(2),
                         callbackContext
                         );
                     break;
@@ -131,6 +132,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                         args.getString(0),
                         args.getString(1),
                         args.getString(2),
+                        args.getBoolean(3),
                         callbackContext
                     );
                     break;
@@ -139,6 +141,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                         args.getString(0),
                         args.getString(1),
                         args.getString(2),
+                        args.getBoolean(3),
                         callbackContext
                     );
                     break;
@@ -376,36 +379,42 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void presentPresentationWithIdentifier(String presentationVendorId,
-                                                    String contentId,
+                                                   String contentId,
+                                                   boolean isFullScreen,
                                                    CallbackContext callbackContext) {
         presentationCallback = callbackContext;
         Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
         intent.putExtra("presentationId", presentationVendorId);
         intent.putExtra("contentId", contentId);
+        intent.putExtra("isFullScreen", isFullScreen);
         cordova.getActivity().startActivity(intent);
     }
 
     private void presentProductWithIdentifier(String productVendorId,
                                               String presentationVendorId,
                                               String contentId,
+                                              boolean isFullScreen,
                                               CallbackContext callbackContext) {
         presentationCallback = callbackContext;
         Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
         intent.putExtra("presentationId", presentationVendorId);
         intent.putExtra("productId", productVendorId);
         intent.putExtra("contentId", contentId);
+        intent.putExtra("isFullScreen", isFullScreen);
         cordova.getActivity().startActivity(intent);
     }
 
     private void presentPlanWithIdentifier(String planVendorId,
                                           String presentationVendorId,
                                           String contentId,
+                                          boolean isFullScreen,
                                           CallbackContext callbackContext) {
         presentationCallback = callbackContext;
         Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
         intent.putExtra("presentationId", presentationVendorId);
         intent.putExtra("planId", planVendorId);
         intent.putExtra("contentId", contentId);
+        intent.putExtra("isFullScreen", isFullScreen);
         cordova.getActivity().startActivity(intent);
     }
 

package/src/android/theme_purchasely_fullscreen.xml

@@ -0,0 +1,6 @@
+<resources>
+    <style name="Theme.Purchasely.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
+      <item name="android:navigationBarColor">@android:color/transparent</item>
+      <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>

package/src/android/theme_purchasely_fullscreen_v23.xml

@@ -0,0 +1,6 @@
+<resources>
+    <style name="Theme.Purchasely.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
+      <item name="android:navigationBarColor">@android:color/transparent</item>
+      <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>

package/src/android/theme_purchasely_fullscreen_v23_light_status_bar.xml

@@ -0,0 +1,7 @@
+<resources>
+    <style name="Theme.Purchasely.Fullscreen.Light" parent="Theme.AppCompat.Light.NoActionBar">
+      <item name="android:navigationBarColor">@android:color/transparent</item>
+      <item name="android:statusBarColor">@android:color/transparent</item>
+      <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>

package/src/ios/CDVPurchasely.m

@@ -17,6 +17,7 @@
 	NSInteger logLevel = [[command argumentAtIndex:3] intValue];
 	NSInteger runningMode = [[command argumentAtIndex:4] intValue];
 
+	[Purchasely setAppTechnology:PLYAppTechnologyCordova];
     [Purchasely startWithAPIKey:apiKey appUserId:userId runningMode:runningMode eventDelegate:nil uiDelegate:nil paywallActionsInterceptor:nil logLevel:logLevel initialized:^(BOOL initialized, NSError * _Nullable error) {
         if (error != nil) {
             [self failureFor:command resultString: error.localizedDescription];
@@ -24,7 +25,6 @@
             [self successFor:command resultBool:initialized];
         }
     }];
-	[Purchasely setAppTechnology:PLYAppTechnologyCordova];
 }
 
 - (void)setLogLevel:(CDVInvokedUrlCommand*)command {
@@ -72,8 +72,10 @@
 
 - (void)presentPresentationWithIdentifier:(CDVInvokedUrlCommand*)command {
 	NSString *presentationVendorId = [command argumentAtIndex:0];
+    NSString *contentId = [command argumentAtIndex:1];
+    BOOL isFullscreen = [[command argumentAtIndex:2] boolValue];
 
-    UIViewController *ctrl = [Purchasely presentationControllerWith:presentationVendorId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
+    UIViewController *ctrl = [Purchasely presentationControllerWith:presentationVendorId contentId:contentId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
         NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
         [self successFor:command resultDict:resultDict];
     }];
@@ -86,7 +88,10 @@
         [navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
 
         self.presentedPresentationViewController = navCtrl;
-
+        
+        if (isFullscreen) {
+            navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
+        }
         [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
     }
 }
@@ -94,8 +99,10 @@
 - (void)presentPlanWithIdentifier:(CDVInvokedUrlCommand*)command {
 	NSString *planVendorId = [command argumentAtIndex:0];
 	NSString *presentationVendorId = [command argumentAtIndex:1];
-
-	UIViewController *ctrl = [Purchasely planControllerFor:planVendorId with:presentationVendorId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
+    NSString *contentId = [command argumentAtIndex:2];
+    BOOL isFullscreen = [[command argumentAtIndex:3] boolValue];
+    
+    UIViewController *ctrl = [Purchasely planControllerFor:planVendorId with:presentationVendorId contentId:contentId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
 		NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
 		[self successFor:command resultDict:resultDict];
 	}];
@@ -109,6 +116,9 @@
         
         self.presentedPresentationViewController = navCtrl;
         
+        if (isFullscreen) {
+            navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
+        }
         [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
     }
 }
@@ -116,8 +126,10 @@
 - (void)presentProductWithIdentifier:(CDVInvokedUrlCommand*)command {
 	NSString *productVendorId = [command argumentAtIndex:0];
 	NSString *presentationVendorId = [command argumentAtIndex:1];
-
-    UIViewController *ctrl = [Purchasely productControllerFor:productVendorId with:presentationVendorId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
+    NSString *contentId = [command argumentAtIndex:2];
+    BOOL isFullscreen = [[command argumentAtIndex:3] boolValue];
+    
+    UIViewController *ctrl = [Purchasely productControllerFor:productVendorId with:presentationVendorId contentId:contentId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
 		NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
 		[self successFor:command resultDict:resultDict];
 	}];
@@ -131,6 +143,9 @@
         
         self.presentedPresentationViewController = navCtrl;
         
+        if (isFullscreen) {
+            navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
+        }
         [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
     }
 }

package/src/ios/Hybrid/PLYPlan+Hybrid.m

@@ -26,7 +26,7 @@
 	}
 
     if (self.appleProductId != nil) {
-        [dict setObject:self.appleProductId forKey:@"appleProductId"];
+        [dict setObject:self.appleProductId forKey:@"productId"];
     }
 
 	NSString *price = [self localizedFullPriceWithLanguage:nil];

package/www/Purchasely.js

@@ -46,28 +46,16 @@ exports.synchronize = function () {
     exec(() => {}, defaultError, 'Purchasely', 'synchronize', []);
 };
 
-exports.presentPresentationWithIdentifier = function (presentationId, contentId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, contentId]);
+exports.presentPresentationWithIdentifier = function (presentationId, contentId, isFullscreen, success, error) {
+    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, contentId, isFullscreen]);
 };
 
-exports.presentPresentationWithIdentifier = function (presentationId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, null]);
+exports.presentProductWithIdentifier = function (productId, presentationId, contentId, isFullscreen, success, error) {
+    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, contentId, isFullscreen]);
 };
 
-exports.presentProductWithIdentifier = function (productId, presentationId, contentId, success, error) {
-    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, contentId]);
-};
-
-exports.presentProductWithIdentifier = function (productId, presentationId, success, error) {
-    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, null]);
-};
-
-exports.presentPlanWithIdentifier = function (planId, presentationId, contentId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, contentId]);
-};
-
-exports.presentPlanWithIdentifier = function (planId, presentationId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, null]);
+exports.presentPlanWithIdentifier = function (planId, presentationId, contentId, isFullscreen, success, error) {
+    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, contentId, isFullscreen]);
 };
 
 exports.presentSubscriptions = function () {