mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-29 16:30:49 +00:00
Fixing quotes and boosts for NIP94 and NIP95 content
This commit is contained in:
parent
4d85a2f6fb
commit
0434ef6ec6
@ -124,7 +124,6 @@ import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.Font14SP
|
import com.vitorpamplona.amethyst.ui.theme.Font14SP
|
||||||
import com.vitorpamplona.amethyst.ui.theme.HalfPadding
|
import com.vitorpamplona.amethyst.ui.theme.HalfPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
|
import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.HalfVertSpacer
|
|
||||||
import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
|
import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
|
import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size10dp
|
import com.vitorpamplona.amethyst.ui.theme.Size10dp
|
||||||
@ -465,45 +464,86 @@ fun NormalNote(
|
|||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
nav: (String) -> Unit
|
nav: (String) -> Unit
|
||||||
) {
|
) {
|
||||||
when (baseNote.event) {
|
if (isQuotedNote || isBoostedNote) {
|
||||||
is ChannelCreateEvent, is ChannelMetadataEvent -> ChannelHeader(
|
when (baseNote.event) {
|
||||||
channelNote = baseNote,
|
is ChannelCreateEvent, is ChannelMetadataEvent -> ChannelHeader(
|
||||||
showVideo = !makeItShort,
|
channelNote = baseNote,
|
||||||
showBottomDiviser = true,
|
showVideo = !makeItShort,
|
||||||
sendToChannel = true,
|
|
||||||
accountViewModel = accountViewModel,
|
|
||||||
nav = nav
|
|
||||||
)
|
|
||||||
is CommunityDefinitionEvent -> (baseNote as? AddressableNote)?.let {
|
|
||||||
CommunityHeader(
|
|
||||||
baseNote = it,
|
|
||||||
showBottomDiviser = true,
|
showBottomDiviser = true,
|
||||||
sendToCommunity = true,
|
sendToChannel = true,
|
||||||
accountViewModel = accountViewModel,
|
accountViewModel = accountViewModel,
|
||||||
nav = nav
|
nav = nav
|
||||||
)
|
)
|
||||||
}
|
is CommunityDefinitionEvent -> (baseNote as? AddressableNote)?.let {
|
||||||
is BadgeDefinitionEvent -> BadgeDisplay(baseNote = baseNote)
|
CommunityHeader(
|
||||||
is FileHeaderEvent -> FileHeaderDisplay(baseNote, isQuotedNote || isBoostedNote, accountViewModel)
|
baseNote = it,
|
||||||
is FileStorageHeaderEvent -> FileStorageHeaderDisplay(baseNote, isQuotedNote || isBoostedNote, accountViewModel)
|
showBottomDiviser = true,
|
||||||
else ->
|
sendToCommunity = true,
|
||||||
LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
|
accountViewModel = accountViewModel,
|
||||||
CheckNewAndRenderNote(
|
nav = nav
|
||||||
baseNote,
|
|
||||||
routeForLastRead,
|
|
||||||
modifier,
|
|
||||||
isBoostedNote,
|
|
||||||
isQuotedNote,
|
|
||||||
unPackReply,
|
|
||||||
makeItShort,
|
|
||||||
addMarginTop,
|
|
||||||
canPreview,
|
|
||||||
parentBackgroundColor,
|
|
||||||
accountViewModel,
|
|
||||||
showPopup,
|
|
||||||
nav
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
is BadgeDefinitionEvent -> BadgeDisplay(baseNote = baseNote)
|
||||||
|
else ->
|
||||||
|
LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
|
||||||
|
CheckNewAndRenderNote(
|
||||||
|
baseNote,
|
||||||
|
routeForLastRead,
|
||||||
|
modifier,
|
||||||
|
isBoostedNote,
|
||||||
|
isQuotedNote,
|
||||||
|
unPackReply,
|
||||||
|
makeItShort,
|
||||||
|
addMarginTop,
|
||||||
|
canPreview,
|
||||||
|
parentBackgroundColor,
|
||||||
|
accountViewModel,
|
||||||
|
showPopup,
|
||||||
|
nav
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
when (baseNote.event) {
|
||||||
|
is ChannelCreateEvent, is ChannelMetadataEvent -> ChannelHeader(
|
||||||
|
channelNote = baseNote,
|
||||||
|
showVideo = !makeItShort,
|
||||||
|
showBottomDiviser = true,
|
||||||
|
sendToChannel = true,
|
||||||
|
accountViewModel = accountViewModel,
|
||||||
|
nav = nav
|
||||||
|
)
|
||||||
|
is CommunityDefinitionEvent -> (baseNote as? AddressableNote)?.let {
|
||||||
|
CommunityHeader(
|
||||||
|
baseNote = it,
|
||||||
|
showBottomDiviser = true,
|
||||||
|
sendToCommunity = true,
|
||||||
|
accountViewModel = accountViewModel,
|
||||||
|
nav = nav
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is BadgeDefinitionEvent -> BadgeDisplay(baseNote = baseNote)
|
||||||
|
is FileHeaderEvent -> FileHeaderDisplay(baseNote, false, accountViewModel)
|
||||||
|
is FileStorageHeaderEvent -> FileStorageHeaderDisplay(baseNote, false, accountViewModel)
|
||||||
|
else ->
|
||||||
|
LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
|
||||||
|
CheckNewAndRenderNote(
|
||||||
|
baseNote,
|
||||||
|
routeForLastRead,
|
||||||
|
modifier,
|
||||||
|
isBoostedNote,
|
||||||
|
isQuotedNote,
|
||||||
|
unPackReply,
|
||||||
|
makeItShort,
|
||||||
|
addMarginTop,
|
||||||
|
canPreview,
|
||||||
|
parentBackgroundColor,
|
||||||
|
accountViewModel,
|
||||||
|
showPopup,
|
||||||
|
nav
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1014,7 +1054,7 @@ private fun NoteBody(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = HalfVertSpacer)
|
Spacer(modifier = StdVertSpacer)
|
||||||
|
|
||||||
if (!makeItShort) {
|
if (!makeItShort) {
|
||||||
ReplyRow(
|
ReplyRow(
|
||||||
@ -1144,6 +1184,14 @@ private fun RenderNoteRow(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is FileHeaderEvent -> {
|
||||||
|
FileHeaderDisplay(baseNote, true, accountViewModel)
|
||||||
|
}
|
||||||
|
|
||||||
|
is FileStorageHeaderEvent -> {
|
||||||
|
FileStorageHeaderDisplay(baseNote, true, accountViewModel)
|
||||||
|
}
|
||||||
|
|
||||||
is CommunityPostApprovalEvent -> {
|
is CommunityPostApprovalEvent -> {
|
||||||
RenderPostApproval(
|
RenderPostApproval(
|
||||||
baseNote,
|
baseNote,
|
||||||
|
Loading…
Reference in New Issue
Block a user