react-native-flyy 1.4.59 → 1.4.60

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

@@ -109,7 +109,7 @@ public class FlyyRouteActivity extends AppCompatActivity {
           Flyy.navigateToRaffleDetailActivity(this, OFFER_ID);
           break;
         case FLYY_OPEN_CHECKIN_PAGE:
-          //Flyy.navigateToCheckInActivity(this);
+          Flyy.navigateToCheckInActivity(this);
           break;
         case FLYY_OPEN_LEADERBOARD_HISTORY:
           //Flyy.navigateToLeaderBoardHistoryActivity(this);

package/ios/ReactNativeFlyy.m

@@ -20,6 +20,55 @@ NSString * extUserId = @"";
 int extEnvironment = 0;
 RCTResponseSenderBlock sdkClosedCallback;
 
++ (UIViewController *)currentViewController {
+    UIViewController *baseController = [UIApplication sharedApplication].delegate.window.rootViewController;
+    if (!baseController) {
+        baseController = [[UIViewController alloc] init];
+    }
+    if (@available(iOS 13.0, *)) {
+        // iOS 13+ handle multiple scenes
+        NSSet *connectedScenes = [UIApplication sharedApplication].connectedScenes;
+        UIWindowScene *windowScene = nil;
+        for (UIScene *scene in connectedScenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]]) {
+                windowScene = (UIWindowScene *)scene;
+                break;
+            }
+        }
+        if (windowScene) {
+            UIWindow *window = windowScene.windows.firstObject;
+            if ([window.rootViewController isKindOfClass:[UINavigationController class]]) {
+                UINavigationController *nav = (UINavigationController *)window.rootViewController;
+                if (nav.viewControllers.firstObject) {
+                    baseController = nav.viewControllers.firstObject;
+                }
+            } else {
+                // fallback: use keyWindow
+                for (UIWindow *w in [UIApplication sharedApplication].windows) {
+                    if (w.isKeyWindow && w.rootViewController) {
+                        baseController = w.rootViewController;
+                        break;
+                    }
+                }
+            }
+        } else {
+            // fallback: key window
+            for (UIWindow *w in [UIApplication sharedApplication].windows) {
+                if (w.isKeyWindow && w.rootViewController) {
+                    baseController = w.rootViewController;
+                    break;
+                }
+            }
+        }
+    } else {
+        // pre–iOS 13 fallback
+        if ([UIApplication sharedApplication].delegate.window.rootViewController) {
+            baseController = [UIApplication sharedApplication].delegate.window.rootViewController;
+        }
+    }
+    return baseController;
+}
+
 -(void)set_navigation_controller:(UINavigationController*)navigation  withCurrentViewController:(UIViewController*) controller
 {
     [navigation pushViewController:controller animated:YES];
@@ -821,8 +870,8 @@ RCT_EXPORT_METHOD(openOffersScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openOffersPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openOffersPageWithCurrentVC:vc];
         });
     });
 }
@@ -837,8 +886,9 @@ RCT_EXPORT_METHOD(openOffersScreenWithCallBack: (RCTResponseSenderBlock)callback
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openOffersPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openOffersPageWithCurrentVC:vc];
+            //[self->flyy openOffersPage];
         });
     });
 
@@ -884,8 +934,9 @@ RCT_EXPORT_METHOD(openRewardsScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openRewardsPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openRewardsPageWithCurrentVC:vc];
+            //[self->flyy openRewardsPage];
         });
     });
 
@@ -901,8 +952,9 @@ RCT_EXPORT_METHOD(openRewardsScreenWithCallBack: (RCTResponseSenderBlock)callbac
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openRewardsPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openRewardsPageWithCurrentVC:vc];
+            //[self->flyy openRewardsPage];
         });
     });
 
@@ -916,8 +968,9 @@ RCT_EXPORT_METHOD(openWalletScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openWalletPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openWalletPageWithCurrentVC:vc];
+            //[self->flyy openWalletPage];
         });
     });
 
@@ -933,8 +986,9 @@ RCT_EXPORT_METHOD(openWalletScreenWithCallBack: (RCTResponseSenderBlock)callback
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openWalletPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openWalletPageWithCurrentVC:vc];
+            //[self->flyy openWalletPage];
         });
     });
 
