Vitor Pamplona
2023-06-04 11:45:34 -04:00
parent e171120836
commit 5695a82c20
5 changed files with 33 additions and 26 deletions
@@ -268,25 +268,28 @@ object LocalCache {
val note = getOrCreateAddressableNote(event.address()) val note = getOrCreateAddressableNote(event.address())
val author = getOrCreateUser(event.pubKey) val author = getOrCreateUser(event.pubKey)
// Already processed this event. if (note.event?.id() == event.id()) return
if (note.event != null) return
if (event.createdAt > (note.createdAt() ?: 0)) {
note.loadEvent(event, author, emptyList()) note.loadEvent(event, author, emptyList())
refreshObservers(note) refreshObservers(note)
} }
}
private fun consume(event: AudioTrackEvent) { private fun consume(event: AudioTrackEvent) {
val note = getOrCreateAddressableNote(event.address()) val note = getOrCreateAddressableNote(event.address())
val author = getOrCreateUser(event.pubKey) val author = getOrCreateUser(event.pubKey)
// Already processed this event. // Already processed this event.
if (note.event != null) return if (note.event?.id() == event.id()) return
if (event.createdAt > (note.createdAt() ?: 0)) {
note.loadEvent(event, author, emptyList()) note.loadEvent(event, author, emptyList())
refreshObservers(note) refreshObservers(note)
} }
}
fun consume(event: BadgeDefinitionEvent) { fun consume(event: BadgeDefinitionEvent) {
val note = getOrCreateAddressableNote(event.address()) val note = getOrCreateAddressableNote(event.address())
@@ -357,12 +360,14 @@ object LocalCache {
val author = getOrCreateUser(event.pubKey) val author = getOrCreateUser(event.pubKey)
// Already processed this event. // Already processed this event.
if (note.event != null) return if (note.event?.id() == event.id()) return
if (event.createdAt > (note.createdAt() ?: 0)) {
note.loadEvent(event, author, emptyList()) note.loadEvent(event, author, emptyList())
refreshObservers(note) refreshObservers(note)
} }
}
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
fun consume(event: RecommendRelayEvent) { fun consume(event: RecommendRelayEvent) {
@@ -39,6 +39,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogProperties
@@ -143,27 +144,21 @@ fun DisplayAccount(
baseUser?.let { baseUser?.let {
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth().clickable {
verticalAlignment = Alignment.CenterVertically
) {
Row(
modifier = Modifier
.weight(1f)
.clickable {
accountStateViewModel.switchUser(acc.npub) accountStateViewModel.switchUser(acc.npub)
}, }.padding(16.dp, 16.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Row( Row(
modifier = Modifier modifier = Modifier.weight(1f),
.padding(16.dp, 16.dp) verticalAlignment = Alignment.CenterVertically
.weight(1f), ) {
Row(
modifier = Modifier.weight(1f),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier.width(55.dp).padding(0.dp)
.width(55.dp)
.padding(0.dp)
) { ) {
AccountPicture(it) AccountPicture(it)
} }
@@ -239,7 +234,9 @@ private fun AccountName(
displayName?.let { displayName?.let {
CreateTextWithEmoji( CreateTextWithEmoji(
text = it, text = it,
tags = tags tags = tags,
maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
} }
@@ -49,6 +49,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import coil.compose.AsyncImage import coil.compose.AsyncImage
@@ -185,7 +186,9 @@ fun ProfileContent(
} }
}), }),
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 18.sp fontSize = 18.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
} }
if (bestUserName != null) { if (bestUserName != null) {
@@ -193,6 +196,8 @@ fun ProfileContent(
text = " @$bestUserName", text = " @$bestUserName",
tags = accountUser.info?.latestMetadata?.tags, tags = accountUser.info?.latestMetadata?.tags,
color = Color.LightGray, color = Color.LightGray,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier modifier = Modifier
.padding(top = 15.dp) .padding(top = 15.dp)
.clickable( .clickable(
@@ -134,7 +134,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
NoteCompose( NoteCompose(
baseNote = baseNote, baseNote = baseNote,
routeForLastRead = null, routeForLastRead = null,
modifier = Modifier.padding(top = 5.dp), modifier = remember { Modifier.padding(top = 5.dp) },
isBoostedNote = true, isBoostedNote = true,
parentBackgroundColor = backgroundColor, parentBackgroundColor = backgroundColor,
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
@@ -1164,7 +1164,7 @@ private fun RenderRepost(
boostedNote?.let { boostedNote?.let {
NoteCompose( NoteCompose(
it, it,
modifier = Modifier, modifier = remember { Modifier },
isBoostedNote = true, isBoostedNote = true,
unPackReply = false, unPackReply = false,
parentBackgroundColor = backgroundColor, parentBackgroundColor = backgroundColor,