@metrixorg/react-native-plugin 1.5.0 → 2.0.1

package/android/build.gradle

@@ -2,14 +2,13 @@ apply plugin: 'com.android.library'
 
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 100500199
-        versionName "1.5.1"
+        targetSdkVersion 31
+        versionCode 200000058
+        versionName "2.0.0.beta8"
     }
 
     buildTypes {
@@ -23,12 +22,17 @@ android {
 
 rootProject.allprojects {
     repositories {
+        google()
         mavenCentral()
+        //noinspection JcenterRepositoryObsolete
+        jcenter()
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'ir.metrix:metrix-reactnative:1.5.1'
 
+    implementation 'ir.metrix.analytics:metrix-reactnative:2.0.0.beta8'
+    implementation 'ir.metrix.attribution:metrix-reactnative:2.0.0.beta8'
+    api 'ir.metrix.notification:metrix-reactnative:2.0.0.beta8'
 }

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

@@ -1,32 +1,28 @@
 package ir.metrix.reactnative;
 
-import android.app.Application;
 import android.net.Uri;
-import android.os.Bundle;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
-
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
-import android.util.Log;
-
 import java.util.HashMap;
 import java.util.Map;
 
-import ir.metrix.AttributionData;
-import ir.metrix.messaging.RevenueCurrency;
-import ir.metrix.OnAttributionChangeListener;
-import ir.metrix.OnDeeplinkResponseListener;
-import ir.metrix.UserIdListener;
-import ir.metrix.session.SessionIdListener;
-import ir.metrix.session.SessionNumberListener;
+import ir.metrix.analytics.SessionIdListener;
+import ir.metrix.analytics.SessionNumberListener;
+import ir.metrix.analytics.messaging.MessageChannel;
+import ir.metrix.analytics.messaging.RevenueCurrency;
+import ir.metrix.analytics.messaging.UserGender;
+import ir.metrix.attribution.AttributionData;
+import ir.metrix.attribution.OnAttributionChangeListener;
+import ir.metrix.attribution.OnDeeplinkResponseListener;
+import ir.metrix.attribution.UserIdListener;
 
 public class MetrixModule extends ReactContextBaseJavaModule {
 
@@ -41,9 +37,17 @@ public class MetrixModule extends ReactContextBaseJavaModule {
         return TAG;
     }
 
+    // Required for rn built in EventEmitter Calls.
+    @ReactMethod
+    public void addListener(String eventName) { }
+
+    // Required for rn built in EventEmitter Calls.
+    @ReactMethod
+    public void removeListeners(Integer count) { }
+
     @ReactMethod
     public void newEvent(String eventName) {
-        ir.metrix.Metrix.newEvent(eventName);
+        ir.metrix.analytics.MetrixAnalytics.newEvent(eventName);
     }
 
     @ReactMethod
@@ -56,75 +60,143 @@ public class MetrixModule extends ReactContextBaseJavaModule {
             customAttr.put(key, customAttributes.getString(key));
         }
 
-        ir.metrix.Metrix.newEvent(eventName, customAttr);
+        ir.metrix.analytics.MetrixAnalytics.newEvent(eventName, customAttr);
     }
 
     @ReactMethod
     public void newRevenueSimple(String slug, Double revenue) {
-        ir.metrix.Metrix.newRevenue(slug, revenue);
+        ir.metrix.analytics.MetrixAnalytics.newRevenue(slug, revenue);
     }
 
     @ReactMethod
     public void newRevenueCurrency(String slug, Double revenue, String currency) {
-        ir.metrix.Metrix.newRevenue(slug, revenue, RevenueCurrency.valueOf(currency));
+        ir.metrix.analytics.MetrixAnalytics.newRevenue(slug, revenue, RevenueCurrency.valueOf(currency));
     }
 
     @ReactMethod
-    public void newRevenueOrderId(String slug, Double revenue, String orderId) {
-        ir.metrix.Metrix.newRevenue(slug, revenue, orderId);
+    public void setSessionNumberListener() {
+        ir.metrix.analytics.MetrixAnalytics.setSessionNumberListener(
+                new SessionNumberListener() {
+                    @Override
+                    public void onSessionNumberChanged(int sessionNumber) {
+                        sendStringEvent("onSessionNumberChangedListener", String.valueOf(sessionNumber));
+                    }
+                });
     }
 
     @ReactMethod
-    public void newRevenueFull(String slug, Double revenue, String currency, String orderId) {
-        ir.metrix.Metrix.newRevenue(slug, revenue, RevenueCurrency.valueOf(currency), orderId);
+    public void setSessionIdListener() {
+        ir.metrix.analytics.MetrixAnalytics.setSessionIdListener(
+                new SessionIdListener() {
+                    @Override
+                    public void onSessionIdChanged(String sessionId) {
+                        sendStringEvent("onSessionIdChangedListener", sessionId);
+                    }
+                });
     }
 
     @ReactMethod
-    public void addUserAttributes(ReadableMap userAttributes) {
-
-        Map<String, String> userAttrs = new HashMap<>();
-
+    public void setUserAttributes(ReadableMap userAttributes) {
         ReadableMapKeySetIterator userAttributesMapKeySetIterator = userAttributes.keySetIterator();
         while (userAttributesMapKeySetIterator.hasNextKey()) {
             String key = userAttributesMapKeySetIterator.nextKey();
-            userAttrs.put(key, userAttributes.getString(key));
+            ir.metrix.analytics.MetrixAnalytics.User.setCustomAttribute(key, userAttributes.getString(key));
         }
+    }
 
-        ir.metrix.Metrix.addUserAttributes(userAttrs);
+    @ReactMethod
+    public void setUserCustomId(String id) {
+        ir.metrix.analytics.MetrixAnalytics.User.setUserCustomId(id);
     }
 
     @ReactMethod
-    public void setPushToken(String token) {
-        ir.metrix.Metrix.setPushToken(token);
+    public void deleteUserCustomId() {
+        ir.metrix.analytics.MetrixAnalytics.User.deleteUserCustomId();
     }
 
     @ReactMethod
-    public void setSessionNumberListener() {
-        ir.metrix.Metrix.setSessionNumberListener(
-            new SessionNumberListener() {
-                @Override
-                public void onSessionNumberChanged(int sessionNumber) {
-                    sendStringEvent("onSessionNumberChangedListener", String.valueOf(sessionNumber));
-                }
-            }
-        );
+    public void setUserFirstName(String firstName) {
+        ir.metrix.analytics.MetrixAnalytics.User.setFirstName(firstName);
     }
 
     @ReactMethod
-    public void setSessionIdListener() {
-        ir.metrix.Metrix.setSessionIdListener(
-            new SessionIdListener() {
-                @Override
-                public void onSessionIdChanged(String sessionId) {
-                    sendStringEvent("onSessionIdChangedListener", sessionId);
-                }
-            }
-        );
+    public void setUserLastName(String lastName) {
+        ir.metrix.analytics.MetrixAnalytics.User.setLastName(lastName);
+    }
+
+    @ReactMethod
+    public void setUserPhoneNumber(String phoneNumber) {
+        ir.metrix.analytics.MetrixAnalytics.User.setPhoneNumber(phoneNumber);
+    }
+
+    @ReactMethod
+    public void setUserHashedPhoneNumber(String hashedPhoneNumber) {
+        ir.metrix.analytics.MetrixAnalytics.User.setHashedPhoneNumber(hashedPhoneNumber);
+    }
+
+    @ReactMethod
+    public void setUserEmail(String email) {
+        ir.metrix.analytics.MetrixAnalytics.User.setEmail(email);
+    }
+
+    @ReactMethod
+    public void setUserHashedEmail(String hashedEmail) {
+        ir.metrix.analytics.MetrixAnalytics.User.setHashedEmail(hashedEmail);
+    }
+
+    @ReactMethod
+    public void setUserCountry(String country) {
+        ir.metrix.analytics.MetrixAnalytics.User.setCountry(country);
+    }
+
+    @ReactMethod
+    public void setUserCity(String city) {
+        ir.metrix.analytics.MetrixAnalytics.User.setCity(city);
+    }
+
+    @ReactMethod
+    public void setUserRegion(String region) {
+        ir.metrix.analytics.MetrixAnalytics.User.setRegion(region);
+    }
+
+    @ReactMethod
+    public void setUserLocality(String locality) {
+        ir.metrix.analytics.MetrixAnalytics.User.setLocality(locality);
+    }
+
+    @ReactMethod
+    public void setUserGender(String gender) {
+        ir.metrix.analytics.MetrixAnalytics.User.setGender(UserGender.valueOf(gender));
+    }
+
+    @ReactMethod
+    public void setUserBirthday(Number birthday) {
+        ir.metrix.analytics.MetrixAnalytics.User.setBirthday(birthday.longValue());
+    }
+
+    @ReactMethod
+    public void setUserFcmToken(String fcmToken) {
+        ir.metrix.analytics.MetrixAnalytics.User.setFcmToken(fcmToken);
+    }
+
+    @ReactMethod
+    public void userChannelEnabled(String channel) {
+        ir.metrix.analytics.MetrixAnalytics.User.channelEnabled(MessageChannel.valueOf(channel));
+    }
+
+    @ReactMethod
+    public void userChannelDisabled(String channel) {
+        ir.metrix.analytics.MetrixAnalytics.User.channelDisabled(MessageChannel.valueOf(channel));
+    }
+
+    @ReactMethod
+    public void setPushToken(String token) {
+        ir.metrix.attribution.MetrixAttribution.setPushToken(token);
     }
 
     @ReactMethod
     public void setOnAttributionChangedListener() {
-        ir.metrix.Metrix.setOnAttributionChangedListener(
+        ir.metrix.attribution.MetrixAttribution.setOnAttributionChangedListener(
                 new OnAttributionChangeListener() {
                     @Override
                     public void onAttributionChanged(AttributionData attributionData) {
@@ -137,7 +209,7 @@ public class MetrixModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setUserIdListener() {
-        ir.metrix.Metrix.setUserIdListener(
+        ir.metrix.attribution.MetrixAttribution.setUserIdListener(
                 new UserIdListener() {
                     @Override
                     public void onUserIdReceived(String userId) {
@@ -148,7 +220,7 @@ public class MetrixModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setOnDeeplinkResponseListener(final boolean shouldLaunchDeeplink) {
-        ir.metrix.Metrix.setOnDeeplinkResponseListener(
+        ir.metrix.attribution.MetrixAttribution.setOnDeeplinkResponseListener(
                 new OnDeeplinkResponseListener() {
                     @Override
                     public boolean launchReceivedDeeplink(Uri deeplink) {
@@ -161,7 +233,6 @@ public class MetrixModule extends ReactContextBaseJavaModule {
     private WritableMap getWritableMapFromAttributionModel(AttributionData attributionData) {
         WritableMap map = Arguments.createMap();
 
-
         if (attributionData.getAcquisitionAd() != null) {
             map.putString("acquisitionAd", attributionData.getAcquisitionAd());
         }
@@ -190,13 +261,13 @@ public class MetrixModule extends ReactContextBaseJavaModule {
 
     private void sendObjectEvent(String eventName, WritableMap param) {
         getReactApplicationContext()
-               .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-               .emit(eventName, param);
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                .emit(eventName, param);
     }
 
     private void sendStringEvent(String eventName, String param) {
         getReactApplicationContext()
-               .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-               .emit(eventName, param);
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                .emit(eventName, param);
     }
 }

package/index.js

@@ -6,48 +6,48 @@ import {
 
 let module_metrix = NativeModules.Metrix;
 const eventEmitter = new NativeEventEmitter(module_metrix);
-   
+
 var Metrix = {};
 
 Metrix.shouldLaunchDeeplink = true
 
 // not used in android
-Metrix.initialize = function(appId) {
+Metrix.initialize = function (appId) {
     if (Platform.OS === "ios") {
         module_metrix.initialize(appId)
     }
 }
 
-Metrix.setPushToken = function(token) {
+Metrix.setPushToken = function (token) {
     module_metrix.setPushToken(token);
 };
 
-Metrix.setSessionNumberListener = function(callback) {
+Metrix.setSessionNumberListener = function (callback) {
     eventEmitter.addListener('onSessionNumberChangedListener', callback);
     module_metrix.setSessionNumberListener();
 };
 
-Metrix.setSessionIdListener = function(callback) {
+Metrix.setSessionIdListener = function (callback) {
     eventEmitter.addListener('onSessionIdChangedListener', callback);
     module_metrix.setSessionIdListener();
 };
 
-Metrix.setOnAttributionChangedListener = function(callback) {
+Metrix.setOnAttributionChangedListener = function (callback) {
     eventEmitter.addListener('onAttributionChangedListener', callback);
     module_metrix.setOnAttributionChangedListener();
 };
 
-Metrix.setOnDeeplinkResponseListener = function(callback) {
+Metrix.setOnDeeplinkResponseListener = function (callback) {
     eventEmitter.addListener('onDeeplinkResponseListener', callback);
     module_metrix.setOnDeeplinkResponseListener(this.shouldLaunchDeeplink);
 };
 
-Metrix.setUserIdListener = function(callback) {
+Metrix.setUserIdListener = function (callback) {
     eventEmitter.addListener('onUserIdListener', callback);
     module_metrix.setUserIdListener();
 };
 
-Metrix.newEvent = function(eventName, customAttributes) {
+Metrix.newEvent = function (eventName, customAttributes) {
     if (customAttributes) {
         module_metrix.newCustomEvent(eventName, customAttributes);
     } else {
@@ -55,42 +55,160 @@ Metrix.newEvent = function(eventName, customAttributes) {
     }
 };
 
-Metrix.newRevenue = function(slug, revenue, currencyOrderId, orderId) {
-    if (currencyOrderId == null && orderId == null) {
+Metrix.newRevenue = function (slug, revenue, currency) {
+    if (currency == null) {
         module_metrix.newRevenueSimple(slug, revenue);
-    } else if (currencyOrderId != null && orderId == null) {
-        if (typeof currencyOrderId === 'string') {
-            module_metrix.newRevenueOrderId(slug, revenue, currencyOrderId);
+    } else if (currency != null) {
+        if (typeof currency === 'string') {
+            module_metrix.newRevenueOrderId(slug, revenue, currency);
         } else {
-            let currency = getCurrency(currencyOrderId)
-            module_metrix.newRevenueCurrency(slug, revenue, currency);
-        }        
-    } else {
-        let currency = getCurrency(currencyOrderId)
-        module_metrix.newRevenueFull(slug, revenue, currency, orderId);
+            let currencyValue = getCurrency(currency)
+            module_metrix.newRevenueCurrency(slug, revenue, currencyValue);
+        }
     }
 };
 
-Metrix.addUserAttributes = function(userAttributes) {
-    module_metrix.addUserAttributes(userAttributes);
+Metrix.setUserAttributes = function (userAttributes) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserAttributes(userAttributes);
+    } else if (Platform.OS === "ios") {
+        module_metrix.addUserAttributes(userAttributes);
+    }
 };
 
+Metrix.setUserCustomId = function (id) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserCustomId(id);
+    }
+}
+
+Metrix.deleteUserCustomId = function () {
+    if (Platform.OS === "android") {
+        module_metrix.deleteUserCustomId();
+    }
+}
+
+Metrix.setUserFirstName = function (firstName) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserFirstName(firstName);
+    }
+}
+
+Metrix.setUserLastName = function (lastName) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserLastName(lastName);
+    }
+}
+
+Metrix.setUserPhoneNumber = function (phoneNumber) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserPhoneNumber(phoneNumber);
+    }
+}
+
+Metrix.setUserHashedPhoneNumber = function (hashedPhoneNumber) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserHashedPhoneNumber(hashedPhoneNumber);
+    }
+}
+
+Metrix.setUserEmail = function (email) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserEmail(email);
+    }
+}
+
+Metrix.setUserHashedEmail = function (hashedEmail) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserHashedEmail(hashedEmail);
+    }
+}
+
+Metrix.setUserCountry = function (country) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserCountry(country);
+    }
+}
+
+Metrix.setUserCity = function (city) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserCity(city);
+    }
+}
+
+Metrix.setUserRegion = function (region) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserRegion(region);
+    }
+}
+
+Metrix.setUserLocality = function (locality) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserLocality(locality);
+    }
+}
+
+Metrix.setUserGender = function (gender) {
+    if (Platform.OS === "android") {
+        if (typeof channel === 'string') {
+            module_metrix.setUserGender(gender);
+        } else {
+            let genderValue = getGender(gender)
+            module_metrix.setUserGender(genderValue);
+        }
+    }
+}
+
+Metrix.setUserBirthday = function (birthday) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserBirthday(birthday);
+    }
+}
+
+Metrix.setUserFcmToken = function (fcmToken) {
+    if (Platform.OS === "android") {
+        module_metrix.setUserFcmToken(fcmToken);
+    }
+}
+
+Metrix.userChannelEnabled = function (channel) {
+    if (Platform.OS === "android") {
+        if (typeof channel === 'string') {
+            module_metrix.userChannelEnabled(channel);
+        } else {
+            let channelValue = getChannel(channel)
+            module_metrix.userChannelEnabled(channelValue);
+        }
+    }
+}
+
+Metrix.userChannelDisabled = function (channel) {
+    if (Platform.OS === "android") {
+        if (typeof channel === 'string') {
+            module_metrix.userChannelDisabled(channel);
+        } else {
+            let channelValue = getChannel(channel)
+            module_metrix.userChannelDisabled(channelValue);
+        }
+    }
+}
+
 // not used in android
-Metrix.setStore = function(storeName) {
+Metrix.setStore = function (storeName) {
     if (Platform.OS === "ios") {
         module_metrix.setStore(storeName);
     }
 };
 
 // not used in android
-Metrix.setAppSecret = function(secretId, info1, info2, info3, info4) {
+Metrix.setAppSecret = function (secretId, info1, info2, info3, info4) {
     if (Platform.OS === "ios") {
         module_metrix.setAppSecret(secretId, info1, info2, info3, info4);
     }
 };
 
 // not used in android
-Metrix.setDefaultTracker = function(trackerToken) {
+Metrix.setDefaultTracker = function (trackerToken) {
     if (Platform.OS === "ios") {
         module_metrix.setDefaultTracker(trackerToken);
     }
@@ -98,7 +216,6 @@ Metrix.setDefaultTracker = function(trackerToken) {
 
 module.exports = { Metrix }
 
-
 function getCurrency(currency) {
     let cr = null;
     if (Platform.OS === "android") {
@@ -108,14 +225,41 @@ function getCurrency(currency) {
             cr = "USD";
         } else {
             cr = "IRR";
-        }    
+        }
     } else {
         if (currency === 2 || currency === 1) {
             cr = currency;
         } else {
             cr = 0;
-        }   
+        }
     }
 
     return cr;
+}
+
+function getChannel(channel) {
+    let ch = null;
+    if (channel === 2) {
+        ch = "SMS";
+    } else if (channel === 1) {
+        ch = "PUSH";
+    } else {
+        ch = "EMAIL";
+    }
+
+    return ch;
+}
+
+function getGender(gender) {
+    let g = null;
+
+    if (gender === 2) {
+        g = "Male";
+    } else if (gender === 1) {
+        g = "Female";
+    } else {
+        g = "Other";
+    }
+
+    return g;
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@metrixorg/react-native-plugin",
-  "version": "1.5.0",
+  "version": "2.0.1",
   "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": "npm version major",
-    "minor": "npm version minor",
-    "patch": "npm version patch"
+    "major": "2",
+    "minor": "0",
+    "patch": "1"
   },
   "author": "Metrix",
   "license": "Apache 2.0",