From c1d05f8b2fb5af39f91075d47754e46b94878617 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sat, 22 Apr 2023 15:14:00 -0400 Subject: [PATCH] Adds some margin for reply quotes --- .../ui/components/ZoomableContentView.kt | 16 ++++++++-------- .../amethyst/ui/note/NoteCompose.kt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt index 496697e62..69b053577 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt @@ -148,14 +148,6 @@ fun ZoomableContentView(content: ZoomableContent, images: List ) if (content is ZoomableImage) { - if (imageState !is AsyncImagePainter.State.Success) { - if (content.bluehash != null) { - DisplayBlueHash(content, mainImageModifier) - } else { - DisplayUrlWithLoadingSymbol(content) - } - } - Box() { AsyncImage( model = content.url, @@ -174,6 +166,14 @@ fun ZoomableContentView(content: ZoomableContent, images: List HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd)) } } + + if (imageState !is AsyncImagePainter.State.Success) { + if (content.bluehash != null) { + DisplayBlueHash(content, mainImageModifier) + } else { + DisplayUrlWithLoadingSymbol(content) + } + } } else { VideoView(content.url) { dialogOpen = true } } 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 a08a2336b..bbcf20e2b 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 @@ -375,7 +375,7 @@ fun NoteComposeInner( baseNote = replyingDirectlyTo, isQuotedNote = true, modifier = Modifier - .padding(0.dp) + .padding(top = 5.dp) .fillMaxWidth() .clip(shape = RoundedCornerShape(15.dp)) .border(