@metrixorg/react-native-plugin 2.0.0 → 2.0.1

package/android/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 31
-        versionCode 200000055
-        versionName "2.0.0.beta5"
+        versionCode 200000058
+        versionName "2.0.0.beta8"
     }
 
     buildTypes {
@@ -22,13 +22,17 @@ android {
 
 rootProject.allprojects {
     repositories {
+        google()
         mavenCentral()
+        //noinspection JcenterRepositoryObsolete
+        jcenter()
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
 
-    implementation 'ir.metrix.analytics:metrix-reactnative:2.0.0.beta5'
-    implementation 'ir.metrix.attribution:metrix-reactnative:2.0.0.beta5'
+    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

@@ -37,6 +37,14 @@ 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.analytics.MetrixAnalytics.newEvent(eventName);
@@ -73,8 +81,7 @@ public class MetrixModule extends ReactContextBaseJavaModule {
                     public void onSessionNumberChanged(int sessionNumber) {
                         sendStringEvent("onSessionNumberChangedListener", String.valueOf(sessionNumber));
                     }
-                }
-        );
+                });
     }
 
     @ReactMethod
@@ -85,8 +92,7 @@ public class MetrixModule extends ReactContextBaseJavaModule {
                     public void onSessionIdChanged(String sessionId) {
                         sendStringEvent("onSessionIdChangedListener", sessionId);
                     }
-                }
-        );
+                });
     }
 
     @ReactMethod
