Merge pull request #458 from android/jdk/adaptive-codelab-end/clean-up

[AdaptiveUiCodelab] Remove unused code and other cleanup

Author: jdkoren

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

@@ -20,23 +20,12 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 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.flowWithLifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.window.core.layout.WindowWidthSizeClass
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.reply.data.local.LocalEmailsDataProvider
 import com.example.reply.ui.theme.ReplyTheme
-import com.example.reply.ui.utils.DevicePosture
-import com.example.reply.ui.utils.isBookPosture
-import com.example.reply.ui.utils.isSeparating
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
 
 class MainActivity : ComponentActivity() {
 
@@ -45,42 +34,12 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        /**
-         * Flow of [DevicePosture] that emits every time there's a change in the windowLayoutInfo
-         */
-        val devicePostureFlow =  WindowInfoTracker.getOrCreate(this).windowLayoutInfo(this)
-            .flowWithLifecycle(this.lifecycle)
-            .map { layoutInfo ->
-                val foldingFeature =
-                    layoutInfo.displayFeatures
-                        .filterIsInstance<FoldingFeature>()
-                        .firstOrNull()
-                when {
-                    isBookPosture(foldingFeature) ->
-                        DevicePosture.BookPosture(foldingFeature.bounds)
-
-                    isSeparating(foldingFeature) ->
-                        DevicePosture.Separating(foldingFeature.bounds, foldingFeature.orientation)
-
-                    else -> DevicePosture.NormalPosture
-                }
-            }
-            .stateIn(
-                scope = lifecycleScope,
-                started = SharingStarted.Eagerly,
-                initialValue = DevicePosture.NormalPosture
-            )
-
         setContent {
             ReplyTheme {
-                val windowAdaptiveInfo = currentWindowAdaptiveInfo()
-                val devicePosture = devicePostureFlow.collectAsState().value
-                val uiState = viewModel.uiState.collectAsState().value
+                val uiState by viewModel.uiState.collectAsStateWithLifecycle()
                 ReplyApp(
-                    windowAdaptiveInfo.windowSizeClass.windowWidthSizeClass,
-                    devicePosture,
-                    uiState,
-                    viewModel::setSelectedEmail
+                    replyHomeUIState = uiState,
+                    onEmailClick = viewModel::setSelectedEmail
                 )
             }
         }
@@ -92,9 +51,9 @@ class MainActivity : ComponentActivity() {
 fun ReplyAppPreview() {
     ReplyTheme {
         ReplyApp(
-            replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.COMPACT,
-            foldingDevicePosture = DevicePosture.NormalPosture,
+            replyHomeUIState = ReplyHomeUIState(
+                emails = LocalEmailsDataProvider.allEmails
+            ),
             onEmailClick = {}
         )
     }
@@ -105,9 +64,9 @@ fun ReplyAppPreview() {
 fun ReplyAppPreviewTablet() {
     ReplyTheme {
         ReplyApp(
-            replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.MEDIUM,
-            foldingDevicePosture = DevicePosture.NormalPosture,
+            replyHomeUIState = ReplyHomeUIState(
+                emails = LocalEmailsDataProvider.allEmails
+            ),
             onEmailClick = {}
         )
     }
@@ -118,9 +77,9 @@ fun ReplyAppPreviewTablet() {
 fun ReplyAppPreviewDesktop() {
     ReplyTheme {
         ReplyApp(
-            replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.EXPANDED,
-            foldingDevicePosture = DevicePosture.NormalPosture,
+            replyHomeUIState = ReplyHomeUIState(
+                emails = LocalEmailsDataProvider.allEmails
+            ),
             onEmailClick = {}
         )
     }

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

@@ -38,16 +38,12 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.toSize
-import androidx.window.core.layout.WindowWidthSizeClass
 import com.example.reply.data.Email
-import com.example.reply.ui.utils.DevicePosture
 
 private val WINDOW_WIDTH_LARGE = 1200.dp
 
 @Composable
 fun ReplyApp(
-    windowSize: WindowWidthSizeClass,
-    foldingDevicePosture: DevicePosture,
     replyHomeUIState: ReplyHomeUIState,
     onEmailClick: (Email) -> Unit,
 ) {

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

@@ -27,7 +27,9 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
-class ReplyHomeViewModel(private val emailsRepository: EmailsRepository = EmailsRepositoryImpl()): ViewModel() {
+class ReplyHomeViewModel(
+    private val emailsRepository: EmailsRepository = EmailsRepositoryImpl()
+): ViewModel() {
 
     // UI state exposed to the UI
     private val _uiState = MutableStateFlow(ReplyHomeUIState(loading = true))

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

@@ -34,7 +34,6 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -78,13 +77,12 @@ fun ReplyDetailPane(
         item {
             ReplyEmailThreadItem(email)
         }
-        items(email.replies) {
-            ReplyEmailThreadItem(it)
+        items(email.replies) { reply ->
+            ReplyEmailThreadItem(reply)
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ReplyEmailListItem(
     email: Email,
@@ -152,7 +150,6 @@ fun ReplyEmailListItem(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ReplyEmailThreadItem(
     email: Email,
@@ -251,21 +248,24 @@ fun ReplyEmailThreadItem(
 fun ReplyProfileImage(
     drawableResource: Int,
     description: String,
-    modifier: Modifier = Modifier.size(40.dp),
+    modifier: Modifier = Modifier,
 ) {
     Image(
-        modifier = modifier.clip(CircleShape),
+        modifier = modifier
+            .size(40.dp)
+            .clip(CircleShape),
         painter = painterResource(id = drawableResource),
         contentDescription = description,
     )
 }
 
 @Composable
 fun ReplySearchBar(modifier: Modifier = Modifier) {
-    Row(modifier = modifier
-        .fillMaxWidth()
-        .padding(16.dp)
-        .background(MaterialTheme.colorScheme.surface, CircleShape),
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(16.dp)
+            .background(MaterialTheme.colorScheme.surface, CircleShape),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Icon(
@@ -274,7 +274,8 @@ fun ReplySearchBar(modifier: Modifier = Modifier) {
             modifier = Modifier.padding(start = 16.dp),
             tint = MaterialTheme.colorScheme.outline
         )
-        Text(text = stringResource(id = R.string.search_replies),
+        Text(
+            text = stringResource(id = R.string.search_replies),
             modifier = Modifier
                 .weight(1f)
                 .padding(16.dp),

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

@@ -19,17 +19,18 @@ package com.example.reply.ui
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Article
-import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.icons.filled.Inbox
 import androidx.compose.material.icons.outlined.Chat
 import androidx.compose.material.icons.outlined.People
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.example.reply.R
 
+/** Navigation destinations in the app. */
 enum class ReplyDestination(
     @StringRes val labelRes: Int,
     val icon: ImageVector,
 ) {
-    Inbox(R.string.tab_inbox, Icons.Default.Menu),
+    Inbox(R.string.tab_inbox, Icons.Default.Inbox),
 
     Articles(R.string.tab_article, Icons.Default.Article),