Solving viewModel creation bug for Public Bookmarks
This commit is contained in:
+15
-3
@@ -44,7 +44,6 @@ import com.vitorpamplona.amethyst.ui.screen.RefresheableFeedView
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.TabRowHeight
|
import com.vitorpamplona.amethyst.ui.theme.TabRowHeight
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun BookmarkListScreen(
|
fun BookmarkListScreen(
|
||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
@@ -52,13 +51,13 @@ fun BookmarkListScreen(
|
|||||||
) {
|
) {
|
||||||
val publicFeedViewModel: NostrBookmarkPublicFeedViewModel =
|
val publicFeedViewModel: NostrBookmarkPublicFeedViewModel =
|
||||||
viewModel(
|
viewModel(
|
||||||
key = "NotificationViewModel",
|
key = "NostrBookmarkPublicFeedViewModel",
|
||||||
factory = NostrBookmarkPublicFeedViewModel.Factory(accountViewModel.account),
|
factory = NostrBookmarkPublicFeedViewModel.Factory(accountViewModel.account),
|
||||||
)
|
)
|
||||||
|
|
||||||
val privateFeedViewModel: NostrBookmarkPrivateFeedViewModel =
|
val privateFeedViewModel: NostrBookmarkPrivateFeedViewModel =
|
||||||
viewModel(
|
viewModel(
|
||||||
key = "NotificationViewModel",
|
key = "NostrBookmarkPrivateFeedViewModel",
|
||||||
factory = NostrBookmarkPrivateFeedViewModel.Factory(accountViewModel.account),
|
factory = NostrBookmarkPrivateFeedViewModel.Factory(accountViewModel.account),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -69,6 +68,18 @@ fun BookmarkListScreen(
|
|||||||
privateFeedViewModel.invalidateData()
|
privateFeedViewModel.invalidateData()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
RenderBookmarkScreen(privateFeedViewModel, accountViewModel, nav, publicFeedViewModel)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
@OptIn(ExperimentalFoundationApi::class)
|
||||||
|
private fun RenderBookmarkScreen(
|
||||||
|
privateFeedViewModel: NostrBookmarkPrivateFeedViewModel,
|
||||||
|
accountViewModel: AccountViewModel,
|
||||||
|
nav: (String) -> Unit,
|
||||||
|
publicFeedViewModel: NostrBookmarkPublicFeedViewModel,
|
||||||
|
) {
|
||||||
Column(Modifier.fillMaxHeight()) {
|
Column(Modifier.fillMaxHeight()) {
|
||||||
val pagerState = rememberPagerState { 2 }
|
val pagerState = rememberPagerState { 2 }
|
||||||
val coroutineScope = rememberCoroutineScope()
|
val coroutineScope = rememberCoroutineScope()
|
||||||
@@ -99,6 +110,7 @@ fun BookmarkListScreen(
|
|||||||
accountViewModel = accountViewModel,
|
accountViewModel = accountViewModel,
|
||||||
nav = nav,
|
nav = nav,
|
||||||
)
|
)
|
||||||
|
|
||||||
1 ->
|
1 ->
|
||||||
RefresheableFeedView(
|
RefresheableFeedView(
|
||||||
publicFeedViewModel,
|
publicFeedViewModel,
|
||||||
|
|||||||
Reference in New Issue
Block a user