Merge pull request #640 from NilsGriebner/search

Implement search functionality

7 files changed, 52 insertions, 4 deletions

diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_search_white_24dp.xml b/News-Android-App/src/main/res/drawable-mdpi/ic_search_white_24dp.xml
new file mode 100644
index 00000000..47432c17
--- /dev/null
+++ b/News-Android-App/src/main/res/drawable-mdpi/ic_search_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/News-Android-App/src/main/res/menu/news_reader.xml b/News-Android-App/src/main/res/menu/news_reader.xml
index 6b7c31cb..2fe1d412 100644
--- a/News-Android-App/src/main/res/menu/news_reader.xml
+++ b/News-Android-App/src/main/res/menu/news_reader.xml
@@ -7,6 +7,16 @@
         android:icon="@drawable/ic_action_refresh"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_search"
+        android:enabled="true"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:iconifiedByDefault="false"
+        android:title="Search"
+        android:visible="true"
+        app:actionViewClass="android.widget.SearchView"
+        app:showAsAction="always|collapseActionView" />
+
     <item android:id="@+id/menu_StartImageCaching"
         android:title="@string/menu_StartImageCaching"
         android:orderInCategory="95"
diff --git a/News-Android-App/src/main/res/values-de-rDE/strings.xml b/News-Android-App/src/main/res/values-de-rDE/strings.xml
index 77917ced..6916023c 100644
--- a/News-Android-App/src/main/res/values-de-rDE/strings.xml
+++ b/News-Android-App/src/main/res/values-de-rDE/strings.xml
@@ -227,5 +227,8 @@
     <string name="array_sync_interval_hour_6">6 Stunden</string>
     <string name="array_sync_interval_hour_12">12 Stunden</string>
     <string name="array_sync_interval_hour_24">24 Stunden</string>
+    <string name="pref_title_general_search_in">Suchen in</string>
+    <string name="pref_general_search_in_title">Titel</string>
+    <string name="pref_general_search_in_body">Artikel</string>
 
-    </resources>
+</resources>
diff --git a/News-Android-App/src/main/res/values-de/strings.xml b/News-Android-App/src/main/res/values-de/strings.xml
index dd85cc29..ac36fba5 100644
--- a/News-Android-App/src/main/res/values-de/strings.xml
+++ b/News-Android-App/src/main/res/values-de/strings.xml
@@ -227,5 +227,8 @@
     <string name="array_sync_interval_hour_6">6 Stunden</string>
     <string name="array_sync_interval_hour_12">12 Stunden</string>
     <string name="array_sync_interval_hour_24">24 Stunden</string>
+    <string name="pref_general_search_in_title">Titel</string>
+    <string name="pref_title_general_search_in">Suchen in</string>
+    <string name="pref_general_search_in_body">Artikel</string>
 
-    </resources>
+</resources>
diff --git a/News-Android-App/src/main/res/values-en-rGB/strings.xml b/News-Android-App/src/main/res/values-en-rGB/strings.xml
index 8818c53e..e90ead39 100644
--- a/News-Android-App/src/main/res/values-en-rGB/strings.xml
+++ b/News-Android-App/src/main/res/values-en-rGB/strings.xml
@@ -227,5 +227,8 @@
     <string name="array_sync_interval_hour_6">6 Hours</string>
     <string name="array_sync_interval_hour_12">12 Hours</string>
     <string name="array_sync_interval_hour_24">24 Hours</string>
+    <string name="pref_title_general_search_in">Search In</string>
+    <string name="pref_general_search_in_title">Title</string>
+    <string name="pref_general_search_in_body">Body</string>
 
-    </resources>
+</resources>
diff --git a/News-Android-App/src/main/res/values/strings.xml b/News-Android-App/src/main/res/values/strings.xml
index 231c0437..5f3b456e 100644
--- a/News-Android-App/src/main/res/values/strings.xml
+++ b/News-Android-App/src/main/res/values/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_general">General</string>
     <string name="pref_title_general_sort_order">Sort Order</string>
 
-
     <string name="pref_general_sort_order_new_old">New -> Old</string>
     <string name="pref_general_sort_order_old_new">Old -> New</string>
 
@@ -128,6 +127,20 @@
         <item>0</item>
     </string-array>
 
+    <string name="pref_title_general_search_in">Search In</string>
+
+    <string name="pref_general_search_in_title">Title</string>
+    <string name="pref_general_search_in_body">Body</string>
+
+    <string-array name="pref_general_search_in" translatable="false">
+        <item>@string/pref_general_search_in_title</item>
+        <item>@string/pref_general_search_in_body</item>
+    </string-array>
+    <string-array name="pref_general_search_in_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
 
     <string name="dialog_clearing_cache">Clearing cache</string>
     <string name="dialog_clearing_cache_please_wait">Clearing cache… Please wait.</string>
diff --git a/News-Android-App/src/main/res/xml/pref_general.xml b/News-Android-App/src/main/res/xml/pref_general.xml
index e7a4ba23..da9fd822 100644
--- a/News-Android-App/src/main/res/xml/pref_general.xml
+++ b/News-Android-App/src/main/res/xml/pref_general.xml
@@ -82,6 +82,13 @@
         android:key="sp_sort_order"
         android:title="@string/pref_title_general_sort_order" />
 
+    <ListPreference
+        android:defaultValue="0"
+        android:entries="@array/pref_general_search_in"
+        android:entryValues="@array/pref_general_search_in_values"
+        android:key="sp_search_in"
+        android:title="@string/pref_title_general_search_in" />
+
     <!--
          NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
          dismiss it.