adjust source search's padding (#325)
This commit is contained in:
parent
eb62927c1b
commit
dfc33f983f
4 changed files with 23 additions and 6 deletions
|
|
@ -337,7 +337,8 @@ fun RadioSelectorSearchable(
|
||||||
SourcesSearch(
|
SourcesSearch(
|
||||||
searchQuery = queryString,
|
searchQuery = queryString,
|
||||||
onChangeSearchQuery = onChangeSearchQuery ?: {},
|
onChangeSearchQuery = onChangeSearchQuery ?: {},
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
.padding(bottom = MaterialTheme.padding.small),
|
||||||
).takeIf { onChangeSearchQuery != null }
|
).takeIf { onChangeSearchQuery != null }
|
||||||
options.forEachIndexed { index, option ->
|
options.forEachIndexed { index, option ->
|
||||||
Row(
|
Row(
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,11 @@ private fun MigrateSourceList(
|
||||||
searchQuery = state.searchQuery,
|
searchQuery = state.searchQuery,
|
||||||
onChangeSearchQuery = onChangeSearchQuery,
|
onChangeSearchQuery = onChangeSearchQuery,
|
||||||
placeholderText = stringResource(KMR.strings.action_search_for_source),
|
placeholderText = stringResource(KMR.strings.action_search_for_source),
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(
|
||||||
|
horizontal = MaterialTheme.padding.medium,
|
||||||
|
vertical = MaterialTheme.padding.extraSmall,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
FastScrollLazyColumn(
|
FastScrollLazyColumn(
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,11 @@ fun SourcesScreen(
|
||||||
searchQuery = state.searchQuery,
|
searchQuery = state.searchQuery,
|
||||||
onChangeSearchQuery = onChangeSearchQuery,
|
onChangeSearchQuery = onChangeSearchQuery,
|
||||||
placeholderText = stringResource(KMR.strings.action_search_for_source),
|
placeholderText = stringResource(KMR.strings.action_search_for_source),
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(
|
||||||
|
horizontal = MaterialTheme.padding.medium,
|
||||||
|
vertical = MaterialTheme.padding.small,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
FastScrollLazyColumn(
|
FastScrollLazyColumn(
|
||||||
|
|
@ -176,13 +181,14 @@ fun AnimatedFloatingSearchBox(
|
||||||
listState: LazyListState,
|
listState: LazyListState,
|
||||||
searchQuery: String?,
|
searchQuery: String?,
|
||||||
onChangeSearchQuery: (String?) -> Unit,
|
onChangeSearchQuery: (String?) -> Unit,
|
||||||
@Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
placeholderText: String? = null,
|
placeholderText: String? = null,
|
||||||
) {
|
) {
|
||||||
AnimatedVisibility(
|
AnimatedVisibility(
|
||||||
visible = listState.isScrollingUp(),
|
visible = listState.isScrollingUp(),
|
||||||
enter = expandVertically(),
|
enter = expandVertically(),
|
||||||
exit = shrinkVertically(),
|
exit = shrinkVertically(),
|
||||||
|
modifier = modifier,
|
||||||
) {
|
) {
|
||||||
SourcesSearch(
|
SourcesSearch(
|
||||||
searchQuery = searchQuery,
|
searchQuery = searchQuery,
|
||||||
|
|
@ -226,8 +232,7 @@ fun SourcesSearch(
|
||||||
onValueChange = onChangeSearchQuery,
|
onValueChange = onChangeSearchQuery,
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(66.dp)
|
.height(40.dp)
|
||||||
.padding(12.dp)
|
|
||||||
.focusRequester(focusRequester)
|
.focusRequester(focusRequester)
|
||||||
.onFocusChanged { isFocused = it.isFocused }
|
.onFocusChanged { isFocused = it.isFocused }
|
||||||
.runOnEnterKeyPressed(action = searchAndClearFocus)
|
.runOnEnterKeyPressed(action = searchAndClearFocus)
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.browse.migration.advanced.design
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import androidx.activity.compose.BackHandler
|
import androidx.activity.compose.BackHandler
|
||||||
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
|
|
@ -10,6 +11,7 @@ import androidx.compose.material.icons.automirrored.outlined.ArrowForward
|
||||||
import androidx.compose.material.icons.outlined.Deselect
|
import androidx.compose.material.icons.outlined.Deselect
|
||||||
import androidx.compose.material.icons.outlined.SelectAll
|
import androidx.compose.material.icons.outlined.SelectAll
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBarDefaults
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
import androidx.compose.material3.rememberTopAppBarState
|
import androidx.compose.material3.rememberTopAppBarState
|
||||||
|
|
@ -51,6 +53,7 @@ import tachiyomi.i18n.kmk.KMR
|
||||||
import tachiyomi.i18n.sy.SYMR
|
import tachiyomi.i18n.sy.SYMR
|
||||||
import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
|
import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
|
||||||
import tachiyomi.presentation.core.components.material.Scaffold
|
import tachiyomi.presentation.core.components.material.Scaffold
|
||||||
|
import tachiyomi.presentation.core.components.material.padding
|
||||||
import tachiyomi.presentation.core.i18n.stringResource
|
import tachiyomi.presentation.core.i18n.stringResource
|
||||||
import java.io.Serializable
|
import java.io.Serializable
|
||||||
import kotlin.math.roundToInt
|
import kotlin.math.roundToInt
|
||||||
|
|
@ -166,7 +169,7 @@ class PreMigrationScreen(val migration: MigrationType) : Screen() {
|
||||||
) { contentPadding ->
|
) { contentPadding ->
|
||||||
// KMK -->
|
// KMK -->
|
||||||
Box(modifier = Modifier.padding(top = contentPadding.calculateTopPadding())) {
|
Box(modifier = Modifier.padding(top = contentPadding.calculateTopPadding())) {
|
||||||
var searchBoxHeight by remember { mutableIntStateOf(0) }
|
var searchBoxHeight by remember { mutableIntStateOf(40) }
|
||||||
// KMK <--
|
// KMK <--
|
||||||
val density = LocalDensity.current
|
val density = LocalDensity.current
|
||||||
val layoutDirection = LocalLayoutDirection.current
|
val layoutDirection = LocalLayoutDirection.current
|
||||||
|
|
@ -205,7 +208,10 @@ class PreMigrationScreen(val migration: MigrationType) : Screen() {
|
||||||
}
|
}
|
||||||
// KMK -->
|
// KMK -->
|
||||||
SourcesSearch(
|
SourcesSearch(
|
||||||
modifier = Modifier.onSizeChanged { searchBoxHeight = it.height },
|
modifier = Modifier
|
||||||
|
.onSizeChanged { searchBoxHeight = it.height }
|
||||||
|
.background(MaterialTheme.colorScheme.background)
|
||||||
|
.padding(horizontal = MaterialTheme.padding.small),
|
||||||
searchQuery = searchQuery,
|
searchQuery = searchQuery,
|
||||||
onChangeSearchQuery = { searchQuery = it ?: "" },
|
onChangeSearchQuery = { searchQuery = it ?: "" },
|
||||||
placeholderText = stringResource(KMR.strings.action_search_for_source),
|
placeholderText = stringResource(KMR.strings.action_search_for_source),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue