pushwoosh-react-native-plugin 6.1.49 → 6.1.51

package/index.js

@@ -4,6 +4,22 @@ import { NativeModules } from 'react-native';
 
 const PushwooshModule = NativeModules.Pushwoosh;
 
+//Constant: RichMediaStyle
+//Rich Media presentation style constants.
+//
+//Values:
+// MODAL - Rich Media displayed as modal dialog
+// LEGACY - Rich Media displayed as full-screen activity
+//
+//Example:
+//(start code)
+//	Pushwoosh.setRichMediaType(Pushwoosh.RichMediaStyle.MODAL);
+//(end)
+const RichMediaStyle = {
+	MODAL: 0,
+	LEGACY: 1
+};
+
 //Class: PushNotification
 //Use `PushNotification` to register device for push notifications on Pushwoosh and customize notification appearance.
 //
@@ -621,11 +637,38 @@ class PushNotification {
 		PushwooshModule.setLanguage(language);
 	}
 
-	// Enables Huawei push messaging 
+	// Enables Huawei push messaging
 	enableHuaweiPushNotifications() {
 		PushwooshModule.enableHuaweiPushNotifications();
 	}
 
+	// Sets the Rich Media presentation style.
+	//
+	// Parameters:
+	// "type" - Rich Media style (Pushwoosh.RichMediaStyle.MODAL or Pushwoosh.RichMediaStyle.LEGACY)
+	//
+	// Example:
+	// Pushwoosh.setRichMediaType(Pushwoosh.RichMediaStyle.MODAL);
+	setRichMediaType(type: number) {
+		PushwooshModule.setRichMediaType(type);
+	}
+
+	// Returns the current Rich Media presentation style.
+	//
+	// Parameters:
+	// "callback" - callback function that receives the current style (MODAL, LEGACY)
+	//
+	// Example:
+	// Pushwoosh.getRichMediaType((type) => {
+	//	console.log("Rich Media Type: " + (type === Pushwoosh.RichMediaStyle.MODAL ? "MODAL" : "LEGACY"));
+	// });
+	getRichMediaType(callback: Function) {
+		PushwooshModule.getRichMediaType(callback);
+	}
+
 }
 
+// Export RichMediaStyle constants
+PushNotification.prototype.RichMediaStyle = RichMediaStyle;
+
 module.exports = new PushNotification();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.49",
+  "version": "6.1.51",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
   "types": "index.d.ts",

package/pushwoosh-react-native-plugin.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name             = "pushwoosh-react-native-plugin"
-  s.version          = "6.1.49"
+  s.version          = "6.1.51"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
   s.license      = 'MIT'
   s.homepage     = 'n/a'
   s.source       = { :git => "https://github.com/Pushwoosh/pushwoosh-react-native-plugin.git" }
-  s.source_files = 'src/ios/PushwooshPlugin/Pushwoosh.{h,m}', 'src/ios/PushwooshPlugin/PWEventDispatcher.{h,m}', 'src/ios/PushwooshPlugin/PWInlineInAppManager.{h,m}'
+  s.source_files = 'src/ios/PushwooshPlugin/Pushwoosh.{h,m}', 'src/ios/PushwooshPlugin/PWEventDispatcher.{h,m}'
   s.platform     = :ios, "11.0"
   s.xcconfig = {
     "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/Headers/Public/React"
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React'
-  s.dependency 'PushwooshXCFramework', '6.11.3'
+  s.dependency 'PushwooshXCFramework', '7.0.14'
   s.dependency 'PushwooshInboxUIXCFramework'
 end

package/src/android/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.7.42"
+    pushwoosh = "6.7.53"
 }
 
 dependencies {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/PushwooshPackage.java

@@ -1,14 +1,11 @@
 package com.pushwoosh.reactnativeplugin;
 
-import android.view.ViewManager;
-
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -20,7 +17,7 @@ public class PushwooshPackage implements ReactPackage {
 
     @Override
     public List<com.facebook.react.uimanager.ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-       return Arrays.<com.facebook.react.uimanager.ViewManager>asList(new InlineInAppManager());
+       return Collections.emptyList();
     }
 
     @Override

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/PushwooshPlugin.java

@@ -43,6 +43,8 @@ import com.pushwoosh.notification.VibrateType;
 import com.pushwoosh.tags.TagsBundle;
 import com.pushwoosh.notification.LocalNotification;
 import com.pushwoosh.notification.LocalNotificationReceiver;
+import com.pushwoosh.richmedia.RichMediaManager;
+import com.pushwoosh.richmedia.RichMediaType;
 
 import org.json.JSONObject;
 
@@ -93,7 +95,6 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		return "Pushwoosh";
 	}
 
