react-native-video-trim 1.0.9 → 1.0.11

package/README.md

@@ -146,18 +146,38 @@ Main method to show Video Editor UI.
 - `config` (optional): 
 
   - `saveToPhoto` (optional, `default = true`): whether to save video to photo/gallery after editing
+  - `removeAfterSavedToPhoto` (optional, `default = false`): whether to remove output file from storage after saved to Photo
   - `maxDuration` (optional): maximum duration for the trimmed video
   - `cancelButtonText` (optional): text of left button in Editor dialog
   - `saveButtonText` (optional): text of right button in Editor dialog
-  - `title` (optional, iOS only): title of Editor dialog
+  -  `enableCancelDialog` (optional, `default = true`): whether to show alert dialog on press Cancel
+  -  `cancelDialogTitle` (optional, `default = "Warning!"`)
+  -  `cancelDialogMessage` (optional, `default = "Are you sure want to cancel?"`)
+  -  `cancelDialogCancelText` (optional, `default = "Close"`)
+  -  `cancelDialogConfirmText` (optional, `default = "Proceed"`)
+  -  `enableSaveDialog` (optional, `default = true`): whether to show alert dialog on press Save
+  -  `saveDialogTitle` (optional, `default = "Confirmation!"`)
+  -  `saveDialogMessage` (optional, `default = "Are you sure want to save?"`)
+  -  `saveDialogCancelText` (optional, `default = "Close"`)
+  -  `saveDialogConfirmText` (optional, `default = "Proceed"`)
+  -  `trimmingText` (optional, `default = "Trimming video..."`): trimming text on the progress dialog
 
 If `saveToPhoto = true`, you must ensure that you have request permission to write to photo/gallery
 - For Android: you need to have `<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />` in AndroidManifest.xml
 - For iOS: you need `NSPhotoLibraryUsageDescription` in Info.plist
 
-## isValidVideo (videoPath: string)
+## isValidVideo(videoPath: string)
 
-This method is to check if a path is a actual video. It returns `Promise<boolean>`
+This method is to check if a path is a actual video and editable. It returns `Promise<boolean>`
+
+## listFiles()
+Return array of generated output files in app storage. (`Promise<string[]>`)
+
+## cleanFiles()
+Clean all generated output files in app storage. Return number of successfully deleted files (`Promise<number>`)
+
+## deleteFile()
+Delete a file in app storage. Return `true` if success
 
 # Events
 To listen for events you interest, do the following:
