From e7690f6717aaeebd74d3c095adb638ce704a75fb Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 15 Feb 2021 19:59:41 +0100
Subject: [PATCH] adding a search button and an own activity fori t

---
 app/src/main/AndroidManifest.xml              | 15 +++++++++++++
 .../smsmessenger/activities/MainActivity.kt   |  5 +++++
 .../smsmessenger/activities/SearchActivity.kt | 21 +++++++++++++++++++
 app/src/main/res/layout/activity_search.xml   |  5 +++++
 app/src/main/res/menu/menu_main.xml           |  5 +++++
 app/src/main/res/menu/menu_search.xml         | 10 +++++++++
 app/src/main/res/xml/searchable.xml           |  5 +++++
 7 files changed, 66 insertions(+)
 create mode 100644 app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
 create mode 100644 app/src/main/res/layout/activity_search.xml
 create mode 100644 app/src/main/res/menu/menu_search.xml
 create mode 100644 app/src/main/res/xml/searchable.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2e542b99..e78996a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,21 @@
             android:name=".activities.ThreadActivity"
             android:parentActivityName=".activities.MainActivity" />
 
+        <activity
+            android:name=".activities.SearchActivity"
+            android:label="@string/search"
+            android:parentActivityName=".activities.MainActivity"
+            android:resizeableActivity="true">
+
+            <meta-data
+                android:name="android.app.default_searchable"
+                android:resource="@xml/searchable"/>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".activities.NewConversationActivity"
             android:parentActivityName=".activities.MainActivity">
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 19906763..6196adb6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -106,6 +106,7 @@ class MainActivity : SimpleActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
+            R.id.search -> launchSearch()
             R.id.settings -> launchSettings()
             R.id.about -> launchAbout()
             else -> return super.onOptionsItemSelected(item)
@@ -296,6 +297,10 @@ class MainActivity : SimpleActivity() {
             .build()
     }
 
+    private fun launchSearch() {
+        startActivity(Intent(applicationContext, SearchActivity::class.java))
+    }
+
     private fun launchSettings() {
         startActivity(Intent(applicationContext, SettingsActivity::class.java))
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
new file mode 100644
index 00000000..e6b4ebc2
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
@@ -0,0 +1,21 @@
+package com.simplemobiletools.smsmessenger.activities
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.Menu
+import com.simplemobiletools.smsmessenger.R
+
+class SearchActivity : SimpleActivity() {
+
+    @SuppressLint("InlinedApi")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_search)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_search, menu)
+        updateMenuItemColors(menu)
+        return true
+    }
+}
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
new file mode 100644
index 00000000..1ff99510
--- /dev/null
+++ b/app/src/main/res/layout/activity_search.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index a0c32233..adda1b70 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/search"
+        android:icon="@drawable/ic_search_vector"
+        android:title="@string/search"
+        app:showAsAction="always" />
     <item
         android:id="@+id/settings"
         android:title="@string/settings"
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
new file mode 100644
index 00000000..65461177
--- /dev/null
+++ b/app/src/main/res/menu/menu_search.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/search"
+        android:icon="@drawable/ic_search_vector"
+        android:title="@string/search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="collapseActionView|always" />
+</menu>
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
new file mode 100644
index 00000000..892fa25a
--- /dev/null
+++ b/app/src/main/res/xml/searchable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:hint="@string/search"
+    android:label="@string/app_name"/>