Skip to content

Commit 8434a49

Browse files
add modifier to chat rows
1 parent 8c3a0fa commit 8434a49

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_6_2SubComposeAndFlexLayout.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,38 +92,45 @@ private fun TutorialContent() {
9292
items(messages) { message: ChatMessage ->
9393

9494
// Remember random stats icon to not create in every recomposition
95-
val messageStatus = remember { MessageStatus.values()[Random.nextInt(3)] }
95+
val messageStatus = remember { MessageStatus.entries[Random.nextInt(3)] }
9696

9797
// Toggle between sent and received message
9898
when (message.id.toInt() % 4) {
9999
1 -> {
100100
SentMessageRowAlt(
101+
modifier = Modifier,
101102
text = message.message,
102103
quotedMessage = "Quote message",
103104
messageTime = sdf.format(System.currentTimeMillis()),
104105
messageStatus = messageStatus
105106
)
106107

107108
}
109+
108110
2 -> {
109111
ReceivedMessageRowAlt(
112+
modifier = Modifier,
110113
text = message.message,
111114
quotedMessage = "Quote",
112115
messageTime = sdf.format(System.currentTimeMillis()),
113116
)
114117

115118
}
119+
116120
3 -> {
117121
SentMessageRowAlt(
122+
modifier = Modifier,
118123
text = message.message,
119124
quotedImage = R.drawable.landscape1,
120125
messageTime = sdf.format(System.currentTimeMillis()),
121126
messageStatus = messageStatus
122127
)
123128

124129
}
130+
125131
else -> {
126132
ReceivedMessageRowAlt(
133+
modifier = Modifier,
127134
text = message.message,
128135
quotedImage = R.drawable.landscape2,
129136
messageTime = sdf.format(System.currentTimeMillis()),
@@ -134,7 +141,7 @@ private fun TutorialContent() {
134141
}
135142

136143
ChatInput(
137-
modifier=Modifier.imePadding(),
144+
modifier = Modifier.imePadding(),
138145
onMessageChange = { messageContent ->
139146
messages.add(
140147
ChatMessage(

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/chat/ReceivedMessageRow.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var recipientOriginalName = "Some user"
3030
*/
3131
@Composable
3232
fun ReceivedMessageRowAlt(
33+
modifier: Modifier = Modifier,
3334
text: String,
3435
quotedMessage: String? = null,
3536
quotedImage: Int? = null,
@@ -47,11 +48,10 @@ fun ReceivedMessageRowAlt(
4748

4849
// This is chat bubble
4950
SubcomposeColumn(
50-
modifier = Modifier
51+
modifier = modifier
5152
.shadow(1.dp, RoundedCornerShape(8.dp))
5253
.clip(RoundedCornerShape(8.dp))
53-
.background(Color.White)
54-
.clickable { },
54+
.background(Color.White),
5555
content = {
5656
RecipientName(
5757
name = recipientRegisteredName,

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/chat/SentMessageRow.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import com.smarttoolfactory.tutorial1_1basics.ui.SentQuoteColor
2121
*/
2222
@Composable
2323
fun SentMessageRowAlt(
24+
modifier: Modifier = Modifier,
2425
text: String,
2526
quotedMessage: String? = null,
2627
quotedImage: Int? = null,
@@ -40,15 +41,13 @@ fun SentMessageRowAlt(
4041

4142

4243
) {
43-
44-
44+
4545
// This is chat bubble
4646
SubcomposeColumn(
47-
modifier = Modifier
47+
modifier = modifier
4848
.shadow(1.dp, RoundedCornerShape(8.dp))
4949
.clip(RoundedCornerShape(8.dp))
50-
.background(SentMessageColor)
51-
.clickable { },
50+
.background(SentMessageColor),
5251

5352
content = {
5453
// 💬 Quoted message

0 commit comments

Comments
 (0)