Fix onBackPresses across application

Author: w2sv

.gitignore

@@ -42,7 +42,7 @@ captures/
 # Keystore files
 keystore.properties
 /keys.jks
-/service-account-key.json
+/app/service-account-key.json
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild

.idea/inspectionProfiles/Project_Default.xml

@@ -1,2 +1,3 @@
 /build
 /release
+/service-account-key.json

app/.gitignore

@@ -2,24 +2,16 @@ package com.w2sv.autocrop.activities.crop
 
 import androidx.fragment.app.Fragment
 import com.w2sv.androidutils.os.getParcelableArrayListCompat
-import com.w2sv.autocrop.activities.AppActivity
+import com.w2sv.autocrop.activities.ViewBoundFragmentActivity
 import com.w2sv.autocrop.activities.main.MainActivity
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint  // Resolves java.lang.IllegalStateException: Hilt Fragments must be attached to an @AndroidEntryPoint Activity
-class CropActivity : AppActivity() {
+class CropActivity : ViewBoundFragmentActivity() {
 
     override fun getRootFragment(): Fragment =
         CropFragment
             .getInstance(
                 intent.getParcelableArrayListCompat(MainActivity.EXTRA_SELECTED_IMAGE_URIS)!!
             )
-
-    override fun handleOnBackPressed() {
-        when (val fragment = getCurrentFragment()) {
-            is CroppingFailedFragment -> MainActivity.start(this)
-            is CropFragment -> fragment.onBackPress()
-            else -> throw IllegalStateException("Invalid Fragment type")
-        }
-    }
 }

app/src/main/kotlin/com/w2sv/autocrop/activities/AppActivity.kt

@@ -22,10 +22,11 @@ import com.w2sv.autocrop.activities.crop.domain.CropResults
 import com.w2sv.autocrop.activities.examination.ExaminationActivity
 import com.w2sv.autocrop.activities.main.MainActivity
 import com.w2sv.autocrop.databinding.CropBinding
+import com.w2sv.autocrop.ui.Constant
 import com.w2sv.autocrop.utils.extensions.launchAfterShortDelay
 import com.w2sv.autocrop.utils.getFragment
+import com.w2sv.autocrop.utils.registerOnBackPressedHandler
 import com.w2sv.autocrop.utils.requireCastActivity
-import com.w2sv.autocrop.ui.Constant
 import com.w2sv.cropbundle.CropBundle
 import com.w2sv.domain.repository.PreferencesRepository
 import dagger.hilt.android.AndroidEntryPoint
@@ -118,6 +119,21 @@ class CropFragment
 
     private val viewModel by viewModels<ViewModel>()
 
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        registerOnBackPressedHandler {
+            viewModel.backPressListener(
+                onFirstPress = {
+                    requireContext().showToast(getString(R.string.tap_again_to_cancel))
+                },
+                onSecondPress = {
+                    MainActivity.start(requireActivity())
+                }
+            )
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -173,17 +189,6 @@ class CropFragment
         Animatoo.animateSwipeLeft(requireActivity())
     }
 
-    fun onBackPress() {
-        viewModel.backPressListener(
-            {
-                requireContext().showToast(getString(R.string.tap_again_to_cancel))
-            },
-            {
-                MainActivity.start(requireContext())
-            }
-        )
-    }
-
     companion object {
         fun getInstance(screenshotUris: List<Uri>): CropFragment =
             getFragment(CropFragment::class.java, MainActivity.EXTRA_SELECTED_IMAGE_URIS to screenshotUris)

app/src/main/kotlin/com/w2sv/autocrop/activities/crop/CropActivity.kt

@@ -1,19 +1,33 @@
 package com.w2sv.autocrop.activities.crop
 
+import android.content.Context
 import android.os.Bundle
 import android.view.View
 import com.w2sv.autocrop.activities.AppFragment
 import com.w2sv.autocrop.activities.main.MainActivity
 import com.w2sv.autocrop.databinding.CroppingFailedBinding
+import com.w2sv.autocrop.utils.registerOnBackPressedHandler
 
 class CroppingFailedFragment
     : AppFragment<CroppingFailedBinding>(CroppingFailedBinding::class.java) {
 
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        registerOnBackPressedHandler {
+            navigateToMainActivity()
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         binding.gotItButton.setOnClickListener {
-            MainActivity.start(requireContext())
+            navigateToMainActivity()
         }
     }
+
+    private fun navigateToMainActivity() {
+        MainActivity.start(requireActivity())
+    }
 }

app/src/main/kotlin/com/w2sv/autocrop/activities/crop/CropFragment.kt

@@ -1,19 +1,15 @@
 package com.w2sv.autocrop.activities.examination
 
+import android.app.Activity
 import android.content.Context
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.viewModelScope
 import com.w2sv.androidutils.os.getParcelableCompat
-import com.w2sv.androidutils.widget.showToast
-import com.w2sv.autocrop.R
-import com.w2sv.autocrop.activities.AppActivity
+import com.w2sv.autocrop.activities.ViewBoundFragmentActivity
 import com.w2sv.autocrop.activities.crop.domain.CropResults
-import com.w2sv.autocrop.activities.examination.adjustment.CropAdjustmentFragment
-import com.w2sv.autocrop.activities.examination.comparison.ComparisonFragment
 import com.w2sv.autocrop.activities.examination.exit.ExitFragment
 import com.w2sv.autocrop.activities.examination.pager.CropPagerFragment
-import com.w2sv.autocrop.activities.examination.saveall.SaveAllFragment
 import com.w2sv.autocrop.activities.main.MainActivity
 import com.w2sv.cropbundle.CropBundle
 import com.w2sv.cropbundle.io.CropBundleIOProcessingUseCase
@@ -29,7 +25,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ExaminationActivity : AppActivity() {
+class ExaminationActivity : ViewBoundFragmentActivity() {
 
     @HiltViewModel
     class ViewModel @Inject constructor(
@@ -74,9 +70,9 @@ class ExaminationActivity : AppActivity() {
             SharingStarted.Eagerly
         )
 
-        fun startMainActivity(context: Context) {
+        fun navigateToMainActivity(activity: Activity) {
             MainActivity.start(
-                context = context,
+                activity = activity,
                 configureIntent = {
                     putExtra(IOResults.EXTRA, IOResults.get(cropBundleIOResults))
                 }
@@ -118,14 +114,4 @@ class ExaminationActivity : AppActivity() {
         )
             .commit()
     }
-
-    override fun handleOnBackPressed() {
-        when (val fragment = getCurrentFragment()) {
-            is ComparisonFragment -> fragment.popFromFragmentManager(supportFragmentManager)
-            is CropAdjustmentFragment -> supportFragmentManager.popBackStack()
-            is SaveAllFragment -> showToast(getString(R.string.wait_until_crops_have_been_saved))
-            is CropPagerFragment -> fragment.onBackPress()
-            else -> throw IllegalStateException("Invalid Fragment type")
-        }
-    }
 }

app/src/main/kotlin/com/w2sv/autocrop/activities/crop/CroppingFailedFragment.kt

@@ -10,7 +10,6 @@ import android.view.MotionEvent.ACTION_DOWN
 import android.view.MotionEvent.ACTION_UP
 import android.view.View
 import android.view.animation.DecelerateInterpolator
-import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -31,6 +30,7 @@ import com.w2sv.autocrop.activities.examination.comparison.model.ImageType
 import com.w2sv.autocrop.databinding.ComparisonBinding
 import com.w2sv.autocrop.utils.extensions.launchAfterShortDelay
 import com.w2sv.autocrop.utils.getFragment
+import com.w2sv.autocrop.utils.registerOnBackPressedHandler
 import com.w2sv.cropbundle.CropBundle
 import com.w2sv.domain.repository.PreferencesRepository
 import dagger.hilt.android.AndroidEntryPoint
@@ -98,6 +98,11 @@ class ComparisonFragment
                     }
                 }
             )
+
+        registerOnBackPressedHandler {
+            binding.cropIv.show()
+            parentFragmentManager.popBackStack()
+        }
     }
 
     private fun onEnterTransitionCompleted() {
@@ -162,11 +167,6 @@ class ComparisonFragment
         }
     }
 
-    fun popFromFragmentManager(fragmentManager: FragmentManager) {
-        binding.cropIv.show()
-        fragmentManager.popBackStack()
-    }
-
     companion object {
         fun getInstance(cropBundlePosition: Int): ComparisonFragment =
             getFragment(ComparisonFragment::class.java, CropBundle.EXTRA_POSITION to cropBundlePosition)

app/src/main/kotlin/com/w2sv/autocrop/activities/examination/ExaminationActivity.kt

@@ -101,7 +101,7 @@ class ExitFragment :
                     .random()
             )
                 .onEnd {
-                    activityViewModel.startMainActivity(requireContext())
+                    activityViewModel.navigateToMainActivity(requireActivity())
                 }
                 .play()
         }