react-native-video-trim 5.0.4 → 5.1.0

package/README.md

@@ -282,7 +282,7 @@ Main method to show Video Editor UI.
   - `alertOnFailCloseText` (`default = "Close"`)
   - `enableRotation` (`default = false`)
   - `rotationAngle` (`default = 0`)
-  - `changeStatusBarOnOpen` (`default = false`): Update status bar to black background color when editor is opened (useful in somecases where your theme has titlebar in different color than black)
+  - `changeStatusBarColorOnOpen` (`default = false`): Update status bar color to black background color when editor is opened (useful in somecases where your theme has titlebar in different color than black)
 
 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

package/VideoTrim.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/maitrungduc1410/react-native-video-trim.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.private_header_files = "ios/**/*.h"
 
   s.dependency "ffmpeg-mobile-#{ENV['FFMPEGKIT_PACKAGE'] || 'min'}", ENV['FFMPEGKIT_PACKAGE_VERSION'] || '~> 6.0'

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

@@ -165,7 +165,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
 
       alertDialog?.show()
 
-      if (shouldChangeStatusBarOnOpen) {
+      if (shouldChangeStatusBarColorOnOpen) {
         changeStatusBarColor()
       }
     }
@@ -511,7 +511,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
       }
     }
 
-    if (shouldChangeStatusBarOnOpen) {
+    if (shouldChangeStatusBarColorOnOpen) {
       restoreStatusBarColor()
     }
   }
@@ -694,8 +694,8 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     reactApplicationContext.currentActivity?.startActivity(Intent.createChooser(shareIntent, "Share file"))
   }
 
