From 0e3ae48386bfe62a8dffcc08df154e1be8d92e33 Mon Sep 17 00:00:00 2001
From: Pavol Franek <>
Date: Wed, 25 Mar 2020 13:30:16 +0100
Subject: [PATCH] fixed review issues 1

---
 .../notes/pro/activities/MainActivity.kt       | 18 +++++++++++-------
 .../notes/pro/extensions/String.kt             |  5 +++--
 app/src/main/res/layout/search_item.xml        |  2 +-
 3 files changed, 15 insertions(+), 10 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 3236e409..fc2e62d5 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
@@ -190,19 +190,21 @@ class MainActivity : SimpleActivity() {
         return indexes
     }
 
-    private fun searchHighLightText(view: MyEditText, textToHighlight: String) {
+    private fun searchHighLightText(view: MyEditText, highlightText: String) {
         val content = view.text.toString()
-        var indexOf = content.indexOf(textToHighlight, 0, true)
+        var indexOf = content.indexOf(highlightText, 0, true)
         val wordToSpan = SpannableString(view.text)
 
         var offset = 0
         while (offset < content.length && indexOf != -1) {
-            indexOf = content.indexOf(textToHighlight, offset, true)
+            indexOf = content.indexOf(highlightText, offset, true)
 
             if (indexOf == -1) {
                 break
             } else {
-                wordToSpan.setSpan(BackgroundColorSpan(ColorUtils.setAlphaComponent(config.primaryColor, 90)), indexOf, indexOf + textToHighlight.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                val spanBgColor = BackgroundColorSpan(ColorUtils.setAlphaComponent(config.primaryColor, 90))
+                val spanFlag = Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                wordToSpan.setSpan(spanBgColor, indexOf, indexOf + highlightText.length, spanFlag)
                 view.setText(wordToSpan, TextView.BufferType.SPANNABLE)
             }
 
@@ -245,10 +247,11 @@ class MainActivity : SimpleActivity() {
         }
         updateTextColors(view_pager)
 
+        val contrastColor = config.primaryColor.getContrastColor()
         search_root.setBackgroundColor(config.primaryColor)
-        search_previous.applyColorFilter(config.primaryColor.getContrastColor())
-        search_next.applyColorFilter(config.primaryColor.getContrastColor())
-        search_clear.applyColorFilter(config.primaryColor.getContrastColor())
+        search_previous.applyColorFilter(contrastColor)
+        search_next.applyColorFilter(contrastColor)
+        search_clear.applyColorFilter(contrastColor)
     }
 
     override fun onPause() {
@@ -356,6 +359,7 @@ class MainActivity : SimpleActivity() {
         view_pager.currentItem = getWantedNoteIndex(wantedNoteId)
         checkIntents(intent)
     }
+
     private val currentItemIsCheckList get() = mAdapter?.isChecklistFragment(view_pager.currentItem) ?: false
 
     private fun checkIntents(intent: Intent) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt
index 34ce5be1..3ce92869 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt
@@ -22,8 +22,9 @@ fun String.parseChecklistItems(): ArrayList<ChecklistItem>? {
 
 @RequiresApi(Build.VERSION_CODES.N)
 fun String.toHtml() =
-        if (isNougatPlus())
+        if (isNougatPlus()) {
             Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
-        else
+        } else {
             Html.fromHtml(this)
+        }
 
diff --git a/app/src/main/res/layout/search_item.xml b/app/src/main/res/layout/search_item.xml
index 5d588e03..716c4bc7 100644
--- a/app/src/main/res/layout/search_item.xml
+++ b/app/src/main/res/layout/search_item.xml
@@ -64,5 +64,5 @@
         android:layout_height="1dp"
         android:layout_gravity="bottom"
         android:alpha="0.1"
-        android:background="#fff" />
+        android:background="@color/md_grey_white" />
 </FrameLayout>