Pop cropScreen when navigating forward

Author: w2sv

.idea/caches/deviceStreaming.xml

@@ -20,7 +20,8 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
         super.onCreate(savedInstanceState)
 
         if (BuildConfig.DEBUG) {
-            findNavController(R.id.nav_host_fragment).currentBackStack.collectOn(lifecycleScope) { backStackEntries ->
+            val navController = findNavController(R.id.nav_host_fragment)
+            navController.currentBackStack.collectOn(lifecycleScope) { backStackEntries ->
                 i { "BackStack: ${backStackEntries.map { it.destination.displayName.substringAfterLast("/") }}" }
             }
         }

.idea/navEditor.xml

@@ -1,8 +1,11 @@
 package com.w2sv.autocrop.ui.designsystem
 
+import android.os.Bundle
+import androidx.annotation.IdRes
 import androidx.annotation.MainThread
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
+import androidx.navigation.NavGraph
 import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.Navigator
 import androidx.navigation.navOptions
@@ -14,9 +17,41 @@ fun NavController.navigateAnimated(
     extras: Navigator.Extras? = null,
     optionsBuilder: NavOptionsBuilder.() -> Unit = {}
 ) {
-    navigate(
+    navigateAnimated(
+        resId = directions.actionId,
+        args = directions.arguments,
+        extras = extras,
+        optionsBuilder = optionsBuilder
+    )
+}
+
+@MainThread
+fun NavController.navigateAnimatedAndPopCurrentDestination(
+    directions: NavDirections,
+    extras: Navigator.Extras? = null,
+    optionsBuilder: NavOptionsBuilder.() -> Unit = {}
+) {
+    navigateAnimated(
         resId = directions.actionId,
         args = directions.arguments,
+        extras = extras,
+        optionsBuilder = {
+            popUpTo(checkNotNull(currentDestination).id, { inclusive = true })
+            optionsBuilder()
+        }
+    )
+}
+
+@MainThread
+fun NavController.navigateAnimated(
+    @IdRes resId: Int,
+    args: Bundle? = null,
+    extras: Navigator.Extras? = null,
+    optionsBuilder: NavOptionsBuilder.() -> Unit = {}
+) {
+    navigate(
+        resId = resId,
+        args = args,
         navigatorExtras = extras,
         navOptions = navOptions {
             launchSingleTop = true
@@ -30,3 +65,10 @@ fun NavController.navigateAnimated(
         }
     )
 }
+
+/**
+ * Returns the current subgraph (the parent graph of the active destination),
+ * or null if no active destination exists.
+ */
+fun NavController.currentSubGraph(): NavGraph? =
+    currentDestination?.parent

app/src/main/kotlin/com/w2sv/autocrop/MainActivity.kt

@@ -27,12 +27,22 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import slimber.log.i
 
 inline fun <reified VM : ViewModel> Fragment.cropNavGraphViewModel(): Lazy<VM> =
     hiltNavGraphViewModels<VM>(R.id.crop_nav_graph)
 
 @HiltViewModel
-class CropSessionViewModel @Inject constructor(val cropSession: CropSession) : ViewModel()
+class CropSessionViewModel @Inject constructor(val cropSession: CropSession) : ViewModel() {
+    init {
+        i { "Lifecycle: init" }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        i { "Lifecycle: onCleared" }
+    }
+}
 
 interface CropSessionAccessingViewModelFactory<VM : ViewModel> {
     fun create(cropSession: CropSession): VM

app/src/main/kotlin/com/w2sv/autocrop/ui/designsystem/Navigation.kt

@@ -7,7 +7,7 @@ import com.w2sv.androidutils.BackPressHandler
 import com.w2sv.androidutils.widget.showToast
 import com.w2sv.autocrop.databinding.CropBinding
 import com.w2sv.autocrop.ui.AppFragment
-import com.w2sv.autocrop.ui.designsystem.navigateAnimated
+import com.w2sv.autocrop.ui.designsystem.navigateAnimatedAndPopCurrentDestination
 import com.w2sv.autocrop.ui.screen.cropSessionInjectedViewModel
 import com.w2sv.autocrop.ui.util.Constant
 import com.w2sv.core.common.R.string as Strings
@@ -58,8 +58,16 @@ class CropFragment : AppFragment<CropBinding>(CropBinding::class.java) {
         lifecycleScope.launch {
             viewModel.cropScreenshots(
                 contentResolver = requireContext().contentResolver,
-                onAnySuccessfulCrops = { navController.navigateAnimated(CropFragmentDirections.navigateToCropPagerScreen()) },
-                onNoSuccessfulCrops = { navController.navigateAnimated(CropFragmentDirections.navigateToCroppingFailedScreen()) }
+                onAnySuccessfulCrops = {
+                    navController.navigateAnimatedAndPopCurrentDestination(
+                        CropFragmentDirections.navigateToCropPagerScreen()
+                    )
+                },
+                onNoSuccessfulCrops = {
+                    navController.navigateAnimatedAndPopCurrentDestination(
+                        CropFragmentDirections.navigateToCroppingFailedScreen()
+                    )
+                }
             )
         }
     }

app/src/main/kotlin/com/w2sv/autocrop/ui/screen/CropBundleViewModel.kt

@@ -4,22 +4,14 @@ import android.os.Bundle
 import android.view.View
 import com.w2sv.autocrop.databinding.CroppingFailedBinding
 import com.w2sv.autocrop.ui.AppFragment
-import com.w2sv.autocrop.ui.designsystem.navigateAnimated
 
 class CroppingFailedScreenFragment : AppFragment<CroppingFailedBinding>(CroppingFailedBinding::class.java) {
 
-    override val onBackPressed: () -> Unit
-        get() = ::navigateToMainActivity
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         binding.gotItButton.setOnClickListener {
-            navigateToMainActivity()
+            navController.popBackStack()
         }
     }
-
-    private fun navigateToMainActivity() {
-        navController.navigateAnimated(CroppingFailedScreenFragmentDirections.navigateToHomeScreen())
-    }
 }

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/main_nav_graph"
     app:startDestination="@id/home_screen">
 
     <fragment
@@ -26,25 +27,16 @@
 
             <action
                 android:id="@+id/navigate_to_cropping_failed_screen"
-                app:destination="@id/cropping_failed_screen"
-                app:popUpTo="@id/crop_nav_graph"
-                app:popUpToInclusive="false" />
+                app:destination="@id/cropping_failed_screen" />
 
             <action
                 android:id="@+id/navigate_to_crop_pager_screen"
-                app:destination="@id/crop_pager_screen"
-                app:popUpTo="@id/crop_nav_graph"
-                app:popUpToInclusive="false" />
+                app:destination="@id/crop_pager_screen" />
         </fragment>
 
         <fragment
             android:id="@+id/cropping_failed_screen"
-            android:name="com.w2sv.autocrop.ui.screen.croppingfailed.CroppingFailedScreenFragment">
-
-            <action
-                android:id="@+id/navigate_to_home_screen"
-                app:destination="@id/home_screen" />
-        </fragment>
+            android:name="com.w2sv.autocrop.ui.screen.croppingfailed.CroppingFailedScreenFragment" />
 
         <fragment
             android:id="@+id/crop_pager_screen"