Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use suggested layout for search filters

Browse source
This commit is contained in:
wb9688 2020-03-21 20:53:30 +01:00
parent 41a100613f
commit 2852815e1a
6 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -416,6 +416,13 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
boolean isFirstItem = true;
final Context c = getContext();
for (String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
if (filter.equals("music_songs")) {
MenuItem musicItem = menu.add(2,
itemId++,
0,
"YouTube Music");
musicItem.setEnabled(false);
}
menuItemToFilterName.put(itemId, filter);
MenuItem item = menu.add(1,
itemId++,

4
app/src/main/java/org/schabi/newpipe/util/Localization.java
View file

@ -6,9 +6,6 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.preference.PreferenceManager;
import org.schabi.newpipe.extractor.ListExtractor;
import android.text.TextUtils;
import android.util.DisplayMetrics;
@ -19,6 +16,7 @@ import androidx.annotation.StringRes;
import org.ocpsoft.prettytime.PrettyTime;
import org.ocpsoft.prettytime.units.Decade;
import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.ListExtractor;
import org.schabi.newpipe.extractor.localization.ContentCountry;
import java.math.BigDecimal;

12
app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
View file

@ -48,10 +48,12 @@ public final class ServiceHelper {
case "all":
return c.getString(R.string.all);
case "videos":
case "music_videos":
return c.getString(R.string.videos_string);
case "channels":
return c.getString(R.string.channels);
case "playlists":
case "music_playlists":
return c.getString(R.string.playlists);
case "tracks":
return c.getString(R.string.tracks);
@ -62,15 +64,11 @@ public final class ServiceHelper {
case "events":
return c.getString(R.string.events);
case "music_songs":
return c.getString(R.string.music_songs);
case "music_videos":
return c.getString(R.string.music_videos);
return c.getString(R.string.songs);
case "music_albums":
return c.getString(R.string.music_albums);
case "music_playlists":
return c.getString(R.string.music_playlists);
return c.getString(R.string.albums);
case "music_artists":
return c.getString(R.string.music_artists);
return c.getString(R.string.artists);
default:
return filter;
}