copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

adjust source search's padding (#325)

Browse source
This commit is contained in:
Cuong-Tran 2024-08-31 01:59:39 +07:00 committed by GitHub
parent eb62927c1b
commit dfc33f983f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
View file

@ -337,7 +337,8 @@ fun RadioSelectorSearchable(
SourcesSearch(
searchQuery = queryString,
onChangeSearchQuery = onChangeSearchQuery ?: {},
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.fillMaxWidth()
.padding(bottom = MaterialTheme.padding.small),
).takeIf { onChangeSearchQuery != null }
options.forEachIndexed { index, option ->
Row(

5
app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
View file

@ -131,6 +131,11 @@ private fun MigrateSourceList(
searchQuery = state.searchQuery,
onChangeSearchQuery = onChangeSearchQuery,
placeholderText = stringResource(KMR.strings.action_search_for_source),
modifier = Modifier
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.extraSmall,
),
)
FastScrollLazyColumn(

11
app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
View file

@ -121,6 +121,11 @@ fun SourcesScreen(
searchQuery = state.searchQuery,
onChangeSearchQuery = onChangeSearchQuery,
placeholderText = stringResource(KMR.strings.action_search_for_source),
modifier = Modifier
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.small,
),
)
FastScrollLazyColumn(
@ -176,13 +181,14 @@ fun AnimatedFloatingSearchBox(
listState: LazyListState,
searchQuery: String?,
onChangeSearchQuery: (String?) -> Unit,
@Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier,
modifier: Modifier = Modifier,
placeholderText: String? = null,
) {
AnimatedVisibility(
visible = listState.isScrollingUp(),
enter = expandVertically(),
exit = shrinkVertically(),
modifier = modifier,
) {
SourcesSearch(
searchQuery = searchQuery,
@ -226,8 +232,7 @@ fun SourcesSearch(
onValueChange = onChangeSearchQuery,
modifier = modifier
.fillMaxWidth()
.height(66.dp)
.padding(12.dp)
.height(40.dp)
.focusRequester(focusRequester)
.onFocusChanged { isFocused = it.isFocused }
.runOnEnterKeyPressed(action = searchAndClearFocus)

10
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreen.kt
View file

@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.browse.migration.advanced.design
import android.view.LayoutInflater
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
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.SelectAll
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarState
@ -51,6 +53,7 @@ import tachiyomi.i18n.kmk.KMR
import tachiyomi.i18n.sy.SYMR
import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
import tachiyomi.presentation.core.components.material.Scaffold
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import java.io.Serializable
import kotlin.math.roundToInt
@ -166,7 +169,7 @@ class PreMigrationScreen(val migration: MigrationType) : Screen() {
) { contentPadding ->
// KMK -->
Box(modifier = Modifier.padding(top = contentPadding.calculateTopPadding())) {
var searchBoxHeight by remember { mutableIntStateOf(0) }
var searchBoxHeight by remember { mutableIntStateOf(40) }
// KMK <--
val density = LocalDensity.current
val layoutDirection = LocalLayoutDirection.current
@ -205,7 +208,10 @@ class PreMigrationScreen(val migration: MigrationType) : Screen() {
}
// KMK -->
SourcesSearch(
modifier = Modifier.onSizeChanged { searchBoxHeight = it.height },
modifier = Modifier
.onSizeChanged { searchBoxHeight = it.height }
.background(MaterialTheme.colorScheme.background)
.padding(horizontal = MaterialTheme.padding.small),
searchQuery = searchQuery,
onChangeSearchQuery = { searchQuery = it ?: "" },
placeholderText = stringResource(KMR.strings.action_search_for_source),