More adjustments to borders and spacing between screen elements for different event types
This commit is contained in:
@@ -46,10 +46,12 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false, idHex: St
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Divider(
|
if (!isQuote) {
|
||||||
modifier = Modifier.padding(vertical = 10.dp),
|
Divider(
|
||||||
thickness = 0.25.dp
|
modifier = Modifier.padding(vertical = 10.dp),
|
||||||
)
|
thickness = 0.25.dp
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ fun NoteCompose(
|
|||||||
onLongClick = { popupExpanded = true }
|
onLongClick = { popupExpanded = true }
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
isBoostedNote
|
isBoostedNote || isQuotedNote
|
||||||
)
|
)
|
||||||
|
|
||||||
NoteQuickActionMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
|
NoteQuickActionMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
|
||||||
@@ -528,6 +528,10 @@ private fun NoteWithReactions(
|
|||||||
accountViewModel,
|
accountViewModel,
|
||||||
nav
|
nav
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
if (!isQuotedNote && !isBoostedNote) {
|
||||||
|
Spacer(modifier = Modifier.height(10.dp))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isQuotedNote && !isBoostedNote) {
|
if (!isQuotedNote && !isBoostedNote) {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import android.content.Context
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.compose.animation.core.animateFloatAsState
|
import androidx.compose.animation.core.animateFloatAsState
|
||||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||||
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.combinedClickable
|
import androidx.compose.foundation.combinedClickable
|
||||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
@@ -84,7 +85,7 @@ fun ReactionsRow(baseNote: Note, showReactionDetail: Boolean, accountViewModel:
|
|||||||
mutableStateOf<Boolean>(false)
|
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)) {
|
Row(verticalAlignment = CenterVertically, modifier = Modifier.padding(start = 10.dp)) {
|
||||||
if (showReactionDetail) {
|
if (showReactionDetail) {
|
||||||
@@ -269,7 +270,7 @@ fun ReplyReaction(
|
|||||||
grayTint: Color,
|
grayTint: Color,
|
||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
showCounter: Boolean = true,
|
showCounter: Boolean = true,
|
||||||
iconSize: Dp = 20.dp,
|
iconSize: Dp = 18.dp,
|
||||||
onPress: () -> Unit
|
onPress: () -> Unit
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|||||||
Reference in New Issue
Block a user