From 1d9775fac6b4637f8d4844913f97fc7bf6690fa7 Mon Sep 17 00:00:00 2001
From: Pavol Franek <>
Date: Wed, 25 Mar 2020 20:01:08 +0100
Subject: [PATCH] fixed review issues 2

---
 .../notes/pro/activities/MainActivity.kt       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
index fc2e62d5..d70b9259 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -14,6 +14,7 @@ import android.view.ActionMode
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
+import android.view.inputmethod.EditorInfo
 import android.widget.TextView
 import androidx.core.graphics.ColorUtils
 import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
@@ -134,7 +135,6 @@ class MainActivity : SimpleActivity() {
         }
 
         search_clear.setOnClickListener {
-            search_query.text?.clear()
             searchHide()
         }
 
@@ -144,11 +144,18 @@ class MainActivity : SimpleActivity() {
                 searchClearSpans(noteView.text)
             }
 
-            search_query.text?.clear()
             searchHide()
-
             currentTextFragment?.setTextWatcher()
         }
+
+        search_query.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                search_next.performClick()
+                return@OnEditorActionListener true
+            }
+
+            false
+        })
     }
     
     private val currentTextFragment: TextFragment? get() = mAdapter?.textFragment(view_pager.currentItem)
@@ -202,7 +209,7 @@ class MainActivity : SimpleActivity() {
             if (indexOf == -1) {
                 break
             } else {
-                val spanBgColor = BackgroundColorSpan(ColorUtils.setAlphaComponent(config.primaryColor, 90))
+                val spanBgColor = BackgroundColorSpan(ColorUtils.setAlphaComponent(config.primaryColor, 128))
                 val spanFlag = Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
                 wordToSpan.setSpan(spanBgColor, indexOf, indexOf + highlightText.length, spanFlag)
                 view.setText(wordToSpan, TextView.BufferType.SPANNABLE)
@@ -228,6 +235,7 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun searchHide() {
+        search_query.text?.clear()
         searchIsActive = false
         search_root.beGone()
     }
@@ -348,6 +356,8 @@ class MainActivity : SimpleActivity() {
                 }
                 super.onBackPressed()
             }
+        } else if (searchIsActive) {
+            searchHide()
         } else {
             super.onBackPressed()
         }