From e3651f9e3127464545e2344c4f605f30a8bf89d1 Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Sat, 3 Jan 2015 16:23:02 -0500
Subject: [PATCH] Add the search view in the toolbar

---
 app/src/main/res/menu/global.xml    | 7 -------
 app/src/main/res/menu/viewer.xml    | 7 +++++++
 app/src/main/res/values/strings.xml | 1 +
 3 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 app/src/main/res/menu/global.xml

diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
deleted file mode 100644
index 48a4ed0..0000000
--- a/app/src/main/res/menu/global.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_settings"
-        android:title="@string/action_settings"
-        android:orderInCategory="100"
-        app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/viewer.xml b/app/src/main/res/menu/viewer.xml
index 7545b24..6ec815c 100644
--- a/app/src/main/res/menu/viewer.xml
+++ b/app/src/main/res/menu/viewer.xml
@@ -3,6 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="org.bspeice.minimalbible.MainActivity">
 
+    <item
+        android:id="@+id/action_search"
+        android:orderInCategory="100"
+        android:title="@string/action_search_title"
+        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6ed412..d61f823 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,5 +13,6 @@
 
     <string name="contact_developer_address">bspeice.nc@gmail.com</string>
     <string name="contact_developer_subject">MinimalBible Feedback</string>
+    <string name="action_search_title">Search</string>
 
 </resources>