Fix pages fields in AdvancedSearch

FooIbar · Sep 1, 2023 · ea93960 · ea93960
1 parent d6a3a35
commit ea93960
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
@@ -71,7 +72,7 @@ class SearchLayout @JvmOverloads constructor(
             }
         }
         Mdc3Theme {
-            Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_layout_margin_h)).verticalScroll(rememberScrollState())) {
+            Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_layout_margin_h)).imePadding().verticalScroll(rememberScrollState())) {
                 AnimatedVisibility(visible = isNormalMode) {
                     ElevatedCard(modifier = Modifier.fillMaxWidth().padding(vertical = dimensionResource(id = R.dimen.search_layout_margin_v))) {
                         Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_category_padding_h), vertical = dimensionResource(id = R.dimen.search_category_padding_v))) {

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/AdvancedSearch.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/AdvancedSearch.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.hippo.ehviewer.R
+import com.hippo.ehviewer.util.toIntOrDefault
 
 @Composable
 fun SearchAdvanced(
@@ -55,9 +56,6 @@ fun SearchAdvanced(
             onExpandedChange = { expanded = !expanded },
         ) {
             val softwareKeyboardController = LocalSoftwareKeyboardController.current
-            SideEffect {
-                softwareKeyboardController?.hide()
-            }
             OutlinedTextField(
                 modifier = Modifier.menuAnchor(),
                 readOnly = true,
@@ -71,6 +69,9 @@ fun SearchAdvanced(
                 expanded = expanded,
                 onDismissRequest = { expanded = false },
             ) {
+                SideEffect {
+                    softwareKeyboardController?.hide()
+                }
                 minRatingItems.forEach { selectionOption ->
                     DropdownMenuItem(
                         text = { Text(selectionOption) },
@@ -88,18 +89,18 @@ fun SearchAdvanced(
             Checkbox(checked = enabled, onCheckedChange = { enabled = it })
             Text(text = stringResource(id = R.string.search_sp), modifier = Modifier.align(Alignment.CenterVertically))
             OutlinedTextField(
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword),
                 value = if (enabled && state.fromPage != -1) state.fromPage.toString() else "",
-                onValueChange = { onStateChanged(state.copy(fromPage = it.toInt())) },
+                onValueChange = { onStateChanged(state.copy(fromPage = it.toIntOrDefault(-1))) },
                 modifier = Modifier.width(96.dp).padding(16.dp),
                 singleLine = true,
                 enabled = enabled,
             )
             Text(text = stringResource(id = R.string.search_sp_to), modifier = Modifier.align(Alignment.CenterVertically))
             OutlinedTextField(
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword),
                 value = if (enabled && state.toPage != -1) state.toPage.toString() else "",
-                onValueChange = { onStateChanged(state.copy(toPage = it.toInt())) },
+                onValueChange = { onStateChanged(state.copy(toPage = it.toIntOrDefault(-1))) },
                 modifier = Modifier.width(96.dp).padding(16.dp),
                 singleLine = true,
                 enabled = enabled,