Add some navigation directly on FeedFlowMenuBar

prof18 · Sep 9, 2024 · c43b93f · c43b93f
1 parent 87341a3
commit c43b93f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt
@@ -34,7 +34,6 @@ import coil3.compose.setSingletonImageLoaderFactory
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.desktop.about.AboutContent
 import com.prof18.feedflow.desktop.di.DI
-import com.prof18.feedflow.desktop.feedsourcelist.FeedSourceListScreen
 import com.prof18.feedflow.desktop.home.FeedFlowMenuBar
 import com.prof18.feedflow.desktop.importexport.ImportExportScreen
 import com.prof18.feedflow.desktop.ui.components.scrollbarStyle
@@ -239,9 +238,6 @@ fun main() = application {
                                 onImportExportClick = {
                                     navigator.push(ImportExportScreen(window))
                                 },
-                                onFeedsListClick = {
-                                    navigator.push(FeedSourceListScreen())
-                                },
                                 onClearOldFeedClick = {
                                     homeViewModel.deleteOldFeedItems()
                                 },

diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/MenuBar.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/MenuBar.kt
@@ -9,6 +9,7 @@ import androidx.compose.ui.window.MenuScope
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.prof18.feedflow.desktop.accounts.AccountsScreen
+import com.prof18.feedflow.desktop.feedsourcelist.FeedSourceListScreen
 import com.prof18.feedflow.shared.ui.utils.LocalFeedFlowStrings
 
 @Composable
@@ -21,7 +22,6 @@ fun FrameWindowScope.FeedFlowMenuBar(
     onRefreshClick: () -> Unit,
     onMarkAllReadClick: () -> Unit,
     onImportExportClick: () -> Unit,
-    onFeedsListClick: () -> Unit,
     onClearOldFeedClick: () -> Unit,
     onAboutClick: () -> Unit,
     onBugReportClick: () -> Unit,
@@ -76,7 +76,7 @@ fun FrameWindowScope.FeedFlowMenuBar(
             Item(
                 text = LocalFeedFlowStrings.current.feedsTitle,
                 onClick = {
-                    onFeedsListClick()
+                    navigator.push(FeedSourceListScreen())
                 },
             )