-
 	@ReactMethod
 	public void init(ReadableMap config, Callback success, Callback error) {
 		String appId = config.getString("pw_appid");
@@ -550,6 +551,18 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		Pushwoosh.getInstance().registerWhatsappNumber(phoneNumber);
 	}
 
+	@ReactMethod
+	public void setRichMediaType(int type) {
+		RichMediaType richMediaType = type == 0 ? RichMediaType.MODAL : RichMediaType.DEFAULT;
+		RichMediaManager.setRichMediaType(richMediaType);
+	}
+
+	@ReactMethod
+	public void getRichMediaType(Callback callback) {
+		RichMediaType type = RichMediaManager.getRichMediaType();
+		callback.invoke(type.ordinal());
+	}
+
 	///
 	/// LifecycleEventListener callbacks
 	///

package/src/ios/PushwooshPlugin/Pushwoosh.h

@@ -12,16 +12,16 @@
 
 #if __has_include(<PushwooshFramework/PushNotificationManager.h>)
 #import <PushwooshFramework/PushNotificationManager.h>
-#import <PushwooshFramework/PWInAppManager.h>
-#import <PushwooshInboxUI/PushwooshInboxUI.h>
-#import <PushwooshFramework/PWInlineInAppView.h>
 #import <PushwooshFramework/PWInbox.h>
+#import <PushwooshCore/PWInAppManager.h>
+#import <PushwooshCore/PWMedia.h>
+#import <PushwooshInboxUI/PushwooshInboxUI.h>
 #else
 #import "PushNotificationManager.h"
+#import "PWInbox.h"
 #import "PWInAppManager.h"
+#import "PWMedia.h"
 #import "PushwooshInboxUI.h"
