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

Fixes jumping chat screens on hidden posts.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
+10 -10
View File
@@ -110,6 +110,8 @@ fun ChatroomMessageCompose(
note?.let { note?.let {
NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel) NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
} }
} else if (account.isHidden(noteForReports.author!!)) {
// Does nothing
} else { } else {
var showHiddenNote by remember { mutableStateOf(false) } var showHiddenNote by remember { mutableStateOf(false) }
var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) } var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
@@ -131,16 +133,14 @@ fun ChatroomMessageCompose(
} }
if (!isAcceptableAndCanPreview.first && !showHiddenNote) { if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
if (!account.isHidden(noteForReports.author!!)) { HiddenNote(
HiddenNote( account.getRelevantReports(noteForReports),
account.getRelevantReports(noteForReports), account.userProfile(),
account.userProfile(), Modifier,
Modifier, innerQuote,
innerQuote, navController,
navController, onClick = { showHiddenNote = true }
onClick = { showHiddenNote = true } )
)
}
} else { } else {
val backgroundBubbleColor: Color val backgroundBubbleColor: Color
val alignment: Arrangement.Horizontal val alignment: Arrangement.Horizontal
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+10 -10
View File
@@ -220,6 +220,8 @@ fun NoteComposeInner(
note?.let { note?.let {
NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel) NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
} }
} else if (account.isHidden(noteForReports.author!!)) {
// Does nothing
} else { } else {
var showHiddenNote by remember { mutableStateOf(false) } var showHiddenNote by remember { mutableStateOf(false) }
var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) } var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
@@ -241,16 +243,14 @@ fun NoteComposeInner(
} }
if (!isAcceptableAndCanPreview.first && !showHiddenNote) { if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
if (!account.isHidden(noteForReports.author!!)) { HiddenNote(
HiddenNote( account.getRelevantReports(noteForReports),
account.getRelevantReports(noteForReports), account.userProfile(),
account.userProfile(), modifier,
modifier, isBoostedNote,
isBoostedNote, navController,
navController, onClick = { showHiddenNote = true }
onClick = { showHiddenNote = true } )
)
}
} else if ((noteEvent is ChannelCreateEvent || noteEvent is ChannelMetadataEvent) && baseChannel != null) { } else if ((noteEvent is ChannelCreateEvent || noteEvent is ChannelMetadataEvent) && baseChannel != null) {
ChannelHeader(baseChannel = baseChannel, account = account, navController = navController) ChannelHeader(baseChannel = baseChannel, account = account, navController = navController)
} else if (noteEvent is BadgeDefinitionEvent) { } else if (noteEvent is BadgeDefinitionEvent) {