增加公共emitter，处理双击tab事件

Author: 10miaomiao

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/ComposeFragment.kt

@@ -28,7 +28,10 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.fragment.FragmentNavigatorDestinationBuilder
 import androidx.navigation.fragment.findNavController
 import cn.a10miaomiao.bilimiao.compose.common.LocalContainerView
+import cn.a10miaomiao.bilimiao.compose.common.LocalEmitter
+import cn.a10miaomiao.bilimiao.compose.common.LocalPageNavigation
 import cn.a10miaomiao.bilimiao.compose.common.addPaddingValues
+import cn.a10miaomiao.bilimiao.compose.common.emitter.SharedFlowEmitter
 import cn.a10miaomiao.bilimiao.compose.common.localContainerView
 import cn.a10miaomiao.bilimiao.compose.common.mypage.LocalPageConfigInfo
 import cn.a10miaomiao.bilimiao.compose.common.mypage.PageConfigInfo
@@ -109,15 +112,15 @@ class ComposeFragment : Fragment(), MyPage, DIAware, OnBackPressedDispatcherOwne
         bindSingleton { this@ComposeFragment }
         bindSingleton { this@ComposeFragment.requireArguments() }
         bindSingleton { messageDialogState }
-        bindSingleton {
-            PageNavigation(
-                this@ComposeFragment,
-                navHostController = { composeNav },
-            )
-        }
+        bindSingleton { emitter }
+        bindSingleton { pageNavigation }
     }
 
+    private val pageNavigation = PageNavigation(
+        this,  { composeNav }
+    )
     private val pageConfigInfo = PageConfigInfo(this)
