Fix CropAdjustmentFragment result relay

Author: w2sv

app/src/main/kotlin/com/w2sv/autocrop/activities/examination/fragments/adjustment/CropAdjustmentFragment.kt

@@ -8,8 +8,10 @@ import android.os.Bundle
 import android.text.SpannableStringBuilder
 import android.view.View
 import androidx.annotation.ColorInt
+import androidx.core.os.bundleOf
 import androidx.core.text.color
 import androidx.core.util.lruCache
+import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -47,6 +49,8 @@ class CropAdjustmentFragment
     : AppFragment<CropAdjustmentBinding>(CropAdjustmentBinding::class.java) {
 
     companion object {
+        const val REQUEST_KEY = "com.w2sv.autocrop.request_key.CROP_ADJUSTMENT_FRAGMENT_RESULT"
+
         fun getInstance(cropBundlePosition: Int): CropAdjustmentFragment =
             getFragment(
                 CropAdjustmentFragment::class.java,
@@ -213,20 +217,13 @@ class CropAdjustmentFragment
         }
 
         cancelButton.setOnClickListener {
-            parentFragmentManager.popBackStack()
+            requireActivity().supportFragmentManager.popBackStack()
         }
         applyButton.setOnClickListener {
-            parentFragmentManager.popBackStackImmediate()  // TODO
-
-            // notify ResultListener
-            (requireViewBoundFragmentActivity().getCurrentFragment() as ResultListener)
-                .onApplyAdjustedCropEdges(viewModel.cropEdgesLive.value!!)
+            setFragmentResult(REQUEST_KEY, bundleOf(CropEdges.EXTRA to viewModel.cropEdgesLive.value))
+            requireActivity().supportFragmentManager.popBackStack()
         }
     }
-
-    interface ResultListener {
-        fun onApplyAdjustedCropEdges(cropEdges: CropEdges)
-    }
 }
 
 private fun formattedUnitText(

app/src/main/kotlin/com/w2sv/autocrop/activities/examination/fragments/pager/CropPagerFragment.kt

@@ -6,9 +6,13 @@ import android.text.SpannableStringBuilder
 import android.view.View
 import android.widget.PopupMenu
 import android.widget.Toast
+import androidx.core.app.BundleCompat
+import androidx.core.content.IntentCompat
+import androidx.core.os.ParcelableCompat
 import androidx.core.text.bold
 import androidx.core.text.color
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LiveData
@@ -53,6 +57,7 @@ import com.w2sv.autocrop.ui.views.visualize
 import com.w2sv.autocrop.utils.extensions.holdingSingularElement
 import com.w2sv.autocrop.utils.getFragment
 import com.w2sv.bidirectionalviewpager.recyclerview.ImageViewHolder
+import com.w2sv.common.extensions.getParcelableCompat
 import com.w2sv.cropbundle.Crop
 import com.w2sv.cropbundle.CropBundle
 import com.w2sv.cropbundle.cropping.CropEdges
@@ -75,7 +80,6 @@ class CropPagerFragment :
     AppFragment<CropPagerBinding>(CropPagerBinding::class.java),
     CropSavingDialogFragment.ResultListener,
     SaveAllCropsDialogFragment.ResultListener,
-    CropAdjustmentFragment.ResultListener,
     RecropDialogFragment.Listener {
 
     companion object {
@@ -191,6 +195,14 @@ class CropPagerFragment :
 
     private lateinit var cropPager: CropPager
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setFragmentResultListener(CropAdjustmentFragment.REQUEST_KEY){ _, bundle ->
+            applyAdjustedCropEdges(bundle.getParcelableCompat(CropEdges.EXTRA)!!)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -365,7 +377,7 @@ class CropPagerFragment :
         }
     }
 
-    override fun onApplyAdjustedCropEdges(cropEdges: CropEdges) {
+    private fun applyAdjustedCropEdges(cropEdges: CropEdges) {
         viewModel.dataSet.liveElement.let {
             it.crop = Crop.fromScreenshot(
                 it.screenshot.getBitmap(requireContext().contentResolver),

common/src/main/kotlin/com/w2sv/common/extensions/Bundle.kt

@@ -0,0 +1,8 @@
+package com.w2sv.common.extensions
+
+import android.os.Bundle
+import android.os.Parcelable
+
+@Suppress("DEPRECATION")
+inline fun <reified T : Parcelable> Bundle.getParcelableCompat(name: String): T? =
+    getParcelable(name) as? T

cropbundle/src/main/kotlin/com/w2sv/cropbundle/cropping/CropEdges.kt

@@ -6,6 +6,10 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class CropEdges(val top: Int, val bottom: Int) : Parcelable {
 
+    companion object {
+        const val EXTRA = "com.w2sv.autocrop.extra.CROP_EDGES"
+    }
+
     constructor(edges: Pair<Int, Int>)
             : this(edges.first, edges.second)