@@ -177,7 +197,7 @@ useEffect(() => {
         break;
       }
       case 'onStartTrimming': {
-        // Android only: on start trimming
+        // on start trimming
         console.log('onStartTrimming', event);
         break;
       }
@@ -204,6 +224,19 @@ useEffect(() => {
   };
 }, []);
 ```
+# FFMPEG Version
+This library uses FFMPEG-Kit Android under the hood, by default FFMPEG-min is used, which gives smallest bundle size: https://github.com/arthenica/ffmpeg-kit#9-packages
+
+If you ever need to use other version of FFMPEG-Kit for Android, you can do the following, in your `android/build.gradle` > `buildscript` > `ext`:
 
+```gradle
+buildscript {
+    ext {
+        ffmpegKitPackage = "full" // default "min", if followed by lts then LTS version is use. Eg "full-lts"
+
+        ffmpegKitPackageVersion = "5.1.LTS" // use exact version, highest precedence, default 6.0-2 if ignored
+    }
+```
 # Thanks
-Android part is created by modified + fix bugs from  [original project](Android-Video-Trimmer)
+- Android part is created by modified + fix bugs from: https://github.com/iknow4/Android-Video-Trimmer
+- iOS UI is created from: https://github.com/AndreasVerhoeven/VideoTrimmerControl

package/android/src/main/java/com/videotrim/VideoTrimModule.java

@@ -44,11 +44,22 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   private AlertDialog alertDialog;
   private AlertDialog mProgressDialog;
   private ProgressBar mProgressBar;
-  private Boolean mSaveToPhoto = true;
   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";
+  private boolean enableSaveDialog = true;
+  private String saveDialogTitle = "Confirmation!";
+  private String saveDialogMessage = "Are you sure want to save?";
+  private String saveDialogCancelText = "Close";
+  private String saveDialogConfirmText  = "Proceed";
+  private String trimmingText = "Trimming video...";
+
   public VideoTrimModule(ReactApplicationContext reactContext) {
     super(reactContext);
   }
@@ -67,17 +78,26 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
       return;
     }
 
-    if (config.hasKey("saveToPhoto")) {
-      this.mSaveToPhoto = config.getBoolean("saveToPhoto");
-    }
-
-    if (!_isValidVideo(videoPath)) {
+    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";
+
+    enableSaveDialog = config.hasKey("enableSaveDialog") ? config.getBoolean("enableSaveDialog") : true;
+    saveDialogTitle = config.hasKey("saveDialogTitle") ? config.getString("saveDialogTitle") : "Confirmation!";
+    saveDialogMessage = config.hasKey("saveDialogMessage") ? config.getString("saveDialogMessage") : "Are you sure want to save?";
+    saveDialogCancelText = config.hasKey("saveDialogCancelText") ? config.getString("saveDialogCancelText") : "Close";
+    saveDialogConfirmText = config.hasKey("saveDialogConfirmText") ? config.getString("saveDialogConfirmText") : "Proceed";
+    trimmingText = config.hasKey("trimmingText") ? config.getString("trimmingText") : "Trimming video...";
+
     Activity activity = getReactApplicationContext().getCurrentActivity();
 
     if (!isInit) {
@@ -169,8 +189,47 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   }
 
   @Override public void onCancel() {
-    sendEvent(getReactApplicationContext(), "onCancelTrimming", null);
-    this.hideDialog();
+    if (!enableCancelDialog) {
+      sendEvent(getReactApplicationContext(), "onCancelTrimming", null);
+      hideDialog();
+      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(), "onCancelTrimming", null);
+      hideDialog();
+    });
+    builder.setNegativeButton(cancelDialogCancelText, (dialog, which) -> {
+      dialog.cancel();
+    });
+    AlertDialog alertDialog = builder.create();
+    alertDialog.show();
+  }
+
+  @Override public void onSave() {
+    if (!enableSaveDialog) {
+      trimmerView.onSaveClicked();
+      return;
+    }
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(getReactApplicationContext().getCurrentActivity());
+    builder.setMessage(saveDialogMessage);
+    builder.setTitle(saveDialogTitle);
+    builder.setCancelable(false);
+    builder.setPositiveButton(saveDialogConfirmText, (dialog, which) -> {
+      dialog.cancel();
+      trimmerView.onSaveClicked();
+    });
+    builder.setNegativeButton(saveDialogCancelText, (dialog, which) -> {
+      dialog.cancel();
+    });
+    AlertDialog alertDialog = builder.create();
+    alertDialog.show();
   }
 
   @ReactMethod
@@ -190,7 +249,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   }
 
   private void buildDialog() {
-    Activity activity =  getReactApplicationContext().getCurrentActivity();
+    Activity activity = getReactApplicationContext().getCurrentActivity();
     // Create the parent layout for the dialog
     LinearLayout layout = new LinearLayout(activity);
     layout.setLayoutParams(new ViewGroup.LayoutParams(
@@ -207,7 +266,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
       ViewGroup.LayoutParams.WRAP_CONTENT,
       ViewGroup.LayoutParams.WRAP_CONTENT
     ));
-    textView.setText(getReactApplicationContext().getResources().getString(R.string.trimming));
+    textView.setText(trimmingText);
     textView.setTextSize(18);
     layout.addView(textView);
 
@@ -253,7 +312,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   }
 
 
-  public boolean _isValidVideo(String filePath) {
+  public boolean isValidVideo(String filePath) {
     MediaMetadataRetriever retriever = new MediaMetadataRetriever();
 
     try {
@@ -269,7 +328,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
 
   @ReactMethod
   private void isValidVideo(String filePath, Promise promise) {
-    promise.resolve(_isValidVideo(filePath));
+    promise.resolve(isValidVideo(filePath));
   }
 
   @ReactMethod
@@ -286,4 +345,29 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     this.hideDialog();
     promise.resolve(null);
   }
+
+  @ReactMethod
+  private void listFiles(Promise promise) {
+    String[] files = StorageUtil.listFiles(getReactApplicationContext());
+    promise.resolve(Arguments.fromArray(files));
+  }
+
+  @ReactMethod
+  private void cleanFiles(Promise promise) {
+    String[] files = StorageUtil.listFiles(getReactApplicationContext());
+    int successCount = 0;
+    for (String file : files) {
+      boolean state = StorageUtil.deleteFile(file);
+      if (state) {
+        successCount++;
+      }
+    }
+    promise.resolve(successCount);
+  }
+
+  @ReactMethod
+  private void deleteFile(String filePath, Promise promise) {
+    boolean state = StorageUtil.deleteFile(filePath);
+    promise.resolve(state);
+  }
 }

package/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java

@@ -6,4 +6,5 @@ public interface VideoTrimListener {
   void onFinishTrim(String url);
   void onError();
   void onCancel();
+  void onSave();
 }

package/android/src/main/java/com/videotrim/utils/StorageUtil.java

@@ -1,6 +1,5 @@
 package com.videotrim.utils;
 
-import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.media.MediaScannerConnection;
@@ -9,7 +8,6 @@ import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
-import android.util.Log;
 import com.facebook.react.bridge.ReactApplicationContext;
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,163 +15,36 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Locale;
-
-import iknow.android.utils.BaseUtils;
-import iknow.android.utils.BuildConfig;
-
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings({ "ResultOfMethodCallIgnored", "FieldCanBeLocal" })
 public class StorageUtil {
-
-  private static final String TAG = "StorageUtil";
-  private static String APP_DATA_PATH = "/Android/data/" + BuildConfig.APPLICATION_ID;
-
-  private static String sDataDir;
-  private static String sCacheDir;
-
-  public static String getAppDataDir() {
-    if (TextUtils.isEmpty(sDataDir)) {
-      try {
-        if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-          sDataDir = Environment.getExternalStorageDirectory().getPath() + APP_DATA_PATH;
-          if (TextUtils.isEmpty(sDataDir)) {
-            sDataDir = BaseUtils.getContext().getFilesDir().getAbsolutePath();
-          }
-        } else {
-          sDataDir = BaseUtils.getContext().getFilesDir().getAbsolutePath();
-        }
-      } catch (Throwable e) {
-        e.printStackTrace();
-        sDataDir = BaseUtils.getContext().getFilesDir().getAbsolutePath();
-      }
-      File file = new File(sDataDir);
-      if (!file.exists()) {//判断文件目录是否存在
-        file.mkdirs();
-      }
-    }
-    return sDataDir;
-  }
-
-  public static String getCacheDir() {
-    if (TextUtils.isEmpty(sCacheDir)) {
-      File file = null;
-      Context context = BaseUtils.getContext();
-      try {
-        if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-          file = context.getExternalCacheDir();
-          if (file == null || !file.exists()) {
-            file = getExternalCacheDirManual(context);
-          }
-        }
-        if (file == null) {
-          file = context.getCacheDir();
-          if (file == null || !file.exists()) {
-            file = getCacheDirManual(context);
-          }
-        }
-        Log.w(TAG, "cache dir = " + file.getAbsolutePath());
-        sCacheDir = file.getAbsolutePath();
-      } catch (Throwable ignored) {
-      }
-    }
-    return sCacheDir;
-  }
-
-  private static File getExternalCacheDirManual(Context context) {
-    File dataDir = new File(new File(Environment.getExternalStorageDirectory(), "Android"), "data");
-    File appCacheDir = new File(new File(dataDir, context.getPackageName()), "cache");
-    if (!appCacheDir.exists()) {
-      if (!appCacheDir.mkdirs()) {//
-        Log.w(TAG, "Unable to create external cache directory");
-        return null;
-      }
-      try {
-        new File(appCacheDir, ".nomedia").createNewFile();
-      } catch (IOException e) {
-        Log.i(TAG, "Can't create \".nomedia\" file in application external cache directory");
-      }
-    }
-    return appCacheDir;
+  public static String getOutputPath(Context context) { // use same extension as inputFile
+    long timestamp = System.currentTimeMillis() / 1000;
+    File file = new File(context.getFilesDir(), VideoTrimmerUtil.FILE_PREFIX + "_" + timestamp + ".mp4"); // always use mp4 to prevent any issue with ffmpeg
+    return file.getAbsolutePath();
   }
 
-  @SuppressLint("SdCardPath")
-  private static File getCacheDirManual(Context context) {
-    String cacheDirPath = "/data/data/" + context.getPackageName() + "/cache";
-    return new File(cacheDirPath);
-  }
+  public static String[] listFiles(Context context) {
+    File filesDir = context.getFilesDir();
+    File[] files = filesDir.listFiles((dir, name) -> name.startsWith(VideoTrimmerUtil.FILE_PREFIX));
 
-  public static boolean delFiles(String path) {
-    File cacheFile = new File(path);
-    if (!cacheFile.exists()) {
-      return false;
-    }
-    File[] files = cacheFile.listFiles();
-    for (int i = 0; i < files.length; i++) {
-      // 是文件则直接删除
-      if (files[i].exists() && files[i].isFile()) {
-        files[i].delete();
-      } else if (files[i].exists() && files[i].isDirectory()) {
-        // 递归删除文件
-        delFiles(files[i].getAbsolutePath());
-        // 删除完目录下面的所有文件后再删除该文件夹
-        files[i].delete();
+    List<String> fileUrls = new ArrayList<>();
+    if (files != null) {
+      for (File file : files) {
+        fileUrls.add(file.getAbsolutePath());
       }
     }
 
-    return true;
-  }
-
-  public static long sizeOfDirectory(File dir) {
-    if (dir.exists()) {
-      long result = 0;
-      File[] fileList = dir.listFiles();
-      for (int i = 0; i < fileList.length; i++) {
-        // Recursive call if it's a directory
-        if (fileList[i].isDirectory()) {
-          result += sizeOfDirectory(fileList[i]);
-        } else {
-          // Sum the file size in bytes
-          result += fileList[i].length();
-        }
-      }
-      return result; // return the file size
-    }
-    return 0;
-  }
-
-  /**
-   * @param length 长度 byte为单位
-   *               将文件大小转换为KB,MB格式
-   */
-  public static String getFileSize(long length) {
-    int MB = 1024 * 1024;
-    if (length < MB) {
-      double resultKB = length * 1.0 / 1024;
-      return String.format(Locale.getDefault(), "%.1f", resultKB) + "Kb";
-    }
-    double resultMB = length * 1.0 / MB;
-    return String.format(Locale.getDefault(), "%.1f", resultMB) + "Mb";
-  }
-
-  public static boolean isFileExist(String path) {
-    if (TextUtils.isEmpty(path)) return false;
-    File file = new File(path);
-    return file.exists();
+    return fileUrls.toArray(new String[0]);
   }
 
-  /**
-   * @param path 路径
-   * @return 是否删除成功
-   */
   public static boolean deleteFile(String path) {
     if (TextUtils.isEmpty(path)) return true;
     return deleteFile(new File(path));
   }
 
-  /**
-   * @return 是否删除成功
-   */
   public static boolean deleteFile(File file) {
     if (file == null || !file.exists()) return true;
 

package/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.java

@@ -23,6 +23,7 @@ import iknow.android.utils.thread.BackgroundExecutor;
 public class VideoTrimmerUtil {
 
   private static final String TAG = VideoTrimmerUtil.class.getSimpleName();
+  public static final String FILE_PREFIX = "trimmedVideo";
   public static final long MIN_SHOOT_DURATION = 3000L;// min 3 seconds for trimming
 //  public static final int VIDEO_MAX_TIME = 10;// max 10 seconds for trimming
 //  public static final long MAX_SHOOT_DURATION = VIDEO_MAX_TIME * 1000L;
@@ -37,22 +38,13 @@ public class VideoTrimmerUtil {
   private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
 
   public static void trim(Context context, String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
-    final String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date());
-    final String outputName = "trimmedVideo_" + timeStamp + ".mp4";
-    outputFile = outputFile + "/" + outputName;
-
     String cmd = "-i " + inputFile + " -ss " + startMs + "ms" + " -to " + endMs + "ms -c copy " + outputFile;
-    final String tempOutFile = outputFile;
-
     callback.onStartTrim();
     FFmpegKit.executeAsync(cmd, session -> {
       SessionState state = session.getState();
-      ReturnCode returnCode = session.getReturnCode();
-
-      Log.d(TAG, String.format("FFmpeg process exited with state %s and rc %s.%s", state, returnCode, session.getFailStackTrace()));
 
       if (state.equals(SessionState.COMPLETED)) {
-        callback.onFinishTrim(tempOutFile);
+        callback.onFinishTrim(outputFile);
       } else {
         callback.onError();
       }

package/android/src/main/java/com/videotrim/widgets/VideoTrimmerView.java

@@ -165,10 +165,6 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       });
   }
 
-  private void onCancelClicked() {
-    mOnTrimVideoListener.onCancel();
-  }
-
   private void videoPrepared(MediaPlayer mp) {
     ViewGroup.LayoutParams lp = mVideoView.getLayoutParams();
     int videoWidth = mp.getVideoWidth();
@@ -245,36 +241,13 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
 
   private void setUpListeners() {
     findViewById(R.id.cancelBtn).setOnClickListener(view -> {
-      AlertDialog.Builder builder = new AlertDialog.Builder(mContext.getCurrentActivity());
-      builder.setMessage("Are you sure want to cancel?");
-      builder.setTitle("Warning!");
-      builder.setCancelable(false);
-      builder.setPositiveButton("Proceed", (dialog, which) -> {
-        dialog.cancel();
-        onCancelClicked();
-      });
-      builder.setNegativeButton("Close", (dialog, which) -> {
-        dialog.cancel();
-      });
-      AlertDialog alertDialog = builder.create();
-      alertDialog.show();
+      mOnTrimVideoListener.onCancel();
     });
 
     findViewById(R.id.saveBtn).setOnClickListener(view ->  {
-      AlertDialog.Builder builder = new AlertDialog.Builder(mContext.getCurrentActivity());
-      builder.setMessage("Are you sure want to save?");
-      builder.setTitle("Confirmation!");
-      builder.setCancelable(false);
-      builder.setPositiveButton("Proceed", (dialog, which) -> {
-        dialog.cancel();
-        onSaveClicked();
-      });
-      builder.setNegativeButton("Close", (dialog, which) -> {
-        dialog.cancel();
-      });
-      AlertDialog alertDialog = builder.create();
-      alertDialog.show();
+      mOnTrimVideoListener.onSave();
     });
+
     mVideoView.setOnPreparedListener(mp -> {
       // this is called everytime activity goes active, and can fire multiple times
       // so that we create a flag to not run below code more than once
@@ -293,14 +266,14 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
     });
   }
 
-  private void onSaveClicked() {
+  public void onSaveClicked() {
     if (mRightProgressPos - mLeftProgressPos < VideoTrimmerUtil.MIN_SHOOT_DURATION) {
       Toast.makeText(mContext, "Video shorter than 3s, can't proceed", Toast.LENGTH_SHORT).show();
     } else {
       mVideoView.pause();
       VideoTrimmerUtil.trim(mContext,
         mSourceUri.getPath(),
-        StorageUtil.getCacheDir(),
+        StorageUtil.getOutputPath(mContext),
         mDuration,
         mLeftProgressPos,
         mRightProgressPos,

package/android/src/main/res/values/strings.xml

@@ -3,7 +3,7 @@
   tools:ignore="MissingTranslation">
   <string name="app_name">Video Trim</string>
   <string name="trimmed_done">video trim completed！</string>
-  <string name="trimming">Trimming video...</string>
+<!--  <string name="trimming">Trimming video...</string>-->
   <string name="compressing">Compressing video...</string>
   <string name="compressed_done">video compression completed！</string>
   <string name="open_permission">Open permission</string>

package/ios/VideoTrim.mm

@@ -6,5 +6,10 @@
 RCT_EXTERN_METHOD(showEditor:(NSString*)uri withConfig:(NSDictionary *)config)
 RCT_EXTERN_METHOD(isValidVideo:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
-
+RCT_EXTERN_METHOD(listFiles:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(cleanFiles:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(deleteFile:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
 @end