Fix navigation (wip)

bubelov · bubelov · commit 45656408d807 · 2026-03-17T12:08:03.000+07:00
diff --git a/app/src/main/kotlin/auth/AuthFragment.kt b/app/src/main/kotlin/auth/AuthFragment.kt
@@ -5,11 +5,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
 import co.appreactor.news.R
 import co.appreactor.news.databinding.FragmentAuthBinding
 import di.Di
 import entries.EntriesFilter
+import entries.EntriesFragment
+import navigation.Activity
 import navigation.NavDirections
 import navigation.findNavController
 
@@ -48,19 +54,31 @@ class AuthFragment : Fragment() {
         useStandaloneBackend.setOnClickListener {
             binding.root.animate().alpha(0f).withEndAction {
                 model.setStandaloneBackend()
-                findNavController().navigate(
-                    R.id.newsFragment,
-                    NavDirections.AuthFragment.actionAuthFragmentToNewsFragment(EntriesFilter.NotBookmarked)
-                )
+
+                parentFragmentManager.commit {
+                    setReorderingAllowed(true)
+                    replace(
+                        R.id.fragmentContainerView,
+                        EntriesFragment::class.java,
+                        bundleOf("filter" to EntriesFilter.NotBookmarked),
+                    )
+                    addToBackStack(null)
+                }
+
+                (activity as Activity).binding.bottomNav.isVisible = true
             }
         }
 
         useMinifluxBackend.setOnClickListener {
-            findNavController().navigate(R.id.minifluxAuthFragment)
+            parentFragmentManager.commit {
+                setReorderingAllowed(true)
+                replace<MinifluxAuthFragment>(R.id.fragmentContainerView)
+                addToBackStack(null)
+            }
         }
 
         useNextcloudBackend.setOnClickListener {
-            findNavController().navigate(R.id.nextcloudAuthFragment)
+            TODO()
         }
     }
 }
