shakebug-react-native 1.0.19 → 2.0.0

package/ios/CustomScreenShot/ShakebugSDKCustomScreenCapture.h

@@ -0,0 +1,11 @@
+//
+//  ShakebugSDKCustomScreenCapture.h
+//  RoomTap_admin
+//
+//  Created by ideveloper2 on 28/11/24.
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface ShakebugSDKCustomScreenCapture : NSObject <RCTBridgeModule>
+@end

package/ios/CustomScreenShot/ShakebugSDKCustomScreenCapture.m

@@ -0,0 +1,71 @@
+//
+//  ShakebugSDKCustomScreenCapture.m
+//  Shakebug
+//
+//  Created by ideveloper2 on 28/11/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+#import "ShakebugSDKCustomScreenCapture.h"
+#import <UIKit/UIKit.h>
+
+@implementation ShakebugSDKCustomScreenCapture
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(captureScreen:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  // Ensure all UI operations run on the main thread
+  dispatch_async(dispatch_get_main_queue(), ^{
+    @try {
+      // Get all windows of the application
+      NSArray<UIWindow *> *windows = [UIApplication sharedApplication].windows;
+      if (windows.count == 0) {
+        reject(@"no_windows", @"No windows available to capture", nil);
+        return;
+      }
+
+      // Create a context for capturing all windows
+      UIScreen *mainScreen = [UIScreen mainScreen];
+      UIGraphicsBeginImageContextWithOptions(mainScreen.bounds.size, NO, mainScreen.scale);
+
+      // Render each window onto the context
+      for (UIWindow *window in windows) {
+        if (![window isHidden]) { // Skip hidden windows
+          [window drawViewHierarchyInRect:mainScreen.bounds afterScreenUpdates:YES];
+        }
+      }
+
+      // Get the final image from the context
+      UIImage *capturedImage = UIGraphicsGetImageFromCurrentImageContext();
+      UIGraphicsEndImageContext();
+
+      if (!capturedImage) {
+        reject(@"capture_error", @"Failed to create image context", nil);
+        return;
+      }
+
+      // Convert the image to PNG data
+      NSData *imageData = UIImagePNGRepresentation(capturedImage);
+      NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"screenshot.png"];
+
+      BOOL success = [imageData writeToFile:filePath atomically:YES];
+      if (!success) {
+        reject(@"file_error", @"Failed to save the screenshot file", nil);
+        return;
+      }
+
+      // Resolve with the file path
+      resolve(filePath);
+    }
+    @catch (NSException *exception) {
+      NSString *errorDetails = [NSString stringWithFormat:@"Exception: %@", exception.reason];
+      NSLog(@"Capture Screen Exception: %@", errorDetails);
+      reject(@"capture_error", errorDetails, nil);
+    }
+  });
+}
+
+@end
+

package/ios/Shakebug.xcodeproj/project.pbxproj

@@ -50,6 +50,7 @@
 		095DA0822B909E8900E2DD76 /* EnvironmentUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 095DA0812B909E8900E2DD76 /* EnvironmentUtil.m */; };
 		095DA0862B909EF600E2DD76 /* RNDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 095DA0852B909EF600E2DD76 /* RNDeviceInfo.m */; };
 		0961C6572B8F406800A68E20 /* MicrophonePermissionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0961C6562B8F406800A68E20 /* MicrophonePermissionManager.m */; };
+		0966B3812CF8894C00BB9F76 /* ShakebugSDKCustomScreenCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 0966B3802CF8894C00BB9F76 /* ShakebugSDKCustomScreenCapture.m */; };
 		096BF6242BD38C1A0069623C /* ShakebugSDKVideoPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 096BF6232BD38C1A0069623C /* ShakebugSDKVideoPlayerView.m */; };
 		096BF6272BD38C5A0069623C /* ShakebugSDKVideoPlayerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 096BF6262BD38C5A0069623C /* ShakebugSDKVideoPlayerManager.m */; };
 		09B93D4E2BDB6D2200FBED4F /* VideoTrim.m in Sources */ = {isa = PBXBuildFile; fileRef = 09B93D4D2BDB6D2200FBED4F /* VideoTrim.m */; };
