Commit 8434a49

committed

add modifier to chat rows

1 parent 8c3a0fa commit 8434a49Copy full SHA for 8434a49

File tree

3 files changed

+16

-10

lines changed

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

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 number	Diff line number	Diff line change
`@@ -92,38 +92,45 @@ private fun TutorialContent() {`
`92`	`92`	`items(messages) { message: ChatMessage ->`
`93`	`93`
`94`	`94`	`// 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)] }`
`96`	`96`
`97`	`97`	`// Toggle between sent and received message`
`98`	`98`	`when (message.id.toInt() % 4) {`
`99`	`99`	`1 -> {`
`100`	`100`	`SentMessageRowAlt(`
	`101`	`+ modifier = Modifier,`
`101`	`102`	`text = message.message,`
`102`	`103`	`quotedMessage = "Quote message",`
`103`	`104`	`messageTime = sdf.format(System.currentTimeMillis()),`
`104`	`105`	`messageStatus = messageStatus`
`105`	`106`	`)`
`106`	`107`
`107`	`108`	`}`
	`109`	`+`
`108`	`110`	`2 -> {`
`109`	`111`	`ReceivedMessageRowAlt(`
	`112`	`+ modifier = Modifier,`
`110`	`113`	`text = message.message,`
`111`	`114`	`quotedMessage = "Quote",`
`112`	`115`	`messageTime = sdf.format(System.currentTimeMillis()),`
`113`	`116`	`)`
`114`	`117`
`115`	`118`	`}`
	`119`	`+`
`116`	`120`	`3 -> {`
`117`	`121`	`SentMessageRowAlt(`
	`122`	`+ modifier = Modifier,`
`118`	`123`	`text = message.message,`
`119`	`124`	`quotedImage = R.drawable.landscape1,`
`120`	`125`	`messageTime = sdf.format(System.currentTimeMillis()),`
`121`	`126`	`messageStatus = messageStatus`
`122`	`127`	`)`
`123`	`128`
`124`	`129`	`}`
	`130`	`+`
`125`	`131`	`else -> {`
`126`	`132`	`ReceivedMessageRowAlt(`
	`133`	`+ modifier = Modifier,`
`127`	`134`	`text = message.message,`
`128`	`135`	`quotedImage = R.drawable.landscape2,`
`129`	`136`	`messageTime = sdf.format(System.currentTimeMillis()),`
`@@ -134,7 +141,7 @@ private fun TutorialContent() {`
`134`	`141`	`}`
`135`	`142`
`136`	`143`	`ChatInput(`
`137`		`- modifier=Modifier.imePadding(),`
	`144`	`+ modifier=Modifier.imePadding(),`
`138`	`145`	`onMessageChange = { messageContent ->`
`139`	`146`	`messages.add(`
`140`	`147`	`ChatMessage(`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ var recipientOriginalName = "Some user"`
`30`	`30`	`*/`
`31`	`31`	`@Composable`
`32`	`32`	`fun ReceivedMessageRowAlt(`
	`33`	`+ modifier: Modifier = Modifier,`
`33`	`34`	`text: String,`
`34`	`35`	`quotedMessage: String? = null,`
`35`	`36`	`quotedImage: Int? = null,`
`@@ -47,11 +48,10 @@ fun ReceivedMessageRowAlt(`
`47`	`48`
`48`	`49`	`// This is chat bubble`
`49`	`50`	`SubcomposeColumn(`
`50`		`- modifier = Modifier`
	`51`	`+ modifier = modifier`
`51`	`52`	`.shadow(1.dp, RoundedCornerShape(8.dp))`
`52`	`53`	`.clip(RoundedCornerShape(8.dp))`
`53`		`- .background(Color.White)`
`54`		`- .clickable { },`
	`54`	`+ .background(Color.White),`
`55`	`55`	`content = {`
`56`	`56`	`RecipientName(`
`57`	`57`	`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 number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import com.smarttoolfactory.tutorial1_1basics.ui.SentQuoteColor`
`21`	`21`	`*/`
`22`	`22`	`@Composable`
`23`	`23`	`fun SentMessageRowAlt(`
	`24`	`+ modifier: Modifier = Modifier,`
`24`	`25`	`text: String,`
`25`	`26`	`quotedMessage: String? = null,`
`26`	`27`	`quotedImage: Int? = null,`
`@@ -40,15 +41,13 @@ fun SentMessageRowAlt(`
`40`	`41`
`41`	`42`
`42`	`43`	`) {`
`43`		`-`
`44`		`-`
	`44`	`+`
`45`	`45`	`// This is chat bubble`
`46`	`46`	`SubcomposeColumn(`
`47`		`- modifier = Modifier`
	`47`	`+ modifier = modifier`
`48`	`48`	`.shadow(1.dp, RoundedCornerShape(8.dp))`
`49`	`49`	`.clip(RoundedCornerShape(8.dp))`
`50`		`- .background(SentMessageColor)`
`51`		`- .clickable { },`
	`50`	`+ .background(SentMessageColor),`
`52`	`51`
`53`	`52`	`content = {`
`54`	`53`	`// 💬 Quoted message`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8434a49

File tree

3 files changed

3 files changed

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

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

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

0 commit comments