shakebug-react-native 2.4.8 → 2.4.10

package/README.md

@@ -23,18 +23,6 @@ Or if you prefer to use Yarn instead of npm:
  yarn add shakebug-react-native
 ```
 
-Make sure to install Required Libraries also
-
-```bash
- npm i react-native-video react-native-video-trim@3.0.9
-```
-Or if you prefer to use Yarn instead of npm:
-
-```bash
- yarn add react-native-video react-native-video-trim@3.0.9
-```
-
-
 ### iOS
 
 1. You need to provide permissions inside `ios/YourProjectName/info.plist`:

package/VideoPlayer/PlayVideo.tsx

@@ -1,51 +1,9 @@
-// videoUtils.js
-
-import { Platform } from 'react-native';
 import { NativeModules } from 'react-native';
-const { ShakebugSDKVideoPlayerModule } = NativeModules;
 
-export interface EditorConfig {
-    saveToPhoto?: boolean;
-    removeAfterSavedToPhoto?: boolean;
-    maxDuration?: number;
-    cancelButtonText?: string;
-    saveButtonText?: string;
-    enableCancelDialog?: boolean;
-    cancelDialogTitle?: string;
-    cancelDialogMessage?: string;
-    cancelDialogCancelText?: string;
-    cancelDialogConfirmText?: string;
-    enableSaveDialog?: boolean;
-    saveDialogTitle?: string;
-    saveDialogMessage?: string;
-    saveDialogCancelText?: string;
-    saveDialogConfirmText?: string;
-    trimmingText?: string;
-}
+const VideoPlayerModule = NativeModules.ShakebugSDKVideoPlayerModule || NativeModules.ShakebugSDKVideoPlayer;
 
 export const PlayVideo = (videoUri: string) => {
-    
-    const config: EditorConfig = {
-        saveToPhoto: false,
-        removeAfterSavedToPhoto: false,
-        maxDuration: 120,
-        cancelButtonText: "Cancel",
-        saveButtonText: "Save",
-        enableCancelDialog: false,
-        cancelDialogTitle: "Cancel Editing",
-        cancelDialogMessage: "Are you sure you want to cancel editing?",
-        cancelDialogCancelText: "No",
-        cancelDialogConfirmText: "Yes",
-        enableSaveDialog: false,
-        saveDialogTitle: "Save Video",
-        saveDialogMessage: "Do you want to save this video?",
-        saveDialogCancelText: "No",
-        saveDialogConfirmText: "Yes",
-        trimmingText: "Trimming Video"
-    };
-    if(Platform.OS == 'android')
-        ShakebugSDKVideoPlayerModule.showEditor(videoUri, config);
-    else
-        ShakebugSDKVideoPlayerModule.playVideo(videoUri);
+    if (VideoPlayerModule && VideoPlayerModule.playVideo) {
+        VideoPlayerModule.playVideo(videoUri);
+    }
 };
-

package/VideoPlayer/index.js

@@ -1,38 +1,13 @@
-import React, { useEffect, useState } from 'react';
-import { NativeModules, Image, TouchableOpacity, ImageBackground, NativeEventEmitter, Platform, StatusBar } from 'react-native';
+import React from 'react';
+import { Image, TouchableOpacity, ImageBackground } from 'react-native';
 import { PlayVideo } from './PlayVideo';
-import Video from 'react-native-video';
 
 const VideoPlayer = ({ videoUri, img, goToScreenAtIndex, UpdateStatusBar }) => {
-    // useEffect(() => {
-    //     if (Platform.OS == 'android') {
-    //         const eventEmitter = new NativeEventEmitter(NativeModules.VideoPlayerModule);
-    //         const subscription = eventEmitter.addListener('ShakebugSDKVideoPlayer', (event) => {
-    //             switch (event.name) {
-    //                 case 'onCancelPlayer': {
-    //                     UpdateStatusBar()
-    //                     goToScreenAtIndex(3)
-    //                     break;
-    //                 }
-    //                 default:
-    //                     break;
-    //             }
-    //         });
-
-    //         return () => {
-    //             subscription.remove();
-    //         };
-    //     }
-    // }, []);
-
-    const [isPlayVideo, setIsPlayVideo] = useState(false);
-
-    const playVideo = () => {
-        setIsPlayVideo(true)
-    }
+    const handlePlayVideo = () => {
+        PlayVideo(videoUri);
+    };
     
     return (
-        !isPlayVideo ? (
         <ImageBackground
             source={{ uri: img }}
             style={{
@@ -51,9 +26,8 @@ const VideoPlayer = ({ videoUri, img, goToScreenAtIndex, UpdateStatusBar }) => {
                     paddingVertical: 8,
                     paddingHorizontal: 15,
                     alignItems: 'center',
-
                 }}
-                onPress={playVideo}
+                onPress={handlePlayVideo}
             >
                 <Image
                     source={require('../src/Assets/images/play.png')}
@@ -66,17 +40,6 @@ const VideoPlayer = ({ videoUri, img, goToScreenAtIndex, UpdateStatusBar }) => {
                 />
             </TouchableOpacity>
         </ImageBackground>
-        )
-            : (<Video
-                source={{ uri: videoUri }}
-                style={{
-                    width: "90%",
-                    marginLeft: '5%',
-                    height: "100%"
-                }}
-                controls={true}
-                fullscreen={Platform.OS == 'ios' && true}
-            />)
     );
 };
 

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

@@ -1,33 +1,21 @@
 package com.shakebug;
 
 import android.content.Context;
-
 import java.lang.ref.WeakReference;
 
-/**
- * Author：J.Chou
- * Date：  2016.07.21 11:45.
- * Email： who_know_me@163.com
- * Describe:
- */
 public class BaseUtils {
-
-  private static final String ERROR_INIT = "Initialize BaseUtils with invoke init()";
-
   private static WeakReference<Context> mWeakReferenceContext;
 
-  /**
-   * init in Application
-   */
-  public static void init(Context ctx){
-    mWeakReferenceContext = new WeakReference<>(ctx);
-    //something to do...
+  public static void init(Context ctx) {
+    if (ctx != null) {
+      mWeakReferenceContext = new WeakReference<>(ctx.getApplicationContext());
+    }
   }
 
   public static Context getContext() {
-    if (mWeakReferenceContext == null) {
-      throw new IllegalArgumentException(ERROR_INIT);
+    if (mWeakReferenceContext != null && mWeakReferenceContext.get() != null) {
+      return mWeakReferenceContext.get();
     }
-    return mWeakReferenceContext.get().getApplicationContext();
+    return null;
   }
 }

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

@@ -3,44 +3,57 @@ package com.shakebug;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-
+import android.content.res.Resources;
 import java.util.List;
 
-/**
- * Author：J.Chou
- * Date：  2016.07.19 11:40.
- * Email： who_know_me@163.com
- * Describe:
- */
 public final class DeviceUtil {
 
   public static int getDeviceWidth() {
-    return BaseUtils.getContext().getResources().getDisplayMetrics().widthPixels;
+    try {
+      if (BaseUtils.getContext() != null) {
+        return BaseUtils.getContext().getResources().getDisplayMetrics().widthPixels;
+      }
+    } catch (Exception ignored) {}
+    return Resources.getSystem().getDisplayMetrics().widthPixels;
   }
 
-  public static int getDeviceHeight(){
-    return BaseUtils.getContext().getResources().getDisplayMetrics().heightPixels;
+  public static int getDeviceHeight() {
+    try {
+      if (BaseUtils.getContext() != null) {
+        return BaseUtils.getContext().getResources().getDisplayMetrics().heightPixels;
+      }
+    } catch (Exception ignored) {}
+    return Resources.getSystem().getDisplayMetrics().heightPixels;
   }
 
   public static boolean hasAppInstalled(String pkgName) {
     try {
-      BaseUtils.getContext().getPackageManager().getPackageInfo(pkgName, PackageManager.PERMISSION_GRANTED);
-      return true;
-    } catch (PackageManager.NameNotFoundException e) {
+      if (BaseUtils.getContext() != null) {
+        BaseUtils.getContext().getPackageManager().getPackageInfo(pkgName, PackageManager.PERMISSION_GRANTED);
+        return true;
+      }
+    } catch (Exception e) {
       return false;
     }
+    return false;
   }
 
   public static boolean isAppRunInBackground() {
-    ActivityManager activityManager = (ActivityManager) BaseUtils.getContext().getSystemService(Context.ACTIVITY_SERVICE);
-    List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
-    for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
-      if (appProcess.processName.equals(BaseUtils.getContext().getPackageName())) {
-        // return true -> Run in background
-        // return false - > Run in foreground
-        return appProcess.importance != ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+    try {
+      if (BaseUtils.getContext() != null) {
+        ActivityManager activityManager = (ActivityManager) BaseUtils.getContext().getSystemService(Context.ACTIVITY_SERVICE);
+        if (activityManager != null) {
+          List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
+          if (appProcesses != null) {
+            for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
+              if (appProcess.processName.equals(BaseUtils.getContext().getPackageName())) {
+                return appProcess.importance != ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+              }
+            }
+          }
+        }
       }
-    }
+    } catch (Exception ignored) {}
     return false;
   }
 }

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/ShakebugPackage.java

@@ -20,7 +20,7 @@ import java.util.Map;
 public class ShakebugPackage implements ReactPackage {
 
  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-
+      BaseUtils.init(reactContext);
       return Arrays.<NativeModule>asList(
         new ShakebugSensors(reactContext, "ShakebugSDKRNSensorsGyroscope", Sensor.TYPE_GYROSCOPE),
         new ShakebugSensors(reactContext, "ShakebugSDKRNSensorsAccelerometer", Sensor.TYPE_ACCELEROMETER),
@@ -38,9 +38,9 @@ public class ShakebugPackage implements ReactPackage {
         new RNLocalizeModule(reactContext),
         new SharedPreferencesModule(reactContext),
         new ShakebugSDKRNViewShotModule(reactContext),
-        // new VideoPlayerModule(reactContext),
+        new VideoPlayerModule(reactContext),
         new CreateThumbnailModule(reactContext),
-        // new VideoTrimModule(reactContext),
+        new VideoTrimModule(reactContext),
         new ScreenshotDetectorModule(reactContext)
       );
     }

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

@@ -1,17 +1,17 @@
 package com.shakebug;
 
+import android.content.res.Resources;
 import android.util.DisplayMetrics;
 
-/**
- * Created by choujason on 7/31/16.
- */
-
 public class UnitConverter {
 
-
-  public static DisplayMetrics getDisplayMetrics(){
-
-    return BaseUtils.getContext().getResources().getDisplayMetrics();
+  public static DisplayMetrics getDisplayMetrics() {
+    try {
+      if (BaseUtils.getContext() != null) {
+        return BaseUtils.getContext().getResources().getDisplayMetrics();
+      }
+    } catch (Exception ignored) {}
+    return Resources.getSystem().getDisplayMetrics();
   }
 
   public static float dpToPx(float dp) {

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

@@ -0,0 +1,81 @@
+package com.shakebug;
+
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.shakebug.interfaces.VideoPlayerListner;
+import com.shakebug.widgets.VideoPlayerView;
+
+import java.io.File;
+
+public class VideoPlayerModule extends ReactContextBaseJavaModule {
+    private final ReactApplicationContext reactContext;
+    private AlertDialog alertDialog;
+    private VideoPlayerView videoPlayerView;
+
+    public VideoPlayerModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "ShakebugSDKVideoPlayerModule";
+    }
+
+    @ReactMethod
+    public void playVideo(final String videoUri) {
+        final Activity currentActivity = getCurrentActivity();
+        if (currentActivity == null || currentActivity.isFinishing() || videoUri == null || videoUri.isEmpty()) {
+            return;
+        }
+
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Activity act = getCurrentActivity();
+                    if (act == null || act.isFinishing()) return;
+
+                    videoPlayerView = new VideoPlayerView(act);
+                    videoPlayerView.setOnTrimVideoListener(new VideoPlayerListner() {
+                        @Override
+                        public void onCancel() {
+                            try {
+                                if (alertDialog != null && alertDialog.isShowing()) {
+                                    alertDialog.dismiss();
+                                }
+                            } catch (Exception ignored) {}
+                        }
+                    });
+
+                    String cleanPath = videoUri.replace("file://", "");
+                    Uri uri = cleanPath.startsWith("/") ? Uri.fromFile(new File(cleanPath)) : Uri.parse(videoUri);
+                    videoPlayerView.initVideoByURI(uri);
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(act, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+                    builder.setCancelable(true);
+                    alertDialog = builder.create();
+                    alertDialog.setView(videoPlayerView);
+                    alertDialog.show();
+
+                    alertDialog.setOnDismissListener(dialog -> {
+                        if (videoPlayerView != null) {
+                            videoPlayerView.onDestroy();
+                            videoPlayerView = null;
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+}