[AdaptiveUiCodelab] clean up unused parameters

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
                 )
             }
         }
@@ -93,8 +52,6 @@ fun ReplyAppPreview() {
     ReplyTheme {
         ReplyApp(
             replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.COMPACT,
-            foldingDevicePosture = DevicePosture.NormalPosture,
             onEmailClick = {}
         )
     }
@@ -106,8 +63,6 @@ fun ReplyAppPreviewTablet() {
     ReplyTheme {
         ReplyApp(
             replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.MEDIUM,
-            foldingDevicePosture = DevicePosture.NormalPosture,
             onEmailClick = {}
         )
     }
@@ -119,8 +74,6 @@ fun ReplyAppPreviewDesktop() {
     ReplyTheme {
         ReplyApp(
             replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.EXPANDED,
-            foldingDevicePosture = DevicePosture.NormalPosture,
             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,
 ) {