diff --git a/app/src/main/java/com/example/research/ui/main/AdaptiveMainScreen.kt b/app/src/main/java/com/example/research/ui/main/AdaptiveMainScreen.kt index dbd7e7f..0b450ec 100644 --- a/app/src/main/java/com/example/research/ui/main/AdaptiveMainScreen.kt +++ b/app/src/main/java/com/example/research/ui/main/AdaptiveMainScreen.kt @@ -97,7 +97,7 @@ fun AdaptiveMainScreen( ) { ArticleTitleBar( articleState = articleState, - showBackButton = isShowingDetail, + showBackButton = isShowingDetail && articleState != null, onNavigateBack = onNavigateBackFromArticle, modifier = Modifier.windowInsetsPadding( WindowInsets.safeDrawing.only(WindowInsetsSides.Top) @@ -113,8 +113,13 @@ fun AdaptiveMainScreen( ) } - LaunchedEffect(articleState, isQueryEmpty) { + LaunchedEffect(articleState, isQueryEmpty, isLandscape) { val targetValue = when { + isLandscape -> ThreePaneScaffoldValue( + primary = PaneAdaptedValue.Expanded, + secondary = PaneAdaptedValue.Expanded, + tertiary = PaneAdaptedValue.Hidden, + ) articleState == null -> ThreePaneScaffoldValue( primary = PaneAdaptedValue.Hidden, secondary = PaneAdaptedValue.Expanded, diff --git a/app/src/main/java/com/example/research/ui/navigation/AppNavigation.kt b/app/src/main/java/com/example/research/ui/navigation/AppNavigation.kt index 3322c82..8015a52 100644 --- a/app/src/main/java/com/example/research/ui/navigation/AppNavigation.kt +++ b/app/src/main/java/com/example/research/ui/navigation/AppNavigation.kt @@ -79,6 +79,12 @@ fun AppNavigation( .windowSizeClass .isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND) + LaunchedEffect(isWideScreen) { + if (isWideScreen) { + screenStack.removeAll { it == Screen.Article } + } + } + BackHandler(enabled = screenStack.size > 1 && !(currentScreen == Screen.Settings && isOperationActive)) { if (currentScreen == Screen.Article) { if (searchViewModel.navigateBackFromArticle()) {