react-native-video-trim 2.0.0 → 2.1.0

package/android/src/main/res/layout/video_trimmer_view.xml

@@ -14,7 +14,28 @@
     <VideoView
       android:id="@+id/video_loader"
       android:layout_width="match_parent"
-      android:layout_height="match_parent" />
+      android:layout_height="match_parent"
+      />
+
+    <FrameLayout
+      android:id="@+id/audioBannerView"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginStart="50dp"
+      android:layout_marginTop="50dp"
+      android:layout_marginEnd="50dp"
+      android:layout_marginBottom="50dp"
+      android:padding="50dp"
+      android:visibility="gone">
+
+      <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:contentDescription="Airpods Max"
+        android:src="@drawable/airpodsmax"
+        />
+    </FrameLayout>
 
   </RelativeLayout>
 
@@ -38,7 +59,8 @@
         android:layout_height="match_parent"
         android:layout_marginHorizontal="20dp"
         android:orientation="horizontal"
-        android:padding="4dp" />
+        android:padding="4dp"
+        />
 
       <RelativeLayout
         android:id="@+id/trimmerContainerWrapper"
@@ -201,7 +223,30 @@
         android:layout_gravity="center"
         android:padding="12dp"
         android:src="@drawable/play_fill"
-        android:tint="@color/white"/>
+        android:tint="@color/white"
+        android:visibility="gone"
+        />
+
+      <ImageView
+        android:id="@+id/failToLoadBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:padding="12dp"
+        android:src="@drawable/exclamationmark_triangle_fill"
+        android:tint="@color/trim_color"
+        android:visibility="gone"
+        />
+
+      <ProgressBar
+        android:id="@+id/loadingIndicator"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="10dp"
+        android:indeterminateTint="@color/white"
+        />
 
       <TextView
         android:id="@+id/saveBtn"
@@ -212,7 +257,9 @@
         android:padding="10dp"
         android:text="@string/save"
         android:textColor="#2196F3"
-        android:textSize="16dp" />
+        android:textSize="16dp"
+        android:visibility="gone"
+        />
 
     </FrameLayout>
 

package/android/src/main/res/xml/file_paths.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+  <files-path name="internal_files" path="." />
+  <external-path name="external_files" path="." />
+</paths>

package/ios/AssetLoader.swift

@@ -0,0 +1,99 @@
+//
+//  AssetLoader.swift
+//  react-native-video-trim
+//
+//  Created by ByteDance on 7/27/24.
+//
+
+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,16 @@
+//
+//  ErrorCode.swift
+//  react-native-video-trim
+//
+//  Created by ByteDance on 7/27/24.
+//
+
+import Foundation
+
+enum ErrorCode: String {
+    case trimmingFailed = "TRIMMING_FAILED"
+    case failToLoadVideo = "FAIL_TO_LOAD_VIDEO"
+    case failToSaveToPhoto = "FAIL_TO_SAVE_TO_PHOTO"
+    case failToShare = "FAIL_TO_SHARE"
+    case noPhotoPermission = "NO_PHOTO_PERMISSION"
+}

package/ios/VideoTrim.mm

@@ -4,12 +4,14 @@
 @interface RCT_EXTERN_MODULE(VideoTrim, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(showEditor:(NSString*)uri withConfig:(NSDictionary *)config)
-RCT_EXTERN_METHOD(isValidVideo:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(listFiles:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(cleanFiles:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(deleteFile:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(closeEditor:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(isValidFile:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
 @end