Merge pull request #459 from android/jdk/adaptive-codelab/update-starter-code

[AdaptiveUiCodelab] update starter code

Author: jdkoren

AdaptiveUiCodelab/app/src/main/java/com/example/reply/data/Email.kt

@@ -33,7 +33,7 @@ data class Email(
     var isStarred: Boolean = false,
     var mailbox: MailboxType = MailboxType.INBOX,
     var createAt: String,
-    val threads: List<Email> = emptyList()
+    val replies: List<Email> = emptyList()
 ) {
     val senderPreview: String = "${sender.fullName} - 4 hrs ago"
     val hasBody: Boolean = body.isNotBlank()
@@ -44,5 +44,3 @@ data class Email(
     val nonUserAccountRecipients = recipients
         .filterNot { LocalAccountsDataProvider.isUserAccount(it.uid) }
 }
-
-

AdaptiveUiCodelab/app/src/main/java/com/example/reply/data/EmailsRepositoryImpl.kt

@@ -17,7 +17,6 @@
 package com.example.reply.data
 
 import com.example.reply.data.local.LocalEmailsDataProvider
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
@@ -39,4 +38,4 @@ class EmailsRepositoryImpl : EmailsRepository {
     override fun getEmailFromId(id: Long): Flow<Email?> = flow {
         val categoryEmails = LocalEmailsDataProvider.allEmails.firstOrNull { it.id == id }
     }
-}
+}

AdaptiveUiCodelab/app/src/main/java/com/example/reply/data/local/LocalEmailsDataProvider.kt

@@ -27,7 +27,7 @@ import com.example.reply.data.MailboxType
 
 object LocalEmailsDataProvider {
 
-    private val threads = listOf(
+    private val replies = listOf(
         Email(
             4L,
             LocalAccountsDataProvider.getContactAccountByUid(11L),
@@ -116,7 +116,7 @@ object LocalEmailsDataProvider {
             """.trimIndent(),
             createAt = "20 mins ago",
             isStarred = true,
-            threads = threads,
+            replies = replies,
         ),
         Email(
             1L,
@@ -133,7 +133,7 @@ object LocalEmailsDataProvider {
                 Ali
             """.trimIndent(),
             createAt = "40 mins ago",
-            threads = threads,
+            replies = replies,
         ),
         Email(
             2L,
@@ -149,7 +149,7 @@ object LocalEmailsDataProvider {
             ),
             true,
             createAt = "1 hour ago",
-            threads = threads,
+            replies = replies,
         ),
         Email(
             3L,
@@ -311,4 +311,3 @@ object LocalEmailsDataProvider {
         "Grocery coupons"
     )
 }
-

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/MainActivity.kt

@@ -21,8 +21,9 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.reply.data.local.LocalEmailsDataProvider
 import com.example.reply.ui.theme.ReplyTheme
 
@@ -35,8 +36,11 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             ReplyTheme {
-                val uiState = viewModel.uiState.collectAsState().value
-                ReplyApp(uiState)
+                val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+                ReplyApp(
+                    replyHomeUIState = uiState,
+                    onEmailClick = viewModel::setSelectedEmail
+                )
             }
         }
     }
@@ -46,28 +50,37 @@ class MainActivity : ComponentActivity() {
 @Composable
 fun ReplyAppPreview() {
     ReplyTheme {
-        ReplyApp(replyHomeUIState = ReplyHomeUIState(
-            emails = LocalEmailsDataProvider.allEmails
-        ))
+        ReplyApp(
+            replyHomeUIState = ReplyHomeUIState(
+                emails = LocalEmailsDataProvider.allEmails
+            ),
+            onEmailClick = {}
+        )
     }
 }
 
 @Preview(showBackground = true, widthDp = 700)
 @Composable
 fun ReplyAppPreviewTablet() {
     ReplyTheme {
-        ReplyApp(replyHomeUIState = ReplyHomeUIState(
-            emails = LocalEmailsDataProvider.allEmails
-        ))
+        ReplyApp(
+            replyHomeUIState = ReplyHomeUIState(
+                emails = LocalEmailsDataProvider.allEmails
+            ),
+            onEmailClick = {}
+        )
     }
 }
 
 @Preview(showBackground = true, widthDp = 1000)
 @Composable
 fun ReplyAppPreviewDesktop() {
     ReplyTheme {
-        ReplyApp(replyHomeUIState = ReplyHomeUIState(
-            emails = LocalEmailsDataProvider.allEmails
-        ))
+        ReplyApp(
+            replyHomeUIState = ReplyHomeUIState(
+                emails = LocalEmailsDataProvider.allEmails
+            ),
+            onEmailClick = {}
+        )
     }
-}
+}