Merge pull request #32 from google-developer-training/m3-nav-update

Starter code for part 2

Author: OwenScott-GDS

app/src/androidTest/java/com/example/reply/test/ReplyAppStateRestorationTest.kt

@@ -54,23 +54,3 @@ fun ReplyAppCompactPreview() {
         )
     }
 }
-
-@Preview(showBackground = true, widthDp = 700)
-@Composable
-fun ReplyAppMediumPreview() {
-    ReplyTheme {
-        ReplyApp(
-            windowSize = WindowWidthSizeClass.Medium,
-        )
-    }
-}
-
-@Preview(showBackground = true, widthDp = 1000)
-@Composable
-fun ReplyAppExpandedPreview() {
-    ReplyTheme {
-        ReplyApp(
-            windowSize = WindowWidthSizeClass.Expanded,
-        )
-    }
-}

app/src/androidTest/java/com/example/reply/test/ReplyAppTest.kt

@@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.reply.data.Email
 import com.example.reply.data.MailboxType
-import com.example.reply.ui.utils.ReplyContentType
 import com.example.reply.ui.utils.ReplyNavigationType
 
 @Composable
@@ -31,31 +30,25 @@ fun ReplyApp(
     modifier: Modifier = Modifier,
 ) {
     val navigationType: ReplyNavigationType
-    val contentType: ReplyContentType
     val viewModel: ReplyViewModel = viewModel()
     val replyUiState = viewModel.uiState.collectAsState().value
 
     when (windowSize) {
         WindowWidthSizeClass.Compact -> {
             navigationType = ReplyNavigationType.BOTTOM_NAVIGATION
-            contentType = ReplyContentType.LIST_ONLY
         }
         WindowWidthSizeClass.Medium -> {
             navigationType = ReplyNavigationType.NAVIGATION_RAIL
-            contentType = ReplyContentType.LIST_ONLY
         }
         WindowWidthSizeClass.Expanded -> {
             navigationType = ReplyNavigationType.PERMANENT_NAVIGATION_DRAWER
-            contentType = ReplyContentType.LIST_AND_DETAIL
         }
         else -> {
             navigationType = ReplyNavigationType.BOTTOM_NAVIGATION
-            contentType = ReplyContentType.LIST_ONLY
         }
     }
     ReplyHomeScreen(
         navigationType = navigationType,
-        contentType = contentType,
         replyUiState = replyUiState,
         onTabPressed = { mailboxType: MailboxType ->
             viewModel.updateCurrentMailbox(mailboxType = mailboxType)

app/src/androidTest/java/com/example/reply/test/TestAnnotations.kt

@@ -22,10 +22,8 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -56,7 +54,6 @@ fun ReplyDetailsScreen(
     replyUiState: ReplyUiState,
     modifier: Modifier = Modifier,
     onBackPressed: () -> Unit = {},
-    isFullScreen: Boolean = false
 ) {
     BackHandler {
         onBackPressed()
@@ -70,23 +67,16 @@ fun ReplyDetailsScreen(
                 .padding(top = dimensionResource(R.dimen.detail_card_list_padding_top))
         ) {
             item {
-                if (isFullScreen) {
-                    ReplyDetailsScreenTopBar(
-                        onBackPressed,
-                        replyUiState,
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = dimensionResource(R.dimen.detail_topbar_padding_bottom))
-                    )
-                }
+                ReplyDetailsScreenTopBar(
+                    onBackPressed,
+                    replyUiState,
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = dimensionResource(R.dimen.detail_topbar_padding_bottom))
+                )
                 ReplyEmailDetailsCard(
                     email = replyUiState.currentSelectedEmail,
-                    mailboxType = replyUiState.currentMailbox,
-                    isFullScreen = isFullScreen,
-                    modifier = if (isFullScreen)
-                        Modifier.padding(horizontal = dimensionResource(R.dimen.detail_card_outer_padding_horizontal))
-                    else
-                        Modifier.padding(end = dimensionResource(R.dimen.detail_card_outer_padding_horizontal))
+                    mailboxType = replyUiState.currentMailbox
                 )
             }
         }
@@ -134,7 +124,6 @@ private fun ReplyEmailDetailsCard(
     email: Email,
     mailboxType: MailboxType,
     modifier: Modifier = Modifier,
-    isFullScreen: Boolean = false
 ) {
     val context = LocalContext.current
     val displayToast = { text: String ->
@@ -153,19 +142,15 @@ private fun ReplyEmailDetailsCard(
                 email,
                 Modifier.fillMaxWidth()
             )
-            if (!isFullScreen) {
-                Text(
-                    text = stringResource(email.subject),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.outline,
-                    modifier = Modifier.padding(
-                        top = dimensionResource(R.dimen.detail_content_padding_top),
-                        bottom = dimensionResource(R.dimen.detail_expanded_subject_body_spacing)
-                    ),
-                )
-            } else {
-                Spacer(modifier = Modifier.height(dimensionResource(R.dimen.detail_content_padding_top)))
-            }
+            Text(
+                text = stringResource(email.subject),
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.outline,
+                modifier = Modifier.padding(
+                    top = dimensionResource(R.dimen.detail_content_padding_top),
+                    bottom = dimensionResource(R.dimen.detail_expanded_subject_body_spacing)
+                ),
+            )
             Text(
                 text = stringResource(email.body),
                 style = MaterialTheme.typography.bodyLarge,

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

@@ -113,7 +113,7 @@ fun ReplyListAndDetailContent(
         ReplyDetailsScreen(
             replyUiState = replyUiState,
             modifier = Modifier.weight(1f),
-            onBackPressed = { activity.finish() }
+            onBackPressed = {}
         )
     }
 }