+    private val emitter = SharedFlowEmitter()
 
     override val pageConfig = myPageConfig {
         val config = pageConfigInfo.lastConfig()
@@ -161,6 +164,8 @@ class ComposeFragment : Fragment(), MyPage, DIAware, OnBackPressedDispatcherOwne
                     LocalContainerView provides container,
                     LocalPageConfigInfo provides pageConfigInfo,
                     LocalOnBackPressedDispatcherOwner provides this@ComposeFragment,
+                    LocalPageNavigation provides pageNavigation,
+                    LocalEmitter provides emitter,
                 ) {
                     withDI(di = di) {
                         val windowStore: WindowStore by rememberInstance()

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/common/CompositionLocal.kt

@@ -5,6 +5,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavHostController
+import cn.a10miaomiao.bilimiao.compose.common.emitter.SharedFlowEmitter
+import cn.a10miaomiao.bilimiao.compose.common.navigation.PageNavigation
 
 
 private fun noLocalProvidedFor(name: String): Nothing {
@@ -18,11 +20,16 @@ internal val LocalContainerView = staticCompositionLocalOf<ViewGroup?> {
 @Composable
 fun localContainerView() = LocalContainerView.current
 
-internal val LocalPageRouter = staticCompositionLocalOf<PageRouter> {
-    noLocalProvidedFor("LocalPageRouter")
+internal val LocalPageNavigation = staticCompositionLocalOf<PageNavigation> {
+    noLocalProvidedFor("PageNavigation")
 }
 
 @Composable
-fun localPageRouter() = LocalPageRouter.current
+fun localPageNavigation() = LocalPageNavigation.current
 
+internal val LocalEmitter = staticCompositionLocalOf<SharedFlowEmitter> {
+    noLocalProvidedFor("SharedFlowEmitter")
+}
 
+@Composable
+fun localEmitter() = LocalEmitter.current

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/common/PageRouter.kt

@@ -0,0 +1,7 @@
+package cn.a10miaomiao.bilimiao.compose.common.emitter
+
+sealed class EmitterAction {
+    data class DoubleClickTab(
+        val tab: String,
+    ): EmitterAction()
+}

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/common/emitter/EmitterAction.kt

@@ -0,0 +1,28 @@
+package cn.a10miaomiao.bilimiao.compose.common.emitter
+
+import androidx.compose.runtime.Stable
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+
+@Stable
+class SharedFlowEmitter {
+
+    private val sharedFlow = MutableSharedFlow<EmitterAction>()
+    val flow: SharedFlow<EmitterAction> get () = sharedFlow
+
+    suspend fun emit(action: EmitterAction) {
+        sharedFlow.emit(action)
+    }
+
+    suspend fun collect(collector: FlowCollector<EmitterAction>) {
+        sharedFlow.collect(collector)
+    }
+
+    suspend inline fun <reified T: EmitterAction> collectAction(collector: FlowCollector<T>) {
+        collect {
+            if (it is T) collector.emit(it)
+        }
+    }
+
+}

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/common/emitter/SharedFlowEmitter.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import cn.a10miaomiao.bilimiao.compose.pages.home.HomePageAction
 import kotlinx.coroutines.launch
 
 @Composable

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/common/foundation/TabClick.kt

@@ -30,8 +30,11 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.navOptions
 import cn.a10miaomiao.bilimiao.compose.base.ComposePage
 import cn.a10miaomiao.bilimiao.compose.common.diViewModel
+import cn.a10miaomiao.bilimiao.compose.common.emitter.EmitterAction
+import cn.a10miaomiao.bilimiao.compose.common.foundation.combinedTabDoubleClick
 import cn.a10miaomiao.bilimiao.compose.common.foundation.pagerTabIndicatorOffset
 import cn.a10miaomiao.bilimiao.compose.common.localContainerView
+import cn.a10miaomiao.bilimiao.compose.common.localEmitter
 import cn.a10miaomiao.bilimiao.compose.common.mypage.PageConfig
 import cn.a10miaomiao.bilimiao.compose.common.mypage.PageListener
 import cn.a10miaomiao.bilimiao.compose.common.mypage.rememberMyMenu
@@ -63,14 +66,14 @@ class DynamicPage : ComposePage() {
 }
 
 private sealed class DynamicPageTab(
-    val id: Int,
+    val id: String,
     val name: String,
 ) {
     @Composable
     abstract fun PageContent()
 
     data object All : DynamicPageTab(
-        id = 0,
+        id = "dynamic.all",
         name = "全部"
     ) {
         @Composable
@@ -80,7 +83,7 @@ private sealed class DynamicPageTab(
     }
 
     data object Video : DynamicPageTab(
-        id = 1,
+        id = "dynamic.video",
         name = "视频"
     ) {
         @Composable
@@ -155,6 +158,18 @@ private fun DynamicPageContent(
     val windowInsets = windowState.getContentInsets(localContainerView())
 
     val pagerState = rememberPagerState(pageCount = { viewModel.tabs.size })
+    val emitter = localEmitter()
+    val combinedTabClick = combinedTabDoubleClick(
+        pagerState = pagerState,
+        onDoubleClick = {
+            scope.launch {
+                emitter.emit(EmitterAction.DoubleClickTab(
+                    tab = viewModel.tabs[it].id
+                ))
+            }
+        }
+    )
+
     Column(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -183,11 +198,7 @@ private fun DynamicPageContent(
                         )
                     },
                     selected = pagerState.currentPage == index,
-                    onClick = {
-                        scope.launch {
-                            pagerState.animateScrollToPage(index)
-                        }
-                    },
+                    onClick = { combinedTabClick(index) },
                 )
             }
         }

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/pages/dynamic/DynamicPage.kt

@@ -15,7 +15,9 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -27,8 +29,10 @@ import bilibili.app.dynamic.v2.DynamicGRPC
 import bilibili.app.dynamic.v2.DynamicItem
 import cn.a10miaomiao.bilimiao.compose.common.addPaddingValues
 import cn.a10miaomiao.bilimiao.compose.common.diViewModel
+import cn.a10miaomiao.bilimiao.compose.common.emitter.EmitterAction
 import cn.a10miaomiao.bilimiao.compose.common.entity.FlowPaginationInfo
 import cn.a10miaomiao.bilimiao.compose.common.localContainerView
+import cn.a10miaomiao.bilimiao.compose.common.localEmitter
 import cn.a10miaomiao.bilimiao.compose.common.navigation.PageNavigation
 import cn.a10miaomiao.bilimiao.compose.common.toPaddingValues
 import cn.a10miaomiao.bilimiao.compose.components.dyanmic.DynamicItemCard
@@ -161,26 +165,26 @@ fun DynamicAllListContent() {
     val listFail by viewModel.list.fail.collectAsState()
     val isRefreshing by viewModel.isRefreshing.collectAsState()
 
-    val listState = rememberLazyGridState()
-//    LaunchedEffect(Unit) {
-//        action.collect {
-//            when (it) {
-//                is HomePageAction.DoubleClickTab -> {
-//                    if (listState.firstVisibleItemIndex == 0) {
-//                        viewModel.refresh()
-//                    } else {
-//                        listState.animateScrollToItem(0)
-//                    }
-//                }
-//            }
-//        }
-//    }
+    val listState = rememberLazyListState()
+    val emitter = localEmitter()
+    LaunchedEffect(Unit) {
+        emitter.collectAction<EmitterAction.DoubleClickTab> {
+            if (it.tab == "dynamic.all") {
+                if (listState.firstVisibleItemIndex == 0) {
+                    viewModel.refresh()
+                } else {
+                    listState.animateScrollToItem(0)
+                }
+            }
+        }
+    }
 
     SwipeToRefresh(
         refreshing = isRefreshing,
         onRefresh = { viewModel.refresh() },
     ) {
         LazyColumn(
+            state = listState,
             modifier = Modifier.fillMaxSize(),
             contentPadding = windowInsets.addPaddingValues(
                 addTop = -windowInsets.topDp.dp + 10.dp,

bilimiao-compose/src/main/java/cn/a10miaomiao/bilimiao/compose/pages/dynamic/content/DynamicAllListContent.kt

@@ -22,8 +22,10 @@ import androidx.navigation.Navigation
 import bilibili.app.dynamic.v2.DynamicGRPC
 import cn.a10miaomiao.bilimiao.compose.BilimiaoPageRoute
 import cn.a10miaomiao.bilimiao.compose.common.diViewModel
+import cn.a10miaomiao.bilimiao.compose.common.emitter.EmitterAction
 import cn.a10miaomiao.bilimiao.compose.common.entity.FlowPaginationInfo
 import cn.a10miaomiao.bilimiao.compose.common.localContainerView
+import cn.a10miaomiao.bilimiao.compose.common.localEmitter
 import cn.a10miaomiao.bilimiao.compose.common.navigation.PageNavigation
 import cn.a10miaomiao.bilimiao.compose.common.toPaddingValues
 import cn.a10miaomiao.bilimiao.compose.components.dyanmic.DynamicModuleAuthorBox
@@ -35,7 +37,6 @@ import cn.a10miaomiao.bilimiao.compose.components.video.VideoItemBox
 import cn.a10miaomiao.bilimiao.compose.pages.bangumi.BangumiDetailPage
 import cn.a10miaomiao.bilimiao.compose.pages.dynamic.DynamicVideoContentInfo
 import cn.a10miaomiao.bilimiao.compose.pages.dynamic.DynamicVideoInfo
-import cn.a10miaomiao.bilimiao.compose.pages.home.HomePageAction
 import cn.a10miaomiao.bilimiao.compose.pages.user.UserSpacePage
 import com.a10miaomiao.bilimiao.comm.network.BiliGRPCHttp
 import com.a10miaomiao.bilimiao.comm.store.FilterStore
@@ -212,19 +213,18 @@ fun DynamicVideoListContent() {
     val isRefreshing by viewModel.isRefreshing.collectAsState()
 
     val listState = rememberLazyGridState()
-//    LaunchedEffect(Unit) {
-//        action.collect {
-//            when (it) {
-//                is HomePageAction.DoubleClickTab -> {
-//                    if (listState.firstVisibleItemIndex == 0) {
-//                        viewModel.refresh()
-//                    } else {
-//                        listState.animateScrollToItem(0)
-//                    }
-//                }
-//            }
-//        }
-//    }
+    val emitter = localEmitter()
+    LaunchedEffect(Unit) {
+        emitter.collectAction<EmitterAction.DoubleClickTab> {
+            if (it.tab == "dynamic.video") {
+                if (listState.firstVisibleItemIndex == 0) {
+                    viewModel.refresh()
+                } else {
+                    listState.animateScrollToItem(0)
+                }
+            }
+        }
+    }
 
     SwipeToRefresh(
         refreshing = isRefreshing,