v1.07: updated to kotlin

Author: danbrough

app/build.gradle

@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
 
   defaultConfig {
     minSdkVersion 14
-    targetSdkVersion 27
-    versionCode 6
-    versionName "v1.06"
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    targetSdkVersion 28
+    versionCode 7
+    versionName "v1.07"
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
 
@@ -35,9 +36,10 @@ android {
 
 dependencies {
   testImplementation 'junit:junit:4.12'
-  androidTestImplementation'junit:junit:4.12'
-  implementation 'com.android.support:design:27.1.0'
-  implementation 'com.github.danbrough.util:slf4j:1.0.6'
+  androidTestImplementation 'junit:junit:4.12'
+  implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
+  implementation 'com.github.danbrough.util:slf4j:1.0.7'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
 }
 
@@ -51,6 +53,9 @@ project.afterEvaluate {
     }
   }
 }
+repositories {
+  mavenCentral()
+}
 
 
 

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

@@ -0,0 +1,37 @@
+package danbroid.searchview
+
+import android.content.pm.PackageManager
+import android.text.Html
+import android.text.SpannableString
+import android.text.method.LinkMovementMethod
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+
+/**
+ * Function to display the about dialog
+ */
+
+fun MainActivity.showAboutDialog() {
+  val builder = AlertDialog.Builder(supportActionBar!!.themedContext,
+      R.style.DialogTheme)
+  builder.setPositiveButton(android.R.string.ok, null)
+  var title = getString(R.string.app_name) + " version: "
+
+
+  try {
+    val packageInfo = packageManager.getPackageInfo(packageName, 0)
+    title += " " + packageInfo.versionName
+  } catch (e: PackageManager.NameNotFoundException) {
+    //Handle exception
+  }
+
+  builder.setTitle(title)
+
+  builder.setIcon(R.drawable.ic_launcher)
+  val aboutMessage = SpannableString(Html.fromHtml(getString(R.string
+      .msg_about)))
+  builder.setMessage(aboutMessage)
+
+  val messageText = builder.show().findViewById<TextView>(android.R.id.message)
+  messageText!!.movementMethod = LinkMovementMethod.getInstance()
+}

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

@@ -0,0 +1,93 @@
+package danbroid.searchview
+
+import android.app.SearchManager
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.Toast
+
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.layout.*
+
+
+private val log by lazy {
+  org.slf4j.LoggerFactory.getLogger(MainActivity::class.java)
+}
+
+class MainActivity : AppCompatActivity() {
+
+  private lateinit var searchItem: MenuItem
+
+  private val searchViewSupport = SearchViewSupport(this)
+
+
+  override fun onCreate(state: Bundle?) {
+    log.info("onCreate() intent:{}", intent)
+    super.onCreate(state)
+
+    setContentView(R.layout.layout)
+    setSupportActionBar(toolbar)
+
+
+    add_suggestion_button.setOnClickListener { searchViewSupport.addAnotherSuggestion() }
+
+    clear_button.setOnClickListener { searchViewSupport.clearSuggestions() }
+
+
+    submit_enabled_checkbox.setOnCheckedChangeListener { _,
+                                                         isChecked ->
+      searchViewSupport.searchView.isSubmitButtonEnabled = isChecked
+    }
+
+  }
+
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    searchViewSupport.createSearchView(menu)
+
+    return super.onCreateOptionsMenu(menu)
+  }
+
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+
+    log.info("onNewIntent() :{}", intent)
+    searchViewSupport.showSearch = false
+
+    intent.extras?.let {
+      /**
+       * USER_QUERY will be set when the user uses the submit button to submit the query
+       */
+      val msg = "SearchManager.USER_QUERY =  ${it[SearchManager.USER_QUERY]}," +
+          "SearchManager.QUERY = ${it[SearchManager.QUERY]}"
+
+      Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+      log.info(msg)
+    }
+
+  }
+
+
+  /**
+   * Called when the hardware search button is pressed
+   */
+  override fun onSearchRequested(): Boolean {
+    log.trace("onSearchRequested();")
+    searchViewSupport.showSearch = false
+
+    // dont show the built-in search dialog
+    return false
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    when (item.itemId) {
+      R.id.menu_about -> {
+        showAboutDialog()
+        return true
+      }
+    }
+    return super.onOptionsItemSelected(item)
+  }
+}
+
+