fix(ui): align content start offset between search list and article
This commit is contained in:
1 parent
f51684367a
commit
f39aa2a341
4 files changed
+8
-3
No files matched your search
@@ -125,6 +125,7 @@ fun ArticleContent(
|
|||||||
|
|
||||||
LazyColumn(
|
LazyColumn(
|
||||||
state = listState,
|
state = listState,
|
||||||
|
contentPadding = PaddingValues(top = Spacing.listItemVertical),
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.onSizeChanged { viewportSize = it }
|
.onSizeChanged { viewportSize = it }
|
||||||
@@ -149,7 +150,7 @@ fun ArticleContent(
|
|||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(
|
.padding(
|
||||||
start = Spacing.iconStart + indentStep * block.indent
|
start = Spacing.contentStart + indentStep * block.indent
|
||||||
)
|
)
|
||||||
.padding(bottom = if (followedByContinuation) 0.dp else 8.dp)
|
.padding(bottom = if (followedByContinuation) 0.dp else 8.dp)
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import com.example.research.ui.article.ArticleContent
|
|||||||
import com.example.research.ui.article.ArticleTitleBar
|
import com.example.research.ui.article.ArticleTitleBar
|
||||||
import com.example.research.ui.article.ArticleState
|
import com.example.research.ui.article.ArticleState
|
||||||
import com.example.research.ui.main.components.MainTopBar
|
import com.example.research.ui.main.components.MainTopBar
|
||||||
|
import com.example.research.ui.theme.Spacing
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
|
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
|
||||||
@Composable
|
@Composable
|
||||||
@@ -84,7 +85,7 @@ fun AdaptiveMainScreen(
|
|||||||
.windowInsetsPadding(
|
.windowInsetsPadding(
|
||||||
WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
|
WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
|
||||||
)
|
)
|
||||||
.padding(start = 32.dp, end = listEndPadding),
|
.padding(start = Spacing.contentStart, end = listEndPadding),
|
||||||
listModifier = Modifier.windowInsetsPadding(WindowInsets.navigationBars),
|
listModifier = Modifier.windowInsetsPadding(WindowInsets.navigationBars),
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import androidx.compose.foundation.text.input.TextFieldState
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import com.example.research.ui.theme.AppWindowInsets
|
import com.example.research.ui.theme.AppWindowInsets
|
||||||
|
import com.example.research.ui.theme.Spacing
|
||||||
import androidx.paging.compose.LazyPagingItems
|
import androidx.paging.compose.LazyPagingItems
|
||||||
import androidx.paging.compose.collectAsLazyPagingItems
|
import androidx.paging.compose.collectAsLazyPagingItems
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
@@ -169,7 +170,7 @@ internal fun MainScreen(
|
|||||||
.padding(paddingValues)
|
.padding(paddingValues)
|
||||||
.consumeWindowInsets(paddingValues)
|
.consumeWindowInsets(paddingValues)
|
||||||
.windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing)
|
.windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing)
|
||||||
.padding(start = 32.dp, end = 16.dp),
|
.padding(start = Spacing.contentStart, end = 16.dp),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,4 +9,6 @@ object Spacing {
|
|||||||
val iconStart = 32.dp
|
val iconStart = 32.dp
|
||||||
val searchTextStart = 68.dp
|
val searchTextStart = 68.dp
|
||||||
val listItemVertical = 8.dp
|
val listItemVertical = 8.dp
|
||||||
|
|
||||||
|
val contentStart = 32.dp
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user