react-native-flyy 1.4.35 → 1.4.37

package/android/build.gradle

@@ -134,7 +134,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   //Flyy sdk dependency
-  implementation 'com.github.roid-software:flyy-sdk:1.4.51.1'
+  implementation 'com.github.roid-software:flyy-sdk:1.4.54.78'
 //  implementation project(path: ':flyy')
 
   implementation 'com.google.code.gson:gson:2.8.7'

package/android/src/main/java/com/reactnativeflyy/FlyyModule.kt

@@ -17,11 +17,13 @@ import theflyy.com.flyy.model.externals.FlyyReferrerDetails
 import theflyy.com.flyy.model.externals.FlyyScrachCardCount
 import theflyy.com.flyy.model.externals.FlyySpecificWalletData
 import java.util.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
 
 
 class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
   private var context: Context? = reactContext.applicationContext
+  private var mReactContext: ReactContext? = null
 
   var STAGE = "STAGE"
   var PRODUCTION = "PRODUCTION"
@@ -36,6 +38,7 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
   init {
     context = reactContext.applicationContext
+    mReactContext = reactContext
   }
 
   @ReactMethod
@@ -154,7 +157,7 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
      })
   }
 
-  
+
 
   @ReactMethod
   fun setNewUserWithSegment(externalUserId: String?, segmentId: String?, successCallBack: Callback) {
@@ -168,7 +171,7 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     extUid = externalUserId
     Flyy.setUser(externalUserId)
   }
