From 459dd50e91fe6dc9b2991e847dd1f93937d264d1 Mon Sep 17 00:00:00 2001 From: tarsin Date: Sat, 1 Jul 2023 10:58:36 +0800 Subject: [PATCH] Cleanup filter --- app/src/main/java/com/hippo/ehviewer/dao/Filter.kt | 4 ++-- .../com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt | 4 +--- .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt | 8 ++------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt b/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt index d065a566d..fa7b520c4 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt @@ -7,10 +7,10 @@ import androidx.room.PrimaryKey @Entity(tableName = "FILTER") data class Filter( @ColumnInfo(name = "MODE") - var mode: Int = 0, + val mode: Int, @ColumnInfo(name = "TEXT") - var text: String = "INVALID", + var text: String, @ColumnInfo(name = "ENABLE") var enable: Boolean = true, diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt index a3e83e3ba..a04474e37 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt @@ -304,9 +304,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh BaseDialogBuilder(context) .setMessage(getString(R.string.filter_the_commenter, commenter)) .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> - val filter = Filter() - filter.mode = EhFilter.MODE_COMMENTER - filter.text = commenter + val filter = Filter(EhFilter.MODE_COMMENTER, commenter) EhFilter.addFilter(filter) hideComment(position) showTip(R.string.filter_added, LENGTH_SHORT) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index 27c4e5506..16edad9e7 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -1232,9 +1232,7 @@ class GalleryDetailScene : BaseScene(), DownloadInfoListener { BaseDialogBuilder(context) .setMessage(getString(R.string.filter_the_tag, tag)) .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> - val filter = Filter() - filter.mode = EhFilter.MODE_TAG - filter.text = tag + val filter = Filter(EhFilter.MODE_TAG, tag) EhFilter.addFilter(filter) showTip(R.string.filter_added, LENGTH_SHORT) } @@ -1341,9 +1339,7 @@ class GalleryDetailScene : BaseScene(), DownloadInfoListener { BaseDialogBuilder(context) .setMessage(getString(R.string.filter_the_uploader, uploader)) .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> - val filter = Filter() - filter.mode = EhFilter.MODE_UPLOADER - filter.text = uploader + val filter = Filter(EhFilter.MODE_UPLOADER, uploader) EhFilter.addFilter(filter) showTip(R.string.filter_added, LENGTH_SHORT) }