react-native-flyy 1.4.27 → 1.4.29

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

@@ -8,7 +8,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.16.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

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.54.46'
+  implementation 'com.github.roid-software:flyy-sdk:1.4.54.61'
 //  implementation project(path: ':flyy')
 
   implementation 'com.google.code.gson:gson:2.8.7'

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

@@ -147,12 +147,15 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
   }
 
   @ReactMethod
-  fun setNewUserWithCallBack(externalUserId: String?, successCallBack: Callback) {
-    Flyy.setNewUser(externalUserId, OnFlyyTaskComplete {
-      successCallBack.invoke("success")
-    })
+  fun setNewUserWithCallBack(externalUserId: String?, promise: Promise) {
+  extUid = externalUserId
+  Flyy.setNewUser(externalUserId, OnFlyyTaskComplete {
+       promise.resolve("success")
+     })
   }
 
+  
+
   @ReactMethod
   fun setNewUserWithSegment(externalUserId: String?, segmentId: String?, successCallBack: Callback) {
     Flyy.setNewUser(externalUserId, segmentId, OnFlyyTaskComplete {
@@ -165,12 +168,12 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     extUid = externalUserId
     Flyy.setUser(externalUserId)
   }
-
+   
   @ReactMethod
-  fun setUserWithCallBack(externalUserId: String?, successCallBack: Callback) {
+  fun setUserWithCallBack(externalUserId: String?, promise: Promise) {
     extUid = externalUserId
     Flyy.setUser(externalUserId, OnFlyyTaskComplete {
-      successCallBack.invoke("success")
+      promise.resolve(true)
     })
   }
 
@@ -326,6 +329,11 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     openFlyyRouteActivity(FlyyRouteActivity.FLYY_QUIZ_PAGE, null)
   }
 
+  //@ReactMethod
+  //fun setCustomFont(regularFont: String?, mediumFont: String?, boldFont: String?) {
+  // Flyy.setCustomFontName(regularFont,mediumFont, boldFont);
+  //}
+
   @ReactMethod
   fun openFlyyQuizHistoryPage() {
     openFlyyRouteActivity(FlyyRouteActivity.FLYY_QUIZ_HISTORY_PAGE, null)
@@ -514,6 +522,21 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     })
   }
 
+  @ReactMethod
+  fun openLeaderBoardHistory() {
+    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_LEADERBOARD_HISTORY, null)
+  }
+
+  @ReactMethod
+  fun openFlyyGamesPage() {
+    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_TOURNAMENT_LIST, null)
+  }
+
+  @ReactMethod
+  fun openFlyyGamesHistory() {
+    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_TOURNAMENT_HISTORY, null)
+  }
+
   @ReactMethod
   fun getScratchCardCount(callBack: Callback) {
     Flyy.getScratchCardCount(context, object : FlyyFetchScratchCardCountListener {

package/android/src/main/java/com/reactnativeflyy/FlyyRouteActivity.java

@@ -31,6 +31,9 @@ public class FlyyRouteActivity extends AppCompatActivity {
   public static final String FLYY_OPEN_RAFFLE_PAGE = "flyy_open_raffle_page";
   public static final String FLYY_OPEN_SPINTHEWHEEL_PAGE = "flyy_open_spinthewheel_page";
   public static final String FLYY_OPEN_CHECKIN_PAGE = "flyy_open_checkin_page";
+  public static final String FLYY_OPEN_LEADERBOARD_HISTORY = "flyy_open_leaderboard_history";
+  public static final String FLYY_OPEN_TOURNAMENT_LIST = "flyy_open_tournament_list";
+  public static final String FLYY_OPEN_TOURNAMENT_HISTORY = "flyy_open_tournament_history";
 
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -99,6 +102,15 @@ public class FlyyRouteActivity extends AppCompatActivity {
         case FLYY_OPEN_CHECKIN_PAGE:
           Flyy.navigateToCheckInActivity(this);
           break;
+        case FLYY_OPEN_LEADERBOARD_HISTORY:
+          Flyy.navigateToLeaderBoardHistoryActivity(this);
+          break;
+        case FLYY_OPEN_TOURNAMENT_LIST:
+          Flyy.navigateToTournamentListActivity(this,null);
+          break;
+        case FLYY_OPEN_TOURNAMENT_HISTORY:
+          Flyy.navigateToTournamentHistoryActivity(this,null);
+          break;
         default:
           throw new IllegalStateException("Unexpected value: " + activityToOpen);
       }

package/ios/ReactNativeFlyy.m

@@ -16,6 +16,7 @@ static NSString * STAGE = @"STAGE";
 static NSString * PRODUCTION = @"PRODUCTION";
 NSString * themeColor = @"";
 NSString * extPartnerId = @"";
+NSString * extUserId = @"";
 int extEnvironment = 0;
 RCTResponseSenderBlock sdkClosedCallback;
 
@@ -71,21 +72,21 @@ void saveToUserDefaults()
     if (standardUserDefaults)
     {
         NSInteger invalue = 1;
-        
+
         NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
         BOOL newUserExist = [prefs valueForKey:@"timestamps"];
 
         if (newUserExist == YES) {
-            
+
             invalue =  [prefs integerForKey:@"timestamps"];
             invalue = invalue +  1;
         }
-        
+
         [standardUserDefaults setInteger:invalue forKey:@"timestamps"];
         [standardUserDefaults synchronize];
-        
-       
-        
+
+
+
     }
 }
 
@@ -96,7 +97,7 @@ RCT_EXPORT_METHOD(getAppOccurence:(NSInteger *)type
 {
     NSUserDefaults *standardUserDefaults = [NSUserDefaults standardUserDefaults];
     NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-    
+
     if(type == 1){
         [standardUserDefaults setInteger:1 forKey:@"timestamps"];
         [standardUserDefaults synchronize];
@@ -115,7 +116,7 @@ RCT_EXPORT_METHOD(initSDKWithCallback: (NSString *)partnerToken :(int)environmen
     extPartnerId = partnerToken;
     extEnvironment = environment;
     flyy = [Flyy sharedFlyyInstance];
-    
+
     [flyy initSDKWithPartnerToken:partnerToken environment: environment];
     callback(@"true");
 }
@@ -135,6 +136,17 @@ RCT_EXPORT_METHOD(initSDKWithReferralCallback: (NSString *)partnerToken :(int)en
     }];
 }
 
+//set custom font
+//RCT_EXPORT_METHOD(setCustomFontName: (NSString *)regularFont :(NSString *)mediumFont :(NSString *)boldFont)
+//{
+//    flyy = [Flyy sharedFlyyInstance];
+//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+//        dispatch_async(dispatch_get_main_queue(), ^(){
+//            [self->flyy setCustomFontNameWithRegularFont:regularFont mediumFont:mediumFont boldFont:boldFont];
+//        });
+//    });
+//}
+
 ////Init flyy sdk with theme colors
 //RCT_EXPORT_METHOD(initSDKWithThemeColors: (NSString *)partnerToken :(int)environment
 //                  :(NSString *)colorPrimary :(NSString *)colorPrimaryDark)
@@ -149,8 +161,9 @@ RCT_EXPORT_METHOD(initSDKWithReferralCallback: (NSString *)partnerToken :(int)en
 RCT_EXPORT_METHOD(setUser: (NSString *)userId)
 {
     //Instance of flyy class
+    extUserId = userId;
     flyy = [Flyy sharedFlyyInstance];
-
+    extUserId = userId;
     [flyy setUserWithExternalUserId:userId];
 }
 
@@ -159,6 +172,7 @@ RCT_EXPORT_METHOD(setUserWithSegment: (NSString *)userId :(NSString *)segmentId
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
+    extUserId = userId;
 
     [flyy setUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
@@ -167,14 +181,18 @@ RCT_EXPORT_METHOD(setUserWithSegment: (NSString *)userId :(NSString *)segmentId
 }
 
 //set user with callback
-RCT_EXPORT_METHOD(setUserWithCallBack: (NSString *)userId :(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(setUserWithCallBack: (NSString *)userId 
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     //Instance of flyy class
+    extUserId = userId;
     flyy = [Flyy sharedFlyyInstance];
+    extUserId = userId;
 
     [flyy setUserWithExternalUserId:userId onComplete: ^(BOOL success) {
         if(success) {
-            callback(@[@("success")]);
+            resolve(@[@("success")]);
         }
     }];
 }
@@ -184,6 +202,7 @@ RCT_EXPORT_METHOD(setUserWithSegmentCallback: (NSString *)userId :(NSString *)se
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
+    extUserId = userId;
 
     [flyy setUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
@@ -227,14 +246,17 @@ RCT_EXPORT_METHOD(setNewUserWithSegmentCallback: (NSString *)userId :(NSString *
 }
 
 //set new user with callback
-RCT_EXPORT_METHOD(setNewUserWithCallBack: (NSString *)userId :(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(setNewUserWithCallBack: (NSString *)userId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     //Instance of flyy class
+    extUserId = userId;
     flyy = [Flyy sharedFlyyInstance];
 
     [flyy setNewUserWithExternalUserId:userId onComplete: ^(BOOL success) {
         if(success) {
-            callback(@[@("success")]);
+            resolve(@[@("success")]);
         }
     }];
 }
@@ -1025,6 +1047,34 @@ RCT_EXPORT_METHOD(openFlyyBonanzaPage)
     });
 }
 
+//open games screen
+RCT_EXPORT_METHOD(openFlyyGamesPage)
+{
+    flyy = [Flyy sharedFlyyInstance];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+
+        dispatch_async(dispatch_get_main_queue(), ^(){
+
+            [self->flyy openGameListPage];
+        });
+    });
+}
+
+//open games history screen
+RCT_EXPORT_METHOD(openFlyyGamesHistory)
+{
+    flyy = [Flyy sharedFlyyInstance];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+
+        dispatch_async(dispatch_get_main_queue(), ^(){
+
+            [self->flyy openGameHistoryPage];
+        });
+    });
+}
+
 //open custom invite and earn screen
 RCT_EXPORT_METHOD(openFlyyCustomInviteAndEarnPage: (NSInteger *)offerId :(NSString *)headerColor)
 {
@@ -1112,6 +1162,7 @@ RCT_EXPORT_METHOD(getUserData:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSDictionary* jsonObject = @{ @"partner_id": extPartnerId,
+                                  @"user_id": extUserId,
                                   @"environment": [NSNumber numberWithInt: extEnvironment]
      };