Response search fixes (#256)

* Fix response search to be case insensitive * Add minimum required symbols * Fix invalid options menu in response fragment
ChuckerTeam · Feb 28, 2020 · 5142af2 · 5142af2
1 parent ad65dd5
commit 5142af2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/support/SearchHighlightUtil.kt b/library/src/main/java/com/chuckerteam/chucker/internal/support/SearchHighlightUtil.kt
@@ -7,7 +7,7 @@ import android.text.style.ForegroundColorSpan
 import android.text.style.UnderlineSpan
 
 /**
- * Hightlight parts of the String when it matches the search.
+ * Highlight parts of the String when it matches the search.
  *
  * @param search the text to highlight
  */

diff --git a/...rc/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadAdapter.kt b/...rc/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadAdapter.kt
@@ -57,7 +57,7 @@ internal class TransactionBodyAdapter(
         bodyItems.filterIsInstance<TransactionPayloadItem.BodyLineItem>()
             .withIndex()
             .forEach { (index, item) ->
-                if (newText in item.line) {
+                if (item.line.contains(newText, ignoreCase = true)) {
                     item.line.clearSpans()
                     item.line = item.line.toString()
                         .highlightWithDefinedColors(newText, backgroundColor, foregroundColor)

diff --git a/...c/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadFragment.kt b/...c/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadFragment.kt
@@ -170,7 +170,7 @@ internal class TransactionPayloadFragment :
 
     override fun onQueryTextChange(newText: String): Boolean {
         val adapter = (transactionContentList.adapter as TransactionBodyAdapter)
-        if (newText.isNotBlank()) {
+        if (newText.isNotBlank() && newText.length > NUMBER_OF_IGNORED_SYMBOLS) {
             adapter.highlightQueryWithColors(newText, backgroundSpanColor, foregroundSpanColor)
         } else {
             adapter.resetHighlight()
@@ -241,6 +241,7 @@ internal class TransactionPayloadFragment :
             progressBar?.visibility = View.INVISIBLE
             recyclerView?.visibility = View.VISIBLE
             recyclerView?.adapter = TransactionBodyAdapter(result)
+            fragment.requireActivity().invalidateOptionsMenu()
         }
     }
 
@@ -298,6 +299,8 @@ internal class TransactionPayloadFragment :
         private const val ARG_TYPE = "type"
         private const val TRANSACTION_EXCEPTION = "Transaction not ready"
 
+        private const val NUMBER_OF_IGNORED_SYMBOLS = 1
+
         const val TYPE_REQUEST = 0
         const val TYPE_RESPONSE = 1