@@ -99,13 +105,13 @@ public class MetrixModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setUserId(String id) {
-        ir.metrix.analytics.MetrixAnalytics.User.setUserId(id);
+    public void setUserCustomId(String id) {
+        ir.metrix.analytics.MetrixAnalytics.User.setUserCustomId(id);
     }
 
     @ReactMethod
-    public void deleteUserId() {
-        ir.metrix.analytics.MetrixAnalytics.User.deleteUserId();
+    public void deleteUserCustomId() {
+        ir.metrix.analytics.MetrixAnalytics.User.deleteUserCustomId();
     }
 
     @ReactMethod
@@ -159,13 +165,13 @@ public class MetrixModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setUserGender(UserGender gender) {
-        ir.metrix.analytics.MetrixAnalytics.User.setGender(gender);
+    public void setUserGender(String gender) {
+        ir.metrix.analytics.MetrixAnalytics.User.setGender(UserGender.valueOf(gender));
     }
 
     @ReactMethod
-    public void setUserBirthday(Long birthday) {
-        ir.metrix.analytics.MetrixAnalytics.User.setBirthday(birthday);
+    public void setUserBirthday(Number birthday) {
+        ir.metrix.analytics.MetrixAnalytics.User.setBirthday(birthday.longValue());
     }
 
     @ReactMethod
@@ -183,7 +189,6 @@ public class MetrixModule extends ReactContextBaseJavaModule {
         ir.metrix.analytics.MetrixAnalytics.User.channelDisabled(MessageChannel.valueOf(channel));
     }
 
-
     @ReactMethod
     public void setPushToken(String token) {
         ir.metrix.attribution.MetrixAttribution.setPushToken(token);
@@ -228,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());
         }

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,7 +55,7 @@ Metrix.newEvent = function(eventName, customAttributes) {
     }
 };
 
-Metrix.newRevenue = function(slug, revenue, currency) {
+Metrix.newRevenue = function (slug, revenue, currency) {
     if (currency == null) {
         module_metrix.newRevenueSimple(slug, revenue);
     } else if (currency != null) {
@@ -64,11 +64,11 @@ Metrix.newRevenue = function(slug, revenue, currency) {
         } else {
             let currencyValue = getCurrency(currency)
             module_metrix.newRevenueCurrency(slug, revenue, currencyValue);
-        }        
+        }
     }
 };
 
-Metrix.setUserAttributes = function(userAttributes) {
+Metrix.setUserAttributes = function (userAttributes) {
     if (Platform.OS === "android") {
         module_metrix.setUserAttributes(userAttributes);
     } else if (Platform.OS === "ios") {
@@ -76,97 +76,102 @@ Metrix.setUserAttributes = function(userAttributes) {
     }
 };
 
-Metrix.setUserId = function(id) {
+Metrix.setUserCustomId = function (id) {
     if (Platform.OS === "android") {
-        module_metrix.setUserId(id);
+        module_metrix.setUserCustomId(id);
     }
 }
 
-Metrix.deleteUserId = function() {
+Metrix.deleteUserCustomId = function () {
     if (Platform.OS === "android") {
-        module_metrix.deleteUserId();
+        module_metrix.deleteUserCustomId();
     }
 }
 
-Metrix.setUserFirstName = function(firstName) {
+Metrix.setUserFirstName = function (firstName) {
     if (Platform.OS === "android") {
         module_metrix.setUserFirstName(firstName);
     }
 }
 
-Metrix.setUserLastName = function(lastName) {
+Metrix.setUserLastName = function (lastName) {
     if (Platform.OS === "android") {
         module_metrix.setUserLastName(lastName);
     }
 }
 
-Metrix.setUserPhoneNumber = function(phoneNumber) {
+Metrix.setUserPhoneNumber = function (phoneNumber) {
     if (Platform.OS === "android") {
         module_metrix.setUserPhoneNumber(phoneNumber);
     }
 }
 
-Metrix.setUserHashedPhoneNumber = function(hashedPhoneNumber) {
+Metrix.setUserHashedPhoneNumber = function (hashedPhoneNumber) {
     if (Platform.OS === "android") {
         module_metrix.setUserHashedPhoneNumber(hashedPhoneNumber);
     }
 }
 
-Metrix.setUserEmail = function(email) {
+Metrix.setUserEmail = function (email) {
     if (Platform.OS === "android") {
         module_metrix.setUserEmail(email);
     }
 }
 
-Metrix.setUserHashedEmail = function(hashedEmail) {
+Metrix.setUserHashedEmail = function (hashedEmail) {
     if (Platform.OS === "android") {
         module_metrix.setUserHashedEmail(hashedEmail);
     }
 }
 
-Metrix.setUserCountry = function(country) {
+Metrix.setUserCountry = function (country) {
     if (Platform.OS === "android") {
         module_metrix.setUserCountry(country);
     }
 }
 
-Metrix.setUserCity = function(city) {
+Metrix.setUserCity = function (city) {
     if (Platform.OS === "android") {
         module_metrix.setUserCity(city);
     }
 }
 
-Metrix.setUserRegion = function(region) {
+Metrix.setUserRegion = function (region) {
     if (Platform.OS === "android") {
         module_metrix.setUserRegion(region);
     }
 }
 
-Metrix.setUserLocality = function(locality) {
+Metrix.setUserLocality = function (locality) {
     if (Platform.OS === "android") {
         module_metrix.setUserLocality(locality);
     }
 }
 
-Metrix.setUserGender = function(gender) {
+Metrix.setUserGender = function (gender) {
     if (Platform.OS === "android") {
-        module_metrix.setUserGender(gender);
+        if (typeof channel === 'string') {
+            module_metrix.setUserGender(gender);
+        } else {
+            let genderValue = getGender(gender)
+            module_metrix.setUserGender(genderValue);
+        }
     }
 }
 
-Metrix.setUserBirthday = function(birthday) {
+Metrix.setUserBirthday = function (birthday) {
     if (Platform.OS === "android") {
         module_metrix.setUserBirthday(birthday);
     }
 }
 
-Metrix.setUserFcmToken = function(fcmToken) {
+Metrix.setUserFcmToken = function (fcmToken) {
     if (Platform.OS === "android") {
         module_metrix.setUserFcmToken(fcmToken);
     }
 }
 
-Metrix.userChannelEnabled = function(channel) {
+Metrix.userChannelEnabled = function (channel) {
     if (Platform.OS === "android") {
         if (typeof channel === 'string') {
             module_metrix.userChannelEnabled(channel);
@@ -177,7 +182,7 @@ Metrix.userChannelEnabled = function(channel) {
     }
 }
 
-Metrix.userChannelDisabled = function(channel) {
+Metrix.userChannelDisabled = function (channel) {
     if (Platform.OS === "android") {
         if (typeof channel === 'string') {
             module_metrix.userChannelDisabled(channel);
@@ -189,21 +194,21 @@ Metrix.userChannelDisabled = function(channel) {
 }
 
 // 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);
     }
@@ -220,13 +225,13 @@ function getCurrency(currency) {
             cr = "USD";
         } else {
             cr = "IRR";
-        }    
+        }
     } else {
         if (currency === 2 || currency === 1) {
             cr = currency;
         } else {
             cr = 0;
-        }   
+        }
     }
 
     return cr;
@@ -240,7 +245,21 @@ function getChannel(channel) {
         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,6 +1,6 @@
 {
   "name": "@metrixorg/react-native-plugin",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Metrix React native plugin",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "deploy": "git checkout master && git pull && git merge develop",
     "major": "2",
     "minor": "0",
-    "patch": "0"
+    "patch": "1"
   },
   "author": "Metrix",
   "license": "Apache 2.0",