Merge pull request #355 from joreilly/NavigationSuiteScaffold

Use NavigationSuiteScaffold and ListDetailPaneScaffold
joreilly · Jun 18, 2024 · 2530fbc · 2530fbc
2 parents 7b35f69 + c4d181c
commit 2530fbc
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 322 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -73,7 +73,11 @@ dependencies {
     implementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.material3.windowSizeClass)
+    implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive.layout)
+    implementation(libs.androidx.compose.material3.adaptive.navigation)
+    implementation(libs.androidx.compose.material3.adaptive.navigation.suite)
+
 
     implementation(libs.coilCompose)
     implementation(libs.glance.appwidget)

diff --git a/app/src/androidTest/java/com/surrus/peopleinspace/PeopleInSpaceNavTest.kt b/app/src/androidTest/java/com/surrus/peopleinspace/PeopleInSpaceNavTest.kt
diff --git a/app/src/main/java/com/surrus/peopleinspace/MainActivity.kt b/app/src/main/java/com/surrus/peopleinspace/MainActivity.kt
@@ -3,15 +3,13 @@ package com.surrus.peopleinspace
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.activity.enableEdgeToEdge
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import com.surrus.peopleinspace.ui.PeopleInSpaceApp
 
 
 class MainActivity : ComponentActivity() {
-    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
@@ -21,7 +19,7 @@ class MainActivity : ComponentActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         setContent {
-            PeopleInSpaceApp(calculateWindowSizeClass(this))
+            PeopleInSpaceApp()
         }
     }
 }

diff --git a/app/src/main/java/com/surrus/peopleinspace/navigation/PeopleInSpaceNavHost.kt b/app/src/main/java/com/surrus/peopleinspace/navigation/PeopleInSpaceNavHost.kt
diff --git a/app/src/main/java/com/surrus/peopleinspace/navigation/TopLevelDestination.kt b/app/src/main/java/com/surrus/peopleinspace/navigation/TopLevelDestination.kt
diff --git a/app/src/main/java/com/surrus/peopleinspace/persondetails/PersonDetailsScreen.kt b/app/src/main/java/com/surrus/peopleinspace/persondetails/PersonDetailsScreen.kt
@@ -32,11 +32,11 @@ import com.surrus.peopleinspace.ui.component.PeopleInSpaceGradientBackground
 
 
 @Composable
-fun PersonDetailsScreen(person: Assignment, popBack: () -> Unit) {
+fun PersonDetailsScreen(person: Assignment, showBackButton: Boolean, popBack: () -> Unit) {
     PeopleInSpaceGradientBackground {
         Scaffold(
             topBar = {
-                PersonDetailsTopAppBar(personName = person.name, popBack = popBack)
+                PersonDetailsTopAppBar(personName = person.name, showBackButton, popBack = popBack)
             },
             containerColor = Color.Transparent,
             contentWindowInsets = WindowInsets(0, 0, 0, 0)
@@ -47,12 +47,14 @@ fun PersonDetailsScreen(person: Assignment, popBack: () -> Unit) {
 }
 
 @Composable
-fun PersonDetailsTopAppBar(personName: String, popBack: () -> Unit) {
+fun PersonDetailsTopAppBar(personName: String, showBackButton: Boolean, popBack: () -> Unit) {
     CenterAlignedTopAppBar(
         title = { Text(personName) },
         navigationIcon = {
-            IconButton(onClick = { popBack() }) {
-                Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
+            if (showBackButton) {
+                IconButton(onClick = { popBack() }) {
+                    Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
+                }
             }
         },
         colors = TopAppBarDefaults.centerAlignedTopAppBarColors(