yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove minimum rating checkbox in advanced search

Browse Source
This commit is contained in:
FooIbar authored and tarsin committed 2023-01-20 21:23:30 +08:00
1 parent 5dc9b83831
commit 574e5dab18
5 files changed
+23 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt
+7 -19
View File
@@ -35,7 +35,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
) : LinearLayout(context, attrs) {
private var mSh: CheckBox
private var mSto: CheckBox
private var mSr: CheckBox
private var mMinRating: TextInputLayout
private var mSp: CheckBox
private var mSpf: EditText
@@ -53,8 +52,7 @@ class AdvanceSearchTable @JvmOverloads constructor(
mSh = row0.getChildAt(0) as CheckBox
mSto = row0.getChildAt(1) as CheckBox
val row1 = getChildAt(1) as ViewGroup
mSr = row1.getChildAt(0) as CheckBox
mMinRating = row1.getChildAt(1) as TextInputLayout
mMinRating = row1.getChildAt(0) as TextInputLayout
val row2 = getChildAt(2) as ViewGroup
mSp = row2.getChildAt(0) as CheckBox
mSpf = row2.getChildAt(1) as EditText
@@ -72,11 +70,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
true
}
mMinRating.isEnabled = mSr.isChecked
mSr.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
mMinRating.isEnabled = isChecked
}
mSpt.isEnabled = mSp.isChecked
mSpf.isEnabled = mSp.isChecked
mSp.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
@@ -105,22 +98,17 @@ class AdvanceSearchTable @JvmOverloads constructor(
var minRating: Int
get() {
val position = mArray.indexOf(mMinRating.editText!!.text.toString())
return if (mSr.isChecked && position >= 0) {
position + 2
return if (position > 0) {
position + 1
} else {
-1
}
}
set(minRating) {
if (minRating in 2..5) {
mSr.isChecked = true
(mMinRating.editText!! as AutoCompleteTextView).setText(
mArray[minRating - 2],
false
)
} else {
mSr.isChecked = false
}
(mMinRating.editText!! as AutoCompleteTextView).setText(
mArray[if (minRating in 2..5) minRating - 1 else 0],
false
)
}
var pageFrom: Int
get() = if (mSp.isChecked) {
app/src/main/res/layout/widget_advance_search_table.xml
+12 -17
View File
@@ -24,7 +24,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_marginEnd="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
@@ -34,7 +34,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginStart="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
@@ -45,17 +45,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/advance_search_table_item_margin"
android:layout_marginBottom="@dimen/advance_search_table_item_margin">
<com.google.android.material.checkbox.MaterialCheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/search_sr" />
android:layout_marginBottom="@dimen/advance_search_table_item_margin"
android:baselineAligned="false">
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -63,6 +54,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/advance_search_table_item_margin"
android:layout_marginEnd="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:hint="@string/search_sr">
@@ -70,6 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"
android:text="@string/unlimited"
app:simpleItems="@array/search_min_rating" />
</com.google.android.material.textfield.TextInputLayout>
@@ -85,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_marginEnd="@dimen/advance_search_table_item_margin"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/search_sp" />
@@ -98,6 +91,7 @@
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:imeOptions="actionNext"
android:importantForAutofill="no"
android:inputType="number"
android:maxLines="1" />
@@ -118,6 +112,7 @@
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:imeOptions="actionNone"
android:importantForAutofill="no"
android:inputType="number"
android:maxLines="1" />
@@ -125,7 +120,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginStart="@dimen/advance_search_table_item_margin"
android:text="@string/search_sp_suffix"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
@@ -153,7 +148,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_marginEnd="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
@@ -174,7 +169,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginStart="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
app/src/main/res/values-zh-rCN/strings.xml
+1
View File
@@ -144,6 +144,7 @@
<string name="go_to_hint">第 %1$d 页，共 %2$d 页</string>
<!-- search_min_rating -->
<string name="unlimited">不限</string>
<string name="star_2">2 星</string>
<string name="star_3">3 星</string>
<string name="star_4">4 星</string>
app/src/main/res/values/arrays.xml
+2 -1
View File
@@ -72,7 +72,8 @@
<item>2</item>
</string-array>
<string-array name="search_min_rating">
<string-array name="search_min_rating" translatable="false">
<item>@string/unlimited</item>
<item>@string/star_2</item>
<item>@string/star_3</item>
<item>@string/star_4</item>
app/src/main/res/values/strings.xml
+1
View File
@@ -190,6 +190,7 @@
<string name="go_to_hint">Page %1$d, total %2$d pages</string>
<!-- search_min_rating -->
<string name="unlimited">Unlimited</string>
<string name="star_2">2 stars</string>
<string name="star_3">3 stars</string>
<string name="star_4">4 stars</string>