fix: show progress dialog first before start trimming

maitrungduc1410 · Sep 8, 2024 · b15f733 · b15f733
1 parent 1c5bd9c
commit b15f733
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 48 deletions.
diff --git a/android/src/main/java/com/videotrim/VideoTrimModule.java b/android/src/main/java/com/videotrim/VideoTrimModule.java
@@ -260,14 +260,6 @@ public void onLoad(int duration) {
     sendEvent(getReactApplicationContext(), "onLoad", map);
   }
 
-  @Override
-  public void onStartTrim() {
-    sendEvent(getReactApplicationContext(), "onStartTrimming", null);
-    runOnUiThread(() -> {
-      buildDialog();
-    });
-  }
-
   @Override
   public void onTrimmingProgress(int percentage) {
     // prevent onTrimmingProgress is called after onFinishTrim (some rare cases)
@@ -361,7 +353,7 @@ public void onCancel() {
   @Override
   public void onSave() {
     if (!enableSaveDialog) {
-      trimmerView.onSaveClicked();
+      startTrim();
       return;
     }
 
@@ -371,7 +363,7 @@ public void onSave() {
     builder.setCancelable(false);
     builder.setPositiveButton(saveDialogConfirmText, (dialog, which) -> {
       dialog.cancel();
-      trimmerView.onSaveClicked();
+      startTrim();
     });
     builder.setNegativeButton(saveDialogCancelText, (dialog, which) -> {
       dialog.cancel();
@@ -390,32 +382,7 @@ public void onStatistics(WritableMap statistics) {
     sendEvent(getReactApplicationContext(), "onStatistics", statistics);
   }
 
-  private void hideDialog(boolean shouldCloseEditor) {
-    // handle the case when the cancel dialog is still showing but the trimming is finished
-    if (cancelTrimmingConfirmDialog != null) {
-      if (cancelTrimmingConfirmDialog.isShowing()) {
-        cancelTrimmingConfirmDialog.dismiss();
-      }
-      cancelTrimmingConfirmDialog = null;
-    }
-
-    if (mProgressDialog != null) {
-      if (mProgressDialog.isShowing()) mProgressDialog.dismiss();
-      mProgressBar = null;
-      mProgressDialog = null;
-    }
-
-    if (shouldCloseEditor) {
-      if (alertDialog != null) {
-        if (alertDialog.isShowing()) {
-          alertDialog.dismiss();
-        }
-        alertDialog = null;
-      }
-    }
-  }
-
-  private void buildDialog() {
+  private void startTrim() {
     Activity activity = getReactApplicationContext().getCurrentActivity();
     // Create the parent layout for the dialog
     LinearLayout layout = new LinearLayout(activity);
@@ -469,10 +436,7 @@ private void buildDialog() {
           builder.setTitle(cancelTrimmingDialogTitle);
           builder.setCancelable(false);
           builder.setPositiveButton(cancelTrimmingDialogConfirmText, (dialog, which) -> {
-            if (trimmerView != null) {
-              // prevent trimmerView is null in some rare cases
-              trimmerView.onCancelTrimClicked();
-            }
+            trimmerView.onCancelTrimClicked();
 
             if (mProgressDialog != null && mProgressDialog.isShowing()) {
               mProgressDialog.dismiss();
@@ -484,10 +448,7 @@ private void buildDialog() {
           cancelTrimmingConfirmDialog = builder.create();
           cancelTrimmingConfirmDialog.show();
         } else {
-          if (trimmerView != null) {
-            // prevent trimmerView is null in some rare cases
-            trimmerView.onCancelTrimClicked();
-          }
+          trimmerView.onCancelTrimClicked();
 
           if (mProgressDialog != null && mProgressDialog.isShowing()) {
             mProgressDialog.dismiss();
@@ -504,9 +465,40 @@ private void buildDialog() {
 
     // Show the dialog
     mProgressDialog = builder.create();
+
+    mProgressDialog.setOnShowListener(dialog -> {
+      sendEvent(getReactApplicationContext(), "onStartTrimming", null);
+      trimmerView.onSaveClicked();
+    });
+
     mProgressDialog.show();
   }
 
+  private void hideDialog(boolean shouldCloseEditor) {
+    // handle the case when the cancel dialog is still showing but the trimming is finished
+    if (cancelTrimmingConfirmDialog != null) {
+      if (cancelTrimmingConfirmDialog.isShowing()) {
+        cancelTrimmingConfirmDialog.dismiss();
+      }
+      cancelTrimmingConfirmDialog = null;
+    }
+
+    if (mProgressDialog != null) {
+      if (mProgressDialog.isShowing()) mProgressDialog.dismiss();
+      mProgressBar = null;
+      mProgressDialog = null;
+    }
+
+    if (shouldCloseEditor) {
+      if (alertDialog != null) {
+        if (alertDialog.isShowing()) {
+          alertDialog.dismiss();
+        }
+        alertDialog = null;
+      }
+    }
+  }
+
   @ReactMethod
   public void addListener(String eventName) {
     // This method is required by React

diff --git a/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java b/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java
@@ -5,7 +5,6 @@
 
 public interface VideoTrimListener {
   void onLoad(int duration);
-  void onStartTrim();
   void onTrimmingProgress(int percentage);
   void onFinishTrim(String url, long startMs, long endMs, int videoDuration);
   void onCancelTrim();

diff --git a/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.java b/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.java
@@ -52,8 +52,6 @@ public static FFmpegSession trim(String inputFile, String outputFile, int videoD
     // Format the current date and time
     String formattedDateTime = dateFormat.format(currentDate);
 
-    callback.onStartTrim();
-
     String[] cmds = {
       "-ss",
       startMs + "ms",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",