diff --git a/app/src/main/java/com/example/research/ui/article/ArticleScreen.kt b/app/src/main/java/com/example/research/ui/article/ArticleScreen.kt index 14c4f23..c799827 100644 --- a/app/src/main/java/com/example/research/ui/article/ArticleScreen.kt +++ b/app/src/main/java/com/example/research/ui/article/ArticleScreen.kt @@ -211,7 +211,8 @@ fun ArticleTitleBar( articleState: ArticleState?, showBackButton: Boolean, onNavigateBack: () -> Unit, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, + compact: Boolean = false, ) { val title = when (articleState) { is ArticleState.Loading -> articleState.title @@ -230,9 +231,14 @@ fun ArticleTitleBar( modifier = Modifier .fillMaxWidth() .windowInsetsPadding(AppWindowInsets.topAndHorizontalSafeDrawing) - .padding( - top = Spacing.listItemVertical, - bottom = Spacing.listItemVertical + .then( + if (compact) { + Modifier.padding(vertical = Spacing.listItemVertical) + } else { + Modifier + .padding(top = Spacing.topBarPadding, bottom = Spacing.topBarPadding) + .height(Spacing.topBarHeight) + } ), verticalAlignment = Alignment.CenterVertically ) { 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 0b450ec..0408705 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 @@ -99,6 +99,7 @@ fun AdaptiveMainScreen( articleState = articleState, showBackButton = isShowingDetail && articleState != null, onNavigateBack = onNavigateBackFromArticle, + compact = true, modifier = Modifier.windowInsetsPadding( WindowInsets.safeDrawing.only(WindowInsetsSides.Top) )