From f3f8bc1b654970fd47400b1cf0895b7add88b1e1 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Fri, 15 Mar 2024 10:45:53 -0300 Subject: [PATCH] show draft in the simplified view --- .../amethyst/ui/note/NoteCompose.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 1cfcef8ae..42811efb3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -115,9 +115,9 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelHeader import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer -import com.vitorpamplona.amethyst.ui.theme.Font14SP import com.vitorpamplona.amethyst.ui.theme.HalfDoubleVertSpacer import com.vitorpamplona.amethyst.ui.theme.HalfPadding +import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding import com.vitorpamplona.amethyst.ui.theme.Size25dp import com.vitorpamplona.amethyst.ui.theme.Size30Modifier import com.vitorpamplona.amethyst.ui.theme.Size34dp @@ -131,10 +131,10 @@ import com.vitorpamplona.amethyst.ui.theme.WidthAuthorPictureModifier import com.vitorpamplona.amethyst.ui.theme.boostedNoteModifier import com.vitorpamplona.amethyst.ui.theme.channelNotePictureModifier import com.vitorpamplona.amethyst.ui.theme.grayText -import com.vitorpamplona.amethyst.ui.theme.lessImportantLink import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor import com.vitorpamplona.amethyst.ui.theme.normalNoteModifier import com.vitorpamplona.amethyst.ui.theme.normalWithTopMarginNoteModifier +import com.vitorpamplona.amethyst.ui.theme.placeholderText import com.vitorpamplona.amethyst.ui.theme.replyBackground import com.vitorpamplona.amethyst.ui.theme.replyModifier import com.vitorpamplona.quartz.events.AppDefinitionEvent @@ -1113,11 +1113,6 @@ fun SecondUserInfoRow( DisplayPoW(pow) } - if (note.isDraft()) { - Spacer(StdHorzSpacer) - DisplayDraft() - } - DisplayOts(note, accountViewModel) } } @@ -1126,10 +1121,10 @@ fun SecondUserInfoRow( fun DisplayDraft() { Text( "Draft", - color = MaterialTheme.colorScheme.lessImportantLink, - fontSize = Font14SP, fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.placeholderText, maxLines = 1, + modifier = HalfStartPadding, ) } @@ -1175,6 +1170,11 @@ fun FirstUserInfoRow( } } + if (baseNote.isDraft()) { + Spacer(StdHorzSpacer) + DisplayDraft() + } + TimeAgo(baseNote) MoreOptionsButton(baseNote, editState, accountViewModel, nav)