shakebug-react-native 2.2.2 → 2.2.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "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/Screens/AddDetailsScreen.js

@@ -13,7 +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 { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed", "Non-serializable"];
 
@@ -25,6 +25,8 @@ const { CreateThumbnail } = NativeModules;
 
 const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScreenTitle }) => {
 
+    const insets = useSafeAreaInsets();
+
     const { setIsScreenShot, setIsRecordingStart } = useGlobalState()
 
     const { goBack, navigate, goToScreenAtIndex } = useNavigation();
@@ -285,7 +287,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     return (
-        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
+        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor, paddingTop: insets.top, paddingBottom: insets.bottom }}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>

package/src/Screens/FirstScreen.js

@@ -11,12 +11,14 @@ import { ActivityIndicator } from 'react-native';
 import DeviceInfo from '../../DeviceInfo';
 import { useGlobalState } from '../Componanats/GlobalStateContext.js';
 import CustomeAlert from 'shakebug-react-native/src/Componanats/CustomAlert.js';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 console.disableYellowBox = true;
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed", "Possible"];
 
 const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
 
+  const insets = useSafeAreaInsets();
 
   const { setIsScreenShot, setIsRecordingStart } = useGlobalState()
 
@@ -310,7 +312,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
+    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, paddingTop: insets.top, paddingBottom: insets.bottom}}>
       <StatusBar backgroundColor={ThemeColor} />
 
       <View style={{ width: "100%", height: "100%", backgroundColor: "#e4fdfd" }}>

package/src/Screens/Shakebug.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Platform, Alert, AppState, NativeModules, View, StyleSheet, Animated, Dimensions, SafeAreaView, Modal } from 'react-native';
+import { Platform, Alert, AppState, NativeModules, View, StyleSheet, Animated, Dimensions, Modal } from 'react-native';
 import ShakeFunction from '../Componanats/ShakeFunction';
 import FirstScreen from './FirstScreen';
 import AddDetailsScreen from './AddDetailsScreen';
@@ -20,6 +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 } from 'react-native-safe-area-context';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
@@ -51,7 +52,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.2.2";
+global.sdk_version = "2.2.4";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -133,15 +134,15 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
       if (SDK_VERSION) {
         if (SDK_VERSION != global.sdk_version) {
-          ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", "0")
-          ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", "null")
+          ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", 0)
+          ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", null)
           ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
           ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
         }
       }
       else {
-        ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", "0")
-        ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", "null")
+        ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", 0)
+        ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", null)
         ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
         ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
       }
@@ -149,7 +150,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       global.app_lunch_count = (KEY_APP_LAUNCH_COUNT + 1);
 
       if (global.app_lunch_count >= POPUP_LAUNCH_THRESHOLD) {
-        if (LAST_POPUP_TIME != "null" && LAST_POPUP_TIME != null && IS_REVIEW_SUBMITTED != "true") {
+        if (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
 
@@ -450,30 +451,32 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   };
 
   return (
-    <View
-      style={{
-        width: '100%',
-        height: '100%'
-      }}
-    >
-      <GlobalStateProvider>
-        <NavigationProvider>
-          <NavigationContainer />
-        </NavigationProvider>
-      </GlobalStateProvider>
-
-      <CustomeAlert
-        isVisible={isAlert}
-        text={isAlertText}
-        color={ThemeColor}
-        OnPrees={() => {
-          setAlertText("")
-          setIsAlert(false)
+    <SafeAreaProvider>
+      <View
+        style={{
+          width: '100%',
+          height: '100%'
         }}
-      />
-
-      <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
-    </View>
+      >
+        <GlobalStateProvider>
+          <NavigationProvider>
+            <NavigationContainer />
+          </NavigationProvider>
+        </GlobalStateProvider>
+
+        <CustomeAlert
+          isVisible={isAlert}
+          text={isAlertText}
+          color={ThemeColor}
+          OnPrees={() => {
+            setAlertText("")
+            setIsAlert(false)
+          }}
+        />
+
+        <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
+      </View>
+    </SafeAreaProvider>
   )
 }