From 381c061ebc56ba0284ec55a0dec9850384a90ff4 Mon Sep 17 00:00:00 2001
From: mpm11011 <mark.mauriello@uconn.edu>
Date: Sun, 6 Sep 2020 11:32:03 -0400
Subject: [PATCH] Adding more UI polish, add comments for future enhancements.

---
 .../main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt | 2 --
 .../eu/kanade/tachiyomi/ui/setting/SettingsController.kt     | 3 ++-
 .../ui/setting/settingssearch/SettingsSearchController.kt    | 5 ++++-
 .../ui/setting/settingssearch/SettingsSearchHelper.kt        | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
index f33aad5dc8..0bd61bbcde 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
@@ -96,8 +96,6 @@ class AboutController : SettingsController() {
         }
 
         preferenceCategory {
-            titleRes = R.string.about_resources
-
             preference {
                 key = "pref_about_website"
                 titleRes = R.string.website
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
index ff42364c6f..62414f7ef1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
@@ -19,6 +19,7 @@ import com.bluelinelabs.conductor.ControllerChangeType
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.controller.BaseController
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -83,7 +84,7 @@ abstract class SettingsController : PreferenceController() {
 
     private fun animatePreferenceHighlight(view: View) {
         ValueAnimator
-            .ofObject(ArgbEvaluator(), Color.TRANSPARENT, R.attr.rippleColor)
+            .ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.rippleColor))
             .apply {
                 duration = 500L
                 repeatCount = 2
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchController.kt
index 3aeb4a54a3..14b43f3744 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchController.kt
@@ -86,6 +86,8 @@ class SettingsSearchController :
             }
 
             override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                searchView.onActionViewCollapsed() // Required to show the query in the view
+                router.popCurrentController()
                 return true
             }
         })
@@ -135,9 +137,10 @@ class SettingsSearchController :
 
     /**
      * returns a list of `SettingsSearchItem` to be shown as search results
+     * Future update: should we add a minimum length to the query before displaying results? Consider other languages.
      */
     fun getResultSet(query: String? = null): List<SettingsSearchItem> {
-        if (!query.isNullOrBlank() && query.length >= 3) {
+        if (!query.isNullOrBlank()) {
             return SettingsSearchHelper.getFilteredResults(query)
                 .map { SettingsSearchItem(it, null) }
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchHelper.kt
index 9f7466e6f6..57fabdda6b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchHelper.kt
@@ -77,6 +77,7 @@ object SettingsSearchHelper {
 
     /**
      * Extracts the data needed from a `Preference` to create a `SettingsSearchResult`, and then adds it to `prefSearchResultList`
+     * Future enhancement: make bold the text matched by the search query.
      */
     private fun getSettingSearchResult(ctrl: SettingsController, pref: Preference, breadcrumbs: String = "") {
         when (pref) {