diff options
| author | Nils Griebner <nils@nils-griebner.de> | 2018-06-16 16:38:46 +0300 |
|---|---|---|
| committer | Nils Griebner <nils@nils-griebner.de> | 2018-06-16 16:38:46 +0300 |
| commit | 5d19ced6891fe3b3125dfde131865f0e8f6ea7ec (patch) | |
| tree | c59423540e5fcf28a6b3410bbfc77a33d1db2ecb /News-Android-App | |
| parent | fa5d52cfeb5661350697ece2abf7e39ae63ace90 (diff) | |
Add preference summary for search settings
Diffstat (limited to 'News-Android-App')
3 files changed, 10 insertions, 6 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java index c015fd98..a1e1dfbc 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java @@ -505,6 +505,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { bindPreferenceBooleanToValue(prefFrag.findPreference(CB_MARK_AS_READ_WHILE_SCROLLING_STRING)); bindPreferenceBooleanToValue(prefFrag.findPreference(CB_SKIP_DETAILVIEW_AND_OPEN_BROWSER_DIRECTLY_STRING)); bindPreferenceSummaryToValue(prefFrag.findPreference(SP_SORT_ORDER)); + bindPreferenceSummaryToValue(prefFrag.findPreference(SP_SEARCH_IN)); } else { @@ -520,6 +521,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { bindPreferenceBooleanToValue(prefAct.findPreference(CB_MARK_AS_READ_WHILE_SCROLLING_STRING)); bindPreferenceBooleanToValue(prefAct.findPreference(CB_SKIP_DETAILVIEW_AND_OPEN_BROWSER_DIRECTLY_STRING)); bindPreferenceSummaryToValue(prefAct.findPreference(SP_SORT_ORDER)); + bindPreferenceSummaryToValue(prefAct.findPreference(SP_SEARCH_IN)); } } diff --git a/News-Android-App/src/main/res/values/strings.xml b/News-Android-App/src/main/res/values/strings.xml index 955e32e4..5f3b456e 100644 --- a/News-Android-App/src/main/res/values/strings.xml +++ b/News-Android-App/src/main/res/values/strings.xml @@ -114,10 +114,6 @@ <!-- General settings --> <string name="pref_header_general">General</string> <string name="pref_title_general_sort_order">Sort Order</string> - <string name="pref_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 name="pref_general_sort_order_new_old">New -> Old</string> <string name="pref_general_sort_order_old_new">Old -> New</string> @@ -131,6 +127,11 @@ <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> 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 b78f5e00..da9fd822 100644 --- a/News-Android-App/src/main/res/xml/pref_general.xml +++ b/News-Android-App/src/main/res/xml/pref_general.xml @@ -81,12 +81,13 @@ android:entryValues="@array/pref_general_sort_order_values_not_translated" android:key="sp_sort_order" android:title="@string/pref_title_general_sort_order" /> + <ListPreference - android:defaultValue="1" + 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_general_search_in" /> + android:title="@string/pref_title_general_search_in" /> <!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to |