Refactor EqualableContentsProvider

DroidKaigi · Feb 3, 2019 · a701c2c · a701c2c
1 parent e665418
commit a701c2c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/...e/session/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeakerItem.kt b/...e/session/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeakerItem.kt
@@ -66,9 +66,12 @@ class SpeakerItem @AssistedInject constructor(
         }
     }
 
-    override fun providerEqualableContents(): Array<*> = arrayOf(speaker)
+    override fun providerEqualableContents(): Array<*> = arrayOf(
+        speaker,
+        if (isContainsQuery()) query else null
+    )
 
-    override fun isTextHighlightNeedUpdate() = query?.let {
+    private fun isContainsQuery() = query?.let {
         speaker.name.toLowerCase().contains(it.toLowerCase())
     } ?: false
 

diff --git a/...ion/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeechSessionItem.kt b/...ion/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeechSessionItem.kt
@@ -28,7 +28,6 @@ import io.github.droidkaigi.confsched2019.session.ui.actioncreator.SessionConten
 import io.github.droidkaigi.confsched2019.session.ui.bindingadapter.setHighlightText
 import io.github.droidkaigi.confsched2019.util.lazyWithParam
 import jp.wasabeef.picasso.transformations.CropCircleTransformation
-import java.lang.IllegalArgumentException
 import kotlin.math.max
 
 class SpeechSessionItem @AssistedInject constructor(
@@ -200,9 +199,12 @@ class SpeechSessionItem @AssistedInject constructor(
 
     override fun getLayout(): Int = R.layout.item_session
 
-    override fun providerEqualableContents(): Array<*> = arrayOf(session)
+    override fun providerEqualableContents(): Array<*> = arrayOf(
+        session,
+        if (isContainsQuery()) query else null
+    )
 
-    override fun isTextHighlightNeedUpdate() = query?.let {
+    private fun isContainsQuery() = query?.let {
         when {
             session.title.getByLang(defaultLang()).toLowerCase()
                 .contains(query.toLowerCase()) -> true

diff --git a/...ponent/src/main/java/io/github/droidkaigi/confsched2019/item/EqualableContentsProvider.kt b/...ponent/src/main/java/io/github/droidkaigi/confsched2019/item/EqualableContentsProvider.kt
@@ -9,16 +9,10 @@ interface EqualableContentsProvider {
 
     override fun hashCode(): Int
 
-    fun isTextHighlightNeedUpdate(): Boolean {
-        return false
-    }
-
     fun isSameContents(other: Any?): Boolean {
         other ?: return false
         if (other !is EqualableContentsProvider) return false
         if (other::class != this::class) return false
-        if (isTextHighlightNeedUpdate()) return false
-        if (other.isTextHighlightNeedUpdate()) return false
         return other.providerEqualableContents().contentDeepEquals(this.providerEqualableContents())
     }