Merge pull request #462 from android/adaptive-codelab

[AdaptiveUiCodelab] merge codelab updates to main

Author: jdkoren

AdaptiveUiCodelab/app/build.gradle.kts

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.example.reply"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "com.example.reply"
+        minSdk = 21
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.13"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/AL2.0"
+            excludes += "/META-INF/LGPL2.1"
+        }
+    }
+}
+
+dependencies {
+    val composeBom = platform(libs.androidx.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.extended)
+    implementation(libs.androidx.ui.tooling.preview)
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.window)
+    implementation(libs.kotlinx.coroutines.android)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

AdaptiveUiCodelab/app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

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 = {}
+        )
     }
-}
+}