-#import "PWInlineInAppView.h"
-#import "PWInbox.h"
 #endif
 
 @interface PushwooshPlugin: RCTEventEmitter<RCTBridgeModule, PushNotificationDelegate>

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -879,7 +879,21 @@ RCT_EXPORT_METHOD(registerSMSNumber:(NSString *)phoneNumber) {
 RCT_EXPORT_METHOD(registerWhatsappNumber:(NSString *)phoneNumber) {
     [[Pushwoosh sharedInstance] registerWhatsappNumber:phoneNumber];
 }
-    
+
+RCT_EXPORT_METHOD(setRichMediaType:(nonnull NSNumber *)type) {
+    PWRichMediaPresentationStyle style = [type integerValue] == 0
+        ? PWRichMediaPresentationStyleModal
+        : PWRichMediaPresentationStyleLegacy;
+    [Pushwoosh.media setRichMediaPresentationStyle:style];
+}
+
+RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
+    PWRichMediaPresentationStyle style = [Pushwoosh.media richMediaPresentationStyle];
+    if (callback) {
+        callback(@[@(style)]);
+    }
+}
+
 #pragma mark - PushNotificationDelegate
 
 - (void)onDidRegisterForRemoteNotificationsWithDeviceToken:(NSString *)token {

package/InlineInApp.js

@@ -1,71 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {requireNativeComponent} from 'react-native';
-
-class InlineInAppView extends React.Component {
-	_onLoaded = (event) => {
-		if (!this.props.onLoaded) {
-			return;
-		}
-
-		// process raw event...
-		this.props.onLoaded(event.nativeEvent);
-	}
-
-	_onClosed = (event) => {
-		if (!this.props.onClosed) {
-			return;
-		}
-
-		// process raw event...
-		this.props.onClosed(event.nativeEvent);
-	}
-
-	_onSizeChanged = (event) => {
-		if (!this.props.onSizeChanged) {
-			return;
-		}
-
-		// process raw event...
-		this.props.onSizeChanged(event.nativeEvent);
-	}
-
-	render() {
-		return (
-			<PWInlineInAppView 
-				{...this.props} 
-				onLoaded = {this._onLoaded}
-				onClosed = {this._onClosed}
-				onSizeChanged = {this._onSizeChanged}
-			/>
-		);
-	}
-}
-
-InlineInAppView.propTypes = {
-	/**
-	 * Value of the identifier property must be equal to the 
-	 * identifier attribute value of the in-app message you've 
-	 * created in Pushwoosh Control Panel
-	 */
-	identifier: PropTypes.string,
-	/**
-     * This event is called to notify you that an inline in-app
-     * was loaded and has been added to the view
-     */
-	onLoaded: PropTypes.func,
-	 /**
-     * This event is called to notify you that an inline in-app
-     * view has been closed by the user
-     */
-	onClosed: PropTypes.func,
-	/**
-     * This event is called to notify you that an inline in-app
-     * view size has been changed
-     */
-	onSizeChanged: PropTypes.func,
-};
-
-var PWInlineInAppView = requireNativeComponent('PWInlineInAppView', InlineInAppView)
-
-export default InlineInAppView

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/InlineInAppManager.java

@@ -1,48 +0,0 @@
-package com.pushwoosh.reactnativeplugin;
-
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.SimpleViewManager;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.Map;
-
-public class InlineInAppManager extends SimpleViewManager<RCTInlineInAppView> {
-    public static final String REACT_CLASS = "PWInlineInAppView";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    public RCTInlineInAppView createViewInstance(ThemedReactContext context) {
-        RCTInlineInAppView view = new RCTInlineInAppView(context);
-        return view;
-    }
-
-    @ReactProp(name = "identifier")
-    public void setIdentifier(final RCTInlineInAppView view, String identifier) {
-        view.setIdentifier(identifier);
-    }
-
-    public Map getExportedCustomBubblingEventTypeConstants() {
-        return MapBuilder.builder()
-                .put(
-                        "onLoaded",
-                        MapBuilder.of(
-                                "phasedRegistrationNames",
-                                MapBuilder.of("bubbled", "onLoaded")))
-                .put(
-                        "onClosed",
-                        MapBuilder.of(
-                                "phasedRegistrationNames",
-                                MapBuilder.of("bubbled", "onClosed")))
-                .put(
-                        "onSizeChanged",
-                        MapBuilder.of(
-                                "phasedRegistrationNames",
-                                MapBuilder.of("bubbled", "onSizeChanged")))
-                .build();
-    }
-}

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/RCTInlineInAppView.java

@@ -1,75 +0,0 @@
-package com.pushwoosh.reactnativeplugin;
-
-import android.content.Context;
-import android.view.Choreographer;
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.pushwoosh.inapp.view.inline.InlineInAppView;
-import com.pushwoosh.inapp.view.inline.InlineInAppViewListener;
-
-public class RCTInlineInAppView extends InlineInAppView implements InlineInAppViewListener {
-    public RCTInlineInAppView(Context context) {
-        super(context);
-        this.addInlineInAppViewListener(this);
-        setupLayoutHack();
-    }
-
-    void setupLayoutHack() {
-        Choreographer.getInstance().postFrameCallback(new Choreographer.FrameCallback() {
-            @Override
-            public void doFrame(long frameTimeNanos) {
-                manuallyLayoutChildren();
-                getViewTreeObserver().dispatchOnGlobalLayout();
-                Choreographer.getInstance().postFrameCallback(this);
-            }
-        });
-
-    }
-
-    void manuallyLayoutChildren() {
-        for (int i = 0; i < getChildCount(); i++) {
-            View child = getChildAt(i);
-            child.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.EXACTLY));
-            child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight());
-        }
-    }
-
-    @Override
-    public void onInlineInAppLoaded() {
-        WritableMap event = Arguments.createMap();
-        event.putString("identifier", this.getIdentifier());
-        ReactContext reactContext = (ReactContext)getContext();
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(
-                getId(),
-                "onLoaded",
-                event);
-    }
-
-    @Override
-    public void onInlineInAppViewClosed() {
-        WritableMap event = Arguments.createMap();
-        event.putString("identifier", this.getIdentifier());
-        ReactContext reactContext = (ReactContext)getContext();
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(
-                getId(),
-                "onClosed",
-                event);
-    }
-
-    @Override
-    public void onInlineInAppViewChangedSize(int var1, int var2) {
-        WritableMap event = Arguments.createMap();
-        event.putString("width", String.valueOf(var1));
-        event.putString("height", String.valueOf(var2));
-        ReactContext reactContext = (ReactContext)getContext();
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(
-                getId(),
-                "onSizeChanged",
-                event);
-    }
-}