-  val shouldChangeStatusBarOnOpen: Boolean
-    get() = editorConfig?.hasKey("changeStatusBarOnOpen") == true && editorConfig?.getBoolean("changeStatusBarOnOpen") == true
+  val shouldChangeStatusBarColorOnOpen: Boolean
+    get() = editorConfig?.hasKey("changeStatusBarColorOnOpen") == true && editorConfig?.getBoolean("changeStatusBarColorOnOpen") == true
 
   companion object {
     const val NAME = "VideoTrim"

package/ios/AssetLoader.swift

@@ -0,0 +1,99 @@
+//
+//  AssetLoader.swift
+//  VideoTrim
+//
+//  Created by Duc Trung Mai on 20/5/25.
+//
+
+import AVFoundation
+
+protocol AssetLoaderDelegate: AnyObject {
+    func assetLoader(_ loader: AssetLoader, didFailWithError error: Error, forKey key: String)
+    func assetLoaderDidSucceed(_ loader: AssetLoader)
+}
+
+class AssetLoader: NSObject {
+    var asset: AVURLAsset?
+    weak var delegate: AssetLoaderDelegate?
+    
+    func loadAsset(url: URL, isVideoType: Bool) {
+        // Creating AVURLAsset (not blocking the main thread)
+        asset = AVURLAsset(url: url, options: [AVURLAssetPreferPreciseDurationAndTimingKey: true])
+        let keys = ["duration", "tracks"]
+        
+        // Asynchronous property loading
+        asset?.loadValuesAsynchronously(forKeys: keys) {
+            DispatchQueue.main.async {
+                self.assetLoaded(isVideoType: isVideoType)
+            }
+        }
+    }
+    
+    private func assetLoaded(isVideoType: Bool) {
+        guard let asset = asset else { return }
+        
+        let keys = ["duration", "tracks"]
+        for key in keys {
+            var error: NSError?
+            let status = asset.statusOfValue(forKey: key, error: &error)
+            
+            if status == .failed {
+                if let error = error {
+                    delegate?.assetLoader(self, didFailWithError: error, forKey: key)
+                }
+                return
+            } else if status == .cancelled {
+                delegate?.assetLoader(self, didFailWithError: NSError(domain: "AssetLoader", code: -1, userInfo: [NSLocalizedDescriptionKey: "\(key) loading was cancelled"]), forKey: key)
+                return
+            } else if status != .loaded {
+                delegate?.assetLoader(self, didFailWithError: NSError(domain: "AssetLoader", code: -1, userInfo: [NSLocalizedDescriptionKey: "\(key) is in an unknown state"]), forKey: key)
+                return
+            }
+        }
+        
+        if isVideoType {
+            // Process the tracks to load the remaining properties
+            self.processAssetTracks()
+        } else {
+            delegate?.assetLoaderDidSucceed(self)
+        }
+    }
+    
+    private func processAssetTracks() {
+        guard let asset = asset else { return }
+        
+        let videoTracks = asset.tracks(withMediaType: .video)
+        guard let videoTrack = videoTracks.first else {
+            delegate?.assetLoader(self, didFailWithError: NSError(domain: "AssetLoader", code: -1, userInfo: [NSLocalizedDescriptionKey: "No video tracks found"]), forKey: "tracks")
+            return
+        }
+        
+        let trackKeys = ["naturalSize", "preferredTransform"]
+        videoTrack.loadValuesAsynchronously(forKeys: trackKeys) {
+            DispatchQueue.main.async {
+                self.trackPropertiesLoaded(track: videoTrack)
+            }
+        }
+    }
+    
+    private func trackPropertiesLoaded(track: AVAssetTrack) {
+        var error: NSError?
+        
+        let naturalSizeStatus = track.statusOfValue(forKey: "naturalSize", error: &error)
+        let preferredTransformStatus = track.statusOfValue(forKey: "preferredTransform", error: &error)
+        
+        if naturalSizeStatus == .loaded, preferredTransformStatus == .loaded {
+            let naturalSize = track.naturalSize
+            let preferredTransform = track.preferredTransform
+            
+            print("Natural size: \(naturalSize)")
+            print("Preferred transform: \(preferredTransform)")
+            delegate?.assetLoaderDidSucceed(self)
+        } else {
+            if let error = error {
+                let failedKey = naturalSizeStatus != .loaded ? "naturalSize" : "preferredTransform"
+                delegate?.assetLoader(self, didFailWithError: error, forKey: failedKey)
+            }
+        }
+    }
+}

package/ios/ErrorCode.swift

@@ -0,0 +1,17 @@
+//
+//  ErrorCode.swift
+//  VideoTrim
+//
+//  Created by Duc Trung Mai on 20/5/25.
+//
+
+import Foundation
+
+enum ErrorCode: String {
+    case trimmingFailed = "TRIMMING_FAILED"
+    case failToLoadMedia = "FAIL_TO_LOAD_MEDIA"
+    case failToSaveToPhoto = "FAIL_TO_SAVE_TO_PHOTO"
+    case failToShare = "FAIL_TO_SHARE"
+    case noPhotoPermission = "NO_PHOTO_PERMISSION"
+    case invalidFilePath = "INVALID_FILE_PATH"
+}

package/ios/ProgressAlertController.swift

@@ -0,0 +1,100 @@
+//
+//  ProgressAlertController.swift
+//  VideoTrim
+//
+//  Created by Duc Trung Mai on 20/5/25.
+//
+
+import UIKit
+
+class ProgressAlertController: UIViewController {
+    var onDismiss: (() -> Void)?
+    
+    private let titleLabel = UILabel()
+    private let progressBar = UIProgressView(progressViewStyle: .default)
+    private let actionButton = UIButton(type: .system)
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        setupBackground()
+        setupAlertView()
+    }
+    
+    private func setupBackground() {
+        view.backgroundColor = UIColor.black.withAlphaComponent(0.4)
+    }
+    
+    private func setupAlertView() {
+        let alertView = UIView()
+        alertView.backgroundColor = UIColor(red: 28/255, green: 28/255, blue: 30/255, alpha: 1.0)
+        alertView.layer.cornerRadius = 12
+        alertView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(alertView)
+        
+        // AlertView Constraints
+        NSLayoutConstraint.activate([
+            alertView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+            alertView.centerYAnchor.constraint(equalTo: view.centerYAnchor),
+            alertView.widthAnchor.constraint(equalToConstant: 270)
+        ])
+        
+        // Title Label
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        titleLabel.textAlignment = .center
+        titleLabel.font = UIFont.systemFont(ofSize: 18)
+        titleLabel.numberOfLines = 0
+        titleLabel.textColor = .white
+        alertView.addSubview(titleLabel)
+        
+        // Progress Bar
+        progressBar.translatesAutoresizingMaskIntoConstraints = false
+        alertView.addSubview(progressBar)
+        
+        // Action Button
+        actionButton.setTitle("Cancel", for: .normal)
+        actionButton.setTitleColor(.systemPink, for: .normal)
+        actionButton.titleLabel?.font = UIFont.systemFont(ofSize: 16)
+        actionButton.addTarget(self, action: #selector(dismissAlert), for: .touchUpInside)
+        actionButton.translatesAutoresizingMaskIntoConstraints = false
+        actionButton.isHidden = true
+        alertView.addSubview(actionButton)
+        
+        // Constraints for titleLabel, progressBar, and actionButton
+        NSLayoutConstraint.activate([
+            titleLabel.topAnchor.constraint(equalTo: alertView.topAnchor, constant: 16),
+            titleLabel.leadingAnchor.constraint(equalTo: alertView.leadingAnchor, constant: 16),
+            titleLabel.trailingAnchor.constraint(equalTo: alertView.trailingAnchor, constant: -16),
+            
+            progressBar.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 16),
+            progressBar.leadingAnchor.constraint(equalTo: alertView.leadingAnchor, constant: 16),
+            progressBar.trailingAnchor.constraint(equalTo: alertView.trailingAnchor, constant: -16),
+            
+            actionButton.topAnchor.constraint(equalTo: progressBar.bottomAnchor, constant: 16),
+            actionButton.bottomAnchor.constraint(equalTo: alertView.bottomAnchor, constant: -16),
+            actionButton.centerXAnchor.constraint(equalTo: alertView.centerXAnchor)
+        ])
+    }
+    
+    @objc private func dismissAlert() {
+        self.onDismiss?()
+    }
+    
+    func setTitle(_ text: String) {
+        titleLabel.text = text
+    }
+    
+    func setCancelTitle(_ text: String) {
+        actionButton.setTitle(text, for: .normal)
+    }
+    
+    func setProgress(_ progress: Float) {
+        progressBar.setProgress(progress, animated: true)
+    }
+    
+    func showCancelBtn() {
+        // Ensure that the button is properly added to the view hierarchy and that the layout has been updated before hiding the button
+        view.layoutIfNeeded()
+        actionButton.isHidden = false
+    }
+}

