nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-29 16:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remembers some variables on NoteCompose

Browse Source
This commit is contained in:
Vitor Pamplona 2023-06-12 16:55:51 -04:00
parent d62bab1b08
commit 243fbeed44
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
View File

@ -634,8 +634,7 @@ private fun RenderNoteRow(
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
nav: (String) -> Unit nav: (String) -> Unit
) { ) {
val noteEvent = remember { baseNote.event } when (remember { baseNote.event }) {
when (noteEvent) {
is AppDefinitionEvent -> { is AppDefinitionEvent -> {
RenderAppDefinition(baseNote, accountViewModel, nav) RenderAppDefinition(baseNote, accountViewModel, nav)
} }
@ -1680,18 +1679,22 @@ private fun ReplyNoteComposition(
} }
} }
val borderColor = MaterialTheme.colors.subtleBorder
NoteCompose( NoteCompose(
baseNote = replyingDirectlyTo, baseNote = replyingDirectlyTo,
isQuotedNote = true, isQuotedNote = true,
modifier = Modifier modifier = remember {
Modifier
.padding(top = 5.dp) .padding(top = 5.dp)
.fillMaxWidth() .fillMaxWidth()
.clip(shape = QuoteBorder) .clip(shape = QuoteBorder)
.border( .border(
1.dp, 1.dp,
MaterialTheme.colors.subtleBorder, borderColor,
QuoteBorder QuoteBorder
), )
},
unPackReply = false, unPackReply = false,
makeItShort = true, makeItShort = true,
parentBackgroundColor = replyBackgroundColor, parentBackgroundColor = replyBackgroundColor,
@ -1770,13 +1773,13 @@ private fun MoreOptionsButton(
var moreActionsExpanded by remember { mutableStateOf(false) } var moreActionsExpanded by remember { mutableStateOf(false) }
IconButton( IconButton(
modifier = Modifier.size(24.dp), modifier = remember { Modifier.size(24.dp) },
onClick = { moreActionsExpanded = true } onClick = { moreActionsExpanded = true }
) { ) {
Icon( Icon(
imageVector = Icons.Default.MoreVert, imageVector = Icons.Default.MoreVert,
null, null,
modifier = Modifier.size(15.dp), modifier = remember { Modifier.size(15.dp) },
tint = MaterialTheme.colors.placeholderText tint = MaterialTheme.colors.placeholderText
) )
@ -2057,9 +2060,13 @@ fun DisplayUncitedHashtags(
eventContent: String, eventContent: String,
nav: (String) -> Unit nav: (String) -> Unit
) { ) {
if (hashtags.isNotEmpty()) { val hasHashtags = remember {
hashtags.isNotEmpty()
}
if (hasHashtags) {
FlowRow( FlowRow(
modifier = Modifier.padding(top = 5.dp) modifier = remember { Modifier.padding(top = 5.dp) }
) { ) {
hashtags.forEach { hashtag -> hashtags.forEach { hashtag ->
if (!eventContent.contains(hashtag, true)) { if (!eventContent.contains(hashtag, true)) {