baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Merge pull request #568 from mauriciocolli/option-search-suggestions

Browse source 
Add option to disable the search suggestions
This commit is contained in:
Mauricio Colli 2017-05-16 22:17:28 -03:00 committed by GitHub
commit b260570e8c
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/schabi/newpipe/fragments/search/SearchFragment.java
View file

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
@ -68,6 +69,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
private int serviceId = -1; private int serviceId = -1;
private String searchQuery = ""; private String searchQuery = "";
private int pageNumber = 0; private int pageNumber = 0;
private boolean showSuggestions = true;
private SearchWorker curSearchWorker; private SearchWorker curSearchWorker;
private SuggestionWorker curSuggestionWorker; private SuggestionWorker curSuggestionWorker;
@ -135,6 +137,8 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
if (pageNumber > 0) search(searchQuery, pageNumber); if (pageNumber > 0) search(searchQuery, pageNumber);
else search(searchQuery, 0, true); else search(searchQuery, 0, true);
} }
showSuggestions = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(getString(R.string.show_search_suggestions_key), true);
} }
@Override @Override
@ -523,6 +527,11 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
} }
private void searchSuggestions(String query) { private void searchSuggestions(String query) {
if (!showSuggestions) {
if (DEBUG) Log.d(TAG, "searchSuggestions() showSuggestions is disabled");
return;
}
if (DEBUG) Log.d(TAG, "searchSuggestions() called with: query = [" + query + "]"); if (DEBUG) Log.d(TAG, "searchSuggestions() called with: query = [" + query + "]");
if (curSuggestionWorker != null && curSuggestionWorker.isRunning()) curSuggestionWorker.cancel(); if (curSuggestionWorker != null && curSuggestionWorker.isRunning()) curSuggestionWorker.cancel();
curSuggestionWorker = SuggestionWorker.startForQuery(activity, serviceId, query, this); curSuggestionWorker = SuggestionWorker.startForQuery(activity, serviceId, query, this);

1
app/src/main/res/values/settings_keys.xml
View file

@ -44,6 +44,7 @@
<item>3GPP</item> <item>3GPP</item>
</string-array> </string-array>
<string name="show_search_suggestions_key" translatable="false">show_search_suggestions</string>
<string name="show_play_with_kodi_key" translatable="false">show_play_with_kodi</string> <string name="show_play_with_kodi_key" translatable="false">show_play_with_kodi</string>
<string name="theme_key" translatable="false">theme</string> <string name="theme_key" translatable="false">theme</string>

2
app/src/main/res/values/strings.xml
View file

@ -64,6 +64,8 @@
<string name="popup_remember_size_pos_summary">Remember the last size and position set to the popup</string> <string name="popup_remember_size_pos_summary">Remember the last size and position set to the popup</string>
<string name="player_gesture_controls_title">Player gesture controls</string> <string name="player_gesture_controls_title">Player gesture controls</string>
<string name="player_gesture_controls_summary">Use gestures to control the brightness and volume of the player</string> <string name="player_gesture_controls_summary">Use gestures to control the brightness and volume of the player</string>
<string name="show_search_suggestions_title">Search suggestions</string>
<string name="show_search_suggestions_summary">Show suggestions when searching</string>
<string name="download_dialog_title">Download</string> <string name="download_dialog_title">Download</string>
<string-array name="download_options"> <string-array name="download_options">

6
app/src/main/res/xml/settings.xml
View file

@ -155,6 +155,12 @@
android:summary="@string/autoplay_by_calling_app_summary" android:summary="@string/autoplay_by_calling_app_summary"
android:defaultValue="false" /> android:defaultValue="false" />
<CheckBoxPreference
android:key="@string/show_search_suggestions_key"
android:title="@string/show_search_suggestions_title"
android:summary="@string/show_search_suggestions_summary"
android:defaultValue="true"/>
<!-- <!--
<CheckBoxPreference <CheckBoxPreference
android:key="@string/use_tor_key" android:key="@string/use_tor_key"