shakebug-react-native 2.3.3 → 2.3.4

package/src/Screens/Shakebug.js

@@ -6,6 +6,7 @@ import AddDetailsScreen from './AddDetailsScreen';
 import TrimVideoScreen from './TrimVideoScreen'
 import DeviceInfo from '../../DeviceInfo';
 import { useEffect, useState } from 'react';
+import { useFocusEffect } from '@react-navigation/native';
 import GetLocation from '../../GetLocation'
 import NetInfo from '../../NetInfo/src'
 import { SessionStartApi } from '../APIs/StartSession';
@@ -52,20 +53,98 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.3.0";
+global.sdk_version = "2.3.4";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
 global.KEY_REVIEW_SUBMITTED = false;
-global.shakebug_type = "1";
-global.isFeatureEnabled = (featureCode) => {
-  if (!global.shakebug_type) return true;
-  const types = global.shakebug_type.split(',');
-  if (types.includes('0')) return false;
-  if (types.includes('1')) return true;
-  return types.includes(featureCode);
+
+const ShakebugContext = React.createContext();
+
+// For navigation in register screen
+const NavigationContainer = ({ screens, setFocusedScreen }) => {
+
+  const { navigationState } = useNavigation();
+  const animation = React.useRef(new Animated.Value(0)).current;
+  const { width } = Dimensions.get('window');
+
+  useFocusEffect(
+    React.useCallback(() => {
+      if (navigationState && navigationState.length > 0) {
+        setFocusedScreen(navigationState[navigationState.length - 1].name);
+      }
+      return () => {
+        setFocusedScreen('');
+      };
+    }, [navigationState, setFocusedScreen])
+  );
+
+  React.useEffect(() => {
+    Animated.timing(animation, {
+      toValue: navigationState.length - 1,
+      duration: 300,
+      useNativeDriver: true,
+    }).start();
+  }, [navigationState, animation]);
+
+  return (
+    <View style={styles.container}>
+      {navigationState.map((screen, index) => {
+        const ScreenComponent = screens[screen.name];
+        const translateX = animation.interpolate({
+          inputRange: [index - 1, index, index + 1],
+          outputRange: [width, 0, -width],
+        });
+
+        return (
+          <Animated.View key={index} style={[styles.screen, { transform: [{ translateX }] }]}>
+            <ScreenComponent {...screen.params} />
+          </Animated.View>
+        );
+      })}
+    </View>
+  );
 };
 
+// For shakeFunctionscreen with childern as props
+const ShakeScreen = () => {
+  const {
+    children,
+    ThemeColor,
+    showTutorialScreenFirstTime,
+    FirstScreenTitle,
+    SecondScreenTitle,
+    allowToReportBugByShakingMobile,
+    allowToReportBugByScreenCapture,
+    allowCrashReport,
+    ShakebugLanguage
+  } = React.useContext(ShakebugContext);
+
+  useEffect(() => {
+    DeviceInfo.isEmulator()
+      .then(res => {
+        global.isRealDevice = !res
+      })
+  }, []);
+
+  return (
+    <ShakeFunction
+      isRealDevice={global.isRealDevice}
+      themeColor={ThemeColor}
+      showTutorialScreen={showTutorialScreenFirstTime}
+      SDKScreenTitle={[FirstScreenTitle, SecondScreenTitle]}
+      allowToReportBugByShaking={allowToReportBugByShakingMobile}
+      allowToReportBugByScreenCapture={allowToReportBugByScreenCapture}
+      allowCrashReport={allowCrashReport}
+      ShakebugLanguage={ShakebugLanguage}
+    >
+      {children}
+    </ShakeFunction>
+  )
+};
+
+
+
 function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirstTime, ShakebugThemeColor, changeSDKScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, makeLogEnabled, setShakebugSDKEndPointURL }) {
 
   const { ShakebugSDKSharedPreferencesModule } = NativeModules;
@@ -76,6 +155,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   const [isAlert, setIsAlert] = useState(false)
   const [isAlertText, setAlertText] = useState("")
   const [showModal, setShowModal] = useState(false);
+  const [focusedScreen, setFocusedScreen] = useState('');
   global.ShakebugLanguage = ShakebugLanguage;
   global.makeLogEnabled = makeLogEnabled;
   global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.5/webservice.php/";
@@ -158,88 +238,61 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       global.app_lunch_count = (parseInt(KEY_APP_LAUNCH_COUNT) + 1);
 
       if (global.app_lunch_count >= POPUP_LAUNCH_THRESHOLD) {
-        if (LAST_POPUP_TIME &&  LAST_POPUP_TIME  != "" && IS_REVIEW_SUBMITTED != "true") {
+        if (LAST_POPUP_TIME && LAST_POPUP_TIME != "" && IS_REVIEW_SUBMITTED != "true") {
           const now = Date.now(); // current timestamp in milliseconds
           const sevenDaysInMs = global.POPUP_COOLDOWN_DAYS * 24 * 60 * 60 * 1000; // 7 days in milliseconds
 
           const afterDaysTimestamp = now + sevenDaysInMs;
 
           if (LAST_POPUP_TIME > afterDaysTimestamp) {
-            if (!global.isFeatureEnabled || global.isFeatureEnabled('6')) setShowModal(true)
+            setShowModal(true)
           }
 
         }
         else if (IS_REVIEW_SUBMITTED != "true") {
-          if (!global.isFeatureEnabled || global.isFeatureEnabled('6')) setShowModal(true)
+          setShowModal(true)
         }
       }
 
-      if (Android_appkey != undefined || iOS_appkey != undefined) {
-        if (Platform.OS == 'android') {
-          if (Android_appkey.trim().length > 0) {
-            try {
-              const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime')
-              if (ismauReached == undefined || ismauReached == null || ismauReached == "") {
-                MatchKeyFunc(Android_appkey)
-              }
-              else {
-                if (parseInt(ismauReached) < new Date().getTime()) {
-                  MatchKeyFunc(Android_appkey)
-                  ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "")
-                }
-                else {
-                  log.debug("------------------------------------------------------------------------------------------")
-                  log.warn('MAU limit is arrived, please try after', new Date(parseInt(ismauReached)).toLocaleString());
-                  log.debug("------------------------------------------------------------------------------------------")
-                }
-              }
-            }
-            catch (err) {
-              log.error("Err here", err)
+      if (Platform.OS == 'android') {
+        if (Android_appkey && Android_appkey.trim().length > 0) {
+          try {
+            const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime');
+            if (!ismauReached) {
+              MatchKeyFunc(Android_appkey);
+            } else if (parseInt(ismauReached) < new Date().getTime()) {
+              MatchKeyFunc(Android_appkey);
+              ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "");
+            } else {
+              log.debug("------------------------------------------------------------------------------------------");
+              log.warn('MAU limit is arrived, please try after', new Date(parseInt(ismauReached)).toLocaleString());
+              log.debug("------------------------------------------------------------------------------------------");
             }
+          } catch (err) {
+            log.error("Err here", err);
           }
-          else {
-            log.warn("Please provide valid android appkey")
-          }
+        } else {
+          log.warn("Please provide valid android appkey");
         }
-        else if (Platform.OS == 'ios') {
-          if (iOS_appkey.trim().length > 0) {
-            try {
-              const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime')
-              if (ismauReached == undefined || ismauReached == null || ismauReached == "") {
-                MatchKeyFunc(iOS_appkey)
-              }
-              else {
-                if (parseInt(ismauReached) < new Date().getTime()) {
-                  MatchKeyFunc(iOS_appkey)
-                  ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "")
-                }
-                else {
-                  log.debug("------------------------------------------------------------------------------------------")
-                  log.warn('MAU limit is arrived, please try after', new Date(parseInt(ismauReached)).toLocaleString());
-                  log.debug("------------------------------------------------------------------------------------------")
-                }
-              }
-            }
-            catch (err) {
-              log.error("Err", err)
+      } else if (Platform.OS == 'ios') {
+        if (iOS_appkey && iOS_appkey.trim().length > 0) {
+          try {
+            const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime');
+            if (!ismauReached) {
+              MatchKeyFunc(iOS_appkey);
+            } else if (parseInt(ismauReached) < new Date().getTime()) {
+              MatchKeyFunc(iOS_appkey);
+              ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "");
+            } else {
+              log.debug("------------------------------------------------------------------------------------------");
+              log.warn('MAU limit is arrived, please try after', new Date(parseInt(ismauReached)).toLocaleString());
+              log.debug("------------------------------------------------------------------------------------------");
             }
+          } catch (err) {
+            log.error("Err", err);
           }
-          else {
-            log.warn("Please provide valid ios appkey")
-          }
-        }
-      }
-      else {
-        if (Platform.OS == 'android') {
-          log.debug("------------------------------------------------------------------------------------------")
-          log.warn("Please provide Android_appkey");
-          log.debug("------------------------------------------------------------------------------------------")
-        }
-        else if (Platform.OS == 'ios') {
-          log.debug("------------------------------------------------------------------------------------------")
-          log.warn("Please provide iOS_appkey");
-          log.debug("------------------------------------------------------------------------------------------")
+        } else {
+          log.warn("Please provide valid ios appkey");
         }
       }
     }
@@ -312,14 +365,11 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     try {
       let BundleId = DeviceInfo.getBundleId();
 
-      const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type } = await MatchKeyApi(appkey, BundleId);
+      const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration } = await MatchKeyApi(appkey, BundleId);
 
       global.videoDuration = video_duration;
 
       if (success) {
-        if (shakebug_type) {
-            global.shakebug_type = shakebug_type.toString();
-        }
         if (total_video == "Unlimited") {
           global.AllowVideo = true;
         }
@@ -373,7 +423,6 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
   // For call Startsesstion and get session id 
   const StartSession = async () => {
-    if (global.isFeatureEnabled && !global.isFeatureEnabled('3')) return;
     if (global.session_id == "") {
       try {
         const { success, session_id: newSessionId, message } = await SessionStartApi(global.latitude, global.longitude, global.application_id);
@@ -401,77 +450,39 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     })
   }
 
-  // For shakeFunctionscreen with childern as props
-  const ShakeScreen = () => {
-
-    DeviceInfo.isEmulator()
-      .then(res => {
-        global.isRealDevice = !res
-      })
-
-    return (
-      <ShakeFunction isRealDevice={global.isRealDevice} themeColor={ThemeColor} showTutorialScreen={showTutorialScreenFirstTime} SDKScreenTitle={[FirstScreenTitle, SecondScreenTitle]} allowToReportBugByShaking={allowToReportBugByShakingMobile} allowToReportBugByScreenCapture={allowToReportBugByScreenCapture} allowCrashReport={allowCrashReport} ShakebugLanguage={ShakebugLanguage}>
-        {children}
-      </ShakeFunction>
-    )
-  }
-
-  // For handel error globaly
+  // For handle error globally
   setGlobalErrorHandler()
 
-  const { width } = Dimensions.get('window');
-
-  // For register all screen
-  const screens = {
-    ShakebugHome: ShakeScreen,
-    TutorialScreen: TutorialScreen,
-    FirstScreen: FirstScreen,
-    TrimVideoScreen: TrimVideoScreen,
-    AddDetailsScreen: AddDetailsScreen
-  };
-
-  // For navigation in register screen
-  const NavigationContainer = () => {
-    const { navigationState } = useNavigation();
-    const animation = React.useRef(new Animated.Value(0)).current;
-
-    React.useEffect(() => {
-      Animated.timing(animation, {
-        toValue: navigationState.length - 1,
-        duration: 300,
-        useNativeDriver: true,
-      }).start();
-    }, [navigationState]);
-
-    return (
-      <View style={styles.container}>
-        {navigationState.map((screen, index) => {
-          const ScreenComponent = screens[screen.name];
-          const translateX = animation.interpolate({
-            inputRange: [index - 1, index, index + 1],
-            outputRange: [width, 0, -width],
-          });
-
-          return (
-            <Animated.View key={index} style={[styles.screen, { transform: [{ translateX }] }]}>
-              <ScreenComponent {...screen.params} />
-            </Animated.View>
-          );
-        })}
-      </View>
-    );
-  };
 
   return (
+    <ShakebugContext.Provider value={{
+      children,
+      ThemeColor,
+      showTutorialScreenFirstTime,
+      FirstScreenTitle,
+      SecondScreenTitle,
+      allowToReportBugByShakingMobile,
+      allowToReportBugByScreenCapture,
+      allowCrashReport,
+      ShakebugLanguage
+    }}>
       <View
         style={{
-          width: '100%',
-          height: '100%'
+          flex: 1,
         }}
       >
         <GlobalStateProvider>
           <NavigationProvider>
-            <NavigationContainer />
+            <NavigationContainer
+              screens={{
+                ShakebugHome: ShakeScreen,
+                TutorialScreen: TutorialScreen,
+                FirstScreen: FirstScreen,
+                TrimVideoScreen: TrimVideoScreen,
+                AddDetailsScreen: AddDetailsScreen
+              }}
+              setFocusedScreen={setFocusedScreen}
+            />
           </NavigationProvider>
         </GlobalStateProvider>
 
@@ -487,6 +498,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
         <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
       </View>
+    </ShakebugContext.Provider>
   )
 }
 
@@ -495,7 +507,6 @@ export default Shakebug;
 
 // For add event api
 export const AddEvent = async (name, value) => {
-  if (global.isFeatureEnabled && !global.isFeatureEnabled('5')) return;
 
   const defaultConfig = {
     levels: {

package/src/index.tsx

@@ -136,3 +136,6 @@ export const fetchRemoteCodeValue = async (key: String) => {
     return "Something went wrong, Please try again later!"
   }
 }
+
+export { default as ShakebugCapture, captureRef, captureScreen, releaseCapture } from './Componanats/ShakebugCapture';
+

package/ios/ScreenShot/ShakebugSDKRNViewShot.h

@@ -1,6 +0,0 @@
-
-#import <React/RCTBridgeModule.h>
-
-@interface ShakebugSDKRNViewShot : NSObject <RCTBridgeModule>
-
-@end