From 9d99644e87784b3a27e9fea257717e363616f59d Mon Sep 17 00:00:00 2001
From: Yenaly <wrzg860546@gmail.com>
Date: Mon, 19 Aug 2024 01:05:20 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/SearchOptionsPopupFragment.kt      | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/search/SearchOptionsPopupFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/search/SearchOptionsPopupFragment.kt
index a50f37a4..a34786ab 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/search/SearchOptionsPopupFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/search/SearchOptionsPopupFragment.kt
@@ -187,7 +187,7 @@ class SearchOptionsPopupFragment :
                 addTagsScope {
                     addTagGroup(getString(R.string.video_attr), videoAttrTagArray)
                     addTagGroup(getString(R.string.relationship), relationshipTagArray)
-                    addTagGroup(getString(R.string.character_setting), characterSettingTagArray)
+                    addTagGroup(getString(R.string.characteristics), characterSettingTagArray)
                     addTagGroup(getString(R.string.appearance_and_figure), appearanceTagArray)
                     addTagGroup(getString(R.string.story_plot), storyPlotTagArray)
                     addTagGroup(getString(R.string.sex_position), sexPositionTagArray)
@@ -235,22 +235,33 @@ class SearchOptionsPopupFragment :
                     it.set(year, month, 0)
                 }
             }
-            val popup = TimePickerPopup(requireContext())
-                .setMode(TimePickerPopup.Mode.YM)
-                .setYearRange(SEARCH_YEAR_RANGE_START, SEARCH_YEAR_RANGE_END)
-                .setDefaultDate(date)
-                .setTimePickerListener(object : TimePickerListener {
-                    override fun onCancel() = Unit
-                    override fun onTimeChanged(date: Date) = Unit
+            val popup = HTimePickerPopup(requireContext())
+                .apply {
+                    setMode(TimePickerPopup.Mode.YM)
+                    setYearRange(SEARCH_YEAR_RANGE_START, SEARCH_YEAR_RANGE_END)
+                    setDefaultDate(date)
+                    setTimePickerListener(object : TimePickerListener {
+                        override fun onCancel() = Unit
+                        override fun onTimeChanged(date: Date) = Unit
 
-                    override fun onTimeConfirm(date: Date, view: View?) {
-                        val calendar = Calendar.getInstance()
-                        calendar.time = date
-                        viewModel.year = calendar.get(Calendar.YEAR)
-                        viewModel.month = calendar.get(Calendar.MONTH) + 1
-                        initOptionsChecked()
-                    }
-                })
+                        override fun onTimeConfirm(date: Date, view: View?) {
+                            val calendar = Calendar.getInstance()
+                            calendar.time = date
+                            when (mode) {
+                                TimePickerPopup.Mode.YM -> {
+                                    viewModel.year = calendar.get(Calendar.YEAR)
+                                    viewModel.month = calendar.get(Calendar.MONTH) + 1
+                                }
+
+                                else -> {
+                                    viewModel.year = calendar.get(Calendar.YEAR)
+                                    viewModel.month = null
+                                }
+                            }
+                            initOptionsChecked()
+                        }
+                    })
+                }
             return XPopup.Builder(requireContext()).setOptionsCheckedCallback()
                 .borderRadius(POP_UP_BORDER_RADIUS)
                 .isDarkTheme(true)