More adjustments to borders and spacing between screen elements for different event types

pull/449/head^2
Vitor Pamplona 2023-06-09 10:25:06 -04:00
rodzic 8a99dc2db4
commit 816a22ec69
3 zmienionych plików z 14 dodań i 7 usunięć

Wyświetl plik

@ -46,10 +46,12 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false, idHex: St
)
}
Divider(
modifier = Modifier.padding(vertical = 10.dp),
thickness = 0.25.dp
)
if (!isQuote) {
Divider(
modifier = Modifier.padding(vertical = 10.dp),
thickness = 0.25.dp
)
}
}
}
}

Wyświetl plik

@ -187,7 +187,7 @@ fun NoteCompose(
onLongClick = { popupExpanded = true }
)
},
isBoostedNote
isBoostedNote || isQuotedNote
)
NoteQuickActionMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
@ -528,6 +528,10 @@ private fun NoteWithReactions(
accountViewModel,
nav
)
} else {
if (!isQuotedNote && !isBoostedNote) {
Spacer(modifier = Modifier.height(10.dp))
}
}
if (!isQuotedNote && !isBoostedNote) {

Wyświetl plik

@ -4,6 +4,7 @@ import android.content.Context
import android.widget.Toast
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
@ -84,7 +85,7 @@ fun ReactionsRow(baseNote: Note, showReactionDetail: Boolean, accountViewModel:
mutableStateOf<Boolean>(false)
}
Spacer(modifier = Modifier.height(8.dp))
Spacer(modifier = Modifier.height(8.dp).border(1.dp, Color.Red))
Row(verticalAlignment = CenterVertically, modifier = Modifier.padding(start = 10.dp)) {
if (showReactionDetail) {
@ -269,7 +270,7 @@ fun ReplyReaction(
grayTint: Color,
accountViewModel: AccountViewModel,
showCounter: Boolean = true,
iconSize: Dp = 20.dp,
iconSize: Dp = 18.dp,
onPress: () -> Unit
) {
val context = LocalContext.current