react-native-video-trim 1.0.6 → 1.0.8

package/README.md

@@ -147,9 +147,9 @@ Main method to show Video Editor UI.
 
   - `saveToPhoto` (optional, `default = true`): whether to save video to photo/gallery after editing
   - `maxDuration` (optional): maximum duration for the trimmed video
-  - `leftButtonText` (optional): text for left button in Editor dialog
-  - `rightButtonText` (optional): text for right button in Editor dialog
-  - `title` (optional, iOS only): title Editor dialog
+  - `cancelButtonText` (optional): text of left button in Editor dialog
+  - `saveButtonText` (optional): text of right button in Editor dialog
+  - `title` (optional, iOS only): title of Editor dialog
 
 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/android/src/main/java/com/videotrim/utils/StorageUtil.java

@@ -222,15 +222,8 @@ public class StorageUtil {
     if (uri != null) {
       try {
         OutputStream outputStream = context.getContentResolver().openOutputStream(uri);
-        if (outputStream != null) {
-          // Copy the video file to the output stream
-          // Here, you can use the method you have to copy the file contents
-          // For example, you can use FileInputStream to read from videoFile and write to outputStream
-
-          outputStream.close();
-          // Notify the media scanner that a new video has been added to the gallery
-          MediaScannerConnection.scanFile(context, new String[]{videoFile.getAbsolutePath()}, new String[]{"video/*"}, null);
-        }
+        copyFile(videoFile, outputStream);
+        MediaScannerConnection.scanFile(context, new String[]{uri.toString()}, new String[]{"video/*"}, null);
       } catch (IOException e) {
         e.printStackTrace();
       }
@@ -245,14 +238,19 @@ public class StorageUtil {
     MediaScannerConnection.scanFile(context, new String[]{destinationFile.getAbsolutePath()}, new String[]{"video/*"}, null);
   }
 
+  private static void copyFile(File sourceFile, OutputStream outputStream) throws IOException {
+    InputStream inputStream = new FileInputStream(sourceFile);
+    copyFile(inputStream, outputStream);
+  }
+
   private static void copyFile(File sourceFile, File destFile) throws IOException {
-    InputStream inputStream = null;
-    OutputStream outputStream = null;
+    InputStream inputStream = new FileInputStream(sourceFile);
+    OutputStream outputStream = new FileOutputStream(destFile);
+    copyFile(inputStream, outputStream);
+  }
 
+  private static void copyFile(InputStream inputStream, OutputStream outputStream) throws IOException {
     try {
-      inputStream = new FileInputStream(sourceFile);
-      outputStream = new FileOutputStream(destFile);
-
       byte[] buffer = new byte[1024];
       int length;
       while ((length = inputStream.read(buffer)) > 0) {

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

@@ -493,14 +493,14 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       this.mMaxDuration = config.getInt("maxDuration");
     }
 
-    if (config.hasKey("leftButtonText")) {
+    if (config.hasKey("cancelButtonText")) {
       TextView tv = findViewById(R.id.cancelBtn);
-      tv.setText(config.getString("leftButtonText"));
+      tv.setText(config.getString("cancelButtonText"));
     }
 
-    if (config.hasKey("rightButtonText")) {
+    if (config.hasKey("saveButtonText")) {
       TextView tv = findViewById(R.id.saveBtn);
-      tv.setText(config.getString("rightButtonText"));
+      tv.setText(config.getString("saveButtonText"));
     }
   }
 }

package/ios/VideoTrim.swift

@@ -74,12 +74,12 @@ class VideoTrim: RCTEventEmitter, UIVideoEditorControllerDelegate, UINavigationC
                                 // when it comes to bar button customization
                                 // we can't customize text of original buttons here, we can only set attrs like enabled/hidden
                                 // to customize text we need to create new button
-                                if let leftBtnText = config["leftButtonText"] as? String, !leftBtnText.isEmpty {
-                                    topItem.leftBarButtonItem = UIBarButtonItem(title: leftBtnText, style: topItem.leftBarButtonItem?.style ?? .plain, target: topItem.leftBarButtonItem?.target, action: topItem.leftBarButtonItem?.action)
+                                if let cancelBtnText = config["cancelButtonText"] as? String, !cancelBtnText.isEmpty {
+                                    topItem.leftBarButtonItem = UIBarButtonItem(title: cancelBtnText, style: topItem.leftBarButtonItem?.style ?? .plain, target: topItem.leftBarButtonItem?.target, action: topItem.leftBarButtonItem?.action)
                                 }
                                 
-                                if let rightBtnText = config["rightButtonText"] as? String, !rightBtnText.isEmpty {
-                                    topItem.rightBarButtonItem = UIBarButtonItem(title: rightBtnText, style: topItem.rightBarButtonItem?.style ?? .plain, target: topItem.rightBarButtonItem?.target, action: topItem.rightBarButtonItem?.action)
+                                if let saveBtnText = config["saveButtonText"] as? String, !saveBtnText.isEmpty {
+                                    topItem.rightBarButtonItem = UIBarButtonItem(title: saveBtnText, style: topItem.rightBarButtonItem?.style ?? .plain, target: topItem.rightBarButtonItem?.target, action: topItem.rightBarButtonItem?.action)
                                 }
                             }
                         })

package/lib/typescript/index.d.ts

@@ -2,8 +2,8 @@ export interface EditorConfig {
     saveToPhoto?: boolean;
     maxDuration?: number;
     title?: string;
-    leftButtonText?: string;
-    rightButtonText?: string;
+    cancelButtonText?: string;
+    saveButtonText?: string;
 }
 export declare function showEditor(videoPath: string, config?: EditorConfig): Promise<void>;
 export declare function isValidVideo(videoPath: string): Promise<boolean>;

package/lib/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,IAAI,CAAC,CAoCf;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,IAAI,CAAC,CAoCf;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhE"}

package/package.json

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

package/src/index.tsx

@@ -21,8 +21,8 @@ export interface EditorConfig {
   saveToPhoto?: boolean;
   maxDuration?: number;
   title?: string;
-  leftButtonText?: string;
-  rightButtonText?: string;
+  cancelButtonText?: string;
+  saveButtonText?: string;
 }
 
 export async function showEditor(