react-native-video-trim 2.0.0 → 2.2.0

package/ios/VideoTrimmer.swift

@@ -36,7 +36,7 @@ import AVFoundation
     // TODO: migrate all to AutoLayout
     private let thumbView: VideoTrimmerThumb = {
         let view = VideoTrimmerThumb()
-        view.accessibilityIdentifier = "wrapperView"
+        view.accessibilityIdentifier = "thumbView"
         return view
     }()
     
@@ -59,7 +59,7 @@ import AVFoundation
         let view = UIView()
         view.accessibilityIdentifier = "thumbnailClipView"
         view.translatesAutoresizingMaskIntoConstraints = false
-
+        
         return view
     }()
     
@@ -152,6 +152,7 @@ import AVFoundation
     // a clip cannot be trimmed shorter than this duration
     var minimumDuration: CMTime = CMTime(seconds: 1, preferredTimescale: 600)
     var maximumDuration: CMTime = .positiveInfinity
+    var enableHapticFeedback = true
     
     // the available range of the asset.
     // Will be set to the full duration of the asset when assigning a new asset
@@ -517,7 +518,9 @@ import AVFoundation
         isZoomedIn = true
         animateChanges()
         
-        UISelectionFeedbackGenerator().selectionChanged()
+        if enableHapticFeedback {
+            UISelectionFeedbackGenerator().selectionChanged()
+        }
     }
     
     private func animateChanges() {
@@ -530,12 +533,13 @@ import AVFoundation
     }
     
     private func startPanning() {
-        UISelectionFeedbackGenerator().selectionChanged()
-        
         didClampWhilePanning = false
         
-        impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
-        impactFeedbackGenerator?.prepare()
+        if enableHapticFeedback {
+            UISelectionFeedbackGenerator().selectionChanged()
+            impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
+            impactFeedbackGenerator?.prepare()
+        }
         
         UIView.animate(withDuration: 0.25, delay: 0, options: [.beginFromCurrentState, .allowUserInteraction], animations: {
             self.updateProgressIndicator()
@@ -612,10 +616,12 @@ import AVFoundation
         }
         switch sender.state {
         case .began:
+            if enableHapticFeedback {
+                UISelectionFeedbackGenerator().selectionChanged()
+                impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
+                impactFeedbackGenerator?.prepare()
+            }
             
-            UISelectionFeedbackGenerator().selectionChanged()
-            impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
-            impactFeedbackGenerator?.prepare()
             didClampWhilePanning = false
             
             isScrubbing = true

package/ios/VideoTrimmerViewController.swift

@@ -22,13 +22,23 @@ extension CMTime {
 
 @available(iOS 13.0, *)
 class VideoTrimmerViewController: UIViewController {
-    var asset: AVAsset!
-    var maximumDuration: Int?
-    var minimumDuration: Int?
-    var cancelBtnText = "Cancel"
-    var saveButtonText = "Save"
+    var asset: AVAsset? {
+        didSet {
+            if let _ = asset {
+                setupVideoTrimmer()
+                setupPlayerController()
+                setupTimeObserver()
+                updateLabels()
+            }
+        }
+    }
+    private var maximumDuration: Int?
+    private var minimumDuration: Int?
+    private var cancelButtonText = "Cancel"
+    private var saveButtonText = "Save"
     var cancelBtnClicked: (() -> Void)?
     var saveBtnClicked: ((CMTimeRange) -> Void)?
+    private var enableHapticFeedback = true
     
     private let playerController = AVPlayerViewController()
     private var trimmer: VideoTrimmer!
@@ -39,16 +49,50 @@ class VideoTrimmerViewController: UIViewController {
     private var btnStackView: UIStackView!
     private var cancelBtn: UIButton!
     private var playBtn: UIButton!
+    private let loadingIndicator = UIActivityIndicatorView()
     private var saveBtn: UIButton!
     private let playIcon = UIImage(systemName: "play.fill")
     private let pauseIcon = UIImage(systemName: "pause.fill")
+    private let audioBannerView = UIImage(systemName: "airpodsmax")
     private var player: AVPlayer! { playerController.player }
     private var timeObserverToken: Any?
+    private var autoplay = false
+    private var jumpToPositionOnLoad: Double = 0;
+    private var headerText: String?
+    private var headerTextSize = 16
+    private var headerTextColor: NSNumber?
+    private var headerView: UIView?
     
     var isSeekInProgress: Bool = false  // Marker
     private var chaseTime = CMTime.zero
     private var preferredFrameRate: Float = 23.98
     
+    public func onAssetFailToLoad() {
+        loadingIndicator.stopAnimating()
+        btnStackView.removeArrangedSubview(loadingIndicator)
+        loadingIndicator.removeFromSuperview()
+        
+        let imageViewContainer = UIView()
+        let imageView = UIImageView(image: UIImage(systemName: "exclamationmark.triangle.fill"))
+        imageView.tintColor = .systemYellow
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        
+        imageViewContainer.addSubview(imageView)
+        NSLayoutConstraint.activate([
+            imageView.widthAnchor.constraint(equalToConstant: 36),
+            imageView.heightAnchor.constraint(equalToConstant: 36),
+            imageView.centerXAnchor.constraint(equalTo: imageViewContainer.centerXAnchor),
+            imageView.centerYAnchor.constraint(equalTo: imageViewContainer.centerYAnchor)
+        ])
+        imageViewContainer.alpha = 0
+        
+        btnStackView.insertArrangedSubview(imageViewContainer, at: 1)
+        
+        UIView.animate(withDuration: 0.25, animations: {
+            imageViewContainer.alpha = 1
+        })
+    }
+    
     // MARK: - Input
     @objc private func didBeginTrimmingFromStart(_ sender: VideoTrimmer) {
         handleBeforeProgressChange()
@@ -107,7 +151,7 @@ class VideoTrimmerViewController: UIViewController {
     private func handleTrimmingEnd(_ start: Bool) {
         self.trimmer.progress = start ? trimmer.selectedRange.start : trimmer.selectedRange.end
         updateLabels()
-        player.seek(to: trimmer.progress, toleranceBefore: .zero, toleranceAfter: .zero)
+        seek(to: trimmer.progress)
     }
     
     // MARK: - UIViewController
@@ -117,17 +161,18 @@ class VideoTrimmerViewController: UIViewController {
         setupView()
         setupButtons()
         setupTimeLabels()
-        setupVideoTrimmer()
-        setupPlayerController()
-        setupTimeObserver()
-        
-        updateLabels()
     }
     
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
+        // if asset has been initialized
+        guard let _ = asset else { return }
         player.pause()
+        
+        // Clean up the observer
+        player.removeObserver(self, forKeyPath: "status")
+        
         if let token = timeObserverToken {
             player.removeTimeObserver(token)
             timeObserverToken = nil
@@ -139,13 +184,18 @@ class VideoTrimmerViewController: UIViewController {
         playerController.dismiss(animated: false, completion: nil)
     }
     
+    public func pausePlayer() {
+        player.pause()
+        setPlayBtnIcon()
+    }
+    
     @objc private func togglePlay(sender: UIButton) {
         if player.timeControlStatus == .playing {
             player.pause()
         } else {
             if CMTimeCompare(trimmer.progress, trimmer.selectedRange.end) != -1 {
                 trimmer.progress = trimmer.selectedRange.start
-                player.seek(to: trimmer.progress, toleranceBefore: .zero, toleranceAfter: .zero)
+                self.seek(to: trimmer.progress)
             }
             
             player.play()
@@ -164,32 +214,74 @@ class VideoTrimmerViewController: UIViewController {
     
     // MARK: - Setup Methods
     private func setupView() {
-        view.backgroundColor = .black
+        self.overrideUserInterfaceStyle = .dark
+        view.backgroundColor = .black // need to have this otherwise during animation the background of this VC is still white in white theme
+        
+        if let headerText = headerText {
+            headerView = UIView()
+            headerView!.translatesAutoresizingMaskIntoConstraints = false
+            view.addSubview(headerView!)
+            let headerTextView = UITextView()
+            headerTextView.text = headerText
+            headerTextView.textAlignment = .center
+            headerTextView.textColor = headerTextColor != nil ? RCTConvert.uiColor(headerTextColor) : .white
+            headerTextView.font = UIFont.systemFont(ofSize: CGFloat(headerTextSize))  // Set font size here
+            headerTextView.translatesAutoresizingMaskIntoConstraints = false
+            headerView!.addSubview(headerTextView)
+            
+            NSLayoutConstraint.activate([
+                // HeaderView constraints
+                headerView!.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
+                headerView!.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+                headerView!.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+                headerView!.heightAnchor.constraint(greaterThanOrEqualToConstant: 50),
+                
+                // HeaderText constraints
+                headerTextView.topAnchor.constraint(equalTo: headerView!.topAnchor),
+                headerTextView.bottomAnchor.constraint(equalTo: headerView!.bottomAnchor),
+                headerTextView.leadingAnchor.constraint(equalTo: headerView!.leadingAnchor),
+                headerTextView.trailingAnchor.constraint(equalTo: headerView!.trailingAnchor),
+            ])
+            
+            view.layoutIfNeeded() // layout after activate constraints, otherwise headerView height = screen height, which leads to playerViewController is missing at runtime
+        }
     }
     
     private func setupButtons() {
-        cancelBtn = UIButton.createButton(title: cancelBtnText, font: .systemFont(ofSize: 18), titleColor: .white, target: self, action: #selector(onCancelBtnClicked))
+        cancelBtn = UIButton.createButton(title: cancelButtonText, font: .systemFont(ofSize: 18), titleColor: .white, target: self, action: #selector(onCancelBtnClicked))
         playBtn = UIButton.createButton(image: playIcon, tintColor: .white, target: self, action: #selector(togglePlay(sender:)))
+        playBtn.alpha = 0
+        playBtn.isEnabled = false
+        
         saveBtn = UIButton.createButton(title: saveButtonText, font: .systemFont(ofSize: 18), titleColor: .systemBlue, target: self, action: #selector(onSaveBtnClicked))
+        saveBtn.alpha = 0
+        saveBtn.isEnabled = false
         
-        btnStackView = UIStackView(arrangedSubviews: [cancelBtn, playBtn, saveBtn])
+        btnStackView = UIStackView(arrangedSubviews: [cancelBtn, loadingIndicator, saveBtn])
         btnStackView.axis = .horizontal
-        btnStackView.alignment = .fill
+        btnStackView.alignment = .center
         btnStackView.distribution = .fillEqually
         btnStackView.spacing = UIStackView.spacingUseSystem
-        view.addSubview(btnStackView)
         btnStackView.translatesAutoresizingMaskIntoConstraints = false
+        
+        view.addSubview(btnStackView)
+        
         NSLayoutConstraint.activate([
             btnStackView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: 16),
             btnStackView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -16),
             btnStackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -16)
         ])
+        
+        loadingIndicator.startAnimating()
     }
     
     private func setupTimeLabels() {
         leadingTrimLabel = UILabel.createLabel(textAlignment: .left, textColor: .white)
+        leadingTrimLabel.text = "00:00.000"
         currentTimeLabel = UILabel.createLabel(textAlignment: .center, textColor: .white)
+        currentTimeLabel.text = "00:00.000"
         trailingTrimLabel = UILabel.createLabel(textAlignment: .right, textColor: .white)
+        trailingTrimLabel.text = "00:00.000"
         
         timingStackView = UIStackView(arrangedSubviews: [leadingTrimLabel, currentTimeLabel, trailingTrimLabel])
         timingStackView.axis = .horizontal
@@ -209,11 +301,12 @@ class VideoTrimmerViewController: UIViewController {
         trimmer = VideoTrimmer()
         trimmer.asset = asset
         trimmer.minimumDuration = CMTime(seconds: 1, preferredTimescale: 600)
+        trimmer.enableHapticFeedback = enableHapticFeedback
         
         if let maxDuration = maximumDuration {
             trimmer.maximumDuration = CMTime(seconds: max(1, Double(maxDuration)), preferredTimescale: 600)
-            if trimmer.maximumDuration > asset.duration {
-                trimmer.maximumDuration = asset.duration
+            if trimmer.maximumDuration > asset!.duration {
+                trimmer.maximumDuration = asset!.duration
             }
             trimmer.selectedRange = CMTimeRange(start: .zero, end: trimmer.maximumDuration)
         }
@@ -233,6 +326,7 @@ class VideoTrimmerViewController: UIViewController {
         trimmer.addTarget(self, action: #selector(didBeginTrimmingFromEnd(_:)), for: VideoTrimmer.didBeginTrimmingFromEnd)
         trimmer.addTarget(self, action: #selector(trailingGrabberChanged(_:)), for: VideoTrimmer.trailingGrabberChanged)
         trimmer.addTarget(self, action: #selector(didEndTrimmingFromEnd(_:)), for: VideoTrimmer.didEndTrimmingFromEnd)
+        trimmer.alpha = 0
         view.addSubview(trimmer)
         trimmer.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
@@ -241,6 +335,10 @@ class VideoTrimmerViewController: UIViewController {
             trimmer.bottomAnchor.constraint(equalTo: timingStackView.topAnchor, constant: -16),
             trimmer.heightAnchor.constraint(equalToConstant: 50)
         ])
+        
+        UIView.animate(withDuration: 0.25, animations: {
+            self.trimmer.alpha = 1
+        })
     }
     
     private func setupPlayerController() {
@@ -249,7 +347,10 @@ class VideoTrimmerViewController: UIViewController {
             playerController.allowsVideoFrameAnalysis = false
         }
         playerController.player = AVPlayer()
-        player.replaceCurrentItem(with: AVPlayerItem(asset: asset))
+        player.replaceCurrentItem(with: AVPlayerItem(asset: asset!))
+        
+        // Add observer for player status
+        player.addObserver(self, forKeyPath: "status", options: [.new, .initial], context: nil)
         
         try? AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
         addChild(playerController)
@@ -258,7 +359,7 @@ class VideoTrimmerViewController: UIViewController {
         NSLayoutConstraint.activate([
             playerController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             playerController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            playerController.view.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
+            playerController.view.topAnchor.constraint(equalTo: headerView != nil ? headerView!.bottomAnchor : view.safeAreaLayoutGuide.topAnchor),
             playerController.view.bottomAnchor.constraint(equalTo: trimmer.topAnchor, constant: -16)
         ])
         
@@ -286,7 +387,7 @@ class VideoTrimmerViewController: UIViewController {
             if CMTimeCompare(self.trimmer.progress, trimmer.selectedRange.end) == 1 {
                 player.pause()
                 self.trimmer.progress = trimmer.selectedRange.end
-                player.seek(to: trimmer.selectedRange.end, toleranceBefore: .zero, toleranceAfter: .zero)
+                self.seek(to: trimmer.selectedRange.end)
             }
             
             currentTimeLabel.text = trimmer.progress.displayString
@@ -333,6 +434,74 @@ class VideoTrimmerViewController: UIViewController {
             }
         }
     }
+    
+    public func configure(config: NSDictionary) {
+        if let maxDuration = config["maxDuration"] as? Int {
+            maximumDuration = maxDuration
+        }
+        
+        if let minDuration = config["minDuration"] as? Int {
+            minimumDuration = minDuration
+        }
+        
+        if let cancelButtonText = config["cancelButtonText"] as? String, !cancelButtonText.isEmpty {
+            self.cancelButtonText = cancelButtonText
+        }
+        
+        if let saveButtonText = config["saveButtonText"] as? String, !saveButtonText.isEmpty {
+            self.saveButtonText = saveButtonText
+        }
+        
+        if let jumpToPositionOnLoad = config["jumpToPositionOnLoad"] as? Int {
+            self.jumpToPositionOnLoad = Double(jumpToPositionOnLoad)
+        }
+        
+        enableHapticFeedback = config["enableHapticFeedback"] as? Bool ?? true
+        autoplay = config["autoplay"] as? Bool ?? false
+        
+        if let jumpToPositionOnLoad = config["jumpToPositionOnLoad"] as? Int {
+            self.jumpToPositionOnLoad = Double(jumpToPositionOnLoad)
+        }
+        
+        if let headerText = config["headerText"] as? String, !headerText.isEmpty {
+            self.headerText = headerText
+            
+            headerTextSize = config["headerTextSize"] as? Int ?? 16
+            headerTextColor = config["headerTextColor"] as? NSNumber
+        }
+    }
+    
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        if keyPath == "status" {
+            if player.status == .readyToPlay {
+                loadingIndicator.stopAnimating()
+                btnStackView.removeArrangedSubview(loadingIndicator)
+                loadingIndicator.removeFromSuperview()
+                btnStackView.insertArrangedSubview(playBtn, at: 1)
+                
+                UIView.animate(withDuration: 0.25, animations: {
+                    self.playBtn.alpha = 1
+                    self.playBtn.isEnabled = true
+                    self.saveBtn.alpha = 1
+                    self.saveBtn.isEnabled = true
+                })
+            
+                if jumpToPositionOnLoad > 0 {
+                    let duration = (asset?.duration.seconds ?? 0) * 1000
+                    let time = jumpToPositionOnLoad > duration ? duration : jumpToPositionOnLoad
+                    let cmtime = CMTime(value: CMTimeValue(time), timescale: 1000)
+                    
+                    self.seek(to: cmtime)
+                    self.trimmer.progress = cmtime
+                    self.currentTimeLabel.text = self.trimmer.progress.displayString
+                }
+                
+                if autoplay {
+                    togglePlay(sender: playBtn)
+                }
+            }
+        }
+    }
 }
 
 private extension UIButton {

package/lib/commonjs/index.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cleanFiles = cleanFiles;
+exports.closeEditor = closeEditor;
 exports.deleteFile = deleteFile;
-exports.isValidVideo = isValidVideo;
+exports.isValidFile = isValidFile;
 exports.listFiles = listFiles;
 exports.showEditor = showEditor;
 var _reactNative = require("react-native");
@@ -25,63 +26,16 @@ const VideoTrim = _reactNative.NativeModules.VideoTrim ? _reactNative.NativeModu
  * @param {EditorConfig} config: editor configuration
  * @returns {void} A **Promise** which resolves `void`
  */
-async function showEditor(filePath) {
+function showEditor(filePath) {
   let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
   const {
-    saveToPhoto = true
+    headerTextColor
   } = config;
-  const outputPath = await VideoTrim.showEditor(filePath, config);
-  if (_reactNative.Platform.OS === 'android') {
-    if (saveToPhoto) {
-      try {
-        if (_reactNative.Platform.Version >= 33) {
-          // since android 13 it's not needed to request permission for write storage: https://github.com/facebook/react-native/issues/36714#issuecomment-1491338276
-          await VideoTrim.saveVideo(outputPath);
-          if (config.removeAfterSavedToPhoto) {
-            deleteFile(outputPath);
-          }
-        } else {
-          const granted = await _reactNative.PermissionsAndroid.request(_reactNative.PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
-            title: 'Video Trimmer Photos Access Required',
-            message: 'Grant access to your Photos to write output Video',
-            buttonNeutral: 'Ask Me Later',
-            buttonNegative: 'Cancel',
-            buttonPositive: 'OK'
-          });
-          if (granted === _reactNative.PermissionsAndroid.RESULTS.GRANTED) {
-            await VideoTrim.saveVideo(outputPath);
-            if (config.removeAfterSavedToPhoto) {
-              deleteFile(outputPath);
-            }
-          } else {
-            throw new Error('Photos Library permission denied');
-          }
-        }
-      } catch (err) {
-        throw err;
-      } finally {
-        VideoTrim.hideDialog();
-      }
-    } else {
-      VideoTrim.hideDialog();
-    }
-  }
-}
-
-/**
- * Delete a file
- *
- * @param {string} filePath: absolute non-empty file path to check if editable
- * @returns {Promise} A **Promise** which resolves `true` if editable
- */
-function isValidVideo(filePath) {
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
-  return VideoTrim.isValidVideo(filePath);
+  const color = (0, _reactNative.processColor)(headerTextColor);
+  VideoTrim.showEditor(filePath, {
+    ...config,
+    headerTextColor: color
+  });
 }
 
 /**
@@ -114,4 +68,20 @@ function deleteFile(filePath) {
   }
   return VideoTrim.deleteFile(filePath);
 }
+
+/**
+ * Close editor
+ */
+function closeEditor() {
+  return VideoTrim.closeEditor();
+}
+
+/**
+ * Check if a file is valid audio or video file
+ *
+ * @returns {Promise} A **Promise** which resolves file info if successful
+ */
+function isValidFile(url) {
+  return VideoTrim.isValidFile(url);
+}
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","VideoTrim","NativeModules","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","trim","saveToPhoto","outputPath","OS","Version","saveVideo","removeAfterSavedToPhoto","deleteFile","granted","PermissionsAndroid","request","PERMISSIONS","WRITE_EXTERNAL_STORAGE","title","message","buttonNeutral","buttonNegative","buttonPositive","RESULTS","GRANTED","err","hideDialog","isValidVideo","listFiles","cleanFiles"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","VideoTrim","NativeModules","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","headerTextColor","color","processColor","listFiles","cleanFiles","deleteFile","trim","closeEditor","isValidFile","url"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAOA,MAAMC,aAAa,GAChB,kFAAiF,GAClFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,SAAS,GAAGC,0BAAa,CAACD,SAAS,GACrCC,0BAAa,CAACD,SAAS,GACvB,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAiOL;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASU,UAAUA,CAACC,QAAgB,EAAmC;EAAA,IAAjCC,MAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpE,MAAM;IAAEG;EAAgB,CAAC,GAAGJ,MAAM;EAClC,MAAMK,KAAK,GAAG,IAAAC,yBAAY,EAACF,eAAe,CAAC;EAC3CX,SAAS,CAACK,UAAU,CAACC,QAAQ,EAAE;IAAE,GAAGC,MAAM;IAAEI,eAAe,EAAEC;EAAM,CAAC,CAAC;AACvE;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,SAASA,CAAA,EAAsB;EAC7C,OAAOd,SAAS,CAACc,SAAS,CAAC,CAAC;AAC9B;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,UAAUA,CAAA,EAAoB;EAC5C,OAAOf,SAAS,CAACe,UAAU,CAAC,CAAC;AAC/B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,UAAUA,CAACV,QAAgB,EAAoB;EAC7D,IAAI,EAACA,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAEW,IAAI,CAAC,CAAC,CAACR,MAAM,GAAE;IAC5B,MAAM,IAAIL,KAAK,CAAC,4BAA4B,CAAC;EAC/C;EACA,OAAOJ,SAAS,CAACgB,UAAU,CAACV,QAAQ,CAAC;AACvC;;AAEA;AACA;AACA;AACO,SAASY,WAAWA,CAAA,EAAS;EAClC,OAAOlB,SAAS,CAACkB,WAAW,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,WAAWA,CAACC,GAAW,EAAoB;EACzD,OAAOpB,SAAS,CAACmB,WAAW,CAACC,GAAG,CAAC;AACnC"}

package/lib/module/index.js

@@ -1,4 +1,4 @@
-import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
+import { NativeModules, Platform, processColor } from 'react-native';
 const LINKING_ERROR = `The package 'react-native-video-trim' doesn't seem to be linked. Make sure: \n\n` + Platform.select({
   ios: "- You have run 'pod install'\n",
   default: ''
@@ -15,63 +15,16 @@ const VideoTrim = NativeModules.VideoTrim ? NativeModules.VideoTrim : new Proxy(
  * @param {EditorConfig} config: editor configuration
  * @returns {void} A **Promise** which resolves `void`
  */
-export async function showEditor(filePath) {
+export function showEditor(filePath) {
   let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
   const {
-    saveToPhoto = true
+    headerTextColor
   } = config;
-  const outputPath = await VideoTrim.showEditor(filePath, config);
-  if (Platform.OS === 'android') {
-    if (saveToPhoto) {
-      try {
-        if (Platform.Version >= 33) {
-          // since android 13 it's not needed to request permission for write storage: https://github.com/facebook/react-native/issues/36714#issuecomment-1491338276
-          await VideoTrim.saveVideo(outputPath);
-          if (config.removeAfterSavedToPhoto) {
-            deleteFile(outputPath);
-          }
-        } else {
-          const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
-            title: 'Video Trimmer Photos Access Required',
-            message: 'Grant access to your Photos to write output Video',
-            buttonNeutral: 'Ask Me Later',
-            buttonNegative: 'Cancel',
-            buttonPositive: 'OK'
-          });
-          if (granted === PermissionsAndroid.RESULTS.GRANTED) {
-            await VideoTrim.saveVideo(outputPath);
-            if (config.removeAfterSavedToPhoto) {
-              deleteFile(outputPath);
-            }
-          } else {
-            throw new Error('Photos Library permission denied');
-          }
-        }
-      } catch (err) {
-        throw err;
-      } finally {
-        VideoTrim.hideDialog();
-      }
-    } else {
-      VideoTrim.hideDialog();
-    }
-  }
-}
-
-/**
- * Delete a file
- *
- * @param {string} filePath: absolute non-empty file path to check if editable
- * @returns {Promise} A **Promise** which resolves `true` if editable
- */
-export function isValidVideo(filePath) {
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
-  return VideoTrim.isValidVideo(filePath);
+  const color = processColor(headerTextColor);
+  VideoTrim.showEditor(filePath, {
+    ...config,
+    headerTextColor: color
+  });
 }
 
 /**
@@ -104,4 +57,20 @@ export function deleteFile(filePath) {
   }
   return VideoTrim.deleteFile(filePath);
 }
+
+/**
+ * Close editor
+ */
+export function closeEditor() {
+  return VideoTrim.closeEditor();
+}
+
+/**
+ * Check if a file is valid audio or video file
+ *
+ * @returns {Promise} A **Promise** which resolves file info if successful
+ */
+export function isValidFile(url) {
+  return VideoTrim.isValidFile(url);
+}
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","PermissionsAndroid","Platform","LINKING_ERROR","select","ios","default","VideoTrim","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","trim","saveToPhoto","outputPath","OS","Version","saveVideo","removeAfterSavedToPhoto","deleteFile","granted","request","PERMISSIONS","WRITE_EXTERNAL_STORAGE","title","message","buttonNeutral","buttonNegative","buttonPositive","RESULTS","GRANTED","err","hideDialog","isValidVideo","listFiles","cleanFiles"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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"}
+{"version":3,"names":["NativeModules","Platform","processColor","LINKING_ERROR","select","ios","default","VideoTrim","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","headerTextColor","color","listFiles","cleanFiles","deleteFile","trim","closeEditor","isValidFile","url"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SACEA,aAAa,EACbC,QAAQ,EACRC,YAAY,QAEP,cAAc;AAErB,MAAMC,aAAa,GAChB,kFAAiF,GAClFF,QAAQ,CAACG,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,SAAS,GAAGP,aAAa,CAACO,SAAS,GACrCP,aAAa,CAACO,SAAS,GACvB,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAiOL;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASQ,UAAUA,CAACC,QAAgB,EAAmC;EAAA,IAAjCC,MAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpE,MAAM;IAAEG;EAAgB,CAAC,GAAGJ,MAAM;EAClC,MAAMK,KAAK,GAAGhB,YAAY,CAACe,eAAe,CAAC;EAC3CV,SAAS,CAACI,UAAU,CAACC,QAAQ,EAAE;IAAE,GAAGC,MAAM;IAAEI,eAAe,EAAEC;EAAM,CAAC,CAAC;AACvE;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,SAASA,CAAA,EAAsB;EAC7C,OAAOZ,SAAS,CAACY,SAAS,CAAC,CAAC;AAC9B;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAAA,EAAoB;EAC5C,OAAOb,SAAS,CAACa,UAAU,CAAC,CAAC;AAC/B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAACT,QAAgB,EAAoB;EAC7D,IAAI,EAACA,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAEU,IAAI,CAAC,CAAC,CAACP,MAAM,GAAE;IAC5B,MAAM,IAAIL,KAAK,CAAC,4BAA4B,CAAC;EAC/C;EACA,OAAOH,SAAS,CAACc,UAAU,CAACT,QAAQ,CAAC;AACvC;;AAEA;AACA;AACA;AACA,OAAO,SAASW,WAAWA,CAAA,EAAS;EAClC,OAAOhB,SAAS,CAACgB,WAAW,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CAACC,GAAW,EAAoB;EACzD,OAAOlB,SAAS,CAACiB,WAAW,CAACC,GAAG,CAAC;AACnC"}