shakebug-react-native 2.2.5 → 2.2.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "Shakebug allows users to report the bug from your mobile phone for your application. Here users just need to shake their mobile and all the data regarding bugs & crashes can be seen by developers through their log in panel easily",
   "main": "src/index.tsx",
   "scripts": {

package/src/Componanats/ShakeFunction.js

@@ -16,7 +16,7 @@ import { useGlobalState } from 'shakebug-react-native/src/Componanats/GlobalStat
 
 LogBox.ignoreAllLogs()
 
-const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitle, allowToReportBugByShaking, allowToReportBugByScreenCapture, allowCrashReport, insets }) => {
+const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitle, allowToReportBugByShaking, allowToReportBugByScreenCapture, allowCrashReport }) => {
 
   const { ShakebugSDKScreenShotDetector, ShakebugSDKSharedPreferencesModule, ShakebugSDKCustomScreenCapture} = NativeModules;
 
@@ -198,7 +198,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       clearInterval(intervalId);
       setIsLoading(false)
       global.isRecording = false;
-      navigate("AddDetailsScreen", { media: res.result.outputURL, mediaType: 'Recordvideo', themeColor: themeColor, SDKScreenTitle: `${SDKScreenTitle}`, insets: insets })
+      navigate("AddDetailsScreen", { media: res.result.outputURL, mediaType: 'Recordvideo', themeColor: themeColor, SDKScreenTitle: `${SDKScreenTitle}` })
     })
       .catch(e => {
         log.warn("e", e)
@@ -307,7 +307,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
                     subscription.unsubscribe();
                     global.IsBackground = false
                     global.isShakebugSDKOpen = true
-                    navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}`, insets: insets })
+                    navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
                   }
                   else {
                     setIsScreenShot(false)
@@ -335,7 +335,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
                 if (ImgUrl != undefined || ImgUrl != null) {
                   subscription.unsubscribe();
                   global.isShakebugSDKOpen = true
-                  navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}`, insets: insets })
+                  navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
                 }
                 else {
                   setIsScreenShot(false)
@@ -381,7 +381,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
           global.isScreenShotDetected = true;
           setTriggred(false)
           global.isShakebugSDKOpen = true
-          navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}`, insets: insets })
+          navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
         }
       }
     }

package/src/Screens/AddDetailsScreen.js

@@ -1,4 +1,4 @@
-import { View, Text, TouchableOpacity, Image, TextInput, SafeAreaView, PanResponder, Alert, StyleSheet, Keyboard, LogBox, Platform, StatusBar, NativeModules, BackHandler, DeviceEventEmitter, Dimensions } from 'react-native'
+import { View, Text, TouchableOpacity, Image, TextInput, PanResponder, Alert, StyleSheet, Keyboard, LogBox, Platform, StatusBar, NativeModules, BackHandler, DeviceEventEmitter, Dimensions, SafeAreaView } from 'react-native'
 import React, { useState, useRef, useEffect } from 'react'
 import { launchImageLibrary } from '../../ImageOrVedioPicker/src/index';
 import { AddIssueApi } from '../APIs/AddIssue';
@@ -13,6 +13,7 @@ import KeyboardAvoidingWrapper from '../Componanats/KeyboardAvoidingWrapper';
 import { useGlobalState } from 'shakebug-react-native/src/Componanats/GlobalStateContext';
 import CustomeAlert from 'shakebug-react-native/src/Componanats/CustomAlert';
 import NetInfo from 'shakebug-react-native/NetInfo/src';
+import DeviceInfo from '../../DeviceInfo';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed", "Non-serializable"];
 
@@ -22,7 +23,7 @@ LogBox.ignoreLogs([
 
 const { CreateThumbnail } = NativeModules;
 
-const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScreenTitle, insets }) => {
+const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScreenTitle }) => {
 
     const { setIsScreenShot, setIsRecordingStart } = useGlobalState()
 
@@ -167,9 +168,9 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                 let videoUri = await response.uri || response.assets?.[0]?.uri;
                 if (response.assets?.[0]?.type.slice(0, 5).trim() == "video") {
                     if (mediaType == "img")
-                        navigate("TrimVideoScreen", { video: `${videoUri}`, Type: "imgReplacedWithVideo", themeColor: ThemeColor, SDKScreenTitle: SDKScreenTitle, UpdateStatusBar: UpdateStatusBar, updateParent: updateParent, insets: insets })
+                        navigate("TrimVideoScreen", { video: `${videoUri}`, Type: "imgReplacedWithVideo", themeColor: ThemeColor, SDKScreenTitle: SDKScreenTitle, UpdateStatusBar: UpdateStatusBar, updateParent: updateParent })
                     else
-                        navigate("TrimVideoScreen", { video: `${videoUri}`, Type: "videoReplacedWithVideo", themeColor: ThemeColor, SDKScreenTitle: SDKScreenTitle, UpdateStatusBar: UpdateStatusBar, updateParent: updateParent, insets: insets })
+                        navigate("TrimVideoScreen", { video: `${videoUri}`, Type: "videoReplacedWithVideo", themeColor: ThemeColor, SDKScreenTitle: SDKScreenTitle, UpdateStatusBar: UpdateStatusBar, updateParent: updateParent })
                 }
                 else {
                     setAPIMessage("Invalid selection, Please choose a valid video file")
@@ -284,7 +285,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     return (
-        <View style={{ width: "100%", height: "100%", backgroundColor: themeColor, paddingTop: insets.top, paddingBottom: insets.bottom }}>
+        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor, paddingTop: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0 , paddingBottom: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0}}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>
@@ -466,7 +467,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                 }}
             />
 
-        </View >
+        </SafeAreaView>
     )
 }
 

package/src/Screens/FirstScreen.js

@@ -15,7 +15,7 @@ import CustomeAlert from 'shakebug-react-native/src/Componanats/CustomAlert.js';
 console.disableYellowBox = true;
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed", "Possible"];
 
-const FirstScreen = ({ img, themeColor, SDKScreenTitle, insets}) => {
+const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
 
   const { setIsScreenShot, setIsRecordingStart } = useGlobalState()
 
@@ -124,7 +124,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle, insets}) => {
         let vedioUri = await response.uri || response.assets?.[0]?.uri;
         if (response.assets?.[0]?.type.slice(0, 5).trim() == "video") {
           setIsLoading(false)
-          navigate("TrimVideoScreen", { video: `${vedioUri}`, Type: "video", themeColor: `${ThemeColor}`, SDKScreenTitle: `${SDKScreenTitle}`, UpdateStatusBar: UpdateStatusBar, updateParent: updateImage, insets: insets })
+          navigate("TrimVideoScreen", { video: `${vedioUri}`, Type: "video", themeColor: `${ThemeColor}`, SDKScreenTitle: `${SDKScreenTitle}`, UpdateStatusBar: UpdateStatusBar, updateParent: updateImage })
         }
         else {
           setIsAlertText("Invalid selection, Please choose a valid video file")
@@ -309,7 +309,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle, insets}) => {
   // backgroundColor: "#181818"
 
   return (
-    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, paddingTop: insets.top, paddingBottom: insets.bottom}}>
+    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, paddingTop: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0 , paddingBottom: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0}}>
       <StatusBar backgroundColor={ThemeColor} />
 
       <View style={{ width: "100%", height: "100%", backgroundColor: "#e4fdfd" }}>
@@ -345,7 +345,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle, insets}) => {
               const ImgUrl = await ref.current.capture()
               if (ImgUrl != undefined || ImgUrl != null) {
                 global.IsBackground = 'true'
-                navigate("AddDetailsScreen", { media: `${ImgUrl}`, updateParent: updateImage, mediaType: 'img', themeColor: ThemeColor, SDKScreenTitle: `${SDKScreenTitle}`, insets: insets })
+                navigate("AddDetailsScreen", { media: `${ImgUrl}`, updateParent: updateImage, mediaType: 'img', themeColor: ThemeColor, SDKScreenTitle: `${SDKScreenTitle}` })
               }
 
             }}
@@ -568,10 +568,8 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle, insets}) => {
       />
 
       {isLoading && <ActivityIndicator size={'large'} color={themeColor} collapsable={true} style={{ position: 'absolute', top: 0, bottom: 0, left: 0, right: 0, elevation: 2 }} />}
-      
-       <View style={{height: insets?.bottom, marginTop: 5, backgroundColor: "#e4fdfd"}}/>
 
-    </SafeAreaView >
+    </SafeAreaView>
   )
 }
 

package/src/Screens/Shakebug.js

@@ -20,7 +20,7 @@ import { Localization } from '../Componanats/localization';
 import { GlobalStateProvider, useGlobalState } from '../Componanats/GlobalStateContext';
 import CustomeAlert from 'shakebug-react-native/src/Componanats/CustomAlert';
 import ReviewModal from 'shakebug-react-native/src/Componanats/ReviewModal';
-import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-context';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
@@ -52,7 +52,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.2.5";
+global.sdk_version = "2.2.7";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -392,15 +392,13 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   // For shakeFunctionscreen with childern as props
   const ShakeScreen = () => {
 
-    const insets = useSafeAreaInsets();
-
     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} insets={insets}>
+      <ShakeFunction isRealDevice={global.isRealDevice} themeColor={ThemeColor} showTutorialScreen={showTutorialScreenFirstTime} SDKScreenTitle={[FirstScreenTitle, SecondScreenTitle]} allowToReportBugByShaking={allowToReportBugByShakingMobile} allowToReportBugByScreenCapture={allowToReportBugByScreenCapture} allowCrashReport={allowCrashReport} ShakebugLanguage={ShakebugLanguage}>
         {children}
       </ShakeFunction>
     )
@@ -453,7 +451,6 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   };
 
   return (
-    <SafeAreaProvider>
       <View
         style={{
           width: '100%',
@@ -478,7 +475,6 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
         <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
       </View>
-    </SafeAreaProvider>
   )
 }
 

package/src/Screens/TrimVideoScreen.js

@@ -8,7 +8,7 @@ console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
 
 
-const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatusBar, updateParent, insets}) => {
+const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatusBar, updateParent }) => {
 
   const { goToScreenAtIndex, navigate, goBack } = useNavigation();
 
@@ -53,7 +53,7 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
         case 'onFinishTrimming': {
           global.IsBackground = 'true'
           UpdateStatusBar()
-          navigate("AddDetailsScreen", { media: `${event.outputPath}`, mediaType: 'video', themeColor: themeColor, SDKScreenTitle: SDKScreenTitle, updateParent: updateParent, insets: insets });
+          navigate("AddDetailsScreen", { media: `${event.outputPath}`, mediaType: 'video', themeColor: themeColor, SDKScreenTitle: SDKScreenTitle, updateParent: updateParent });
           return;
         }
         case 'onCancel': {