react-native-video-trim 2.2.2 → 2.2.4

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

@@ -260,14 +260,6 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     sendEvent(getReactApplicationContext(), "onLoad", map);
   }
 
-  @Override
-  public void onStartTrim() {
-    sendEvent(getReactApplicationContext(), "onStartTrimming", null);
-    runOnUiThread(() -> {
-      buildDialog();
-    });
-  }
-
   @Override
   public void onTrimmingProgress(int percentage) {
     // prevent onTrimmingProgress is called after onFinishTrim (some rare cases)
@@ -361,7 +353,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   @Override
   public void onSave() {
     if (!enableSaveDialog) {
-      trimmerView.onSaveClicked();
+      startTrim();
       return;
     }
 
@@ -371,7 +363,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     builder.setCancelable(false);
     builder.setPositiveButton(saveDialogConfirmText, (dialog, which) -> {
       dialog.cancel();
-      trimmerView.onSaveClicked();
+      startTrim();
     });
     builder.setNegativeButton(saveDialogCancelText, (dialog, which) -> {
       dialog.cancel();
@@ -390,32 +382,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     sendEvent(getReactApplicationContext(), "onStatistics", statistics);
   }
 
-  private void hideDialog(boolean shouldCloseEditor) {
-    // handle the case when the cancel dialog is still showing but the trimming is finished
-    if (cancelTrimmingConfirmDialog != null) {
-      if (cancelTrimmingConfirmDialog.isShowing()) {
-        cancelTrimmingConfirmDialog.dismiss();
-      }
-      cancelTrimmingConfirmDialog = null;
-    }
-
-    if (mProgressDialog != null) {
-      if (mProgressDialog.isShowing()) mProgressDialog.dismiss();
-      mProgressBar = null;
-      mProgressDialog = null;
-    }
-
-    if (shouldCloseEditor) {
-      if (alertDialog != null) {
-        if (alertDialog.isShowing()) {
-          alertDialog.dismiss();
-        }
-        alertDialog = null;
-      }
-    }
-  }
-
-  private void buildDialog() {
+  private void startTrim() {
     Activity activity = getReactApplicationContext().getCurrentActivity();
     // Create the parent layout for the dialog
     LinearLayout layout = new LinearLayout(activity);
@@ -469,10 +436,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
           builder.setTitle(cancelTrimmingDialogTitle);
           builder.setCancelable(false);
           builder.setPositiveButton(cancelTrimmingDialogConfirmText, (dialog, which) -> {
-            if (trimmerView != null) {
-              // prevent trimmerView is null in some rare cases
-              trimmerView.onCancelTrimClicked();
-            }
+            trimmerView.onCancelTrimClicked();
 
             if (mProgressDialog != null && mProgressDialog.isShowing()) {
               mProgressDialog.dismiss();
@@ -484,10 +448,7 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
           cancelTrimmingConfirmDialog = builder.create();
           cancelTrimmingConfirmDialog.show();
         } else {
-          if (trimmerView != null) {
-            // prevent trimmerView is null in some rare cases
-            trimmerView.onCancelTrimClicked();
-          }
+          trimmerView.onCancelTrimClicked();
 
           if (mProgressDialog != null && mProgressDialog.isShowing()) {
             mProgressDialog.dismiss();
@@ -504,9 +465,40 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
 
     // Show the dialog
     mProgressDialog = builder.create();
+
+    mProgressDialog.setOnShowListener(dialog -> {
+      sendEvent(getReactApplicationContext(), "onStartTrimming", null);
+      trimmerView.onSaveClicked();
+    });
+
     mProgressDialog.show();
   }
 
+  private void hideDialog(boolean shouldCloseEditor) {
+    // handle the case when the cancel dialog is still showing but the trimming is finished
+    if (cancelTrimmingConfirmDialog != null) {
+      if (cancelTrimmingConfirmDialog.isShowing()) {
+        cancelTrimmingConfirmDialog.dismiss();
+      }
+      cancelTrimmingConfirmDialog = null;
+    }
+
+    if (mProgressDialog != null) {
+      if (mProgressDialog.isShowing()) mProgressDialog.dismiss();
+      mProgressBar = null;
+      mProgressDialog = null;
+    }
+
+    if (shouldCloseEditor) {
+      if (alertDialog != null) {
+        if (alertDialog.isShowing()) {
+          alertDialog.dismiss();
+        }
+        alertDialog = null;
+      }
+    }
+  }
+
   @ReactMethod
   public void addListener(String eventName) {
     // This method is required by React

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

@@ -5,7 +5,6 @@ import com.videotrim.enums.ErrorCode;
 
 public interface VideoTrimListener {
   void onLoad(int duration);
-  void onStartTrim();
   void onTrimmingProgress(int percentage);
   void onFinishTrim(String url, long startMs, long endMs, int videoDuration);
   void onCancelTrim();

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

@@ -52,8 +52,6 @@ public class VideoTrimmerUtil {
     // Format the current date and time
     String formattedDateTime = dateFormat.format(currentDate);
 
-    callback.onStartTrim();
-
     String[] cmds = {
       "-ss",
       startMs + "ms",

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

@@ -56,6 +56,9 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
 
   private ReactApplicationContext mContext;
   private VideoView mVideoView;
+  // https://stackoverflow.com/a/73361868/7569705
+  // the videoPlayer is to solve the issue after manually seek -> hit play -> it starts from a position slightly before with the one we just sought to
+  private MediaPlayer videoPlayer;
   private ImageView mPlayView;
   private LinearLayout mThumbnailContainer;
   private Uri mSourceUri;
@@ -110,6 +113,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   private String alertOnFailTitle = "Error";
   private String alertOnFailMessage = "Fail to load media. Possibly invalid file or no network connection";
   private String alertOnFailCloseText = "Close";
+  private View currentSelectedhandle;
 
   public VideoTrimmerView(ReactApplicationContext context, ReadableMap config, AttributeSet attrs) {
     this(context, attrs, 0, config);
@@ -172,6 +176,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       mVideoView.setOnPreparedListener(mp -> {
         mp.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
         mediaPrepared();
+        videoPlayer = mp;
       });
 
       mVideoView.setOnErrorListener(this::onFailToLoadMedia);
@@ -403,7 +408,11 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
 
   private void seekTo(long msec, boolean needUpdateProgress) {
     if (isVideoType) {
-      mVideoView.seekTo((int) msec);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        videoPlayer.seekTo((int) msec, MediaPlayer.SEEK_CLOSEST);
+      } else {
+        mVideoView.seekTo((int) msec);
+      }
     } else {
       audioPlayer.seekTo((int) msec);
     }
@@ -568,6 +577,8 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       currentPosition = duration;
     } else if (currentPosition >= endTime - 100) {
       currentPosition = (int) endTime;
+    } else if (currentPosition <= startTime + 100) {
+      currentPosition = (int) startTime;
     }
 
     String currentTime = formatTime(currentPosition);
@@ -583,9 +594,13 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       // Update progressIndicator position
       float indicatorPosition = (float) currentPosition / duration * (trimmerContainerBg.getWidth() - progressIndicator.getWidth()) + leadingHandle.getWidth();
 
-      float rightBoundary = trimmerContainer.getX() + trimmerContainer.getWidth() - progressIndicator.getWidth();
-
-      progressIndicator.setX(Math.min(rightBoundary, indicatorPosition));
+      if (currentSelectedhandle == leadingHandle) {
+        float leftBoundary = trimmerContainer.getX();
+        progressIndicator.setX(Math.max(leftBoundary, indicatorPosition));
+      } else {
+        float rightBoundary = trimmerContainer.getX() + trimmerContainer.getWidth() - progressIndicator.getWidth();
+        progressIndicator.setX(Math.min(rightBoundary, indicatorPosition));
+      }
     }
   }
 
@@ -655,6 +670,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
     handle.setOnTouchListener((view, event) -> {
       switch (event.getAction()) {
         case MotionEvent.ACTION_DOWN:
+          currentSelectedhandle = handle;
           didClampWhilePanning = false;
           onMediaPause();
           fadeOutProgressIndicator();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",