Refine CroppingActivityViewModel

Author: w2sv

app/src/main/java/com/autocrop/activities/cropping/CroppingActivityViewModel.kt

@@ -2,10 +2,8 @@ package com.autocrop.activities.cropping
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.autocrop.collections.CropBundle
-import com.autocrop.utilsandroid.asMutable
 
 class CroppingActivityViewModel(val uris: ArrayList<Uri>): ViewModel(){
 
@@ -15,10 +13,11 @@ class CroppingActivityViewModel(val uris: ArrayList<Uri>): ViewModel(){
     val nDismissedImages: Int
         get() = nSelectedImages - cropBundles.size
 
-    val currentImageNumber: LiveData<Int> by lazy {
-        MutableLiveData(0)
-    }
-    fun incrementCurrentImageNumber(){
-        currentImageNumber.asMutable.value = currentImageNumber.value?.plus(1)
+    val currentImageNumber: CurrentImageNumber = CurrentImageNumber()
+
+    class CurrentImageNumber: LiveData<Int>(0){
+        fun increment(){
+            postValue(value?.plus(1))
+        }
     }
 }

app/src/main/java/com/autocrop/activities/cropping/fragments/cropping/CroppingFragment.kt

@@ -16,6 +16,7 @@ import com.autocrop.collections.CropBundle
 import com.autocrop.utils.executeAsyncTask
 import com.autocrop.utils.logBeforehand
 import com.autocrop.utilsandroid.openBitmap
+import com.lyrebirdstudio.croppylib.utils.extensions.asMutable
 import com.w2sv.autocrop.R
 import com.w2sv.autocrop.databinding.CroppingFragmentBinding
 import kotlinx.coroutines.Job
@@ -37,7 +38,7 @@ class CroppingFragment
         // launch croppingJob
         croppingJob = lifecycleScope.executeAsyncTask(
             ::cropImages,
-            { sharedViewModel.incrementCurrentImageNumber() },
+            { sharedViewModel.currentImageNumber.increment()},
             { startExaminationActivityOrInvokeCroppingFailureFragment() }
         )
     }

app/src/main/java/com/autocrop/uicontroller/activity/FragmentHostingActivity.kt

@@ -8,9 +8,11 @@ abstract class FragmentHostingActivity<RF: Fragment>(
     private val rootFragmentClass: Class<RF>) :
         ViewBoundActivity(){
 
-    private val layoutId: Int by lazy { binding.root.id }
+    private val layoutId: Int by lazy {
+        binding.root.id
+    }
 
-    protected fun onSavedInstanceStateNull() {
+    protected open fun onSavedInstanceStateNull() {
         launchRootFragment()
     }
 

app/src/main/res/layout/cropping_fragment.xml

@@ -26,6 +26,8 @@
         android:layout_marginEnd="10dp"
         android:layout_marginStart="10dp"
 
+        android:progress="0"
+
         android:progressDrawable="@drawable/progress_bar_cropping_activity_progress"/>
 
     <com.autocrop.activities.cropping.fragments.cropping.views.CurrentImageNumberTextView