@@ -947,8 +1001,9 @@ RCT_EXPORT_METHOD(openGiftCardScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openGiftCardPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openGiftCardPageWithCurrentVC:vc];
+            //[self->flyy openGiftCardPage];
         });
     });
 
@@ -962,8 +1017,9 @@ RCT_EXPORT_METHOD(openReferralHistory)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openReferralHistoryPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openReferralHistoryPageWithCurrentVC:vc];
+            //[self->flyy openReferralHistoryPage];
         });
     });
 }
@@ -976,8 +1032,9 @@ RCT_EXPORT_METHOD(openFlyyQuizPage: (NSInteger)quizId)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openQuizListDetailPageWithQuizId:quizId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openQuizListDetailPageWithQuizId:quizId currentVC:vc];
+            //[self->flyy openQuizListDetailPageWithQuizId:quizId];
         });
     });
 }
@@ -990,8 +1047,9 @@ RCT_EXPORT_METHOD(openFlyyQuizHistoryPage)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openQuizHistoryPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openQuizHistoryPageWithCurrentVC:vc];
+            //[self->flyy openQuizHistoryPage];
         });
     });
 
@@ -1005,8 +1063,9 @@ RCT_EXPORT_METHOD(openFlyyQuizListPage)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openQuizListPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openQuizListPageWithCurrentVC:vc];
+            //[self->flyy openQuizListPage];
         });
     });
 }
@@ -1019,36 +1078,39 @@ RCT_EXPORT_METHOD(openFlyyStampsPage)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openStampPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openStampPageWithCurrentVC:vc];
+            //[self->flyy openStampPage];
         });
     });
 }
 
 //open invite details screen
-RCT_EXPORT_METHOD(openFlyyInviteDetailsPage: (NSInteger *)offerId)
+RCT_EXPORT_METHOD(openFlyyInviteDetailsPage: (NSInteger)offerId)
 {
     flyy = [Flyy sharedFlyyInstance];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openInviteDetailsPageWithOfferId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openInviteDetailsPageWithOfferId:offerId currentVC:vc];
+            //[self->flyy openInviteDetailsPageWithOfferId:offerId];
         });
     });
 }
 
 //open challenge details screen
-RCT_EXPORT_METHOD(openFlyyChallengeDetailPage: (NSInteger *)offerId)
+RCT_EXPORT_METHOD(openFlyyChallengeDetailPage: (NSInteger)offerId)
 {
     flyy = [Flyy sharedFlyyInstance];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openFlyyChallengesPageWithOfferId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openFlyyChallengesPageWithOfferId:offerId currentVC:vc];
+            //[self->flyy openFlyyChallengesPageWithOfferId:offerId];
         });
     });
 }
@@ -1061,8 +1123,9 @@ RCT_EXPORT_METHOD(openFlyyBonanzaPage)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openBonanzaPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openBonanzaPageWithCurrentVC:vc];
+            //[self->flyy openBonanzaPage];
         });
     });
 }
@@ -1075,8 +1138,9 @@ RCT_EXPORT_METHOD(openFlyyGamesPage)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openGameListPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openGameListPageWithCurrentVC:vc];
+            //[self->flyy openGameListPage];
         });
     });
 }
@@ -1089,36 +1153,38 @@ RCT_EXPORT_METHOD(openFlyyGamesHistory)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openGameHistoryPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openGameHistoryPageWithCurrentVC:vc];
+            //[self->flyy openGameHistoryPage];
         });
     });
 }
 
 //open custom invite and earn screen
-RCT_EXPORT_METHOD(openFlyyCustomInviteAndEarnPage: (NSInteger *)offerId :(NSString *)headerColor)
+RCT_EXPORT_METHOD(openFlyyCustomInviteAndEarnPage: (NSInteger)offerId :(NSString *)headerColor)
 {
     flyy = [Flyy sharedFlyyInstance];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openFlyyCustomInviteAndEarnVCWithOfferId:offerId headerColor:headerColor];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openFlyyCustomInviteAndEarnVCWithOfferId:offerId headerColor:headerColor currentVC:vc];
