added new search icon

Author: danbrough

app/src/main/java/danbroid/searchview/MainActivity.kt

@@ -52,7 +52,7 @@ class MainActivity : AppCompatActivity() {
     super.onNewIntent(intent)
 
     log.info("onNewIntent() :{}", intent)
-    searchViewSupport.showSearch = false
+    invalidateOptionsMenu()
 
     intent.extras?.let {
       /**
@@ -73,7 +73,7 @@ class MainActivity : AppCompatActivity() {
    */
   override fun onSearchRequested(): Boolean {
     log.trace("onSearchRequested();")
-    searchViewSupport.showSearch = false
+
 
     // dont show the built-in search dialog
     return false

app/src/main/java/danbroid/searchview/SearchViewSupport.kt

@@ -26,20 +26,11 @@ class SearchViewSupport(val activity: AppCompatActivity) {
   private lateinit var searchItem: MenuItem
 
 
-  var showSearch: Boolean
-    get() = searchItem.isActionViewExpanded
-    set(value):Unit {
-      if (value)
-        searchItem.expandActionView()
-      else
-        searchItem.collapseActionView()
-    }
-
 
   fun createSearchView(menu: Menu) {
 
     searchItem = menu.add(android.R.string.search_go)
-    searchItem.setIcon(R.drawable.ic_search_white_36dp)
+    searchItem.setIcon(R.drawable.ic_search)
     searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW)
 
     searchView = SearchView(activity.supportActionBar!!.themedContext).apply {
@@ -58,8 +49,9 @@ class SearchViewSupport(val activity: AppCompatActivity) {
     // Collapse the search menu when the user hits the back key
     searchAutoComplete.setOnFocusChangeListener { v, hasFocus ->
       log.trace("onFocusChange(): $hasFocus")
-      if (!hasFocus)
-        showSearch = false
+      if (!hasFocus){
+        log.debug("lost focus .. closing search view") //TODO
+      }
     }
 
     try {

app/src/main/res/drawable-hdpi/ic_search_white_18dp.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>

app/src/main/res/drawable-hdpi/ic_search_white_24dp.png

@@ -11,7 +11,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="?attr/actionBarSize"
 		android:popupBackground="@color/red"
-		app:logo="@drawable/ic_launcher"
 		app:popupTheme="@style/PopupTheme"
 		app:theme="@style/ToolbarTheme" >
 	</androidx.appcompat.widget.Toolbar>