shakebug-react-native 2.2.6 → 2.2.8

package/Volumes:.fileloc

@@ -0,0 +1,8 @@
+<?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>URL</key>
+	<string>file:///Volumes/Data/React-Native/expenzo/node_modules/shakebug-react-native/src</string>
+</dict>
+</plist>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "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

@@ -1,4 +1,4 @@
-import { View, Text, TouchableOpacity, Image, TextInput, 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,8 +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 { SafeAreaView } from 'react-native-safe-area-context';
-
+import DeviceInfo from '../../DeviceInfo';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed", "Non-serializable"];
 
@@ -26,8 +25,6 @@ const { CreateThumbnail } = NativeModules;
 
 const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScreenTitle }) => {
 
-    const insets = useSafeAreaInsets();
-
     const { setIsScreenShot, setIsRecordingStart } = useGlobalState()
 
     const { goBack, navigate, goToScreenAtIndex } = useNavigation();
@@ -288,7 +285,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     return (
-        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor}}>
+        <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>
                 <>
@@ -470,7 +467,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                 }}
             />
 
-        </SafeAreaView >
+        </SafeAreaView>
     )
 }
 

package/src/Screens/FirstScreen.js

@@ -309,7 +309,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-    <View style={{ width: "100%", height: '100%', backgroundColor: themeColor, paddingTop: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 ? StatusBar.currentHeight : 0 : StatusBar.currentHeight, paddingBottom: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 ? StatusBar.currentHeight : 0 : StatusBar.currentHeight}}>
+    <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" }}>
@@ -354,7 +354,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
           </TouchableOpacity>
         </View>
         <View style={{ position: 'relative', height: Platform.OS == 'android' ? '78%' : '79%', backgroundColor: '#e4fdfd', width: '100%', alignItems: 'center', paddingTop: 8 }}>
-          <ViewShot ref={ref} options={{ fileName: "ScreenShort", format: "jpg", quality: 1 }} style={{ width: Platform.OS == 'android' ? "77%" : '73%', height: '100%' }}>
+          <ViewShot ref={ref} options={{ fileName: "ScreenShort", format: "png", quality: 1 }}  collapsable={false} style={{ width: Platform.OS == 'android' ? "77%" : '73%', height: '100%' }}>
 
             {text.trim().length > 0 ?
               <Animated.View
@@ -400,7 +400,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
               </Animated.View>
               : null}
             <ImageBackground
-              source={{ uri: image }}
+              source={image ? { uri: image } : undefined}
               style={{
                 alignItems: 'center',
                 width: "100%",
@@ -569,7 +569,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
 
       {isLoading && <ActivityIndicator size={'large'} color={themeColor} collapsable={true} style={{ position: 'absolute', top: 0, bottom: 0, left: 0, right: 0, elevation: 2 }} />}
 
-    </View>
+    </SafeAreaView>
   )
 }
 

package/src/Screens/Shakebug.js

@@ -52,7 +52,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.2.6";
+global.sdk_version = "2.2.8";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -134,23 +134,23 @@ 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", "")
           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", "")
         ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
         ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
       }
 
-      global.app_lunch_count = (KEY_APP_LAUNCH_COUNT + 1);
+      global.app_lunch_count = (parseInt(KEY_APP_LAUNCH_COUNT) + 1);
 
       if (global.app_lunch_count >= POPUP_LAUNCH_THRESHOLD) {
-        if (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