Fixes jumping chat screens on hidden posts.

This commit is contained in:
Vitor Pamplona
2023-05-17 11:20:03 -04:00
parent a8e650a38d
commit 117446688b
2 changed files with 20 additions and 20 deletions
@@ -110,6 +110,8 @@ fun ChatroomMessageCompose(
note?.let {
NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
}
} else if (account.isHidden(noteForReports.author!!)) {
// Does nothing
} else {
var showHiddenNote by remember { mutableStateOf(false) }
var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
@@ -131,7 +133,6 @@ fun ChatroomMessageCompose(
}
if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
if (!account.isHidden(noteForReports.author!!)) {
HiddenNote(
account.getRelevantReports(noteForReports),
account.userProfile(),
@@ -140,7 +141,6 @@ fun ChatroomMessageCompose(
navController,
onClick = { showHiddenNote = true }
)
}
} else {
val backgroundBubbleColor: Color
val alignment: Arrangement.Horizontal
@@ -220,6 +220,8 @@ fun NoteComposeInner(
note?.let {
NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
}
} else if (account.isHidden(noteForReports.author!!)) {
// Does nothing
} else {
var showHiddenNote by remember { mutableStateOf(false) }
var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
@@ -241,7 +243,6 @@ fun NoteComposeInner(
}
if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
if (!account.isHidden(noteForReports.author!!)) {
HiddenNote(
account.getRelevantReports(noteForReports),
account.userProfile(),
@@ -250,7 +251,6 @@ fun NoteComposeInner(
navController,
onClick = { showHiddenNote = true }
)
}
} else if ((noteEvent is ChannelCreateEvent || noteEvent is ChannelMetadataEvent) && baseChannel != null) {
ChannelHeader(baseChannel = baseChannel, account = account, navController = navController)
} else if (noteEvent is BadgeDefinitionEvent) {