-   
+
   @ReactMethod
   fun setUserWithCallBack(externalUserId: String?, promise: Promise) {
     extUid = externalUserId
@@ -687,18 +690,21 @@ fun getPreviousLeaderboardWinners(tag: String, callBack: Callback) {
   }
 
   @ReactMethod
-  fun trackUIEvents(callBack: Callback) {
+  fun trackUIEvents() {
     Flyy.trackUIEvents(object : FlyyUIEventsListener {
       override fun onEventDone(flyyUiEvent: FlyyUIEvent?) {
-        val resultData: WritableMap = WritableNativeMap()
-        resultData.putInt("campaign_id", flyyUiEvent?.campaignID!!)
-        resultData.putString("campaign_name", flyyUiEvent.campaignName)
-        resultData.putInt("wallet_type", flyyUiEvent.walletType)
-        resultData.putString("wallet_label", flyyUiEvent.walletLabel)
-        resultData.putString("user_id", flyyUiEvent.userID)
-        resultData.putString("actionEvent_name", flyyUiEvent.actionEventName)
-        resultData.putInt("created_at", flyyUiEvent.createdAt.toInt())
-        callBack.invoke(resultData)
+        if (flyyUiEvent != null) {
+          val resultData: WritableMap = WritableNativeMap()
+          resultData.putInt("campaignID", flyyUiEvent.campaignID?: -1)
+          resultData.putString("campaignName", flyyUiEvent.campaignName?: "N/A")
+          resultData.putInt("walletType", flyyUiEvent.walletType?: -1)
+          resultData.putString("walletLabel", flyyUiEvent.walletLabel?: "N/A")
+          resultData.putString("userID", flyyUiEvent.userID)
+          resultData.putString("actionEventName", flyyUiEvent.actionEventName)
+          resultData.putInt("createdAt", flyyUiEvent.createdAt.toInt())
+          mReactContext?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            ?.emit("FlyyScreenTracking", resultData)
+        }
       }
     })
   }

package/ios/ReactNativeFlyy.h

@@ -1,6 +1,7 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface ReactNativeFlyy : NSObject <RCTBridgeModule>
+@interface ReactNativeFlyy : RCTEventEmitter <RCTBridgeModule>
 
 - (void)set_navigation_controller:(UINavigationController*)navigation  withCurrentViewController:(UIViewController*) controller;
 

package/ios/ReactNativeFlyy.m

@@ -1,7 +1,7 @@
 #import "ReactNativeFlyy.h"
 #import "FlyyFramework/FlyyFramework.h"
 
-@interface ReactNativeFlyy ()<FlyySDKClosedListener> {
+@interface ReactNativeFlyy ()<FlyySDKClosedListener,FlyySDKUiEventListener> {
     Flyy *flyy;
 }
 
@@ -703,10 +703,11 @@ RCT_EXPORT_METHOD(getLeaderboardParticipants: (NSString *)tag :(RCTResponseSende
 }
 
 //track ui events
-RCT_EXPORT_METHOD(trackUIEvents: (RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(trackUIEvents)
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
+    [flyy trackUIEventsWithFlyysdkuieventlistener:self];
 }
 
 
@@ -1204,4 +1205,21 @@ RCT_EXPORT_METHOD(getAppData:(RCTPromiseResolveBlock)resolve
     };
 }
 
+// Override the supportedEvents method
+- (NSArray<NSString *> *)supportedEvents {
+  return @[@"FlyyScreenTracking"];
+}
+
+- (void)onSDKTrackUiEventWithCampaignName:(NSString * _Nonnull)campaignName campaignID:(NSInteger)campaignID walletType:(NSInteger)walletType userID:(NSString * _Nonnull)userID actionEventName:(NSString * _Nonnull)actionEventName walletLabel:(NSString * _Nonnull)walletLabel createdAt:(NSString * _Nonnull)createdAt {
+      NSDictionary* jsonObject = @{ @"campaignID": [NSNumber numberWithInt: campaignID],
+                                  @"campaignName": campaignName,
+                                  @"walletType": [NSNumber numberWithInt: walletType],
+                                  @"walletLabel": walletLabel,
+                                  @"userID": userID,
+                                  @"actionEventName": actionEventName,
+                                  @"createdAt": createdAt
+      };
+    [self sendEventWithName:@"FlyyScreenTracking" body:@{@"name": jsonObject}];
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-flyy",
-  "version": "1.4.35",
+  "version": "1.4.37",
   "description": "React Native wrapper around our Android and iOS mobile SDKs",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -65,7 +65,7 @@
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
     "react": "17.0.2",
-    "react-native": "0.68.1",
+    "react-native": "0.67.5",
     "react-native-builder-bob": "^0.17.1",
     "release-it": "^14.2.2",
     "typescript": "^4.1.3"
@@ -629,19 +629,19 @@
     "meow": "^8.1.0",
     "merge-stream": "^2.0.0",
     "merge2": "^1.4.1",
-    "metro": "^0.58.0",
-    "metro-babel-register": "^0.59.0",
-    "metro-babel-transformer": "^0.58.0",
-    "metro-cache": "^0.58.0",
-    "metro-config": "^0.58.0",
-    "metro-core": "^0.58.0",
-    "metro-inspector-proxy": "^0.58.0",
-    "metro-minify-uglify": "^0.58.0",
-    "metro-react-native-babel-preset": "^0.58.0",
-    "metro-react-native-babel-transformer": "^0.59.0",
-    "metro-resolver": "^0.58.0",
-    "metro-source-map": "^0.58.0",
-    "metro-symbolicate": "^0.58.0",
+    "metro": "^0.66.2",
+    "metro-babel-register": "^0.66.2",
+    "metro-babel-transformer": "^0.66.2",
+    "metro-cache": "^0.66.2",
+    "metro-config": "^0.66.2",
+    "metro-core": "^0.66.2",
+    "metro-inspector-proxy": "^0.66.2",
+    "metro-minify-uglify": "^0.66.2",
+    "metro-react-native-babel-preset": "^0.66.2",
+    "metro-react-native-babel-transformer": "^0.66.2",
+    "metro-resolver": "^0.66.2",
+    "metro-source-map": "^0.66.2",
+    "metro-symbolicate": "^0.66.2",
     "micromatch": "^4.0.2",
     "mime": "^2.4.7",
     "mime-db": "^1.45.0",
@@ -677,7 +677,7 @@
     "nullthrows": "^1.1.1",
     "nwsapi": "^2.2.0",
     "oauth-sign": "^0.9.0",
-    "ob1": "^0.58.0",
+    "ob1": "^0.66.2",
     "object-assign": "^4.1.1",
     "object-copy": "^0.1.0",
     "object-inspect": "^1.9.0",

package/react-native-flyy.podspec

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
 
 
   s.dependency "React-Core"
-  s.dependency "FlyyFramework", "1.3.72" 
+  s.dependency "FlyyFramework", "1.3.73"
 end