mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-11-11 16:17:46 +01:00
No need to remember simple state.
This commit is contained in:
@@ -2645,19 +2645,8 @@ private fun BadgeBox(
|
|||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
nav: (String) -> Unit
|
nav: (String) -> Unit
|
||||||
) {
|
) {
|
||||||
val isRepost by remember(baseNote) {
|
if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) {
|
||||||
derivedStateOf {
|
baseNote.replyTo?.lastOrNull()?.let {
|
||||||
baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isRepost) {
|
|
||||||
val baseReply by remember(baseNote) {
|
|
||||||
derivedStateOf {
|
|
||||||
baseNote.replyTo?.lastOrNull()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
baseReply?.let {
|
|
||||||
RelayBadges(it, accountViewModel, nav)
|
RelayBadges(it, accountViewModel, nav)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -139,19 +139,13 @@ fun UserPicture(
|
|||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
nav: (String) -> Unit
|
nav: (String) -> Unit
|
||||||
) {
|
) {
|
||||||
val route by remember(user) {
|
|
||||||
derivedStateOf {
|
|
||||||
"User/${user.pubkeyHex}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ClickableUserPicture(
|
ClickableUserPicture(
|
||||||
baseUser = user,
|
baseUser = user,
|
||||||
size = size,
|
size = size,
|
||||||
accountViewModel = accountViewModel,
|
accountViewModel = accountViewModel,
|
||||||
modifier = pictureModifier,
|
modifier = pictureModifier,
|
||||||
onClick = {
|
onClick = {
|
||||||
nav(route)
|
nav("User/${user.pubkeyHex}")
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -365,7 +359,10 @@ fun WatchUserFollows(userHex: String, accountViewModel: AccountViewModel, onFoll
|
|||||||
accountViewModel.userFollows.map {
|
accountViewModel.userFollows.map {
|
||||||
it.user.isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
|
it.user.isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
|
||||||
}.distinctUntilChanged()
|
}.distinctUntilChanged()
|
||||||
}.observeAsState(false)
|
}.observeAsState(
|
||||||
|
accountViewModel.account.userProfile().isFollowingCached(userHex) ||
|
||||||
|
(userHex == accountViewModel.account.userProfile().pubkeyHex)
|
||||||
|
)
|
||||||
|
|
||||||
onFollowChanges(showFollowingMark)
|
onFollowChanges(showFollowingMark)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user