minor refactoring on variables inside the chat screen rendering.
This commit is contained in:
+4
-19
@@ -51,7 +51,6 @@ import androidx.compose.ui.Alignment
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.Shape
|
|
||||||
import androidx.compose.ui.graphics.compositeOver
|
import androidx.compose.ui.graphics.compositeOver
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
@@ -289,23 +288,9 @@ fun ChatBubbleLayout(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val alignment: Arrangement.Horizontal =
|
|
||||||
if (isLoggedInUser) {
|
|
||||||
Arrangement.End
|
|
||||||
} else {
|
|
||||||
Arrangement.Start
|
|
||||||
}
|
|
||||||
|
|
||||||
val shape: Shape =
|
|
||||||
if (isLoggedInUser) {
|
|
||||||
ChatBubbleShapeMe
|
|
||||||
} else {
|
|
||||||
ChatBubbleShapeThem
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
modifier = if (innerQuote) ChatPaddingInnerQuoteModifier else ChatPaddingModifier,
|
modifier = if (innerQuote) ChatPaddingInnerQuoteModifier else ChatPaddingModifier,
|
||||||
horizontalArrangement = alignment,
|
horizontalArrangement = if (isLoggedInUser) Arrangement.End else Arrangement.Start,
|
||||||
) {
|
) {
|
||||||
val popupExpanded = remember { mutableStateOf(false) }
|
val popupExpanded = remember { mutableStateOf(false) }
|
||||||
|
|
||||||
@@ -335,19 +320,19 @@ fun ChatBubbleLayout(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
horizontalArrangement = alignment,
|
horizontalArrangement = if (isLoggedInUser) Arrangement.End else Arrangement.Start,
|
||||||
modifier = if (innerQuote) Modifier else ChatBubbleMaxSizeModifier,
|
modifier = if (innerQuote) Modifier else ChatBubbleMaxSizeModifier,
|
||||||
) {
|
) {
|
||||||
Surface(
|
Surface(
|
||||||
color = backgroundBubbleColor.value,
|
color = backgroundBubbleColor.value,
|
||||||
shape = shape,
|
shape = if (isLoggedInUser) ChatBubbleShapeMe else ChatBubbleShapeThem,
|
||||||
modifier = clickableModifier,
|
modifier = clickableModifier,
|
||||||
) {
|
) {
|
||||||
Column(modifier = messageBubbleLimits, verticalArrangement = RowColSpacing5dp) {
|
Column(modifier = messageBubbleLimits, verticalArrangement = RowColSpacing5dp) {
|
||||||
if (drawAuthorInfo) {
|
if (drawAuthorInfo) {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
horizontalArrangement = alignment,
|
horizontalArrangement = if (isLoggedInUser) Arrangement.End else Arrangement.Start,
|
||||||
modifier = HalfHalfVertPadding.clickable(onClick = onAuthorClick),
|
modifier = HalfHalfVertPadding.clickable(onClick = onAuthorClick),
|
||||||
) {
|
) {
|
||||||
drawAuthorLine()
|
drawAuthorLine()
|
||||||
|
|||||||
Reference in New Issue
Block a user