From 2b8bfab44bf0adae16d3d47cb698921d3db1c09c Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 22 Sep 2023 13:41:22 +0800
Subject: [PATCH] Fix minRating advanced search

---
 app/src/main/java/com/hippo/ehviewer/ui/main/AdvanceTable.kt | 2 +-
 .../main/java/com/hippo/ehviewer/ui/main/AdvancedSearch.kt   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/AdvanceTable.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/AdvanceTable.kt
index 8d43e73dc..47166c558 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/main/AdvanceTable.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/AdvanceTable.kt
@@ -10,7 +10,7 @@ object AdvanceTable {
 
 data class AdvancedSearchOption(
     val advanceSearch: Int = 0,
-    val minRating: Int = 0,
+    val minRating: Int = -1,
     val fromPage: Int = -1,
     val toPage: Int = -1,
 )
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
index a0249fec5..d8420fb96 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/main/AdvancedSearch.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/AdvancedSearch.kt
@@ -59,7 +59,7 @@ fun SearchAdvanced(
             OutlinedTextField(
                 modifier = Modifier.menuAnchor(),
                 readOnly = true,
-                value = minRatingItems[state.minRating],
+                value = minRatingItems[if (state.minRating in 2..5) state.minRating - 1 else 0],
                 onValueChange = {},
                 label = { Text(stringResource(id = R.string.search_sr)) },
                 trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
@@ -77,7 +77,8 @@ fun SearchAdvanced(
                         text = { Text(selectionOption) },
                         onClick = {
                             expanded = false
-                            onStateChanged(state.copy(minRating = minRatingItems.indexOf(selectionOption)))
+                            val index = minRatingItems.indexOf(selectionOption)
+                            onStateChanged(state.copy(minRating = if (index > 0) index + 1 else -1))
                         },
                         contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
                     )