Skip to content

Commit 29b753c

Browse files
committed
Address PR comments
1 parent 27e7c51 commit 29b753c

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Jetchat/app/src/main/java/com/example/compose/jetchat/NavActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import androidx.compose.material.rememberScaffoldState
2424
import androidx.compose.runtime.CompositionLocalProvider
2525
import androidx.compose.runtime.LaunchedEffect
2626
import androidx.compose.runtime.collectAsState
27+
import androidx.compose.runtime.getValue
2728
import androidx.compose.runtime.rememberCoroutineScope
2829
import androidx.compose.ui.viewinterop.AndroidViewBinding
2930
import androidx.core.os.bundleOf
3031
import androidx.core.view.WindowCompat
3132
import androidx.navigation.NavController
32-
import androidx.navigation.findNavController
3333
import androidx.navigation.fragment.NavHostFragment
3434
import com.example.compose.jetchat.components.JetchatScaffold
3535
import com.example.compose.jetchat.conversation.BackPressHandler
@@ -60,8 +60,8 @@ class NavActivity : AppCompatActivity() {
6060
) {
6161
val scaffoldState = rememberScaffoldState()
6262

63-
val openDrawerEvent = viewModel.drawerShouldBeOpened.collectAsState()
64-
if (openDrawerEvent.value) {
63+
val drawerOpen by viewModel.drawerShouldBeOpened.collectAsState()
64+
if (drawerOpen) {
6565
// Open drawer and reset state in VM.
6666
LaunchedEffect(Unit) {
6767
scaffoldState.drawerState.open()

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ fun ConversationContent(
102102

103103
val scrollState = rememberLazyListState()
104104
val scope = rememberCoroutineScope()
105+
105106
Surface(modifier = modifier) {
106107
Box(modifier = Modifier.fillMaxSize()) {
107108
Column(Modifier.fillMaxSize()) {
@@ -288,8 +289,6 @@ fun Message(
288289
isFirstMessageByAuthor: Boolean,
289290
isLastMessageByAuthor: Boolean
290291
) {
291-
val painter = painterResource(id = msg.authorImage)
292-
293292
val borderColor = if (isUserMe) {
294293
MaterialTheme.colors.primary
295294
} else {
@@ -309,7 +308,7 @@ fun Message(
309308
.border(3.dp, MaterialTheme.colors.surface, CircleShape)
310309
.clip(CircleShape)
311310
.align(Alignment.Top),
312-
painter = painter,
311+
painter = painterResource(id = msg.authorImage),
313312
contentScale = ContentScale.Crop,
314313
contentDescription = null,
315314
)

0 commit comments

Comments
 (0)