From 2852815e1ab5553f22403ca31cb5e422d56de1aa Mon Sep 17 00:00:00 2001
From: wb9688 <wb9688@users.noreply.github.com>
Date: Sat, 21 Mar 2020 20:53:30 +0100
Subject: [PATCH] Use suggested layout for search filters

---
 app/build.gradle                                     |  2 +-
 .../fragments/list/search/SearchFragment.java        |  7 +++++++
 .../java/org/schabi/newpipe/util/Localization.java   |  4 +---
 .../java/org/schabi/newpipe/util/ServiceHelper.java  | 12 +++++-------
 app/src/main/res/values-nl/strings.xml               |  8 +++-----
 app/src/main/res/values/strings.xml                  |  8 +++-----
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 75cbf8fba..e6a37527d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -136,7 +136,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.wb9688:NewPipeExtractor:3b4fca8133456cc8839c465341cf185eb2d276be'
+    implementation 'com.github.wb9688:NewPipeExtractor:c1cfdb3356a1024953c506a1849c64d3595f41f6'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 718865f10..6dd52c59e 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -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++,
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index c799c44c8..7e336f02d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -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;
diff --git a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
index 369627041..dacf7d844 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -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;
         }
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6f72b3226..9df0b7f61 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -596,9 +596,7 @@
     <string name="drawer_header_description">Toggle service, momenteel geselecteerd:</string>
     <string name="most_liked">Meest geliked</string>
     <string name="error_postprocessing_stopped">NewPipe werd gesloten terwijl het bezig was met het bestand</string>
-    <string name="music_songs">Music/Nummers</string>
-    <string name="music_videos">Music/Video\'s</string>
-    <string name="music_albums">Music/Albums</string>
-    <string name="music_playlists">Music/Afspeellijsten</string>
-    <string name="music_artists">Music/Artiesten</string>
+    <string name="songs">Nummers</string>
+    <string name="albums">Albums</string>
+    <string name="artists">Artiesten</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76e018eeb..4af6149b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -150,11 +150,9 @@
     <string name="tracks">Tracks</string>
     <string name="users">Users</string>
     <string name="events">Events</string>
-    <string name="music_songs">Music/Songs</string>
-    <string name="music_videos">Music/Videos</string>
-    <string name="music_albums">Music/Albums</string>
-    <string name="music_playlists">Music/Playlists</string>
-    <string name="music_artists">Music/Artists</string>
+    <string name="songs">Songs</string>
+    <string name="albums">Albums</string>
+    <string name="artists">Artists</string>
     <string name="yes">Yes</string>
     <string name="later">Later</string>
     <string name="disabled">Disabled</string>