From f39aa2a341638a68e57676c6370db6ada09c2570 Mon Sep 17 00:00:00 2001 From: OneWay Date: Fri, 18 Sep 2026 02:02:00 +0800 Subject: [PATCH] fix(ui): align content start offset between search list and article --- .../main/java/com/example/research/ui/article/ArticleScreen.kt | 3 ++- .../java/com/example/research/ui/main/AdaptiveMainScreen.kt | 3 ++- app/src/main/java/com/example/research/ui/main/MainScreen.kt | 3 ++- app/src/main/java/com/example/research/ui/theme/Spacing.kt | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) 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 66f697c..afd131e 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 @@ -125,6 +125,7 @@ fun ArticleContent( LazyColumn( state = listState, + contentPadding = PaddingValues(top = Spacing.listItemVertical), modifier = modifier .fillMaxSize() .onSizeChanged { viewportSize = it } @@ -149,7 +150,7 @@ fun ArticleContent( Box( modifier = Modifier .padding( - start = Spacing.iconStart + indentStep * block.indent + start = Spacing.contentStart + indentStep * block.indent ) .padding(bottom = if (followedByContinuation) 0.dp else 8.dp) ) { 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 d9bc274..dbd7e7f 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 @@ -13,6 +13,7 @@ import com.example.research.ui.article.ArticleContent import com.example.research.ui.article.ArticleTitleBar import com.example.research.ui.article.ArticleState import com.example.research.ui.main.components.MainTopBar +import com.example.research.ui.theme.Spacing @OptIn(ExperimentalMaterial3AdaptiveApi::class) @Composable @@ -84,7 +85,7 @@ fun AdaptiveMainScreen( .windowInsetsPadding( WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal) ) - .padding(start = 32.dp, end = listEndPadding), + .padding(start = Spacing.contentStart, end = listEndPadding), listModifier = Modifier.windowInsetsPadding(WindowInsets.navigationBars), ) }, diff --git a/app/src/main/java/com/example/research/ui/main/MainScreen.kt b/app/src/main/java/com/example/research/ui/main/MainScreen.kt index d494b25..af0fc42 100644 --- a/app/src/main/java/com/example/research/ui/main/MainScreen.kt +++ b/app/src/main/java/com/example/research/ui/main/MainScreen.kt @@ -14,6 +14,7 @@ import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.example.research.ui.theme.AppWindowInsets +import com.example.research.ui.theme.Spacing import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.collectAsLazyPagingItems import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -169,7 +170,7 @@ internal fun MainScreen( .padding(paddingValues) .consumeWindowInsets(paddingValues) .windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing) - .padding(start = 32.dp, end = 16.dp), + .padding(start = Spacing.contentStart, end = 16.dp), ) } } diff --git a/app/src/main/java/com/example/research/ui/theme/Spacing.kt b/app/src/main/java/com/example/research/ui/theme/Spacing.kt index 56280ec..3d2b033 100644 --- a/app/src/main/java/com/example/research/ui/theme/Spacing.kt +++ b/app/src/main/java/com/example/research/ui/theme/Spacing.kt @@ -9,4 +9,6 @@ object Spacing { val iconStart = 32.dp val searchTextStart = 68.dp val listItemVertical = 8.dp + + val contentStart = 32.dp }