Skip to content

Commit 4c17ed5

Browse files
authored
Merge branch 'main' into jetchat/fix-text-input-focus
2 parents 01ca7fa + 6074a82 commit 4c17ed5

File tree

1 file changed

+16
-21
lines changed
  • Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home

1 file changed

+16
-21
lines changed

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -321,17 +321,18 @@ private fun HomeScreenReady(
321321
)
322322

323323
Surface {
324-
val podcastUri = navigator.currentDestination?.content
325-
if (podcastUri.isNullOrEmpty()) {
326-
HomeScreen(
327-
homeState = homeState,
328-
modifier = Modifier.fillMaxSize()
329-
)
330-
} else {
331-
SupportingPaneScaffold(
332-
value = navigator.scaffoldValue,
333-
directive = navigator.scaffoldDirective,
334-
supportingPane = {
324+
SupportingPaneScaffold(
325+
value = navigator.scaffoldValue,
326+
directive = navigator.scaffoldDirective,
327+
mainPane = {
328+
HomeScreen(
329+
homeState = homeState,
330+
modifier = Modifier.fillMaxSize()
331+
)
332+
},
333+
supportingPane = {
334+
val podcastUri = navigator.currentDestination?.content
335+
if (!podcastUri.isNullOrEmpty()) {
335336
val podcastDetailsViewModel =
336337
hiltViewModel<PodcastDetailsViewModel, PodcastDetailsViewModel.Factory>(
337338
key = podcastUri
@@ -348,16 +349,10 @@ private fun HomeScreenReady(
348349
},
349350
showBackButton = navigator.isMainPaneHidden(),
350351
)
351-
},
352-
mainPane = {
353-
HomeScreen(
354-
homeState = homeState,
355-
modifier = Modifier.fillMaxSize()
356-
)
357-
},
358-
modifier = Modifier.fillMaxSize()
359-
)
360-
}
352+
}
353+
},
354+
modifier = Modifier.fillMaxSize()
355+
)
361356
}
362357
}
363358

0 commit comments

Comments
 (0)