shakebug-react-native 2.1.0 → 2.2.1

package/src/Screens/TrimVideoScreen.js

@@ -1,6 +1,6 @@
-import { NativeEventEmitter, NativeModules, SafeAreaView, StatusBar } from 'react-native'
+import { NativeEventEmitter, NativeModules, Platform, SafeAreaView, StatusBar } from 'react-native'
 import React, { useEffect, useState } from 'react'
-import { showEditor } from '../../trimVideo/src/index';
+import { showEditor } from 'react-native-video-trim';
 import { useNavigation } from '../Componanats/NavigationContext';
 import { Localization } from '../Componanats/localization';
 
@@ -12,10 +12,15 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
 
   const { goToScreenAtIndex, navigate, goBack } = useNavigation();
 
+
   // For display video trimmer
   useEffect(() => {
     StatusBar.setHidden(true)
-    showEditor(video, {
+
+    const uri = video; // your path
+    const trimmedUri = uri.replace('file://', '');
+
+    showEditor(Platform.OS == 'android' ? trimmedUri : video, {
       saveButtonText: Localization[global.ShakebugLanguage].Choose,
       cancelButtonText: Localization[global.ShakebugLanguage].Cancel,
       trimmingText: Localization[global.ShakebugLanguage].TrimmingText,
@@ -32,8 +37,9 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
       saveDialogCancelText: Localization[global.ShakebugLanguage].No,
       saveDialogConfirmText: Localization[global.ShakebugLanguage].Yes
     });
-    const eventEmitter = new NativeEventEmitter(NativeModules.ShakebugSDKVideoTrim);
-    const subscription = eventEmitter.addListener('ShakebugSDKVideoTrim', (event) => {
+
+    const eventEmitter = new NativeEventEmitter(NativeModules.VideoTrim);
+    const subscription = eventEmitter.addListener('VideoTrim', (event) => {
       switch (event.name) {
         case 'onShow': {
           break;
@@ -50,7 +56,7 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
           navigate("AddDetailsScreen", { media: `${event.outputPath}`, mediaType: 'video', themeColor: themeColor, SDKScreenTitle: SDKScreenTitle, updateParent: updateParent });
           return;
         }
-        case 'onCancelTrimming': {
+        case 'onCancel': {
           UpdateStatusBar()
           if (Type == "video") {
             goToScreenAtIndex(1)
@@ -62,7 +68,7 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
             goToScreenAtIndex(3)
           }
           return;
-          // break;
+          break;
         }
         case 'onError': {
           break;

package/src/index.tsx

@@ -4,6 +4,7 @@ import { NavigationContainer, findFocusedRoute } from '@react-navigation/native'
 import { getLocales } from '../GetLocals/src';
 import { NativeModules, Text, View, findNodeHandle } from 'react-native';
 import { useGlobalState } from './Componanats/GlobalStateContext'
+import { CustomUserIdApi } from './APIs/CustomUserId'
 
 let Languages = ['ENGLISH', 'HINDI', 'GUJARATI', 'ARABIC', 'CHINESE', 'DUTCH', 'FRENCH', 'GERMAN', 'GREEK', 'INDONESIAN', 'ITALIAN', 'JAPANESE', 'KOREAN', 'RUSSIAN', 'SPANISH', 'TURKISH', 'UKRAINIAN', 'MARATHI', 'TAMIL', 'TELUGU']
 let LanguageCodes = ['en', 'hi', 'gu', 'ar', 'zh', 'nl', 'fr', 'de', 'el', 'id', 'it', 'ja', 'ko', 'ru', 'es', 'tr', 'uk', 'mr', 'ta', 'te']
@@ -41,7 +42,7 @@ const ShakebugView: React.FC<ShakebugViewProps> = ({
   allowCrashReport = true,
   makeLogEnabled = false,
   ShakebugLanguage = LocalLanguage != -1 ? Languages[LocalLanguage] : "ENGLISH",
-  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.3/webservice.php/", "MarchShake2022", ""]
+  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.4/webservice.php/", "MarchShake2022", ""]
 }) => {
 
   return (
@@ -76,7 +77,6 @@ export const triggerBugReporting = (): void => {
   global.isTrigger = true;
 }
 
-
 export const ShakebugSdkProtectedView = ({ children }) => {
 
   const { isRecordingStart, isScreenShot } = useGlobalState();
@@ -115,3 +115,7 @@ export const ShakebugSdkProtectedView = ({ children }) => {
 export const IsShakebugSDKOpen = () => {
   return global.isShakebugSDKOpen;
 }
+
+export const addCustomUser = (id, name, email, country, other, applicationsid) => {
+  CustomUserIdApi(id, name, email, country, other, applicationsid)
+}

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

@@ -1,196 +0,0 @@
-
-package com.shakebug;
-
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import android.util.DisplayMetrics;
-import android.util.Log;
-
-import com.facebook.react.bridge.GuardedAsyncTask;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.UIManagerModule;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-import com.shakebug.ViewShot.Formats;
-import com.shakebug.ViewShot.Results;
-
-public class ShakebugSDKScreenShotModule extends ReactContextBaseJavaModule {
-
-    public static final String RNVIEW_SHOT = "ShakebugSDKRNViewShot";
-
-    private final ReactApplicationContext reactContext;
-
-    private final Executor executor = Executors.newCachedThreadPool();
-
-    public ShakebugSDKScreenShotModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
-
-    @Override
-    public String getName() {
-        return RNVIEW_SHOT;
-    }
-
-    @Override
-    public Map<String, Object> getConstants() {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void onCatalystInstanceDestroy() {
-        super.onCatalystInstanceDestroy();
-        new CleanTask(getReactApplicationContext()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
-    @ReactMethod
-    public void releaseCapture(String uri) {
-        final String path = Uri.parse(uri).getPath();
-        if (path == null) return;
-        File file = new File(path);
-        if (!file.exists()) return;
-        File parent = file.getParentFile();
-        if (parent.equals(reactContext.getExternalCacheDir()) || parent.equals(reactContext.getCacheDir())) {
-            file.delete();
-        }
-    }
-
-    @ReactMethod
-    public void captureRef(int tag, ReadableMap options, Promise promise) {
-        final ReactApplicationContext context = getReactApplicationContext();
-        final DisplayMetrics dm = context.getResources().getDisplayMetrics();
-
-        final String extension = options.getString("format");
-        final int imageFormat = "jpg".equals(extension)
-                ? Formats.JPEG
-                : "webm".equals(extension)
-                ? Formats.WEBP
-                : "raw".equals(extension)
-                ? Formats.RAW
-                : Formats.PNG;
-
-        final double quality = options.getDouble("quality");
-        final Integer scaleWidth = options.hasKey("width") ? options.getInt("width") : null;
-        final Integer scaleHeight = options.hasKey("height") ? options.getInt("height") : null;
-        final String resultStreamFormat = options.getString("result");
-        final String fileName = options.hasKey("fileName") ? options.getString("fileName") : null;
-        final Boolean snapshotContentContainer = options.getBoolean("snapshotContentContainer");
-        final boolean handleGLSurfaceView = options.hasKey("handleGLSurfaceViewOnAndroid") && options.getBoolean("handleGLSurfaceViewOnAndroid");
-
-        try {
-            File outputFile = null;
-            if (Results.TEMP_FILE.equals(resultStreamFormat)) {
-                outputFile = createTempFile(getReactApplicationContext(), extension, fileName);
-            }
-
-            final Activity activity = getCurrentActivity();
-            final UIManagerModule uiManager = this.reactContext.getNativeModule(UIManagerModule.class);
-
-            uiManager.addUIBlock(new ViewShot(
-                    tag, extension, imageFormat, quality,
-                    scaleWidth, scaleHeight, outputFile, resultStreamFormat,
-                    snapshotContentContainer, reactContext, activity, handleGLSurfaceView, promise, executor)
-            );
-        } catch (final Throwable ex) {
-            Log.e(RNVIEW_SHOT, "Failed to snapshot view tag " + tag, ex);
-            promise.reject(ViewShot.ERROR_UNABLE_TO_SNAPSHOT, "Failed to snapshot view tag " + tag);
-        }
-    }
-
-    @ReactMethod
-    public void captureScreen(ReadableMap options, Promise promise) {
-        captureRef(-1, options, promise);
-    }
-
-    private static final String TEMP_FILE_PREFIX = "ReactNative-snapshot-image";
-
-    /**
-     * Asynchronous task that cleans up cache dirs (internal and, if available, external) of cropped
-     * image files. This is run when the catalyst instance is being destroyed (i.e. app is shutting
-     * down) and when the module is instantiated, to handle the case where the app crashed.
-     */
-    private static class CleanTask extends GuardedAsyncTask<Void, Void> implements FilenameFilter {
-        private final File cacheDir;
-        private final File externalCacheDir;
-
-        private CleanTask(ReactContext context) {
-            super(context);
-
-            cacheDir = context.getCacheDir();
-            externalCacheDir = context.getExternalCacheDir();
-        }
-
-        @Override
-        protected void doInBackgroundGuarded(Void... params) {
-            if (null != cacheDir) {
-                cleanDirectory(cacheDir);
-            }
-
-            if (externalCacheDir != null) {
-                cleanDirectory(externalCacheDir);
-            }
-        }
-
-        @Override
-        public final boolean accept(File dir, String filename) {
-            return filename.startsWith(TEMP_FILE_PREFIX);
-        }
-
-        private void cleanDirectory(@NonNull final File directory) {
-            final File[] toDelete = directory.listFiles(this);
-
-            if (toDelete != null) {
-                for (File file : toDelete) {
-                    if (file.delete()) {
-                        Log.d(RNVIEW_SHOT, "deleted file: " + file.getAbsolutePath());
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Create a temporary file in the cache directory on either internal or external storage,
-     * whichever is available and has more free space.
-     */
-    @NonNull
-    private File createTempFile(@NonNull final Context context, @NonNull final String ext, String fileName) throws IOException {
-        final File externalCacheDir = context.getExternalCacheDir();
-        final File internalCacheDir = context.getCacheDir();
-        final File cacheDir;
-
-        if (externalCacheDir == null && internalCacheDir == null) {
-            throw new IOException("No cache directory available");
-        }
-
-        if (externalCacheDir == null) {
-            cacheDir = internalCacheDir;
-        } else if (internalCacheDir == null) {
-            cacheDir = externalCacheDir;
-        } else {
-            cacheDir = externalCacheDir.getFreeSpace() > internalCacheDir.getFreeSpace() ?
-                    externalCacheDir : internalCacheDir;
-        }
-
-        final String suffix = "." + ext;
-        if (fileName != null) {
-            return File.createTempFile(fileName, suffix, cacheDir);
-        }
-        return File.createTempFile(TEMP_FILE_PREFIX, suffix, cacheDir);
-    }
-}

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

@@ -1,199 +0,0 @@
-package com.shakebug;
-
-import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
-
-import android.app.Activity;
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.widget.ProgressBar;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.shakebug.interfaces.VideoPlayerListner;
-import com.shakebug.widgets.VideoPlayerView;
-
-public class VideoPlayerModule extends ReactContextBaseJavaModule implements VideoPlayerListner, LifecycleEventListener {
-
-
-    private static final String MODULE_NAME = "ShakebugSDKVideoPlayerModule";
-    private static Boolean isInit = false;
-    private VideoPlayerView trimmerView;
-    private AlertDialog alertDialog;
-    private AlertDialog mProgressDialog;
-    private ProgressBar mProgressBar;
-    private int listenerCount = 0;
-
-    private Promise showEditorPromise;
-
-    private boolean enableCancelDialog = true;
-    private String cancelDialogTitle = "Warning!";
-    private String cancelDialogMessage = "Are you sure want to cancel?";
-    private String cancelDialogCancelText = "Close";
-    private String cancelDialogConfirmText = "Proceed";
-//    Activity activity = getReactApplicationContext().getCurrentActivity();
-
-    public VideoPlayerModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Override
-    @NonNull
-    public String getName() {
-        return MODULE_NAME;
-    }
-
-
-
-
-
-//    From Trimmer
-
-    @ReactMethod
-    public void showEditor(String videoPath, ReadableMap config) {
-//        if (trimmerView != null || alertDialog != null) {
-//            return;
-//        }
-
-
-        if (!isValidVideo(videoPath)) {
-            WritableMap map = Arguments.createMap();
-            map.putString("message", "File is not a valid video");
-            sendEvent(getReactApplicationContext(), "onError", map);
-            return;
-        }
-
-        enableCancelDialog = config.hasKey("enableCancelDialog") ? config.getBoolean("enableCancelDialog") : true;
-        cancelDialogTitle = config.hasKey("cancelDialogTitle") ? config.getString("cancelDialogTitle") : "Warning!";
-        cancelDialogMessage = config.hasKey("cancelDialogMessage") ? config.getString("cancelDialogMessage") : "Are you sure want to cancel?";
-        cancelDialogCancelText = config.hasKey("cancelDialogCancelText") ? config.getString("cancelDialogCancelText") : "Close";
-        cancelDialogConfirmText = config.hasKey("cancelDialogConfirmText") ? config.getString("cancelDialogConfirmText") : "Proceed";
-
-
-        Activity activity = getReactApplicationContext().getCurrentActivity();
-
-        if (!isInit) {
-            init(activity);
-            isInit = true;
-        }
-
-        // here is NOT main thread, we need to create VideoTrimmerView on UI thread, so that later we can update it using same thread
-
-        runOnUiThread(() -> {
-            trimmerView = new VideoPlayerView(getReactApplicationContext(), config, null);
-            trimmerView.setOnTrimVideoListener(this);
-            trimmerView.initVideoByURI(Uri.parse(videoPath));
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
-            builder.setCancelable(false);
-            alertDialog = builder.create();
-            alertDialog.setView(trimmerView);
-            alertDialog.show();
-
-            // this is to ensure to release resource if dialog is dismissed in unexpected way (Eg. open control/notification center by dragging from top of screen)
-            alertDialog.setOnDismissListener(dialog -> {
-                // This is called in same thread as the trimmer view -> UI thread
-                if (trimmerView != null) {
-                    trimmerView.onDestroy();
-                    trimmerView = null;
-                }
-                sendEvent(getReactApplicationContext(), "onHide", null);
-            });
-            sendEvent(getReactApplicationContext(), "onShow", null);
-        });
-    }
-
-    private void init(Activity activity) {
-        isInit = true;
-        // we have to init this before create videoTrimmerView
-        BaseUtils.init(getReactApplicationContext());
-    }
-
-    @Override
-    public void onHostResume() {
-
-    }
-
-    @Override
-    public void onHostPause() {
-
-    }
-
-    @Override
-    public void onHostDestroy() {
-
-    }
-
-
-    @Override public void onCancel() {
-        if (!enableCancelDialog) {
-            alertDialog.dismiss(); // Dismiss the alertDialog when the close button is clicked
-            trimmerView.onDestroy(); // Clean up the trimmerView
-            trimmerView = null;
-            sendEvent(getReactApplicationContext(), "onCancelPlayer", null);
-            return;
-        }
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getReactApplicationContext().getCurrentActivity());
-        builder.setMessage(cancelDialogMessage);
-        builder.setTitle(cancelDialogTitle);
-        builder.setCancelable(false);
-        builder.setPositiveButton(cancelDialogConfirmText, (dialog, which) -> {
-            dialog.cancel();
-            sendEvent(getReactApplicationContext(), "onCancelPlayer", null);
-        });
-        builder.setNegativeButton(cancelDialogCancelText, (dialog, which) -> {
-            dialog.cancel();
-        });
-        AlertDialog alertDialog = builder.create();
-        alertDialog.show();
-    }
-
-    @ReactMethod
-    public void addListener(String eventName) {
-        // This method is required by React
-        listenerCount += 1;
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // This method is required by React
-        listenerCount -= count;
-    }
-
-    private void sendEvent(ReactContext reactContext, String eventName, @Nullable WritableMap params) {
-        if (listenerCount > 0) {
-            WritableMap map = params != null ? params : Arguments.createMap();
-            map.putString("name", eventName);
-            reactContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                    .emit("ShakebugSDKVideoPlayer", map);
-        }
-    }
-
-
-    public boolean isValidVideo(String filePath) {
-        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-
-        try {
-            retriever.setDataSource(getReactApplicationContext(), Uri.parse(filePath));
-        } catch (Exception e){
-            e.printStackTrace();
-            return false;
-        }
-
-        String hasVideo = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO);
-        return "yes".equals(hasVideo);
-    }
-}