react-native-video-trim 5.0.1 → 5.0.3

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

@@ -1,8 +1,10 @@
 package com.videotrim.utils;
 
 import android.media.MediaMetadataRetriever;
+import android.net.Uri;
 import android.util.Log;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 
@@ -17,7 +19,22 @@ public class MediaMetadataUtil {
       if (source.startsWith("http://") || source.startsWith("https://")) {
         retriever.setDataSource(source, new HashMap<>());
       } else {
-        retriever.setDataSource(source);
+        String filePath = source;
+
+        // if "source" is not a valid file path, try to parse it as a URI
+        if (!StorageUtil.isFileExists(filePath)) {
+          Log.e(TAG, "File does not exist, trying to parse as URI: " + source);
+
+          Uri uri = Uri.parse(source);
+          filePath = uri.getPath();
+
+          if (!StorageUtil.isFileExists(filePath)) {
+            Log.e(TAG, "File does not exist at path: " + filePath);
+            return null;
+          }
+        }
+
+        retriever.setDataSource(filePath);
       }
       return retriever;
     } catch (Exception e) {

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

@@ -27,6 +27,12 @@ public class StorageUtil {
     return file.getAbsolutePath();
   }
 
+  public static boolean isFileExists(String filePath) {
+    if (TextUtils.isEmpty(filePath)) return false;
+    File file = new File(filePath);
+    return file.exists();
+  }
+
   public static String[] listFiles(Context context) {
     File filesDir = context.getFilesDir();
     File[] files = filesDir.listFiles((dir, name) -> name.startsWith(VideoTrimmerUtil.FILE_PREFIX));

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

@@ -270,7 +270,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
 
       VideoTrimmerUtil.SCREEN_WIDTH_FULL = this.getScreenWidthInPortraitMode();
       VideoTrimmerUtil.VIDEO_FRAMES_WIDTH = VideoTrimmerUtil.SCREEN_WIDTH_FULL - RECYCLER_VIEW_PADDING * 2;
-      VideoTrimmerUtil.MAX_COUNT_RANGE = Math.max((VIDEO_FRAMES_WIDTH / VideoTrimmerUtil.mThumbWidth), VideoTrimmerUtil.MAX_COUNT_RANGE);
+      VideoTrimmerUtil.MAX_COUNT_RANGE = VideoTrimmerUtil.mThumbWidth != 0 ? Math.max((VIDEO_FRAMES_WIDTH / VideoTrimmerUtil.mThumbWidth), VideoTrimmerUtil.MAX_COUNT_RANGE) : VideoTrimmerUtil.MAX_COUNT_RANGE;
 
       startShootVideoThumbs(mContext, VideoTrimmerUtil.MAX_COUNT_RANGE, 0, mDuration);
     }

package/ios/ProgressAlertController.h

@@ -3,12 +3,9 @@
 @interface ProgressAlertController : UIViewController
 
 @property (nonatomic, copy) void (^onDismiss)(void);
-@property (nonatomic, strong) UILabel *titleLabel;
-@property (nonatomic, strong) UIProgressView *progressBar;
-@property (nonatomic, strong) UIButton *actionButton;
 
-- (void)setTitle:(NSString *)title;
-- (void)setCancelTitle:(NSString *)title;
+- (void)setTitle:(NSString *)text;
+- (void)setCancelTitle:(NSString *)text;
 - (void)setProgress:(float)progress;
 - (void)showCancelBtn;
 

package/ios/ProgressAlertController.mm

@@ -1,7 +1,25 @@
 #import "ProgressAlertController.h"
 
+@interface ProgressAlertController ()
+
+@property (nonatomic, strong) UILabel *titleLabel;
+@property (nonatomic, strong) UIProgressView *progressBar;
+@property (nonatomic, strong) UIButton *actionButton;
+
+@end
+
 @implementation ProgressAlertController
 
+- (instancetype)init {
+    // init early because in VideoTrim.mm we call this before presenting the view controller (before viewDidLoad)
+    if (self = [super init]) {
+        self.titleLabel = [[UILabel alloc] init];
+        self.progressBar = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
+        self.actionButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    }
+    return self;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setupBackground];
@@ -14,26 +32,32 @@
 
 - (void)setupAlertView {
     UIView *alertView = [[UIView alloc] init];
-    alertView.backgroundColor = [UIColor colorWithRed:28/255.0 green:28/255.0 blue:30/255.0 alpha:1.0];
+    alertView.backgroundColor = [UIColor colorWithRed:28.0/255.0 green:28.0/255.0 blue:30.0/255.0 alpha:1.0];
     alertView.layer.cornerRadius = 12;
     alertView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.view addSubview:alertView];
+    
+    // AlertView Constraints
     [NSLayoutConstraint activateConstraints:@[
         [alertView.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
         [alertView.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor],
         [alertView.widthAnchor constraintEqualToConstant:270]
     ]];
-    self.titleLabel = [[UILabel alloc] init];
+    
+    // Title Label
     self.titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
     self.titleLabel.textAlignment = NSTextAlignmentCenter;
     self.titleLabel.font = [UIFont systemFontOfSize:18];
     self.titleLabel.numberOfLines = 0;
     self.titleLabel.textColor = [UIColor whiteColor];
     [alertView addSubview:self.titleLabel];
-    self.progressBar = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
+    
+    // Progress Bar
     self.progressBar.translatesAutoresizingMaskIntoConstraints = NO;
     [alertView addSubview:self.progressBar];
-    self.actionButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    
+    // Action Button
+    
     [self.actionButton setTitle:@"Cancel" forState:UIControlStateNormal];
     [self.actionButton setTitleColor:[UIColor systemPinkColor] forState:UIControlStateNormal];
     self.actionButton.titleLabel.font = [UIFont systemFontOfSize:16];
@@ -41,13 +65,17 @@
     self.actionButton.translatesAutoresizingMaskIntoConstraints = NO;
     self.actionButton.hidden = YES;
     [alertView addSubview:self.actionButton];
+    
+    // Constraints for titleLabel, progressBar, and actionButton
     [NSLayoutConstraint activateConstraints:@[
         [self.titleLabel.topAnchor constraintEqualToAnchor:alertView.topAnchor constant:16],
         [self.titleLabel.leadingAnchor constraintEqualToAnchor:alertView.leadingAnchor constant:16],
         [self.titleLabel.trailingAnchor constraintEqualToAnchor:alertView.trailingAnchor constant:-16],
+        
         [self.progressBar.topAnchor constraintEqualToAnchor:self.titleLabel.bottomAnchor constant:16],
         [self.progressBar.leadingAnchor constraintEqualToAnchor:alertView.leadingAnchor constant:16],
         [self.progressBar.trailingAnchor constraintEqualToAnchor:alertView.trailingAnchor constant:-16],
+        
         [self.actionButton.topAnchor constraintEqualToAnchor:self.progressBar.bottomAnchor constant:16],
         [self.actionButton.bottomAnchor constraintEqualToAnchor:alertView.bottomAnchor constant:-16],
         [self.actionButton.centerXAnchor constraintEqualToAnchor:alertView.centerXAnchor]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "Video trimmer for your React Native app",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",