From b2a1b4aec0e1e3d5fb96401fe41bc27547817748 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 16 Aug 2012 21:45:49 +0200
Subject: Add search functionality

* AndroidManifest.xml: Register `DVDroidActivity' as searchable.

* res/drawable-hdpi/menu_search.png:
* res/drawable-mdpi/menu_search.png: New icons.

* res/menu/main_activity.xml: Add a search icon to the main activity's
  action menu.

* res/values/strings.xml: Add strings "search_hint" and "menu_search".

* res/xml/searchable.xml: New configuration file.

* src/ryuslash/org/dvdroid/DVDDataSource.java (getQuery): New
  function.

* src/ryuslash/org/dvdroid/DVDroidActivity.java (getData): New
  overload, calls `getQuery' to search for something instead of
  everything.
  (onCreate): If a search has been started, search, don't just show
  everything.
  (onCreateOptionsMenu): Instantiate the `SearchView' in order to use
  it.
---
 res/drawable-hdpi/menu_search.png | Bin 0 -> 1764 bytes
 res/drawable-mdpi/menu_search.png | Bin 0 -> 1394 bytes
 res/menu/main_activity.xml        |   5 +++++
 res/values/strings.xml            |   2 ++
 res/xml/searchable.xml            |   5 +++++
 5 files changed, 12 insertions(+)
 create mode 100644 res/drawable-hdpi/menu_search.png
 create mode 100644 res/drawable-mdpi/menu_search.png
 create mode 100644 res/xml/searchable.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/menu_search.png b/res/drawable-hdpi/menu_search.png
new file mode 100644
index 0000000..f12e005
Binary files /dev/null and b/res/drawable-hdpi/menu_search.png differ
diff --git a/res/drawable-mdpi/menu_search.png b/res/drawable-mdpi/menu_search.png
new file mode 100644
index 0000000..587d9e0
Binary files /dev/null and b/res/drawable-mdpi/menu_search.png differ
diff --git a/res/menu/main_activity.xml b/res/menu/main_activity.xml
index d2f94bd..ddb7d7a 100644
--- a/res/menu/main_activity.xml
+++ b/res/menu/main_activity.xml
@@ -4,4 +4,9 @@
         android:title="@string/main_menu_add"
         android:showAsAction="ifRoom|withText"
         android:icon="@drawable/add" />
+  <item android:id="@+id/menu_search"
+        android:title="@string/menu_search"
+        android:icon="@drawable/menu_search"
+        android:showAsAction="collapseActionView|ifRoom"
+        android:actionViewClass="android.widget.SearchView" />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a4ee4d..f0269f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">DVDroid</string>
+  <string name="search_hint">Search DVDs</string>
+  <string name="menu_search">Search</string>
   <string name="name_entry">Title...</string>
   <string name="wishlist_entry">On wishlist</string>
   <string name="watched_entry">Watched</string>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
new file mode 100644
index 0000000..f0f4ef2
--- /dev/null
+++ b/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:label="@string/app_name"
+            android:hint="@string/search_hint">
+</searchable>
-- 
cgit v1.3-2-g0d8e