package/src/ios/PushwooshPlugin/PWInlineInAppManager.h

@@ -1,17 +0,0 @@
-//
-//  PWInlineInAppManager.h
-//  pushwoosh-react-native-plugin
-//
-//  Created by Fectum on 15/01/2020.
-//
-
-#import "RCTViewManager.h"
-#import "Pushwoosh.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface PWInlineInAppManager : RCTViewManager <PWInlineInAppViewDelegate>
-
-@end
-
-NS_ASSUME_NONNULL_END

package/src/ios/PushwooshPlugin/PWInlineInAppManager.m

@@ -1,54 +0,0 @@
-//
-//  PWInlineInAppManager.m
-//  pushwoosh-react-native-plugin
-//
-//  Created by Fectum on 15/01/2020.
-//
-
-#import "PWInlineInAppManager.h"
-
-@interface PWReactInlineInAppView: PWInlineInAppView
-
-@property (nonatomic) RCTBubblingEventBlock onLoaded;
-@property (nonatomic) RCTBubblingEventBlock onClosed;
-@property (nonatomic) RCTBubblingEventBlock onSizeChanged;
-
-@end
-
-@implementation PWReactInlineInAppView
-@end
-
-@implementation PWInlineInAppManager 
-
-RCT_EXPORT_MODULE(PWInlineInAppView)
-
-- (UIView *)view {
-    PWReactInlineInAppView *view = [PWReactInlineInAppView new];
-    view.delegate = self;
-    return view;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(identifier, NSString)
-RCT_EXPORT_VIEW_PROPERTY(onLoaded, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onClosed, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onSizeChanged, RCTBubblingEventBlock)
-
-- (void)inlineInAppDidLoadInView:(PWReactInlineInAppView *)inAppView {
-    if (inAppView.onLoaded) {
-        inAppView.onLoaded(@{@"identifier": inAppView.identifier});
-    }
-}
-
-- (void)didCloseInlineInAppView:(PWReactInlineInAppView *)inAppView {
-    if (inAppView.onClosed) {
-        inAppView.onClosed(@{@"identifier": inAppView.identifier});
-    }
-}
-
-- (void)didChangeSizeOfInlineInAppView:(PWReactInlineInAppView *)inAppView {
-    if (inAppView.onSizeChanged) {
-        inAppView.onSizeChanged(@{@"width": @(inAppView.bounds.size.width), @"height": @(inAppView.bounds.size.height)});
-    }
-}
-
-@end