From 5f76cdf721e475733a829305bdbcc59217f0ba49 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Mar 2024 11:31:03 -0500 Subject: [PATCH] Center the text of notes that couldn't be found. --- .../vitorpamplona/amethyst/ui/note/BadgeCompose.kt | 2 +- .../vitorpamplona/amethyst/ui/note/BlankNote.kt | 8 +++++--- .../vitorpamplona/amethyst/ui/note/NoteCompose.kt | 2 +- .../vitorpamplona/amethyst/ui/screen/FeedView.kt | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt index d6fef2970..f85d8fbaf 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt @@ -84,7 +84,7 @@ fun BadgeCompose( val scope = rememberCoroutineScope() if (note == null) { - BlankNote(Modifier, isInnerNote) + BlankNote(Modifier, !isInnerNote) } else { val defaultBackgroundColor = MaterialTheme.colorScheme.background val backgroundColor = remember { mutableStateOf(defaultBackgroundColor) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt index 6774fde06..878dec216 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt @@ -36,6 +36,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R @@ -62,7 +63,7 @@ fun BlankNotePreview() { @Composable fun BlankNote( modifier: Modifier = Modifier, - showDivider: Boolean = false, + showDivider: Boolean = true, idHex: String? = null, ) { Column(modifier = modifier) { @@ -74,7 +75,7 @@ fun BlankNote( start = 20.dp, end = 20.dp, bottom = 8.dp, - top = 15.dp, + top = 8.dp, ), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, @@ -83,10 +84,11 @@ fun BlankNote( text = stringResource(R.string.post_not_found) + if (idHex != null) ": $idHex" else "", modifier = Modifier.padding(30.dp), color = Color.Gray, + textAlign = TextAlign.Center, ) } - if (!showDivider) { + if (showDivider) { HorizontalDivider( modifier = Modifier.padding(vertical = 10.dp), thickness = DividerThickness, 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 44687bac2..679cd84b1 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 @@ -217,7 +217,7 @@ fun NoteCompose( onLongClick = showPopup, ) }, - isBoostedNote || isQuotedNote, + !isBoostedNote && !isQuotedNote, ) } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt index 72e389c3a..4330347e0 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt @@ -231,6 +231,20 @@ private fun FeedLoaded( nav = nav, ) } + + /*var see by + remember { + mutableStateOf(false) + } + + if (see) { + } else { + Row(defaultModifier) { + Button(onClick = { see = true }) { + Text("Show") + } + } + }*/ } } }