Proper navigation after auth flow

Android-Academy-Global · Aug 16, 2020 · c73995f · c73995f
1 parent 1bcea4f
commit c73995f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/app/src/main/java/com/aaglobal/jnc_playground/ui/auth/FinishAuthFragment.kt b/app/src/main/java/com/aaglobal/jnc_playground/ui/auth/FinishAuthFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.findNavController
 import com.aaglobal.jnc_playground.R
@@ -16,18 +17,24 @@ class FinishAuthFragment : Fragment(R.layout.fragment_finish_auth) {
         const val AUTH_FLOW_RESULT_KEY = "auth_flow_result"
     }
 
+    private val finishAuthViewModel: FinishAuthViewModel by viewModels()
 
     private var callback: OnBackPressedCallback? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         fragment_finish_auth__button.setOnClickListener {
+            // Save hasAuthData flag in prefs
+            finishAuthViewModel.setFinishAuthFlag()
+
+            // Navigate back from auth flow
             Navigation.findNavController(
                 requireActivity(),
                 R.id.activity_root__fragment__nav_host
             ).popBackStack(R.id.auth__nav_graph, true)
 
+            // Send signal about finishing flow
             findNavController().currentBackStackEntry?.savedStateHandle?.set(AUTH_FLOW_RESULT_KEY, true)
         }
 

diff --git a/app/src/main/java/com/aaglobal/jnc_playground/ui/auth/FinishAuthViewModel.kt b/app/src/main/java/com/aaglobal/jnc_playground/ui/auth/FinishAuthViewModel.kt
@@ -0,0 +1,16 @@
+package com.aaglobal.jnc_playground.ui.auth
+
+import androidx.lifecycle.ViewModel
+import com.aaglobal.jnc_playground.di.GlobalDI
+
+
+class FinishAuthViewModel : ViewModel() {
+
+    private val authRepository = GlobalDI.getAuthRepository()
+
+
+    fun setFinishAuthFlag() {
+        authRepository.putHasAuthData(true)
+    }
+
+}
diff --git a/app/src/main/java/com/aaglobal/jnc_playground/ui/splash/SplashFragment.kt b/app/src/main/java/com/aaglobal/jnc_playground/ui/splash/SplashFragment.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import com.aaglobal.jnc_playground.R
+import com.aaglobal.jnc_playground.ui.auth.FinishAuthFragment
 import com.aaglobal.jnc_playground.ui.auth.StartAuthFragmentArgs
 
 
@@ -18,6 +19,15 @@ class SplashFragment : Fragment(R.layout.fragment_splash) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val authResult = findNavController().currentBackStackEntry
+            ?.savedStateHandle
+            ?.remove<Boolean>(FinishAuthFragment.AUTH_FLOW_RESULT_KEY) == true
+
+        if (authResult) {
+            navigateToMainScreen()
+            return
+        }
+
         // Navigate with SingleLiveEvent from Splash screen
         splashViewModel.splashNavCommand.observe(viewLifecycleOwner, Observer { splashNavCommand ->
             when (splashNavCommand) {