@metrixorg/react-native-plugin 2.2.14 → 2.4.0

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=--init-script /var/folders/3y/rmmx1z3n28q716pq_3s9py4w0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/3y/rmmx1z3n28q716pq_3s9py4w0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

package/android/build.gradle

@@ -38,9 +38,9 @@ rootProject.allprojects {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
 
-    implementation 'ir.metrix.analytics:metrix-reactnative:2.2.14'
-    implementation 'ir.metrix.attribution:metrix-reactnative:2.2.14'
+    implementation 'ir.metrix.analytics:metrix-reactnative:2.4.0'
+    implementation 'ir.metrix.attribution:metrix-reactnative:2.4.0'
     if (project.ext.notificationEnabled) {
-        api 'ir.metrix.notification:metrix-reactnative:2.2.14'
+        api 'ir.metrix.notification:metrix-reactnative:2.4.0'
     }
 }

package/android/src/main/java/ir/metrix/reactnative/MetrixModule.java

@@ -46,21 +46,23 @@ public class MetrixModule extends ReactContextBaseJavaModule {
     public void removeListeners(Integer count) { }
 
     @ReactMethod
-    public void newEvent(String eventName) {
-        ir.metrix.analytics.MetrixAnalytics.newEvent(eventName);
+    public void newEvent(String slug) {
+        ir.metrix.analytics.MetrixAnalytics.newEvent(slug);
     }
 
     @ReactMethod
-    public void newCustomEvent(String eventName, ReadableMap customAttributes) {
-        Map<String, String> customAttr = new HashMap<>();
+    public void newEventByName(String name) {
+        ir.metrix.analytics.MetrixAnalytics.newEventByName(name);
+    }
 
-        ReadableMapKeySetIterator customAttrMapKeySetIterator = customAttributes.keySetIterator();
-        while (customAttrMapKeySetIterator.hasNextKey()) {
-            String key = customAttrMapKeySetIterator.nextKey();
-            customAttr.put(key, customAttributes.getString(key));
-        }
+    @ReactMethod
+    public void newCustomEvent(String slug, ReadableMap customAttributes) {
+        ir.metrix.analytics.MetrixAnalytics.newEvent(slug, ReadableMapUtils.toMap(customAttributes));
+    }
 
-        ir.metrix.analytics.MetrixAnalytics.newEvent(eventName, customAttr);
+    @ReactMethod
+    public void newCustomEventByName(String name, ReadableMap customAttributes) {
+        ir.metrix.analytics.MetrixAnalytics.newEventByName(name, ReadableMapUtils.toMap(customAttributes));
     }
 
     @ReactMethod
@@ -68,11 +70,21 @@ public class MetrixModule extends ReactContextBaseJavaModule {
         ir.metrix.analytics.MetrixAnalytics.newRevenue(slug, revenue);
     }
 
+    @ReactMethod
+    public void newRevenueByNameSimple(String name, Double revenue) {
+        ir.metrix.analytics.MetrixAnalytics.newRevenueByName(name, revenue);
+    }
+
     @ReactMethod
     public void newRevenueCurrency(String slug, Double revenue, String currency) {
         ir.metrix.analytics.MetrixAnalytics.newRevenue(slug, revenue, RevenueCurrency.valueOf(currency));
     }
 
+    @ReactMethod
+    public void newRevenueByNameCurrency(String name, Double revenue, String currency) {
+        ir.metrix.analytics.MetrixAnalytics.newRevenueByName(name, revenue, RevenueCurrency.valueOf(currency));
+    }
+
     @ReactMethod
     public void setSessionNumberListener() {
         ir.metrix.analytics.MetrixAnalytics.setSessionNumberListener(
@@ -97,10 +109,9 @@ public class MetrixModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setUserAttributes(ReadableMap userAttributes) {
-        ReadableMapKeySetIterator userAttributesMapKeySetIterator = userAttributes.keySetIterator();
-        while (userAttributesMapKeySetIterator.hasNextKey()) {
-            String key = userAttributesMapKeySetIterator.nextKey();
-            ir.metrix.analytics.MetrixAnalytics.User.setCustomAttribute(key, userAttributes.getString(key));
+        Map<String, Object> customAttributes = ReadableMapUtils.toMap(userAttributes);
+        for (Map.Entry<String, Object> entry : customAttributes.entrySet()) {
+            ir.metrix.analytics.MetrixAnalytics.User.setCustomAttribute(entry.getKey(), entry.getValue());
         }
     }
 
@@ -189,6 +200,11 @@ public class MetrixModule extends ReactContextBaseJavaModule {
         ir.metrix.analytics.MetrixAnalytics.User.channelDisabled(MessageChannel.valueOf(channel));
     }
 
+    @ReactMethod
+    public void setSignature(String signature) {
+        ir.metrix.attribution.MetrixAttribution.setSignature(signature);
+    }
+
     @ReactMethod
     public void setPushToken(String token) {
         ir.metrix.attribution.MetrixAttribution.setPushToken(token);
@@ -196,10 +212,7 @@ public class MetrixModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void loadInAppMessages() {
-        ir.metrix.reactnative.Reflection.invokeStaticMethod(
-            "ir.metrix.notification.MetrixNotification",
-            "loadInAppMessages"
-        );
+        Reflection.invokeStaticMethod("ir.metrix.notification.MetrixNotification", "loadInAppMessages");
     }
 
     @ReactMethod

package/android/src/main/java/ir/metrix/reactnative/ReadableMapUtils.java

@@ -0,0 +1,72 @@
+package ir.metrix.reactnative;
+
+import com.facebook.react.bridge.*;
+import java.util.*;
+
+public class ReadableMapUtils {
+
+    public static Map<String, Object> toMap(ReadableMap readableMap) {
+        Map<String, Object> result = new HashMap<>();
+
+        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+        while (iterator.hasNextKey()) {
+            String key = iterator.nextKey();
+            ReadableType type = readableMap.getType(key);
+
+            switch (type) {
+                case Null:
+                    result.put(key, null);
+                    break;
+                case Boolean:
+                    result.put(key, readableMap.getBoolean(key));
+                    break;
+                case Number:
+                    // Double is used for both integer and floating point
+                    result.put(key, readableMap.getDouble(key));
+                    break;
+                case String:
+                    result.put(key, readableMap.getString(key));
+                    break;
+                case Map:
+                    result.put(key, toMap(readableMap.getMap(key)));
+                    break;
+                case Array:
+                    result.put(key, toList(readableMap.getArray(key)));
+                    break;
+            }
+        }
+
+        return result;
+    }
+
+    public static List<Object> toList(ReadableArray readableArray) {
+        List<Object> result = new ArrayList<>();
+
+        for (int i = 0; i < readableArray.size(); i++) {
+            ReadableType type = readableArray.getType(i);
+
+            switch (type) {
+                case Null:
+                    result.add(null);
+                    break;
+                case Boolean:
+                    result.add(readableArray.getBoolean(i));
+                    break;
+                case Number:
+                    result.add(readableArray.getDouble(i));
+                    break;
+                case String:
+                    result.add(readableArray.getString(i));
+                    break;
+                case Map:
+                    result.add(toMap(readableArray.getMap(i)));
+                    break;
+                case Array:
+                    result.add(toList(readableArray.getArray(i)));
+                    break;
+            }
+        }
+
+        return result;
+    }
+}

package/android/src/main/java/ir/metrix/reactnative/Reflection.java

@@ -4,9 +4,13 @@ import java.lang.reflect.Method;
 
 public class Reflection {
 
-    public static Object invokeStaticMethod(String className, String methodName) throws Exception {
-        Class<?> clazz = Class.forName(className);
-        Method method = clazz.getDeclaredMethod(methodName);
-        return method.invoke(null);
+    public static Object invokeStaticMethod(String className, String methodName) {
+        try {
+            Class<?> clazz = Class.forName(className);
+            Method method = clazz.getDeclaredMethod(methodName);
+            return method.invoke(null);
+        } catch (Exception e) {
+            return null;
+        }
     }
 }

package/index.js

@@ -18,6 +18,10 @@ Metrix.initialize = function (appId) {
     }
 }
 
+Metrix.setSignature = function (signature) {
+    module_metrix.setSignature(signature);
+};
+
 Metrix.setPushToken = function (token) {
     module_metrix.setPushToken(token);
 };
@@ -47,11 +51,19 @@ Metrix.setUserIdListener = function (callback) {
     module_metrix.setUserIdListener();
 };
 
-Metrix.newEvent = function (eventName, customAttributes) {
+Metrix.newEvent = function (slug, customAttributes) {
+    if (customAttributes) {
+        module_metrix.newCustomEvent(slug, customAttributes);
+    } else {
+        module_metrix.newEvent(slug);
+    }
+};
+
+Metrix.newEventByName = function (name, customAttributes) {
     if (customAttributes) {
-        module_metrix.newCustomEvent(eventName, customAttributes);
+        module_metrix.newCustomEventByName(name, customAttributes);
     } else {
-        module_metrix.newEvent(eventName);
+        module_metrix.newEventByName(name);
     }
 };
 
@@ -60,7 +72,7 @@ Metrix.newRevenue = function (slug, revenue, currency) {
         module_metrix.newRevenueSimple(slug, revenue);
     } else if (currency != null) {
         if (typeof currency === 'string') {
-            module_metrix.newRevenueOrderId(slug, revenue, currency);
+            module_metrix.newRevenueCurrency(slug, revenue, currency);
         } else {
             let currencyValue = getCurrency(currency)
             module_metrix.newRevenueCurrency(slug, revenue, currencyValue);
@@ -68,6 +80,19 @@ Metrix.newRevenue = function (slug, revenue, currency) {
     }
 };
 
+Metrix.newRevenueByName = function (name, revenue, currency) {
+    if (currency == null) {
+        module_metrix.newRevenueByNameSimple(name, revenue);
+    } else if (currency != null) {
+        if (typeof currency === 'string') {
+            module_metrix.newRevenueByNameCurrency(name, revenue, currency);
+        } else {
+            let currencyValue = getCurrency(currency)
+            module_metrix.newRevenueByNameCurrency(name, revenue, currencyValue);
+        }
+    }
+};
+
 Metrix.setUserAttributes = function (userAttributes) {
     if (Platform.OS === "android") {
         module_metrix.setUserAttributes(userAttributes);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@metrixorg/react-native-plugin",
-  "version": "2.2.14",
+  "version": "2.4.0",
   "description": "Metrix React native plugin",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "deploy": "git checkout master && git pull && git merge develop",
     "major": "2",
-    "minor": "2",
-    "patch": "14"
+    "minor": "4",
+    "patch": "0"
   },
   "author": "Metrix",
   "license": "Apache 2.0",