nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Using the correct observer for picture profile in the Top bar.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-09-07 12:53:19 -04:00
parent 8eb89f0fe9
commit 190b7fe819
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+3 -5
View File
@@ -451,8 +451,6 @@ fun GenericMainTopBar(
nav: (String) -> Unit, nav: (String) -> Unit,
content: @Composable (AccountViewModel) -> Unit content: @Composable (AccountViewModel) -> Unit
) { ) {
val coroutineScope = rememberCoroutineScope()
Column(modifier = BottomTopHeight) { Column(modifier = BottomTopHeight) {
MyTopAppBar( MyTopAppBar(
elevation = 0.dp, elevation = 0.dp,
@@ -476,6 +474,7 @@ fun GenericMainTopBar(
} }
}, },
navigationIcon = { navigationIcon = {
val coroutineScope = rememberCoroutineScope()
LoggedInUserPictureDrawer(accountViewModel) { LoggedInUserPictureDrawer(accountViewModel) {
coroutineScope.launch { coroutineScope.launch {
scaffoldState.drawerState.open() scaffoldState.drawerState.open()
@@ -506,10 +505,9 @@ private fun LoggedInUserPictureDrawer(
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
onClick: () -> Unit onClick: () -> Unit
) { ) {
val accountUserState by accountViewModel.account.userProfile().live().metadata.observeAsState() val profilePicture by accountViewModel.account.userProfile().live().profilePictureChanges.observeAsState()
val pubkeyHex = remember { accountUserState?.user?.pubkeyHex ?: "" } val pubkeyHex = remember { accountViewModel.userProfile().pubkeyHex }
val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture() }
IconButton( IconButton(
onClick = onClick onClick = onClick