Small changes to progress dialog

Author: danopdev

app/src/main/java/com/dan/videostab/BusyDialog.kt

@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import com.dan.videostab.databinding.BusyDialogBinding
 
-class BusyDialog( private var message: String): DialogFragment() {
+class BusyDialog( private var message: String, private var progress: Int, private var total: Int): DialogFragment() {
 
     companion object {
         private const val FRAGMENT_TAG = "busy"
@@ -29,27 +29,15 @@ class BusyDialog( private var message: String): DialogFragment() {
             }
         }
 
-        fun show(message: String) {
+        fun show(message: String, progress: Int = -1, total: Int = -1) {
             runSafe {
                 if (null == currentDialog) {
-                    val dialog = BusyDialog(message)
+                    val dialog = BusyDialog(message, progress, total)
                     dialog.isCancelable = false
                     dialog.show(activity.supportFragmentManager, FRAGMENT_TAG)
                     currentDialog = dialog
                 } else {
-                    currentDialog?.binding?.textBusyMessage?.text = message
-                }
-            }
-        }
-
-        fun updateProgress(progress: Int, total: Int) {
-            if (total <= 0 || progress < 0 || progress > total) return
-
-            runSafe {
-                currentDialog?.binding?.progressBar?.apply {
-                    this.max = total
-                    this.progress = progress
-                    this.isIndeterminate = false
+                    currentDialog?.update(message, progress, total)
                 }
             }
         }
@@ -64,10 +52,34 @@ class BusyDialog( private var message: String): DialogFragment() {
 
     private var binding: BusyDialogBinding? = null
 
+    fun update(message: String, progress: Int = -1, total: Int = -1) {
+        this.message = message
+        this.progress = progress
+        this.total = total
+        update()
+    }
+
+    private fun update() {
+        val infinite = progress < 0 || total <= 0 || progress > total
+        val title = if (progress < 0) message else "$message ($progress)"
+        binding?.let {
+            it.textBusyMessage.text = title
+            if (infinite) {
+                it.progressBar.isIndeterminate = true
+            } else {
+                it.progressBar.progress = 0
+                it.progressBar.max = total
+                it.progressBar.progress = progress
+                it.progressBar.isIndeterminate = false
+            }
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val binding = BusyDialogBinding.inflate( inflater )
         binding.textBusyMessage.text = message
         this.binding = binding
+        update()
         return binding.root
     }
 }

app/src/main/java/com/dan/videostab/MainFragment.kt

@@ -27,6 +27,10 @@ import kotlin.math.sin
 
 class MainFragment(activity: MainActivity) : AppFragment(activity) {
     companion object {
+        const val TITLE_ANALYSE = "Analyse"
+        const val TITLE_STABILIZE = "Stabilize"
+        const val TITLE_SAVE = "Save"
+
         const val INTENT_OPEN_VIDEO = 2
         const val INTENT_OPEN_IMAGES = 3
         const val INTENT_OPEN_FOLDER = 4
@@ -246,13 +250,13 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
 
 
     private fun handleStabilize() {
-        runAsync("Stabilize") {
+        runAsync(TITLE_STABILIZE) {
             stabApplyAsync()
         }
     }
 
     private fun handleSave() {
-        runAsync("Save") {
+        runAsync(TITLE_SAVE) {
             saveAsync()
         }
     }
@@ -335,12 +339,11 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
             var a = 0.0
 
             framesInput.forEachFrame { index, size, readFrame ->
-                if (firstFrame.empty()) firstFrame = readFrame.clone()
                 cvtColor(readFrame, frames[currentIndex], COLOR_BGR2GRAY)
                 val scale = scaleForAnalyse(frames[currentIndex])
 
                 frameCounter++
-                BusyDialog.updateProgress(index, size)
+                BusyDialog.show(TITLE_ANALYSE, index, size)
 
                 if (!frames[prevIndex].empty()) {
                     // Detect features in previous frame
@@ -465,8 +468,6 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
     }
 
     private fun stabApplyAsync() {
-        BusyDialog.show("Smooth movements")
-
         val framesInput = this.framesInput ?: return
         val trajectory = videoTrajectory ?: return
 
@@ -571,9 +572,8 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
         val frameStabilized = Mat()
         val t = Mat(2, 3, CV_64F)
 
-        BusyDialog.show("Stabilize")
         framesInput.forEachFrame { index, size, frame ->
-            BusyDialog.updateProgress(index, size)
+            BusyDialog.show(TITLE_STABILIZE, index, size)
 
             transforms.getTransform(index, t)
             warpAffine(frame, frameStabilized, t, frame.size())
@@ -633,6 +633,7 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
             }
 
             firstFrame = framesInput.firstFrame()
+            scaleForAnalyse(firstFrame)
         }
     }
 
@@ -668,7 +669,7 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
 
     private fun stabAnalyse() {
         videoTrajectory = null
-        runAsync("Analyse") { stabAnalyzeAsync() }
+        runAsync(TITLE_ANALYSE) { stabAnalyzeAsync() }
     }
 
     private fun updateView() {