From d135a6ba49ebd32ca3cb372631eb33b18eeda711 Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Wed, 13 Nov 2024 16:00:09 -0800
Subject: [PATCH 1/2] Use one HomeScreen call in SupportingPaneScaffold

Change-Id: I22b5b18cb129806b5e5e79c583cb77f387dffb1d
---
 .../com/example/jetcaster/ui/home/Home.kt     | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
index a11a4b83db..c7211a611b 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
@@ -321,17 +321,12 @@ private fun HomeScreenReady(
     )
 
     Surface {
-        val podcastUri = navigator.currentDestination?.content
-        if (podcastUri.isNullOrEmpty()) {
-            HomeScreen(
-                homeState = homeState,
-                modifier = Modifier.fillMaxSize()
-            )
-        } else {
-            SupportingPaneScaffold(
-                value = navigator.scaffoldValue,
-                directive = navigator.scaffoldDirective,
-                supportingPane = {
+        SupportingPaneScaffold(
+            value = navigator.scaffoldValue,
+            directive = navigator.scaffoldDirective,
+            supportingPane = {
+                val podcastUri = navigator.currentDestination?.content
+                if (!podcastUri.isNullOrEmpty()) {
                     val podcastDetailsViewModel =
                         hiltViewModel<PodcastDetailsViewModel, PodcastDetailsViewModel.Factory>(
                             key = podcastUri
@@ -348,16 +343,16 @@ private fun HomeScreenReady(
                         },
                         showBackButton = navigator.isMainPaneHidden(),
                     )
-                },
-                mainPane = {
-                    HomeScreen(
-                        homeState = homeState,
-                        modifier = Modifier.fillMaxSize()
-                    )
-                },
-                modifier = Modifier.fillMaxSize()
-            )
-        }
+                }
+            },
+            mainPane = {
+                HomeScreen(
+                    homeState = homeState,
+                    modifier = Modifier.fillMaxSize()
+                )
+            },
+            modifier = Modifier.fillMaxSize()
+        )
     }
 }
 

From 69ef8ced4ddad92635d7168a54173e269f79c730 Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Thu, 14 Nov 2024 13:59:36 -0800
Subject: [PATCH 2/2] Re-order mainPane for ease of understanding

Change-Id: Iacdce15aa75097389f334a99af97f93917ffa793
---
 .../main/java/com/example/jetcaster/ui/home/Home.kt  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
index c7211a611b..ce2d128a2c 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
@@ -324,6 +324,12 @@ private fun HomeScreenReady(
         SupportingPaneScaffold(
             value = navigator.scaffoldValue,
             directive = navigator.scaffoldDirective,
+            mainPane = {
+                HomeScreen(
+                    homeState = homeState,
+                    modifier = Modifier.fillMaxSize()
+                )
+            },
             supportingPane = {
                 val podcastUri = navigator.currentDestination?.content
                 if (!podcastUri.isNullOrEmpty()) {
@@ -345,12 +351,6 @@ private fun HomeScreenReady(
                     )
                 }
             },
-            mainPane = {
-                HomeScreen(
-                    homeState = homeState,
-                    modifier = Modifier.fillMaxSize()
-                )
-            },
             modifier = Modifier.fillMaxSize()
         )
     }