+            //[self->flyy openFlyyCustomInviteAndEarnVCWithOfferId:offerId headerColor:headerColor];
         });
     });
 }
 
 //open invite and earn screen
-RCT_EXPORT_METHOD(openFlyyInviteAndEarnPage: (NSInteger *)offerId)
+RCT_EXPORT_METHOD(openFlyyInviteAndEarnPage: (NSInteger)offerId)
 {
     flyy = [Flyy sharedFlyyInstance];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openInviteAndEarnPageWithOfferId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openInviteAndEarnPageWithOfferId:offerId currentVC:vc];
         });
     });
 }
@@ -1131,7 +1197,8 @@ RCT_EXPORT_METHOD(openFlyySpinTheWheelPage: (NSInteger)wheelId)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-            [self->flyy openSpinTheWheelPageWithSpinWheelId:wheelId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openSpinTheWheelPageWithSpinWheelId:wheelId currentVC:vc];
         });
     });
 }
@@ -1144,7 +1211,8 @@ RCT_EXPORT_METHOD(openFlyyCheckinPage)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-            [self->flyy openDailyCheckinPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openDailyCheckinPageWithCurrentVC:vc];
         });
     });
 }
@@ -1157,22 +1225,22 @@ RCT_EXPORT_METHOD(openCheckinScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openDailyCheckinPage];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openDailyCheckinPageWithCurrentVC:vc];
         });
     });
 }
 
 //open raffle screen
-RCT_EXPORT_METHOD(openFlyyRafflePage: (NSInteger *)raffleId)
+RCT_EXPORT_METHOD(openFlyyRafflePage: (NSInteger)raffleId)
 {
     flyy = [Flyy sharedFlyyInstance];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openRafflePageWithRaffleId:raffleId currentVC:vc];           
         });
     });
 }
@@ -1209,8 +1277,9 @@ RCT_EXPORT_METHOD(openFlyyPollScreen: (NSInteger)offerId)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy navigateToPollActivityWithPollId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy navigateToPollActivityWithPollId:offerId currentVC:vc];
+            //[self->flyy navigateToPollActivityWithPollId:offerId];
         });
     });
 }
@@ -1223,8 +1292,8 @@ RCT_EXPORT_METHOD(openFlyySurveyScreen: (NSInteger)offerId)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy navigateToSurveyActivityWithSurveyId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy navigateToSurveyActivityWithSurveyId:offerId currentVC:vc];
         });
     });
 }
@@ -1237,8 +1306,8 @@ RCT_EXPORT_METHOD(openFlyyTriviaScreen: (NSInteger)offerId)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy navigateToTriviaActivityWithTriviaId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy navigateToTriviaActivityWithTriviaId:offerId currentVC:vc];
         });
     });
 }
@@ -1251,8 +1320,8 @@ RCT_EXPORT_METHOD(openFlyyPollListScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy navigateToPollListActivity];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy navigateToPollListActivityWithCurrentVC:vc];
         });
     });
 }
@@ -1265,8 +1334,8 @@ RCT_EXPORT_METHOD(openFlyySurveyListScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy navigateToSurveyListActivity];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy navigateToSurveyListActivityWithCurrentVC:vc];
         });
     });
 }
@@ -1279,8 +1348,8 @@ RCT_EXPORT_METHOD(openFlyyTriviaListScreen)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy navigateToTriviaListActivity];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy navigateToTriviaListActivityWithCurrentVC:vc];
         });
     });
 }
@@ -1293,8 +1362,8 @@ RCT_EXPORT_METHOD(openInviteAndEarnQR: (NSInteger)offerId)
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
         dispatch_async(dispatch_get_main_queue(), ^(){
-
-            [self->flyy openInviteAndEarnQRActivityWithOfferId:offerId];
+            UIViewController *vc = [ReactNativeFlyy currentViewController];
+            [self->flyy openInviteAndEarnQRActivityWithOfferId:offerId currentVC:vc];
         });
     });
 }

package/ios/ReactNativeFlyy.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/ReactNativeFlyy.xcodeproj/xcuserdata/vishalthakur.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Flyy.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-flyy",
-  "version": "1.4.59",
+  "version": "1.4.60",
   "description": "React Native wrapper around our Android and iOS mobile SDKs",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",