open search when clicking explore tab again (#127)

axiel7 · Apr 22, 2024 · 08eb594 · 08eb594
1 parent c470cf7
commit 08eb594
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/app/src/main/java/com/axiel7/anihyou/ui/common/navigation/NavActionManager.kt b/app/src/main/java/com/axiel7/anihyou/ui/common/navigation/NavActionManager.kt
@@ -101,7 +101,11 @@ class NavActionManager(
     }
 
     fun toSearch() {
-        navController.navigate(NavDestination.Search.route())
+        navController.navigate(
+            NavDestination.Search.putArguments(
+                mapOf(NavArgument.Focus to TriBoolean.TRUE.value.toString())
+            )
+        )
     }
 
     fun toSearchOnMyList(mediaType: MediaType) {

diff --git a/app/src/main/java/com/axiel7/anihyou/ui/common/navigation/NavDestination.kt b/app/src/main/java/com/axiel7/anihyou/ui/common/navigation/NavDestination.kt
@@ -208,7 +208,7 @@ enum class NavDestination(
 
     val namedNavArguments get() = arguments.map { it.toNamedNavArgument() }
 
-    fun putArguments(arguments: Map<NavArgument, String?>): String {
+    fun putArguments(arguments: Map<NavArgument, String?> = emptyMap()): String {
         var routeWithArguments = route()
         this.arguments.forEach { destArg ->
             val value = arguments.getOrDefault(destArg.argument, null)

diff --git a/app/src/main/java/com/axiel7/anihyou/ui/screens/main/MainActivity.kt b/app/src/main/java/com/axiel7/anihyou/ui/screens/main/MainActivity.kt
@@ -42,6 +42,7 @@ import com.axiel7.anihyou.common.firstBlocking
 import com.axiel7.anihyou.data.model.DeepLink
 import com.axiel7.anihyou.ui.common.BottomDestination.Companion.toBottomDestinationIndex
 import com.axiel7.anihyou.ui.common.Theme
+import com.axiel7.anihyou.ui.common.navigation.NavActionManager
 import com.axiel7.anihyou.ui.screens.home.HomeTab
 import com.axiel7.anihyou.ui.screens.main.composables.MainBottomNavBar
 import com.axiel7.anihyou.ui.screens.main.composables.MainNavigationRail
@@ -176,13 +177,15 @@ fun MainView(
     deepLink: DeepLink?,
 ) {
     val navController = rememberNavController()
+    val navActionManager = NavActionManager.rememberNavActionManager(navController)
     val isCompactScreen = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact
 
     Scaffold(
         bottomBar = {
             if (isCompactScreen) {
                 MainBottomNavBar(
                     navController = navController,
+                    navActionManager = navActionManager,
                     onItemSelected = saveLastTab
                 )
             }
@@ -193,6 +196,7 @@ fun MainView(
         if (isCompactScreen) {
             MainNavigation(
                 navController = navController,
+                navActionManager = navActionManager,
                 isCompactScreen = true,
                 isLoggedIn = isLoggedIn,
                 lastTabOpened = lastTabOpened,
@@ -209,6 +213,7 @@ fun MainView(
                 )
                 MainNavigation(
                     navController = navController,
+                    navActionManager = navActionManager,
                     isCompactScreen = false,
                     isLoggedIn = isLoggedIn,
                     lastTabOpened = lastTabOpened,

diff --git a/app/src/main/java/com/axiel7/anihyou/ui/screens/main/MainNavigation.kt b/app/src/main/java/com/axiel7/anihyou/ui/screens/main/MainNavigation.kt
@@ -24,7 +24,7 @@ import com.axiel7.anihyou.ui.common.BottomDestination.Companion.toBottomDestinat
 import com.axiel7.anihyou.ui.common.navigation.DestArgument.Companion.getBoolean
 import com.axiel7.anihyou.ui.common.navigation.DestArgument.Companion.getIntArg
 import com.axiel7.anihyou.ui.common.navigation.DestArgument.Companion.getStringArg
-import com.axiel7.anihyou.ui.common.navigation.NavActionManager.Companion.rememberNavActionManager
+import com.axiel7.anihyou.ui.common.navigation.NavActionManager
 import com.axiel7.anihyou.ui.common.navigation.NavArgument
 import com.axiel7.anihyou.ui.common.navigation.NavDestination
 import com.axiel7.anihyou.ui.composables.FullScreenImageView
@@ -55,6 +55,7 @@ import com.axiel7.anihyou.ui.screens.usermedialist.UserMediaListHostView
 @Composable
 fun MainNavigation(
     navController: NavHostController,
+    navActionManager: NavActionManager,
     isCompactScreen: Boolean,
     isLoggedIn: Boolean,
     lastTabOpened: Int,
@@ -67,9 +68,6 @@ fun MainNavigation(
         label = "bottom_bar_padding"
     )
 
-    // common navigation actions
-    val navActionManager = rememberNavActionManager(navController)
-
     LaunchedEffect(deepLink) {
         if (deepLink != null) {
             when (deepLink.type) {

diff --git a/app/src/main/java/com/axiel7/anihyou/ui/screens/main/composables/MainBottomNavBar.kt b/app/src/main/java/com/axiel7/anihyou/ui/screens/main/composables/MainBottomNavBar.kt
@@ -16,10 +16,12 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
 import com.axiel7.anihyou.ui.common.BottomDestination
+import com.axiel7.anihyou.ui.common.navigation.NavActionManager
 
 @Composable
 fun MainBottomNavBar(
     navController: NavController,
+    navActionManager: NavActionManager,
     onItemSelected: (Int) -> Unit,
 ) {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
@@ -55,13 +57,23 @@ fun MainBottomNavBar(
                     },
                     selected = isSelected,
                     onClick = {
-                        onItemSelected(index)
-                        navController.navigate(dest.route) {
-                            popUpTo(navController.graph.findStartDestination().id) {
-                                saveState = true
+                        if (isSelected) {
+                            when (dest) {
+                                BottomDestination.Explore -> {
+                                    navActionManager.toSearch()
+                                }
+
+                                else -> {}
+                            }
+                        } else {
+                            onItemSelected(index)
+                            navController.navigate(dest.route) {
+                                popUpTo(navController.graph.findStartDestination().id) {
+                                    saveState = true
+                                }
+                                launchSingleTop = true
+                                restoreState = true
                             }
-                            launchSingleTop = true
-                            restoreState = true
                         }
                     }
                 )