react-native-video-trim 2.2.9 → 2.2.11

package/README.md

@@ -477,11 +477,18 @@ buildscript {
 ```
 
 # Naming conflict with `ffmpeg-kit-react-native`
-This issue is due to this package and `ffmpeg-kit-react-native` share FFMPEG Kit under the hood. To fix it we need to synchronize the FFMPEG Kit version of the 2 packages.
+This issue is due to this package and `ffmpeg-kit-react-native` have same ffmpegkit class name under the hood:
 
-First find out exactly FFMPEG Kit version that `ffmpeg-kit-react-native` is using. By default (if you don't change), the ffmpeg package is `https` ([check here](https://github.com/arthenica/ffmpeg-kit/blob/main/react-native/ffmpeg-kit-react-native.podspec#L19)) and version is `version` in [package.json](https://github.com/arthenica/ffmpeg-kit/blob/main/react-native/package.json#L3)
+<img src="images/error_conflict_name.png"/>
 
-When you know the package name + version, simply follow the section [Customize FFMPEG version](#customize-ffmpeg-version) in this doc
+To fix it we need to synchronize the FFMPEG Kit version of the 2 packages. For example: as shown in the image above, `ffmpeg-kit-react-native` uses `https`, version `6.0`, hence we need to run this:
+```
+FFMPEGKIT_PACKAGE=https FFMPEG_KIT_PACKAGE_VERSION=6.0 pod install
+```
+
+Another way to find out exactly FFMPEG Kit version that `ffmpeg-kit-react-native` using is to ([check here for package name](https://github.com/arthenica/ffmpeg-kit/blob/main/react-native/ffmpeg-kit-react-native.podspec#L19)) and package version is `version` in [package.json](https://github.com/arthenica/ffmpeg-kit/blob/main/react-native/package.json#L3)
+
+When you know the package name + version, simply run `pod install` with `FFMPEGKIT_PACKAGE` and `FFMPEG_KIT_PACKAGE_VERSION` like above
 
 # Thanks
 - Android part is created by modified + fix bugs from: https://github.com/iknow4/Android-Video-Trimmer

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

@@ -37,6 +37,7 @@ public class VideoTrimmerUtil {
 //  public static final int THUMB_WIDTH = (SCREEN_WIDTH_FULL - RECYCLER_VIEW_PADDING * 2) / VIDEO_MAX_TIME;
   public static int mThumbWidth = 0; // make it automatic
   public static final int THUMB_HEIGHT = UnitConverter.dpToPx(50); // x2 for better resolution
+  public static final int THUMB_WIDTH = UnitConverter.dpToPx(25); // x2 for better resolution
   private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
 
   public static FFmpegSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {

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

@@ -258,7 +258,9 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       Bitmap bitmap = mediaMetadataRetriever.getFrameAtTime(0, MediaMetadataRetriever.OPTION_CLOSEST_SYNC);
 
       if (bitmap != null) {
-        VideoTrimmerUtil.mThumbWidth = VideoTrimmerUtil.THUMB_HEIGHT * bitmap.getWidth() / bitmap.getHeight();
+        int bitmapHeight = bitmap.getHeight() > 0 ? bitmap.getHeight() : VideoTrimmerUtil.THUMB_HEIGHT;
+        int bitmapWidth = bitmap.getWidth() > 0 ? bitmap.getWidth() : VideoTrimmerUtil.THUMB_WIDTH;
+        VideoTrimmerUtil.mThumbWidth = VideoTrimmerUtil.THUMB_HEIGHT * bitmapWidth / bitmapHeight;
       }
 
       VideoTrimmerUtil.SCREEN_WIDTH_FULL = this.getScreenWidthInPortraitMode();
@@ -640,6 +642,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
 
   private void setHandleTouchListener(View handle, boolean isLeading) {
     handle.setOnTouchListener((view, event) -> {
+      boolean draggingDisabled = mDuration < mMinDuration; // if the video is shorter than the minimum duration, disable dragging
       switch (event.getAction()) {
         case MotionEvent.ACTION_DOWN:
           currentSelectedhandle = handle;
@@ -650,6 +653,10 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
           playHapticFeedback(true);
           break;
         case MotionEvent.ACTION_MOVE:
+          if (draggingDisabled) {
+            return false;
+          }
+
           boolean didClamp = false;
           float newX = event.getRawX() - ((float) view.getWidth() / 2);
           if (isLeading) {

package/package.json

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