@@ -165,6 +166,8 @@
 		095DA0872B909F1C00E2DD76 /* RNDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNDeviceInfo.h; sourceTree = "<group>"; };
 		0961C6552B8F400F00A68E20 /* MicrophonePermissionManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicrophonePermissionManager.h; sourceTree = "<group>"; };
 		0961C6562B8F406800A68E20 /* MicrophonePermissionManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicrophonePermissionManager.m; sourceTree = "<group>"; };
+		0966B37F2CF8892700BB9F76 /* ShakebugSDKCustomScreenCapture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShakebugSDKCustomScreenCapture.h; sourceTree = "<group>"; };
+		0966B3802CF8894C00BB9F76 /* ShakebugSDKCustomScreenCapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShakebugSDKCustomScreenCapture.m; sourceTree = "<group>"; };
 		096BF6222BD38BFF0069623C /* ShakebugSDKVideoPlayerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShakebugSDKVideoPlayerView.h; sourceTree = "<group>"; };
 		096BF6232BD38C1A0069623C /* ShakebugSDKVideoPlayerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShakebugSDKVideoPlayerView.m; sourceTree = "<group>"; };
 		096BF6252BD38C410069623C /* ShakebugSDKVideoPlayerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShakebugSDKVideoPlayerManager.h; sourceTree = "<group>"; };
@@ -388,6 +391,15 @@
 			path = DeviceInfo;
 			sourceTree = "<group>";
 		};
+		0966B37D2CF8883500BB9F76 /* CustomScreenShot */ = {
+			isa = PBXGroup;
+			children = (
+				0966B37F2CF8892700BB9F76 /* ShakebugSDKCustomScreenCapture.h */,
+				0966B3802CF8894C00BB9F76 /* ShakebugSDKCustomScreenCapture.m */,
+			);
+			path = CustomScreenShot;
+			sourceTree = "<group>";
+		};
 		096BF6212BD38BF20069623C /* VideoPlayer */ = {
 			isa = PBXGroup;
 			children = (
@@ -490,6 +502,7 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				0966B37D2CF8883500BB9F76 /* CustomScreenShot */,
 				09ECCD2B2C00A72F000F0BE9 /* SketchCanvas */,
 				09B93D5D2BDB8E6100FBED4F /* Thumbnaill */,
 				09B93D4C2BDB6D1700FBED4F /* TrimVideo */,
@@ -659,6 +672,7 @@
 				0946E5F72B98786E00C1E846 /* LocationModule.m in Sources */,
 				092244972B870CFC009E7378 /* RNSensorsGyroscope.m in Sources */,
 				0946E5E02B98769800C1E846 /* ImagePickerManager.m in Sources */,
+				0966B3812CF8894C00BB9F76 /* ShakebugSDKCustomScreenCapture.m in Sources */,
 				09B93D512BDB766100FBED4F /* ShakebugSDKVideoTrim.swift in Sources */,
 				0946E5D82B98769800C1E846 /* RNViewShot.m in Sources */,
 				0946E5DB2B98769800C1E846 /* RNSensorsAccelerometer.m in Sources */,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "1.0.19",
+  "version": "2.0.0",
   "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": {
@@ -17,7 +17,8 @@
     "crash",
     "errors",
     "reporting",
-    "feedback"
+    "feedback",
+    "tool"
   ],
   "author": {
     "name": "Softnoesis Pvt. Ltd.",

package/src/APIs/StartSession.js

@@ -1,3 +1,4 @@
+import { NativeModules } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 import { getLocales } from "../../GetLocals/src";
 
@@ -9,6 +10,8 @@ async function SessionStartApi(latitude, longitude, application_id) {
     let city = "";
     let state = ""
 
+    const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
     if (latitude != "" && latitude != undefined && longitude != "" && longitude != undefined) {
         try {
             await fetch(
@@ -22,13 +25,29 @@ async function SessionStartApi(latitude, longitude, application_id) {
         }
         catch (err) {
             // console.log("err", err)
-            throw err
+            // throw err
         }
     }
 
     let locals = getLocales()
 
-    let uuid = await DeviceInfo.getUniqueId()
+    let uuid = null;
+    let idFromStorege = await ShakebugSDKSharedPreferencesModule.getString("uuid");
+
+    console.log("idFromStorege", idFromStorege);
+
+    if (idFromStorege == "" || idFromStorege == undefined) {
+        let id = await DeviceInfo.getUniqueId();
+        ShakebugSDKSharedPreferencesModule.setString("uuid", id)
+        uuid = id;
+    }
+    else {
+        uuid = idFromStorege;
+    }
+
+    console.log("uuid", uuid);
+
+
 
     let system_version = await DeviceInfo.getSystemVersion()
 

package/src/Componanats/ShakeFunction.js

@@ -18,7 +18,7 @@ LogBox.ignoreAllLogs()
 
 const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitle, allowToReportBugByShaking, allowToReportBugByScreenCapture, allowCrashReport }) => {
 
-  const { ShakebugSDKScreenShotDetector, ShakebugSDKSharedPreferencesModule } = NativeModules;
+  const { ShakebugSDKScreenShotDetector, ShakebugSDKSharedPreferencesModule, ShakebugSDKCustomScreenCapture} = NativeModules;
 
   const { navigate, focusedScreen, goToScreenAtIndex } = useNavigation();
 
@@ -321,7 +321,14 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             if (calculate.toFixed(2) >= 2.00) {
               if (global.isIOSValid == true && global.application_id != "" && global.application_id != undefined) {
                 setIsScreenShot(true)
-                const ImgUrl = await ref.current.capture()
+                let ImgUrl = await ref.current.capture()
+                try {
+                  const filePath = await ShakebugSDKCustomScreenCapture.captureScreen();
+                  ImgUrl = filePath
+                }
+                catch (e) {
+                  console.log("e", e);
+                }
                 if (ImgUrl != undefined || ImgUrl != null) {
                   subscription.unsubscribe();
                   global.isShakebugSDKOpen = true

package/src/Screens/AddDetailsScreen.js

@@ -281,7 +281,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     return (
-        <SafeAreaView style={{ width: "100%", height: Dimensions.get('screen').height - StatusBar.currentHeight, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
+        <SafeAreaView style={{ width: "100%", height: Dimensions.get('window').height, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>
@@ -418,7 +418,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                             </View>
 
                             <View style={{ alignItems: 'flex-end', marginHorizontal: 15, marginTop: '1%' }}>
-                                <Text style={{ fontSize: 16, color: "black" }}>© <Text>ShakeBug v1.0</Text></Text>
+                                <Text style={{ fontSize: 12, color: "gray", fontWeight: '300' }}>© <Text>ShakeBug v2.0</Text></Text>
                             </View>
 
                         </View>

package/src/Screens/FirstScreen.js

@@ -310,7 +310,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-    <SafeAreaView style={{ width: "100%", height: Dimensions.get('screen').height - StatusBar.currentHeight, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
+    <SafeAreaView style={{ width: "100%", height: Dimensions.get('window').height, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
       <StatusBar backgroundColor={ThemeColor} />
 
       <View style={{ width: "100%", height: "100%", backgroundColor: "#e4fdfd" }}>