diff --git a/app/src/main/kotlin/auth/MinifluxAuthFragment.kt b/app/src/main/kotlin/auth/MinifluxAuthFragment.kt
@@ -38,7 +38,7 @@ class MinifluxAuthFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.apply {
-            toolbar.setNavigationOnClickListener { findNavController().popBackStack() }
+            toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
 
             password.setOnEditorActionListener { _, actionId, keyEvent ->
                 if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER) {
diff --git a/app/src/main/kotlin/navigation/Activity.kt b/app/src/main/kotlin/navigation/Activity.kt
@@ -1,59 +1,32 @@
 package navigation
 
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.forEach
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
-import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
 import androidx.lifecycle.lifecycleScope
 import co.appreactor.news.R
 import co.appreactor.news.databinding.ActivityBinding
 import com.google.android.material.navigation.NavigationBarView.OnItemReselectedListener
 import conf.ConfRepo
 import di.Di
 import entries.EntriesFilter
-import kotlinx.coroutines.flow.first
+import entries.EntriesFragment
+import feeds.FeedsFragment
 import kotlinx.coroutines.launch
 import opengraph.OpenGraphImagesRepo
 
 class Activity : AppCompatActivity() {
 
     lateinit var binding: ActivityBinding
 
-    private val navController: NavController by lazy { getSharedNavController()!! }
-
-    private var currentDestinationId: Int = R.id.newsFragment
-
-    private var destinationChangedListener: ((Int, Bundle?) -> Unit)? = null
-
-    private val backPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            android.util.Log.d("Activity", "Gesture back pressed")
-            if (!navController.popBackStack()) {
-                isEnabled = false
-                onBackPressedDispatcher.onBackPressed()
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onBackPressed() {
-        android.util.Log.d("Activity", "XXXX onBackPressed called")
-        if (!navController.popBackStack()) {
-            @Suppress("DEPRECATION")
-            super.onBackPressed()
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        android.util.Log.d("Activity", "XXXX onCreate called - NEW INSTANCE")
         binding = ActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -68,111 +41,76 @@ class Activity : AppCompatActivity() {
 
         Di.get(ConfRepo::class.java).update { it.copy(syncedOnStartup = false) }
         lifecycleScope.launch { Di.get(OpenGraphImagesRepo::class.java).fetchEntryImages() }
-
-        NavController.create(supportFragmentManager, R.id.navHost)
-        
-        onBackPressedDispatcher.addCallback(this, backPressedCallback)
     }
 
     override fun onStart() {
         super.onStart()
-        android.util.Log.d("Activity", "XXXX onStart called")
-        
-        destinationChangedListener?.let { navController.removeOnDestinationChangedListener(it) }
 
-        destinationChangedListener = { destinationId, args ->
-            android.util.Log.d("Activity", "Destination changed: $destinationId")
-            currentDestinationId = destinationId
-
-            // Use the visible fragment to determine bottom nav visibility
-            updateBottomNavForCurrentDestination()
+        lifecycleScope.launch {
+            val confRepo = Di.get(ConfRepo::class.java)
+            val config = confRepo.conf.value
 
-            if (binding.bottomNav.isVisible) {
-                binding.bottomNav.menu.forEach { item ->
-                    if (item.itemId == destinationId) {
-                        item.isChecked = true
-                    }
+            if (config.backend.isNotBlank()) {
+                supportFragmentManager.commit {
+                    replace(
+                        R.id.fragmentContainerView,
+                        EntriesFragment::class.java,
+                        bundleOf("filter" to EntriesFilter.NotBookmarked),
+                    )
                 }
-            }
 
-            when (destinationId) {
-                R.id.newsFragment -> args?.putParcelable("filter", EntriesFilter.NotBookmarked)
-                R.id.bookmarksFragment -> args?.putParcelable("filter", EntriesFilter.Bookmarked)
+                binding.bottomNav.isVisible = true
+            } else {
+//                supportFragmentManager.commit {
+//                    setReorderingAllowed(true)
+//                    replace<AuthFragment>(R.id.fragmentContainerView)
+//                    addToBackStack(null)
+//                }
             }
         }
 
-        navController.addOnDestinationChangedListener(destinationChangedListener!!)
-
-        if (navController.getCurrentDestinationId() == null) {
-            navigateToStartDestination()
-        }
-
-        updateBottomNavForCurrentDestination()
-
         binding.bottomNav.apply {
             setOnItemSelectedListener { item ->
                 when (item.itemId) {
                     R.id.newsFragment -> {
-                        navController.navigate(R.id.newsFragment, NavDirections.AuthFragment.actionAuthFragmentToNewsFragment(EntriesFilter.NotBookmarked))
+                        supportFragmentManager.commit {
+                            replace(
+                                R.id.fragmentContainerView,
+                                EntriesFragment::class.java,
+                                bundleOf("filter" to EntriesFilter.NotBookmarked),
+                            )
+                        }
                         true
                     }
+
                     R.id.bookmarksFragment -> {
-                        navController.navigate(R.id.bookmarksFragment, NavDirections.AuthFragment.actionAuthFragmentToNewsFragment(EntriesFilter.Bookmarked))
+                        supportFragmentManager.commit {
+                            replace(
+                                R.id.fragmentContainerView,
+                                EntriesFragment::class.java,
+                                bundleOf("filter" to EntriesFilter.Bookmarked),
+                            )
+                        }
                         true
                     }
+
                     R.id.feedsFragment -> {
-                        navController.navigate(R.id.feedsFragment)
+                        supportFragmentManager.commit {
+                            replace(
+                                R.id.fragmentContainerView,
+                                FeedsFragment::class.java,
+                                bundleOf("url" to ""),
+                            )
+                        }
                         true
                     }
+
                     else -> false
                 }
             }
-            setOnItemReselectedListener(createOnItemReselectedListener())
-        }
-    }
 
-    private fun updateBottomNavForCurrentDestination() {
-        // Check the actual visible fragment to determine bottom nav visibility
-        val visibleFragment = supportFragmentManager.findFragmentById(R.id.navHost)
-        
-        val showBottomNav = when (visibleFragment) {
-            is entries.EntriesFragment -> true
-            is feeds.FeedsFragment -> true
-            else -> false
-        }
-        
-        binding.bottomNav.isVisible = showBottomNav
-        android.util.Log.d("Activity", "Bottom nav visibility: $showBottomNav for ${visibleFragment?.javaClass?.simpleName}")
-    }
-
-    private fun navigateToStartDestination() {
-        lifecycleScope.launch {
-            val confRepo = Di.get(ConfRepo::class.java)
-            val config = confRepo.conf.value
-            
-            // Only navigate to news if already configured, otherwise go to auth
-            if (config.minifluxServerUrl.isNotBlank() || config.nextcloudServerUrl.isNotBlank() || config.initialSyncCompleted) {
-                navController.navigate(R.id.newsFragment, NavDirections.AuthFragment.actionAuthFragmentToNewsFragment(EntriesFilter.NotBookmarked))
-            } else {
-                navController.navigate(R.id.authFragment)
-            }
-        }
-    }
-
-    private fun updateBottomNavVisibility(destinationId: Int) {
-        val showBottomNav = when (destinationId) {
-            R.id.authFragment,
-            R.id.minifluxAuthFragment,
-            R.id.nextcloudAuthFragment,
-            R.id.settingsFragment,
-            R.id.enclosuresFragment,
-            R.id.entryFragment,
-            R.id.searchFragment,
-            R.id.feedEntriesFragment,
-            R.id.feedSettingsFragment -> false
-            else -> true
+            setOnItemReselectedListener(createOnItemReselectedListener())
         }
-        binding.bottomNav.isVisible = showBottomNav
     }
 
     private fun createOnItemReselectedListener(): OnItemReselectedListener {
@@ -184,14 +122,4 @@ class Activity : AppCompatActivity() {
             }
         }
     }
-
-    override fun onResume() {
-        super.onResume()
-        android.util.Log.d("Activity", "XXXX onResume called - updating bottom nav")
-        
-        // Post the update to ensure the fragment transaction is complete
-        binding.bottomNav.postDelayed({
-            updateBottomNavForCurrentDestination()
-        }, 100)
-    }
 }
diff --git a/app/src/main/kotlin/navigation/NavController.kt b/app/src/main/kotlin/navigation/NavController.kt
@@ -213,7 +213,7 @@ private var sharedNavController: NavController? = null
 
 fun Fragment.findNavController(): NavController {
     val activity = requireActivity()
-    val containerView = activity.findViewById<android.view.View>(R.id.navHost)
+    val containerView = activity.findViewById<android.view.View>(R.id.fragmentContainerView)
     val containerViewId = containerView?.id ?: throw IllegalStateException("navHost not found")
     val fragmentManager = activity.supportFragmentManager
     
diff --git a/app/src/main/res/layout/activity.xml b/app/src/main/res/layout/activity.xml
@@ -6,8 +6,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:id="@+id/navHost"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainerView"
+        android:name="auth.AuthFragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
