shakebug-react-native 2.4.8 → 2.4.9

package/android/src/main/java/com/shakebug/DrawingView.java

@@ -34,8 +34,13 @@ public class DrawingView extends View {
         if (bitmap != null) {
             bitmap.recycle();
         }
-        bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
-        canvas = new Canvas(bitmap);
+        if (w > 0 && h > 0) {
+            bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+            canvas = new Canvas(bitmap);
+        } else {
+            bitmap = null;
+            canvas = null;
+        }
     }
 
     @Override
@@ -81,7 +86,7 @@ public class DrawingView extends View {
     }
 
     public void clearCanvas() {
-        if (canvas != null) {
+        if (canvas != null && bitmap != null && bitmap.getWidth() > 0 && bitmap.getHeight() > 0) {
             bitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
             canvas = new Canvas(bitmap);
             invalidate();

package/android/src/main/java/com/shakebug/RecordScreenModule.java

@@ -51,6 +51,7 @@ public class RecordScreenModule extends ReactContextBaseJavaModule implements HB
 
     public RecordScreenModule(ReactApplicationContext reactContext) {
         super(reactContext);
+        reactContext.addActivityEventListener(mActivityEventListener);
     }
 
     @NonNull
@@ -90,7 +91,6 @@ public class RecordScreenModule extends ReactContextBaseJavaModule implements HB
 
     @ReactMethod
     public void setup(ReadableMap readableMap) {
-        new Application().onCreate();
         screenWidth = readableMap.hasKey("width") ? (int) Math.ceil(readableMap.getDouble("width")) : 0;
         screenHeight = readableMap.hasKey("height") ? (int) Math.ceil(readableMap.getDouble("height")) : 0;
         mic = readableMap.hasKey("mic") && readableMap.getBoolean("mic");
@@ -117,7 +117,6 @@ public class RecordScreenModule extends ReactContextBaseJavaModule implements HB
             hbRecorder.setVideoEncoder("DEFAULT");
         }
         hbRecorder.isAudioEnabled(mic);
-        getReactApplicationContext().addActivityEventListener(mActivityEventListener);
     }
 
     private void startRecordingScreen() {

package/android/src/main/java/com/shakebug/ViewShot.java

@@ -351,10 +351,13 @@ public class ViewShot implements UIBlock {
 
         // evaluate real height
         if (snapshotContentContainer) {
-            h = 0;
+            int evaluatedHeight = 0;
             ScrollView scrollView = (ScrollView) view;
             for (int i = 0; i < scrollView.getChildCount(); i++) {
-                h += scrollView.getChildAt(i).getHeight();
+                evaluatedHeight += scrollView.getChildAt(i).getHeight();
+            }
+            if (evaluatedHeight > 0) {
+                h = evaluatedHeight;
             }
         }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "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",
   "types": "src/index.tsx",

package/src/APIs/AddIssue.js

@@ -27,7 +27,17 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         let bugtypes = "bug";
         let created = new Date().toLocaleString();
         let appversion = DeviceInfo.getVersion();
-        let memory = await DeviceInfo.getTotalMemory() - await DeviceInfo.getUsedMemory()
+        let totalMemory = await DeviceInfo.getTotalMemory();
+        let usedMemory = await DeviceInfo.getUsedMemory();
+        let memoryInBytes = totalMemory - usedMemory;
+        
+        let memory = "";
+        if (memoryInBytes >= 1024 * 1024 * 1024) {
+            memory = (memoryInBytes / (1024 * 1024 * 1024)).toFixed(2) + " GB";
+        } else {
+            memory = Math.round(memoryInBytes / (1024 * 1024)) + " MB";
+        }
+
         let osversion = await DeviceInfo.getSystemVersion()
         const type = isVideo ? 'video/mp4' : 'image/jpg';
         const name = isVideo ? 'video.mp4' : 'photo.jpg';

package/src/Componanats/CustomAlert.js

@@ -7,10 +7,9 @@ const CustomeAlert = ({color, isVisible, OnPrees, text}) => {
         <Modal
             transparent={true}
             visible={isVisible}
+            animationType="fade"
         >
             <View style={styles.background}>
-                <View style={styles.overlay} />
-
                 <View 
                     style={[
                     styles.container, {
@@ -52,10 +51,7 @@ const styles = StyleSheet.create({
         flex: 1,
         justifyContent: 'center',
         alignItems: 'center',
-    },
-    overlay: {
-        ...StyleSheet.absoluteFillObject,
-        backgroundColor: 'rgba(0, 0, 0, 0.5)', // Slightly transparent overlay
+        backgroundColor: 'rgba(0, 0, 0, 0.5)',
     },
     container: {
         width: '80%',

package/src/Componanats/ErrorHandler.js

@@ -12,7 +12,16 @@ const AddCrashApi = async (desc) => {
     let model = await DeviceInfo.getModel();
     let created = new Date().toLocaleString();
     let appversion = DeviceInfo.getVersion();
-    let memory = await DeviceInfo.getTotalMemory() - await DeviceInfo.getUsedMemory()
+    let totalMemory = await DeviceInfo.getTotalMemory();
+    let usedMemory = await DeviceInfo.getUsedMemory();
+    let memoryInBytes = totalMemory - usedMemory;
+    
+    let memory = "";
+    if (memoryInBytes >= 1024 * 1024 * 1024) {
+        memory = (memoryInBytes / (1024 * 1024 * 1024)).toFixed(2) + " GB";
+    } else {
+        memory = Math.round(memoryInBytes / (1024 * 1024)) + " MB";
+    }
     let osversion = await DeviceInfo.getSystemVersion()
 
     let i = 0;

package/src/Screens/AddDetailsScreen.js

@@ -285,12 +285,11 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     return (
-        <SafeAreaView style={{ flex: 1, backgroundColor: ThemeColor }}>
+        <SafeAreaView style={{ flex: 1, backgroundColor: ThemeColor, paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0 }}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} barStyle="dark-content" />
             <View style={{
                 flex: 1,
                 backgroundColor: "#fff",
-                paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0,
                 paddingBottom: Platform.OS === 'android' ? 48 : 0 // Standard bottom navigation bar height
             }}>
                 <KeyboardAvoidingWrapper>
@@ -427,7 +426,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                                 </TouchableOpacity>
                             </View>
 
-                            <View style={{ alignItems: 'flex-end', marginHorizontal: 15, marginTop: '1%' }}>
+                            <View style={{ alignItems: 'flex-end', marginHorizontal: 15, marginTop: '0.5%' }}>
                                 <Text style={{ fontSize: 12, color: "gray", fontWeight: '300' }}>© <Text>ShakeBug v{global.sdk_version}</Text></Text>
                             </View>
 

package/src/Screens/FirstScreen.js

@@ -310,13 +310,12 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: ThemeColor }}>
+      <SafeAreaView style={{ flex: 1, backgroundColor: ThemeColor, paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0 }}>
         <StatusBar backgroundColor={ThemeColor} barStyle="dark-content" />
         
         <View style={{
           flex: 1,
           backgroundColor: "#e4fdfd",
-          paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0,
           paddingBottom: Platform.OS === 'android' ? 48 : 0 // Standard bottom navigation bar height
         }}>
 

package/src/Screens/Shakebug.js

@@ -63,7 +63,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.4.8";
+global.sdk_version = "2.4.9";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -101,33 +101,25 @@ const NavigationContainer = ({ screens, setFocusedScreen }) => {
     );
   }
 
-  const currentScreen =
-    navigationState[navigationState.length - 1];
-
-
-  const ScreenComponent = screens[currentScreen.name];
-
-
-  if (!ScreenComponent) {
-    return (
-      <View
-        style={{
-          flex: 1,
-          justifyContent: 'center',
-          alignItems: 'center',
-          backgroundColor: 'red',
-        }}
-      >
-        <Text style={{ color: 'white', fontSize: 20 }}>
-          Screen Not Found: {currentScreen.name}
-        </Text>
-      </View>
-    );
-  }
-
   return (
     <View style={{ flex: 1, backgroundColor: 'white' }}>
-      <ScreenComponent {...(currentScreen.params || {})} />
+      {navigationState.map((screen, index) => {
+        const ScreenComponent = screens[screen.name];
+        if (!ScreenComponent) return null;
+
+        const isFocused = index === navigationState.length - 1;
+        return (
+          <View
+            key={index}
+            style={[
+              StyleSheet.absoluteFillObject,
+              { display: isFocused ? 'flex' : 'none', width: '100%', height: '100%' }
+            ]}
+          >
+            <ScreenComponent {...(screen.params || {})} />
+          </View>
+        );
+      })}
     </View>
   );
 };