From fc219477c6abc3c92465a06d4082d48b6a2156cd Mon Sep 17 00:00:00 2001 From: Thomas Szatmary Date: Mon, 24 Oct 2022 18:21:21 +1100 Subject: [PATCH 1/3] Added (trending music) kiosk access to frontend (still need to connect to backend) --- app/src/main/java/org/schabi/newpipe/MainActivity.java | 6 +++++- app/src/main/res/values/strings.xml | 1 + settings.gradle | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index d4b2305c7e3..2cdb9e458ee 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -113,6 +113,7 @@ public class MainActivity extends AppCompatActivity { private static final int ITEM_ID_BOOKMARKS = -3; private static final int ITEM_ID_DOWNLOADS = -4; private static final int ITEM_ID_HISTORY = -5; + private static final int ITEM_ID_TRENDING_MUSIC = -6; private static final int ITEM_ID_SETTINGS = 0; private static final int ITEM_ID_ABOUT = 1; @@ -225,7 +226,6 @@ private void addDrawerMenuForCurrentService() throws ExtractionException { .setIcon(KioskTranslator.getKioskIcon(ks)); kioskId++; } - drawerLayoutBinding.navigation.getMenu() .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions) @@ -242,6 +242,10 @@ private void addDrawerMenuForCurrentService() throws ExtractionException { drawerLayoutBinding.navigation.getMenu() .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history) .setIcon(R.drawable.ic_history); + drawerLayoutBinding.navigation.getMenu() + .add(R.id.menu_tabs_group, ITEM_ID_TRENDING_MUSIC, ORDER, + R.string.tab_trending_music) + .setIcon(R.drawable.ic_trending_up); //Settings and About drawerLayoutBinding.navigation.getMenu() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e685ca081d7..341ae364d81 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,6 +29,7 @@ Could not change subscription Could not update subscription Show info + Trending Music Subscriptions Bookmarked Playlists Choose Tab diff --git a/settings.gradle b/settings.gradle index 0338fde6c55..a0aed95275d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,8 +4,8 @@ include ':app' // We assume, that NewPipe and NewPipe Extractor have the same parent directory. // If this is not the case, please change the path in includeBuild(). -//includeBuild('../NewPipeExtractor') { -// dependencySubstitution { -// substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor') -// } -//} +includeBuild('../NewPipeExtractor') { + dependencySubstitution { + substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor') + } +} From 1f16f65d4ac7a7047f1b8d95c8aa62e7153b60f5 Mon Sep 17 00:00:00 2001 From: Thomas Szatmary Date: Wed, 26 Oct 2022 11:17:11 +1100 Subject: [PATCH 2/3] Added kiosk extractor file --- app/src/main/java/org/schabi/newpipe/MainActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 2cdb9e458ee..a39f133d67a 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -306,6 +306,10 @@ private void tabSelected(final MenuItem item) throws ExtractionException { case ITEM_ID_HISTORY: NavigationHelper.openStatisticFragment(getSupportFragmentManager()); break; + case ITEM_ID_TRENDING_MUSIC: + NavigationHelper.openKioskFragment(getSupportFragmentManager(), + ITEM_ID_TRENDING_MUSIC, "Trending Music"); + break; default: final int currentServiceId = ServiceHelper.getSelectedServiceId(this); final StreamingService service = NewPipe.getService(currentServiceId); From d81a431cbfddb4f5930a2091a06dcac390f21b6b Mon Sep 17 00:00:00 2001 From: Thomas Szatmary Date: Wed, 26 Oct 2022 12:45:27 +1100 Subject: [PATCH 3/3] Music Kiosk is added but does not display trending music. just trending --- app/src/main/java/org/schabi/newpipe/MainActivity.java | 8 -------- .../java/org/schabi/newpipe/util/KioskTranslator.java | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index a39f133d67a..405307f6abc 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -242,10 +242,6 @@ private void addDrawerMenuForCurrentService() throws ExtractionException { drawerLayoutBinding.navigation.getMenu() .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history) .setIcon(R.drawable.ic_history); - drawerLayoutBinding.navigation.getMenu() - .add(R.id.menu_tabs_group, ITEM_ID_TRENDING_MUSIC, ORDER, - R.string.tab_trending_music) - .setIcon(R.drawable.ic_trending_up); //Settings and About drawerLayoutBinding.navigation.getMenu() @@ -306,10 +302,6 @@ private void tabSelected(final MenuItem item) throws ExtractionException { case ITEM_ID_HISTORY: NavigationHelper.openStatisticFragment(getSupportFragmentManager()); break; - case ITEM_ID_TRENDING_MUSIC: - NavigationHelper.openKioskFragment(getSupportFragmentManager(), - ITEM_ID_TRENDING_MUSIC, "Trending Music"); - break; default: final int currentServiceId = ServiceHelper.getSelectedServiceId(this); final StreamingService service = NewPipe.getService(currentServiceId); diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java index b8c2ff23699..de091859bbd 100644 --- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java +++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java @@ -77,6 +77,8 @@ public static int getKioskIcon(final String kioskId) { return R.drawable.ic_stars; case "Radio": return R.drawable.ic_radio; + case "Trending Music": + return R.drawable.ic_music_note; default: return 0; }