From 596ad2ccbe609c39cf4d6befa3e4e0f02940cc45 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Thu, 8 Aug 2024 10:24:29 +0800
Subject: [PATCH] Refactor(Navigation): Remove handleOnCanScrollChange

---
 .../fatweb/oxygen/toolbox/navigation/OxygenNavHost.kt  |  6 ++----
 .../oxygen/toolbox/navigation/ToolsNavigation.kt       |  6 ++----
 .../kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt   |  7 +------
 .../top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt   | 10 +---------
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/OxygenNavHost.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/OxygenNavHost.kt
index 191879a..8f77dcb 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/OxygenNavHost.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/OxygenNavHost.kt
@@ -10,8 +10,7 @@ fun OxygenNavHost(
     modifier: Modifier = Modifier,
     appState: OxygenAppState,
     onShowSnackbar: suspend (String, String?) -> Boolean,
-    startDestination: String,
-    handleOnCanScrollChange: (Boolean) -> Unit
+    startDestination: String
 ) {
     val navController = appState.navController
     NavHost(
@@ -31,8 +30,7 @@ fun OxygenNavHost(
         )
         toolsScreen(
             onNavigateToToolView = navController::navigateToToolView,
-            onShowSnackbar = onShowSnackbar,
-            handleOnCanScrollChange = handleOnCanScrollChange
+            onShowSnackbar = onShowSnackbar
         )
         toolViewScreen(
             onBackClick = navController::popBackStack
diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt
index ce8f511..b27108e 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt
@@ -12,16 +12,14 @@ fun NavController.navigateToTools(navOptions: NavOptions) = navigate(TOOLS_ROUTE
 
 fun NavGraphBuilder.toolsScreen(
     onNavigateToToolView: (username: String, toolId: String) -> Unit,
-    onShowSnackbar: suspend (String, String?) -> Boolean,
-    handleOnCanScrollChange: (Boolean) -> Unit
+    onShowSnackbar: suspend (String, String?) -> Boolean
 ) {
     composable(
         route = TOOLS_ROUTE
     ) {
         ToolsRoute(
             onNavigateToToolView = onNavigateToToolView,
-            onShowSnackbar = onShowSnackbar,
-            handleOnCanScrollChange = handleOnCanScrollChange
+            onShowSnackbar = onShowSnackbar
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt
index d0b95ed..020ed3c 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt
@@ -77,10 +77,6 @@ fun OxygenApp(appState: OxygenAppState) {
 
             val noConnectMessage = stringResource(R.string.core_no_connect)
 
-            var canScroll by remember { mutableStateOf(false) }
-            val handleOnCanScrollChange = { value: Boolean ->
-                canScroll = value
-            }
             val topAppBarScrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
 
             LaunchedEffect(isOffline) {
@@ -175,8 +171,7 @@ fun OxygenApp(appState: OxygenAppState) {
                             startDestination = when (appState.launchPageConfig) {
                                 LaunchPageConfig.TOOLS -> TOOLS_ROUTE
                                 LaunchPageConfig.STAR -> STAR_ROUTE
-                            },
-                            handleOnCanScrollChange = handleOnCanScrollChange
+                            }
                         )
                     }
                 }
diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt
index a911cd5..ab28215 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt
@@ -51,16 +51,13 @@ internal fun ToolsRoute(
     modifier: Modifier = Modifier,
     viewModel: ToolsScreenViewModel = hiltViewModel(),
     onNavigateToToolView: (username: String, toolId: String) -> Unit,
-    onShowSnackbar: suspend (String, String?) -> Boolean,
-    handleOnCanScrollChange: (Boolean) -> Unit
+    onShowSnackbar: suspend (String, String?) -> Boolean
 ) {
     val toolStorePagingItems = viewModel.storeData.collectAsLazyPagingItems()
 
     ToolsScreen(
         modifier = modifier,
         onNavigateToToolView = onNavigateToToolView,
-        onShowSnackbar = onShowSnackbar,
-        handleOnCanScrollChange = handleOnCanScrollChange,
         toolStorePagingItems = toolStorePagingItems
     )
 }
@@ -69,8 +66,6 @@ internal fun ToolsRoute(
 internal fun ToolsScreen(
     modifier: Modifier = Modifier,
     onNavigateToToolView: (username: String, toolId: String) -> Unit,
-    onShowSnackbar: suspend (String, String?) -> Boolean,
-    handleOnCanScrollChange: (Boolean) -> Unit,
     toolStorePagingItems: LazyPagingItems<Tool>
 ) {
     val isToolLoading =
@@ -86,9 +81,6 @@ internal fun ToolsScreen(
 
     val infiniteTransition = rememberInfiniteTransition(label = "infiniteTransition")
 
-    LaunchedEffect(state.canScrollForward) {
-        handleOnCanScrollChange(state.canScrollForward)
-    }
     Box(
         modifier.fillMaxSize()
     ) {