nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-29 16:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converts TopBar Observables to Maps.

Browse Source
This commit is contained in:
Vitor Pamplona 2023-06-23 17:55:30 -04:00
parent 4f43d7cde5
commit 415252b770
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
View File

@ -46,6 +46,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.map
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavBackStackEntry import androidx.navigation.NavBackStackEntry
@ -133,13 +134,9 @@ fun NoTopBar() {
@Composable @Composable
fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) { fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel -> GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
val accountState by accountViewModel.accountLiveData.observeAsState() val list by accountViewModel.accountLiveData.map {
it.account.defaultStoriesFollowList
val list by remember(accountState) { }.observeAsState(GLOBAL_FOLLOWS)
derivedStateOf {
accountState?.account?.defaultStoriesFollowList ?: GLOBAL_FOLLOWS
}
}
FollowList( FollowList(
followLists, followLists,
@ -154,13 +151,9 @@ fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState
@Composable @Composable
fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) { fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel -> GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
val accountState by accountViewModel.accountLiveData.observeAsState() val list by accountViewModel.accountLiveData.map {
it.account.defaultHomeFollowList
val list by remember(accountState) { }.observeAsState(KIND3_FOLLOWS)
derivedStateOf {
accountState?.account?.defaultHomeFollowList ?: GLOBAL_FOLLOWS
}
}
FollowList( FollowList(
followLists, followLists,
@ -175,13 +168,9 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
@Composable @Composable
fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) { fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel -> GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
val accountState by accountViewModel.accountLiveData.observeAsState() val list by accountViewModel.accountLiveData.map {
it.account.defaultNotificationFollowList
val list by remember(accountState) { }.observeAsState(GLOBAL_FOLLOWS)
derivedStateOf {
accountState?.account?.defaultNotificationFollowList ?: GLOBAL_FOLLOWS
}
}
FollowList( FollowList(
followLists, followLists,