updated dependencies

Author: danbrough

app/build.gradle

@@ -6,14 +6,16 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
   compileSdkVersion 28
+
   defaultConfig {
-    applicationId "searchview.danbroid.searchviewdemo2"
+    applicationId "danbroid.searchviewdemo"
     minSdkVersion 15
     targetSdkVersion 28
-    versionCode 1
-    versionName "1.0"
+    versionCode 4
+    versionName "1.04"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -34,7 +36,6 @@ project.afterEvaluate {
 }
 
 
-
 dependencies {
   implementation "org.slf4j:slf4j-api:1.7.25"
 
@@ -45,10 +46,9 @@ dependencies {
   //implementation "org.slf4j:slf4j-android:1.7.25"
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-  implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
-  implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
-  implementation 'com.google.android.material:material:1.0.0-rc01'
-  testImplementation 'junit:junit:4.12'
-  androidTestImplementation 'androidx.test:runner:1.1.0-rc01'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+  implementation 'androidx.appcompat:appcompat:1.0.2'
+  implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+  implementation 'com.google.android.material:material:1.0.0'
+  implementation 'com.github.arimorty:floatingsearchview:2.1.1'
+
 }

app/src/androidTest/java/searchview/danbroid/searchviewdemo2/ExampleInstrumentedTest.kt

@@ -70,6 +70,13 @@
 
     </activity>
 
+    <activity
+      android:name=".demo5.Demo5Activity"
+      android:label="@string/title_demo5"
+      android:launchMode="singleTop"
+      android:theme="@style/AppTheme.NoActionBar">
+    </activity>
+
 
     <provider
       android:name="danbroid.searchviewdemo.CheeseSuggestionsProvider"

app/src/main/AndroidManifest.xml

@@ -110,8 +110,9 @@ abstract class BaseActivity : AppCompatActivity() {
   protected fun closeSearchView() {
     menu?.findItem(R.id.action_search)?.let {
       if (it.isActionViewExpanded) {
-        it.collapseActionView()
-        it.actionView.clearFocus()
+        /*it.actionView.clearFocus()
+        it.collapseActionView()*/
+        invalidateOptionsMenu()
       }
     }
   }

app/src/main/java/danbroid/searchviewdemo/BaseActivity.kt

@@ -1,10 +1,6 @@
 package danbroid.searchviewdemo
 
-import android.app.SearchManager
 import android.content.Context
-import android.database.Cursor
-import android.database.MatrixCursor
-import android.provider.BaseColumns
 import android.text.TextUtils
 import java.io.BufferedReader
 import java.io.InputStreamReader

app/src/main/java/danbroid/searchviewdemo/CheeseData.kt

@@ -7,6 +7,7 @@ import danbroid.searchviewdemo.demo1.Demo1Activity
 import danbroid.searchviewdemo.demo2.Demo2Activity
 import danbroid.searchviewdemo.demo3.Demo3Activity
 import danbroid.searchviewdemo.demo4.Demo4Activity
+import danbroid.searchviewdemo.demo5.Demo5Activity
 
 
 class MainActivity : BaseActivity() {
@@ -26,9 +27,13 @@ class MainActivity : BaseActivity() {
       startActivity(Intent(this, Demo1Activity::class.java))
     }
 
-    addButton("Demo4") {
+    addButton("Search Dialog") {
       startActivity(Intent(this, Demo4Activity::class.java))
     }
+
+    addButton("Floating Search") {
+      startActivity(Intent(this, Demo5Activity::class.java))
+    }
   }
 
   override fun configureSearchMenu(menuItem: MenuItem) {

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

@@ -0,0 +1,29 @@
+package danbroid.searchviewdemo.demo5
+
+import android.view.MenuItem
+import android.view.View
+import danbroid.searchviewdemo.BaseActivity
+import danbroid.searchviewdemo.R
+import kotlinx.android.synthetic.main.activity.*
+
+
+private val log by lazy {
+  org.slf4j.LoggerFactory.getLogger(Demo5Activity::class.java)
+}
+
+class Demo5Activity : BaseActivity() {
+
+  override fun configureSearchMenu(menuItem: MenuItem) {
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+    R.id.action_search -> {
+      floating_search_view.visibility = View.VISIBLE
+      toolbar.visibility = View.GONE
+      true
+    }
+    else -> super.onOptionsItemSelected(item)
+  }
+
+
+}

app/src/main/java/danbroid/searchviewdemo/demo5/Demo5Activity.kt

@@ -20,6 +20,13 @@
 
   </com.google.android.material.appbar.AppBarLayout>
 
+  <com.arlib.floatingsearchview.FloatingSearchView
+    android:id="@+id/floating_search_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:floatingSearch_leftActionMode="showHamburger"
+    android:fitsSystemWindows="true"
+    android:visibility="gone" />
 
   <LinearLayout
     android:id="@+id/content_container"

app/src/main/res/layout/activity.xml

@@ -7,4 +7,5 @@
   <string name="title_demo2">Demo 2</string>
   <string name="title_demo3">Demo 3</string>
   <string name="title_demo4">Demo4</string>
+  <string name="title_demo5">Demo5</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-  ext.kotlin_version = '1.2.60'
+  ext.kotlin_version = '1.3.11'
   repositories {
     google()
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.0-alpha05'
+    classpath 'com.android.tools.build:gradle:3.3.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
     // NOTE: Do not place your application dependencies here; they belong
@@ -20,7 +20,6 @@ allprojects {
     google()
     jcenter()
     maven { url 'https://jitpack.io' }
-
   }
 }
 

app/src/test/java/searchview/danbroid/searchviewdemo2/ExampleUnitTest.kt

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists