Просмотр исходного кода

移除重复点击首页弹出右上菜单

5151561 3 месяцев назад
Родитель
Сommit
8527920497

+ 0 - 10
app/src/main/java/io/legado/app/ui/main/MainScreen.kt

@@ -223,20 +223,11 @@ fun MainScreen(
         orientation = Orientation.Horizontal,
     )
     var bookshelfScrollToTopRequest by remember { mutableLongStateOf(0L) }
-    var homeOverflowMenuRequest by remember { mutableLongStateOf(0L) }
     fun requestBookshelfScrollToTop() {
         bookshelfScrollToTopRequest++
     }
 
     fun handleMainDestinationClick(index: Int, destination: MainDestination) {
-        if (
-            destination == MainDestination.Home &&
-            pagerState.currentPage == index &&
-            pagerState.targetPage == index
-        ) {
-            homeOverflowMenuRequest++
-            return
-        }
         if (
             destination == MainDestination.Bookshelf &&
             pagerState.currentPage == index &&
@@ -524,7 +515,6 @@ fun MainScreen(
                         CompositionLocalProvider(LocalLifecycleOwner provides pageLifecycleOwner) {
                             when (destination) {
                             MainDestination.Home -> HomeRouteScreen(
-                                showOverflowMenuRequest = homeOverflowMenuRequest,
                                 onOpenBook = { book ->
                                     context.startActivityForBook(book)
                                 },

+ 0 - 9
app/src/main/java/io/legado/app/ui/main/home/HomeScreen.kt

@@ -135,7 +135,6 @@ import kotlin.math.roundToInt
 
 @Composable
 fun HomeRouteScreen(
-    showOverflowMenuRequest: Long = 0L,
     onOpenBook: (Book) -> Unit,
     onNavigateToBookInfo: (
         name: String?,
@@ -334,7 +333,6 @@ fun HomeRouteScreen(
     }
 
     HomeScreen(
-        showOverflowMenuRequest = showOverflowMenuRequest,
         state = state,
         homepageState = homepageState,
         homepageFeedActions = feedActions,
@@ -381,7 +379,6 @@ fun HomeRouteScreen(
 )
 @Composable
 fun HomeScreen(
-    showOverflowMenuRequest: Long = 0L,
     state: HomeUiState,
     homepageState: HomepageUiState,
     homepageFeedActions: HomepageFeedActions,
@@ -413,12 +410,6 @@ fun HomeScreen(
         derivedStateOf { selectedSets.getOrNull(pagerState.currentPage)?.sourceName }
     }
 
-    LaunchedEffect(showOverflowMenuRequest) {
-        if (showOverflowMenuRequest > 0L) {
-            showPageMenu = true
-        }
-    }
-
     LaunchedEffect(pagerState) {
         snapshotFlow { pagerState.currentPage }
             .distinctUntilChanged()