package/ios/VideoTrim-Bridging-Header.h

@@ -0,0 +1 @@
+

package/ios/VideoTrim.h

@@ -1,31 +1,5 @@
 #import <VideoTrimSpec/VideoTrimSpec.h>
-#import <AVFoundation/AVFoundation.h>
-#import <UIKit/UIKit.h>
-#import "AssetLoader.h"
-
-@class VideoTrimmerViewController;
-@class ProgressAlertController;
-
-@interface VideoTrim : NativeVideoTrimSpecBase <NativeVideoTrimSpec, AssetLoaderDelegate, UIDocumentPickerDelegate>
-
-@property (nonatomic, strong) NSString *FILE_PREFIX;
-@property (nonatomic, strong) NSString *BEFORE_TRIM_PREFIX;
-@property (nonatomic, assign) BOOL isShowing;
-@property (nonatomic, strong) VideoTrimmerViewController *vc;
-@property (nonatomic, strong) NSURL *outputFile;
-@property (nonatomic, assign) BOOL isVideoType;
-//@property (nonatomic, assign) JS::NativeVideoTrim::EditorConfig editorConfig;
-
-// Helper methods
-- (NSURL *)renameFileAtURL:(NSURL *)url newName:(NSString *)newName;
-- (void)trimWithViewController:(VideoTrimmerViewController *)viewController
-                     inputFile:(NSURL *)inputFile 
-                 videoDuration:(double)videoDuration 
-                     startTime:(double)startTime 
-                       endTime:(double)endTime;
-- (void)saveFileToFilesApp:(NSURL *)fileURL;
-- (void)shareFile:(NSURL *)fileURL;
-- (int)deleteFileAtURL:(NSURL *)url;
-- (void)onError:(NSString *)message code:(NSString *)code;
+#import <VideoTrim-Swift.h>
 
+@interface VideoTrim : NativeVideoTrimSpecBase <NativeVideoTrimSpec, VideoTrimProtocol>
 @end