highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 19:07:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes margins when images are used in the poll

Browse Source
This commit is contained in:
Vitor Pamplona
2023-04-04 13:39:12 -04:00
parent a68ea1abe5
commit b09bb0c3c5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt
View File

@@ -69,7 +69,6 @@ fun ZoomableImageView(word: String, images: List<String> = listOf(word)) {
contentDescription = word, contentDescription = word,
contentScale = ContentScale.FillWidth, contentScale = ContentScale.FillWidth,
modifier = Modifier modifier = Modifier
.padding(top = 4.dp)
.fillMaxWidth() .fillMaxWidth()
.clip(shape = RoundedCornerShape(15.dp)) .clip(shape = RoundedCornerShape(15.dp))
.border( .border(

2
app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
View File

@@ -107,7 +107,7 @@ fun PollNote(
) )
} }
Column(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(10.dp)) {
TranslatableRichTextViewer( TranslatableRichTextViewer(
poll_op.value, poll_op.value,
canPreview, canPreview,

4
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
View File

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@@ -296,8 +297,9 @@ fun NoteMaster(
} }
} }
Spacer(modifier = Modifier.height(10.dp))
if (noteEvent is BadgeDefinitionEvent) { if (noteEvent is BadgeDefinitionEvent) {
Spacer(modifier = Modifier.padding(top = 10.dp))
BadgeDisplay(baseNote = note) BadgeDisplay(baseNote = note)
} else if (noteEvent is LongTextNoteEvent) { } else if (noteEvent is LongTextNoteEvent) {
Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)) { Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)) {