From c0ff1e86b93bd47761aae2cf3e5fcd3ef3053822 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 20 Nov 2020 21:43:05 +0100
Subject: [PATCH 001/131] VideoDetailFragment: Don't exit fullscreen on
 rotation in tablet UI

Fixes https://github.com/TeamNewPipe/NewPipe/issues/4936

Going from portrait to landscape doesn't toggle fullscreen in tablet mode, so
the reverse action shouldn't do it either.
---
 .../schabi/newpipe/fragments/detail/VideoDetailFragment.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 772a291b116..2f1c3e58642 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -274,7 +274,9 @@ public void onServiceConnected(final VideoPlayerImpl connectedPlayer,
             // If the video is playing but orientation changed
             // let's make the video in fullscreen again
             checkLandscape();
-        } else if (player.isFullscreen() && !player.isVerticalVideo()) {
+        } else if (player.isFullscreen() && !player.isVerticalVideo()
+                // Tablet UI has orientation-independent fullscreen
+                && !DeviceUtils.isTablet(activity)) {
             // Device is in portrait orientation after rotation but UI is in fullscreen.
             // Return back to non-fullscreen state
             player.toggleFullscreen();

From f341f43427ca048f762c8df6e37f5d70f23c1bdf Mon Sep 17 00:00:00 2001
From: mhmdanas <32234660+mhmdanas@users.noreply.github.com>
Date: Sun, 6 Dec 2020 16:52:03 +0300
Subject: [PATCH 002/131] Update "Updates" to account for F-Droid bug

Pun not intended (oh really?).
---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 2568b7624b8..b29e2c758fa 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,13 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 
 ## Updates
 When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:
- 1. Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
- 2. Add our custom repo to F-Droid and install it from there as soon as we publish a release. The instructions are here: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
- 3. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it as soon as we publish a release.
- 4. Update via F-droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
 
-We recommend method 2 for most users. APKs installed using method 2 or 3 are compatible with each other, but not with those installed using method 4. This is due to the same signing key (ours) being used for 2 and 3, but a different signing key (F-Droid's) being used for 4. Building a debug APK using method 1 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app.
+ 1. Add our custom repo to F-Droid and install it from there as soon as we publish a release. The instructions are here: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
+ 2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it as soon as we publish a release.
+ 3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users. (**IMPORTANT**: as of the time of writing, an F-Droid bug is preventing updates later than 0.20.1 from being published. Thus, till this bug is solved, if you want to use install updates from F-Droid, we recommend method 1.)
+ 4. Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
+
+We recommend method 1 for most users. APKs installed using method 1 or 2 are compatible with each other, but not with those installed using method 3. This is due to the same signing key (ours) being used for 1 and 2, but a different signing key (F-Droid's) being used for 3. Building a debug APK using method 4 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app.
 
 In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality was broken and F-Droid doesn't have the update yet), we recommend following this procedure:
 1. Back up your data via Settings > Content > Export Database so you keep your history, subscriptions, and playlists

From 2b8837609bed291969961f351e5d128fb90bb65f Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 19 Dec 2020 14:48:03 +0100
Subject: [PATCH 003/131] dynamically get package name

it fixes issues with forks or debug builds, e.g. when you open two newpipe apps (with debug or fork apps), close one notification, it closes all newpipe notifications
fixes https://github.com/TeamNewPipe/NewPipe/issues/4653
---
 app/src/main/java/org/schabi/newpipe/App.java |  4 +++-
 .../fragments/detail/VideoDetailFragment.java | 18 ++++++++--------
 .../local/feed/service/FeedLoadService.kt     |  3 ++-
 .../services/SubscriptionsExportService.java  |  3 ++-
 .../services/SubscriptionsImportService.java  |  3 ++-
 .../org/schabi/newpipe/player/MainPlayer.java | 21 ++++++++++---------
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index e6dce4d6763..7e3466f678e 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -67,8 +67,10 @@
 public class App extends MultiDexApplication {
     protected static final String TAG = App.class.toString();
     private static App app;
+    public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
 
-    @Nullable private Disposable disposable = null;
+    @Nullable
+    private Disposable disposable = null;
 
     @NonNull
     public static App getApp() {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 427cff06ee2..d0a1584a97f 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -145,15 +145,15 @@ public final class VideoDetailFragment
     private static final float MAX_PLAYER_HEIGHT = 0.7f;
 
     public static final String ACTION_SHOW_MAIN_PLAYER =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_SHOW_MAIN_PLAYER";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_SHOW_MAIN_PLAYER";
     public static final String ACTION_HIDE_MAIN_PLAYER =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER";
     public static final String ACTION_PLAYER_STARTED =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_PLAYER_STARTED";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_PLAYER_STARTED";
     public static final String ACTION_VIDEO_FRAGMENT_RESUMED =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED";
     public static final String ACTION_VIDEO_FRAGMENT_STOPPED =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED";
 
     private static final String COMMENTS_TAB_TAG = "COMMENTS";
     private static final String RELATED_TAB_TAG = "NEXT VIDEO";
@@ -494,10 +494,10 @@ public void onClick(final View v) {
 
                     final PlaylistAppendDialog d = PlaylistAppendDialog.fromStreamInfo(currentInfo);
                     disposables.add(
-                        PlaylistAppendDialog.onPlaylistFound(getContext(),
-                            () -> d.show(getFM(), TAG),
-                            () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
-                        )
+                            PlaylistAppendDialog.onPlaylistFound(getContext(),
+                                    () -> d.show(getFM(), TAG),
+                                    () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
+                            )
                     );
                 }
                 break;
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
index 2a0aa1c90fd..45e8855e736 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
@@ -43,6 +43,7 @@ import io.reactivex.rxjava3.processors.PublishProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.reactivestreams.Subscriber
 import org.reactivestreams.Subscription
+import org.schabi.newpipe.App
 import org.schabi.newpipe.MainActivity.DEBUG
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
@@ -68,7 +69,7 @@ class FeedLoadService : Service() {
     companion object {
         private val TAG = FeedLoadService::class.java.simpleName
         private const val NOTIFICATION_ID = 7293450
-        private const val ACTION_CANCEL = "org.schabi.newpipe.local.feed.service.FeedLoadService.CANCEL"
+        private const val ACTION_CANCEL = App.PACKAGE_NAME + ".local.feed.service.FeedLoadService.CANCEL"
 
         /**
          * How often the notification will be updated.
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java
index 982701d1f56..5dfb1bfe5b9 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java
@@ -27,6 +27,7 @@
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.extractor.subscription.SubscriptionItem;
@@ -50,7 +51,7 @@ public class SubscriptionsExportService extends BaseImportExportService {
      * A {@link LocalBroadcastManager local broadcast} will be made with this action
      * when the export is successfully completed.
      */
-    public static final String EXPORT_COMPLETE_ACTION = "org.schabi.newpipe.local.subscription"
+    public static final String EXPORT_COMPLETE_ACTION = App.PACKAGE_NAME + ".local.subscription"
             + ".services.SubscriptionsExportService.EXPORT_COMPLETE";
 
     private Subscription subscription;
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
index b1c67719c5c..90d0afe377b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
@@ -29,6 +29,7 @@
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -66,7 +67,7 @@ public class SubscriptionsImportService extends BaseImportExportService {
      * A {@link LocalBroadcastManager local broadcast} will be made with this action
      * when the import is successfully completed.
      */
-    public static final String IMPORT_COMPLETE_ACTION = "org.schabi.newpipe.local.subscription"
+    public static final String IMPORT_COMPLETE_ACTION = App.PACKAGE_NAME + ".local.subscription"
             + ".services.SubscriptionsImportService.IMPORT_COMPLETE";
 
     /**
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index 63f6a400ef7..49c83634664 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -33,6 +33,7 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
@@ -64,25 +65,25 @@ public enum PlayerType {
     //////////////////////////////////////////////////////////////////////////*/
 
     static final String ACTION_CLOSE
-            = "org.schabi.newpipe.player.MainPlayer.CLOSE";
+            = App.PACKAGE_NAME + ".player.MainPlayer.CLOSE";
     static final String ACTION_PLAY_PAUSE
-            = "org.schabi.newpipe.player.MainPlayer.PLAY_PAUSE";
+            = App.PACKAGE_NAME + ".player.MainPlayer.PLAY_PAUSE";
     static final String ACTION_OPEN_CONTROLS
-            = "org.schabi.newpipe.player.MainPlayer.OPEN_CONTROLS";
+            = App.PACKAGE_NAME + ".player.MainPlayer.OPEN_CONTROLS";
     static final String ACTION_REPEAT
-            = "org.schabi.newpipe.player.MainPlayer.REPEAT";
+            = App.PACKAGE_NAME + ".player.MainPlayer.REPEAT";
     static final String ACTION_PLAY_NEXT
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_PLAY_NEXT";
     static final String ACTION_PLAY_PREVIOUS
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_PLAY_PREVIOUS";
     static final String ACTION_FAST_REWIND
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_FAST_REWIND";
     static final String ACTION_FAST_FORWARD
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_FAST_FORWARD";
     static final String ACTION_SHUFFLE
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_SHUFFLE";
     public static final String ACTION_RECREATE_NOTIFICATION
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_RECREATE_NOTIFICATION";
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service's LifeCycle

From b5bf0d7e1d2e47fbac39333e194671eafb3997f3 Mon Sep 17 00:00:00 2001
From: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:58:29 +0000
Subject: [PATCH 004/131] Export -> Import

---
 README.ko.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.ko.md b/README.ko.md
index a86eae8d939..460a90dc15d 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -98,7 +98,7 @@ NewPipe 코드의 변경이 있을 때(기능 추가 또는 버그 수정으로
 1. 당신의 기록, 구독, 그리고 재생목록을 유지할 수 있도록 Settings > Content > Export Database 를 통해 데이터를 백업하십시오.
 2. NewPipe를 삭제하십시오.
 3. 새로운 소스에서 APK를 다운로드하고 이것을 설치하십시오.
-4. Step 1의 Settings > Content > Export Database 을 통해 데이터를 불러오십시오.
+4. Step 1의 Settings > Content > Import Database 을 통해 데이터를 불러오십시오.
 
 ## Contribution
 당신이 아이디어, 번역, 디자인 변경, 코드 정리, 또는 정말 큰 코드 수정에 대한 의견이 있다면, 도움은 항상 환영합니다.

From 81bbef04dc7f46e5e2cf94e572d7713ddd2772c2 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Wed, 23 Dec 2020 15:14:26 +0100
Subject: [PATCH 005/131] [peertube] implement sepia search

---
 app/build.gradle                                       |  2 +-
 .../newpipe/fragments/list/search/SearchFragment.java  | 10 +++++++++-
 .../java/org/schabi/newpipe/util/ServiceHelper.java    |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3ac8ff525dd..0d3cf61a8a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:85fa006214b003f21eacb76c445a167732f19981'
+    implementation 'com.github.B0pol:NewPipeExtractor:3ae924a7f18d5ee5b4aa0bd13d7179922cc094fa'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"
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 02dbf176bc5..4b7b1c3db88 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
@@ -45,6 +45,8 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.search.SearchInfo;
+import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeSearchQueryHandlerFactory;
+import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -419,12 +421,18 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         boolean isFirstItem = true;
         final Context c = getContext();
         for (final String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
-            if (filter.equals("music_songs")) {
+            if (filter.equals(YoutubeSearchQueryHandlerFactory.MUSIC_SONGS)) {
                 final MenuItem musicItem = menu.add(2,
                         itemId++,
                         0,
                         "YouTube Music");
                 musicItem.setEnabled(false);
+            } else if (filter.equals(PeertubeSearchQueryHandlerFactory.SEPIA_VIDEOS)) {
+                final MenuItem sepiaItem = menu.add(2,
+                        itemId++,
+                        0,
+                        "Sepia Search");
+                sepiaItem.setEnabled(false);
             }
             menuItemToFilterName.put(itemId, filter);
             final MenuItem item = menu.add(1,
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 8f3423b2253..a6756991c5c 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -48,6 +48,7 @@ public static String getTranslatedFilterString(final String filter, final Contex
             case "all":
                 return c.getString(R.string.all);
             case "videos":
+            case "sepia_videos":
             case "music_videos":
                 return c.getString(R.string.videos_string);
             case "channels":

From c55077947227d0a336b4fa92fd5bf3511de4fd72 Mon Sep 17 00:00:00 2001
From: mhmdanas <32234660+mhmdanas@users.noreply.github.com>
Date: Sat, 26 Dec 2020 21:35:07 +0300
Subject: [PATCH 006/131] Remove APK testing section from PR template

This is because the our workflows build debug APKs now.
---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c3022d93f49..5e5cfd08d46 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,9 +20,5 @@
 <!-- Delete this if it doesn't apply to you. -->
 - 
 
-#### APK testing 
-<!-- Use a new, meaningfully named branch. The name is used as a suffix for the app ID to allow installing and testing multiple versions of NewPipe, e.g. "commentfix", if your PR implements a bugfix for comments. (No names like "patch-0" and "feature-1".)  -->
-debug.zip
-
 #### Due diligence
 - [ ] I read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md).

From d45ce19b04f175cbb2fd22fd01636e5e2bdb5ca9 Mon Sep 17 00:00:00 2001
From: urlordjames <urlordjames@gmail.com>
Date: Sat, 26 Dec 2020 12:47:08 -0500
Subject: [PATCH 007/131] Fix #4481

---
 .../schabi/newpipe/fragments/detail/VideoDetailFragment.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 6560ab404d2..0da79d4c2b8 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -2048,6 +2048,10 @@ private void setupBrightness() {
             // Apply system brightness when the player is not in fullscreen
             restoreDefaultBrightness();
         } else {
+            // Do not restore if user has disabled brightness gesture
+            if (!PlayerHelper.isBrightnessGestureEnabled(activity)) {
+                return;
+            }
             // Restore already saved brightness level
             final float brightnessLevel = PlayerHelper.getScreenBrightness(activity);
             if (brightnessLevel == lp.screenBrightness) {

From 0a05534c848a5b32d67ce3df7060a037ce686c1c Mon Sep 17 00:00:00 2001
From: Eric Lemieux <eric@lemieuxdev.com>
Date: Mon, 28 Dec 2020 15:20:17 -0500
Subject: [PATCH 008/131] Fix null pointer exception in play button method

When the play queue was null, and this method was called a null pointer
exception would be thrown. This change adds an additional check to see
if the play queue is not null before making additional changes.
---
 .../newpipe/player/VideoPlayerImpl.java       | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index a304b44300b..06cbcd780ee 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -1071,11 +1071,25 @@ public int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
 
     private void animatePlayButtons(final boolean show, final int duration) {
         animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
-        if (playQueue.getIndex() > 0 || !show) {
-            animateView(playPreviousButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
-        }
-        if (playQueue.getIndex() + 1 < playQueue.getStreams().size() || !show) {
-            animateView(playNextButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+
+        boolean showQueueButtons = show;
+        if (playQueue == null) {
+            showQueueButtons = false;
+        }
+
+        if (!showQueueButtons || playQueue.getIndex() > 0) {
+            animateView(
+                playPreviousButton,
+                AnimationUtils.Type.SCALE_AND_ALPHA,
+                showQueueButtons,
+                duration);
+        }
+        if (!showQueueButtons || playQueue.getIndex() + 1 < playQueue.getStreams().size()) {
+            animateView(
+                playNextButton,
+                AnimationUtils.Type.SCALE_AND_ALPHA,
+                showQueueButtons,
+                duration);
         }
 
     }

From 83faf119a90ac1adb02d62fee2ec31d54f18e669 Mon Sep 17 00:00:00 2001
From: khimaros <me@khimaros.com>
Date: Tue, 29 Dec 2020 18:17:36 -0800
Subject: [PATCH 009/131] add list item to play video on kodi

closes: #5157
---
 .../newpipe/fragments/list/BaseListFragment.java       |  7 +++++++
 .../fragments/list/playlist/PlaylistFragment.java      |  8 ++++++++
 .../local/history/StatisticsPlaylistFragment.java      |  8 ++++++++
 .../newpipe/local/playlist/LocalPlaylistFragment.java  |  8 ++++++++
 .../org/schabi/newpipe/util/StreamDialogEntry.java     | 10 ++++++++++
 5 files changed, 41 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 5252024c27c..ecfaaf80e4c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -31,6 +31,7 @@
 import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
@@ -359,6 +360,12 @@ protected void showStreamDialog(final StreamInfoItem item) {
                     StreamDialogEntry.share
             ));
         }
+        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(item.getServiceId())
+                && PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
+        if (enableKodiEntry) {
+            entries.add(StreamDialogEntry.play_on_kodi);
+        }
         StreamDialogEntry.setEnabledEntries(entries);
 
         new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context),
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 6fa7eb700b9..a4ccd9c787b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -17,6 +17,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.preference.PreferenceManager;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -42,6 +43,7 @@
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ShareUtils;
@@ -174,6 +176,12 @@ protected void showStreamDialog(final StreamInfoItem item) {
                     StreamDialogEntry.share
             ));
         }
+        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(item.getServiceId())
+                && PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
+        if (enableKodiEntry) {
+            entries.add(StreamDialogEntry.play_on_kodi);
+        }
         StreamDialogEntry.setEnabledEntries(entries);
 
         StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItem) ->
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 9750d98207f..59537f1a860 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -17,6 +17,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -37,6 +38,7 @@
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StreamDialogEntry;
@@ -413,6 +415,12 @@ private void showStreamDialog(final StreamStatisticsEntry item) {
                     StreamDialogEntry.share
             ));
         }
+        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(infoItem.getServiceId())
+                && PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
+        if (enableKodiEntry) {
+            entries.add(StreamDialogEntry.play_on_kodi);
+        }
         StreamDialogEntry.setEnabledEntries(entries);
 
         StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItemDuplicate) ->
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index a8974e018f9..c6314f557e6 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -20,6 +20,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -41,6 +42,7 @@
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -781,6 +783,12 @@ protected void showStreamItemDialog(final PlaylistStreamEntry item) {
                     StreamDialogEntry.share
             ));
         }
+        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(infoItem.getServiceId())
+                && PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
+        if (enableKodiEntry) {
+            entries.add(StreamDialogEntry.play_on_kodi);
+        }
         StreamDialogEntry.setEnabledEntries(entries);
 
         StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItemDuplicate) ->
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index 34ff637ad61..d85f5ae574f 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.util;
 
 import android.content.Context;
+import android.net.Uri;
 
 import androidx.fragment.app.Fragment;
 
@@ -70,6 +71,15 @@ public enum StreamDialogEntry {
         }
     }),
 
+    play_on_kodi(R.string.play_with_kodi_title, (fragment, item) -> {
+        final Uri videoUrl = Uri.parse(item.getUrl());
+        try {
+            NavigationHelper.playWithKore(fragment.getContext(), videoUrl);
+        } catch (final Exception e) {
+            KoreUtil.showInstallKoreDialog(fragment.getActivity());
+        }
+    }),
+
     share(R.string.share, (fragment, item) ->
             ShareUtils.shareUrl(fragment.getContext(), item.getName(), item.getUrl()));
 

From 1f15368b7bd53ed06e149c6eca81c1e6a91bed5c Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 30 Dec 2020 21:07:30 +0100
Subject: [PATCH 010/131] Fix urls with timestamps not being played

Else path is now executed, when a timestamp (item.getRecoveryPosition) is present
---
 .../org/schabi/newpipe/player/BasePlayer.java | 80 +++++++++----------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index d5ad9cb6fdf..8eae33de602 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -19,6 +19,12 @@
 
 package org.schabi.newpipe.player;
 
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -30,11 +36,9 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
-
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -53,7 +57,12 @@
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.SerialDisposable;
+import java.io.IOException;
 import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
@@ -75,20 +84,6 @@
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.SerializedCache;
 
-import java.io.IOException;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.disposables.SerialDisposable;
-
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 /**
  * Base for the players, joining the common properties.
  *
@@ -342,37 +337,36 @@ public void handleIntent(final Intent intent) {
             simpleExoPlayer.setPlayWhenReady(playWhenReady);
 
         } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false)
-                && isPlaybackResumeEnabled()
-                && !samePlayQueue) {
-            final PlayQueueItem item = queue.getItem();
-            if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
-                stateLoader = recordManager.loadStreamState(item)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        // Do not place initPlayback() in doFinally() because
-                        // it restarts playback after destroy()
-                        //.doFinally()
-                        .subscribe(
-                                state -> {
-                                    queue.setRecovery(queue.getIndex(), state.getProgressTime());
-                                    initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                                            playbackSkipSilence, playWhenReady, isMuted);
-                                },
-                                error -> {
-                                    if (DEBUG) {
-                                        error.printStackTrace();
-                                    }
-                                    // In case any error we can start playback without history
-                                    initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                                            playbackSkipSilence, playWhenReady, isMuted);
-                                },
-                                () -> {
-                                    // Completed but not found in history
+            && isPlaybackResumeEnabled()
+            && !samePlayQueue
+            && !queue.isEmpty()
+            && queue.getItem().getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
+            stateLoader = recordManager.loadStreamState(queue.getItem())
+                .observeOn(AndroidSchedulers.mainThread())
+                // Do not place initPlayback() in doFinally() because
+                // it restarts playback after destroy()
+                //.doFinally()
+                .subscribe(
+                    state -> {
+                        queue.setRecovery(queue.getIndex(), state.getProgressTime());
+                        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
+                            playbackSkipSilence, playWhenReady, isMuted);
+                    },
+                    error -> {
+                        if (DEBUG) {
+                            error.printStackTrace();
+                        }
+                        // In case any error we can start playback without history
+                        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
+                            playbackSkipSilence, playWhenReady, isMuted);
+                    },
+                    () -> {
+                        // Completed but not found in history
                                     initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
                                             playbackSkipSilence, playWhenReady, isMuted);
                                 }
                         );
                 databaseUpdateReactor.add(stateLoader);
-            }
         } else {
             // Good to go...
             // In a case of equal PlayQueues we can re-init old one but only when it is disposed

From ebd589c9cbe7c73f4a2ba174438b533529860668 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Wed, 30 Dec 2020 17:10:57 -0500
Subject: [PATCH 011/131] Use AndroidX Media compat in AudioReactor

---
 app/build.gradle                              |  1 +
 .../newpipe/player/helper/AudioReactor.java   | 39 ++++++-------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 15561b2d21a..15b0668c6e7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -203,6 +203,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.media:media:1.2.1'
     implementation 'androidx.webkit:webkit:1.4.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
index ffe19599d20..13ee24e16cf 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -5,14 +5,14 @@
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.Intent;
-import android.media.AudioFocusRequest;
 import android.media.AudioManager;
 import android.media.audiofx.AudioEffect;
-import android.os.Build;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+import androidx.media.AudioFocusRequestCompat;
+import androidx.media.AudioManagerCompat;
 
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
@@ -21,20 +21,17 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
 
     private static final String TAG = "AudioFocusReactor";
 
-    private static final boolean SHOULD_BUILD_FOCUS_REQUEST =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-
     private static final int DUCK_DURATION = 1500;
     private static final float DUCK_AUDIO_TO = .2f;
 
-    private static final int FOCUS_GAIN_TYPE = AudioManager.AUDIOFOCUS_GAIN;
+    private static final int FOCUS_GAIN_TYPE = AudioManagerCompat.AUDIOFOCUS_GAIN;
     private static final int STREAM_TYPE = AudioManager.STREAM_MUSIC;
 
     private final SimpleExoPlayer player;
     private final Context context;
     private final AudioManager audioManager;
 
-    private final AudioFocusRequest request;
+    private final AudioFocusRequestCompat request;
 
     public AudioReactor(@NonNull final Context context,
                         @NonNull final SimpleExoPlayer player) {
@@ -43,15 +40,11 @@ public AudioReactor(@NonNull final Context context,
         this.audioManager = ContextCompat.getSystemService(context, AudioManager.class);
         player.addAnalyticsListener(this);
 
-        if (SHOULD_BUILD_FOCUS_REQUEST) {
-            request = new AudioFocusRequest.Builder(FOCUS_GAIN_TYPE)
-                    .setAcceptsDelayedFocusGain(true)
-                    .setWillPauseWhenDucked(true)
-                    .setOnAudioFocusChangeListener(this)
-                    .build();
-        } else {
-            request = null;
-        }
+        request = new AudioFocusRequestCompat.Builder(FOCUS_GAIN_TYPE)
+                //.setAcceptsDelayedFocusGain(true)
+                .setWillPauseWhenDucked(true)
+                .setOnAudioFocusChangeListener(this)
+                .build();
     }
 
     public void dispose() {
@@ -64,19 +57,11 @@ public void dispose() {
     //////////////////////////////////////////////////////////////////////////*/
 
     public void requestAudioFocus() {
-        if (SHOULD_BUILD_FOCUS_REQUEST) {
-            audioManager.requestAudioFocus(request);
-        } else {
-            audioManager.requestAudioFocus(this, STREAM_TYPE, FOCUS_GAIN_TYPE);
-        }
+        AudioManagerCompat.requestAudioFocus(audioManager, request);
     }
 
     public void abandonAudioFocus() {
-        if (SHOULD_BUILD_FOCUS_REQUEST) {
-            audioManager.abandonAudioFocusRequest(request);
-        } else {
-            audioManager.abandonAudioFocus(this);
-        }
+        AudioManagerCompat.abandonAudioFocusRequest(audioManager, request);
     }
 
     public int getVolume() {
@@ -88,7 +73,7 @@ public void setVolume(final int volume) {
     }
 
     public int getMaxVolume() {
-        return audioManager.getStreamMaxVolume(STREAM_TYPE);
+        return AudioManagerCompat.getStreamMaxVolume(audioManager, STREAM_TYPE);
     }
 
     /*//////////////////////////////////////////////////////////////////////////

From 48a5107296c4f62fa762dafe4e999337f2b23e62 Mon Sep 17 00:00:00 2001
From: khimaros <me@khimaros.com>
Date: Wed, 30 Dec 2020 14:40:21 -0800
Subject: [PATCH 012/131] address pull request feedback

---
 .../schabi/newpipe/fragments/list/BaseListFragment.java   | 7 ++-----
 .../newpipe/fragments/list/playlist/PlaylistFragment.java | 8 ++------
 .../newpipe/local/history/StatisticsPlaylistFragment.java | 8 ++------
 .../newpipe/local/playlist/LocalPlaylistFragment.java     | 8 ++------
 app/src/main/java/org/schabi/newpipe/util/KoreUtil.java   | 8 ++++++++
 .../java/org/schabi/newpipe/util/StreamDialogEntry.java   | 2 +-
 6 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index ecfaaf80e4c..10527d1896d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -360,11 +360,8 @@ protected void showStreamDialog(final StreamInfoItem item) {
                     StreamDialogEntry.share
             ));
         }
-        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(item.getServiceId())
-                && PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
-        if (enableKodiEntry) {
-            entries.add(StreamDialogEntry.play_on_kodi);
+        if (KoreUtil.shouldShowPlayWithKodi(context, item)) {
+            entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index a4ccd9c787b..0eed5f4b00b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -17,7 +17,6 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.preference.PreferenceManager;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -176,11 +175,8 @@ protected void showStreamDialog(final StreamInfoItem item) {
                     StreamDialogEntry.share
             ));
         }
-        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(item.getServiceId())
-                && PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
-        if (enableKodiEntry) {
-            entries.add(StreamDialogEntry.play_on_kodi);
+        if (KoreUtil.shouldShowPlayWithKodi(context, item)) {
+            entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 59537f1a860..a6a73e05f93 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -17,7 +17,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.preference.PreferenceManager;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -415,11 +414,8 @@ private void showStreamDialog(final StreamStatisticsEntry item) {
                     StreamDialogEntry.share
             ));
         }
-        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(infoItem.getServiceId())
-                && PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
-        if (enableKodiEntry) {
-            entries.add(StreamDialogEntry.play_on_kodi);
+        if (KoreUtil.shouldShowPlayWithKodi(context, infoItem)) {
+            entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index c6314f557e6..94f76cc754d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -20,7 +20,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -783,11 +782,8 @@ protected void showStreamItemDialog(final PlaylistStreamEntry item) {
                     StreamDialogEntry.share
             ));
         }
-        final boolean enableKodiEntry = KoreUtil.isServiceSupportedByKore(infoItem.getServiceId())
-                && PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
-        if (enableKodiEntry) {
-            entries.add(StreamDialogEntry.play_on_kodi);
+        if (KoreUtil.shouldShowPlayWithKodi(context, infoItem)) {
+            entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java b/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
index 7d37b25c48a..26019cd1f50 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
@@ -4,9 +4,11 @@
 import android.content.Context;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
 public final class KoreUtil {
     private KoreUtil() { }
@@ -16,6 +18,12 @@ public static boolean isServiceSupportedByKore(final int serviceId) {
                 || serviceId == ServiceList.SoundCloud.getServiceId());
     }
 
+    public static boolean shouldShowPlayWithKodi(final Context context, final StreamInfoItem item) {
+        return isServiceSupportedByKore(item.getServiceId())
+                && PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
+    }
+
     public static void showInstallKoreDialog(final Context context) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(context);
         builder.setMessage(R.string.kore_not_found)
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index d85f5ae574f..153ba7cf48d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -71,7 +71,7 @@ public enum StreamDialogEntry {
         }
     }),
 
-    play_on_kodi(R.string.play_with_kodi_title, (fragment, item) -> {
+    play_with_kodi(R.string.play_with_kodi_title, (fragment, item) -> {
         final Uri videoUrl = Uri.parse(item.getUrl());
         try {
             NavigationHelper.playWithKore(fragment.getContext(), videoUrl);

From 71add5a7c28945682ad9e45b108baa47f1928353 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Thu, 31 Dec 2020 19:26:41 -0500
Subject: [PATCH 013/131] Update displayed licenses

---
 app/src/main/assets/epl1.html                 | 245 ++++++++++++++++++
 .../schabi/newpipe/about/AboutActivity.java   |  60 +++--
 .../newpipe/about/StandardLicenses.java       |   2 +
 3 files changed, 282 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/assets/epl1.html

diff --git a/app/src/main/assets/epl1.html b/app/src/main/assets/epl1.html
new file mode 100644
index 00000000000..7123552dd6c
--- /dev/null
+++ b/app/src/main/assets/epl1.html
@@ -0,0 +1,245 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0050)https://www.eclipse.org/org/documents/epl-v10.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+
+    <title>Eclipse Public License - Version 1.0</title>
+
+</head>
+
+<body cz-shortcut-listen="true" lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+    DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+    AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+    code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+    originate from and are distributed by that particular Contributor. A
+    Contribution 'originates' from a Contributor if it was added to the
+    Program by such Contributor itself or anyone acting on such
+    Contributor's behalf. Contributions do not include additions to the
+    Program which: (i) are separate modules of software distributed in
+    conjunction with the Program under their own license agreement, and (ii)
+    are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+    the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+    Contributor which are necessarily infringed by the use or sale of its
+    Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+    with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+    this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+    Contributor hereby grants Recipient a non-exclusive, worldwide,
+    royalty-free copyright license to reproduce, prepare derivative works
+    of, publicly display, publicly perform, distribute and sublicense the
+    Contribution of such Contributor, if any, and such derivative works, in
+    source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+    Contributor hereby grants Recipient a non-exclusive, worldwide,
+    royalty-free patent license under Licensed Patents to make, use, sell,
+    offer to sell, import and otherwise transfer the Contribution of such
+    Contributor, if any, in source code and object code form. This patent
+    license shall apply to the combination of the Contribution and the
+    Program if, at the time the Contribution is added by the Contributor,
+    such addition of the Contribution causes such combination to be covered
+    by the Licensed Patents. The patent license shall not apply to any other
+    combinations which include the Contribution. No hardware per se is
+    licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+    grants the licenses to its Contributions set forth herein, no assurances
+    are provided by any Contributor that the Program does not infringe the
+    patent or other intellectual property rights of any other entity. Each
+    Contributor disclaims any liability to Recipient for claims brought by
+    any other entity based on infringement of intellectual property rights
+    or otherwise. As a condition to exercising the rights and licenses
+    granted hereunder, each Recipient hereby assumes sole responsibility to
+    secure any other intellectual property rights needed, if any. For
+    example, if a third party patent license is required to allow Recipient
+    to distribute the Program, it is Recipient's responsibility to acquire
+    that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+    has sufficient copyright rights in its Contribution, if any, to grant
+    the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+    form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+    Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+    all warranties and conditions, express and implied, including warranties
+    or conditions of title and non-infringement, and implied warranties or
+    conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+    all liability for damages, including direct, indirect, special,
+    incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+    Agreement are offered by that Contributor alone and not by any other
+    party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+    from such Contributor, and informs licensees how to obtain it in a
+    reasonable manner on or through a medium customarily used for software
+    exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+    copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+    within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+    Contribution, if any, in a manner that reasonably allows subsequent
+    Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+    responsibilities with respect to end users, business partners and the
+    like. While this license is intended to facilitate the commercial use of
+    the Program, the Contributor who includes the Program in a commercial
+    product offering should do so in a manner which does not create
+    potential liability for other Contributors. Therefore, if a Contributor
+    includes the Program in a commercial product offering, such Contributor
+    ("Commercial Contributor") hereby agrees to defend and
+    indemnify every other Contributor ("Indemnified Contributor")
+    against any losses, damages and costs (collectively "Losses")
+    arising from claims, lawsuits and other legal actions brought by a third
+    party against the Indemnified Contributor to the extent caused by the
+    acts or omissions of such Commercial Contributor in connection with its
+    distribution of the Program in a commercial product offering. The
+    obligations in this section do not apply to any claims or Losses
+    relating to any actual or alleged intellectual property infringement. In
+    order to qualify, an Indemnified Contributor must: a) promptly notify
+    the Commercial Contributor in writing of such claim, and b) allow the
+    Commercial Contributor to control, and cooperate with the Commercial
+    Contributor in, the defense and any related settlement negotiations. The
+    Indemnified Contributor may participate in any such claim at its own
+    expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+    product offering, Product X. That Contributor is then a Commercial
+    Contributor. If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone. Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those
+    performance claims and warranties, and if a court requires any other
+    Contributor to pay any damages as a result, the Commercial Contributor
+    must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+    PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+    OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+    ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+    OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+    responsible for determining the appropriateness of using and
+    distributing the Program and assumes all risks associated with its
+    exercise of rights under this Agreement , including but not limited to
+    the risks and costs of program errors, compliance with applicable laws,
+    damage to or loss of data, programs or equipment, and unavailability or
+    interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+    NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+    WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+    DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further action
+    by the parties hereto, such provision shall be reformed to the minimum
+    extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+    (including a cross-claim or counterclaim in a lawsuit) alleging that the
+    Program itself (excluding combinations of the Program with other
+    software or hardware) infringes such Recipient's patent(s), then such
+    Recipient's rights granted under Section 2(b) shall terminate as of the
+    date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+    fails to comply with any of the material terms or conditions of this
+    Agreement and does not cure such failure in a reasonable period of time
+    after becoming aware of such noncompliance. If all Recipient's rights
+    under this Agreement terminate, Recipient agrees to cease use and
+    distribution of the Program as soon as reasonably practicable. However,
+    Recipient's obligations under this Agreement and any licenses granted by
+    Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+    Agreement, but in order to avoid inconsistency the Agreement is
+    copyrighted and may only be modified in the following manner. The
+    Agreement Steward reserves the right to publish new versions (including
+    revisions) of this Agreement from time to time. No one other than the
+    Agreement Steward has the right to modify this Agreement. The Eclipse
+    Foundation is the initial Agreement Steward. The Eclipse Foundation may
+    assign the responsibility to serve as the Agreement Steward to a
+    suitable separate entity. Each new version of the Agreement will be
+    given a distinguishing version number. The Program (including
+    Contributions) may always be distributed subject to the version of the
+    Agreement under which it was received. In addition, after a new version
+    of the Agreement is published, Contributor may elect to distribute the
+    Program (including its Contributions) under the new version. Except as
+    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+    rights or licenses to the intellectual property of any Contributor under
+    this Agreement, whether expressly, by implication, estoppel or
+    otherwise. All rights in the Program not expressly granted under this
+    Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+    the intellectual property laws of the United States of America. No party
+    to this Agreement will bring a legal action under this Agreement more
+    than one year after the cause of action arose. Each party waives its
+    rights to a jury trial in any resulting litigation.</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 6ff69156112..2569f4a9404 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -29,37 +29,46 @@ public class AboutActivity extends AppCompatActivity {
      * List of all software components.
      */
     private static final SoftwareComponent[] SOFTWARE_COMPONENTS = {
-            new SoftwareComponent("Giga Get", "2014 - 2015", "Peter Cai",
+            new SoftwareComponent("ACRA", "2013", "Kevin Gaudin",
+                    "https://github.com/ACRA/acra", StandardLicenses.APACHE2),
+            new SoftwareComponent("AndroidX", "2005 - 2011", "The Android Open Source Project",
+                    "https://developer.android.com/jetpack", StandardLicenses.APACHE2),
+            new SoftwareComponent("CircleImageView", "2014 - 2020", "Henning Dodenhof",
+                    "https://github.com/hdodenhof/CircleImageView",
+                    StandardLicenses.APACHE2),
+            new SoftwareComponent("ExoPlayer", "2014 - 2020", "Google, Inc.",
+                    "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
+            new SoftwareComponent("GigaGet", "2014 - 2015", "Peter Cai",
                     "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL3),
-            new SoftwareComponent("NewPipe Extractor", "2017 - 2020", "Christian Schabesberger",
-                    "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
-            new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley",
+            new SoftwareComponent("Groupie", "2016", "Lisa Wray",
+                    "https://github.com/lisawray/groupie", StandardLicenses.MIT),
+            new SoftwareComponent("Icepick", "2015", "Frankie Sardo",
+                    "https://github.com/frankiesardo/icepick", StandardLicenses.EPL1),
+            new SoftwareComponent("Jsoup", "2009 - 2020", "Jonathan Hedley",
                     "https://github.com/jhy/jsoup", StandardLicenses.MIT),
-            new SoftwareComponent("Rhino", "2015", "Mozilla",
-                    "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
-            new SoftwareComponent("ACRA", "2013", "Kevin Gaudin",
-                    "http://www.acra.ch", StandardLicenses.APACHE2),
-            new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich",
-                    "https://github.com/nostra13/Android-Universal-Image-Loader",
+            new SoftwareComponent("Markwon", "2019", "Dimitry Ivanov",
+                    "https://github.com/noties/Markwon", StandardLicenses.APACHE2),
+            new SoftwareComponent("Material Components for Android", "2016 - 2020", "Google, Inc.",
+                    "https://github.com/material-components/material-components-android",
                     StandardLicenses.APACHE2),
-            new SoftwareComponent("CircleImageView", "2014 - 2020", "Henning Dodenhof",
-                    "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
+            new SoftwareComponent("NewPipe Extractor", "2017 - 2020", "Christian Schabesberger",
+                    "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
             new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam",
-                    "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2),
-            new SoftwareComponent("ExoPlayer", "2014 - 2020", "Google Inc",
-                    "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxAndroid", "2015 - 2018", "The RxAndroid authors",
+                    "https://github.com/spacecowboy/NoNonsense-FilePicker",
+                    StandardLicenses.MPL2),
+            new SoftwareComponent("OkHttp", "2019", "Square, Inc.",
+                    "https://square.github.io/okhttp/", StandardLicenses.APACHE2),
+            new SoftwareComponent("PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
+                    "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors",
                     "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxBinding", "2015", "Jake Wharton",
+                    "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2),
             new SoftwareComponent("RxJava", "2016 - 2020", "RxJava Contributors",
                     "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxBinding", "2015 - 2018", "Jake Wharton",
-                    "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2),
-            new SoftwareComponent("PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
-                    "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2),
-            new SoftwareComponent("Markwon", "2017 - 2020", "Noties",
-                    "https://github.com/noties/Markwon", StandardLicenses.APACHE2),
-            new SoftwareComponent("Groupie", "2016", "Lisa Wray",
-                    "https://github.com/lisawray/groupie", StandardLicenses.MIT)
+            new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich",
+                    "https://github.com/nostra13/Android-Universal-Image-Loader",
+                    StandardLicenses.APACHE2),
     };
 
     private static final int POS_ABOUT = 0;
@@ -115,7 +124,8 @@ public boolean onOptionsItemSelected(final MenuItem item) {
      * A placeholder fragment containing a simple view.
      */
     public static class AboutFragment extends Fragment {
-        public AboutFragment() { }
+        public AboutFragment() {
+        }
 
         /**
          * Created a new instance of this fragment for the given section number.
diff --git a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java b/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java
index 50ee5ebc37a..60b1e168c6f 100644
--- a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java
+++ b/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java
@@ -12,6 +12,8 @@ public final class StandardLicenses {
             = new License("Mozilla Public License, Version 2.0", "MPL 2.0", "mpl2.html");
     public static final License MIT
             = new License("MIT License", "MIT", "mit.html");
+    public static final License EPL1
+            = new License("Eclipse Public License, Version 1.0", "EPL 1.0", "epl1.html");
 
     private StandardLicenses() { }
 }

From 31899d2ab9dee7a6a41f17b818297d4170408152 Mon Sep 17 00:00:00 2001
From: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:40:20 +0000
Subject: [PATCH 014/131] Checklist is compulsory: bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f9201f94851..e74a5a76116 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -15,7 +15,7 @@ Oh no, a bug! It happens. Thanks for reporting an issue with NewPipe. To make it
 <!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
 
 ### Checklist
-<!-- The first box has been checked for you to show you how it is done. -->
+<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
 
 - [x] I am using the latest version - x.xx.x <!-- Check https://github.com/TeamNewPipe/NewPipe/releases -->
 - [ ] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O -->

From 24c1cfbf721bc8df5f36005c180cfec653a82bdf Mon Sep 17 00:00:00 2001
From: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:42:07 +0000
Subject: [PATCH 015/131] Checklist is compulsory: feature request template

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index c4d378d14c1..361c8057fab 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,7 +11,7 @@ assignees: ''
 <!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
 
 ### Checklist
-<!-- The first box has been checked for you to show you how it is done. -->
+<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
 
 - [x] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O -->
 - [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.

From 14a21710359f2ae688288087a661bd9f27a16772 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 23 Dec 2020 07:50:43 +0530
Subject: [PATCH 016/131] Use Objects.requireNonNull().

---
 .../org/schabi/newpipe/about/LicenseFragment.java  |  8 +++-----
 .../newpipe/settings/DownloadSettingsFragment.java |  5 +----
 .../java/us/shandian/giga/get/DownloadMission.java |  5 +++--
 .../us/shandian/giga/get/DownloadRunnable.java     |  4 ++--
 .../giga/get/sqlite/FinishedMissionStore.java      | 14 +++++---------
 .../us/shandian/giga/io/CircularFileWriter.java    |  5 ++---
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
index 8367a75dc43..6e48a0e1488 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
@@ -35,12 +36,9 @@ public class LicenseFragment extends Fragment {
     private final CompositeDisposable compositeDisposable = new CompositeDisposable();
 
     public static LicenseFragment newInstance(final SoftwareComponent[] softwareComponents) {
-        if (softwareComponents == null) {
-            throw new NullPointerException("softwareComponents is null");
-        }
-        final LicenseFragment fragment = new LicenseFragment();
         final Bundle bundle = new Bundle();
-        bundle.putParcelableArray(ARG_COMPONENTS, softwareComponents);
+        bundle.putParcelableArray(ARG_COMPONENTS, Objects.requireNonNull(softwareComponents));
+        final LicenseFragment fragment = new LicenseFragment();
         fragment.setArguments(bundle);
         return fragment;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index a4b29fc4941..8742f093767 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -246,10 +246,7 @@ public void onActivityResult(final int requestCode, final int resultCode, final
 
 
         // revoke permissions on the old save path (required for SAF only)
-        final Context context = getContext();
-        if (context == null) {
-            throw new NullPointerException("getContext()");
-        }
+        final Context context = requireContext();
 
         forgetSAFTree(context, defaultPreferences.getString(key, ""));
 
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index d7c586083ba..2b3faa3e050 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -22,6 +22,7 @@
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.channels.ClosedByInterruptException;
+import java.util.Objects;
 
 import javax.net.ssl.SSLException;
 
@@ -154,8 +155,8 @@ public class DownloadMission extends Mission {
     public transient Thread init = null;
 
     public DownloadMission(String[] urls, StoredFileHelper storage, char kind, Postprocessing psInstance) {
-        if (urls == null) throw new NullPointerException("urls is null");
-        if (urls.length < 1) throw new IllegalArgumentException("urls is empty");
+        if (Objects.requireNonNull(urls).length < 1)
+            throw new IllegalArgumentException("urls array is empty");
         this.urls = urls;
         this.kind = kind;
         this.offsets = new long[urls.length];
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 7fb12d0889c..6f504cea3b1 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -8,6 +8,7 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.nio.channels.ClosedByInterruptException;
+import java.util.Objects;
 
 import us.shandian.giga.get.DownloadMission.Block;
 import us.shandian.giga.get.DownloadMission.HttpError;
@@ -29,8 +30,7 @@ public class DownloadRunnable extends Thread {
     private HttpURLConnection mConn;
 
     DownloadRunnable(DownloadMission mission, int id) {
-        if (mission == null) throw new NullPointerException("mission is null");
-        mMission = mission;
+        mMission = Objects.requireNonNull(mission);
         mId = id;
     }
 
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
index 1d1dca0dff3..15c45c6fd31 100644
--- a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
@@ -12,6 +12,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Objects;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
@@ -140,9 +141,7 @@ private ContentValues getValuesOfMission(@NonNull Mission downloadMission) {
     }
 
     private FinishedMission getMissionFromCursor(Cursor cursor) {
-        if (cursor == null) throw new NullPointerException("cursor is null");
-
-        String kind = cursor.getString(cursor.getColumnIndex(KEY_KIND));
+        String kind = Objects.requireNonNull(cursor).getString(cursor.getColumnIndex(KEY_KIND));
         if (kind == null || kind.isEmpty()) kind = "?";
 
         String path = cursor.getString(cursor.getColumnIndexOrThrow(KEY_PATH));
@@ -186,15 +185,13 @@ public ArrayList<FinishedMission> loadFinishedMissions() {
     }
 
     public void addFinishedMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+        ContentValues values = getValuesOfMission(Objects.requireNonNull(downloadMission));
         SQLiteDatabase database = getWritableDatabase();
-        ContentValues values = getValuesOfMission(downloadMission);
         database.insert(FINISHED_TABLE_NAME, null, values);
     }
 
     public void deleteMission(Mission mission) {
-        if (mission == null) throw new NullPointerException("mission is null");
-        String ts = String.valueOf(mission.timestamp);
+        String ts = String.valueOf(Objects.requireNonNull(mission).timestamp);
 
         SQLiteDatabase database = getWritableDatabase();
 
@@ -212,9 +209,8 @@ public void deleteMission(Mission mission) {
     }
 
     public void updateMission(Mission mission) {
-        if (mission == null) throw new NullPointerException("mission is null");
+        ContentValues values = getValuesOfMission(Objects.requireNonNull(mission));
         SQLiteDatabase database = getWritableDatabase();
-        ContentValues values = getValuesOfMission(mission);
         String ts = String.valueOf(mission.timestamp);
 
         int rowsAffected;
diff --git a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
index 4d62ab20057..dbceeb091d2 100644
--- a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
+++ b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Objects;
 
 public class CircularFileWriter extends SharpStream {
 
@@ -27,9 +28,7 @@ public class CircularFileWriter extends SharpStream {
     private BufferedFile aux;
 
     public CircularFileWriter(SharpStream target, File temp, OffsetChecker checker) throws IOException {
-        if (checker == null) {
-            throw new NullPointerException("checker is null");
-        }
+        Objects.requireNonNull(checker);
 
         if (!temp.exists()) {
             if (!temp.createNewFile()) {

From aeca8dc5b2fb9f612d1d26b797d2160977247c40 Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Sat, 2 Jan 2021 14:39:31 +0100
Subject: [PATCH 017/131] Disable sending metrics to Google in Android System
 Webview

Fixes TeamNewPipe/NewPipe#5335
---
 app/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d240d123f75..3509f2d1331 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -318,6 +318,8 @@
             android:name=".RouterActivity$FetcherService"
             android:exported="false" />
 
+        <!-- opting out of sending metrics to Google in Android System WebView -->
+        <meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true" />
         <!-- see https://github.com/TeamNewPipe/NewPipe/issues/3947 -->
         <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>

From ac59382b84cc047483e29df1ba40a2a71848d5be Mon Sep 17 00:00:00 2001
From: khimaros <me@khimaros.com>
Date: Sat, 2 Jan 2021 11:24:33 -0800
Subject: [PATCH 018/131] pass serviceId instead of item, reduce duplication

---
 .../org/schabi/newpipe/fragments/list/BaseListFragment.java | 3 +--
 .../newpipe/fragments/list/playlist/PlaylistFragment.java   | 2 +-
 .../newpipe/local/history/StatisticsPlaylistFragment.java   | 2 +-
 .../newpipe/local/playlist/LocalPlaylistFragment.java       | 2 +-
 .../java/org/schabi/newpipe/player/VideoPlayerImpl.java     | 4 +---
 app/src/main/java/org/schabi/newpipe/util/KoreUtil.java     | 6 ++----
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 10527d1896d..a40ff1bf319 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -333,7 +333,6 @@ protected void onScrollToBottom() {
         }
     }
 
-
     protected void showStreamDialog(final StreamInfoItem item) {
         final Context context = getContext();
         final Activity activity = getActivity();
@@ -360,7 +359,7 @@ protected void showStreamDialog(final StreamInfoItem item) {
                     StreamDialogEntry.share
             ));
         }
-        if (KoreUtil.shouldShowPlayWithKodi(context, item)) {
+        if (KoreUtil.shouldShowPlayWithKodi(context, item.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 0eed5f4b00b..8f7d6128b94 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -175,7 +175,7 @@ protected void showStreamDialog(final StreamInfoItem item) {
                     StreamDialogEntry.share
             ));
         }
-        if (KoreUtil.shouldShowPlayWithKodi(context, item)) {
+        if (KoreUtil.shouldShowPlayWithKodi(context, item.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index a6a73e05f93..0d549ecf91a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -414,7 +414,7 @@ private void showStreamDialog(final StreamStatisticsEntry item) {
                     StreamDialogEntry.share
             ));
         }
-        if (KoreUtil.shouldShowPlayWithKodi(context, infoItem)) {
+        if (KoreUtil.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 94f76cc754d..17f7a4ff9ef 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -782,7 +782,7 @@ protected void showStreamItemDialog(final PlaylistStreamEntry item) {
                     StreamDialogEntry.share
             ));
         }
-        if (KoreUtil.shouldShowPlayWithKodi(context, infoItem)) {
+        if (KoreUtil.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
         StreamDialogEntry.setEnabledEntries(entries);
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index a304b44300b..9ae26cf33aa 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -932,9 +932,7 @@ private void showHideKodiButton() {
                 service.getString(R.string.show_play_with_kodi_key), false);
         // show kodi button if it supports the current service and it is enabled in settings
         final boolean showKodiButton = playQueue != null && playQueue.getItem() != null
-                && KoreUtil.isServiceSupportedByKore(playQueue.getItem().getServiceId())
-                && PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
+                && KoreUtil.shouldShowPlayWithKodi(context, playQueue.getItem().getServiceId());
         playWithKodi.setVisibility(videoPlayerSelected() && kodiEnabled && showKodiButton
                 ? View.VISIBLE : View.GONE);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java b/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
index 26019cd1f50..de6f3fa9a8d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.util;
 
-
 import android.content.Context;
 
 import androidx.appcompat.app.AlertDialog;
@@ -8,7 +7,6 @@
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
 public final class KoreUtil {
     private KoreUtil() { }
@@ -18,8 +16,8 @@ public static boolean isServiceSupportedByKore(final int serviceId) {
                 || serviceId == ServiceList.SoundCloud.getServiceId());
     }
 
-    public static boolean shouldShowPlayWithKodi(final Context context, final StreamInfoItem item) {
-        return isServiceSupportedByKore(item.getServiceId())
+    public static boolean shouldShowPlayWithKodi(final Context context, final int serviceId) {
+        return isServiceSupportedByKore(serviceId)
                 && PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
     }

From f78a7fa630b7be39c0508e36faa912d1557c85df Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 11:22:25 +0100
Subject: [PATCH 019/131] Extract import database logic in
 ContentSettingsManager

---
 .../settings/ContentSettingsFragment.java     | 52 ++---------
 .../settings/ContentSettingsManager.kt        | 92 ++++++++++++++++++-
 2 files changed, 95 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index d7766f7b091..1d9b8e10274 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -224,33 +224,24 @@ private void exportDatabase(final String path) {
 
     private void importDatabase(final String filePath) {
         // check if file is supported
-        try (ZipFile zipFile = new ZipFile(filePath)) {
-        } catch (final IOException ioe) {
+        if (!manager.isValidZipFile(filePath)) {
             Toast.makeText(getContext(), R.string.no_valid_zip_file, Toast.LENGTH_SHORT)
-                    .show();
+                .show();
             return;
         }
 
         try {
-            if (!databasesDir.exists() && !databasesDir.mkdir()) {
+            if (!manager.ensureDbDirectoryExists()) {
                 throw new Exception("Could not create databases dir");
             }
 
-            final boolean isDbFileExtracted = ZipHelper.extractFileFromZip(filePath,
-                    newpipeDb.getPath(), "newpipe.db");
-
-            if (isDbFileExtracted) {
-                newpipeDbJournal.delete();
-                newpipeDbWal.delete();
-                newpipeDbShm.delete();
-            } else {
+            if (!manager.extractDb(filePath)) {
                 Toast.makeText(getContext(), R.string.could_not_import_all_files, Toast.LENGTH_LONG)
-                        .show();
+                    .show();
             }
 
             //If settings file exist, ask if it should be imported.
-            if (ZipHelper.extractFileFromZip(filePath, newpipeSettings.getPath(),
-                    "newpipe.settings")) {
+            if (manager.containSettings(filePath)) {
                 final AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
                 alert.setTitle(R.string.import_settings);
 
@@ -261,7 +252,8 @@ private void importDatabase(final String filePath) {
                 });
                 alert.setPositiveButton(getString(R.string.finish), (dialog, which) -> {
                     dialog.dismiss();
-                    loadSharedPreferences(newpipeSettings);
+                    manager.loadSharedPreferences(PreferenceManager
+                        .getDefaultSharedPreferences(requireContext()));
                     // restart app to properly load db
                     System.exit(0);
                 });
@@ -275,34 +267,6 @@ private void importDatabase(final String filePath) {
         }
     }
 
-    private void loadSharedPreferences(final File src) {
-        try (ObjectInputStream input = new ObjectInputStream(new FileInputStream(src))) {
-            final SharedPreferences.Editor prefEdit = PreferenceManager
-                    .getDefaultSharedPreferences(requireContext()).edit();
-            prefEdit.clear();
-            final Map<String, ?> entries = (Map<String, ?>) input.readObject();
-            for (final Map.Entry<String, ?> entry : entries.entrySet()) {
-                final Object v = entry.getValue();
-                final String key = entry.getKey();
-
-                if (v instanceof Boolean) {
-                    prefEdit.putBoolean(key, (Boolean) v);
-                } else if (v instanceof Float) {
-                    prefEdit.putFloat(key, (Float) v);
-                } else if (v instanceof Integer) {
-                    prefEdit.putInt(key, (Integer) v);
-                } else if (v instanceof Long) {
-                    prefEdit.putLong(key, (Long) v);
-                } else if (v instanceof String) {
-                    prefEdit.putString(key, (String) v);
-                }
-            }
-            prefEdit.commit();
-        } catch (final IOException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Error
     //////////////////////////////////////////////////////////////////////////*/
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 2682ac5e0a6..2a2c4df2034 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -1,23 +1,34 @@
 package org.schabi.newpipe.settings
 
 import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
 import org.schabi.newpipe.util.ZipHelper
 import java.io.BufferedOutputStream
 import java.io.File
+import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
+import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
-import java.lang.Exception
+import java.util.zip.ZipFile
 import java.util.zip.ZipOutputStream
 
 class ContentSettingsManager(
-    private val newpipeDb: File,
-    private val newpipeSettings: File
+        private val databasesDir: File,
+        private val newpipeDb: File,
+        private val newpipeDbJournal: File,
+        private var newpipeDbShm: File,
+        private val newpipeDbWal: File,
+        private val newpipeSettings: File,
 ) {
 
     constructor(homeDir: File) : this(
-        File(homeDir, "databases/newpipe.db"),
-        File(homeDir, "databases/newpipe.settings")
+            File(homeDir, "/databases"),
+            File(homeDir, "/databases/newpipe.db"),
+            File(homeDir, "/databases/newpipe.db-journal"),
+            File(homeDir, "/databases/newpipe.db-shm"),
+            File(homeDir, "/databases/newpipe.db-wal"),
+            File(homeDir, "/databases/newpipe.settings")
     )
 
     /**
@@ -42,4 +53,75 @@ class ContentSettingsManager(
                 ZipHelper.addFileToZip(outZip, newpipeSettings.path, "newpipe.settings")
             }
     }
+
+    fun isValidZipFile(filePath: String): Boolean {
+        try {
+            ZipFile(filePath).use {
+                return@isValidZipFile true
+            }
+        } catch (ioe: IOException) {
+            return false
+        }
+    }
+
+    /**
+     * Tries to create database directory if it does not exist.
+     *
+     * @return Whether the directory exists afterwards.
+     */
+    fun ensureDbDirectoryExists(): Boolean {
+        return !databasesDir.exists() && !databasesDir.mkdir()
+    }
+
+    fun extractDb(filePath: String): Boolean {
+        val success = ZipHelper.extractFileFromZip(filePath, newpipeDb.path, "newpipe.db")
+        if (success) {
+            newpipeDbJournal.delete()
+            newpipeDbWal.delete()
+            newpipeDbShm.delete()
+        }
+
+        return success
+    }
+
+    fun containSettings(filePath: String): Boolean {
+        return ZipHelper
+                .extractFileFromZip(filePath, newpipeSettings.path, "newpipe.settings")
+    }
+
+    fun loadSharedPreferences(preferences: SharedPreferences) {
+        try {
+            val preferenceEditor = preferences.edit()
+
+            ObjectInputStream(FileInputStream(newpipeSettings)).use { input ->
+                preferenceEditor.clear()
+                val entries = input.readObject() as Map<String, *>
+                for ((key, value) in entries) {
+                    when (value) {
+                        is Boolean -> {
+                            preferenceEditor.putBoolean(key, value)
+                        }
+                        is Float -> {
+                            preferenceEditor.putFloat(key, value)
+                        }
+                        is Int -> {
+                            preferenceEditor.putInt(key, value)
+                        }
+                        is Long -> {
+                            preferenceEditor.putLong(key, value)
+                        }
+                        is String -> {
+                            preferenceEditor.putString(key, value)
+                        }
+                    }
+                }
+                preferenceEditor.commit()
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } catch (e: ClassNotFoundException) {
+            e.printStackTrace()
+        }
+    }
+
 }

From cef791ba1baa639476ebc00a8060d5f4ac1c07a1 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 14:02:34 +0100
Subject: [PATCH 020/131] Introduce NewPipeFileLocator class

It handles locating specific NewPipe files based on the home directory of the app.
---
 .../settings/ContentSettingsFragment.java     |  2 +-
 .../settings/ContentSettingsManager.kt        | 68 ++++++++-----------
 .../newpipe/settings/NewPipeFileLocator.kt    | 22 ++++++
 3 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 1d9b8e10274..f783df85e87 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -129,7 +129,7 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
         newpipeSettings = new File(homeDir, "/databases/newpipe.settings");
         newpipeSettings.delete();
 
-        manager = new ContentSettingsManager(homeDir);
+        manager = new ContentSettingsManager(new NewPipeFileLocator(homeDir));
 
         addPreferencesFromResource(R.xml.content_settings);
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 2a2c4df2034..5e92f59bfd4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -1,10 +1,8 @@
 package org.schabi.newpipe.settings
 
 import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
 import org.schabi.newpipe.util.ZipHelper
 import java.io.BufferedOutputStream
-import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
@@ -13,23 +11,7 @@ import java.io.ObjectOutputStream
 import java.util.zip.ZipFile
 import java.util.zip.ZipOutputStream
 
-class ContentSettingsManager(
-        private val databasesDir: File,
-        private val newpipeDb: File,
-        private val newpipeDbJournal: File,
-        private var newpipeDbShm: File,
-        private val newpipeDbWal: File,
-        private val newpipeSettings: File,
-) {
-
-    constructor(homeDir: File) : this(
-            File(homeDir, "/databases"),
-            File(homeDir, "/databases/newpipe.db"),
-            File(homeDir, "/databases/newpipe.db-journal"),
-            File(homeDir, "/databases/newpipe.db-shm"),
-            File(homeDir, "/databases/newpipe.db-wal"),
-            File(homeDir, "/databases/newpipe.settings")
-    )
+class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
 
     /**
      * Exports given [SharedPreferences] to the file in given outputPath.
@@ -38,19 +20,19 @@ class ContentSettingsManager(
     @Throws(Exception::class)
     fun exportDatabase(preferences: SharedPreferences, outputPath: String) {
         ZipOutputStream(BufferedOutputStream(FileOutputStream(outputPath)))
-            .use { outZip ->
-                ZipHelper.addFileToZip(outZip, newpipeDb.path, "newpipe.db")
+                .use { outZip ->
+                    ZipHelper.addFileToZip(outZip, fileLocator.dbDir.path, "newpipe.db")
 
-                try {
-                    ObjectOutputStream(FileOutputStream(newpipeSettings)).use { output ->
-                        output.writeObject(preferences.all)
-                        output.flush()
+                    try {
+                        ObjectOutputStream(FileOutputStream(fileLocator.settings)).use { output ->
+                            output.writeObject(preferences.all)
+                            output.flush()
+                        }
+                    } catch (e: IOException) {
+                        e.printStackTrace()
                     }
-                } catch (e: IOException) {
-                    e.printStackTrace()
-                }
 
-                ZipHelper.addFileToZip(outZip, newpipeSettings.path, "newpipe.settings")
+                    ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings")
             }
     }
 
@@ -70,30 +52,37 @@ class ContentSettingsManager(
      * @return Whether the directory exists afterwards.
      */
     fun ensureDbDirectoryExists(): Boolean {
-        return !databasesDir.exists() && !databasesDir.mkdir()
+        return !fileLocator.dbDir.exists() && !fileLocator.dbDir.mkdir()
     }
 
-    fun extractDb(filePath: String): Boolean {
-        val success = ZipHelper.extractFileFromZip(filePath, newpipeDb.path, "newpipe.db")
+
+    fun extractDb(
+            filePath: String,
+    ): Boolean {
+        val success = ZipHelper.extractFileFromZip(filePath, fileLocator.db.path, "newpipe.db")
         if (success) {
-            newpipeDbJournal.delete()
-            newpipeDbWal.delete()
-            newpipeDbShm.delete()
+            fileLocator.dbJournal.delete()
+            fileLocator.dbWal.delete()
+            fileLocator.dbShm.delete()
         }
 
         return success
     }
 
-    fun containSettings(filePath: String): Boolean {
+    fun containSettings(
+            filePath: String,
+    ): Boolean {
         return ZipHelper
-                .extractFileFromZip(filePath, newpipeSettings.path, "newpipe.settings")
+                .extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings")
     }
 
-    fun loadSharedPreferences(preferences: SharedPreferences) {
+    fun loadSharedPreferences(
+            preferences: SharedPreferences,
+    ) {
         try {
             val preferenceEditor = preferences.edit()
 
-            ObjectInputStream(FileInputStream(newpipeSettings)).use { input ->
+            ObjectInputStream(FileInputStream(fileLocator.settings)).use { input ->
                 preferenceEditor.clear()
                 val entries = input.readObject() as Map<String, *>
                 for ((key, value) in entries) {
@@ -123,5 +112,4 @@ class ContentSettingsManager(
             e.printStackTrace()
         }
     }
-
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt b/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt
new file mode 100644
index 00000000000..1fe2fffa0d3
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt
@@ -0,0 +1,22 @@
+package org.schabi.newpipe.settings
+
+import java.io.File
+
+/**
+ * Locates specific files of NewPipe based on the home directory of the app.
+ */
+class NewPipeFileLocator(private val homeDir: File) {
+
+    val dbDir by lazy { File(homeDir, "/databases") }
+
+    val db by lazy { File(homeDir, "/databases/newpipe.db") }
+
+    val dbJournal by lazy { File(homeDir, "/databases/newpipe.db-journal") }
+
+    val dbShm by lazy { File(homeDir, "/databases/newpipe.db-shm") }
+
+    val dbWal by lazy { File(homeDir, "/databases/newpipe.db-wal") }
+
+    val settings by lazy { File(homeDir, "/databases/newpipe.settings") }
+
+}

From ea91a62c89e70fc392c811af5dbcea34a9064035 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 14:10:10 +0100
Subject: [PATCH 021/131] Adjust ExportTest to new DI with FileLocator

---
 app/build.gradle                                          | 4 +++-
 .../org/schabi/newpipe/settings/ContentSettingsManager.kt | 2 +-
 .../schabi/newpipe/settings/ContentSettingsManagerTest.kt | 8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9fb9cf85fe7..b3c6f6bad8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -102,6 +102,7 @@ ext {
     groupieVersion = '2.8.1'
     markwonVersion = '4.6.0'
     googleAutoServiceVersion = '1.0-rc7'
+    mockitoVersion = '3.6.0'
 }
 
 configurations {
@@ -235,7 +236,8 @@ dependencies {
     implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
 
     testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:3.6.0'
+    testImplementation "org.mockito:mockito-core:${mockitoVersion}"
+    testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
 
     androidTestImplementation "androidx.test.ext:junit:1.1.2"
     androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 5e92f59bfd4..f278c6b247c 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -21,7 +21,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
     fun exportDatabase(preferences: SharedPreferences, outputPath: String) {
         ZipOutputStream(BufferedOutputStream(FileOutputStream(outputPath)))
                 .use { outZip ->
-                    ZipHelper.addFileToZip(outZip, fileLocator.dbDir.path, "newpipe.db")
+                    ZipHelper.addFileToZip(outZip, fileLocator.db.path, "newpipe.db")
 
                     try {
                         ObjectOutputStream(FileOutputStream(fileLocator.settings)).use { output ->
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index 5ac132f7fd4..67895fc7cb1 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.settings
 
 import android.content.SharedPreferences
+import com.nononsenseapps.filepicker.NewFolderFragment
 import org.junit.Assert
 import org.junit.Assume
 import org.junit.Before
@@ -24,6 +25,7 @@ class ContentSettingsManagerTest {
     class ExportTest {
 
         companion object {
+            private lateinit var fileLocator: NewPipeFileLocator
             private lateinit var newpipeDb: File
             private lateinit var newpipeSettings: File
 
@@ -37,6 +39,10 @@ class ContentSettingsManagerTest {
 
                 newpipeDb = File(dbPath!!)
                 newpipeSettings = File(settingsPath!!)
+
+                fileLocator = Mockito.mock(NewPipeFileLocator::class.java, Mockito.withSettings().stubOnly())
+                `when`(fileLocator.db).thenReturn(newpipeDb)
+                `when`(fileLocator.settings).thenReturn(newpipeSettings)
             }
         }
 
@@ -52,7 +58,7 @@ class ContentSettingsManagerTest {
             val expectedPreferences = mapOf("such pref" to "much wow")
             `when`(preferences.all).thenReturn(expectedPreferences)
 
-            val manager = ContentSettingsManager(newpipeDb, newpipeSettings)
+            val manager = ContentSettingsManager(fileLocator)
 
             val output = File.createTempFile("newpipe_", "")
             manager.exportDatabase(preferences, output.absolutePath)

From 19cd3a17df4f3b17b72604c5887f3aea7ab3fbb2 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 14:14:48 +0100
Subject: [PATCH 022/131] Move isValidZipFile to ZipHelper

---
 .../newpipe/settings/ContentSettingsFragment.java      |  2 +-
 .../schabi/newpipe/settings/ContentSettingsManager.kt  | 10 ----------
 .../main/java/org/schabi/newpipe/util/ZipHelper.java   | 10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index f783df85e87..2339de53a37 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -224,7 +224,7 @@ private void exportDatabase(final String path) {
 
     private void importDatabase(final String filePath) {
         // check if file is supported
-        if (!manager.isValidZipFile(filePath)) {
+        if (!ZipHelper.isValidZipFile(filePath)) {
             Toast.makeText(getContext(), R.string.no_valid_zip_file, Toast.LENGTH_SHORT)
                 .show();
             return;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index f278c6b247c..3ab3dc8f329 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -36,16 +36,6 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
             }
     }
 
-    fun isValidZipFile(filePath: String): Boolean {
-        try {
-            ZipFile(filePath).use {
-                return@isValidZipFile true
-            }
-        } catch (ioe: IOException) {
-            return false
-        }
-    }
-
     /**
      * Tries to create database directory if it does not exist.
      *
diff --git a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
index f9a950d2bdf..e2b766bb03e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
@@ -4,7 +4,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
@@ -99,4 +101,12 @@ public static boolean extractFileFromZip(final String filePath, final String fil
             return found;
         }
     }
+
+    public static boolean isValidZipFile(final String filePath) {
+        try (ZipFile ignored = new ZipFile(filePath)) {
+            return true;
+        } catch (final IOException ioe) {
+            return false;
+        }
+    }
 }

From f778c4892359ba5bcb3b411637a530713066267f Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:15:38 +0100
Subject: [PATCH 023/131] Add basic tests for settings import

---
 .../settings/ContentSettingsManagerTest.kt    | 110 +++++++++++++++++-
 app/src/test/resources/settings/empty.zip     | Bin 0 -> 22 bytes
 app/src/test/resources/settings/newpipe.zip   | Bin 0 -> 8317 bytes
 3 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 app/src/test/resources/settings/empty.zip
 create mode 100644 app/src/test/resources/settings/newpipe.zip

diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index 67895fc7cb1..111fd7c092b 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -1,8 +1,10 @@
 package org.schabi.newpipe.settings
 
 import android.content.SharedPreferences
-import com.nononsenseapps.filepicker.NewFolderFragment
 import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Assume
 import org.junit.Before
 import org.junit.BeforeClass
@@ -11,10 +13,16 @@ import org.junit.runner.RunWith
 import org.junit.runners.Suite
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
+import org.mockito.Mockito.anyString
+import org.mockito.Mockito.anyBoolean
+import org.mockito.Mockito.atLeastOnce
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.withSettings
 import org.mockito.junit.MockitoJUnitRunner
 import org.schabi.newpipe.settings.ContentSettingsManagerTest.ExportTest
 import java.io.File
 import java.io.ObjectInputStream
+import java.nio.file.Files
 import java.util.zip.ZipFile
 
 @RunWith(Suite::class)
@@ -40,7 +48,7 @@ class ContentSettingsManagerTest {
                 newpipeDb = File(dbPath!!)
                 newpipeSettings = File(settingsPath!!)
 
-                fileLocator = Mockito.mock(NewPipeFileLocator::class.java, Mockito.withSettings().stubOnly())
+                fileLocator = Mockito.mock(NewPipeFileLocator::class.java, withSettings().stubOnly())
                 `when`(fileLocator.db).thenReturn(newpipeDb)
                 `when`(fileLocator.settings).thenReturn(newpipeSettings)
             }
@@ -50,7 +58,7 @@ class ContentSettingsManagerTest {
 
         @Before
         fun setupMocks() {
-            preferences = Mockito.mock(SharedPreferences::class.java, Mockito.withSettings().stubOnly())
+            preferences = Mockito.mock(SharedPreferences::class.java, withSettings().stubOnly())
         }
 
         @Test
@@ -79,4 +87,100 @@ class ContentSettingsManagerTest {
             }
         }
     }
+
+    @RunWith(MockitoJUnitRunner::class)
+    class ImportTest {
+        companion object {
+            private lateinit var fileLocator: NewPipeFileLocator
+            private lateinit var zip: File
+            private lateinit var emptyZip: File
+            private lateinit var db: File
+            private lateinit var dbJournal: File
+            private lateinit var dbWal: File
+            private lateinit var dbShm: File
+            private lateinit var settings: File
+
+            @JvmStatic
+            @BeforeClass
+            fun setupReadOnlyFiles() {
+                val zipPath = ImportTest::class.java.classLoader?.getResource("settings/newpipe.zip")?.file
+                val emptyZipPath = ImportTest::class.java.classLoader?.getResource("settings/empty.zip")?.file
+                Assume.assumeNotNull(zipPath)
+                Assume.assumeNotNull(emptyZipPath)
+
+                zip = File(zipPath!!)
+                emptyZip = File(emptyZipPath!!)
+            }
+        }
+
+        @Before
+        fun setupWriteFiles() {
+            db = File.createTempFile("newpipe_", "")
+            dbJournal = File.createTempFile("newpipe_", "")
+            dbWal = File.createTempFile("newpipe_", "")
+            dbShm = File.createTempFile("newpipe_", "")
+            settings = File.createTempFile("newpipe_", "")
+
+            fileLocator = Mockito.mock(NewPipeFileLocator::class.java, withSettings().stubOnly())
+            `when`(fileLocator.db).thenReturn(db)
+            `when`(fileLocator.dbJournal).thenReturn(dbJournal)
+            `when`(fileLocator.dbShm).thenReturn(dbShm)
+            `when`(fileLocator.dbWal).thenReturn(dbWal)
+            `when`(fileLocator.settings).thenReturn(settings)
+        }
+
+        @Test
+        fun `The database must be extracted from the zip file`() {
+            val success = ContentSettingsManager(fileLocator).extractDb(zip.path)
+
+            assertTrue(success)
+            assertFalse(dbJournal.exists())
+            assertFalse(dbWal.exists())
+            assertFalse(dbShm.exists())
+            assertTrue("database file size is zero", Files.size(db.toPath()) > 0)
+        }
+
+        @Test
+        fun `Extracting the database from an empty zip must not work`() {
+            val success = ContentSettingsManager(fileLocator).extractDb(emptyZip.path)
+
+            assertFalse(success)
+            assertTrue(dbJournal.exists())
+            assertTrue(dbWal.exists())
+            assertTrue(dbShm.exists())
+            assertEquals(0, Files.size(db.toPath()))
+        }
+
+        @Test
+        fun `Contain setting must return true, if a settings file exists in the zip`() {
+            val contains = ContentSettingsManager(fileLocator).containSettings(zip.path)
+
+            assertTrue(contains)
+        }
+
+        @Test
+        fun `Contain setting must return false, if a no settings file exists in the zip`() {
+            val contains = ContentSettingsManager(fileLocator).containSettings(emptyZip.path)
+
+            assertFalse(contains)
+        }
+
+        @Test
+        fun `Preferences must be set from the settings file`() {
+            val preferences = Mockito.mock(SharedPreferences::class.java, withSettings().stubOnly())
+            val editor = Mockito.mock(SharedPreferences.Editor::class.java)
+            `when`(preferences.edit()).thenReturn(editor)
+
+
+            val manager = ContentSettingsManager(fileLocator)
+            manager.containSettings(zip.path)
+            manager.loadSharedPreferences(preferences)
+
+            verify(editor, atLeastOnce()).putBoolean(anyString(), anyBoolean())
+        }
+
+
+    }
+
+
 }
diff --git a/app/src/test/resources/settings/empty.zip b/app/src/test/resources/settings/empty.zip
new file mode 100644
index 0000000000000000000000000000000000000000..15cb0ecb3e219d1701294bfdf0fe3f5cb5d208e7
GIT binary patch
literal 22
NcmWIWW@Tf*000g10H*)|

literal 0
HcmV?d00001

diff --git a/app/src/test/resources/settings/newpipe.zip b/app/src/test/resources/settings/newpipe.zip
new file mode 100644
index 0000000000000000000000000000000000000000..1ce8431feb3d4f2b14e770ac7f8a3b7efac07436
GIT binary patch
literal 8317
zcmZ{Jby!s0_b-Z+gmj0*(A|w99Yc#qN!QTbAl)xRcej9mGz{IPl0yvLjRHf?_50qR
ze!cfTcmHvov(AcVpR+&vbM{(GT^acqArd+|I#Rb+k_OUW<N2?92MbRp8z&1+bJOD$
zOegw%!<SAYsT^Itmg3YCzCMCkIRawj%BkkcP!MV-``Fx_33QS=^X*~MOzO<aNd&c#
z^dJm?Ti#|6ro8Q?6ZBLw<vAq-iaTNLD^~5qZahuGbxzMAqKeHRdXg4pbWg?Em3fYY
zm3sc%+<gDF`#`%u4)^PM<HJ?szz6@83y>(834=_kZ~;)UxX)>lo8KJn0OlvfdIP@}
z>8q=P&%42I1s?@AR!#c$!?CWjw<7C#&sDb{mP85uyjF*EZiXi6d3dvBAxuzMX)qxv
za3ccsw;HmkLXm9sW0iZ2=Jz9{Y!1uKe^BafK<}v#YPwi(wExj`Bl#h+oqM^ja!Ia|
zN@>t_8KOv5>pp)437$5J=z%f!s3&Gg_MQ*ampA=$={VYMV{AW5VXz2#zhpgOH#Q97
z>-}7>V2Nu;%ZJ4!xu~M=vdort6J6|3%<&D=$g%00`IyFJ7nN~EScQkpSlyRaoz>VH
zZHgZJMw<yv7x(5dNQR9wEKR0tNlCxz?c!WLREd>sOfQV8ugot`Gp2|omHj2YV_q!}
zKcHYE#+)D#{FM<9|4B<nh8I7Ixz69wbfez^9IK$opcX~fS0~KILR$%R0bGz7ttplB
zwZFAX`ohkg%`W+-kT~HPhLyQ<)F<Zo#2~(JM5$HI+k%R9vh_WLc=8+Agck36DPCp~
zp{B|6xNAV^!*w1D4Gjs_1(G$r`_Bc6lVdRHD|ma^-aZ3z>MHarwTMTXkToqs>%9`j
z*Av)Y3Rsm9YQDlo6&PqQW~PO`x7JUoASWQ(Wy0juVgp-{?G7C>%W9d2;FB^mrf7;(
zxWIWn0pe3-wY3F1LaY`0d6cJ#I*J5-#z&FbQlB74k)xvtt18y37tbhIvDUw2t?kPC
zvIH|}SbxRHoXNt&AMb;lDB>8aqT9ka;wqboUn0Ns4lf<ZNix|_W0k2si0JF@62dj6
zg@iKw!GPCT79};rk`VAj!~J}xwP0Orv(Nz7CU`x?mtn(u^X$GQk~z3$i!GMfS=zTZ
z-w%P9M!iS=?H<%z<C!@K<9j>~C@KDNjR>^rminzj5~jC|r4LW6(=*#7I>atuRLt2$
zAcleh{}?#U#o|oGZ=QEuNX<~tJ-*KPL3utgiTOvLjpx`Enq*a$yo(TGx({bL?9T%#
z^eZPx$@!TdXeF&?-YmHJT)1kj@}0X**Q#cgAzW@VD!P~!GPowbSh4r-mPv9qh(53p
zJSv8#XS#JkX;A)+-BAE4<ynNcbV=E3;v2TEdR2_*&NqxzG<q=jXz7NRgjc^mJF-kn
zYcF7XGj}kCf()SDE2uqW>mhy>Q<C~(WW=tGSAEGsjr)V^Nmz5u!RTjQNBXzu=uf)t
zq9M$RxmTKI-hiEzwohz*_3zH!nVrvhRD-^y(2jz{mh@wI<j4FKb;AXgfb@G<EeGG{
zvTLv=t##1lJn?5`cV!L9zO(5SD6~Jkj?bD+3C3)6^*t#8aFKN8v%QIQRZN8A_cdqk
zx?3<qg}^9iY1c<7Q~RUp==R>MJ#n@$d4k*c5H^Dgl6j9G2Cj0t;mcQrQ-FG$J5Gse
zwvdhk4vXR@rmUsR@7HAFu;El=SPJWMaShh2d)e6hqN4o$MraL|xO|#4WXnU4ih4dJ
z7-}xzY-d~hPeT0uDDG>;FYC>1X3%0i-EbubmMMqDQJg4>Sx?}u$AMc7XjN}Ke$UP_
z^Ke937!MnSrrO4vygBl&vhMBL;jD@OY&*CN)VRF3h${3Yh)?{A2H7h)cx6YZS^wV1
zP3_?>u&-6<4*%)z<qw)qy11tqMEsV!p{SdGu(Ng)a*Fr^Lo1qC#FPKA3u<@)LA?0w
zl<j|ZPxD(4zFWJI`YkwJ^}zqqe7OJH=Nj?btQ(3p^>^&Q=Tr7;H!$J};I1-2fPN`(
zyN$8_Kt_ndJ<qww24BA;L6@8#7>=@0)UQS$1@w!ABb^6q=xj*HBrO0cpV3|P6DJO4
z{F(MCLuppu;CWUlg>a`yTm1B4shx1AWn1)gRVkZrr)gX4^cW*1kfT&txYIndZ$EpV
z4#<^h=`3p37Br1n`a@X4Q8Z%OmGNm=s10fvU#U$tFssx_)FQKgzu4w!89}LYc6`>L
zlc*){<_w5@V87hvSs6Ve0nqv5w8=Cs@ci@)-g0q|U^LMhL>SXUr0)UeyZw3V-w;+&
zY6M-c@1LK?cpV|M`V;VJ7y{D0uoLbnp2=&YM=uO+KBD6>z+~As$NzjYGCo`0cnU|D
zHj|J;dD7wh>`0^C!PbF}yUTX8Xse%I&O7#lt?vMLUZFA|r;#>OL&L#VFN(X%V~41S
zCol&$R5T+)gK2vDz}!|TM+I1!6oui=D_H{^9Gr=QegewL&yEa7it=R4jGTQIB_rp}
z7^I0qRH1I@_X|ZLWc|Y6Z2wsb+DGJbrhXc{Jb>gIzi7DohHjKGqa@HT8BVsr6cza9
z9{rpv>YAVy?-X!_p0Va^`Fs9I;-=)(LNIMGg_4V*VhziP4xqJ=AuXl<*Cp8;sL07W
z@(FC94*sF!0#rl?WN3hG02!KKML>o+*cm{kh2H><WgUqGrze}gQw$G}7#dn%Mg0D`
zB27xd{|m2QXwCf_$Krq6k^ZI0yLbqsKX*rd{0$hSZarQHO2JrCirROlk3*Aig!13S
z92fw*GVBX4FWWM5BRWFoXgdZrR|iGQMzpW#HKpOoiV>%kF){Zg>+$2#<lJmw2|S2t
zAsi3x7#{;ZlHCpVH<$@D2;XjhI~C{@KOlYVDL`1>>zfUnQH0a<ASAv$-e*I>4dmCW
z6Q5;gG?O}l4zfcp{NilqNj30)(BYF~#a*cIaA7v~4G_%i1^Taq{AaIr^juMBS&l8O
zI{3N2E_^P)p!Brxz+0oRxMrU3QTuBa2AHgt3!j0;nndDdUf|DM7Ri@=bt>G1Dv5Po
z;jtF<iS1j+Mr)%_@drBkXEeG5@GG2VvKHy)L-ZHzCsqNv8x<df2@mz8OFy#pXmjtp
zD5W`$gRkA7)wi)z(>Fu~)wc&YE}mjPOA!hFz)+sS*Ci!r(-gWJcgJOY`z!*W?GzY9
zuy|ASw0&2N29=%?^O?{HTA7u9KH+1&uZ`#M&I^d$GAJWY2qI^l(6ipQa>{r|9RbNY
z_GDnrd>j8pLjvTViWw=NoLnZ7k&?UdDre#1&}Z2wo3yciHx5<cV8bD<Cx>4twFM&I
z1A7Q~t_$aBoJ)w!;OMa%eAvzn39P5_687BSK7+m!&N%knQ?s0*_R^5xmybyaVzC?V
z5;YOjuQB8c2-I=i8t5DG>N2Z#P@JPSn&6@BgsO;B_T3cryp!|&AYgGVc5-lH`7z7T
zn?bI!00xbqO<DBI3zOB$X9zdDOY5B%u8a(ol-1et2`)*0|7fjtwu~B*$#hUy&uOd3
z8#b@q?C~z`g{#|y*ko_yV&f0O1pQ)Sty9?a&2@YxN5JyS<?nMCG8k^#@K0}7J*FrR
zm&kvPdA_4>BX(yEZ*vPkJVq|!P<n|r7T67(c<vCm7g=Sg8NRXh(@ydF`Ro)!XZM@D
zR($vUBX$xL++ntyU}wfmBJ=)(m&KukRhkEM&t`Xlg+e5@$|G(l+c9cgV+@mvv|050
zn4g+%F$GUK&rj?-(K-QUo>hftTg>Xj=_yVIhvx~YapwxO)Pt!FmJXz>OY*(D&6$Qb
z*0;+$mZJhRq~|j{T7*y-e&#yLx_v2%kQcF{Y<yQO_x_=uP@hoPkMcmF&}p^+2%$N-
zU1mxHPt6NwRu)W#m&rd4bK7-Tzw|Qo^Km|?E!$xXi@Ji(5B2S+rLQ{XQcT49Im7$t
z;|f*<0+4F2s0#eYKzi@EPdpFOx}7ima_|9u#kW%}D@3Qc16w~->Wl^2#|ZIa^zS_&
z(ords>%yN`w8tcm(vopmckI0MTX=NHqfDo;>f7V5*>$IsR0jeLW{)RbwTaq&X_%U(
zr}u?hJK7Jwx!+2tqA}!y03`w4PVCtjzVwOJeHlI7_W=jt(0U5~ldeJ=q*>u)6yQ#K
zX5Br`$(Jp)qg|Ur*nww>cV?U?`RKIEPci8qwGcn->(q~f*PUJlFQ}6cUo3=fXX3Ry
ziW>Hub#s{J3u_i#zSK#2tIcH>xwlu1pFiT%Kso>ipp)D35^_I-gxi^03n}}3)jku)
zyOgRHGxzp(vyzEn49#2ur=c^iol7R2%OY{6!!Pec64EA5yAGqFE_Y4mFWm|+sJq&(
zTB2``4bu|1nigBJ9^hBNI~yQpE(vEA2TWx1u`%h};k1i^KWKq^3IC_W=IJ{*4z9_Z
z_kfu<f!nh&Y2&G_BAa)N358YnMkjH5NoZwizCh17sXQ+c(lyeb)qzR~0%|Wxj;8GI
z6oI{^qK$`JN(uW(rxaWpJ3Wgl;y(%Vv$dJ5j1F{{?soj{aVnH|uPGWVOO)>ps)1z(
z{n1RTQ|`K_0ZUX~o{%cc+T-?X8Zpm=#)OFDm6f|2|BH`MushlHL*|;)?aPFdQnxnz
z1YmxEGS`(DewkybtHN!y>&D4Kz(ohNw>1_mNo{eUD5HhAl5fWSu3FSrX(b?9HSdv(
z-#dA<W<-!iRLIu5`Ox{;ZdKy*b(Zh?ES5=Ai^1S^brn(bs_4T`&S_1zkL2rB;=7qE
z1Bx;x{_V2R0~y~+!-jSa3CRbe=BE3&w(#*HGCyrcvg?RD?Hgc>$Ip{xo3h-d%ftC2
zRkbXRW+xF9-DA82Bix6>k!EPGyMT#*X0`YB9YX6(9^d%=`p;8Uf76RT0vbxk*s$?k
z`KgS@)3dx6{*!P=Y^m#=_(7dFQ=L#>B-jDYq}l}O;NJ35gpqJM6-0v9D3QU)Z>U$g
z0opOYW3I@V@5`@iZ2iAa*@{M&sl1v?NfY*Ar~J4hg{b%nc(kd-3r*T43%q(}m682i
z1HRWM_Myl<UXnRIOx81Ql7DBCtg)^0sp&p?9OXUi)}!yrkBBv*z;@p|sUUvF%iG5F
zF52xdEQg!<G00jpTZhJblJphZ?p5}?w_qbK0xU;wp-#x|vvYuBw)-u;kx+Y@g)#*w
zpW2a8cQl#ny<@(TCiCuSnj|N5gi%@t%<4KQ=WxFrftJRUlKygqhsCQSk)x}FO-I;~
z{}rkp1_m7t65RulQt#`RS}hy{aZBJKOZsy!wy<O?)Wxq@4{ZJg-v|Z%`3m1F|GaaN
zyrA9px?sU}dL6d435^>ZRl3+%c&lb@$&~!HL*LW7@(`F-+n5v&A4ndrS2{jx##C6d
zXj0-_Oifc%qAP-_@=}eP_tvT3HVLwtCEXSlvRH6yBu0-Il(*;`s9BmSV|5PIx)vyj
zyscy!JH5|Z6(dV|IHk}nG@Yj+$}Li+HFgop!l~7SGuYDAkJq82(K#UkbQ|G@{!hMw
zoVcx2Si10{_$g-_$vNO*_ESxLd3vy-Il(s*Ka3wHa&6a1>79_SCUVe)b19!#CSCSd
zS9D5ClK0UF9{~<kTImvv0vW5Wc%DaMIfT-Wj+g;lVWb%~PO7{?*4jg}5nq;0Hx3%C
zr%?}k5noBzRiVfjsjGVB)$_-fAX;in=f>yYx$^h0_w~eE_1gr-N>wYI+6=yh9`m2%
z>@__*qw*OR&-7R7K)fOPX}CJN!17SzidQHZ6^iCj1jEm@n8*@;%5^TmV|&+?2i}-R
zvus+HbvtXSEz4!!Zj`e4b6aI}WyEYReH*+5LI~}wB=%dhRg=rri*p$QHXfAC6K!L1
zoH{$sPN}I4$aE&_>rbq8T$H^%rr&xfEVI`9+Q)<C3Yxb4q|2eB_<C~S;%7WWK!%S`
zcp>%QXP;tAd?le!)e8}M(pQqbyy((T;3kv$U@g+A1uGvGQF_mrH+HX<#wa*5I1qvM
zhF%FI-e%U2wp20QTJLYgLy>y27DJ>ZZyV}lSPkY~bzh;L^LG9Ya(nq2-Rq#PL*800
zHC^47=QBiee8B}08lmbn>S~PW&>{%^etiLNv-fE`ywY@)&_ib`3_i|ZOp8JhIwLJ8
z|I**-Pqs|Ao`jjR_Z=(H$k>`+7Mqbj%Eg1io}Kd;b<?k$I<?uANVl*z9KUg^H80>>
z0fy?O)#KWF&&_(-;ZDl$#7(E9<Q!!>Lw-UvIZ0MVGQn!oNdZfB*7o?O#&xIbFea)r
z_Q^nh4)cPSq|T?>#Z4XCZ){@~93#e<E~*=9L&O3+>w$=y2((gK0OPe7PwVAYdMK;+
z=-aXCYI`S>dS)l_1Pb>O%g^PCw**jMrh~y@uKk!0%l42~YQ5{{_B@>mCFKUt6q_>_
z+KvOGs!^6MPtaw=u@a@I$v<7Ui+#vh8W?@PVkYmX$$T|Q7wiLE+Xqf%uQMak931JW
zqau2jS|0q2yyafGlz7)8ES6S$p}Ds$5N?}MDiwmI_Y*DC6CW5?@j=vr#4r;IztS8-
z*f~Q);8n;_nmt8SEn%<8giTi0F!Lq?W10ku9x?JWEMrO~5OjdXlo54GmJr90@VI%#
z^`g^s3p=BXCOYo%s9W9>3F%A*ZHH`|Zf$-=DzdE?5a?_#G$oL5i<W^6Hk)0dj*1i_
z9$!8=Q4CZy=BtHXe5eVpI@GRDj29Vg{D-u{GUL-&XB$12MYi9MkHXV@%<a4nZbh+w
zviY2HjpHxH0TPLBRIsg{wAWm%(sd{`aqUnHhDh;3KxuHBL+r};e}PFBEHa&ZgmH(T
z<t1yI!ZPnSEBOAWL*2KnZK-=FH4w~Ok?Qk%(H`gha>ntdhR#M(*DuQv{wT{dxD1uC
z!-b!4gzqb=Wf*~SeRUsL{eRI$Gwq;&=t}s2Mg5dhpoUeLC@iAqSv9e#*;0lQ3%G!Q
z;*!0Km~*`cYO6WQAfNY8T@(=VCJtuOY_fC8`{D)Xq>V#v=kdrl{f1-ykCQ=Foc1ip
z3v}|~ifz5lbZrTJ$qMbm;R+7KEyNjePeab^?EPXz?{qRXQ3>*TmGtX{41yI}N4Jgx
z=2jLJ81`EnJ^Pe9?z>1DP4w>P@+8F5A?2ZfN-_37HI=foT|0D7E?LF3Md6)GK{5~v
zQ@Rg+^onO*ps}$ye-@33I4M(?RwMNMYfGZFS5Z8bBO`}bxdF2Q<e|yUQGC!+z`ict
zt5~;QI?>}UgpvfJ#bkCsb%RtEJIgzI)~{bm+T=SUTFgb5$?<}j@TO$2zPm;IxKp;O
zdOM-t4(L4%%{Lu^PC=@K2<N$&3(600P)KZdua=dSjX23=KYnF=APUAS5e2{ivf`TC
z&Ue20t@No-2C60i#p9X3!yrXhC6{>ScT_$)MPk17CY5=O4`XkiFX&q92cPR|03g{N
zZg*TheXfTc__>BF>ln_QEcnKz@V9(HwgSAz*K$Q(GsLpOj8lt-f>|zh>~YrOpLH`o
zi1!Y}ab@J6rB6ZyzW6s!792YVhg7^8aq8bLqKE^T2sPL=?CO`4bY5xNdp75Gv|jYU
z&<!QaWFqIN3c&vKdQMK>Q$`|jV!U+JH?z^BowOR@7%T@9oYT_qHwo=oqPK5urHfc>
zxC@{j#I2yVL>mipwQ<H~DrT+5_Ct{wC8O8}O-JkHP#+#9H{)^40uD7mi^jy=9?}p@
z<1~j_r@#`Wj$u-kc<Wb5)?Aco&ljy5>Py=N*A>n4r%IDbpRV4UY+E_xX>B$04C}a2
zsMo<2$GHZIoKQ7zQX3BYN()ImDE6g8LFqReGh8YG)^t+2WUg5g(_N32*Big`=pdo)
zo=ys--2;g>F<fPA{l+!u1Rd8rS&QtkdFbX@36Upqa>OHTJlj>*lMjck$ZOwAC#@WZ
z25@%b!N{#8NNKgV>LsuZrL3^d9hbgS^XP%%8{@#^^3}DOpA=hNHy67!)CR3J-mfZ(
zgfbg%U3y+AqWkPo0@j7$A~mIw7xL0k1P6r5^p}YURvk9?lMW256?Z$EJ;zHFMXi|+
zZAIQ{FIn`mCKib|T^2!LE{*cJ)TW1H^&fth%|4Ftv4*~F8mC~6AYx?>8gLR$)>5hD
zS0<KvZ8I;;opWooSCPlJym9B4qK9MWsc3F!;KehsD`_^jrsP7IRXLB&Ohwcfu{u-N
zx%DILu+7RV!L0aqzss8Ig(GeYT|f`k0!^Lo3cc&<tWkMYij*-^wcKn4<TsxVYp`Fy
zKXP=~Qn?p`x5u9996^L`c>Fb{kNQ63?kqmP)a-5k0!arSrcmu(+=3+_5TfQGEf_R`
zr&A-Vy-+(put3b(_fpU_EC~0ky&+LWxY93JnCOCq{=;QMsYR|XwdF0Fc6Imy?*SyQ
z^K;b?WxSyQEZZ6UVM5Yyu=uiz--t2j_!CJ*Hq|Wt_PJ+3u@Glpnt(C(H@vjcEgLR@
zR9#b8wHwu}?Ocm{2wsZsqDoo8Nn6rS8-I<jAUE#DH!f|XMzu2rI~S^)G9{RP?6S2=
zrh~^4&0i0qKCYiR-s99P`?WE){HY9+*J|4HDq+ladBK0!nq?&?GOw@G#$(EcC)egD
zVOKKJcXU)?JR;}th;rI;t9}+UeRBdRNH$;tRe!pf>#I7Jc4;M=N*kN@bhtLk&26xT
zVC2&aj+yqD#SQ2$HM)Eb4()Rs&(Dk$r9JmXHb>GWUEYGTJ=K-x58EseoPjGDzkSRO
zC}LBe+QUpPUG90ty60X~&7)Y^+99pT=F-WslqzWMIiZ?n6*vpi%6ODgS4Kl0;^@hk
zBmY%-`S27;{r}qy!~JFOyBp?e;pS%JVCCws)8$AhOGu4qc_zl-Y&z5v&iv{LKb*5)
zh8SD;Z6T=%!2mJJgt^1@%CS>B-(iN(H9g96Y{D;JHPqF25|A{s)W53J`dBBHdo?up
z!s6mMZi;iff9zzP`kwkuJ(_aZEu>8KtAm7-_Xm+pk|YwFClQa+Q&kCpIc5#lP}53T
zKVzBl2~Pd){vcI1@`NAPQXd{q&-YMn{gn`&iJd0&iBIJxjuQz`TgGMb0*G|UE!5<m
zmb~@wv18Q^+^m^nLBAZU+SzwpeYm@3&$>x&45xGFp0xU>dOD61xrT^@Gd1(tZHxUB
zv*HNvE_;H<oNe+}|AUHfD+=k^6P5cN5pymA7~VBEGafk^ZNK>U=dVr3E|g@Du%ukp
zx*aczN1hj7^0!VJ0!4U-+dj0Us0HmVzNP&!%!wh-^+L}U?R6AqBDl=-JJGiweL{5c
z6k>Za7m1V%ncV%F;_i3(Ym@k<=JUOi=lFOP*8Z0_#lgk+!#-2HJg?gE)^&!9WJotq
zvFgcy3Wn6axO7u?3blh@2{>i*RLUj^f<TW~Ily?3$Q=E)a?gcIEX&i0P?ye_BbN~X
z-mZ3?&m@ptI{e7e(A`1nIHZ0#X6F1_@bE+0_n$om4?pf`9&a|PI4VO{Dsiy%MdOz|
zje@xH{Czijg#!H~#ukLH!xR*rmsC9e=Y<7Uo8KHbutaKKJkZS^d%bbfO0Uw1=H*d-
z@wsW^h-)xLeY1G=Y2#S8pgAW1f77F^vn&E1<Vz#>!UD(MoJ&Xht&SGGo9h^XPbX5=
zaDeoHTZeH<KfsvgCl;xOUVkyXgNsv?n9QC-0$+X+3r-l|ePo)LqHtBI8)F9%izMP!
zDh|#pbm~riQbngKL5eGqV3?{rTbnXK#tLKA{^@*J+|8b%?kvT~kciJ)EikklZTw;|
z+DPY?Dala~Z1fUIB0u$V*EG_f+5Zx$DAXz_Dt?S2mBIz3;nmd+B4+1PtZgQWEW5}P
zi>8`YruK5ef}eIzWUaF+UWEJD+OI&5+{(|}!k@{aFeFNysH`(tyS=xt=@9x}AqZ25
z_ZAH~_9X8g*Eo_9b6W{-xUpUDq1sS_(Grn}?CnRUDmSQql<rV__sV4^2W=?<=Y;B_
zGvNi!P0z2xYWosR4y!H!kzuo@&$NP96#jlit<iO1t*NnZa5LNV6rKgPopMT^Hiy3B
zJg+;8Cf~IZBT?&ilBsrgI;dgT^GAQZ&^Uy)nRT`uZ&WHZ^*)<9)cKh=t$#J95lJE~
z@<&J{<5I;FJT;Fm<lrJ{zj7g=CP7g^{QP9>{a0HZ)Fy6PPq`*iOxx`XGY+Az$Y$sf
zlfjlo+Sqhzx}x|5ha8olwcRW+m0>y8JUZxcxH+aa?ev_;w>G1%qvIdle}2h}A13a#
zN_E5!t9aS&lG_<Xqx~#(x~LlK)W1EoEOV1~$`nrdT1bq@zAU&&mPnu9R!?wdADL>b
z0&%lWBS!xb+T`Fa3gPKXEHtr^nSO<&107@$60|=Shra(O83tGM`Ua_J+6@4yByvB*
zR2T}lISVv;8~cQ*Yi313cJ_9)WiR0WQrw8)&~(W&B&0YDq+b;G<S8N2e_Q^4)8Btu
u{{QFrO?l>~|F_@YG5<r3{~b6K|1VXlE2I3|Wq*qF6v^Y4>G{81rT+!Ia@nE)

literal 0
HcmV?d00001


From 8fceffd6fd0afd882ff8ae27a00b53c899b2b11b Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:16:22 +0100
Subject: [PATCH 024/131] Introduce NewPipeFileLocator class

---
 .../newpipe/settings/ContentSettingsManager.kt       | 12 +++---------
 .../newpipe/settings/ContentSettingsManagerTest.kt   | 11 ++++++-----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 3ab3dc8f329..0e779edbf56 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -46,9 +46,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
     }
 
 
-    fun extractDb(
-            filePath: String,
-    ): Boolean {
+    fun extractDb(filePath: String): Boolean {
         val success = ZipHelper.extractFileFromZip(filePath, fileLocator.db.path, "newpipe.db")
         if (success) {
             fileLocator.dbJournal.delete()
@@ -59,16 +57,12 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
         return success
     }
 
-    fun containSettings(
-            filePath: String,
-    ): Boolean {
+    fun containSettings(filePath: String): Boolean {
         return ZipHelper
                 .extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings")
     }
 
-    fun loadSharedPreferences(
-            preferences: SharedPreferences,
-    ) {
+    fun loadSharedPreferences(preferences: SharedPreferences) {
         try {
             val preferenceEditor = preferences.edit()
 
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index 111fd7c092b..e139dad7bc5 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -19,14 +19,14 @@ import org.mockito.Mockito.atLeastOnce
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.withSettings
 import org.mockito.junit.MockitoJUnitRunner
-import org.schabi.newpipe.settings.ContentSettingsManagerTest.ExportTest
+import org.schabi.newpipe.settings.ContentSettingsManagerTest.*
 import java.io.File
 import java.io.ObjectInputStream
 import java.nio.file.Files
 import java.util.zip.ZipFile
 
 @RunWith(Suite::class)
-@Suite.SuiteClasses(ExportTest::class)
+@Suite.SuiteClasses(ExportTest::class, ImportTest::class)
 class ContentSettingsManagerTest {
 
     @RunWith(MockitoJUnitRunner::class)
@@ -73,23 +73,24 @@ class ContentSettingsManagerTest {
 
             val zipFile = ZipFile(output.absoluteFile)
             val entries = zipFile.entries().toList()
-            Assert.assertEquals(2, entries.size)
+            assertEquals(2, entries.size)
 
             zipFile.getInputStream(entries.first { it.name == "newpipe.db" }).use { actual ->
                 newpipeDb.inputStream().use { expected ->
-                    Assert.assertEquals(expected.reader().readText(), actual.reader().readText())
+                    assertEquals(expected.reader().readText(), actual.reader().readText())
                 }
             }
 
             zipFile.getInputStream(entries.first { it.name == "newpipe.settings" }).use { actual ->
                 val actualPreferences = ObjectInputStream(actual).readObject()
-                Assert.assertEquals(expectedPreferences, actualPreferences)
+                assertEquals(expectedPreferences, actualPreferences)
             }
         }
     }
 
     @RunWith(MockitoJUnitRunner::class)
     class ImportTest {
+
         companion object {
             private lateinit var fileLocator: NewPipeFileLocator
             private lateinit var zip: File

From 122e80fae9afc2e5bc75aa3cd73af027391358d0 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 16:28:10 +0100
Subject: [PATCH 025/131] Remove subclasses from ContentSettingsManagerTest

ExportTest provides no value.
ImportTest creates temporary files even if not needed.
---
 .../settings/ContentSettingsFragment.java     |   7 +-
 .../settings/ContentSettingsManager.kt        |   2 +-
 .../settings/ContentSettingsManagerTest.kt    | 233 +++++++-----------
 .../test/resources/settings/newpipe.settings  | Bin 0 -> 2445 bytes
 4 files changed, 97 insertions(+), 145 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 2339de53a37..18d49b50740 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -32,14 +32,9 @@
 import org.schabi.newpipe.util.ZipHelper;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
-import java.util.Map;
-import java.util.zip.ZipFile;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
@@ -241,7 +236,7 @@ private void importDatabase(final String filePath) {
             }
 
             //If settings file exist, ask if it should be imported.
-            if (manager.containSettings(filePath)) {
+            if (manager.extractSettings(filePath)) {
                 final AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
                 alert.setTitle(R.string.import_settings);
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 0e779edbf56..bab29a30a99 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -57,7 +57,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
         return success
     }
 
-    fun containSettings(filePath: String): Boolean {
+    fun extractSettings(filePath: String): Boolean {
         return ZipHelper
                 .extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings")
     }
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index e139dad7bc5..875ef758a79 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -1,187 +1,144 @@
 package org.schabi.newpipe.settings
 
 import android.content.SharedPreferences
-import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
-import org.junit.Assume
 import org.junit.Before
-import org.junit.BeforeClass
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.runners.Suite
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyString
 import org.mockito.Mockito.anyBoolean
+import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.atLeastOnce
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.withSettings
 import org.mockito.junit.MockitoJUnitRunner
-import org.schabi.newpipe.settings.ContentSettingsManagerTest.*
 import java.io.File
 import java.io.ObjectInputStream
 import java.nio.file.Files
 import java.util.zip.ZipFile
 
-@RunWith(Suite::class)
-@Suite.SuiteClasses(ExportTest::class, ImportTest::class)
+@RunWith(MockitoJUnitRunner::class)
 class ContentSettingsManagerTest {
 
-    @RunWith(MockitoJUnitRunner::class)
-    class ExportTest {
-
-        companion object {
-            private lateinit var fileLocator: NewPipeFileLocator
-            private lateinit var newpipeDb: File
-            private lateinit var newpipeSettings: File
-
-            @JvmStatic
-            @BeforeClass
-            fun setupFiles() {
-                val dbPath = ExportTest::class.java.classLoader?.getResource("settings/newpipe.db")?.file
-                val settingsPath = ExportTest::class.java.classLoader?.getResource("settings/newpipe.settings")?.path
-                Assume.assumeNotNull(dbPath)
-                Assume.assumeNotNull(settingsPath)
-
-                newpipeDb = File(dbPath!!)
-                newpipeSettings = File(settingsPath!!)
-
-                fileLocator = Mockito.mock(NewPipeFileLocator::class.java, withSettings().stubOnly())
-                `when`(fileLocator.db).thenReturn(newpipeDb)
-                `when`(fileLocator.settings).thenReturn(newpipeSettings)
-            }
-        }
-
-        private lateinit var preferences: SharedPreferences
-
-        @Before
-        fun setupMocks() {
-            preferences = Mockito.mock(SharedPreferences::class.java, withSettings().stubOnly())
-        }
+    companion object {
+        private val classloader = ContentSettingsManager::class.java.classLoader!!
+    }
 
-        @Test
-        fun `The settings must be exported successfully in the correct format`() {
-            val expectedPreferences = mapOf("such pref" to "much wow")
-            `when`(preferences.all).thenReturn(expectedPreferences)
+    private lateinit var fileLocator: NewPipeFileLocator
 
-            val manager = ContentSettingsManager(fileLocator)
+    @Before
+    fun setupFileLocator() {
+        fileLocator = Mockito.mock(NewPipeFileLocator::class.java, withSettings().stubOnly())
+    }
 
-            val output = File.createTempFile("newpipe_", "")
-            manager.exportDatabase(preferences, output.absolutePath)
+    @Test
+    fun `The settings must be exported successfully in the correct format`() {
+        val db = File(classloader.getResource("settings/newpipe.db")!!.file)
+        val newpipeSettings = File.createTempFile("newpipe_", "")
+        `when`(fileLocator.db).thenReturn(db)
+        `when`(fileLocator.settings).thenReturn(newpipeSettings)
 
-            val zipFile = ZipFile(output.absoluteFile)
-            val entries = zipFile.entries().toList()
-            assertEquals(2, entries.size)
+        val expectedPreferences = mapOf("such pref" to "much wow")
+        val sharedPreferences = Mockito.mock(SharedPreferences::class.java, withSettings().stubOnly())
+        `when`(sharedPreferences.all).thenReturn(expectedPreferences)
 
-            zipFile.getInputStream(entries.first { it.name == "newpipe.db" }).use { actual ->
-                newpipeDb.inputStream().use { expected ->
-                    assertEquals(expected.reader().readText(), actual.reader().readText())
-                }
-            }
+        val output = File.createTempFile("newpipe_", "")
+        ContentSettingsManager(fileLocator).exportDatabase(sharedPreferences, output.absolutePath)
 
-            zipFile.getInputStream(entries.first { it.name == "newpipe.settings" }).use { actual ->
-                val actualPreferences = ObjectInputStream(actual).readObject()
-                assertEquals(expectedPreferences, actualPreferences)
-            }
-        }
-    }
+        val zipFile = ZipFile(output)
+        val entries = zipFile.entries().toList()
+        assertEquals(2, entries.size)
 
-    @RunWith(MockitoJUnitRunner::class)
-    class ImportTest {
-
-        companion object {
-            private lateinit var fileLocator: NewPipeFileLocator
-            private lateinit var zip: File
-            private lateinit var emptyZip: File
-            private lateinit var db: File
-            private lateinit var dbJournal: File
-            private lateinit var dbWal: File
-            private lateinit var dbShm: File
-            private lateinit var settings: File
-
-            @JvmStatic
-            @BeforeClass
-            fun setupReadOnlyFiles() {
-                val zipPath = ImportTest::class.java.classLoader?.getResource("settings/newpipe.zip")?.file
-                val emptyZipPath = ImportTest::class.java.classLoader?.getResource("settings/empty.zip")?.file
-                Assume.assumeNotNull(zipPath)
-                Assume.assumeNotNull(emptyZipPath)
-
-                zip = File(zipPath!!)
-                emptyZip = File(emptyZipPath!!)
+        zipFile.getInputStream(entries.first { it.name == "newpipe.db" }).use { actual ->
+            db.inputStream().use { expected ->
+                assertEquals(expected.reader().readText(), actual.reader().readText())
             }
         }
 
-        @Before
-        fun setupWriteFiles() {
-            db = File.createTempFile("newpipe_", "")
-            dbJournal = File.createTempFile("newpipe_", "")
-            dbWal = File.createTempFile("newpipe_", "")
-            dbShm = File.createTempFile("newpipe_", "")
-            settings = File.createTempFile("newpipe_", "")
-
-            fileLocator = Mockito.mock(NewPipeFileLocator::class.java, withSettings().stubOnly())
-            `when`(fileLocator.db).thenReturn(db)
-            `when`(fileLocator.dbJournal).thenReturn(dbJournal)
-            `when`(fileLocator.dbShm).thenReturn(dbShm)
-            `when`(fileLocator.dbWal).thenReturn(dbWal)
-            `when`(fileLocator.settings).thenReturn(settings)
-        }
-
-        @Test
-        fun `The database must be extracted from the zip file`() {
-            val success = ContentSettingsManager(fileLocator).extractDb(zip.path)
-
-            assertTrue(success)
-            assertFalse(dbJournal.exists())
-            assertFalse(dbWal.exists())
-            assertFalse(dbShm.exists())
-            assertTrue("database file size is zero", Files.size(db.toPath()) > 0)
+        zipFile.getInputStream(entries.first { it.name == "newpipe.settings" }).use { actual ->
+            val actualPreferences = ObjectInputStream(actual).readObject()
+            assertEquals(expectedPreferences, actualPreferences)
         }
+    }
 
-        @Test
-        fun `Extracting the database from an empty zip must not work`() {
-            val success = ContentSettingsManager(fileLocator).extractDb(emptyZip.path)
+    @Test
+    fun `The database must be extracted from the zip file`() {
+        val db = File.createTempFile("newpipe_", "")
+        val dbJournal = File.createTempFile("newpipe_", "")
+        val dbWal = File.createTempFile("newpipe_", "")
+        val dbShm = File.createTempFile("newpipe_", "")
+        `when`(fileLocator.db).thenReturn(db)
+        `when`(fileLocator.dbJournal).thenReturn(dbJournal)
+        `when`(fileLocator.dbShm).thenReturn(dbShm)
+        `when`(fileLocator.dbWal).thenReturn(dbWal)
+
+        val zip = File(classloader.getResource("settings/newpipe.zip")?.file!!)
+        val success = ContentSettingsManager(fileLocator).extractDb(zip.path)
+
+        assertTrue(success)
+        assertFalse(dbJournal.exists())
+        assertFalse(dbWal.exists())
+        assertFalse(dbShm.exists())
+        assertTrue("database file size is zero", Files.size(db.toPath()) > 0)
+    }
 
-            assertFalse(success)
-            assertTrue(dbJournal.exists())
-            assertTrue(dbWal.exists())
-            assertTrue(dbShm.exists())
-            assertEquals(0, Files.size(db.toPath()))
-        }
+    @Test
+    fun `Extracting the database from an empty zip must not work`() {
+        val db = File.createTempFile("newpipe_", "")
+        val dbJournal = File.createTempFile("newpipe_", "")
+        val dbWal = File.createTempFile("newpipe_", "")
+        val dbShm = File.createTempFile("newpipe_", "")
+        `when`(fileLocator.db).thenReturn(db)
+
+        val emptyZip = File(classloader.getResource("settings/empty.zip")?.file!!)
+        val success = ContentSettingsManager(fileLocator).extractDb(emptyZip.path)
+
+        assertFalse(success)
+        assertTrue(dbJournal.exists())
+        assertTrue(dbWal.exists())
+        assertTrue(dbShm.exists())
+        assertEquals(0, Files.size(db.toPath()))
+    }
 
-        @Test
-        fun `Contain setting must return true, if a settings file exists in the zip`() {
-            val contains = ContentSettingsManager(fileLocator).containSettings(zip.path)
+    @Test
+    fun `Contains setting must return true if a settings file exists in the zip`() {
+        val settings = File.createTempFile("newpipe_", "")
+        `when`(fileLocator.settings).thenReturn(settings)
 
-            assertTrue(contains)
-        }
+        val zip = File(classloader.getResource("settings/newpipe.zip")?.file!!)
+        val contains = ContentSettingsManager(fileLocator).extractSettings(zip.path)
 
-        @Test
-        fun `Contain setting must return false, if a no settings file exists in the zip`() {
-            val contains = ContentSettingsManager(fileLocator).containSettings(emptyZip.path)
+        assertTrue(contains)
+    }
 
-            assertFalse(contains)
-        }
+    @Test
+    fun `Contains setting must return false if a no settings file exists in the zip`() {
+        val settings = File.createTempFile("newpipe_", "")
+        `when`(fileLocator.settings).thenReturn(settings)
 
-        @Test
-        fun `Preferences must be set from the settings file`() {
-            val preferences = Mockito.mock(SharedPreferences::class.java, withSettings().stubOnly())
-            val editor = Mockito.mock(SharedPreferences.Editor::class.java)
-            `when`(preferences.edit()).thenReturn(editor)
+        val emptyZip = File(classloader.getResource("settings/empty.zip")?.file!!)
+        val contains = ContentSettingsManager(fileLocator).extractSettings(emptyZip.path)
 
+        assertFalse(contains)
+    }
 
-            val manager = ContentSettingsManager(fileLocator)
-            manager.containSettings(zip.path)
-            manager.loadSharedPreferences(preferences)
+    @Test
+    fun `Preferences must be set from the settings file`() {
+        val settings = File(classloader.getResource("settings/newpipe.settings")!!.path)
+        `when`(fileLocator.settings).thenReturn(settings)
 
-            verify(editor, atLeastOnce()).putBoolean(anyString(), anyBoolean())
-        }
+        val preferences = Mockito.mock(SharedPreferences::class.java, withSettings().stubOnly())
+        val editor = Mockito.mock(SharedPreferences.Editor::class.java)
+        `when`(preferences.edit()).thenReturn(editor)
 
+        ContentSettingsManager(fileLocator).loadSharedPreferences(preferences)
 
+        verify(editor, atLeastOnce()).putBoolean(anyString(), anyBoolean())
+        verify(editor, atLeastOnce()).putString(anyString(), anyString())
+        verify(editor, atLeastOnce()).putInt(anyString(), anyInt())
     }
-
-
 }
diff --git a/app/src/test/resources/settings/newpipe.settings b/app/src/test/resources/settings/newpipe.settings
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..56e6c5d5dd53ba66b0144215b928f6137f67fc30 100644
GIT binary patch
literal 2445
zcmaJ@zi%8x7#-VjLL8FV`Qea26rcba><clGMFUBcC`KeiIHI7L%<X=6J9u|zJ@c*a
zjsk@S3R>tWC@AwsfT$@bXs8f9v`AFEZ+6$YOH59>lXiFZn>X*h?|t{^FSQuFTKUxM
znYEg2zINM$?2f4xkNp1A&#Mo9T~PD4)KczDddnp2{FXY(nWvDsJRMi>zNh5#VDub*
zAL4tR)oUR!Icat}?AFGUwuKqux74L$JFtmi>&mddYi`Qn+I8o0GUYEX`-i`M_wV2H
zYVH%YxM%X3#?>6F3)rzPNV`&-I<-y@Tv7);G`0-8>T|WASe>bZ>_TJU)PZP6@6bdZ
z9%l6-@Q$>=Kq2-vVM=x4N~V(AB`+la;Pq}zHOZra^+iNFU8ZtXU7<!nMW4J5_A}Cz
z3*C}KtWKC3CvU1u?N6oYgOn;alfFrIbYR1za~n9~2gGx^EiCK8^(_{rhK;TR5VJbl
zJb8QzM3%U}`ef0DBsmX&To_0lPuMa6-ja2a84qsAvzpUDT30AZ+Ei7CA23d(G%$6}
zLX^wl2#}->UAfw;Se;JYs1z#%U6?Ueu%DpT+pJEuT!Of|jCT)*Nnk2iU7A*1hui^(
zD=HDGC;QI&U<;BA$)Ec3`yc-K;;T*gV5{?iSIg0*(Jyyv5#Y;5-(EcS%^zRSD>bg*
zKDgjyR2nW|y=PN$t-8x{N_n#u6JT3b`v}iIK30IkWq}DhEse*!hq^MHv3f&jeP_L0
zxK2f#gT!>bw|>X%SqkfSX>`w4w9e{<j>^t8Q-p483ZdsB*vt+ynCUU$oh43)KX42h
z!4@eLKP2YDYl(LuXn0`c{EqGrcCQ_eRY9_--rYPe-2qm}mnLthiEbp{GPG*)96gee
zsdQQwl`V%;ws?k$m!pbO<pLC#hlS$)oI#?}*u1L(PoC`f6)?dJ+O5w$ZIO+cqQ_vP
z0ik8(y_8bP5L^w2lS~)HnM+%__AMIaYQlom>;ErW9c(hCS))im5}<OZheO1Lq*Yt~
ze1oECoc$aWtgIF{uWs~uXuQ6Mpj;9plGkfQptOf~c~@oTyot-5mmq250z5r~?YCx#
zS-{$ftGVvaB%8QJH|Y?GL0_-#p_`GQ2O~P&hDB+xL~<e!BT;YMzV^}f&HMV!huin{
z_Pv`owyu2u`^~_Q9X*Q*+ns5%X=FsA3_f-~hA~d}ytr7Bu;FcG|8j)s(A-<@@}z6o
z>2_^Pw<68fK2z8dISMv0Drk&AjoMs#>b9it&?BwVX2r$E{;3Vfb9jr!2~|;gdEOfJ
zRg-wLmebHAlWVyrlTL29au110>3z4cwz<}8C4S|ZE8h>UY!@zahID4Nlp3^hdvU(<
zG$8MR!&QWtmk5#u=!(flW)dW#+6HDd+uY5B6oU7g`vA$VNV({1Y1^Z4NS7l(@kHy2
zpk0{7RK@(2>B#D6b6HdytS;sTafKF5b%USEgn|Y=0qEttZ%)<e=6F+Qskt0cA0y)c
zw9TlH8iIBavnYm4bkWFirgvOw<uRZhkHbH$eH`Ct%*#D|x>w|ni~KpkK%laVjRSU^
zjkP0)wMJ5$@#E%1cYR0S!jG8J9etsl{&8xzDqo6d(dI)d@yix%W`<6)%&E>_<Np9|
CQeJcb

literal 0
HcmV?d00001


From af119db1d7b864b28bf43b500240d6b30b9229e1 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 16:35:30 +0100
Subject: [PATCH 026/131] Extract settings file deletion

---
 .../settings/ContentSettingsFragment.java     | 17 +---------------
 .../settings/ContentSettingsManager.kt        |  5 ++++-
 .../settings/ContentSettingsManagerTest.kt    | 20 +++++++++++++++++++
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 18d49b50740..c0639131c08 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -44,13 +44,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
     private ContentSettingsManager manager;
 
-    private File databasesDir;
-    private File newpipeDb;
-    private File newpipeDbJournal;
-    private File newpipeDbShm;
-    private File newpipeDbWal;
-    private File newpipeSettings;
-
     private String thumbnailLoadToggleKey;
     private String youtubeRestrictedModeEnabledKey;
 
@@ -115,16 +108,8 @@ public boolean onPreferenceTreeClick(final Preference preference) {
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
         final File homeDir = ContextCompat.getDataDir(requireContext());
-        databasesDir = new File(homeDir, "/databases");
-        newpipeDb = new File(homeDir, "/databases/newpipe.db");
-        newpipeDbJournal = new File(homeDir, "/databases/newpipe.db-journal");
-        newpipeDbShm = new File(homeDir, "/databases/newpipe.db-shm");
-        newpipeDbWal = new File(homeDir, "/databases/newpipe.db-wal");
-
-        newpipeSettings = new File(homeDir, "/databases/newpipe.settings");
-        newpipeSettings.delete();
-
         manager = new ContentSettingsManager(new NewPipeFileLocator(homeDir));
+        manager.deleteSettingsFile();
 
         addPreferencesFromResource(R.xml.content_settings);
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index bab29a30a99..d461ac61b8d 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -8,7 +8,6 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
-import java.util.zip.ZipFile
 import java.util.zip.ZipOutputStream
 
 class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
@@ -36,6 +35,10 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
             }
     }
 
+    fun deleteSettingsFile() {
+        fileLocator.settings.delete()
+    }
+
     /**
      * Tries to create database directory if it does not exist.
      *
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index 875ef758a79..088b7e1d120 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -65,6 +65,26 @@ class ContentSettingsManagerTest {
         }
     }
 
+    @Test
+    fun `Settings file must be deleted`() {
+        val settings = File.createTempFile("newpipe_", "")
+        `when`(fileLocator.settings).thenReturn(settings)
+
+        ContentSettingsManager(fileLocator).deleteSettingsFile()
+
+        assertFalse(settings.exists())
+    }
+
+    @Test
+    fun `Deleting settings file must do nothing if none exist`() {
+        val settings = File("non_existent")
+        `when`(fileLocator.settings).thenReturn(settings)
+
+        ContentSettingsManager(fileLocator).deleteSettingsFile()
+
+        assertFalse(settings.exists())
+    }
+
     @Test
     fun `The database must be extracted from the zip file`() {
         val db = File.createTempFile("newpipe_", "")

From fcfdcd1025a6fc005c11e82a0ace8a5fe3fba1a3 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 16:53:11 +0100
Subject: [PATCH 027/131] Fix ensureDbDirectoryExists

---
 .../settings/ContentSettingsManager.kt        |  3 +--
 .../settings/ContentSettingsManagerTest.kt    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index d461ac61b8d..49d35d984f4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -45,10 +45,9 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
      * @return Whether the directory exists afterwards.
      */
     fun ensureDbDirectoryExists(): Boolean {
-        return !fileLocator.dbDir.exists() && !fileLocator.dbDir.mkdir()
+        return fileLocator.dbDir.exists() || fileLocator.dbDir.mkdir()
     }
 
-
     fun extractDb(filePath: String): Boolean {
         val success = ZipHelper.extractFileFromZip(filePath, fileLocator.db.path, "newpipe.db")
         if (success) {
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index 088b7e1d120..a21ad7cb1f7 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -4,6 +4,7 @@ import android.content.SharedPreferences
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
+import org.junit.Assume
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -85,6 +86,25 @@ class ContentSettingsManagerTest {
         assertFalse(settings.exists())
     }
 
+    @Test
+    fun `Ensuring db directory existence must work`() {
+        val dir = Files.createTempDirectory("newpipe_").toFile()
+        Assume.assumeTrue(dir.delete())
+        `when`(fileLocator.dbDir).thenReturn(dir)
+
+        ContentSettingsManager(fileLocator).ensureDbDirectoryExists()
+        assertTrue(dir.exists())
+    }
+
+    @Test
+    fun `Ensuring db directory existence must work when the directory already exists`() {
+        val dir = Files.createTempDirectory("newpipe_").toFile()
+        `when`(fileLocator.dbDir).thenReturn(dir)
+
+        ContentSettingsManager(fileLocator).ensureDbDirectoryExists()
+        assertTrue(dir.exists())
+    }
+
     @Test
     fun `The database must be extracted from the zip file`() {
         val db = File.createTempFile("newpipe_", "")

From 716d79597050a24b315d5b384e744b4a3b47983b Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 19 Dec 2020 16:54:42 +0100
Subject: [PATCH 028/131] cleanup

---
 .../settings/ContentSettingsManager.kt        | 23 ++++++++++---------
 .../newpipe/settings/NewPipeFileLocator.kt    |  1 -
 .../settings/ContentSettingsManagerTest.kt    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 49d35d984f4..1730a230e04 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -19,19 +19,19 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
     @Throws(Exception::class)
     fun exportDatabase(preferences: SharedPreferences, outputPath: String) {
         ZipOutputStream(BufferedOutputStream(FileOutputStream(outputPath)))
-                .use { outZip ->
-                    ZipHelper.addFileToZip(outZip, fileLocator.db.path, "newpipe.db")
+            .use { outZip ->
+                ZipHelper.addFileToZip(outZip, fileLocator.db.path, "newpipe.db")
 
-                    try {
-                        ObjectOutputStream(FileOutputStream(fileLocator.settings)).use { output ->
-                            output.writeObject(preferences.all)
-                            output.flush()
-                        }
-                    } catch (e: IOException) {
-                        e.printStackTrace()
+                try {
+                    ObjectOutputStream(FileOutputStream(fileLocator.settings)).use { output ->
+                        output.writeObject(preferences.all)
+                        output.flush()
                     }
+                } catch (e: IOException) {
+                    e.printStackTrace()
+                }
 
-                    ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings")
+                ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings")
             }
     }
 
@@ -61,7 +61,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
 
     fun extractSettings(filePath: String): Boolean {
         return ZipHelper
-                .extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings")
+            .extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings")
     }
 
     fun loadSharedPreferences(preferences: SharedPreferences) {
@@ -70,6 +70,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
 
             ObjectInputStream(FileInputStream(fileLocator.settings)).use { input ->
                 preferenceEditor.clear()
+                @Suppress("UNCHECKED_CAST")
                 val entries = input.readObject() as Map<String, *>
                 for ((key, value) in entries) {
                     when (value) {
diff --git a/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt b/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt
index 1fe2fffa0d3..c2f93d15f0a 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt
@@ -18,5 +18,4 @@ class NewPipeFileLocator(private val homeDir: File) {
     val dbWal by lazy { File(homeDir, "/databases/newpipe.db-wal") }
 
     val settings by lazy { File(homeDir, "/databases/newpipe.settings") }
-
 }
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
index a21ad7cb1f7..3c59c29b35f 100644
--- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
@@ -10,9 +10,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.mockito.Mockito.anyString
 import org.mockito.Mockito.anyBoolean
 import org.mockito.Mockito.anyInt
+import org.mockito.Mockito.anyString
 import org.mockito.Mockito.atLeastOnce
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.withSettings

From 50a026183d56b379f9d0f20a8f420106a00aaae6 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 6 Jan 2021 14:48:34 +0100
Subject: [PATCH 029/131] Make Localization.relativeTime testable

Problem is global state in static variable prettyTime. But for performance reasons on Android that is preferred.
Now allow injecting prettyTime dependency by making init function public.
---
 app/src/main/java/org/schabi/newpipe/App.java | 37 ++++++++----------
 .../java/org/schabi/newpipe/MainActivity.java | 16 +++-----
 .../org/schabi/newpipe/util/Localization.java | 27 ++++++-------
 .../schabi/newpipe/util/LocalizationTest.kt   | 39 +++++++++++++++++++
 4 files changed, 73 insertions(+), 46 deletions(-)
 create mode 100644 app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 7e3466f678e..062a033e9b0 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -6,16 +6,26 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
-
 import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
-
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
+import io.reactivex.rxjava3.exceptions.UndeliverableException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import org.acra.ACRA;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.CoreConfiguration;
@@ -31,21 +41,6 @@
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.SocketException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.CompositeException;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
-import io.reactivex.rxjava3.exceptions.UndeliverableException;
-import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-
 /*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
  * App.java is part of NewPipe.
@@ -93,9 +88,9 @@ public void onCreate() {
         SettingsActivity.initSettings(this);
 
         NewPipe.init(getDownloader(),
-                Localization.getPreferredLocalization(this),
-                Localization.getPreferredContentCountry(this));
-        Localization.init(getApplicationContext());
+            Localization.getPreferredLocalization(this),
+            Localization.getPreferredContentCountry(this));
+        Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
 
         StateSaver.init(this);
         initNotificationChannels();
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 0c784e9d50a..1d1f87f6f61 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -20,6 +20,8 @@
 
 package org.schabi.newpipe;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -41,7 +43,6 @@
 import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.Spinner;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -52,9 +53,10 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
-
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.schabi.newpipe.databinding.ActivityMainBinding;
 import org.schabi.newpipe.databinding.DrawerHeaderBinding;
 import org.schabi.newpipe.databinding.DrawerLayoutBinding;
@@ -87,12 +89,6 @@
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
@@ -468,7 +464,7 @@ protected void onDestroy() {
     protected void onResume() {
         assureCorrectAppLanguage(this);
         // Change the date format to match the selected language on resume
-        Localization.init(getApplicationContext());
+        Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
         super.onResume();
 
         // Close drawer on return, and don't show animation,
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 978f558c46a..3fdab9a1288 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -9,19 +9,10 @@
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
 import androidx.preference.PreferenceManager;
-
-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 org.schabi.newpipe.ktx.OffsetDateTimeKt;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
@@ -33,6 +24,12 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
+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 org.schabi.newpipe.ktx.OffsetDateTimeKt;
 
 
 /*
@@ -62,10 +59,6 @@ public final class Localization {
 
     private Localization() { }
 
-    public static void init(final Context context) {
-        initPrettyTime(context);
-    }
-
     @NonNull
     public static String concatenateStrings(final String... strings) {
         return concatenateStrings(Arrays.asList(strings));
@@ -307,12 +300,16 @@ public static String localizeDuration(final Context context, final int durationI
     // Pretty Time
     //////////////////////////////////////////////////////////////////////////*/
 
-    private static void initPrettyTime(final Context context) {
-        prettyTime = new PrettyTime(getAppLocale(context));
+    public static void initPrettyTime(final PrettyTime time) {
+        prettyTime = time;
         // Do not use decades as YouTube doesn't either.
         prettyTime.removeUnit(Decade.class);
     }
 
+    public static PrettyTime resolvePrettyTime(final Context context) {
+        return new PrettyTime(getAppLocale(context));
+    }
+
     public static String relativeTime(final OffsetDateTime offsetDateTime) {
         return relativeTime(OffsetDateTimeKt.toCalendar(offsetDateTime));
     }
diff --git a/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt b/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt
new file mode 100644
index 00000000000..d0a8e7a404a
--- /dev/null
+++ b/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt
@@ -0,0 +1,39 @@
+package org.schabi.newpipe.util
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.ocpsoft.prettytime.PrettyTime
+import java.text.SimpleDateFormat
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.util.GregorianCalendar
+import java.util.Locale
+
+class LocalizationTest {
+
+    @Test
+    fun `After initializing pretty time relativeTime() with a Calendar must work`() {
+        val reference = SimpleDateFormat("yyyy/MM/dd").parse("2021/1/1")
+        Localization.initPrettyTime(PrettyTime(reference, Locale.ENGLISH))
+
+        val actual = Localization.relativeTime(GregorianCalendar(2021, 1, 6))
+
+        assertEquals("1 month from now", actual)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun `relativeTime() must fail without initializing pretty time`() {
+        Localization.relativeTime(GregorianCalendar(2021, 1, 6))
+    }
+
+    @Test
+    fun `relativeTime() with a OffsetDateTime must work`() {
+        val reference = SimpleDateFormat("yyyy/MM/dd").parse("2021/1/1")
+        Localization.initPrettyTime(PrettyTime(reference, Locale.ENGLISH))
+
+        val offset = OffsetDateTime.of(2021, 1, 6, 0, 0, 0, 0, ZoneOffset.UTC)
+        val actual = Localization.relativeTime(offset)
+
+        assertEquals("5 days from now", actual)
+    }
+}

From 907106156fa2887e1714a0c8ff25e326e67433c4 Mon Sep 17 00:00:00 2001
From: Mikhail Barashkov <git@mbarashkov.email>
Date: Fri, 1 Jan 2021 23:23:59 +0200
Subject: [PATCH 030/131] When in Fullscreen playback mode, toggle play/pause
 with the hardware Space button.

---
 .../schabi/newpipe/fragments/detail/VideoDetailFragment.java | 2 ++
 .../main/java/org/schabi/newpipe/player/VideoPlayerImpl.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 470de3aa940..aeb51f63adb 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1891,8 +1891,10 @@ public void onFullscreenStateChanged(final boolean fullscreen) {
 
         if (fullscreen) {
             hideSystemUiIfNeeded();
+            viewPager.setVisibility(View.GONE);
         } else {
             showSystemUi();
+            viewPager.setVisibility(View.VISIBLE);
         }
 
         if (relatedStreamsLayout != null) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index 06cbcd780ee..10887790b80 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -505,6 +505,11 @@ public boolean onKeyDown(final int keyCode) {
         switch (keyCode) {
             default:
                 break;
+            case KeyEvent.KEYCODE_SPACE:
+                if (isFullscreen) {
+                    onPlayPause();
+                }
+                break;
             case KeyEvent.KEYCODE_BACK:
                 if (DeviceUtils.isTv(service) && isControlsVisible()) {
                     hideControls(0, 0);

From 0ff7170ab18cef623a281a3beb1984e6f4bc60e4 Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Sat, 9 Jan 2021 18:39:43 +0300
Subject: [PATCH 031/131] Update settings_keys.xml

Changed the Somali language name from Af-Soomaali to Soomaali which is common and more user friendly when users are looking for Somali language in the list (since they aren't expecting it starts with A as in Af-Soomaali).
I contributed the language to the project on Weblate and I think this is name is better.
---
 app/src/main/res/values/settings_keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 44e75c10cab..e9d951520dc 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -1145,7 +1145,7 @@
         <item>sardu</item>
         <item>Slovenčina</item>
         <item>Slovenščina</item>
-        <item>Af Soomaali</item>
+        <item>Soomaali</item>
         <item>Shqip</item>
         <item>Српски</item>
         <item>Svenska</item>

From 43e4dc817034bbf6df6eb43ff09083539e960eac Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sun, 10 Jan 2021 15:54:01 +0100
Subject: [PATCH 032/131] update extractor version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9fb9cf85fe7..f2c84644251 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:deb9af7bf53b3f8fd9d32322adae02df78d985ea'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:2d93b237236b8dce98943fd5dced9b8e645a2e0a'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From 486e720e00a6c589997821529f0e77967b6598d7 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 21 Nov 2020 15:15:42 +0530
Subject: [PATCH 033/131] Rewrite ExceptionUtils methods as extension
 functions.

---
 app/src/main/java/org/schabi/newpipe/App.java |  2 +-
 .../newpipe/fragments/BaseStateFragment.java  |  2 +-
 .../fragments/list/search/SearchFragment.java |  2 +-
 .../java/org/schabi/newpipe/ktx/Throwable.kt  | 65 ++++++++++++++
 .../local/feed/service/FeedLoadService.kt     |  4 +-
 .../services/BaseImportExportService.java     |  2 +-
 .../services/SubscriptionsImportService.java  |  2 +-
 .../org/schabi/newpipe/util/ExceptionUtils.kt | 86 -------------------
 .../schabi/newpipe/util/ExtractorHelper.java  |  1 +
 .../newpipe/ktx/ThrowableExtensionsTest.kt    | 67 +++++++++++++++
 .../schabi/newpipe/util/ExceptionUtilsTest.kt | 69 ---------------
 11 files changed, 140 insertions(+), 162 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt
 create mode 100644 app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt
 delete mode 100644 app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 7e3466f678e..ea6c23028db 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -22,11 +22,11 @@
 import org.acra.config.CoreConfigurationBuilder;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.downloader.Downloader;
+import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.SettingsActivity;
-import org.schabi.newpipe.util.ExceptionUtils;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
index 0d25765a483..9f1f5799879 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -22,10 +22,10 @@
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.ExceptionUtils;
 import org.schabi.newpipe.util.InfoCache;
 
 import java.util.Collections;
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 3b48d9c84a8..fb05ed51cf0 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
@@ -50,6 +50,7 @@
 import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
+import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
@@ -57,7 +58,6 @@
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
-import org.schabi.newpipe.util.ExceptionUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
diff --git a/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt b/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt
new file mode 100644
index 00000000000..e05a55f3f0f
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt
@@ -0,0 +1,65 @@
+@file:JvmName("ExceptionUtils")
+
+package org.schabi.newpipe.ktx
+
+import java.io.IOException
+import java.io.InterruptedIOException
+
+/**
+ * @return if throwable is related to Interrupted exceptions, or one of its causes is.
+ */
+val Throwable.isInterruptedCaused: Boolean
+    get() = hasExactCause(InterruptedIOException::class.java, InterruptedException::class.java)
+
+/**
+ * @return if throwable is related to network issues, or one of its causes is.
+ */
+val Throwable.isNetworkRelated: Boolean
+    get() = hasAssignableCause(IOException::class.java)
+
+/**
+ * Calls [hasCause] with the `checkSubtypes` parameter set to false.
+ */
+fun Throwable.hasExactCause(vararg causesToCheck: Class<*>) = hasCause(false, *causesToCheck)
+
+/**
+ * Calls [hasCause] with the `checkSubtypes` parameter set to true.
+ */
+fun Throwable?.hasAssignableCause(vararg causesToCheck: Class<*>) = hasCause(true, *causesToCheck)
+
+/**
+ * Check if the throwable has some cause from the causes to check, or is itself in it.
+ *
+ * If `checkIfAssignable` is true, not only the exact type will be considered equals, but also its subtypes.
+ *
+ * @param checkSubtypes if subtypes are also checked.
+ * @param causesToCheck an array of causes to check.
+ *
+ * @see Class.isAssignableFrom
+ */
+tailrec fun Throwable?.hasCause(checkSubtypes: Boolean, vararg causesToCheck: Class<*>): Boolean {
+    if (this == null) {
+        return false
+    }
+
+    // Check if throwable is a subtype of any of the causes to check
+    causesToCheck.forEach { causeClass ->
+        if (checkSubtypes) {
+            if (causeClass.isAssignableFrom(this.javaClass)) {
+                return true
+            }
+        } else {
+            if (causeClass == this.javaClass) {
+                return true
+            }
+        }
+    }
+
+    val currentCause: Throwable? = cause
+    // Check if cause is not pointing to the same instance, to avoid infinite loops.
+    if (this !== currentCause) {
+        return currentCause.hasCause(checkSubtypes, *causesToCheck)
+    }
+
+    return false
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
index 45e8855e736..5ed7998d260 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
@@ -50,13 +50,13 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.extractor.ListInfo
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
+import org.schabi.newpipe.ktx.isNetworkRelated
 import org.schabi.newpipe.local.feed.FeedDatabaseManager
 import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ErrorResultEvent
 import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ProgressEvent
 import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.SuccessResultEvent
 import org.schabi.newpipe.local.feed.service.FeedEventManager.postEvent
 import org.schabi.newpipe.local.subscription.SubscriptionManager
-import org.schabi.newpipe.util.ExceptionUtils
 import org.schabi.newpipe.util.ExtractorHelper
 import java.io.IOException
 import java.time.OffsetDateTime
@@ -344,7 +344,7 @@ class FeedLoadService : Service() {
 
                     error is IOException -> throw error
                     cause is IOException -> throw cause
-                    ExceptionUtils.isNetworkRelated(error) -> throw IOException(error)
+                    error.isNetworkRelated -> throw IOException(error)
                 }
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
index 34543b56587..f573f4679a1 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
@@ -36,11 +36,11 @@
 import org.reactivestreams.Publisher;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
+import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.ExceptionUtils;
 
 import java.io.FileNotFoundException;
 import java.util.Collections;
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
index 90d0afe377b..af94934b251 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
@@ -35,8 +35,8 @@
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.subscription.SubscriptionItem;
+import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.ExceptionUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt b/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt
deleted file mode 100644
index 0addb26fb91..00000000000
--- a/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.schabi.newpipe.util
-
-import java.io.IOException
-import java.io.InterruptedIOException
-
-class ExceptionUtils {
-    companion object {
-        /**
-         * @return if throwable is related to Interrupted exceptions, or one of its causes is.
-         */
-        @JvmStatic
-        fun isInterruptedCaused(throwable: Throwable): Boolean {
-            return hasExactCause(
-                throwable,
-                InterruptedIOException::class.java,
-                InterruptedException::class.java
-            )
-        }
-
-        /**
-         * @return if throwable is related to network issues, or one of its causes is.
-         */
-        @JvmStatic
-        fun isNetworkRelated(throwable: Throwable): Boolean {
-            return hasAssignableCause(
-                throwable,
-                IOException::class.java
-            )
-        }
-
-        /**
-         * Calls [hasCause] with the `checkSubtypes` parameter set to false.
-         */
-        @JvmStatic
-        fun hasExactCause(throwable: Throwable, vararg causesToCheck: Class<*>): Boolean {
-            return hasCause(throwable, false, *causesToCheck)
-        }
-
-        /**
-         * Calls [hasCause] with the `checkSubtypes` parameter set to true.
-         */
-        @JvmStatic
-        fun hasAssignableCause(throwable: Throwable?, vararg causesToCheck: Class<*>): Boolean {
-            return hasCause(throwable, true, *causesToCheck)
-        }
-
-        /**
-         * Check if throwable has some cause from the causes to check, or is itself in it.
-         *
-         * If `checkIfAssignable` is true, not only the exact type will be considered equals, but also its subtypes.
-         *
-         * @param throwable throwable that will be checked.
-         * @param checkSubtypes if subtypes are also checked.
-         * @param causesToCheck an array of causes to check.
-         *
-         * @see Class.isAssignableFrom
-         */
-        @JvmStatic
-        tailrec fun hasCause(throwable: Throwable?, checkSubtypes: Boolean, vararg causesToCheck: Class<*>): Boolean {
-            if (throwable == null) {
-                return false
-            }
-
-            // Check if throwable is a subtype of any of the causes to check
-            causesToCheck.forEach { causeClass ->
-                if (checkSubtypes) {
-                    if (causeClass.isAssignableFrom(throwable.javaClass)) {
-                        return true
-                    }
-                } else {
-                    if (causeClass == throwable.javaClass) {
-                        return true
-                    }
-                }
-            }
-
-            val currentCause: Throwable? = throwable.cause
-            // Check if cause is not pointing to the same instance, to avoid infinite loops.
-            if (throwable !== currentCause) {
-                return hasCause(currentCause, checkSubtypes, *causesToCheck)
-            }
-
-            return false
-        }
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index 1f1b945452a..103d9a72b95 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -58,6 +58,7 @@
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
+import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
diff --git a/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt b/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt
new file mode 100644
index 00000000000..8132b8fbc33
--- /dev/null
+++ b/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt
@@ -0,0 +1,67 @@
+package org.schabi.newpipe.ktx
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.io.IOException
+import java.io.InterruptedIOException
+import java.net.SocketException
+import javax.net.ssl.SSLException
+
+class ThrowableExtensionsTest {
+    @Test fun `assignable causes`() {
+        assertTrue(Throwable().hasAssignableCause(Throwable::class.java))
+        assertTrue(Exception().hasAssignableCause(Exception::class.java))
+        assertTrue(IOException().hasAssignableCause(Exception::class.java))
+
+        assertTrue(IOException().hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(SocketException()).hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException()).hasAssignableCause(RuntimeException::class.java))
+        assertTrue(Exception(Exception(IOException())).hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(IOException()))).hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(SocketException()))).hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(SSLException("IO")))).hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(RuntimeException::class.java))
+
+        assertTrue(IllegalStateException().hasAssignableCause(Throwable::class.java))
+        assertTrue(IllegalStateException().hasAssignableCause(Exception::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(InterruptedIOException::class.java))
+    }
+
+    @Test fun `no assignable causes`() {
+        assertFalse(Throwable().hasAssignableCause(Exception::class.java))
+        assertFalse(Exception().hasAssignableCause(IOException::class.java))
+        assertFalse(Exception(IllegalStateException()).hasAssignableCause(IOException::class.java))
+        assertFalse(Exception(NullPointerException()).hasAssignableCause(IOException::class.java))
+        assertFalse(Exception(IllegalStateException(Exception(Exception()))).hasAssignableCause(IOException::class.java))
+        assertFalse(Exception(IllegalStateException(Exception(SocketException()))).hasAssignableCause(InterruptedIOException::class.java))
+        assertFalse(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(InterruptedException::class.java))
+    }
+
+    @Test fun `exact causes`() {
+        assertTrue(Throwable().hasExactCause(Throwable::class.java))
+        assertTrue(Exception().hasExactCause(Exception::class.java))
+
+        assertTrue(IOException().hasExactCause(IOException::class.java))
+        assertTrue(Exception(SocketException()).hasExactCause(SocketException::class.java))
+        assertTrue(Exception(Exception(IOException())).hasExactCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(IOException()))).hasExactCause(IOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(SocketException()))).hasExactCause(SocketException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(SSLException("IO")))).hasExactCause(SSLException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause(InterruptedIOException::class.java))
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause(IllegalStateException::class.java))
+    }
+
+    @Test fun `no exact causes`() {
+        assertFalse(Throwable().hasExactCause(Exception::class.java))
+        assertFalse(Exception().hasExactCause(Throwable::class.java))
+
+        assertFalse(SocketException().hasExactCause(IOException::class.java))
+        assertFalse(IllegalStateException().hasExactCause(RuntimeException::class.java))
+        assertFalse(Exception(SocketException()).hasExactCause(IOException::class.java))
+        assertFalse(Exception(IllegalStateException(Exception(IOException()))).hasExactCause(RuntimeException::class.java))
+        assertFalse(Exception(IllegalStateException(Exception(SocketException()))).hasExactCause(IOException::class.java))
+        assertFalse(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause(IOException::class.java))
+    }
+}
diff --git a/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt b/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt
deleted file mode 100644
index 2d897e37931..00000000000
--- a/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.schabi.newpipe.util
-
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.schabi.newpipe.util.ExceptionUtils.Companion.hasAssignableCause
-import org.schabi.newpipe.util.ExceptionUtils.Companion.hasExactCause
-import java.io.IOException
-import java.io.InterruptedIOException
-import java.net.SocketException
-import javax.net.ssl.SSLException
-
-class ExceptionUtilsTest {
-    @Test fun `assignable causes`() {
-        assertTrue(hasAssignableCause(Throwable(), Throwable::class.java))
-        assertTrue(hasAssignableCause(Exception(), Exception::class.java))
-        assertTrue(hasAssignableCause(IOException(), Exception::class.java))
-
-        assertTrue(hasAssignableCause(IOException(), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(SocketException()), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException()), RuntimeException::class.java))
-        assertTrue(hasAssignableCause(Exception(Exception(IOException())), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException(Exception(IOException()))), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException(Exception(SocketException()))), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException(Exception(SSLException("IO")))), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), IOException::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), RuntimeException::class.java))
-
-        assertTrue(hasAssignableCause(IllegalStateException(), Throwable::class.java))
-        assertTrue(hasAssignableCause(IllegalStateException(), Exception::class.java))
-        assertTrue(hasAssignableCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), InterruptedIOException::class.java))
-    }
-
-    @Test fun `no assignable causes`() {
-        assertFalse(hasAssignableCause(Throwable(), Exception::class.java))
-        assertFalse(hasAssignableCause(Exception(), IOException::class.java))
-        assertFalse(hasAssignableCause(Exception(IllegalStateException()), IOException::class.java))
-        assertFalse(hasAssignableCause(Exception(NullPointerException()), IOException::class.java))
-        assertFalse(hasAssignableCause(Exception(IllegalStateException(Exception(Exception()))), IOException::class.java))
-        assertFalse(hasAssignableCause(Exception(IllegalStateException(Exception(SocketException()))), InterruptedIOException::class.java))
-        assertFalse(hasAssignableCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), InterruptedException::class.java))
-    }
-
-    @Test fun `exact causes`() {
-        assertTrue(hasExactCause(Throwable(), Throwable::class.java))
-        assertTrue(hasExactCause(Exception(), Exception::class.java))
-
-        assertTrue(hasExactCause(IOException(), IOException::class.java))
-        assertTrue(hasExactCause(Exception(SocketException()), SocketException::class.java))
-        assertTrue(hasExactCause(Exception(Exception(IOException())), IOException::class.java))
-        assertTrue(hasExactCause(Exception(IllegalStateException(Exception(IOException()))), IOException::class.java))
-        assertTrue(hasExactCause(Exception(IllegalStateException(Exception(SocketException()))), SocketException::class.java))
-        assertTrue(hasExactCause(Exception(IllegalStateException(Exception(SSLException("IO")))), SSLException::class.java))
-        assertTrue(hasExactCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), InterruptedIOException::class.java))
-        assertTrue(hasExactCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), IllegalStateException::class.java))
-    }
-
-    @Test fun `no exact causes`() {
-        assertFalse(hasExactCause(Throwable(), Exception::class.java))
-        assertFalse(hasExactCause(Exception(), Throwable::class.java))
-
-        assertFalse(hasExactCause(SocketException(), IOException::class.java))
-        assertFalse(hasExactCause(IllegalStateException(), RuntimeException::class.java))
-        assertFalse(hasExactCause(Exception(SocketException()), IOException::class.java))
-        assertFalse(hasExactCause(Exception(IllegalStateException(Exception(IOException()))), RuntimeException::class.java))
-        assertFalse(hasExactCause(Exception(IllegalStateException(Exception(SocketException()))), IOException::class.java))
-        assertFalse(hasExactCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), IOException::class.java))
-    }
-}

From 50dcf308a266296c92be92e7186299eac20f46d9 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 15 Dec 2020 16:45:34 +0530
Subject: [PATCH 034/131] Add extension functions that accept reified types.

---
 .../java/org/schabi/newpipe/ktx/Throwable.kt  | 12 ++-
 .../newpipe/ktx/ThrowableExtensionsTest.kt    | 80 +++++++++----------
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt b/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt
index e05a55f3f0f..b95f46fd409 100644
--- a/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt
+++ b/app/src/main/java/org/schabi/newpipe/ktx/Throwable.kt
@@ -15,18 +15,28 @@ val Throwable.isInterruptedCaused: Boolean
  * @return if throwable is related to network issues, or one of its causes is.
  */
 val Throwable.isNetworkRelated: Boolean
-    get() = hasAssignableCause(IOException::class.java)
+    get() = hasAssignableCause<IOException>()
 
 /**
  * Calls [hasCause] with the `checkSubtypes` parameter set to false.
  */
 fun Throwable.hasExactCause(vararg causesToCheck: Class<*>) = hasCause(false, *causesToCheck)
 
+/**
+ * Calls [hasCause] with a reified [Throwable] type.
+ */
+inline fun <reified T : Throwable> Throwable.hasExactCause() = hasExactCause(T::class.java)
+
 /**
  * Calls [hasCause] with the `checkSubtypes` parameter set to true.
  */
 fun Throwable?.hasAssignableCause(vararg causesToCheck: Class<*>) = hasCause(true, *causesToCheck)
 
+/**
+ * Calls [hasCause] with a reified [Throwable] type.
+ */
+inline fun <reified T : Throwable> Throwable?.hasAssignableCause() = hasAssignableCause(T::class.java)
+
 /**
  * Check if the throwable has some cause from the causes to check, or is itself in it.
  *
diff --git a/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt b/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt
index 8132b8fbc33..ca2d04c85f2 100644
--- a/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/ktx/ThrowableExtensionsTest.kt
@@ -10,58 +10,58 @@ import javax.net.ssl.SSLException
 
 class ThrowableExtensionsTest {
     @Test fun `assignable causes`() {
-        assertTrue(Throwable().hasAssignableCause(Throwable::class.java))
-        assertTrue(Exception().hasAssignableCause(Exception::class.java))
-        assertTrue(IOException().hasAssignableCause(Exception::class.java))
+        assertTrue(Throwable().hasAssignableCause<Throwable>())
+        assertTrue(Exception().hasAssignableCause<Exception>())
+        assertTrue(IOException().hasAssignableCause<Exception>())
 
-        assertTrue(IOException().hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(SocketException()).hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException()).hasAssignableCause(RuntimeException::class.java))
-        assertTrue(Exception(Exception(IOException())).hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(IOException()))).hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(SocketException()))).hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(SSLException("IO")))).hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(RuntimeException::class.java))
+        assertTrue(IOException().hasAssignableCause<IOException>())
+        assertTrue(Exception(SocketException()).hasAssignableCause<IOException>())
+        assertTrue(Exception(IllegalStateException()).hasAssignableCause<RuntimeException>())
+        assertTrue(Exception(Exception(IOException())).hasAssignableCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(IOException()))).hasAssignableCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(SocketException()))).hasAssignableCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(SSLException("IO")))).hasAssignableCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause<RuntimeException>())
 
-        assertTrue(IllegalStateException().hasAssignableCause(Throwable::class.java))
-        assertTrue(IllegalStateException().hasAssignableCause(Exception::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(InterruptedIOException::class.java))
+        assertTrue(IllegalStateException().hasAssignableCause<Throwable>())
+        assertTrue(IllegalStateException().hasAssignableCause<Exception>())
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause<InterruptedIOException>())
     }
 
     @Test fun `no assignable causes`() {
-        assertFalse(Throwable().hasAssignableCause(Exception::class.java))
-        assertFalse(Exception().hasAssignableCause(IOException::class.java))
-        assertFalse(Exception(IllegalStateException()).hasAssignableCause(IOException::class.java))
-        assertFalse(Exception(NullPointerException()).hasAssignableCause(IOException::class.java))
-        assertFalse(Exception(IllegalStateException(Exception(Exception()))).hasAssignableCause(IOException::class.java))
-        assertFalse(Exception(IllegalStateException(Exception(SocketException()))).hasAssignableCause(InterruptedIOException::class.java))
-        assertFalse(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause(InterruptedException::class.java))
+        assertFalse(Throwable().hasAssignableCause<Exception>())
+        assertFalse(Exception().hasAssignableCause<IOException>())
+        assertFalse(Exception(IllegalStateException()).hasAssignableCause<IOException>())
+        assertFalse(Exception(NullPointerException()).hasAssignableCause<IOException>())
+        assertFalse(Exception(IllegalStateException(Exception(Exception()))).hasAssignableCause<IOException>())
+        assertFalse(Exception(IllegalStateException(Exception(SocketException()))).hasAssignableCause<InterruptedIOException>())
+        assertFalse(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasAssignableCause<InterruptedException>())
     }
 
     @Test fun `exact causes`() {
-        assertTrue(Throwable().hasExactCause(Throwable::class.java))
-        assertTrue(Exception().hasExactCause(Exception::class.java))
+        assertTrue(Throwable().hasExactCause<Throwable>())
+        assertTrue(Exception().hasExactCause<Exception>())
 
-        assertTrue(IOException().hasExactCause(IOException::class.java))
-        assertTrue(Exception(SocketException()).hasExactCause(SocketException::class.java))
-        assertTrue(Exception(Exception(IOException())).hasExactCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(IOException()))).hasExactCause(IOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(SocketException()))).hasExactCause(SocketException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(SSLException("IO")))).hasExactCause(SSLException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause(InterruptedIOException::class.java))
-        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause(IllegalStateException::class.java))
+        assertTrue(IOException().hasExactCause<IOException>())
+        assertTrue(Exception(SocketException()).hasExactCause<SocketException>())
+        assertTrue(Exception(Exception(IOException())).hasExactCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(IOException()))).hasExactCause<IOException>())
+        assertTrue(Exception(IllegalStateException(Exception(SocketException()))).hasExactCause<SocketException>())
+        assertTrue(Exception(IllegalStateException(Exception(SSLException("IO")))).hasExactCause<SSLException>())
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause<InterruptedIOException>())
+        assertTrue(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause<IllegalStateException>())
     }
 
     @Test fun `no exact causes`() {
-        assertFalse(Throwable().hasExactCause(Exception::class.java))
-        assertFalse(Exception().hasExactCause(Throwable::class.java))
+        assertFalse(Throwable().hasExactCause<Exception>())
+        assertFalse(Exception().hasExactCause<Throwable>())
 
-        assertFalse(SocketException().hasExactCause(IOException::class.java))
-        assertFalse(IllegalStateException().hasExactCause(RuntimeException::class.java))
-        assertFalse(Exception(SocketException()).hasExactCause(IOException::class.java))
-        assertFalse(Exception(IllegalStateException(Exception(IOException()))).hasExactCause(RuntimeException::class.java))
-        assertFalse(Exception(IllegalStateException(Exception(SocketException()))).hasExactCause(IOException::class.java))
-        assertFalse(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause(IOException::class.java))
+        assertFalse(SocketException().hasExactCause<IOException>())
+        assertFalse(IllegalStateException().hasExactCause<RuntimeException>())
+        assertFalse(Exception(SocketException()).hasExactCause<IOException>())
+        assertFalse(Exception(IllegalStateException(Exception(IOException()))).hasExactCause<RuntimeException>())
+        assertFalse(Exception(IllegalStateException(Exception(SocketException()))).hasExactCause<IOException>())
+        assertFalse(Exception(IllegalStateException(Exception(InterruptedIOException()))).hasExactCause<IOException>())
     }
 }

From fee1fed0a160a26af3f98f1a565ae4ee41bc072f Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Tue, 12 Jan 2021 15:16:54 +0300
Subject: [PATCH 035/131] Created Somali Readme (#5383)

* Created Somali Readme
---
 README.so.md | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 README.so.md

diff --git a/README.so.md b/README.so.md
new file mode 100644
index 00000000000..adbeafc37e9
--- /dev/null
+++ b/README.so.md
@@ -0,0 +1,136 @@
+<p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
+<h2 align="center"><b>NewPipe</b></h2>
+<h4 align="center">App bilaash ah oo fudud looguna talagalay in aaladaha nidaamka Android-ka ku shaqeeya wax loogu daawado.</h4>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
+
+<p align="center">
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="Siidaynta GitHub "><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="Laysinka: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Darajada Dhismaha"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
+<a href="https://hosted.weblate.org/engage/newpipe/" alt="Heerka Turjimaada"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="Kanaalka IRC: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Kuwa Bountysource "><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
+</p>
+<hr>
+<p align="center"><a href="#screenshots">Sawir-shaashadeed</a> &bull; <a href="#description">Faahfaahin</a> &bull; <a href="#features">Waxqabadka</a> &bull; <a href="#updates">Cusboonaysiin</a> &bull; <a href="#contribution">Kusoo Kordhin</a> &bull; <a href="#donate">Ugu Deeq</a> &bull; <a href="#license">Laysinka</a></p>
+<p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
+<hr>
+
+*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md).*
+
+<b>DIGNIIN: MIDKAN [NOOCA APP-KA EE HADDA] WALI TIJAABO AYUU KU JIRAA (BETA), SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
+
+<b>NEWPIPE AMA KUWA KU SALAYSAN PLAYSTORE-KA IN LA GALIYO WAXAY KA HOR IMANAYSAA SHARCIGA IYO SHURUUDAHA AY LEEYIHIIN.</b>
+
+## Sawir-shaashadeed
+
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
+
+## Faahfaahin
+
+NewPipe ma isticmalo nidaamka wada shaqaynta Google, ama API-ga YouTube. Kaliya website-yada ayaa la furaa si xogta loo baahanyahay loogala soo dhex baxo, App-kan waxaa lagu isticmaali karaa aaladaha aysa ku jirin Adeegyada Google. Sidoo kale, uma baahnid akoon YouTube ah si aad u isticmaasho NewPipe, kaasoo ah barnaamij bilaash ah.
+
+### Waxqabadka
+
+* Raadi muuqaalo
+* Soo bandhiga faahfaahin guud oo muuqaalada ku saabsan
+* Ku daawo muuqaalada YouTube
+* Dhagayso muuqaalada YouTube
+* Qaab daaqad ah (muuqaal daare yar oo application-nada dul fuula)
+* Dooro muuqaal daareha aad rabto inaad wax ku daawato
+* Daji muuqaalada
+* Daji dhagaysiga kaliya (cod)
+* Ku fur muuqaal Kodi
+* Tus muuqaalada ka xiga/kuwa lamidka ah
+* Inaad luuqada aad rabto wax kaga dhex raadiso YouTube
+* Daawo/xanib muuqaalada da'da ku xidhan
+* Soo bandhig xog guud oo ku saabsan kanaalada
+* Raadi kanaalo
+* Daawo muuqaalada kanaal
+* Taageerida Orbot/Tor (wali toos ma aha)
+* Taageerida muuqaalada 1080p/2K/4K 
+* Kaydka wixii hore [aad u daawatay]
+* Inaad rukumato kanaalada
+* Kaydinta waxaad raadisay
+* Raadi/daawo xulalka
+* U daawo sidii xulal la horay
+* Hormo gali muuqaalada
+* Xulal gudaha [aalada] ah
+* Qoraal-hooseed
+* Taageerida waxyaabaha tooska ah
+* Soo bandhiga faalooyinka
+
+### Adeegyada la Taageero
+
+NewPipe wuxuu taageeraa adeegyo badan. [warqadan](https://teamnewpipe.github.io/documentation/) ayaa si faahfaahsan u sharaxaysa sida adeeg cusub loogu soo dari lahaa iyo kala fur-furaha. Fadlan nala soo xidhiidh hadaad rabto inaad mid cusub kusoo darto. Adeegyada aan hadda taageero waxaa kamid ah:
+
+* YouTube
+* SoundCloud \[tijaabo\]
+* media.ccc.de \[tijaabo\]
+* PeerTube instances \[tijaabo\]
+
+## Cusboonaysiin
+Marka koodhka NewPipe isbadal ku dhaco (wax cusub oo lagusoo kordhiyay ama cilad bixin), ugu dambayn waxaa lasii daayaa mid cusub (Siidayn). Siidaynta qaabkeedu waa x.xx.x . Si aad midka cusub u hesho, waxaad samayn kartaa:
+ 1. Inaad mid cusub (APK) adigu dhisato. Tani waa mida ugu dagdag badan eed waxyaabaha cusub ku heli karto, laakiin way adagtahay, sidaa darteed waxaan soojeedinaynaa inaad isticmaasho qababka kale.
+ 2. Ku dar qayb gaar ah xaganaga F-Droid oo xagaas kaga shub isla markay siidayn soobaxdo. Hagitaanka xagan ka eeg: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
+ 3. Kasoo dajiso APK-ga xaga [Siidaynta Github](https://github.com/TeamNewPipe/NewPipe/releases) oo ku shubo isla markay siidayn soobaxdo.
+ 4. Ka cusboonaysii xaga F-Droid. Tani waa mida ugu daahitaanka badan, sababtoo ah F-Droid waxay fiirin isbadalka waxayna iyadu dhisi mid (app), sixiixi, kadibna ay cusboonaysiinta usiidayn isticmaalayaasha.
+
+Waxaan usoojeedinaynaa isticmaaalka qaabka 2 dadka badankood. APK-yada loogu shubo qaabka 2 ama 3 way isqaadan karaan, laakiin isma qaadan karaan kuwa loogu shubay qaabka 4. Sababtuna waxaa weeye furaha sixiixa oo iskumid ah (kaanaga weeye) oo loo isticmaalay 2 iyo 3, laakiin furo sixiixeed ka duwan (midka F-Droid) oo loo isticmaalay 4. Dhisida APK ayadoo la isticmaalayo qaabka 1 waxay gabi ahaanba ka reebtaa wax fure ah. Furayaasha sixiixa waxay xaqiijiyaan in isticmaalaha aan lagu khaldin inuu ku shubto cusboonaysiin khalad ah (wax lasoo dhexraaciyay) app-ka.
+
+Waxaa kale, hadaad rabto inaad tixraacayada kala badasho sabab jirta awgeed (tusaale shaqaynta aasaasiga ah ee NewPipe ayaa khalkhashay F-Droid-na wali cusboonysiin ma hayo), waxaan soojeedinaynaa isticmaalka qaabkan:
+1. Xogtaada koobi ka samee adoo raacaya Fadhiga > Luuqada & Fadhiga Kale > Gudbi Xog Diyaaran si aysa kaaga bixin kaydka wixii hore, rukunka, iyo xulalka
+2. Saar NewPipe
+3. Kasoo daji APK-ga tixraaca cusub oo ku shub
+4. Kasoo gali xogta talaabada 1 xaga Fadhiga > Luuqada & Fadhiga Kale >  Soo Gali Xog Kaydsan
+
+## Kusoo Kordhin
+Hadaad hayso fikrado; rogid, qaab badal, nadiifin koodh, ama koodhka ood si wayn wax oga badashaa—caawinta marwalba waa lasoo dhawaynayaa. Waxbadan hadii la qabto waxbadan ayaa fiicnaan!
+
+Hadaad jeceshahay inaad qayb ka noqoto, fiiri [ogaysiisyada kusoo kordhinta](.github/CONTRIBUTING.md).
+
+<a href="https://hosted.weblate.org/engage/newpipe/">
+<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="Translation status" />
+</a>
+
+## Ugu Deeq
+Hadaad jeceshahay NewPipe waan ku faraxsanaan lahayn deeq. Waxaad soo diri kartaa bitcoin ama sidoo kale waxaad deeqda kusoo diri kartaa xaga Bountysource ama Liberapay. Faahfaahin dheeraad ah oo kusaabsan ugu deeqida NewPipe, fadlan booqo [website-kanaga](https://newpipe.net/donate).
+
+<table>
+  <tr>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
+    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+  </tr>
+  <tr>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
+  </tr>
+  <tr>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
+  </tr>
+</table>
+
+## Siyaasada Sirdhawrka
+
+Mashruuca NewPipe waxay ujeedadiisu tahay inuu bixiyo wax kuu gaar ah, oo adoon shaqsi ahaan laguu aqoonsan aad isticmaasho website-yada wax laga daawado/dhagaysto.
+Sidaa darteed, app-ku wax xog ah ma uruuriyo fasaxaaga la'aantii. Siyaasada Sirdhawrka NewPipe ayaa si faahfaahsan u sharaxda waxii xog ah ee la diro markaad cillad wariso, ama aad bogganaga faallo ka dhiibato. Warqada waxaad ka heli kartaa [halkan](https://newpipe.net/legal/privacy/).
+
+## Laysinka
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe waa barnaamij bilaash ah oon lahayn xuquuqda daabacaada: Waad isticmaali kartaa, waad wadaagi kartaa waadna hormarin kartaa hadaad rabto. Gaar ahaan waad sii daabici kartaa ama wax baad ka badali kartaa ayadoo la raacayo shuruudaha sharciga guud ee [GNU](https://www.gnu.org/licenses/gpl.html) sida ay soosaareen Ururka Barnaamijyada Bilaashka ah, soosaarista 3aad ee laysinka, ama (hadaad doonto) nooc walba oo kasii dambeeyay laysinkii 3aad. 

From 6215faa06caeb54a8d46d82ef45fd16e2e3cd8eb Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:17:04 +0300
Subject: [PATCH 036/131] Linked with Somali Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 006085a51e2..87e03f05961 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md).*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 

From 5108bf17422f9082307b8ef3343df23aa5364b6c Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:23:52 +0300
Subject: [PATCH 037/131] Linked with Somali Readme

---
 README.ko.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.ko.md b/README.ko.md
index 1ca7be1bebc..8af84d3dfe1 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 

From 4c26e597e4a91a4b834e12deca8c8b84c90620aa Mon Sep 17 00:00:00 2001
From: David BrazSan <60136669+DavidBrazSan@users.noreply.github.com>
Date: Tue, 12 Jan 2021 12:55:28 -0300
Subject: [PATCH 038/131] Created Brazilian Portuguese Readme

---
 README.pt.br.md | 140 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 README.pt.br.md

diff --git a/README.pt.br.md b/README.pt.br.md
new file mode 100644
index 00000000000..4b2662cefd7
--- /dev/null
+++ b/README.pt.br.md
@@ -0,0 +1,140 @@
+<p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
+<h2 align="center"><b>NewPipe</b></h2>
+<h4 align="center">Uma interface de streaming leve e gratuita para Android.</h4>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
+
+<p align="center">
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
+<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
+</p>
+<hr>
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Descrição</a> &bull; <a href="#features">Características</a> &bull; <a href="#updates">Atualizações</a> &bull; <a href="#contribution">Contribuição</a> &bull; <a href="#donate">Doar</a> &bull; <a href="#license">Licença</a></p>
+<p align="center"><a href="https://newpipe.net">Site</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
+<hr>
+
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
+
+<b>AVISO: ESTA É UMA VERSÃO BETA, PORTANTO, VOCÊ PODE ENCONTRAR BUGS. ENCONTROU ALGUM, ABRA UM ISSUE ATRAVÉS DO NOSSO REPOSITÓRIO GITHUB.</b>
+
+<b>COLOCAR NEWPIPE OU QUALQUER FORK DELE NA GOOGLE PLAY STORE VIOLA SEUS TERMOS E CONDIÇÕES.</b>
+
+## Screenshots
+
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
+
+## Descrição
+
+O NewPipe não usa nenhuma biblioteca de framework do Google, nem a API do YouTube. Os sites são apenas analisados para obter informações necessárias, para que este aplicativo possa ser usado em dispositivos sem os serviços do Google instalados. Além disso, você não precisa de uma conta no YouTube para usar o NewPipe, que é um software livre com copyleft.
+
+### Características
+
+* Procurar vídeos
+* Exibir informações gerais sobre vídeos
+* Assista aos vídeos do YouTube
+* Ouça vídeos do YouTube
+* Modo popup (player flutuante)
+* Selecione o player para assistir streaming 
+* Baixar vídeos
+* Baixar somente áudio
+* Abrir vídeo no Kodi
+* Mostrar vídeos próximos/relacionados
+* Pesquise no YouTube em um idioma específico
+* Assistir/Bloquear material restrito
+* Exibir informações gerais sobre canais
+* Pesquisar canais
+* Assista a vídeos de um canal
+* Suporte Orbot/Tor (ainda não diretamente)
+* Suporte 1080p/2K/4K
+* Ver histórico
+* Inscreva-se nos canais
+* Procurar histórico
+* Porcurar/Assistir playlists
+* Assistir playlists em fila
+* Vídeos em fila
+* Playlists Local
+* Legenda
+* Suporte a live
+* Mostrar comentários
+
+### Serviços Suportados
+
+O NewPipe suporta vários serviços. Nosso [documentação](https://teamnewpipe.github.io/documentation/) fornecer mais informações sobre como um novo serviço pode ser adicionado ao aplicativo e ao extrator. Por favor, entre em contato conosco se você pretende adicionar um novo. Atualmente, os serviços suportados são:
+
+* YouTube
+* SoundCloud \[beta\]
+* media.ccc.de \[beta\]
+* PeerTube instances \[beta\]
+
+## Atualizações
+Quando uma alteração no código NewPipe (devido à adição de recursos ou fixação de bugs), eventualmente ocorrerá uma versão. Estes estão no formato x.xx.x . A fim de obter esta nova versão, você pode:
+ 1. Construa um APK de depuração você mesmo. Esta é a maneira mais rápida de obter novos recursos em seu dispositivo, mas é muito mais complicado, por isso recomendamos usar um dos outros métodos.
+ 2. Adicione nosso repo personalizado ao F-Droid e instale-o a partir daí assim que publicarmos um lançamento. As instruções estão aqui.: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
+ 3. Baixe o APK do [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) e instalá-lo assim que publicarmos um lançamento.
+ 4. Atualização via F-droid. Este é o método mais lento para obter atualizações, pois o F-Droid deve reconhecer alterações, construir o próprio APK, assiná-lo e, em seguida, enviar a atualização para os usuários.
+
+Recomendamos o método 2 para a maioria dos usuários. Os APKs instalados usando o método 2 ou 3 são compatíveis entre si, mas não com aqueles instalados usando o método 4. Isso se deve à mesma chave de assinatura (nossa) sendo usada para 2 e 3, mas uma chave de assinatura diferente (F-Droid's) está sendo usada para 4. Construir um APK depuração usando o método 1 exclui totalmente uma chave. Assinar chaves ajudam a garantir que um usuário não seja enganado para instalar uma atualização maliciosa em um aplicativo.
+
+Enquanto isso, se você quiser trocar de fontes por algum motivo (por exemplo, a funcionalidade principal do NewPipe foi quebrada e o F-Droid ainda não tem a atualização), recomendamos seguir este procedimento:
+1. Back up your data via Settings > Content > Export Database so you keep your history, subscriptions, and playlistsFaça backup de seus dados através de Configurações > Conteúdo > Exportar Base de Dados para que você mantenha seu histórico, inscrições e playlists
+2. Desinstale o NewPipe
+3. Baixe o APK da nova fonte e instale-o
+4. Importe os dados da etapa 1 via Configurações > Conteúdo > Inportar Banco de Dados
+
+## Contribuição
+Se você tem ideias, traduções, alterações de design, limpeza de códigos ou mudanças reais de código, a ajuda é sempre bem-vinda.
+Quanto mais for feito, melhor fica!
+
+Se você quiser se envolver, verifique nossa [notas de contribuição](.github/CONTRIBUTING.md).
+
+<a href="https://hosted.weblate.org/engage/newpipe/">
+<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="Translation status" />
+</a>
+
+## Doar
+Se você gosta de NewPipe, ficaríamos felizes com uma doação. Você pode enviar bitcoin ou doar via Bountysource ou Liberapay. Para obter mais informações sobre como doar para a NewPipe, visite nosso [site](https://newpipe.net/donate).
+
+<table>
+  <tr>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
+    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+  </tr>
+  <tr>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
+  </tr>
+  <tr>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
+  </tr>
+</table>
+
+## Política de Privacidade
+
+O projeto NewPipe tem como objetivo proporcionar uma experiência privada e anônima para o uso de serviços web de mídia.
+Portanto, o aplicativo não coleta nenhum dado sem o seu consentimento. A política de privacidade da NewPipe explica em detalhes quais dados são enviados e armazenados quando você envia um relatório de erro ou comenta em nosso blog. Você pode encontrar o documento [aqui](https://newpipe.net/legal/privacy/).
+
+## Licença
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe é Software Livre: Você pode usar, estudar compartilhamento e melhorá-lo à sua vontade.
+ Especificamente, você pode redistribuir e/ou modificá-lo sob os termos do
+[GNU General Public License](https://www.gnu.org/licenses/gpl.html) publicado pela Free Software Foundation, seja a versão 3 da Licença, ou
+(a sua opção) qualquer versão posterior.  

From 031585be3fd8374464357925d5e5640eb41e00e8 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 13 Jan 2021 17:25:00 +0100
Subject: [PATCH 039/131] Add comment about unexpected assertion

---
 app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt b/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt
index d0a8e7a404a..9f7e746491c 100644
--- a/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt
+++ b/app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt
@@ -18,6 +18,7 @@ class LocalizationTest {
 
         val actual = Localization.relativeTime(GregorianCalendar(2021, 1, 6))
 
+        // yes this assertion is true, even if it should be 5 days, it works as it is. Future research required.
         assertEquals("1 month from now", actual)
     }
 

From 0c86a4e608f7f07c686643b8b2f8c17d2763f59a Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 23 Dec 2020 06:25:57 +0530
Subject: [PATCH 040/131] Use view binding (PlayerBinding) in VideoPlayer.

---
 .../org/schabi/newpipe/player/BasePlayer.java |   7 -
 .../org/schabi/newpipe/player/MainPlayer.java |   7 +-
 .../schabi/newpipe/player/VideoPlayer.java    | 384 +++++--------
 .../newpipe/player/VideoPlayerImpl.java       | 531 ++++++++----------
 .../player/event/PlayerGestureListener.java   |   4 +-
 5 files changed, 386 insertions(+), 547 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 8eae33de602..ea16574e942 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -225,13 +225,6 @@ public void onReceive(final Context ctx, final Intent intent) {
         this.renderFactory = new DefaultRenderersFactory(context);
     }
 
-    public void setup() {
-        if (simpleExoPlayer == null) {
-            initPlayer(true);
-        }
-        initListeners();
-    }
-
     public void initPlayer(final boolean playOnReady) {
         if (DEBUG) {
             Log.d(TAG, "initPlayer() called with: playOnReady = [" + playOnReady + "]");
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index 49c83634664..fc9f110e68d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -26,6 +26,7 @@
 import android.os.IBinder;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -33,8 +34,8 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
+import org.schabi.newpipe.databinding.PlayerBinding;
 import org.schabi.newpipe.App;
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
@@ -102,10 +103,10 @@ public void onCreate() {
     }
 
     private void createView() {
-        final View layout = View.inflate(this, R.layout.player, null);
+        final PlayerBinding binding = PlayerBinding.inflate(LayoutInflater.from(this));
 
         playerImpl = new VideoPlayerImpl(this);
-        playerImpl.setup(layout);
+        playerImpl.setup(binding);
         playerImpl.shouldUpdateOnProgress = true;
 
         NotificationUtil.getInstance().createNotificationAndStartForeground(playerImpl, this);
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
index 67ea673c314..8894646c089 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
@@ -33,21 +33,18 @@
 import android.graphics.PorterDuffColorFilter;
 import android.os.Build;
 import android.os.Handler;
-import androidx.preference.PreferenceManager;
 import android.util.Log;
-
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.PopupMenu;
-import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.preference.PreferenceManager;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
@@ -62,6 +59,7 @@
 import com.google.android.exoplayer2.video.VideoListener;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.PlayerBinding;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -84,7 +82,7 @@
  *
  * @author mauriciocolli
  */
-@SuppressWarnings({"WeakerAccess", "unused"})
+@SuppressWarnings({"WeakerAccess"})
 public abstract class VideoPlayer extends BasePlayer
         implements VideoListener,
         SeekBar.OnSeekBarChangeListener,
@@ -117,34 +115,11 @@ public abstract class VideoPlayer extends BasePlayer
     // Views
     //////////////////////////////////////////////////////////////////////////*/
 
-    private View rootView;
-
-    private ExpandableSurfaceView surfaceView;
-    private View surfaceForeground;
-
-    private View loadingPanel;
-    private ImageView endScreen;
-    private ImageView controlAnimationView;
-
-    private View controlsRoot;
-    private TextView currentDisplaySeek;
-    private View playerTopShadow;
-    private View playerBottomShadow;
+    protected PlayerBinding binding;
 
-    private View bottomControlsRoot;
-    private SeekBar playbackSeekBar;
-    private TextView playbackCurrentTime;
-    private TextView playbackEndTime;
-    private TextView playbackLiveSync;
-    private TextView playbackSpeedTextView;
-
-    private LinearLayout topControlsRoot;
-    private TextView qualityTextView;
-
-    private SubtitleView subtitleView;
-
-    private TextView resizeView;
-    private TextView captionTextView;
+    protected SeekBar playbackSeekBar;
+    protected TextView qualityTextView;
+    protected TextView playbackSpeed;
 
     private ValueAnimator controlViewAnimator;
     private final Handler controlsVisibilityHandler = new Handler();
@@ -162,7 +137,7 @@ public abstract class VideoPlayer extends BasePlayer
 
     ///////////////////////////////////////////////////////////////////////////
 
-    public VideoPlayer(final String debugTag, final Context context) {
+    protected VideoPlayer(final String debugTag, final Context context) {
         super(context);
         this.TAG = debugTag;
         this.resolver = new VideoPlaybackResolver(context, dataSource, getQualityResolver());
@@ -178,54 +153,37 @@ private static boolean containsCaseInsensitive(final List<String> list, final St
         return false;
     }
 
-    public void setup(final View view) {
-        initViews(view);
-        setup();
+    public void setup(@NonNull final PlayerBinding playerBinding) {
+        initViews(playerBinding);
+        if (simpleExoPlayer == null) {
+            initPlayer(true);
+        }
+        initListeners();
     }
 
-    public void initViews(final View view) {
-        this.rootView = view;
-        this.surfaceView = view.findViewById(R.id.surfaceView);
-        this.surfaceForeground = view.findViewById(R.id.surfaceForeground);
-        this.loadingPanel = view.findViewById(R.id.loading_panel);
-        this.endScreen = view.findViewById(R.id.endScreen);
-        this.controlAnimationView = view.findViewById(R.id.controlAnimationView);
-        this.controlsRoot = view.findViewById(R.id.playbackControlRoot);
-        this.currentDisplaySeek = view.findViewById(R.id.currentDisplaySeek);
-        this.playerTopShadow = view.findViewById(R.id.playerTopShadow);
-        this.playerBottomShadow = view.findViewById(R.id.playerBottomShadow);
-        this.playbackSeekBar = view.findViewById(R.id.playbackSeekBar);
-        this.playbackCurrentTime = view.findViewById(R.id.playbackCurrentTime);
-        this.playbackEndTime = view.findViewById(R.id.playbackEndTime);
-        this.playbackLiveSync = view.findViewById(R.id.playbackLiveSync);
-        this.playbackSpeedTextView = view.findViewById(R.id.playbackSpeed);
-        this.bottomControlsRoot = view.findViewById(R.id.bottomControls);
-        this.topControlsRoot = view.findViewById(R.id.topControls);
-        this.qualityTextView = view.findViewById(R.id.qualityTextView);
-
-        this.subtitleView = view.findViewById(R.id.subtitleView);
+    public void initViews(@NonNull final PlayerBinding playerBinding) {
+        binding = playerBinding;
+        playbackSeekBar = (SeekBar) binding.playbackSeekBar;
+        qualityTextView = (TextView) binding.qualityTextView;
+        playbackSpeed = (TextView) binding.playbackSpeed;
 
         final float captionScale = PlayerHelper.getCaptionScale(context);
         final CaptionStyleCompat captionStyle = PlayerHelper.getCaptionStyle(context);
-        setupSubtitleView(subtitleView, captionScale, captionStyle);
-
-        this.resizeView = view.findViewById(R.id.resizeTextView);
-        resizeView.setText(PlayerHelper
-                .resizeTypeOf(context, getSurfaceView().getResizeMode()));
+        setupSubtitleView(binding.subtitleView, captionScale, captionStyle);
 
-        this.captionTextView = view.findViewById(R.id.captionTextView);
+        ((TextView) binding.resizeTextView).setText(PlayerHelper.resizeTypeOf(context,
+                binding.surfaceView.getResizeMode()));
 
-        playbackSeekBar.getThumb()
-                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
-        this.playbackSeekBar.getProgressDrawable()
-                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY));
+        playbackSeekBar.getThumb().setColorFilter(new PorterDuffColorFilter(Color.RED,
+                PorterDuff.Mode.SRC_IN));
+        playbackSeekBar.getProgressDrawable().setColorFilter(new PorterDuffColorFilter(Color.RED,
+                PorterDuff.Mode.MULTIPLY));
 
-        this.qualityPopupMenu = new PopupMenu(context, qualityTextView);
-        this.playbackSpeedPopupMenu = new PopupMenu(context, playbackSpeedTextView);
-        this.captionPopupMenu = new PopupMenu(context, captionTextView);
+        qualityPopupMenu = new PopupMenu(context, qualityTextView);
+        playbackSpeedPopupMenu = new PopupMenu(context, playbackSpeed);
+        captionPopupMenu = new PopupMenu(context, binding.captionTextView);
 
-        ((ProgressBar) this.loadingPanel.findViewById(R.id.progressBarLoadingPanel))
-                .getIndeterminateDrawable()
+        binding.progressBarLoadingPanel.getIndeterminateDrawable()
                 .setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
     }
 
@@ -235,11 +193,11 @@ protected abstract void setupSubtitleView(@NonNull SubtitleView view, float capt
     @Override
     public void initListeners() {
         playbackSeekBar.setOnSeekBarChangeListener(this);
-        playbackSpeedTextView.setOnClickListener(this);
-        qualityTextView.setOnClickListener(this);
-        captionTextView.setOnClickListener(this);
-        resizeView.setOnClickListener(this);
-        playbackLiveSync.setOnClickListener(this);
+        binding.playbackSpeed.setOnClickListener(this);
+        binding.qualityTextView.setOnClickListener(this);
+        binding.captionTextView.setOnClickListener(this);
+        binding.resizeTextView.setOnClickListener(this);
+        binding.playbackLiveSync.setOnClickListener(this);
     }
 
     @Override
@@ -247,11 +205,11 @@ public void initPlayer(final boolean playOnReady) {
         super.initPlayer(playOnReady);
 
         // Setup video view
-        simpleExoPlayer.setVideoSurfaceView(surfaceView);
+        simpleExoPlayer.setVideoSurfaceView(binding.surfaceView);
         simpleExoPlayer.addVideoListener(this);
 
         // Setup subtitle view
-        simpleExoPlayer.addTextOutput(cues -> subtitleView.onCues(cues));
+        simpleExoPlayer.addTextOutput(binding.subtitleView);
 
         // Setup audio session with onboard equalizer
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -305,7 +263,7 @@ private void buildPlaybackSpeedMenu() {
             playbackSpeedPopupMenu.getMenu().add(playbackSpeedPopupMenuGroupId, i, Menu.NONE,
                     formatSpeed(PLAYBACK_SPEEDS[i]));
         }
-        playbackSpeedTextView.setText(formatSpeed(getPlaybackSpeed()));
+        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
         playbackSpeedPopupMenu.setOnMenuItemClickListener(this);
         playbackSpeedPopupMenu.setOnDismissListener(this);
     }
@@ -385,29 +343,29 @@ private void updateStreamRelatedViews() {
         final MediaSourceTag tag = getCurrentMetadata();
         final StreamInfo metadata = tag.getMetadata();
 
-        qualityTextView.setVisibility(View.GONE);
-        playbackSpeedTextView.setVisibility(View.GONE);
+        binding.qualityTextView.setVisibility(View.GONE);
+        binding.playbackSpeed.setVisibility(View.GONE);
 
-        playbackEndTime.setVisibility(View.GONE);
-        playbackLiveSync.setVisibility(View.GONE);
+        binding.playbackEndTime.setVisibility(View.GONE);
+        binding.playbackLiveSync.setVisibility(View.GONE);
 
         switch (metadata.getStreamType()) {
             case AUDIO_STREAM:
-                surfaceView.setVisibility(View.GONE);
-                endScreen.setVisibility(View.VISIBLE);
-                playbackEndTime.setVisibility(View.VISIBLE);
+                binding.surfaceView.setVisibility(View.GONE);
+                binding.endScreen.setVisibility(View.VISIBLE);
+                binding.playbackEndTime.setVisibility(View.VISIBLE);
                 break;
 
             case AUDIO_LIVE_STREAM:
-                surfaceView.setVisibility(View.GONE);
-                endScreen.setVisibility(View.VISIBLE);
-                playbackLiveSync.setVisibility(View.VISIBLE);
+                binding.surfaceView.setVisibility(View.GONE);
+                binding.endScreen.setVisibility(View.VISIBLE);
+                binding.playbackLiveSync.setVisibility(View.VISIBLE);
                 break;
 
             case LIVE_STREAM:
-                surfaceView.setVisibility(View.VISIBLE);
-                endScreen.setVisibility(View.GONE);
-                playbackLiveSync.setVisibility(View.VISIBLE);
+                binding.surfaceView.setVisibility(View.VISIBLE);
+                binding.endScreen.setVisibility(View.GONE);
+                binding.playbackLiveSync.setVisibility(View.VISIBLE);
                 break;
 
             case VIDEO_STREAM:
@@ -420,16 +378,16 @@ private void updateStreamRelatedViews() {
                 selectedStreamIndex = tag.getSelectedVideoStreamIndex();
                 buildQualityMenu();
 
-                qualityTextView.setVisibility(View.VISIBLE);
-                surfaceView.setVisibility(View.VISIBLE);
+                binding.qualityTextView.setVisibility(View.VISIBLE);
+                binding.surfaceView.setVisibility(View.VISIBLE);
             default:
-                endScreen.setVisibility(View.GONE);
-                playbackEndTime.setVisibility(View.VISIBLE);
+                binding.endScreen.setVisibility(View.GONE);
+                binding.playbackEndTime.setVisibility(View.VISIBLE);
                 break;
         }
 
         buildPlaybackSpeedMenu();
-        playbackSpeedTextView.setVisibility(View.VISIBLE);
+        binding.playbackSpeed.setVisibility(View.VISIBLE);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -438,6 +396,7 @@ private void updateStreamRelatedViews() {
 
     protected abstract VideoPlaybackResolver.QualityResolver getQualityResolver();
 
+    @Override
     protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
         super.onMetadataChanged(tag);
         updateStreamRelatedViews();
@@ -458,15 +417,15 @@ public void onBlocked() {
         super.onBlocked();
 
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
-        animateView(controlsRoot, false, DEFAULT_CONTROLS_DURATION);
+        animateView(binding.playbackControlRoot, false, DEFAULT_CONTROLS_DURATION);
 
         playbackSeekBar.setEnabled(false);
-        playbackSeekBar.getThumb()
-                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
+        playbackSeekBar.getThumb().setColorFilter(new PorterDuffColorFilter(Color.RED,
+                PorterDuff.Mode.SRC_IN));
 
-        loadingPanel.setBackgroundColor(Color.BLACK);
-        animateView(loadingPanel, true, 0);
-        animateView(surfaceForeground, true, 100);
+        binding.loadingPanel.setBackgroundColor(Color.BLACK);
+        animateView(binding.loadingPanel, true, 0);
+        animateView(binding.surfaceForeground, true, 100);
     }
 
     @Override
@@ -478,12 +437,13 @@ public void onPlaying() {
         showAndAnimateControl(-1, true);
 
         playbackSeekBar.setEnabled(true);
-        playbackSeekBar.getThumb()
-                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
+        playbackSeekBar.getThumb().setColorFilter(new PorterDuffColorFilter(Color.RED,
+                PorterDuff.Mode.SRC_IN));
 
-        loadingPanel.setVisibility(View.GONE);
+        binding.loadingPanel.setVisibility(View.GONE);
 
-        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false,
+                200);
     }
 
     @Override
@@ -491,7 +451,7 @@ public void onBuffering() {
         if (DEBUG) {
             Log.d(TAG, "onBuffering() called");
         }
-        loadingPanel.setBackgroundColor(Color.TRANSPARENT);
+        binding.loadingPanel.setBackgroundColor(Color.TRANSPARENT);
     }
 
     @Override
@@ -500,7 +460,7 @@ public void onPaused() {
             Log.d(TAG, "onPaused() called");
         }
         showControls(400);
-        loadingPanel.setVisibility(View.GONE);
+        binding.loadingPanel.setVisibility(View.GONE);
     }
 
     @Override
@@ -516,10 +476,11 @@ public void onCompleted() {
         super.onCompleted();
 
         showControls(500);
-        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
-        loadingPanel.setVisibility(View.GONE);
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false,
+                200);
+        binding.loadingPanel.setVisibility(View.GONE);
 
-        animateView(surfaceForeground, true, 100);
+        animateView(binding.surfaceForeground, true, 100);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -527,16 +488,16 @@ public void onCompleted() {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onTracksChanged(final TrackGroupArray trackGroups,
-                                final TrackSelectionArray trackSelections) {
+    public void onTracksChanged(@NonNull final TrackGroupArray trackGroups,
+                                @NonNull final TrackSelectionArray trackSelections) {
         super.onTracksChanged(trackGroups, trackSelections);
         onTextTrackUpdate();
     }
 
     @Override
-    public void onPlaybackParametersChanged(final PlaybackParameters playbackParameters) {
+    public void onPlaybackParametersChanged(@NonNull final PlaybackParameters playbackParameters) {
         super.onPlaybackParametersChanged(playbackParameters);
-        playbackSpeedTextView.setText(formatSpeed(playbackParameters.speed));
+        playbackSpeed.setText(formatSpeed(playbackParameters.speed));
     }
 
     @Override
@@ -550,12 +511,12 @@ public void onVideoSizeChanged(final int width, final int height,
                     + "unappliedRotationDegrees = [" + unappliedRotationDegrees + "], "
                     + "pixelWidthHeightRatio = [" + pixelWidthHeightRatio + "]");
         }
-        getSurfaceView().setAspectRatio(((float) width) / height);
+        binding.surfaceView.setAspectRatio(((float) width) / height);
     }
 
     @Override
     public void onRenderedFirstFrame() {
-        animateView(surfaceForeground, false, 100);
+        animateView(binding.surfaceForeground, false, 100);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -565,12 +526,12 @@ public void onRenderedFirstFrame() {
     private void onTextTrackUpdate() {
         final int textRenderer = getRendererIndex(C.TRACK_TYPE_TEXT);
 
-        if (captionTextView == null) {
+        if (binding == null) {
             return;
         }
         if (trackSelector.getCurrentMappedTrackInfo() == null
                 || textRenderer == RENDERER_UNAVAILABLE) {
-            captionTextView.setVisibility(View.GONE);
+            binding.captionTextView.setVisibility(View.GONE);
             return;
         }
 
@@ -593,11 +554,12 @@ private void onTextTrackUpdate() {
         if (trackSelector.getParameters().getRendererDisabled(textRenderer)
                 || preferredLanguage == null || (!availableLanguages.contains(preferredLanguage)
                 && !containsCaseInsensitive(availableLanguages, preferredLanguage))) {
-            captionTextView.setText(R.string.caption_none);
+            binding.captionTextView.setText(R.string.caption_none);
         } else {
-            captionTextView.setText(preferredLanguage);
+            binding.captionTextView.setText(preferredLanguage);
         }
-        captionTextView.setVisibility(availableLanguages.isEmpty() ? View.GONE : View.VISIBLE);
+        binding.captionTextView.setVisibility(availableLanguages.isEmpty() ? View.GONE
+                : View.VISIBLE);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -611,8 +573,8 @@ public void onPrepared(final boolean playWhenReady) {
         }
 
         playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
-        playbackEndTime.setText(getTimeString((int) simpleExoPlayer.getDuration()));
-        playbackSpeedTextView.setText(formatSpeed(getPlaybackSpeed()));
+        binding.playbackEndTime.setText(getTimeString((int) simpleExoPlayer.getDuration()));
+        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
 
         super.onPrepared(playWhenReady);
     }
@@ -620,8 +582,8 @@ public void onPrepared(final boolean playWhenReady) {
     @Override
     public void destroy() {
         super.destroy();
-        if (endScreen != null) {
-            endScreen.setImageBitmap(null);
+        if (binding != null) {
+            binding.endScreen.setImageBitmap(null);
         }
     }
 
@@ -633,14 +595,14 @@ public void onUpdateProgress(final int currentProgress, final int duration,
         }
 
         if (duration != playbackSeekBar.getMax()) {
-            playbackEndTime.setText(getTimeString(duration));
+            binding.playbackEndTime.setText(getTimeString(duration));
             playbackSeekBar.setMax(duration);
         }
         if (currentState != STATE_PAUSED) {
             if (currentState != STATE_PAUSED_SEEK) {
                 playbackSeekBar.setProgress(currentProgress);
             }
-            playbackCurrentTime.setText(getTimeString(currentProgress));
+            binding.playbackCurrentTime.setText(getTimeString(currentProgress));
         }
         if (simpleExoPlayer.isLoading() || bufferPercent > 90) {
             playbackSeekBar.setSecondaryProgress(
@@ -652,7 +614,7 @@ public void onUpdateProgress(final int currentProgress, final int duration,
                     + "currentProgress = [" + currentProgress + "], "
                     + "duration = [" + duration + "], bufferPercent = [" + bufferPercent + "]");
         }
-        playbackLiveSync.setClickable(!isLiveEdge());
+        binding.playbackLiveSync.setClickable(!isLiveEdge());
     }
 
     @Override
@@ -660,7 +622,7 @@ public void onLoadingComplete(final String imageUri, final View view,
                                   final Bitmap loadedImage) {
         super.onLoadingComplete(imageUri, view, loadedImage);
         if (loadedImage != null) {
-            endScreen.setImageBitmap(loadedImage);
+            binding.endScreen.setImageBitmap(loadedImage);
         }
     }
 
@@ -689,15 +651,15 @@ public void onClick(final View v) {
         if (DEBUG) {
             Log.d(TAG, "onClick() called with: v = [" + v + "]");
         }
-        if (v.getId() == qualityTextView.getId()) {
+        if (v.getId() == binding.qualityTextView.getId()) {
             onQualitySelectorClicked();
-        } else if (v.getId() == playbackSpeedTextView.getId()) {
+        } else if (v.getId() == binding.playbackSpeed.getId()) {
             onPlaybackSpeedClicked();
-        } else if (v.getId() == resizeView.getId()) {
+        } else if (v.getId() == binding.resizeTextView.getId()) {
             onResizeClicked();
-        } else if (v.getId() == captionTextView.getId()) {
+        } else if (v.getId() == binding.captionTextView.getId()) {
             onCaptionClicked();
-        } else if (v.getId() == playbackLiveSync.getId()) {
+        } else if (v.getId() == binding.playbackLiveSync.getId()) {
             seekToDefault();
         }
     }
@@ -732,7 +694,7 @@ public boolean onMenuItemClick(final MenuItem menuItem) {
             final float speed = PLAYBACK_SPEEDS[speedIndex];
 
             setPlaybackSpeed(speed);
-            playbackSpeedTextView.setText(formatSpeed(speed));
+            playbackSpeed.setText(formatSpeed(speed));
         }
 
         return false;
@@ -786,16 +748,17 @@ private void onCaptionClicked() {
     }
 
     void onResizeClicked() {
-        if (getSurfaceView() != null) {
-            final int currentResizeMode = getSurfaceView().getResizeMode();
+        if (binding != null) {
+            final int currentResizeMode = binding.surfaceView.getResizeMode();
             final int newResizeMode = nextResizeMode(currentResizeMode);
             setResizeMode(newResizeMode);
         }
     }
 
     protected void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
-        getSurfaceView().setResizeMode(resizeMode);
-        getResizeView().setText(PlayerHelper.resizeTypeOf(context, resizeMode));
+        binding.surfaceView.setResizeMode(resizeMode);
+        ((TextView) binding.resizeTextView).setText(PlayerHelper.resizeTypeOf(context,
+                resizeMode));
     }
 
     protected abstract int nextResizeMode(@AspectRatioFrameLayout.ResizeMode int resizeMode);
@@ -811,9 +774,8 @@ public void onProgressChanged(final SeekBar seekBar, final int progress,
             Log.d(TAG, "onProgressChanged() called with: "
                     + "seekBar = [" + seekBar + "], progress = [" + progress + "]");
         }
-        //if (fromUser) playbackCurrentTime.setText(getTimeString(progress));
         if (fromUser) {
-            currentDisplaySeek.setText(getTimeString(progress));
+            binding.currentDisplaySeek.setText(getTimeString(progress));
         }
     }
 
@@ -832,7 +794,7 @@ public void onStartTrackingTouch(final SeekBar seekBar) {
         }
 
         showControls(0);
-        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true,
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true,
                 DEFAULT_CONTROLS_DURATION);
     }
 
@@ -847,8 +809,9 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
             simpleExoPlayer.setPlayWhenReady(true);
         }
 
-        playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
-        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        binding.playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false,
+                200);
 
         if (getCurrentState() == STATE_PAUSED_SEEK) {
             changeState(STATE_BUFFERING);
@@ -877,7 +840,8 @@ public int getRendererIndex(final int trackIndex) {
     }
 
     public boolean isControlsVisible() {
-        return controlsRoot != null && controlsRoot.getVisibility() == View.VISIBLE;
+        return binding != null
+                && binding.playbackControlRoot.getVisibility() == View.VISIBLE;
     }
 
     /**
@@ -900,8 +864,9 @@ public void showAndAnimateControl(final int drawableId, final boolean goneOnEnd)
         }
 
         if (drawableId == -1) {
-            if (controlAnimationView.getVisibility() == View.VISIBLE) {
-                controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(controlAnimationView,
+            if (binding.controlAnimationView.getVisibility() == View.VISIBLE) {
+                controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(
+                        binding.controlAnimationView,
                         PropertyValuesHolder.ofFloat(View.ALPHA, 1.0f, 0.0f),
                         PropertyValuesHolder.ofFloat(View.SCALE_X, 1.4f, 1.0f),
                         PropertyValuesHolder.ofFloat(View.SCALE_Y, 1.4f, 1.0f)
@@ -909,7 +874,7 @@ public void showAndAnimateControl(final int drawableId, final boolean goneOnEnd)
                 controlViewAnimator.addListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationEnd(final Animator animation) {
-                        controlAnimationView.setVisibility(View.GONE);
+                        binding.controlAnimationView.setVisibility(View.GONE);
                     }
                 });
                 controlViewAnimator.start();
@@ -923,7 +888,8 @@ public void onAnimationEnd(final Animator animation) {
         final float alphaTo = goneOnEnd ? 0f : 1f;
 
 
-        controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(controlAnimationView,
+        controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(
+                binding.controlAnimationView,
                 PropertyValuesHolder.ofFloat(View.ALPHA, alphaFrom, alphaTo),
                 PropertyValuesHolder.ofFloat(View.SCALE_X, scaleFrom, scaleTo),
                 PropertyValuesHolder.ofFloat(View.SCALE_Y, scaleFrom, scaleTo)
@@ -932,17 +898,14 @@ public void onAnimationEnd(final Animator animation) {
         controlViewAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(final Animator animation) {
-                if (goneOnEnd) {
-                    controlAnimationView.setVisibility(View.GONE);
-                } else {
-                    controlAnimationView.setVisibility(View.VISIBLE);
-                }
+                binding.controlAnimationView.setVisibility(goneOnEnd ? View.GONE
+                        : View.VISIBLE);
             }
         });
 
-
-        controlAnimationView.setVisibility(View.VISIBLE);
-        controlAnimationView.setImageDrawable(AppCompatResources.getDrawable(context, drawableId));
+        binding.controlAnimationView.setVisibility(View.VISIBLE);
+        binding.controlAnimationView.setImageDrawable(AppCompatResources.getDrawable(context,
+                drawableId));
         controlViewAnimator.start();
     }
 
@@ -955,12 +918,12 @@ public void showControlsThenHide() {
             Log.d(TAG, "showControlsThenHide() called");
         }
 
-        final int hideTime = controlsRoot.isInTouchMode()
+        final int hideTime = binding.playbackControlRoot.isInTouchMode()
                 ? DEFAULT_CONTROLS_HIDE_TIME
                 : DPAD_CONTROLS_HIDE_TIME;
 
         showHideShadow(true, DEFAULT_CONTROLS_DURATION, 0);
-        animateView(controlsRoot, true, DEFAULT_CONTROLS_DURATION, 0,
+        animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0,
                 () -> hideControls(DEFAULT_CONTROLS_DURATION, hideTime));
     }
 
@@ -970,17 +933,18 @@ public void showControls(final long duration) {
         }
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
         showHideShadow(true, duration, 0);
-        animateView(controlsRoot, true, duration);
+        animateView(binding.playbackControlRoot, true, duration);
     }
 
     public void safeHideControls(final long duration, final long delay) {
         if (DEBUG) {
             Log.d(TAG, "safeHideControls() called with: delay = [" + delay + "]");
         }
-        if (rootView.isInTouchMode()) {
+        if (binding.getRoot().isInTouchMode()) {
             controlsVisibilityHandler.removeCallbacksAndMessages(null);
             controlsVisibilityHandler.postDelayed(
-                    () -> animateView(controlsRoot, false, duration), delay);
+                    () -> animateView(binding.playbackControlRoot, false, duration),
+                    delay);
         }
     }
 
@@ -991,7 +955,7 @@ public void hideControls(final long duration, final long delay) {
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
         controlsVisibilityHandler.postDelayed(() -> {
             showHideShadow(false, duration, 0);
-            animateView(controlsRoot, false, duration);
+            animateView(binding.playbackControlRoot, false, duration);
         }, delay);
     }
 
@@ -1007,13 +971,13 @@ public void hideControlsAndButton(final long duration, final long delay, final V
     private Runnable hideControlsAndButtonHandler(final long duration, final View videoPlayPause) {
         return () -> {
             videoPlayPause.setVisibility(View.INVISIBLE);
-            animateView(controlsRoot, false, duration);
+            animateView(binding.playbackControlRoot, false, duration);
         };
     }
 
     void showHideShadow(final boolean show, final long duration, final long delay) {
-        animateView(playerTopShadow, show, duration, delay, null);
-        animateView(playerBottomShadow, show, duration, delay, null);
+        animateView(binding.playerTopShadow, show, duration, delay, null);
+        animateView(binding.playerBottomShadow, show, duration, delay, null);
     }
 
     public abstract void hideSystemUIIfNeeded();
@@ -1032,7 +996,7 @@ public void setPlaybackQuality(final String quality) {
     }
 
     public ExpandableSurfaceView getSurfaceView() {
-        return surfaceView;
+        return binding.surfaceView;
     }
 
     public boolean wasPlaying() {
@@ -1050,83 +1014,23 @@ public Handler getControlsVisibilityHandler() {
         return controlsVisibilityHandler;
     }
 
+    @NonNull
     public View getRootView() {
-        return rootView;
-    }
-
-    public void setRootView(final View rootView) {
-        this.rootView = rootView;
+        return binding.getRoot();
     }
 
+    @NonNull
     public View getLoadingPanel() {
-        return loadingPanel;
-    }
-
-    public ImageView getEndScreen() {
-        return endScreen;
-    }
-
-    public ImageView getControlAnimationView() {
-        return controlAnimationView;
-    }
-
-    public View getControlsRoot() {
-        return controlsRoot;
+        return binding.loadingPanel;
     }
 
-    public View getBottomControlsRoot() {
-        return bottomControlsRoot;
-    }
-
-    public SeekBar getPlaybackSeekBar() {
-        return playbackSeekBar;
-    }
-
-    public TextView getPlaybackCurrentTime() {
-        return playbackCurrentTime;
-    }
-
-    public TextView getPlaybackEndTime() {
-        return playbackEndTime;
-    }
-
-    public LinearLayout getTopControlsRoot() {
-        return topControlsRoot;
-    }
-
-    public TextView getQualityTextView() {
-        return qualityTextView;
-    }
-
-    public PopupMenu getQualityPopupMenu() {
-        return qualityPopupMenu;
-    }
-
-    public TextView getPlaybackSpeedTextView() {
-        return playbackSpeedTextView;
-    }
-
-    public PopupMenu getPlaybackSpeedPopupMenu() {
-        return playbackSpeedPopupMenu;
-    }
-
-    public View getSurfaceForeground() {
-        return surfaceForeground;
+    @NonNull
+    public View getPlaybackControlRoot() {
+        return binding.playbackControlRoot;
     }
 
+    @NonNull
     public TextView getCurrentDisplaySeek() {
-        return currentDisplaySeek;
-    }
-
-    public SubtitleView getSubtitleView() {
-        return subtitleView;
-    }
-
-    public TextView getResizeView() {
-        return resizeView;
-    }
-
-    public TextView getCaptionTextView() {
-        return captionTextView;
+        return binding.currentDisplaySeek;
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index ce40efb5f73..a968ddc9141 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -77,6 +77,7 @@
 import com.nostra13.universalimageloader.core.assist.FailReason;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.PlayerBinding;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
@@ -145,45 +146,11 @@ public class VideoPlayerImpl extends VideoPlayer
 
     private static final float MAX_GESTURE_LENGTH = 0.75f;
 
-    private TextView titleTextView;
-    private TextView channelTextView;
-    private RelativeLayout volumeRelativeLayout;
-    private ProgressBar volumeProgressBar;
-    private ImageView volumeImageView;
-    private RelativeLayout brightnessRelativeLayout;
-    private ProgressBar brightnessProgressBar;
-    private ImageView brightnessImageView;
-    private TextView resizingIndicator;
-    private ImageButton queueButton;
-    private ImageButton repeatButton;
-    private ImageButton shuffleButton;
-    private ImageButton playWithKodi;
-    private ImageButton openInBrowser;
-    private ImageButton fullscreenButton;
-    private ImageButton playerCloseButton;
-    private ImageButton screenRotationButton;
-    private ImageButton muteButton;
-
-    private ImageButton playPauseButton;
-    private ImageButton playPreviousButton;
-    private ImageButton playNextButton;
-
-    private RelativeLayout queueLayout;
-    private ImageButton itemsListCloseButton;
-    private RecyclerView itemsList;
     private ItemTouchHelper itemTouchHelper;
 
-    private RelativeLayout playerOverlays;
-
     private boolean queueVisible;
     private MainPlayer.PlayerType playerType = MainPlayer.PlayerType.VIDEO;
 
-    private ImageButton moreOptionsButton;
-    private ImageButton shareButton;
-
-    private View primaryControls;
-    private View secondaryControls;
-
     private int maxGestureLength;
 
     private boolean audioOnly = false;
@@ -205,7 +172,6 @@ public class VideoPlayerImpl extends VideoPlayer
     private WindowManager.LayoutParams popupLayoutParams;
     public WindowManager windowManager;
 
-    private View closingOverlayView;
     private View closeOverlayView;
     private FloatingActionButton closeOverlayButton;
 
@@ -251,13 +217,13 @@ public void handleIntent(final Intent intent) {
             getRootView().setVisibility(View.VISIBLE);
             initPopup();
             initPopupCloseOverlay();
-            playPauseButton.requestFocus();
+            binding.playPauseButton.requestFocus();
         } else {
             getRootView().setVisibility(View.VISIBLE);
             initVideoPlayer();
             onQueueClosed();
             // Android TV: without it focus will frame the whole player
-            playPauseButton.requestFocus();
+            binding.playPauseButton.requestFocus();
 
             if (simpleExoPlayer.getPlayWhenReady()) {
                 onPlay();
@@ -279,49 +245,14 @@ public void handleIntent(final Intent intent) {
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
-    public void initViews(final View view) {
-        super.initViews(view);
-        this.titleTextView = view.findViewById(R.id.titleTextView);
-        this.channelTextView = view.findViewById(R.id.channelTextView);
-        this.volumeRelativeLayout = view.findViewById(R.id.volumeRelativeLayout);
-        this.volumeProgressBar = view.findViewById(R.id.volumeProgressBar);
-        this.volumeImageView = view.findViewById(R.id.volumeImageView);
-        this.brightnessRelativeLayout = view.findViewById(R.id.brightnessRelativeLayout);
-        this.brightnessProgressBar = view.findViewById(R.id.brightnessProgressBar);
-        this.brightnessImageView = view.findViewById(R.id.brightnessImageView);
-        this.resizingIndicator = view.findViewById(R.id.resizing_indicator);
-        this.queueButton = view.findViewById(R.id.queueButton);
-        this.repeatButton = view.findViewById(R.id.repeatButton);
-        this.shuffleButton = view.findViewById(R.id.shuffleButton);
-        this.playWithKodi = view.findViewById(R.id.playWithKodi);
-        this.openInBrowser = view.findViewById(R.id.openInBrowser);
-        this.fullscreenButton = view.findViewById(R.id.fullScreenButton);
-        this.screenRotationButton = view.findViewById(R.id.screenRotationButton);
-        this.playerCloseButton = view.findViewById(R.id.playerCloseButton);
-        this.muteButton = view.findViewById(R.id.switchMute);
-
-        this.playPauseButton = view.findViewById(R.id.playPauseButton);
-        this.playPreviousButton = view.findViewById(R.id.playPreviousButton);
-        this.playNextButton = view.findViewById(R.id.playNextButton);
-
-        this.moreOptionsButton = view.findViewById(R.id.moreOptionsButton);
-        this.primaryControls = view.findViewById(R.id.primaryControls);
-        this.secondaryControls = view.findViewById(R.id.secondaryControls);
-        this.shareButton = view.findViewById(R.id.share);
-
-        this.queueLayout = view.findViewById(R.id.playQueuePanel);
-        this.itemsListCloseButton = view.findViewById(R.id.playQueueClose);
-        this.itemsList = view.findViewById(R.id.playQueue);
-
-        this.playerOverlays = view.findViewById(R.id.player_overlays);
-
-        closingOverlayView = view.findViewById(R.id.closingOverlay);
-
-        titleTextView.setSelected(true);
-        channelTextView.setSelected(true);
+    public void initViews(@NonNull final PlayerBinding binding) {
+        super.initViews(binding);
+
+        binding.titleTextView.setSelected(true);
+        binding.channelTextView.setSelected(true);
 
         // Prevent hiding of bottom sheet via swipe inside queue
-        this.itemsList.setNestedScrollingEnabled(false);
+        binding.playQueue.setNestedScrollingEnabled(false);
     }
 
     @Override
@@ -349,58 +280,60 @@ protected void setupSubtitleView(final @NonNull SubtitleView view,
      */
     private void setupElementsVisibility() {
         if (popupPlayerSelected()) {
-            fullscreenButton.setVisibility(View.VISIBLE);
-            screenRotationButton.setVisibility(View.GONE);
-            getResizeView().setVisibility(View.GONE);
-            getRootView().findViewById(R.id.metadataView).setVisibility(View.GONE);
-            queueButton.setVisibility(View.GONE);
-            moreOptionsButton.setVisibility(View.GONE);
-            getTopControlsRoot().setOrientation(LinearLayout.HORIZONTAL);
-            primaryControls.getLayoutParams().width = LinearLayout.LayoutParams.WRAP_CONTENT;
-            secondaryControls.setAlpha(1.0f);
-            secondaryControls.setVisibility(View.VISIBLE);
-            secondaryControls.setTranslationY(0);
-            shareButton.setVisibility(View.GONE);
-            playWithKodi.setVisibility(View.GONE);
-            openInBrowser.setVisibility(View.GONE);
-            muteButton.setVisibility(View.GONE);
-            playerCloseButton.setVisibility(View.GONE);
-            getTopControlsRoot().bringToFront();
-            getTopControlsRoot().setClickable(false);
-            getTopControlsRoot().setFocusable(false);
-            getBottomControlsRoot().bringToFront();
+            binding.fullScreenButton.setVisibility(View.VISIBLE);
+            binding.screenRotationButton.setVisibility(View.GONE);
+            binding.resizeTextView.setVisibility(View.GONE);
+            binding.metadataView.setVisibility(View.GONE);
+            binding.queueButton.setVisibility(View.GONE);
+            binding.moreOptionsButton.setVisibility(View.GONE);
+            binding.topControls.setOrientation(LinearLayout.HORIZONTAL);
+            binding.primaryControls.getLayoutParams().width =
+                    LinearLayout.LayoutParams.WRAP_CONTENT;
+            binding.secondaryControls.setAlpha(1.0f);
+            binding.secondaryControls.setVisibility(View.VISIBLE);
+            binding.secondaryControls.setTranslationY(0);
+            binding.share.setVisibility(View.GONE);
+            binding.playWithKodi.setVisibility(View.GONE);
+            binding.openInBrowser.setVisibility(View.GONE);
+            binding.switchMute.setVisibility(View.GONE);
+            binding.playerCloseButton.setVisibility(View.GONE);
+            binding.topControls.bringToFront();
+            binding.topControls.setClickable(false);
+            binding.topControls.setFocusable(false);
+            binding.bottomControls.bringToFront();
             onQueueClosed();
         } else {
-            fullscreenButton.setVisibility(View.GONE);
+            binding.fullScreenButton.setVisibility(View.GONE);
             setupScreenRotationButton();
-            getResizeView().setVisibility(View.VISIBLE);
-            getRootView().findViewById(R.id.metadataView).setVisibility(View.VISIBLE);
-            moreOptionsButton.setVisibility(View.VISIBLE);
-            getTopControlsRoot().setOrientation(LinearLayout.VERTICAL);
-            primaryControls.getLayoutParams().width = LinearLayout.LayoutParams.MATCH_PARENT;
-            secondaryControls.setVisibility(View.INVISIBLE);
-            moreOptionsButton.setImageDrawable(AppCompatResources.getDrawable(service,
+            binding.resizeTextView.setVisibility(View.VISIBLE);
+            binding.metadataView.setVisibility(View.VISIBLE);
+            binding.moreOptionsButton.setVisibility(View.VISIBLE);
+            binding.topControls.setOrientation(LinearLayout.VERTICAL);
+            binding.primaryControls.getLayoutParams().width =
+                    LinearLayout.LayoutParams.MATCH_PARENT;
+            binding.secondaryControls.setVisibility(View.INVISIBLE);
+            binding.moreOptionsButton.setImageDrawable(AppCompatResources.getDrawable(service,
                     R.drawable.ic_expand_more_white_24dp));
-            shareButton.setVisibility(View.VISIBLE);
+            binding.share.setVisibility(View.VISIBLE);
             showHideKodiButton();
-            openInBrowser.setVisibility(View.VISIBLE);
-            muteButton.setVisibility(View.VISIBLE);
-            playerCloseButton.setVisibility(isFullscreen ? View.GONE : View.VISIBLE);
+            binding.openInBrowser.setVisibility(View.VISIBLE);
+            binding.switchMute.setVisibility(View.VISIBLE);
+            binding.playerCloseButton.setVisibility(isFullscreen ? View.GONE : View.VISIBLE);
             // Top controls have a large minHeight which is allows to drag the player
             // down in fullscreen mode (just larger area to make easy to locate by finger)
-            getTopControlsRoot().setClickable(true);
-            getTopControlsRoot().setFocusable(true);
+            binding.topControls.setClickable(true);
+            binding.topControls.setFocusable(true);
         }
         if (!isFullscreen()) {
-            titleTextView.setVisibility(View.GONE);
-            channelTextView.setVisibility(View.GONE);
+            binding.titleTextView.setVisibility(View.GONE);
+            binding.channelTextView.setVisibility(View.GONE);
         } else {
-            titleTextView.setVisibility(View.VISIBLE);
-            channelTextView.setVisibility(View.VISIBLE);
+            binding.titleTextView.setVisibility(View.VISIBLE);
+            binding.channelTextView.setVisibility(View.VISIBLE);
         }
-        setMuteButton(muteButton, isMuted());
+        setMuteButton(binding.switchMute, isMuted());
 
-        animateRotation(moreOptionsButton, DEFAULT_CONTROLS_DURATION, 0);
+        animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION, 0);
     }
 
     /**
@@ -413,15 +346,15 @@ private void setupElementsSize() {
                     .getDimensionPixelSize(R.dimen.player_popup_controls_padding);
             final int buttonsPadding = service.getResources()
                     .getDimensionPixelSize(R.dimen.player_popup_buttons_padding);
-            getTopControlsRoot().setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
-            getBottomControlsRoot().setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
-            getQualityTextView().setPadding(
-                    buttonsPadding, buttonsPadding, buttonsPadding, buttonsPadding);
-            getPlaybackSpeedTextView().setPadding(
-                    buttonsPadding, buttonsPadding, buttonsPadding, buttonsPadding);
-            getCaptionTextView().setPadding(
-                    buttonsPadding, buttonsPadding, buttonsPadding, buttonsPadding);
-            getPlaybackSpeedTextView().setMinimumWidth(0);
+            binding.topControls.setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
+            binding.bottomControls.setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
+            binding.qualityTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
+                    buttonsPadding);
+            binding.playbackSpeed.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
+                    buttonsPadding);
+            binding.captionTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
+                    buttonsPadding);
+            binding.playbackSpeed.setMinimumWidth(0);
         } else if (videoPlayerSelected()) {
             final int buttonsMinWidth = service.getResources()
                     .getDimensionPixelSize(R.dimen.player_main_buttons_min_width);
@@ -431,16 +364,16 @@ private void setupElementsSize() {
                     .getDimensionPixelSize(R.dimen.player_main_controls_padding);
             final int buttonsPadding = service.getResources()
                     .getDimensionPixelSize(R.dimen.player_main_buttons_padding);
-            getTopControlsRoot().setPaddingRelative(
-                    controlsPadding, playerTopPadding, controlsPadding, 0);
-            getBottomControlsRoot().setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
-            getQualityTextView().setPadding(
-                    buttonsPadding, buttonsPadding, buttonsPadding, buttonsPadding);
-            getPlaybackSpeedTextView().setPadding(
-                    buttonsPadding, buttonsPadding, buttonsPadding, buttonsPadding);
-            getPlaybackSpeedTextView().setMinimumWidth(buttonsMinWidth);
-            getCaptionTextView().setPadding(
-                    buttonsPadding, buttonsPadding, buttonsPadding, buttonsPadding);
+            binding.topControls.setPaddingRelative(controlsPadding, playerTopPadding,
+                    controlsPadding, 0);
+            binding.bottomControls.setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
+            binding.qualityTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
+                    buttonsPadding);
+            binding.playbackSpeed.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
+                    buttonsPadding);
+            binding.playbackSpeed.setMinimumWidth(buttonsMinWidth);
+            binding.captionTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
+                    buttonsPadding);
         }
     }
 
@@ -452,23 +385,23 @@ public void initListeners() {
         gestureDetector = new GestureDetector(context, listener);
         getRootView().setOnTouchListener(listener);
 
-        queueButton.setOnClickListener(this);
-        repeatButton.setOnClickListener(this);
-        shuffleButton.setOnClickListener(this);
+        binding.queueButton.setOnClickListener(this);
+        binding.repeatButton.setOnClickListener(this);
+        binding.shuffleButton.setOnClickListener(this);
 
-        playPauseButton.setOnClickListener(this);
-        playPreviousButton.setOnClickListener(this);
-        playNextButton.setOnClickListener(this);
+        binding.playPauseButton.setOnClickListener(this);
+        binding.playPreviousButton.setOnClickListener(this);
+        binding.playNextButton.setOnClickListener(this);
 
-        moreOptionsButton.setOnClickListener(this);
-        moreOptionsButton.setOnLongClickListener(this);
-        shareButton.setOnClickListener(this);
-        fullscreenButton.setOnClickListener(this);
-        screenRotationButton.setOnClickListener(this);
-        playWithKodi.setOnClickListener(this);
-        openInBrowser.setOnClickListener(this);
-        playerCloseButton.setOnClickListener(this);
-        muteButton.setOnClickListener(this);
+        binding.moreOptionsButton.setOnClickListener(this);
+        binding.moreOptionsButton.setOnLongClickListener(this);
+        binding.share.setOnClickListener(this);
+        binding.fullScreenButton.setOnClickListener(this);
+        binding.screenRotationButton.setOnClickListener(this);
+        binding.playWithKodi.setOnClickListener(this);
+        binding.openInBrowser.setOnClickListener(this);
+        binding.playerCloseButton.setOnClickListener(this);
+        binding.switchMute.setOnClickListener(this);
 
         settingsContentObserver = new ContentObserver(new Handler()) {
             @Override
@@ -481,24 +414,25 @@ public void onChange(final boolean selfChange) {
                 settingsContentObserver);
         getRootView().addOnLayoutChangeListener(this);
 
-        ViewCompat.setOnApplyWindowInsetsListener(queueLayout, (view, windowInsets) -> {
-            final DisplayCutoutCompat cutout = windowInsets.getDisplayCutout();
-            if (cutout != null) {
-                view.setPadding(cutout.getSafeInsetLeft(), cutout.getSafeInsetTop(),
-                        cutout.getSafeInsetRight(), cutout.getSafeInsetBottom());
-            }
-            return windowInsets;
-        });
+        ViewCompat.setOnApplyWindowInsetsListener(binding.playQueuePanel,
+                (view, windowInsets) -> {
+                    final DisplayCutoutCompat cutout = windowInsets.getDisplayCutout();
+                    if (cutout != null) {
+                        view.setPadding(cutout.getSafeInsetLeft(), cutout.getSafeInsetTop(),
+                                cutout.getSafeInsetRight(), cutout.getSafeInsetBottom());
+                    }
+                    return windowInsets;
+                });
 
         // PlaybackControlRoot already consumed window insets but we should pass them to
         // player_overlays too. Without it they will be off-centered
-        getControlsRoot().addOnLayoutChangeListener((v, left, top, right, bottom,
-                                                     oldLeft, oldTop, oldRight, oldBottom) ->
-                playerOverlays.setPadding(
-                        v.getPaddingLeft(),
-                        v.getPaddingTop(),
-                        v.getPaddingRight(),
-                        v.getPaddingBottom()));
+        binding.playbackControlRoot.addOnLayoutChangeListener(
+                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) ->
+                        binding.playerOverlays.setPadding(
+                                v.getPaddingLeft(),
+                                v.getPaddingTop(),
+                                v.getPaddingRight(),
+                                v.getPaddingBottom()));
     }
 
     public boolean onKeyDown(final int keyCode) {
@@ -521,7 +455,7 @@ public boolean onKeyDown(final int keyCode) {
             case KeyEvent.KEYCODE_DPAD_DOWN:
             case KeyEvent.KEYCODE_DPAD_RIGHT:
             case KeyEvent.KEYCODE_DPAD_CENTER:
-                if (getRootView().hasFocus() && !getControlsRoot().hasFocus()) {
+                if (getRootView().hasFocus() && !binding.playbackControlRoot.hasFocus()) {
                     // do not interfere with focus in playlist etc.
                     return false;
                 }
@@ -532,7 +466,7 @@ public boolean onKeyDown(final int keyCode) {
 
                 if (!isControlsVisible()) {
                     if (!queueVisible) {
-                        playPauseButton.requestFocus();
+                        binding.playPauseButton.requestFocus();
                     }
                     showControlsThenHide();
                     showSystemUIPartially();
@@ -548,13 +482,12 @@ public boolean onKeyDown(final int keyCode) {
 
     public AppCompatActivity getParentActivity() {
         // ! instanceof ViewGroup means that view was added via windowManager for Popup
-        if (getRootView() == null
-                || getRootView().getParent() == null
-                || !(getRootView().getParent() instanceof ViewGroup)) {
+        if (binding == null || binding.getRoot().getParent() == null
+                || !(binding.getRoot().getParent() instanceof ViewGroup)) {
             return null;
         }
 
-        final ViewGroup parent = (ViewGroup) getRootView().getParent();
+        final ViewGroup parent = (ViewGroup) binding.getRoot().getParent();
         return (AppCompatActivity) parent.getContext();
     }
 
@@ -644,13 +577,14 @@ public void onTimelineChanged(final Timeline timeline, final int reason) {
         NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, true);
     }
 
+    @Override
     protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
         super.onMetadataChanged(tag);
 
         showHideKodiButton();
 
-        titleTextView.setText(tag.getMetadata().getName());
-        channelTextView.setText(tag.getMetadata().getUploaderName());
+        binding.titleTextView.setText(tag.getMetadata().getName());
+        binding.channelTextView.setText(tag.getMetadata().getUploaderName());
 
         NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
         updateMetadata();
@@ -668,7 +602,7 @@ public void onPlaybackShutdown() {
     public void onMuteUnmuteButtonClicked() {
         super.onMuteUnmuteButtonClicked();
         updatePlayback();
-        setMuteButton(muteButton, isMuted());
+        setMuteButton(binding.switchMute, isMuted());
     }
 
     @Override
@@ -747,7 +681,7 @@ public void toggleFullscreen() {
         if (!isFullscreen) {
             // Apply window insets because Android will not do it when orientation changes
             // from landscape to portrait (open vertical video to reproduce)
-            getControlsRoot().setPadding(0, 0, 0, 0);
+            getPlaybackControlRoot().setPadding(0, 0, 0, 0);
         } else {
             // Android needs tens milliseconds to send new insets but a user is able to see
             // how controls changes it's position from `0` to `nav bar height` padding.
@@ -757,13 +691,14 @@ public void toggleFullscreen() {
         fragmentListener.onFullscreenStateChanged(isFullscreen());
 
         if (!isFullscreen()) {
-            titleTextView.setVisibility(View.GONE);
-            channelTextView.setVisibility(View.GONE);
-            playerCloseButton.setVisibility(videoPlayerSelected() ? View.VISIBLE : View.GONE);
+            binding.titleTextView.setVisibility(View.GONE);
+            binding.channelTextView.setVisibility(View.GONE);
+            binding.playerCloseButton.setVisibility(videoPlayerSelected()
+                    ? View.VISIBLE : View.GONE);
         } else {
-            titleTextView.setVisibility(View.VISIBLE);
-            channelTextView.setVisibility(View.VISIBLE);
-            playerCloseButton.setVisibility(View.GONE);
+            binding.titleTextView.setVisibility(View.VISIBLE);
+            binding.channelTextView.setVisibility(View.VISIBLE);
+            binding.playerCloseButton.setVisibility(View.GONE);
         }
         setupScreenRotationButton();
     }
@@ -771,34 +706,34 @@ public void toggleFullscreen() {
     @Override
     public void onClick(final View v) {
         super.onClick(v);
-        if (v.getId() == playPauseButton.getId()) {
+        if (v.getId() == binding.playPauseButton.getId()) {
             onPlayPause();
-        } else if (v.getId() == playPreviousButton.getId()) {
+        } else if (v.getId() == binding.playPreviousButton.getId()) {
             onPlayPrevious();
-        } else if (v.getId() == playNextButton.getId()) {
+        } else if (v.getId() == binding.playNextButton.getId()) {
             onPlayNext();
-        } else if (v.getId() == queueButton.getId()) {
+        } else if (v.getId() == binding.queueButton.getId()) {
             onQueueClicked();
             return;
-        } else if (v.getId() == repeatButton.getId()) {
+        } else if (v.getId() == binding.repeatButton.getId()) {
             onRepeatClicked();
             return;
-        } else if (v.getId() == shuffleButton.getId()) {
+        } else if (v.getId() == binding.shuffleButton.getId()) {
             onShuffleClicked();
             return;
-        } else if (v.getId() == moreOptionsButton.getId()) {
+        } else if (v.getId() == binding.moreOptionsButton.getId()) {
             onMoreOptionsClicked();
-        } else if (v.getId() == shareButton.getId()) {
+        } else if (v.getId() == binding.share.getId()) {
             onShareClicked();
-        } else if (v.getId() == playWithKodi.getId()) {
+        } else if (v.getId() == binding.playWithKodi.getId()) {
             onPlayWithKodiClicked();
-        } else if (v.getId() == openInBrowser.getId()) {
+        } else if (v.getId() == binding.openInBrowser.getId()) {
             onOpenInBrowserClicked();
-        } else if (v.getId() == fullscreenButton.getId()) {
+        } else if (v.getId() == binding.fullScreenButton.getId()) {
             setRecovery();
             NavigationHelper.playOnMainPlayer(context, getPlayQueue(), true);
             return;
-        } else if (v.getId() == screenRotationButton.getId()) {
+        } else if (v.getId() == binding.screenRotationButton.getId()) {
             // Only if it's not a vertical video or vertical video but in landscape with locked
             // orientation a screen orientation can be changed automatically
             if (!isVerticalVideo
@@ -807,32 +742,34 @@ public void onClick(final View v) {
             } else {
                 toggleFullscreen();
             }
-        } else if (v.getId() == muteButton.getId()) {
+        } else if (v.getId() == binding.switchMute.getId()) {
             onMuteUnmuteButtonClicked();
-        } else if (v.getId() == playerCloseButton.getId()) {
+        } else if (v.getId() == binding.playerCloseButton.getId()) {
             service.sendBroadcast(new Intent(VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER));
         }
 
         if (getCurrentState() != STATE_COMPLETED) {
             getControlsVisibilityHandler().removeCallbacksAndMessages(null);
             showHideShadow(true, DEFAULT_CONTROLS_DURATION, 0);
-            animateView(getControlsRoot(), true, DEFAULT_CONTROLS_DURATION, 0, () -> {
-                if (getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible()) {
-                    if (v.getId() == playPauseButton.getId()
-                            // Hide controls in fullscreen immediately
-                            || (v.getId() == screenRotationButton.getId() && isFullscreen)) {
-                        hideControls(0, 0);
-                    } else {
-                        hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
-                    }
-                }
-            });
+            animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0,
+                    () -> {
+                        if (getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible()) {
+                            if (v.getId() == binding.playPauseButton.getId()
+                                    // Hide controls in fullscreen immediately
+                                    || (v.getId() == binding.screenRotationButton.getId()
+                                    && isFullscreen)) {
+                                hideControls(0, 0);
+                            } else {
+                                hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+                            }
+                        }
+                    });
         }
     }
 
     @Override
     public boolean onLongClick(final View v) {
-        if (v.getId() == moreOptionsButton.getId() && isFullscreen()) {
+        if (v.getId() == binding.moreOptionsButton.getId() && isFullscreen()) {
             fragmentListener.onMoreOptionsLongClicked();
             hideControls(0, 0);
             hideSystemUIIfNeeded();
@@ -848,11 +785,11 @@ private void onQueueClicked() {
         updatePlaybackButtons();
 
         hideControls(0, 0);
-        queueLayout.requestFocus();
-        animateView(queueLayout, SLIDE_AND_ALPHA, true,
+        binding.playQueuePanel.requestFocus();
+        animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, true,
                 DEFAULT_CONTROLS_DURATION);
 
-        itemsList.scrollToPosition(playQueue.getIndex());
+        binding.playQueue.scrollToPosition(playQueue.getIndex());
     }
 
     public void onQueueClosed() {
@@ -860,14 +797,15 @@ public void onQueueClosed() {
             return;
         }
 
-        animateView(queueLayout, SLIDE_AND_ALPHA, false,
+        animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, false,
                 DEFAULT_CONTROLS_DURATION, 0, () -> {
                     // Even when queueLayout is GONE it receives touch events
                     // and ruins normal behavior of the app. This line fixes it
-                    queueLayout.setTranslationY(-queueLayout.getHeight() * 5);
+                    binding.playQueuePanel
+                            .setTranslationY(-binding.playQueuePanel.getHeight() * 5);
                 });
         queueVisible = false;
-        playPauseButton.requestFocus();
+        binding.playPauseButton.requestFocus();
     }
 
     private void onMoreOptionsClicked() {
@@ -875,18 +813,19 @@ private void onMoreOptionsClicked() {
             Log.d(TAG, "onMoreOptionsClicked() called");
         }
 
-        final boolean isMoreControlsVisible = secondaryControls.getVisibility() == View.VISIBLE;
+        final boolean isMoreControlsVisible =
+                binding.secondaryControls.getVisibility() == View.VISIBLE;
 
-        animateRotation(moreOptionsButton, DEFAULT_CONTROLS_DURATION,
+        animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION,
                 isMoreControlsVisible ? 0 : 180);
-        animateView(secondaryControls, SLIDE_AND_ALPHA, !isMoreControlsVisible,
+        animateView(binding.secondaryControls, SLIDE_AND_ALPHA, !isMoreControlsVisible,
                 DEFAULT_CONTROLS_DURATION, 0,
                 () -> {
                     // Fix for a ripple effect on background drawable.
                     // When view returns from GONE state it takes more milliseconds than returning
                     // from INVISIBLE state. And the delay makes ripple background end to fast
                     if (isMoreControlsVisible) {
-                        secondaryControls.setVisibility(View.INVISIBLE);
+                        binding.secondaryControls.setVisibility(View.INVISIBLE);
                     }
                 });
         showControls(DEFAULT_CONTROLS_DURATION);
@@ -896,7 +835,7 @@ private void onShareClicked() {
         // share video at the current time (youtube.com/watch?v=ID&t=SECONDS)
         // Timestamp doesn't make sense in a live stream so drop it
 
-        final int ts = getPlaybackSeekBar().getProgress() / 1000;
+        final int ts = playbackSeekBar.getProgress() / 1000;
         final MediaSourceTag metadata = getCurrentMetadata();
         String videoUrl = getVideoUrl();
         if (!isLive() && ts >= 0 && metadata != null
@@ -938,18 +877,18 @@ private void showHideKodiButton() {
         // show kodi button if it supports the current service and it is enabled in settings
         final boolean showKodiButton = playQueue != null && playQueue.getItem() != null
                 && KoreUtil.shouldShowPlayWithKodi(context, playQueue.getItem().getServiceId());
-        playWithKodi.setVisibility(videoPlayerSelected() && kodiEnabled && showKodiButton
-                ? View.VISIBLE : View.GONE);
+        binding.playWithKodi.setVisibility(videoPlayerSelected() && kodiEnabled
+                && showKodiButton ? View.VISIBLE : View.GONE);
     }
 
     private void setupScreenRotationButton() {
         final boolean orientationLocked = PlayerHelper.globalScreenOrientationLocked(service);
         final boolean showButton = videoPlayerSelected()
                 && (orientationLocked || isVerticalVideo || DeviceUtils.isTablet(service));
-        screenRotationButton.setVisibility(showButton ? View.VISIBLE : View.GONE);
-        screenRotationButton.setImageDrawable(AppCompatResources.getDrawable(service, isFullscreen()
-                ? R.drawable.ic_fullscreen_exit_white_24dp
-                : R.drawable.ic_fullscreen_white_24dp));
+        binding.screenRotationButton.setVisibility(showButton ? View.VISIBLE : View.GONE);
+        binding.screenRotationButton.setImageDrawable(AppCompatResources.getDrawable(service,
+                isFullscreen() ? R.drawable.ic_fullscreen_exit_white_24dp
+                        : R.drawable.ic_fullscreen_white_24dp));
     }
 
     private void prepareOrientation() {
@@ -1009,11 +948,12 @@ public void onLayoutChange(final View view, final int l, final int t, final int
                 Log.d(TAG, "maxGestureLength = " + maxGestureLength);
             }
 
-            volumeProgressBar.setMax(maxGestureLength);
-            brightnessProgressBar.setMax(maxGestureLength);
+            binding.volumeProgressBar.setMax(maxGestureLength);
+            binding.brightnessProgressBar.setMax(maxGestureLength);
 
             setInitialGestureValues();
-            queueLayout.getLayoutParams().height = height - queueLayout.getTop();
+            binding.playQueuePanel.getLayoutParams().height = height
+                    - binding.playQueuePanel.getTop();
         }
     }
 
@@ -1073,7 +1013,8 @@ public int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
         //////////////////////////////////////////////////////////////////////////*/
 
     private void animatePlayButtons(final boolean show, final int duration) {
-        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show,
+                duration);
 
         boolean showQueueButtons = show;
         if (playQueue == null) {
@@ -1082,19 +1023,18 @@ private void animatePlayButtons(final boolean show, final int duration) {
 
         if (!showQueueButtons || playQueue.getIndex() > 0) {
             animateView(
-                playPreviousButton,
+                binding.playPreviousButton,
                 AnimationUtils.Type.SCALE_AND_ALPHA,
                 showQueueButtons,
                 duration);
         }
         if (!showQueueButtons || playQueue.getIndex() + 1 < playQueue.getStreams().size()) {
             animateView(
-                playNextButton,
+                binding.playNextButton,
                 AnimationUtils.Type.SCALE_AND_ALPHA,
                 showQueueButtons,
                 duration);
         }
-
     }
 
     @Override
@@ -1106,7 +1046,7 @@ public void changeState(final int state) {
     @Override
     public void onBlocked() {
         super.onBlocked();
-        playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
+        binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
         animatePlayButtons(false, 100);
         getRootView().setKeepScreenOn(false);
 
@@ -1126,13 +1066,14 @@ public void onBuffering() {
     @Override
     public void onPlaying() {
         super.onPlaying();
-        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
-            animatePlayButtons(true, 200);
-            if (!queueVisible) {
-                playPauseButton.requestFocus();
-            }
-        });
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false,
+                80, 0, () -> {
+                    binding.playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
+                    animatePlayButtons(true, 200);
+                    if (!queueVisible) {
+                        binding.playPauseButton.requestFocus();
+                    }
+                });
 
         updateWindowFlags(ONGOING_PLAYBACK_WINDOW_FLAGS);
         checkLandscape();
@@ -1144,13 +1085,15 @@ public void onPlaying() {
     @Override
     public void onPaused() {
         super.onPaused();
-        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
-            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
-            animatePlayButtons(true, 200);
-            if (!queueVisible) {
-                playPauseButton.requestFocus();
-            }
-        });
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA,
+                false, 80, 0, () -> {
+                    binding.playPauseButton
+                            .setImageResource(R.drawable.ic_play_arrow_white_24dp);
+                    animatePlayButtons(true, 200);
+                    if (!queueVisible) {
+                        binding.playPauseButton.requestFocus();
+                    }
+                });
 
         updateWindowFlags(IDLE_WINDOW_FLAGS);
 
@@ -1177,10 +1120,11 @@ public void onPausedSeek() {
 
     @Override
     public void onCompleted() {
-        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, () -> {
-            playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
-            animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
-        });
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false,
+                0, 0, () -> {
+                    binding.playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
+                    animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
+                });
 
         getRootView().setKeepScreenOn(false);
         updateWindowFlags(IDLE_WINDOW_FLAGS);
@@ -1355,8 +1299,8 @@ private void setInitialGestureValues() {
         if (getAudioReactor() != null) {
             final float currentVolumeNormalized = (float) getAudioReactor()
                     .getVolume() / getAudioReactor().getMaxVolume();
-            volumeProgressBar.setProgress(
-                    (int) (volumeProgressBar.getMax() * currentVolumeNormalized));
+            binding.volumeProgressBar.setProgress(
+                    (int) (binding.volumeProgressBar.getMax() * currentVolumeNormalized));
         }
     }
 
@@ -1453,14 +1397,15 @@ public void hideControls(final long duration, final long delay) {
         getControlsVisibilityHandler().removeCallbacksAndMessages(null);
         getControlsVisibilityHandler().postDelayed(() -> {
                     showHideShadow(false, duration, 0);
-                    animateView(getControlsRoot(), false, duration, 0, this::hideSystemUIIfNeeded);
+                    animateView(binding.playbackControlRoot, false, duration, 0,
+                            this::hideSystemUIIfNeeded);
                 }, delay
         );
     }
 
     @Override
     public void safeHideControls(final long duration, final long delay) {
-        if (getControlsRoot().isInTouchMode()) {
+        if (binding.playbackControlRoot.isInTouchMode()) {
             hideControls(duration, delay);
         }
     }
@@ -1474,12 +1419,12 @@ private void showOrHideButtons() {
         final boolean showNext = playQueue.getIndex() + 1 != playQueue.getStreams().size();
         final boolean showQueue = playQueue.getStreams().size() > 1 && !popupPlayerSelected();
 
-        playPreviousButton.setVisibility(showPrev ? View.VISIBLE : View.INVISIBLE);
-        playPreviousButton.setAlpha(showPrev ? 1.0f : 0.0f);
-        playNextButton.setVisibility(showNext ? View.VISIBLE : View.INVISIBLE);
-        playNextButton.setAlpha(showNext ? 1.0f : 0.0f);
-        queueButton.setVisibility(showQueue ? View.VISIBLE : View.GONE);
-        queueButton.setAlpha(showQueue ? 1.0f : 0.0f);
+        binding.playPreviousButton.setVisibility(showPrev ? View.VISIBLE : View.INVISIBLE);
+        binding.playPreviousButton.setAlpha(showPrev ? 1.0f : 0.0f);
+        binding.playNextButton.setVisibility(showNext ? View.VISIBLE : View.INVISIBLE);
+        binding.playNextButton.setAlpha(showNext ? 1.0f : 0.0f);
+        binding.queueButton.setVisibility(showQueue ? View.VISIBLE : View.GONE);
+        binding.queueButton.setAlpha(showQueue ? 1.0f : 0.0f);
     }
 
     private void showSystemUIPartially() {
@@ -1524,15 +1469,12 @@ private boolean isInMultiWindow() {
     }
 
     private void updatePlaybackButtons() {
-        if (repeatButton == null
-                || shuffleButton == null
-                || simpleExoPlayer == null
-                || playQueue == null) {
+        if (binding == null || simpleExoPlayer == null || playQueue == null) {
             return;
         }
 
-        setRepeatModeButton(repeatButton, getRepeatMode());
-        setShuffleButton(shuffleButton, playQueue.isShuffled());
+        setRepeatModeButton(binding.repeatButton, getRepeatMode());
+        setShuffleButton(binding.shuffleButton, playQueue.isShuffled());
     }
 
     public void checkLandscape() {
@@ -1553,19 +1495,19 @@ && videoPlayerSelected()
     }
 
     private void buildQueue() {
-        itemsList.setAdapter(playQueueAdapter);
-        itemsList.setClickable(true);
-        itemsList.setLongClickable(true);
+        binding.playQueue.setAdapter(playQueueAdapter);
+        binding.playQueue.setClickable(true);
+        binding.playQueue.setLongClickable(true);
 
-        itemsList.clearOnScrollListeners();
-        itemsList.addOnScrollListener(getQueueScrollListener());
+        binding.playQueue.clearOnScrollListeners();
+        binding.playQueue.addOnScrollListener(getQueueScrollListener());
 
         itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
-        itemTouchHelper.attachToRecyclerView(itemsList);
+        itemTouchHelper.attachToRecyclerView(binding.playQueue);
 
         playQueueAdapter.setSelectedListener(getOnSelectedListener());
 
-        itemsListCloseButton.setOnClickListener(view -> onQueueClosed());
+        binding.playQueueClose.setOnClickListener(view -> onQueueClosed());
     }
 
     public void useVideoSource(final boolean video) {
@@ -1589,8 +1531,8 @@ private OnScrollBelowItemsListener getQueueScrollListener() {
             public void onScrolledDown(final RecyclerView recyclerView) {
                 if (playQueue != null && !playQueue.isComplete()) {
                     playQueue.fetch();
-                } else if (itemsList != null) {
-                    itemsList.clearOnScrollListeners();
+                } else if (binding != null) {
+                    binding.playQueue.clearOnScrollListeners();
                 }
             }
         };
@@ -1682,8 +1624,8 @@ private void initPopup() {
 
         checkPopupPositionBounds();
 
-        getLoadingPanel().setMinimumWidth(popupLayoutParams.width);
-        getLoadingPanel().setMinimumHeight(popupLayoutParams.height);
+        binding.loadingPanel.setMinimumWidth(popupLayoutParams.width);
+        binding.loadingPanel.setMinimumHeight(popupLayoutParams.height);
 
         service.removeViewFromParent();
         windowManager.addView(getRootView(), popupLayoutParams);
@@ -1933,10 +1875,9 @@ private void end() {
     }
 
     private boolean popupHasParent() {
-        final View root = getRootView();
-        return root != null
-                && root.getLayoutParams() instanceof WindowManager.LayoutParams
-                && root.getParent() != null;
+        return binding != null
+                && binding.getRoot().getLayoutParams() instanceof WindowManager.LayoutParams
+                && binding.getRoot().getParent() != null;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -1949,9 +1890,9 @@ public void setFragmentListener(final PlayerServiceEventListener listener) {
         // Apply window insets because Android will not do it when orientation changes
         // from landscape to portrait
         if (!isFullscreen) {
-            getControlsRoot().setPadding(0, 0, 0, 0);
+            binding.playbackControlRoot.setPadding(0, 0, 0, 0);
         }
-        queueLayout.setPadding(0, 0, 0, 0);
+        binding.playQueuePanel.setPadding(0, 0, 0, 0);
         updateQueue();
         updateMetadata();
         updatePlayback();
@@ -2050,31 +1991,31 @@ private void onFragmentStopped() {
     ///////////////////////////////////////////////////////////////////////////
 
     public RelativeLayout getVolumeRelativeLayout() {
-        return volumeRelativeLayout;
+        return binding.volumeRelativeLayout;
     }
 
     public ProgressBar getVolumeProgressBar() {
-        return volumeProgressBar;
+        return binding.volumeProgressBar;
     }
 
     public ImageView getVolumeImageView() {
-        return volumeImageView;
+        return binding.volumeImageView;
     }
 
     public RelativeLayout getBrightnessRelativeLayout() {
-        return brightnessRelativeLayout;
+        return binding.brightnessRelativeLayout;
     }
 
     public ProgressBar getBrightnessProgressBar() {
-        return brightnessProgressBar;
+        return binding.brightnessProgressBar;
     }
 
     public ImageView getBrightnessImageView() {
-        return brightnessImageView;
+        return binding.brightnessImageView;
     }
 
     public ImageButton getPlayPauseButton() {
-        return playPauseButton;
+        return binding.playPauseButton;
     }
 
     public int getMaxGestureLength() {
@@ -2082,7 +2023,7 @@ public int getMaxGestureLength() {
     }
 
     public TextView getResizingIndicator() {
-        return resizingIndicator;
+        return binding.resizingIndicator;
     }
 
     public GestureDetector getGestureDetector() {
@@ -2125,8 +2066,8 @@ public View getCloseOverlayButton() {
         return closeOverlayButton;
     }
 
-    public View getClosingOverlayView() {
-        return closingOverlayView;
+    public View getClosingOverlay() {
+        return binding.closingOverlay;
     }
 
     public boolean isVerticalVideo() {
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index ab1330f7b6a..b6916e620ad 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -123,7 +123,7 @@ public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
             }
 
         } else /* MainPlayer.PlayerType.POPUP */ {
-            final View closingOverlayView = playerImpl.getClosingOverlayView();
+            final View closingOverlayView = playerImpl.getClosingOverlay();
             if (playerImpl.isInsideClosingRadius(movingEvent)) {
                 if (closingOverlayView.getVisibility() == View.GONE) {
                     animateView(closingOverlayView, true, 250);
@@ -240,7 +240,7 @@ public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
             if (playerImpl.isInsideClosingRadius(event)) {
                 playerImpl.closePopup();
             } else {
-                animateView(playerImpl.getClosingOverlayView(), false, 0);
+                animateView(playerImpl.getClosingOverlay(), false, 0);
 
                 if (!playerImpl.isPopupClosing) {
                     animateView(playerImpl.getCloseOverlayButton(), false, 200);

From fa75c79d34e79e2a71a304bde3e1629d0e1c6194 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 23 Dec 2020 06:47:36 +0530
Subject: [PATCH 041/131] Use view binding (PlayerPopupCloseOverlayBinding) in
 VideoPlayerImpl.

---
 .../newpipe/player/VideoPlayerImpl.java       | 48 +++++++++----------
 .../player/event/BasePlayerGestureListener.kt |  2 +-
 .../player/event/PlayerGestureListener.java   |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index a968ddc9141..949b11374c7 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -39,6 +39,7 @@
 import android.view.GestureDetector;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -73,11 +74,11 @@
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SubtitleView;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.PlayerBinding;
+import org.schabi.newpipe.databinding.PlayerPopupCloseOverlayBinding;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
@@ -172,8 +173,7 @@ public class VideoPlayerImpl extends VideoPlayer
     private WindowManager.LayoutParams popupLayoutParams;
     public WindowManager windowManager;
 
-    private View closeOverlayView;
-    private FloatingActionButton closeOverlayButton;
+    private PlayerPopupCloseOverlayBinding closeOverlayBinding;
 
     public boolean isPopupClosing = false;
 
@@ -1341,10 +1341,10 @@ public boolean isPlayerStopped() {
     }
 
     private int distanceFromCloseButton(final MotionEvent popupMotionEvent) {
-        final int closeOverlayButtonX = closeOverlayButton.getLeft()
-                + closeOverlayButton.getWidth() / 2;
-        final int closeOverlayButtonY = closeOverlayButton.getTop()
-                + closeOverlayButton.getHeight() / 2;
+        final int closeOverlayButtonX = closeOverlayBinding.closeButton.getLeft()
+                + closeOverlayBinding.closeButton.getWidth() / 2;
+        final int closeOverlayButtonY = closeOverlayBinding.closeButton.getTop()
+                + closeOverlayBinding.closeButton.getHeight() / 2;
 
         final float fingerX = popupLayoutParams.x + popupMotionEvent.getX();
         final float fingerY = popupLayoutParams.y + popupMotionEvent.getY();
@@ -1354,7 +1354,7 @@ private int distanceFromCloseButton(final MotionEvent popupMotionEvent) {
     }
 
     private float getClosingRadius() {
-        final int buttonRadius = closeOverlayButton.getWidth() / 2;
+        final int buttonRadius = closeOverlayBinding.closeButton.getWidth() / 2;
         // 20% wider than the button itself
         return buttonRadius * 1.2f;
     }
@@ -1641,12 +1641,11 @@ private void initPopupCloseOverlay() {
         }
 
         // closeOverlayView is already added to windowManager
-        if (closeOverlayView != null) {
+        if (closeOverlayBinding != null) {
             return;
         }
 
-        closeOverlayView = View.inflate(service, R.layout.player_popup_close_overlay, null);
-        closeOverlayButton = closeOverlayView.findViewById(R.id.closeButton);
+        closeOverlayBinding = PlayerPopupCloseOverlayBinding.inflate(LayoutInflater.from(service));
 
         final int flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
                 | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
@@ -1661,8 +1660,8 @@ private void initPopupCloseOverlay() {
         closeOverlayLayoutParams.softInputMode =
                 WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
 
-        closeOverlayButton.setVisibility(View.GONE);
-        windowManager.addView(closeOverlayView, closeOverlayLayoutParams);
+        closeOverlayBinding.closeButton.setVisibility(View.GONE);
+        windowManager.addView(closeOverlayBinding.getRoot(), closeOverlayLayoutParams);
     }
 
     private void initVideoPlayer() {
@@ -1835,22 +1834,23 @@ public void closePopup() {
     }
 
     public void removePopupFromView() {
-        final boolean isCloseOverlayHasParent = closeOverlayView != null
-                && closeOverlayView.getParent() != null;
+        final boolean isCloseOverlayHasParent = closeOverlayBinding != null
+                && closeOverlayBinding.getRoot().getParent() != null;
         if (popupHasParent()) {
             windowManager.removeView(getRootView());
         }
         if (isCloseOverlayHasParent) {
-            windowManager.removeView(closeOverlayView);
+            windowManager.removeView(closeOverlayBinding.getRoot());
         }
     }
 
     private void animateOverlayAndFinishService() {
-        final int targetTranslationY = (int) (closeOverlayButton.getRootView().getHeight()
-                - closeOverlayButton.getY());
+        final int targetTranslationY =
+                (int) (closeOverlayBinding.closeButton.getRootView().getHeight()
+                        - closeOverlayBinding.closeButton.getY());
 
-        closeOverlayButton.animate().setListener(null).cancel();
-        closeOverlayButton.animate()
+        closeOverlayBinding.closeButton.animate().setListener(null).cancel();
+        closeOverlayBinding.closeButton.animate()
                 .setInterpolator(new AnticipateInterpolator())
                 .translationY(targetTranslationY)
                 .setDuration(400)
@@ -1866,8 +1866,8 @@ public void onAnimationEnd(final Animator animation) {
                     }
 
                     private void end() {
-                        windowManager.removeView(closeOverlayView);
-                        closeOverlayView = null;
+                        windowManager.removeView(closeOverlayBinding.getRoot());
+                        closeOverlayBinding = null;
 
                         service.onDestroy();
                     }
@@ -2062,8 +2062,8 @@ public void setPopupHeight(final float height) {
         popupHeight = height;
     }
 
-    public View getCloseOverlayButton() {
-        return closeOverlayButton;
+    public View getCloseButton() {
+        return closeOverlayBinding.closeButton;
     }
 
     public View getClosingOverlay() {
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
index 043e7f31de6..d34746ca50c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
@@ -371,7 +371,7 @@ abstract class BasePlayerGestureListener(
         }
 
         if (!isMovingInPopup) {
-            AnimationUtils.animateView(playerImpl.closeOverlayButton, true, 200)
+            AnimationUtils.animateView(playerImpl.closeButton, true, 200)
         }
 
         isMovingInPopup = true
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index b6916e620ad..8f95147810d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -243,7 +243,7 @@ public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
                 animateView(playerImpl.getClosingOverlay(), false, 0);
 
                 if (!playerImpl.isPopupClosing) {
-                    animateView(playerImpl.getCloseOverlayButton(), false, 200);
+                    animateView(playerImpl.getCloseButton(), false, 200);
                 }
             }
         }

From 98be89a20ac833bf9ec7af55e8d71ea8c0477766 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 09:47:27 +0530
Subject: [PATCH 042/131] Return ViewBinding instead of View in
 BaseLocalListFragment's getListHeader() and getListFooter() methods.

---
 .../newpipe/local/BaseLocalListFragment.java  | 37 ++++----
 .../history/StatisticsPlaylistFragment.java   | 66 +++++++--------
 .../local/playlist/LocalPlaylistFragment.java | 84 ++++++++-----------
 .../main/res/layout/local_playlist_header.xml |  5 +-
 .../res/layout/statistic_playlist_control.xml |  4 +-
 5 files changed, 93 insertions(+), 103 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 8e88ceaed4e..38ecc1c631c 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -4,6 +4,8 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
+
+import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.view.Menu;
@@ -15,8 +17,10 @@
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewbinding.ViewBinding;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.PignateFooterBinding;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.list.ListViewContract;
 
@@ -42,8 +46,8 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
     //////////////////////////////////////////////////////////////////////////*/
 
     private static final int LIST_MODE_UPDATE_FLAG = 0x32;
-    private View headerRootView;
-    private View footerRootView;
+    private ViewBinding headerRootBinding;
+    private ViewBinding footerRootBinding;
     protected LocalItemListAdapter itemListAdapter;
     protected RecyclerView itemsList;
     private int updateFlags = 0;
@@ -86,12 +90,13 @@ public void onResume() {
     // Lifecycle - View
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected View getListHeader() {
+    @Nullable
+    protected ViewBinding getListHeader() {
         return null;
     }
 
-    protected View getListFooter() {
-        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
+    protected ViewBinding getListFooter() {
+        return PignateFooterBinding.inflate(activity.getLayoutInflater(), itemsList, false);
     }
 
     protected RecyclerView.LayoutManager getGridLayoutManager() {
@@ -120,10 +125,12 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
         itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
         itemListAdapter.setUseGridVariant(useGrid);
-        headerRootView = getListHeader();
-        itemListAdapter.setHeader(headerRootView);
-        footerRootView = getListFooter();
-        itemListAdapter.setFooter(footerRootView);
+        headerRootBinding = getListHeader();
+        if (headerRootBinding != null) {
+            itemListAdapter.setHeader(headerRootBinding.getRoot());
+        }
+        footerRootBinding = getListFooter();
+        itemListAdapter.setFooter(footerRootBinding.getRoot());
 
         itemsList.setAdapter(itemListAdapter);
     }
@@ -180,8 +187,8 @@ public void showLoading() {
         if (itemsList != null) {
             animateView(itemsList, false, 200);
         }
-        if (headerRootView != null) {
-            animateView(headerRootView, false, 200);
+        if (headerRootBinding != null) {
+            animateView(headerRootBinding.getRoot(), false, 200);
         }
     }
 
@@ -191,8 +198,8 @@ public void hideLoading() {
         if (itemsList != null) {
             animateView(itemsList, true, 200);
         }
-        if (headerRootView != null) {
-            animateView(headerRootView, true, 200);
+        if (headerRootBinding != null) {
+            animateView(headerRootBinding.getRoot(), true, 200);
         }
     }
 
@@ -204,8 +211,8 @@ public void showError(final String message, final boolean showRetryButton) {
         if (itemsList != null) {
             animateView(itemsList, false, 200);
         }
-        if (headerRootView != null) {
-            animateView(headerRootView, false, 200);
+        if (headerRootBinding != null) {
+            animateView(headerRootBinding.getRoot(), false, 200);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 0d549ecf91a..f9aa38054eb 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -10,13 +10,12 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.viewbinding.ViewBinding;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -26,6 +25,8 @@
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.databinding.PlaylistControlBinding;
+import org.schabi.newpipe.databinding.StatisticPlaylistControlBinding;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemDialog;
@@ -60,13 +61,10 @@ public class StatisticsPlaylistFragment
     @State
     Parcelable itemsListState;
     private StatisticSortMode sortMode = StatisticSortMode.LAST_PLAYED;
-    private View headerPlayAllButton;
-    private View headerPopupButton;
-    private View headerBackgroundButton;
-    private View playlistCtrl;
-    private View sortButton;
-    private ImageView sortButtonIcon;
-    private TextView sortButtonText;
+
+    private StatisticPlaylistControlBinding headerBinding;
+    private PlaylistControlBinding playlistControlBinding;
+
     /* Used for independent events */
     private Subscription databaseSubscription;
     private HistoryRecordManager recordManager;
@@ -131,17 +129,12 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
     }
 
     @Override
-    protected View getListHeader() {
-        final View headerRootLayout = activity.getLayoutInflater()
-                .inflate(R.layout.statistic_playlist_control, itemsList, false);
-        playlistCtrl = headerRootLayout.findViewById(R.id.playlist_control);
-        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
-        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
-        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
-        sortButton = headerRootLayout.findViewById(R.id.sortButton);
-        sortButtonIcon = headerRootLayout.findViewById(R.id.sortButtonIcon);
-        sortButtonText = headerRootLayout.findViewById(R.id.sortButtonText);
-        return headerRootLayout;
+    protected ViewBinding getListHeader() {
+        headerBinding = StatisticPlaylistControlBinding.inflate(activity.getLayoutInflater(),
+                itemsList, false);
+        playlistControlBinding = headerBinding.playlistControl;
+
+        return headerBinding;
     }
 
     @Override
@@ -245,14 +238,13 @@ public void onDestroyView() {
         if (itemListAdapter != null) {
             itemListAdapter.unsetSelectedListener();
         }
-        if (headerBackgroundButton != null) {
-            headerBackgroundButton.setOnClickListener(null);
-        }
-        if (headerPlayAllButton != null) {
-            headerPlayAllButton.setOnClickListener(null);
-        }
-        if (headerPopupButton != null) {
-            headerPopupButton.setOnClickListener(null);
+        if (playlistControlBinding != null) {
+            playlistControlBinding.playlistCtrlPlayBgButton.setOnClickListener(null);
+            playlistControlBinding.playlistCtrlPlayAllButton.setOnClickListener(null);
+            playlistControlBinding.playlistCtrlPlayPopupButton.setOnClickListener(null);
+
+            headerBinding = null;
+            playlistControlBinding = null;
         }
 
         if (databaseSubscription != null) {
@@ -311,7 +303,7 @@ public void handleResult(@NonNull final List<StreamStatisticsEntry> result) {
             return;
         }
 
-        playlistCtrl.setVisibility(View.VISIBLE);
+        playlistControlBinding.getRoot().setVisibility(View.VISIBLE);
 
         itemListAdapter.clearStreamItemList();
 
@@ -326,13 +318,13 @@ public void handleResult(@NonNull final List<StreamStatisticsEntry> result) {
             itemsListState = null;
         }
 
-        headerPlayAllButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayAllButton.setOnClickListener(view ->
                 NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
-        headerPopupButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnClickListener(view ->
                 NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
-        headerBackgroundButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnClickListener(view ->
                 NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
-        sortButton.setOnClickListener(view -> toggleSortMode());
+        headerBinding.sortButton.setOnClickListener(view -> toggleSortMode());
 
         hideLoading();
     }
@@ -368,15 +360,15 @@ private void toggleSortMode() {
         if (sortMode == StatisticSortMode.LAST_PLAYED) {
             sortMode = StatisticSortMode.MOST_PLAYED;
             setTitle(getString(R.string.title_most_played));
-            sortButtonIcon.setImageResource(
+            headerBinding.sortButtonIcon.setImageResource(
                 ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_history));
-            sortButtonText.setText(R.string.title_last_played);
+            headerBinding.sortButtonText.setText(R.string.title_last_played);
         } else {
             sortMode = StatisticSortMode.LAST_PLAYED;
             setTitle(getString(R.string.title_last_played));
-            sortButtonIcon.setImageResource(
+            headerBinding.sortButtonIcon.setImageResource(
                 ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_filter_list));
-            sortButtonText.setText(R.string.title_most_played);
+            headerBinding.sortButtonText.setText(R.string.title_most_played);
         }
         startLoading(true);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 17f7a4ff9ef..08b7101e66a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -14,7 +14,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -22,6 +21,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewbinding.ViewBinding;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -32,6 +32,8 @@
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.databinding.LocalPlaylistHeaderBinding;
+import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemDialog;
@@ -77,13 +79,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     @State
     Parcelable itemsListState;
 
-    private View headerRootLayout;
-    private TextView headerTitleView;
-    private TextView headerStreamCount;
-    private View playlistControl;
-    private View headerPlayAllButton;
-    private View headerPopupButton;
-    private View headerBackgroundButton;
+    private LocalPlaylistHeaderBinding headerBinding;
+    private PlaylistControlBinding playlistControlBinding;
 
     private ItemTouchHelper itemTouchHelper;
 
@@ -137,8 +134,8 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     public void setTitle(final String title) {
         super.setTitle(title);
 
-        if (headerTitleView != null) {
-            headerTitleView.setText(title);
+        if (headerBinding != null) {
+            headerBinding.playlistTitleView.setText(title);
         }
     }
 
@@ -149,28 +146,21 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
     }
 
     @Override
-    protected View getListHeader() {
-        headerRootLayout = activity.getLayoutInflater()
-                .inflate(R.layout.local_playlist_header, itemsList, false);
+    protected ViewBinding getListHeader() {
+        headerBinding = LocalPlaylistHeaderBinding.inflate(activity.getLayoutInflater(), itemsList,
+                false);
+        playlistControlBinding = headerBinding.playlistControl;
 
-        headerTitleView = headerRootLayout.findViewById(R.id.playlist_title_view);
-        headerTitleView.setSelected(true);
+        headerBinding.playlistTitleView.setSelected(true);
 
-        headerStreamCount = headerRootLayout.findViewById(R.id.playlist_stream_count);
-
-        playlistControl = headerRootLayout.findViewById(R.id.playlist_control);
-        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
-        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
-        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
-
-        return headerRootLayout;
+        return headerBinding;
     }
 
     @Override
     protected void initListeners() {
         super.initListeners();
 
-        headerTitleView.setOnClickListener(view -> createRenameDialog());
+        headerBinding.playlistTitleView.setOnClickListener(view -> createRenameDialog());
 
         itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
         itemTouchHelper.attachToRecyclerView(itemsList);
@@ -210,22 +200,18 @@ public void drag(final LocalItem selectedItem,
     @Override
     public void showLoading() {
         super.showLoading();
-        if (headerRootLayout != null) {
-            animateView(headerRootLayout, false, 200);
-        }
-        if (playlistControl != null) {
-            animateView(playlistControl, false, 200);
+        if (headerBinding != null) {
+            animateView(headerBinding.getRoot(), false, 200);
+            animateView(playlistControlBinding.getRoot(), false, 200);
         }
     }
 
     @Override
     public void hideLoading() {
         super.hideLoading();
-        if (headerRootLayout != null) {
-            animateView(headerRootLayout, true, 200);
-        }
-        if (playlistControl != null) {
-            animateView(playlistControl, true, 200);
+        if (headerBinding != null) {
+            animateView(headerBinding.getRoot(), true, 200);
+            animateView(playlistControlBinding.getRoot(), true, 200);
         }
     }
 
@@ -277,14 +263,13 @@ public void onDestroyView() {
         if (itemListAdapter != null) {
             itemListAdapter.unsetSelectedListener();
         }
-        if (headerBackgroundButton != null) {
-            headerBackgroundButton.setOnClickListener(null);
-        }
-        if (headerPlayAllButton != null) {
-            headerPlayAllButton.setOnClickListener(null);
-        }
-        if (headerPopupButton != null) {
-            headerPopupButton.setOnClickListener(null);
+        if (playlistControlBinding != null) {
+            playlistControlBinding.playlistCtrlPlayBgButton.setOnClickListener(null);
+            playlistControlBinding.playlistCtrlPlayAllButton.setOnClickListener(null);
+            playlistControlBinding.playlistCtrlPlayPopupButton.setOnClickListener(null);
+
+            headerBinding = null;
+            playlistControlBinding = null;
         }
 
         if (databaseSubscription != null) {
@@ -494,19 +479,19 @@ public void handleResult(@NonNull final List<PlaylistStreamEntry> result) {
         }
         setVideoCount(itemListAdapter.getItemsList().size());
 
-        headerPlayAllButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayAllButton.setOnClickListener(view ->
                 NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
-        headerPopupButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnClickListener(view ->
                 NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
-        headerBackgroundButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnClickListener(view ->
                 NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
-        headerPopupButton.setOnLongClickListener(view -> {
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
             return true;
         });
 
-        headerBackgroundButton.setOnLongClickListener(view -> {
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
             return true;
         });
@@ -806,8 +791,9 @@ private void setInitialData(final long pid, final String title) {
     }
 
     private void setVideoCount(final long count) {
-        if (activity != null && headerStreamCount != null) {
-            headerStreamCount.setText(Localization.localizeStreamCount(activity, count));
+        if (activity != null && headerBinding != null) {
+            headerBinding.playlistStreamCount.setText(Localization
+                    .localizeStreamCount(activity, count));
         }
     }
 
diff --git a/app/src/main/res/layout/local_playlist_header.xml b/app/src/main/res/layout/local_playlist_header.xml
index 5cd44944e99..53c0c434390 100644
--- a/app/src/main/res/layout/local_playlist_header.xml
+++ b/app/src/main/res/layout/local_playlist_header.xml
@@ -40,7 +40,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/playlist_stream_count">
 
-        <include layout="@layout/playlist_control" />
+        <include
+            android:id="@+id/playlist_control"
+            layout="@layout/playlist_control" />
+
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/statistic_playlist_control.xml b/app/src/main/res/layout/statistic_playlist_control.xml
index ef090807ccd..c8eff8fd38c 100644
--- a/app/src/main/res/layout/statistic_playlist_control.xml
+++ b/app/src/main/res/layout/statistic_playlist_control.xml
@@ -38,6 +38,8 @@
             tools:ignore="RtlHardcoded" />
     </RelativeLayout>
 
-    <include layout="@layout/playlist_control" />
+    <include
+        android:id="@+id/playlist_control"
+        layout="@layout/playlist_control" />
 
 </LinearLayout>

From 979102a2d932cd17ce58d367244c6c906dcc81a8 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 10:49:19 +0530
Subject: [PATCH 043/131] Return ViewBinding instead of View in
 BaseListFragment's getListHeader() and getListFooter() methods.

---
 .../fragments/list/BaseListFragment.java      |  18 ++-
 .../list/channel/ChannelFragment.java         | 152 +++++++++---------
 .../list/playlist/PlaylistFragment.java       |  89 +++++-----
 .../list/videos/RelatedVideosFragment.java    |  46 +++---
 app/src/main/res/layout/channel_header.xml    |   5 +-
 app/src/main/res/layout/playlist_header.xml   |   4 +-
 6 files changed, 155 insertions(+), 159 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index a40ff1bf319..02c7a48183a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -12,13 +12,16 @@
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewbinding.ViewBinding;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.PignateFooterBinding;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
@@ -215,12 +218,13 @@ public void onStart() {
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected View getListHeader() {
+    @Nullable
+    protected ViewBinding getListHeader() {
         return null;
     }
 
-    protected View getListFooter() {
-        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
+    protected ViewBinding getListFooter() {
+        return PignateFooterBinding.inflate(activity.getLayoutInflater(), itemsList, false);
     }
 
     protected RecyclerView.LayoutManager getListLayoutManager() {
@@ -247,8 +251,12 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
         itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
         infoListAdapter.setUseGridVariant(useGrid);
-        infoListAdapter.setFooter(getListFooter());
-        infoListAdapter.setHeader(getListHeader());
+        infoListAdapter.setFooter(getListFooter().getRoot());
+
+        final ViewBinding listHeader = getListHeader();
+        if (listHeader != null) {
+            infoListAdapter.setHeader(listHeader.getRoot());
+        }
 
         itemsList.setAdapter(infoListAdapter);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 0342bb99c75..b97ef9accf8 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -14,8 +14,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -23,11 +21,14 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
+import androidx.viewbinding.ViewBinding;
 
 import com.jakewharton.rxbinding4.view.RxView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.databinding.ChannelHeaderBinding;
+import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -78,18 +79,10 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     //////////////////////////////////////////////////////////////////////////*/
 
     private SubscriptionManager subscriptionManager;
-    private View headerRootLayout;
-    private ImageView headerChannelBanner;
-    private ImageView headerAvatarView;
-    private TextView headerTitleView;
-    private ImageView headerSubChannelAvatarView;
-    private TextView headerSubChannelTitleView;
-    private TextView headerSubscribersTextView;
-    private Button headerSubscribeButton;
-    private View playlistCtrl;
-    private LinearLayout headerPlayAllButton;
-    private LinearLayout headerPopupButton;
-    private LinearLayout headerBackgroundButton;
+
+    private ChannelHeaderBinding headerBinding;
+    private PlaylistControlBinding playlistControlBinding;
+
     private MenuItem menuRssButton;
     private TextView contentNotSupportedTextView;
     private TextView kaomojiTextView;
@@ -140,45 +133,38 @@ public void onViewCreated(final View rootView, final Bundle savedInstanceState)
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (disposables != null) {
-            disposables.clear();
-        }
+        disposables.clear();
         if (subscribeButtonMonitor != null) {
             subscribeButtonMonitor.dispose();
         }
     }
 
+    @Override
+    public void onDestroyView() {
+        headerBinding = null;
+        playlistControlBinding = null;
+        super.onDestroyView();
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected View getListHeader() {
-        headerRootLayout = activity.getLayoutInflater()
-                .inflate(R.layout.channel_header, itemsList, false);
-        headerChannelBanner = headerRootLayout.findViewById(R.id.channel_banner_image);
-        headerAvatarView = headerRootLayout.findViewById(R.id.channel_avatar_view);
-        headerTitleView = headerRootLayout.findViewById(R.id.channel_title_view);
-        headerSubscribersTextView = headerRootLayout.findViewById(R.id.channel_subscriber_view);
-        headerSubscribeButton = headerRootLayout.findViewById(R.id.channel_subscribe_button);
-        playlistCtrl = headerRootLayout.findViewById(R.id.playlist_control);
-        headerSubChannelAvatarView =
-                headerRootLayout.findViewById(R.id.sub_channel_avatar_view);
-        headerSubChannelTitleView =
-                headerRootLayout.findViewById(R.id.sub_channel_title_view);
-
-        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
-        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
-        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
-
-        return headerRootLayout;
+    @Override
+    protected ViewBinding getListHeader() {
+        headerBinding = ChannelHeaderBinding
+                .inflate(activity.getLayoutInflater(), itemsList, false);
+        playlistControlBinding = headerBinding.playlistControl;
+
+        return headerBinding;
     }
 
     @Override
     protected void initListeners() {
         super.initListeners();
 
-        headerSubChannelTitleView.setOnClickListener(this);
-        headerSubChannelAvatarView.setOnClickListener(this);
+        headerBinding.subChannelTitleView.setOnClickListener(this);
+        headerBinding.subChannelAvatarView.setOnClickListener(this);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -241,7 +227,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
 
     private void monitorSubscription(final ChannelInfo info) {
         final Consumer<Throwable> onError = (Throwable throwable) -> {
-            animateView(headerSubscribeButton, false, 100);
+            animateView(headerBinding.channelSubscribeButton, false, 100);
             showSnackBarError(throwable, UserAction.SUBSCRIPTION,
                     NewPipe.getNameOfService(currentInfo.getServiceId()),
                     "Get subscription status", 0);
@@ -351,15 +337,15 @@ private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor(final Chann
                         info.getAvatarUrl(),
                         info.getDescription(),
                         info.getSubscriberCount());
-                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton,
-                        mapOnSubscribe(channel, info));
+                subscribeButtonMonitor = monitorSubscribeButton(
+                        headerBinding.channelSubscribeButton, mapOnSubscribe(channel, info));
             } else {
                 if (DEBUG) {
                     Log.d(TAG, "Found subscription to this channel!");
                 }
                 final SubscriptionEntity subscription = subscriptionEntities.get(0);
-                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton,
-                        mapOnUnsubscribe(subscription));
+                subscribeButtonMonitor = monitorSubscribeButton(
+                        headerBinding.channelSubscribeButton, mapOnUnsubscribe(subscription));
             }
         };
     }
@@ -370,7 +356,8 @@ private void updateSubscribeButton(final boolean isSubscribed) {
                     + "isSubscribed = [" + isSubscribed + "]");
         }
 
-        final boolean isButtonVisible = headerSubscribeButton.getVisibility() == View.VISIBLE;
+        final boolean isButtonVisible = headerBinding.channelSubscribeButton.getVisibility()
+                == View.VISIBLE;
         final int backgroundDuration = isButtonVisible ? 300 : 0;
         final int textDuration = isButtonVisible ? 200 : 0;
 
@@ -382,18 +369,21 @@ private void updateSubscribeButton(final boolean isSubscribed) {
         final int subscribedText = ContextCompat.getColor(activity, R.color.subscribed_text_color);
 
         if (!isSubscribed) {
-            headerSubscribeButton.setText(R.string.subscribe_button_title);
-            animateBackgroundColor(headerSubscribeButton, backgroundDuration, subscribedBackground,
-                    subscribeBackground);
-            animateTextColor(headerSubscribeButton, textDuration, subscribedText, subscribeText);
+            headerBinding.channelSubscribeButton.setText(R.string.subscribe_button_title);
+            animateBackgroundColor(headerBinding.channelSubscribeButton, backgroundDuration,
+                    subscribedBackground, subscribeBackground);
+            animateTextColor(headerBinding.channelSubscribeButton, textDuration, subscribedText,
+                    subscribeText);
         } else {
-            headerSubscribeButton.setText(R.string.subscribed_button_title);
-            animateBackgroundColor(headerSubscribeButton, backgroundDuration, subscribeBackground,
-                    subscribedBackground);
-            animateTextColor(headerSubscribeButton, textDuration, subscribeText, subscribedText);
+            headerBinding.channelSubscribeButton.setText(R.string.subscribed_button_title);
+            animateBackgroundColor(headerBinding.channelSubscribeButton, backgroundDuration,
+                    subscribeBackground, subscribedBackground);
+            animateTextColor(headerBinding.channelSubscribeButton, textDuration, subscribeText,
+                    subscribedText);
         }
 
-        animateView(headerSubscribeButton, AnimationUtils.Type.LIGHT_SCALE_AND_ALPHA, true, 100);
+        animateView(headerBinding.channelSubscribeButton, AnimationUtils.Type.LIGHT_SCALE_AND_ALPHA,
+                true, 100);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -446,48 +436,49 @@ public void onClick(final View v) {
     public void showLoading() {
         super.showLoading();
 
-        IMAGE_LOADER.cancelDisplayTask(headerChannelBanner);
-        IMAGE_LOADER.cancelDisplayTask(headerAvatarView);
-        IMAGE_LOADER.cancelDisplayTask(headerSubChannelAvatarView);
-        animateView(headerSubscribeButton, false, 100);
+        IMAGE_LOADER.cancelDisplayTask(headerBinding.channelBannerImage);
+        IMAGE_LOADER.cancelDisplayTask(headerBinding.channelAvatarView);
+        IMAGE_LOADER.cancelDisplayTask(headerBinding.subChannelAvatarView);
+        animateView(headerBinding.channelSubscribeButton, false, 100);
     }
 
     @Override
     public void handleResult(@NonNull final ChannelInfo result) {
         super.handleResult(result);
 
-        headerRootLayout.setVisibility(View.VISIBLE);
-        IMAGE_LOADER.displayImage(result.getBannerUrl(), headerChannelBanner,
+        headerBinding.getRoot().setVisibility(View.VISIBLE);
+        IMAGE_LOADER.displayImage(result.getBannerUrl(), headerBinding.channelBannerImage,
                 ImageDisplayConstants.DISPLAY_BANNER_OPTIONS);
-        IMAGE_LOADER.displayImage(result.getAvatarUrl(), headerAvatarView,
+        IMAGE_LOADER.displayImage(result.getAvatarUrl(), headerBinding.channelAvatarView,
                 ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
-        IMAGE_LOADER.displayImage(result.getParentChannelAvatarUrl(), headerSubChannelAvatarView,
+        IMAGE_LOADER.displayImage(result.getParentChannelAvatarUrl(),
+                headerBinding.subChannelAvatarView,
                 ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
 
-        headerSubscribersTextView.setVisibility(View.VISIBLE);
+        headerBinding.channelSubscriberView.setVisibility(View.VISIBLE);
         if (result.getSubscriberCount() >= 0) {
-            headerSubscribersTextView.setText(Localization
+            headerBinding.channelSubscriberView.setText(Localization
                     .shortSubscriberCount(activity, result.getSubscriberCount()));
         } else {
-            headerSubscribersTextView.setText(R.string.subscribers_count_not_available);
+            headerBinding.channelSubscriberView.setText(R.string.subscribers_count_not_available);
         }
 
         if (!TextUtils.isEmpty(currentInfo.getParentChannelName())) {
-            headerSubChannelTitleView.setText(String.format(
+            headerBinding.subChannelTitleView.setText(String.format(
                             getString(R.string.channel_created_by),
                             currentInfo.getParentChannelName())
             );
-            headerSubChannelTitleView.setVisibility(View.VISIBLE);
-            headerSubChannelAvatarView.setVisibility(View.VISIBLE);
+            headerBinding.subChannelTitleView.setVisibility(View.VISIBLE);
+            headerBinding.subChannelAvatarView.setVisibility(View.VISIBLE);
         } else {
-            headerSubChannelTitleView.setVisibility(View.GONE);
+            headerBinding.subChannelTitleView.setVisibility(View.GONE);
         }
 
         if (menuRssButton != null) {
             menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
         }
 
-        playlistCtrl.setVisibility(View.VISIBLE);
+        playlistControlBinding.getRoot().setVisibility(View.VISIBLE);
 
         final List<Throwable> errors = new ArrayList<>(result.getErrors());
         if (!errors.isEmpty()) {
@@ -516,19 +507,22 @@ public void handleResult(@NonNull final ChannelInfo result) {
         updateSubscription(result);
         monitorSubscription(result);
 
-        headerPlayAllButton.setOnClickListener(view -> NavigationHelper
-                .playOnMainPlayer(activity, getPlayQueue()));
-        headerPopupButton.setOnClickListener(view -> NavigationHelper
-                .playOnPopupPlayer(activity, getPlayQueue(), false));
-        headerBackgroundButton.setOnClickListener(view -> NavigationHelper
-                .playOnBackgroundPlayer(activity, getPlayQueue(), false));
-
-        headerPopupButton.setOnLongClickListener(view -> {
+        playlistControlBinding.playlistCtrlPlayAllButton
+                .setOnClickListener(view -> NavigationHelper
+                        .playOnMainPlayer(activity, getPlayQueue()));
+        playlistControlBinding.playlistCtrlPlayPopupButton
+                .setOnClickListener(view -> NavigationHelper
+                        .playOnPopupPlayer(activity, getPlayQueue(), false));
+        playlistControlBinding.playlistCtrlPlayBgButton
+                .setOnClickListener(view -> NavigationHelper
+                        .playOnBackgroundPlayer(activity, getPlayQueue(), false));
+
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
             return true;
         });
 
-        headerBackgroundButton.setOnLongClickListener(view -> {
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
             return true;
         });
@@ -596,7 +590,7 @@ protected boolean onError(final Throwable exception) {
     public void setTitle(final String title) {
         super.setTitle(title);
         if (!useAsFrontPage) {
-            headerTitleView.setText(title);
+            headerBinding.channelTitleView.setText(title);
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 8f7d6128b94..6e723a686ee 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -11,18 +11,20 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.viewbinding.ViewBinding;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.databinding.PlaylistControlBinding;
+import org.schabi.newpipe.databinding.PlaylistHeaderBinding;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -53,7 +55,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import de.hdodenhof.circleimageview.CircleImageView;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;
@@ -74,17 +75,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     // Views
     //////////////////////////////////////////////////////////////////////////*/
 
-    private View headerRootLayout;
-    private TextView headerTitleView;
-    private View headerUploaderLayout;
-    private TextView headerUploaderName;
-    private CircleImageView headerUploaderAvatar;
-    private TextView headerStreamCount;
-    private View playlistCtrl;
-
-    private View headerPlayAllButton;
-    private View headerPopupButton;
-    private View headerBackgroundButton;
+    private PlaylistHeaderBinding headerBinding;
+    private PlaylistControlBinding playlistControlBinding;
 
     private MenuItem playlistBookmarkButton;
 
@@ -119,22 +111,13 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected View getListHeader() {
-        headerRootLayout = activity.getLayoutInflater()
-                .inflate(R.layout.playlist_header, itemsList, false);
-        headerTitleView = headerRootLayout.findViewById(R.id.playlist_title_view);
-        headerUploaderLayout = headerRootLayout.findViewById(R.id.uploader_layout);
-        headerUploaderName = headerRootLayout.findViewById(R.id.uploader_name);
-        headerUploaderAvatar = headerRootLayout.findViewById(R.id.uploader_avatar_view);
-        headerStreamCount = headerRootLayout.findViewById(R.id.playlist_stream_count);
-        playlistCtrl = headerRootLayout.findViewById(R.id.playlist_control);
-
-        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
-        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
-        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
-
+    @Override
+    protected ViewBinding getListHeader() {
+        headerBinding = PlaylistHeaderBinding
+                .inflate(activity.getLayoutInflater(), itemsList, false);
+        playlistControlBinding = headerBinding.playlistControl;
 
-        return headerRootLayout;
+        return headerBinding;
     }
 
     @Override
@@ -203,6 +186,9 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
 
     @Override
     public void onDestroyView() {
+        headerBinding = null;
+        playlistControlBinding = null;
+
         super.onDestroyView();
         if (isBookmarkButtonReady != null) {
             isBookmarkButtonReady.set(false);
@@ -275,25 +261,25 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     @Override
     public void showLoading() {
         super.showLoading();
-        animateView(headerRootLayout, false, 200);
+        animateView(headerBinding.getRoot(), false, 200);
         animateView(itemsList, false, 100);
 
-        IMAGE_LOADER.cancelDisplayTask(headerUploaderAvatar);
-        animateView(headerUploaderLayout, false, 200);
+        IMAGE_LOADER.cancelDisplayTask(headerBinding.uploaderAvatarView);
+        animateView(headerBinding.uploaderLayout, false, 200);
     }
 
     @Override
     public void handleResult(@NonNull final PlaylistInfo result) {
         super.handleResult(result);
 
-        animateView(headerRootLayout, true, 100);
-        animateView(headerUploaderLayout, true, 300);
-        headerUploaderLayout.setOnClickListener(null);
+        animateView(headerBinding.getRoot(), true, 100);
+        animateView(headerBinding.uploaderLayout, true, 300);
+        headerBinding.uploaderLayout.setOnClickListener(null);
         // If we have an uploader put them into the UI
         if (!TextUtils.isEmpty(result.getUploaderName())) {
-            headerUploaderName.setText(result.getUploaderName());
+            headerBinding.uploaderName.setText(result.getUploaderName());
             if (!TextUtils.isEmpty(result.getUploaderUrl())) {
-                headerUploaderLayout.setOnClickListener(v -> {
+                headerBinding.uploaderLayout.setOnClickListener(v -> {
                     try {
                         NavigationHelper.openChannelFragment(getFM(), result.getServiceId(),
                                 result.getUploaderUrl(), result.getUploaderName());
@@ -303,28 +289,29 @@ public void handleResult(@NonNull final PlaylistInfo result) {
                 });
             }
         } else { // Otherwise say we have no uploader
-            headerUploaderName.setText(R.string.playlist_no_uploader);
+            headerBinding.uploaderName.setText(R.string.playlist_no_uploader);
         }
 
-        playlistCtrl.setVisibility(View.VISIBLE);
+        playlistControlBinding.getRoot().setVisibility(View.VISIBLE);
 
         final String avatarUrl = result.getUploaderAvatarUrl();
         if (result.getServiceId() == ServiceList.YouTube.getServiceId()
                 && (YoutubeParsingHelper.isYoutubeMixId(result.getId())
                 || YoutubeParsingHelper.isYoutubeMusicMixId(result.getId()))) {
             // this is an auto-generated playlist (e.g. Youtube mix), so a radio is shown
-            headerUploaderAvatar.setDisableCircularTransformation(true);
-            headerUploaderAvatar.setBorderColor(
+            headerBinding.uploaderAvatarView.setDisableCircularTransformation(true);
+            headerBinding.uploaderAvatarView.setBorderColor(
                     getResources().getColor(R.color.transparent_background_color));
-            headerUploaderAvatar.setImageDrawable(AppCompatResources.getDrawable(requireContext(),
-                    resolveResourceIdFromAttr(requireContext(), R.attr.ic_radio)));
-
+            headerBinding.uploaderAvatarView.setImageDrawable(
+                    AppCompatResources.getDrawable(requireContext(),
+                    resolveResourceIdFromAttr(requireContext(), R.attr.ic_radio))
+            );
         } else {
-            IMAGE_LOADER.displayImage(avatarUrl, headerUploaderAvatar,
+            IMAGE_LOADER.displayImage(avatarUrl, headerBinding.uploaderAvatarView,
                     ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
         }
 
-        headerStreamCount.setText(Localization
+        headerBinding.playlistStreamCount.setText(Localization
                 .localizeStreamCount(getContext(), result.getStreamCount()));
 
         if (!result.getErrors().isEmpty()) {
@@ -338,19 +325,19 @@ public void handleResult(@NonNull final PlaylistInfo result) {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(getPlaylistBookmarkSubscriber());
 
-        headerPlayAllButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayAllButton.setOnClickListener(view ->
                 NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
-        headerPopupButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnClickListener(view ->
                 NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
-        headerBackgroundButton.setOnClickListener(view ->
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnClickListener(view ->
                 NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
-        headerPopupButton.setOnLongClickListener(view -> {
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
             return true;
         });
 
-        headerBackgroundButton.setOnLongClickListener(view -> {
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
             return true;
         });
@@ -459,7 +446,7 @@ public void onComplete() { }
     @Override
     public void setTitle(final String title) {
         super.setTitle(title);
-        headerTitleView.setText(title);
+        headerBinding.playlistTitleView.setText(title);
     }
 
     private void onBookmarkClicked() {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
index 907615b4555..7fb41f0e558 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
@@ -8,13 +8,14 @@
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Switch;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
+import androidx.viewbinding.ViewBinding;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.RelatedStreamsHeaderBinding;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
@@ -38,8 +39,7 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
     // Views
     //////////////////////////////////////////////////////////////////////////*/
 
-    private View headerRootLayout;
-    private Switch autoplaySwitch;
+    private RelatedStreamsHeaderBinding headerBinding;
 
     public static RelatedVideosFragment getInstance(final StreamInfo info) {
         final RelatedVideosFragment instance = new RelatedVideosFragment();
@@ -66,25 +66,29 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (disposables != null) {
-            disposables.clear();
-        }
+        disposables.clear();
+    }
+
+    @Override
+    public void onDestroyView() {
+        headerBinding = null;
+        super.onDestroyView();
     }
 
-    protected View getListHeader() {
+    @Override
+    protected ViewBinding getListHeader() {
         if (relatedStreamInfo != null && relatedStreamInfo.getRelatedItems() != null) {
-            headerRootLayout = activity.getLayoutInflater()
-                    .inflate(R.layout.related_streams_header, itemsList, false);
-            autoplaySwitch = headerRootLayout.findViewById(R.id.autoplay_switch);
+            headerBinding = RelatedStreamsHeaderBinding
+                    .inflate(activity.getLayoutInflater(), itemsList, false);
 
             final SharedPreferences pref = PreferenceManager
                     .getDefaultSharedPreferences(requireContext());
             final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
-            autoplaySwitch.setChecked(autoplay);
-            autoplaySwitch.setOnCheckedChangeListener((compoundButton, b) ->
+            headerBinding.autoplaySwitch.setChecked(autoplay);
+            headerBinding.autoplaySwitch.setOnCheckedChangeListener((compoundButton, b) ->
                     PreferenceManager.getDefaultSharedPreferences(requireContext()).edit()
                             .putBoolean(getString(R.string.auto_queue_key), b).apply());
-            return headerRootLayout;
+            return headerBinding;
         } else {
             return null;
         }
@@ -107,8 +111,8 @@ protected Single<RelatedStreamInfo> loadResult(final boolean forceLoad) {
     @Override
     public void showLoading() {
         super.showLoading();
-        if (headerRootLayout != null) {
-            headerRootLayout.setVisibility(View.INVISIBLE);
+        if (headerBinding != null) {
+            headerBinding.getRoot().setVisibility(View.INVISIBLE);
         }
     }
 
@@ -116,8 +120,8 @@ public void showLoading() {
     public void handleResult(@NonNull final RelatedStreamInfo result) {
         super.handleResult(result);
 
-        if (headerRootLayout != null) {
-            headerRootLayout.setVisibility(View.VISIBLE);
+        if (headerBinding != null) {
+            headerBinding.getRoot().setVisibility(View.VISIBLE);
         }
         AnimationUtils.slideUp(getView(), 120, 96, 0.06f);
 
@@ -126,9 +130,7 @@ public void handleResult(@NonNull final RelatedStreamInfo result) {
                     NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
         }
 
-        if (disposables != null) {
-            disposables.clear();
-        }
+        disposables.clear();
     }
 
     @Override
@@ -202,8 +204,8 @@ public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
         final SharedPreferences pref =
                 PreferenceManager.getDefaultSharedPreferences(requireContext());
         final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
-        if (autoplaySwitch != null) {
-            autoplaySwitch.setChecked(autoplay);
+        if (headerBinding != null) {
+            headerBinding.autoplaySwitch.setChecked(autoplay);
         }
     }
 
diff --git a/app/src/main/res/layout/channel_header.xml b/app/src/main/res/layout/channel_header.xml
index 241aa474129..534d7f7c489 100644
--- a/app/src/main/res/layout/channel_header.xml
+++ b/app/src/main/res/layout/channel_header.xml
@@ -119,7 +119,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/channel_metadata">
 
-        <include layout="@layout/playlist_control" />
+        <include
+            android:id="@+id/playlist_control"
+            layout="@layout/playlist_control" />
+
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/playlist_header.xml b/app/src/main/res/layout/playlist_header.xml
index d27c868726f..a5960472f1e 100644
--- a/app/src/main/res/layout/playlist_header.xml
+++ b/app/src/main/res/layout/playlist_header.xml
@@ -83,7 +83,9 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/playlist_meta">
 
-        <include layout="@layout/playlist_control" />
+        <include
+            android:id="@+id/playlist_control"
+            layout="@layout/playlist_control" />
     </LinearLayout>
 
 </RelativeLayout>

From 910d22daa6dcccdb6b21213ab02da1eed1842047 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 09:24:07 +0530
Subject: [PATCH 044/131] Use view binding in MainFragment.

---
 .../newpipe/fragments/MainFragment.java       | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
index a77109f86f2..9487fa385a9 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -19,12 +19,12 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapterMenuWorkaround;
 import androidx.preference.PreferenceManager;
-import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.tabs.TabLayout;
 
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.FragmentMainBinding;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
@@ -34,15 +34,13 @@
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.views.ScrollableTabLayout;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
-    private ViewPager viewPager;
+    private FragmentMainBinding binding;
     private SelectedTabsPagerAdapter pagerAdapter;
-    private ScrollableTabLayout tabLayout;
 
     private final List<Tab> tabsList = new ArrayList<>();
     private TabsManager tabsManager;
@@ -90,13 +88,12 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        tabLayout = rootView.findViewById(R.id.main_tab_layout);
-        viewPager = rootView.findViewById(R.id.pager);
+        binding = FragmentMainBinding.bind(rootView);
 
-        tabLayout.setTabIconTint(ColorStateList.valueOf(
+        binding.mainTabLayout.setTabIconTint(ColorStateList.valueOf(
                 ThemeHelper.resolveColorFromAttr(requireContext(), R.attr.colorAccent)));
-        tabLayout.setupWithViewPager(viewPager);
-        tabLayout.addOnTabSelectedListener(this);
+        binding.mainTabLayout.setupWithViewPager(binding.pager);
+        binding.mainTabLayout.addOnTabSelectedListener(this);
 
         setupTabs();
     }
@@ -120,8 +117,14 @@ public void onResume() {
     public void onDestroy() {
         super.onDestroy();
         tabsManager.unsetSavedTabsListener();
-        if (viewPager != null) {
-            viewPager.setAdapter(null);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (binding != null) {
+            binding.pager.setAdapter(null);
+            binding = null;
         }
     }
 
@@ -172,19 +175,19 @@ private void setupTabs() {
                     getChildFragmentManager(), tabsList);
         }
 
-        viewPager.setAdapter(null);
-        viewPager.setOffscreenPageLimit(tabsList.size());
-        viewPager.setAdapter(pagerAdapter);
+        binding.pager.setAdapter(null);
+        binding.pager.setOffscreenPageLimit(tabsList.size());
+        binding.pager.setAdapter(pagerAdapter);
 
         updateTabsIconAndDescription();
-        updateTitleForTab(viewPager.getCurrentItem());
+        updateTitleForTab(binding.pager.getCurrentItem());
 
         hasTabsChanged = false;
     }
 
     private void updateTabsIconAndDescription() {
         for (int i = 0; i < tabsList.size(); i++) {
-            final TabLayout.Tab tabToSet = tabLayout.getTabAt(i);
+            final TabLayout.Tab tabToSet = binding.mainTabLayout.getTabAt(i);
             if (tabToSet != null) {
                 final Tab tab = tabsList.get(i);
                 tabToSet.setIcon(tab.getTabIconRes(requireContext()));

From 7c581ec108e84fa4c15b720520a0004dd3ed88b7 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 09:52:51 +0530
Subject: [PATCH 045/131] Use view binding in LicenseFragment.

---
 .../schabi/newpipe/about/LicenseFragment.java | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
index 6e48a0e1488..f5bf4df19e9 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -7,13 +7,14 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.FragmentLicensesBinding;
+import org.schabi.newpipe.databinding.ItemSoftwareComponentBinding;
 import org.schabi.newpipe.util.ShareUtils;
 
 import java.io.Serializable;
@@ -67,43 +68,42 @@ public void onDestroy() {
 
     @Nullable
     @Override
-    public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGroup container,
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
                              @Nullable final Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.fragment_licenses, container, false);
-        final ViewGroup softwareComponentsView = rootView.findViewById(R.id.software_components);
+        final FragmentLicensesBinding binding = FragmentLicensesBinding
+                .inflate(inflater, container, false);
 
-        final View licenseLink = rootView.findViewById(R.id.app_read_license);
-        licenseLink.setOnClickListener(v -> {
+        binding.appReadLicense.setOnClickListener(v -> {
             activeLicense = StandardLicenses.GPL3;
             compositeDisposable.add(LicenseFragmentHelper.showLicense(getActivity(),
                     StandardLicenses.GPL3));
         });
 
         for (final SoftwareComponent component : softwareComponents) {
-            final View componentView = inflater
-                    .inflate(R.layout.item_software_component, container, false);
-            final TextView softwareName = componentView.findViewById(R.id.name);
-            final TextView copyright = componentView.findViewById(R.id.copyright);
-            softwareName.setText(component.getName());
-            copyright.setText(getString(R.string.copyright,
+            final ItemSoftwareComponentBinding componentBinding = ItemSoftwareComponentBinding
+                    .inflate(inflater, container, false);
+            componentBinding.name.setText(component.getName());
+            componentBinding.copyright.setText(getString(R.string.copyright,
                     component.getYears(),
                     component.getCopyrightOwner(),
                     component.getLicense().getAbbreviation()));
 
-            componentView.setTag(component);
-            componentView.setOnClickListener(v -> {
+            final View root = componentBinding.getRoot();
+            root.setTag(component);
+            root.setOnClickListener(v -> {
                 activeLicense = component.getLicense();
                 compositeDisposable.add(LicenseFragmentHelper.showLicense(getActivity(),
                         component.getLicense()));
             });
-            softwareComponentsView.addView(componentView);
-            registerForContextMenu(componentView);
+            binding.softwareComponents.addView(root);
+            registerForContextMenu(root);
         }
         if (activeLicense != null) {
             compositeDisposable.add(LicenseFragmentHelper.showLicense(getActivity(),
                     activeLicense));
         }
-        return rootView;
+        return binding.getRoot();
     }
 
     @Override

From 7682ebd245a55261e2c5737f305d35b2ab37d441 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 10:00:12 +0530
Subject: [PATCH 046/131] Use view binding in DownloadDialog.

---
 .../newpipe/download/DownloadDialog.java      | 102 +++++++++---------
 1 file changed, 48 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index e80a0ab2110..68bcf3cc1e2 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -16,12 +16,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.EditText;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.IdRes;
@@ -40,6 +36,7 @@
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.RouterActivity;
+import org.schabi.newpipe.databinding.DownloadDialogBinding;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.localization.Localization;
@@ -116,11 +113,7 @@ public class DownloadDialog extends DialogFragment
 
     private final CompositeDisposable disposables = new CompositeDisposable();
 
-    private EditText nameEditText;
-    private Spinner streamsSpinner;
-    private RadioGroup radioStreamsGroup;
-    private TextView threadsCountTextView;
-    private SeekBar threadsSeekBar;
+    private DownloadDialogBinding dialogBinding;
 
     private SharedPreferences prefs;
 
@@ -277,38 +270,35 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
     @Override
     public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        nameEditText = view.findViewById(R.id.file_name);
-        nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
+        dialogBinding = DownloadDialogBinding.bind(view);
+
+        dialogBinding.fileName.setText(FilenameUtils.createFilename(getContext(),
+                currentInfo.getName()));
         selectedAudioIndex = ListHelper
                 .getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());
 
         selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
 
-        streamsSpinner = view.findViewById(R.id.quality_spinner);
-        streamsSpinner.setOnItemSelectedListener(this);
-
-        threadsCountTextView = view.findViewById(R.id.threads_count);
-        threadsSeekBar = view.findViewById(R.id.threads);
+        dialogBinding.qualitySpinner.setOnItemSelectedListener(this);
 
-        radioStreamsGroup = view.findViewById(R.id.video_audio_group);
-        radioStreamsGroup.setOnCheckedChangeListener(this);
+        dialogBinding.videoAudioGroup.setOnCheckedChangeListener(this);
 
-        initToolbar(view.findViewById(R.id.toolbar));
+        initToolbar(dialogBinding.toolbarLayout.toolbar);
         setupDownloadOptions();
 
         prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
 
         final int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
-        threadsCountTextView.setText(String.valueOf(threads));
-        threadsSeekBar.setProgress(threads - 1);
-        threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        dialogBinding.threadsCount.setText(String.valueOf(threads));
+        dialogBinding.threads.setProgress(threads - 1);
+        dialogBinding.threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(final SeekBar seekbar, final int progress,
                                           final boolean fromUser) {
                 final int newProgress = progress + 1;
                 prefs.edit().putInt(getString(R.string.default_download_threads), newProgress)
                         .apply();
-                threadsCountTextView.setText(String.valueOf(newProgress));
+                dialogBinding.threadsCount.setText(String.valueOf(newProgress));
             }
 
             @Override
@@ -326,19 +316,19 @@ private void fetchStreamsSize() {
 
         disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams)
                 .subscribe(result -> {
-            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.video_button) {
+            if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.video_button) {
                 setupVideoSpinner();
             }
         }));
         disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedAudioStreams)
                 .subscribe(result -> {
-            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.audio_button) {
+            if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
                 setupAudioSpinner();
             }
         }));
         disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams)
                 .subscribe(result -> {
-            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+            if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
                 setupSubtitleSpinner();
             }
         }));
@@ -350,6 +340,12 @@ public void onDestroy() {
         disposables.clear();
     }
 
+    @Override
+    public void onDestroyView() {
+        dialogBinding = null;
+        super.onDestroyView();
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Radio group Video&Audio options - Listener
     //////////////////////////////////////////////////////////////////////////*/
@@ -429,8 +425,8 @@ private void setupAudioSpinner() {
             return;
         }
 
-        streamsSpinner.setAdapter(audioStreamsAdapter);
-        streamsSpinner.setSelection(selectedAudioIndex);
+        dialogBinding.qualitySpinner.setAdapter(audioStreamsAdapter);
+        dialogBinding.qualitySpinner.setSelection(selectedAudioIndex);
         setRadioButtonsState(true);
     }
 
@@ -439,8 +435,8 @@ private void setupVideoSpinner() {
             return;
         }
 
-        streamsSpinner.setAdapter(videoStreamsAdapter);
-        streamsSpinner.setSelection(selectedVideoIndex);
+        dialogBinding.qualitySpinner.setAdapter(videoStreamsAdapter);
+        dialogBinding.qualitySpinner.setSelection(selectedVideoIndex);
         setRadioButtonsState(true);
     }
 
@@ -449,8 +445,8 @@ private void setupSubtitleSpinner() {
             return;
         }
 
-        streamsSpinner.setAdapter(subtitleStreamsAdapter);
-        streamsSpinner.setSelection(selectedSubtitleIndex);
+        dialogBinding.qualitySpinner.setAdapter(subtitleStreamsAdapter);
+        dialogBinding.qualitySpinner.setSelection(selectedSubtitleIndex);
         setRadioButtonsState(true);
     }
 
@@ -475,7 +471,7 @@ public void onCheckedChanged(final RadioGroup group, @IdRes final int checkedId)
                 break;
         }
 
-        threadsSeekBar.setEnabled(flag);
+        dialogBinding.threads.setEnabled(flag);
     }
 
     @Override
@@ -486,7 +482,7 @@ public void onItemSelected(final AdapterView<?> parent, final View view,
                     + "parent = [" + parent + "], view = [" + view + "], "
                     + "position = [" + position + "], id = [" + id + "]");
         }
-        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
+        switch (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 selectedAudioIndex = position;
                 break;
@@ -506,16 +502,14 @@ public void onNothingSelected(final AdapterView<?> parent) {
     protected void setupDownloadOptions() {
         setRadioButtonsState(false);
 
-        final RadioButton audioButton = radioStreamsGroup.findViewById(R.id.audio_button);
-        final RadioButton videoButton = radioStreamsGroup.findViewById(R.id.video_button);
-        final RadioButton subtitleButton = radioStreamsGroup.findViewById(R.id.subtitle_button);
         final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
         final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
         final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;
 
-        audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
-        videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
-        subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);
+        dialogBinding.audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
+        dialogBinding.videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+        dialogBinding.subtitleButton.setVisibility(isSubtitleStreamsAvailable
+                ? View.VISIBLE : View.GONE);
 
         prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         final String defaultMedia = prefs.getString(getString(R.string.last_used_download_type),
@@ -523,24 +517,24 @@ protected void setupDownloadOptions() {
 
         if (isVideoStreamsAvailable
                 && (defaultMedia.equals(getString(R.string.last_download_type_video_key)))) {
-            videoButton.setChecked(true);
+            dialogBinding.videoButton.setChecked(true);
             setupVideoSpinner();
         } else if (isAudioStreamsAvailable
                 && (defaultMedia.equals(getString(R.string.last_download_type_audio_key)))) {
-            audioButton.setChecked(true);
+            dialogBinding.audioButton.setChecked(true);
             setupAudioSpinner();
         } else if (isSubtitleStreamsAvailable
                 && (defaultMedia.equals(getString(R.string.last_download_type_subtitle_key)))) {
-            subtitleButton.setChecked(true);
+            dialogBinding.subtitleButton.setChecked(true);
             setupSubtitleSpinner();
         } else if (isVideoStreamsAvailable) {
-            videoButton.setChecked(true);
+            dialogBinding.videoButton.setChecked(true);
             setupVideoSpinner();
         } else if (isAudioStreamsAvailable) {
-            audioButton.setChecked(true);
+            dialogBinding.audioButton.setChecked(true);
             setupAudioSpinner();
         } else if (isSubtitleStreamsAvailable) {
-            subtitleButton.setChecked(true);
+            dialogBinding.subtitleButton.setChecked(true);
             setupSubtitleSpinner();
         } else {
             Toast.makeText(getContext(), R.string.no_streams_available_download,
@@ -550,9 +544,9 @@ protected void setupDownloadOptions() {
     }
 
     private void setRadioButtonsState(final boolean enabled) {
-        radioStreamsGroup.findViewById(R.id.audio_button).setEnabled(enabled);
-        radioStreamsGroup.findViewById(R.id.video_button).setEnabled(enabled);
-        radioStreamsGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
+        dialogBinding.audioButton.setEnabled(enabled);
+        dialogBinding.videoButton.setEnabled(enabled);
+        dialogBinding.subtitleButton.setEnabled(enabled);
     }
 
     private int getSubtitleIndexBy(final List<SubtitlesStream> streams) {
@@ -582,7 +576,7 @@ private int getSubtitleIndexBy(final List<SubtitlesStream> streams) {
     }
 
     private String getNameEditText() {
-        final String str = nameEditText.getText().toString().trim();
+        final String str = dialogBinding.fileName.getText().toString().trim();
 
         return FilenameUtils.createFilename(context, str.isEmpty() ? currentInfo.getName() : str);
     }
@@ -619,7 +613,7 @@ private void prepareSelectedDownload() {
 
         String filename = getNameEditText().concat(".");
 
-        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
+        switch (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 selectedMediaType = getString(R.string.last_download_type_audio_key);
                 mainStorage = mainStorageAudio;
@@ -669,7 +663,7 @@ private void prepareSelectedDownload() {
                         filename, mime);
             } else {
                 File initialSavePath;
-                if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.audio_button) {
+                if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
                     initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MUSIC);
                 } else {
                     initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MOVIES);
@@ -862,7 +856,7 @@ private void continueSelectedDownload(@NonNull final StoredFileHelper storage) {
         final Stream selectedStream;
         Stream secondaryStream = null;
         final char kind;
-        int threads = threadsSeekBar.getProgress() + 1;
+        int threads = dialogBinding.threads.getProgress() + 1;
         final String[] urls;
         final MissionRecoveryInfo[] recoveryInfo;
         String psName = null;
@@ -870,7 +864,7 @@ private void continueSelectedDownload(@NonNull final StoredFileHelper storage) {
         long nearLength = 0;
 
         // more download logic: select muxer, subtitle converter, etc.
-        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
+        switch (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 kind = 'a';
                 selectedStream = audioStreamsAdapter.getItem(selectedAudioIndex);

From 6039484a02bda6eeef9633c46fd5edfc4eb6311d Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 10:56:29 +0530
Subject: [PATCH 047/131] Use view binding in ChannelFragment.

---
 .../list/channel/ChannelFragment.java         | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index b97ef9accf8..003893517f7 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -14,7 +14,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,6 +27,7 @@
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.databinding.ChannelHeaderBinding;
+import org.schabi.newpipe.databinding.FragmentChannelBinding;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -80,13 +80,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
 
     private SubscriptionManager subscriptionManager;
 
+    private FragmentChannelBinding channelBinding;
     private ChannelHeaderBinding headerBinding;
     private PlaylistControlBinding playlistControlBinding;
 
     private MenuItem menuRssButton;
-    private TextView contentNotSupportedTextView;
-    private TextView kaomojiTextView;
-    private TextView noVideosTextView;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -125,9 +123,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     @Override
     public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
-        contentNotSupportedTextView = rootView.findViewById(R.id.error_content_not_supported);
-        kaomojiTextView = rootView.findViewById(R.id.channel_kaomoji);
-        noVideosTextView = rootView.findViewById(R.id.channel_no_videos);
+        channelBinding = FragmentChannelBinding.bind(rootView);
     }
 
     @Override
@@ -141,6 +137,7 @@ public void onDestroy() {
 
     @Override
     public void onDestroyView() {
+        channelBinding = null;
         headerBinding = null;
         playlistControlBinding = null;
         super.onDestroyView();
@@ -529,10 +526,10 @@ public void handleResult(@NonNull final ChannelInfo result) {
     }
 
     private void showContentNotSupported() {
-        contentNotSupportedTextView.setVisibility(View.VISIBLE);
-        kaomojiTextView.setText("(︶︹︺)");
-        kaomojiTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
-        noVideosTextView.setVisibility(View.GONE);
+        channelBinding.errorContentNotSupported.setVisibility(View.VISIBLE);
+        channelBinding.channelKaomoji.setText("(︶︹︺)");
+        channelBinding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
+        channelBinding.channelNoVideos.setVisibility(View.GONE);
     }
 
     private PlayQueue getPlayQueue() {

From 97672f06de29fb5f5def106a03fcc5d9c8ce938d Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 13:28:21 +0530
Subject: [PATCH 048/131] Use view binding in SearchFragment.

---
 .../fragments/list/search/SearchFragment.java | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

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 3b48d9c84a8..0aaf87ea687 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
@@ -37,6 +37,7 @@
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.databinding.FragmentSearchBinding;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.MetaInfo;
@@ -155,6 +156,8 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     // Views
     //////////////////////////////////////////////////////////////////////////*/
 
+    private FragmentSearchBinding searchBinding;
+
     private View searchToolbarContainer;
     private EditText searchEditText;
     private View searchClear;
@@ -165,7 +168,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
     private View suggestionsPanel;
     private boolean suggestionsPanelVisible = false;
-    private RecyclerView suggestionsRecyclerView;
 
     /*////////////////////////////////////////////////////////////////////////*/
 
@@ -301,6 +303,8 @@ public void onDestroyView() {
             Log.d(TAG, "onDestroyView() called");
         }
         unsetSearchListeners();
+
+        searchBinding = null;
         super.onDestroyView();
     }
 
@@ -337,9 +341,9 @@ public void onActivityResult(final int requestCode, final int resultCode, final
     @Override
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
-        suggestionsPanel = rootView.findViewById(R.id.suggestions_panel);
-        suggestionsRecyclerView = rootView.findViewById(R.id.suggestions_list);
-        suggestionsRecyclerView.setAdapter(suggestionListAdapter);
+        searchBinding = FragmentSearchBinding.bind(rootView);
+
+        searchBinding.suggestionsList.setAdapter(suggestionListAdapter);
         new ItemTouchHelper(new ItemTouchHelper.Callback() {
             @Override
             public int getMovementFlags(@NonNull final RecyclerView recyclerView,
@@ -358,7 +362,7 @@ public boolean onMove(@NonNull final RecyclerView recyclerView,
             public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, final int i) {
                 onSuggestionItemSwiped(viewHolder);
             }
-        }).attachToRecyclerView(suggestionsRecyclerView);
+        }).attachToRecyclerView(searchBinding.suggestionsList);
 
         searchToolbarContainer = activity.findViewById(R.id.toolbar_search_container);
         searchEditText = searchToolbarContainer.findViewById(R.id.toolbar_search_edit_text);
@@ -523,7 +527,7 @@ private void initSearchListeners() {
                 return;
             }
 
-            correctSuggestion.setVisibility(View.GONE);
+            searchBinding.correctSuggestion.setVisibility(View.GONE);
 
             searchEditText.setText("");
             suggestionListAdapter.setItems(new ArrayList<>());
@@ -640,7 +644,8 @@ private void showSuggestionsPanel() {
             Log.d(TAG, "showSuggestionsPanel() called");
         }
         suggestionsPanelVisible = true;
-        animateView(suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA, true, 200);
+        animateView(searchBinding.suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA,
+                true, 200);
     }
 
     private void hideSuggestionsPanel() {
@@ -648,7 +653,8 @@ private void hideSuggestionsPanel() {
             Log.d(TAG, "hideSuggestionsPanel() called");
         }
         suggestionsPanelVisible = false;
-        animateView(suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA, false, 200);
+        animateView(searchBinding.suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA,
+                false, 200);
     }
 
     private void showKeyboardSearch() {
@@ -936,8 +942,8 @@ public void handleSuggestions(@NonNull final List<SuggestionItem> suggestions) {
         if (DEBUG) {
             Log.d(TAG, "handleSuggestions() called with: suggestions = [" + suggestions + "]");
         }
-        suggestionsRecyclerView.smoothScrollToPosition(0);
-        suggestionsRecyclerView.post(() -> suggestionListAdapter.setItems(suggestions));
+        searchBinding.suggestionsList.smoothScrollToPosition(0);
+        searchBinding.suggestionsList.post(() -> suggestionListAdapter.setItems(suggestions));
 
         if (suggestionsPanelVisible && errorPanelRoot.getVisibility() == View.VISIBLE) {
             hideLoading();
@@ -1019,7 +1025,7 @@ public void handleResult(@NonNull final SearchInfo result) {
 
     private void handleSearchSuggestion() {
         if (TextUtils.isEmpty(searchSuggestion)) {
-            correctSuggestion.setVisibility(View.GONE);
+            searchBinding.correctSuggestion.setVisibility(View.GONE);
         } else {
             final String helperText = getString(isCorrectedSearch
                     ? R.string.search_showing_result_for
@@ -1028,22 +1034,23 @@ private void handleSearchSuggestion() {
             final String highlightedSearchSuggestion =
                     "<b><i>" + Html.escapeHtml(searchSuggestion) + "</i></b>";
             final String text = String.format(helperText, highlightedSearchSuggestion);
-            correctSuggestion.setText(HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY));
+            searchBinding.correctSuggestion.setText(HtmlCompat.fromHtml(text,
+                    HtmlCompat.FROM_HTML_MODE_LEGACY));
 
-            correctSuggestion.setOnClickListener(v -> {
-                correctSuggestion.setVisibility(View.GONE);
+            searchBinding.correctSuggestion.setOnClickListener(v -> {
+                searchBinding.correctSuggestion.setVisibility(View.GONE);
                 search(searchSuggestion, contentFilter, sortFilter);
                 searchEditText.setText(searchSuggestion);
             });
 
-            correctSuggestion.setOnLongClickListener(v -> {
+            searchBinding.correctSuggestion.setOnLongClickListener(v -> {
                 searchEditText.setText(searchSuggestion);
                 searchEditText.setSelection(searchSuggestion.length());
                 showKeyboardSearch();
                 return true;
             });
 
-            correctSuggestion.setVisibility(View.VISIBLE);
+            searchBinding.correctSuggestion.setVisibility(View.VISIBLE);
         }
     }
 

From f80e1bd214ca7db29d58229a2428dc8b82533e08 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 13:51:37 +0530
Subject: [PATCH 049/131] Use view binding in FeedFragment.

---
 .../schabi/newpipe/local/feed/FeedFragment.kt | 109 ++++++++++--------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index dbe91ec55b0..f767f8f22b7 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -37,18 +37,10 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import icepick.State
-import kotlinx.android.synthetic.main.error_retry.error_button_retry
-import kotlinx.android.synthetic.main.error_retry.error_message_view
-import kotlinx.android.synthetic.main.fragment_feed.empty_state_view
-import kotlinx.android.synthetic.main.fragment_feed.error_panel
-import kotlinx.android.synthetic.main.fragment_feed.items_list
-import kotlinx.android.synthetic.main.fragment_feed.loading_progress_bar
-import kotlinx.android.synthetic.main.fragment_feed.loading_progress_text
-import kotlinx.android.synthetic.main.fragment_feed.refresh_root_view
-import kotlinx.android.synthetic.main.fragment_feed.refresh_subtitle_text
-import kotlinx.android.synthetic.main.fragment_feed.refresh_text
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.databinding.ErrorRetryBinding
+import org.schabi.newpipe.databinding.FragmentFeedBinding
 import org.schabi.newpipe.fragments.list.BaseListFragment
 import org.schabi.newpipe.local.feed.service.FeedLoadService
 import org.schabi.newpipe.report.UserAction
@@ -57,6 +49,12 @@ import org.schabi.newpipe.util.Localization
 import java.util.Calendar
 
 class FeedFragment : BaseListFragment<FeedState, Unit>() {
+    private var _feedBinding: FragmentFeedBinding? = null
+    private val feedBinding get() = _feedBinding!!
+
+    private var _errorBinding: ErrorRetryBinding? = null
+    private val errorBinding get() = _errorBinding!!
+
     private lateinit var viewModel: FeedViewModel
     private lateinit var swipeRefreshLayout: SwipeRefreshLayout
     @State
@@ -86,15 +84,17 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
 
     override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) {
         super.onViewCreated(rootView, savedInstanceState)
-        swipeRefreshLayout = requireView().findViewById(R.id.swiperefresh)
-        swipeRefreshLayout.setOnRefreshListener { reloadContent() }
+        _feedBinding = FragmentFeedBinding.bind(rootView)
+        _errorBinding = feedBinding.errorPanel
+
+        feedBinding.swiperefresh.setOnRefreshListener { reloadContent() }
         viewModel = ViewModelProvider(this, FeedViewModel.Factory(requireContext(), groupId)).get(FeedViewModel::class.java)
         viewModel.stateLiveData.observe(viewLifecycleOwner, Observer { it?.let(::handleResult) })
     }
 
     override fun onPause() {
         super.onPause()
-        listState = items_list?.layoutManager?.onSaveInstanceState()
+        listState = _feedBinding?.itemsList?.layoutManager?.onSaveInstanceState()
     }
 
     override fun onResume() {
@@ -112,7 +112,8 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
 
     override fun initListeners() {
         super.initListeners()
-        refresh_root_view.setOnClickListener {
+        // Using the non-null property may result in a NullPointerException
+        _feedBinding?.refreshRootView?.setOnClickListener {
             triggerUpdate()
         }
     }
@@ -169,55 +170,60 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
         activity?.supportActionBar?.subtitle = null
     }
 
+    override fun onDestroyView() {
+        _feedBinding = null
+        super.onDestroyView()
+    }
+
     // /////////////////////////////////////////////////////////////////////////
     // Handling
     // /////////////////////////////////////////////////////////////////////////
 
     override fun showLoading() {
-        animateView(refresh_root_view, false, 0)
-        animateView(items_list, false, 0)
+        animateView(feedBinding.refreshRootView, false, 0)
+        animateView(feedBinding.itemsList, false, 0)
 
-        animateView(loading_progress_bar, true, 200)
-        animateView(loading_progress_text, true, 200)
+        animateView(feedBinding.loadingProgressBar, true, 200)
+        animateView(feedBinding.loadingProgressText, true, 200)
 
-        empty_state_view?.let { animateView(it, false, 0) }
-        animateView(error_panel, false, 0)
+        animateView(feedBinding.emptyStateView.root, false, 0)
+        animateView(errorBinding.root, false, 0)
     }
 
     override fun hideLoading() {
-        animateView(refresh_root_view, true, 200)
-        animateView(items_list, true, 300)
+        animateView(feedBinding.refreshRootView, true, 200)
+        animateView(feedBinding.itemsList, true, 300)
 
-        animateView(loading_progress_bar, false, 0)
-        animateView(loading_progress_text, false, 0)
+        animateView(feedBinding.loadingProgressBar, false, 0)
+        animateView(feedBinding.loadingProgressText, false, 0)
 
-        empty_state_view?.let { animateView(it, false, 0) }
-        animateView(error_panel, false, 0)
-        swipeRefreshLayout.isRefreshing = false
+        animateView(feedBinding.emptyStateView.root, false, 0)
+        animateView(errorBinding.root, false, 0)
+        feedBinding.swiperefresh.isRefreshing = false
     }
 
     override fun showEmptyState() {
-        animateView(refresh_root_view, true, 200)
-        animateView(items_list, false, 0)
+        animateView(feedBinding.refreshRootView, true, 200)
+        animateView(feedBinding.itemsList, false, 0)
 
-        animateView(loading_progress_bar, false, 0)
-        animateView(loading_progress_text, false, 0)
+        animateView(feedBinding.loadingProgressBar, false, 0)
+        animateView(feedBinding.loadingProgressText, false, 0)
 
-        empty_state_view?.let { animateView(it, true, 800) }
-        animateView(error_panel, false, 0)
+        animateView(feedBinding.emptyStateView.root, true, 800)
+        animateView(errorBinding.root, false, 0)
     }
 
     override fun showError(message: String, showRetryButton: Boolean) {
         infoListAdapter.clearStreamItemList()
-        animateView(refresh_root_view, false, 120)
-        animateView(items_list, false, 120)
+        animateView(feedBinding.refreshRootView, false, 120)
+        animateView(feedBinding.itemsList, false, 120)
 
-        animateView(loading_progress_bar, false, 120)
-        animateView(loading_progress_text, false, 120)
+        animateView(feedBinding.loadingProgressBar, false, 120)
+        animateView(feedBinding.loadingProgressText, false, 120)
 
-        error_message_view.text = message
-        animateView(error_button_retry, showRetryButton, if (showRetryButton) 600 else 0)
-        animateView(error_panel, true, 300)
+        errorBinding.errorMessageView.text = message
+        animateView(errorBinding.errorButtonRetry, showRetryButton, if (showRetryButton) 600 else 0)
+        animateView(errorBinding.root, true, 300)
     }
 
     override fun handleResult(result: FeedState) {
@@ -237,33 +243,34 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
             progressState.maxProgress == -1
 
         if (!isIndeterminate) {
-            loading_progress_text.text = "${progressState.currentProgress}/${progressState.maxProgress}"
+            feedBinding.loadingProgressText.text = "${progressState.currentProgress}/${progressState.maxProgress}"
         } else if (progressState.progressMessage > 0) {
-            loading_progress_text?.setText(progressState.progressMessage)
+            _feedBinding?.loadingProgressText?.setText(progressState.progressMessage)
         } else {
-            loading_progress_text?.text = "∞/∞"
+            _feedBinding?.loadingProgressText?.text = "∞/∞"
         }
 
-        loading_progress_bar.isIndeterminate = isIndeterminate ||
-            (progressState.maxProgress > 0 && progressState.currentProgress == 0)
-        loading_progress_bar.progress = progressState.currentProgress
+        feedBinding.loadingProgressBar.isIndeterminate = isIndeterminate ||
+                (progressState.maxProgress > 0 && progressState.currentProgress == 0)
+        feedBinding.loadingProgressBar.progress = progressState.currentProgress
 
-        loading_progress_bar.max = progressState.maxProgress
+        feedBinding.loadingProgressBar.max = progressState.maxProgress
     }
 
     private fun handleLoadedState(loadedState: FeedState.LoadedState) {
         infoListAdapter.setInfoItemList(loadedState.items)
         listState?.run {
-            items_list.layoutManager?.onRestoreInstanceState(listState)
+            feedBinding.itemsList.layoutManager?.onRestoreInstanceState(listState)
             listState = null
         }
 
         oldestSubscriptionUpdate = loadedState.oldestUpdate
 
         val loadedCount = loadedState.notLoadedCount > 0
-        refresh_subtitle_text.isVisible = loadedCount
+        feedBinding.refreshSubtitleText.isVisible = loadedCount
         if (loadedCount) {
-            refresh_subtitle_text.text = getString(R.string.feed_subscription_not_loaded_count, loadedState.notLoadedCount)
+            feedBinding.refreshSubtitleText.text = getString(R.string.feed_subscription_not_loaded_count,
+                    loadedState.notLoadedCount)
         }
 
         if (loadedState.itemsErrors.isNotEmpty()) {
@@ -300,7 +307,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
             else -> "—"
         }
 
-        refresh_text?.text = getString(R.string.feed_oldest_subscription_update, oldestSubscriptionUpdateText)
+        feedBinding.refreshText.text = getString(R.string.feed_oldest_subscription_update, oldestSubscriptionUpdateText)
     }
 
     // /////////////////////////////////////////////////////////////////////////

From 83f33a7d1b45b4378de197f490542628a4413274 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 14:01:36 +0530
Subject: [PATCH 050/131] Use view binding in SubscriptionFragment.

---
 .../subscription/SubscriptionFragment.kt      | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index 64286dab347..c745ae39e12 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -17,6 +17,7 @@ import android.view.MenuInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
@@ -29,11 +30,10 @@ import com.xwray.groupie.Section
 import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import icepick.State
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import kotlinx.android.synthetic.main.dialog_title.view.itemAdditionalDetails
-import kotlinx.android.synthetic.main.dialog_title.view.itemTitleView
-import kotlinx.android.synthetic.main.fragment_subscription.items_list
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.databinding.DialogTitleBinding
+import org.schabi.newpipe.databinding.FragmentSubscriptionBinding
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
 import org.schabi.newpipe.fragments.BaseStateFragment
 import org.schabi.newpipe.local.subscription.SubscriptionViewModel.SubscriptionState
@@ -70,6 +70,9 @@ import kotlin.math.floor
 import kotlin.math.max
 
 class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
+    private var _binding: FragmentSubscriptionBinding? = null
+    private val binding get() = _binding!!
+
     private lateinit var viewModel: SubscriptionViewModel
     private lateinit var subscriptionManager: SubscriptionManager
     private val disposables: CompositeDisposable = CompositeDisposable()
@@ -129,7 +132,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     override fun onPause() {
         super.onPause()
-        itemsListState = items_list.layoutManager?.onSaveInstanceState()
+        itemsListState = binding.itemsList.layoutManager?.onSaveInstanceState()
         feedGroupsListState = feedGroupsCarousel?.onSaveInstanceState()
         importExportItemExpandedState = importExportItem.isExpanded
 
@@ -169,7 +172,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         filters.addAction(IMPORT_COMPLETE_ACTION)
         subscriptionBroadcastReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
-                items_list?.post {
+                _binding?.itemsList?.post {
                     importExportItem.isExpanded = false
                     importExportItem.notifyChanged(FeedImportExportItem.REFRESH_EXPANDED_STATUS)
                 }
@@ -275,17 +278,18 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     override fun initViews(rootView: View, savedInstanceState: Bundle?) {
         super.initViews(rootView, savedInstanceState)
+        _binding = FragmentSubscriptionBinding.bind(rootView)
 
         val shouldUseGridLayout = shouldUseGridLayout()
         groupAdapter.spanCount = if (shouldUseGridLayout) getGridSpanCount() else 1
-        items_list.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
+        binding.itemsList.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
             spanSizeLookup = groupAdapter.spanSizeLookup
         }
-        items_list.adapter = groupAdapter
+        binding.itemsList.adapter = groupAdapter
 
         viewModel = ViewModelProvider(this).get(SubscriptionViewModel::class.java)
-        viewModel.stateLiveData.observe(viewLifecycleOwner, androidx.lifecycle.Observer { it?.let(this::handleResult) })
-        viewModel.feedGroupsLiveData.observe(viewLifecycleOwner, androidx.lifecycle.Observer { it?.let(this::handleFeedGroups) })
+        viewModel.stateLiveData.observe(viewLifecycleOwner, Observer { it?.let(this::handleResult) })
+        viewModel.feedGroupsLiveData.observe(viewLifecycleOwner, Observer { it?.let(this::handleFeedGroups) })
     }
 
     private fun showLongTapDialog(selectedItem: ChannelInfoItem) {
@@ -301,16 +305,16 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
             }
         }
 
-        val bannerView = View.inflate(requireContext(), R.layout.dialog_title, null)
-        bannerView.isSelected = true
-        bannerView.itemTitleView.text = selectedItem.name
-        bannerView.itemAdditionalDetails.visibility = View.GONE
+        val dialogTitleBinding = DialogTitleBinding.inflate(LayoutInflater.from(requireContext()))
+        dialogTitleBinding.root.isSelected = true
+        dialogTitleBinding.itemTitleView.text = selectedItem.name
+        dialogTitleBinding.itemAdditionalDetails.visibility = View.GONE
 
         AlertDialog.Builder(requireContext())
-            .setCustomTitle(bannerView)
-            .setItems(commands, actions)
-            .create()
-            .show()
+                .setCustomTitle(dialogTitleBinding.root)
+                .setItems(commands, actions)
+                .create()
+                .show()
     }
 
     private fun deleteChannel(selectedItem: ChannelInfoItem) {
@@ -368,14 +372,14 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 subscriptionsSection.setHideWhenEmpty(false)
 
                 if (result.subscriptions.isEmpty() && importExportItemExpandedState == null) {
-                    items_list.post {
+                    binding.itemsList.post {
                         importExportItem.isExpanded = true
                         importExportItem.notifyChanged(FeedImportExportItem.REFRESH_EXPANDED_STATUS)
                     }
                 }
 
                 if (itemsListState != null) {
-                    items_list.layoutManager?.onRestoreInstanceState(itemsListState)
+                    binding.itemsList.layoutManager?.onRestoreInstanceState(itemsListState)
                     itemsListState = null
                 }
             }
@@ -394,7 +398,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         }
 
         feedGroupsSortMenuItem.showMenuItem = groups.size > 1
-        items_list.post { feedGroupsSortMenuItem.notifyChanged(PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM) }
+        binding.itemsList.post { feedGroupsSortMenuItem.notifyChanged(PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM) }
     }
 
     // /////////////////////////////////////////////////////////////////////////
@@ -403,12 +407,12 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     override fun showLoading() {
         super.showLoading()
-        animateView(items_list, false, 100)
+        animateView(binding.itemsList, false, 100)
     }
 
     override fun hideLoading() {
         super.hideLoading()
-        animateView(items_list, true, 200)
+        animateView(binding.itemsList, true, 200)
     }
 
     // /////////////////////////////////////////////////////////////////////////

From 5994cd8ea24c1216a771a99258bafc7ffd846675 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 14:15:43 +0530
Subject: [PATCH 051/131] Use view binding in FeedGroupDialog.

---
 .../subscription/dialog/FeedGroupDialog.kt    | 164 +++++++++---------
 1 file changed, 85 insertions(+), 79 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
index 1d5650a993e..8260f0fb9d2 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@@ -24,10 +24,10 @@ import com.xwray.groupie.Section
 import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import icepick.Icepick
 import icepick.State
-import kotlinx.android.synthetic.main.dialog_feed_group_create.*
-import kotlinx.android.synthetic.main.toolbar_search_layout.*
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.databinding.DialogFeedGroupCreateBinding
+import org.schabi.newpipe.databinding.ToolbarSearchLayoutBinding
 import org.schabi.newpipe.fragments.BackPressable
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.DeleteScreen
@@ -45,6 +45,12 @@ import java.io.Serializable
 import kotlin.collections.contains
 
 class FeedGroupDialog : DialogFragment(), BackPressable {
+    private var _feedGroupCreateBinding: DialogFeedGroupCreateBinding? = null
+    private val feedGroupCreateBinding get() = _feedGroupCreateBinding!!
+
+    private var _searchLayoutBinding: ToolbarSearchLayoutBinding? = null
+    private val searchLayoutBinding get() = _searchLayoutBinding!!
+
     private lateinit var viewModel: FeedGroupDialogViewModel
     private var groupId: Long = NO_GROUP_SELECTED
     private var groupIcon: FeedGroupIcon? = null
@@ -107,14 +113,16 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
 
-        iconsListState = icon_selector.layoutManager?.onSaveInstanceState()
-        subscriptionsListState = subscriptions_selector_list.layoutManager?.onSaveInstanceState()
+        iconsListState = feedGroupCreateBinding.iconSelector.layoutManager?.onSaveInstanceState()
+        subscriptionsListState = feedGroupCreateBinding.subscriptionsSelectorList.layoutManager?.onSaveInstanceState()
 
         Icepick.saveInstanceState(this, outState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        _feedGroupCreateBinding = DialogFeedGroupCreateBinding.bind(view)
+        _searchLayoutBinding = feedGroupCreateBinding.subscriptionsHeaderSearchContainer
 
         viewModel = ViewModelProvider(
             this,
@@ -146,7 +154,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
             add(subscriptionEmptyFooter)
             spanCount = 4
         }
-        subscriptions_selector_list.apply {
+        feedGroupCreateBinding.subscriptionsSelectorList.apply {
             // Disable animations, too distracting.
             itemAnimator = null
             adapter = subscriptionGroupAdapter
@@ -172,8 +180,11 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
     override fun onDestroyView() {
         super.onDestroyView()
-        subscriptions_selector_list?.adapter = null
-        icon_selector?.adapter = null
+        feedGroupCreateBinding.subscriptionsSelectorList.adapter = null
+        feedGroupCreateBinding.iconSelector.adapter = null
+
+        _feedGroupCreateBinding = null
+        _searchLayoutBinding = null
     }
 
     /*/​//////////////////////////////////////////////////////////////////////////
@@ -193,30 +204,30 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     }
 
     private fun setupListeners() {
-        delete_button.setOnClickListener { showScreen(DeleteScreen) }
+        feedGroupCreateBinding.deleteButton.setOnClickListener { showScreen(DeleteScreen) }
 
-        cancel_button.setOnClickListener {
+        feedGroupCreateBinding.cancelButton.setOnClickListener {
             when (currentScreen) {
                 InitialScreen -> dismiss()
                 else -> showScreen(InitialScreen)
             }
         }
 
-        group_name_input_container.error = null
-        group_name_input.doOnTextChanged { text, _, _, _ ->
-            if (group_name_input_container.isErrorEnabled && !text.isNullOrBlank()) {
-                group_name_input_container.error = null
+        feedGroupCreateBinding.groupNameInputContainer.error = null
+        feedGroupCreateBinding.groupNameInput.doOnTextChanged { text, _, _, _ ->
+            if (feedGroupCreateBinding.groupNameInputContainer.isErrorEnabled && !text.isNullOrBlank()) {
+                feedGroupCreateBinding.groupNameInputContainer.error = null
             }
         }
 
-        confirm_button.setOnClickListener { handlePositiveButton() }
+        feedGroupCreateBinding.confirmButton.setOnClickListener { handlePositiveButton() }
 
-        select_channel_button.setOnClickListener {
-            subscriptions_selector_list.scrollToPosition(0)
+        feedGroupCreateBinding.selectChannelButton.setOnClickListener {
+            feedGroupCreateBinding.subscriptionsSelectorList.scrollToPosition(0)
             showScreen(SubscriptionsPickerScreen)
         }
 
-        val headerMenu = subscriptions_header_toolbar.menu
+        val headerMenu = feedGroupCreateBinding.subscriptionsHeaderToolbar.menu
         requireActivity().menuInflater.inflate(R.menu.menu_feed_group_dialog, headerMenu)
 
         headerMenu.findItem(R.id.action_search).setOnMenuItemClickListener {
@@ -234,8 +245,8 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
             }
         }
 
-        toolbar_search_clear.setOnClickListener {
-            if (toolbar_search_edit_text.text.isEmpty()) {
+        searchLayoutBinding.toolbarSearchClear.setOnClickListener {
+            if (searchLayoutBinding.toolbarSearchEditText.text.isNullOrEmpty()) {
                 hideSearch()
                 return@setOnClickListener
             }
@@ -243,14 +254,14 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
             showKeyboardSearch()
         }
 
-        toolbar_search_edit_text.setOnClickListener {
+        searchLayoutBinding.toolbarSearchEditText.setOnClickListener {
             if (DeviceUtils.isTv(context)) {
                 showKeyboardSearch()
             }
         }
 
-        toolbar_search_edit_text.doOnTextChanged { _, _, _, _ ->
-            val newQuery: String = toolbar_search_edit_text.text.toString()
+        searchLayoutBinding.toolbarSearchEditText.doOnTextChanged { _, _, _, _ ->
+            val newQuery: String = searchLayoutBinding.toolbarSearchEditText.text.toString()
             subscriptionsCurrentSearchQuery = newQuery
             viewModel.filterSubscriptionsBy(newQuery)
         }
@@ -266,16 +277,16 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     }
 
     private fun handlePositiveButtonInitialScreen() {
-        val name = group_name_input.text.toString().trim()
+        val name = feedGroupCreateBinding.groupNameInput.text.toString().trim()
         val icon = selectedIcon ?: groupIcon ?: FeedGroupIcon.ALL
 
         if (name.isBlank()) {
-            group_name_input_container.error = getString(R.string.feed_group_dialog_empty_name)
-            group_name_input.text = null
-            group_name_input.requestFocus()
+            feedGroupCreateBinding.groupNameInputContainer.error = getString(R.string.feed_group_dialog_empty_name)
+            feedGroupCreateBinding.groupNameInput.text = null
+            feedGroupCreateBinding.groupNameInput.requestFocus()
             return
         } else {
-            group_name_input_container.error = null
+            feedGroupCreateBinding.groupNameInputContainer.error = null
         }
 
         if (selectedSubscriptions.isEmpty()) {
@@ -296,10 +307,10 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         groupSortOrder = feedGroupEntity?.sortOrder ?: -1
 
         val feedGroupIcon = if (selectedIcon == null) icon else selectedIcon!!
-        icon_preview.setImageResource(feedGroupIcon.getDrawableRes(requireContext()))
+        feedGroupCreateBinding.iconPreview.setImageResource(feedGroupIcon.getDrawableRes(requireContext()))
 
-        if (group_name_input.text.isNullOrBlank()) {
-            group_name_input.setText(name)
+        if (feedGroupCreateBinding.groupNameInput.text.isNullOrBlank()) {
+            feedGroupCreateBinding.groupNameInput.setText(name)
         }
     }
 
@@ -346,10 +357,10 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         subscriptionMainSection.update(subscriptions, false)
 
         if (subscriptionsListState != null) {
-            subscriptions_selector_list.layoutManager?.onRestoreInstanceState(subscriptionsListState)
+            feedGroupCreateBinding.subscriptionsSelectorList.layoutManager?.onRestoreInstanceState(subscriptionsListState)
             subscriptionsListState = null
         } else {
-            subscriptions_selector_list.scrollToPosition(0)
+            feedGroupCreateBinding.subscriptionsSelectorList.scrollToPosition(0)
         }
     }
 
@@ -357,17 +368,16 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         val selectedCount = this.selectedSubscriptions.size
         val selectedCountText = resources.getQuantityString(
             R.plurals.feed_group_dialog_selection_count,
-            selectedCount, selectedCount
-        )
-        selected_subscription_count_view.text = selectedCountText
-        subscriptions_header_info.text = selectedCountText
+            selectedCount, selectedCount)
+        feedGroupCreateBinding.selectedSubscriptionCountView.text = selectedCountText
+        feedGroupCreateBinding.subscriptionsHeaderInfo.text = selectedCountText
     }
 
     private fun setupIconPicker() {
         val groupAdapter = GroupAdapter<GroupieViewHolder>()
         groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(requireContext(), it) })
 
-        icon_selector.apply {
+        feedGroupCreateBinding.iconSelector.apply {
             layoutManager = GridLayoutManager(requireContext(), 7, RecyclerView.VERTICAL, false)
             adapter = groupAdapter
 
@@ -381,20 +391,20 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
             when (item) {
                 is PickerIconItem -> {
                     selectedIcon = item.icon
-                    icon_preview.setImageResource(item.iconRes)
+                    feedGroupCreateBinding.iconPreview.setImageResource(item.iconRes)
 
                     showScreen(InitialScreen)
                 }
             }
         }
-        icon_preview.setOnClickListener {
-            icon_selector.scrollToPosition(0)
+        feedGroupCreateBinding.iconPreview.setOnClickListener {
+            feedGroupCreateBinding.iconSelector.scrollToPosition(0)
             showScreen(IconPickerScreen)
         }
 
         if (groupId == NO_GROUP_SELECTED) {
             val icon = selectedIcon ?: FeedGroupIcon.ALL
-            icon_preview.setImageResource(icon.getDrawableRes(requireContext()))
+            feedGroupCreateBinding.iconPreview.setImageResource(icon.getDrawableRes(requireContext()))
         }
     }
 
@@ -405,22 +415,20 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     private fun showScreen(screen: ScreenState) {
         currentScreen = screen
 
-        options_root.onlyVisibleIn(InitialScreen)
-        icon_selector.onlyVisibleIn(IconPickerScreen)
-        subscriptions_selector.onlyVisibleIn(SubscriptionsPickerScreen)
-        delete_screen_message.onlyVisibleIn(DeleteScreen)
+        feedGroupCreateBinding.optionsRoot.onlyVisibleIn(InitialScreen)
+        feedGroupCreateBinding.iconSelector.onlyVisibleIn(IconPickerScreen)
+        feedGroupCreateBinding.subscriptionsSelector.onlyVisibleIn(SubscriptionsPickerScreen)
+        feedGroupCreateBinding.deleteScreenMessage.onlyVisibleIn(DeleteScreen)
 
-        separator.onlyVisibleIn(SubscriptionsPickerScreen, IconPickerScreen)
-        cancel_button.onlyVisibleIn(InitialScreen, DeleteScreen)
+        feedGroupCreateBinding.separator.onlyVisibleIn(SubscriptionsPickerScreen, IconPickerScreen)
+        feedGroupCreateBinding.cancelButton.onlyVisibleIn(InitialScreen, DeleteScreen)
 
-        confirm_button.setText(
-            when {
-                currentScreen == InitialScreen && groupId == NO_GROUP_SELECTED -> R.string.create
-                else -> android.R.string.ok
-            }
-        )
+        feedGroupCreateBinding.confirmButton.setText(when {
+            currentScreen == InitialScreen && groupId == NO_GROUP_SELECTED -> R.string.create
+            else -> android.R.string.ok
+        })
 
-        delete_button.isGone = currentScreen != InitialScreen || groupId == NO_GROUP_SELECTED
+        feedGroupCreateBinding.deleteButton.isGone = currentScreen != InitialScreen || groupId == NO_GROUP_SELECTED
 
         hideKeyboard()
         hideSearch()
@@ -434,26 +442,26 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     // Utils
     //​//////////////////////////////////////////////////////////////////////// */
 
-    private fun isSearchVisible() = subscriptions_header_search_container?.visibility == View.VISIBLE
+    private fun isSearchVisible() = _searchLayoutBinding?.root?.visibility == View.VISIBLE
 
     private fun resetSearch() {
-        toolbar_search_edit_text.setText("")
+        searchLayoutBinding.toolbarSearchEditText.setText("")
         subscriptionsCurrentSearchQuery = ""
         viewModel.clearSubscriptionsFilter()
     }
 
     private fun hideSearch() {
         resetSearch()
-        subscriptions_header_search_container.visibility = View.GONE
-        subscriptions_header_info_container.visibility = View.VISIBLE
-        subscriptions_header_toolbar.menu.findItem(R.id.action_search).isVisible = true
+        searchLayoutBinding.root.visibility = View.GONE
+        feedGroupCreateBinding.subscriptionsHeaderInfoContainer.visibility = View.VISIBLE
+        feedGroupCreateBinding.subscriptionsHeaderToolbar.menu.findItem(R.id.action_search).isVisible = true
         hideKeyboardSearch()
     }
 
     private fun showSearch() {
-        subscriptions_header_search_container.visibility = View.VISIBLE
-        subscriptions_header_info_container.visibility = View.GONE
-        subscriptions_header_toolbar.menu.findItem(R.id.action_search).isVisible = false
+        searchLayoutBinding.root.visibility = View.VISIBLE
+        feedGroupCreateBinding.subscriptionsHeaderInfoContainer.visibility = View.GONE
+        feedGroupCreateBinding.subscriptionsHeaderToolbar.menu.findItem(R.id.action_search).isVisible = false
         showKeyboardSearch()
     }
 
@@ -462,37 +470,35 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     }
 
     private fun showKeyboardSearch() {
-        if (toolbar_search_edit_text.requestFocus()) {
-            inputMethodManager.showSoftInput(toolbar_search_edit_text, InputMethodManager.SHOW_IMPLICIT)
+        if (searchLayoutBinding.toolbarSearchEditText.requestFocus()) {
+            inputMethodManager.showSoftInput(searchLayoutBinding.toolbarSearchEditText,
+                    InputMethodManager.SHOW_IMPLICIT)
         }
     }
 
     private fun hideKeyboardSearch() {
-        inputMethodManager.hideSoftInputFromWindow(
-            toolbar_search_edit_text.windowToken,
-            InputMethodManager.RESULT_UNCHANGED_SHOWN
-        )
-        toolbar_search_edit_text.clearFocus()
+        inputMethodManager.hideSoftInputFromWindow(searchLayoutBinding.toolbarSearchEditText.windowToken,
+            InputMethodManager.RESULT_UNCHANGED_SHOWN)
+        searchLayoutBinding.toolbarSearchEditText.clearFocus()
     }
 
     private fun showKeyboard() {
-        if (group_name_input.requestFocus()) {
-            inputMethodManager.showSoftInput(group_name_input, InputMethodManager.SHOW_IMPLICIT)
+        if (feedGroupCreateBinding.groupNameInput.requestFocus()) {
+            inputMethodManager.showSoftInput(feedGroupCreateBinding.groupNameInput,
+                    InputMethodManager.SHOW_IMPLICIT)
         }
     }
 
     private fun hideKeyboard() {
-        inputMethodManager.hideSoftInputFromWindow(
-            group_name_input.windowToken,
-            InputMethodManager.RESULT_UNCHANGED_SHOWN
-        )
-        group_name_input.clearFocus()
+        inputMethodManager.hideSoftInputFromWindow(feedGroupCreateBinding.groupNameInput.windowToken,
+            InputMethodManager.RESULT_UNCHANGED_SHOWN)
+        feedGroupCreateBinding.groupNameInput.clearFocus()
     }
 
     private fun disableInput() {
-        delete_button?.isEnabled = false
-        confirm_button?.isEnabled = false
-        cancel_button?.isEnabled = false
+        _feedGroupCreateBinding?.deleteButton?.isEnabled = false
+        _feedGroupCreateBinding?.confirmButton?.isEnabled = false
+        _feedGroupCreateBinding?.cancelButton?.isEnabled = false
         isCancelable = false
 
         hideKeyboard()

From f04b5fd42f493df0dc6b35c8c45b3b498f4ef9f5 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 3 Nov 2020 14:17:24 +0530
Subject: [PATCH 052/131] Use view binding in FeedGroupReorderDialog.

---
 .../dialog/FeedGroupReorderDialog.kt          | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
index 380bf13f5bc..3b74ddc7433 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
@@ -16,10 +16,9 @@ import com.xwray.groupie.TouchCallback
 import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import icepick.Icepick
 import icepick.State
-import kotlinx.android.synthetic.main.dialog_feed_group_reorder.confirm_button
-import kotlinx.android.synthetic.main.dialog_feed_group_reorder.feed_groups_list
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.databinding.DialogFeedGroupReorderBinding
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.ProcessingEvent
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.SuccessEvent
 import org.schabi.newpipe.local.subscription.item.FeedGroupReorderItem
@@ -27,6 +26,9 @@ import org.schabi.newpipe.util.ThemeHelper
 import java.util.Collections
 
 class FeedGroupReorderDialog : DialogFragment() {
+    private var _binding: DialogFeedGroupReorderBinding? = null
+    private val binding get() = _binding!!
+
     private lateinit var viewModel: FeedGroupReorderDialogViewModel
 
     @State
@@ -48,6 +50,7 @@ class FeedGroupReorderDialog : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        _binding = DialogFeedGroupReorderBinding.bind(view)
 
         viewModel = ViewModelProvider(this).get(FeedGroupReorderDialogViewModel::class.java)
         viewModel.groupsLiveData.observe(viewLifecycleOwner, Observer(::handleGroups))
@@ -61,15 +64,20 @@ class FeedGroupReorderDialog : DialogFragment() {
             }
         )
 
-        feed_groups_list.layoutManager = LinearLayoutManager(requireContext())
-        feed_groups_list.adapter = groupAdapter
-        itemTouchHelper.attachToRecyclerView(feed_groups_list)
+        binding.feedGroupsList.layoutManager = LinearLayoutManager(requireContext())
+        binding.feedGroupsList.adapter = groupAdapter
+        itemTouchHelper.attachToRecyclerView(binding.feedGroupsList)
 
-        confirm_button.setOnClickListener {
+        binding.confirmButton.setOnClickListener {
             viewModel.updateOrder(groupOrderedIdList)
         }
     }
 
+    override fun onDestroyView() {
+        _binding = null
+        super.onDestroyView()
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         Icepick.saveInstanceState(this, outState)
@@ -89,7 +97,7 @@ class FeedGroupReorderDialog : DialogFragment() {
     }
 
     private fun disableInput() {
-        confirm_button?.isEnabled = false
+        _binding?.confirmButton?.isEnabled = false
         isCancelable = false
     }
 

From f6e2dd1480a71fa61d8a285912beb11c9169c069 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 8 Jan 2021 18:35:33 +0100
Subject: [PATCH 053/131] Merge player classes into a single one

---
 .../java/org/schabi/newpipe/MainActivity.java |    4 +-
 .../fragments/detail/VideoDetailFragment.java |   28 +-
 .../player/BackgroundPlayerActivity.java      |   20 +-
 .../org/schabi/newpipe/player/BasePlayer.java | 1615 -------
 .../org/schabi/newpipe/player/MainPlayer.java |  101 +-
 .../newpipe/player/NotificationUtil.java      |   92 +-
 .../org/schabi/newpipe/player/Player.java     | 3973 +++++++++++++++++
 .../newpipe/player/PlayerServiceBinder.java   |   10 +-
 .../newpipe/player/ServicePlayerActivity.java |   43 +-
 .../schabi/newpipe/player/VideoPlayer.java    | 1036 -----
 .../newpipe/player/VideoPlayerImpl.java       | 2076 ---------
 .../player/event/BasePlayerGestureListener.kt |  116 +-
 .../player/event/PlayerGestureListener.java   |  135 +-
 .../PlayerServiceExtendedEventListener.java   |    4 +-
 .../helper/PlaybackParameterDialog.java       |    2 +-
 .../newpipe/player/helper/PlayerHelper.java   |  311 +-
 .../newpipe/player/helper/PlayerHolder.java   |    4 +-
 .../mediasession/MediaSessionCallback.java    |   10 +-
 .../mediasession/PlayQueueNavigator.java      |    6 +-
 .../PlayQueuePlaybackController.java          |    4 +-
 ...iaSession.java => PlayerMediaSession.java} |   35 +-
 .../org/schabi/newpipe/util/Localization.java |   15 +
 .../schabi/newpipe/util/NavigationHelper.java |   27 +-
 app/src/main/res/values/settings_keys.xml     |    6 +-
 checkstyle-suppressions.xml                   |    2 +-
 25 files changed, 4528 insertions(+), 5147 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/player/Player.java
 delete mode 100644 app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
 delete mode 100644 app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
 rename app/src/main/java/org/schabi/newpipe/player/playback/{BasePlayerMediaSession.java => PlayerMediaSession.java} (77%)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 0c784e9d50a..b111af1fb03 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -68,7 +68,7 @@
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
-import org.schabi.newpipe.player.VideoPlayer;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -763,7 +763,7 @@ private void handleIntent(final Intent intent) {
                 switch (linkType) {
                     case STREAM:
                         final String intentCacheKey = intent.getStringExtra(
-                                VideoPlayer.PLAY_QUEUE_KEY);
+                                Player.PLAY_QUEUE_KEY);
                         final PlayQueue playQueue = intentCacheKey != null
                                 ? SerializedCache.getInstance()
                                 .take(intentCacheKey, PlayQueue.class)
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index aeb51f63adb..b9f4ef6a97b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -49,7 +49,6 @@
 
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.tabs.TabLayout;
@@ -80,9 +79,8 @@
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.BasePlayer;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.VideoPlayerImpl;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
 import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -255,14 +253,14 @@ public final class VideoDetailFragment
 
     private ContentObserver settingsContentObserver;
     private MainPlayer playerService;
-    private VideoPlayerImpl player;
+    private Player player;
 
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service management
     //////////////////////////////////////////////////////////////////////////*/
     @Override
-    public void onServiceConnected(final VideoPlayerImpl connectedPlayer,
+    public void onServiceConnected(final Player connectedPlayer,
                                    final MainPlayer connectedPlayerService,
                                    final boolean playAfterConnect) {
         player = connectedPlayer;
@@ -539,7 +537,7 @@ public void onClick(final View v) {
                 break;
             case R.id.overlay_play_pause_button:
                 if (playerIsNotStopped()) {
-                    player.onPlayPause();
+                    player.playPause();
                     player.hideControls(0, 0);
                     showSystemUi();
                 } else {
@@ -805,7 +803,7 @@ public boolean onBackPressed() {
         // If we are in fullscreen mode just exit from it via first back press
         if (player != null && player.isFullscreen()) {
             if (!DeviceUtils.isTablet(activity)) {
-                player.onPause();
+                player.pause();
             }
             restoreDefaultOrientation();
             setAutoPlay(false);
@@ -850,7 +848,7 @@ private void setupFromHistoryItem(final StackItem item) {
 
         final PlayQueueItem playQueueItem = item.getPlayQueue().getItem();
         // Update title, url, uploader from the last item in the stack (it's current now)
-        final boolean isPlayerStopped = player == null || player.isPlayerStopped();
+        final boolean isPlayerStopped = player == null || player.isStopped();
         if (playQueueItem != null && isPlayerStopped) {
             updateOverlayData(playQueueItem.getTitle(),
                     playQueueItem.getUploader(), playQueueItem.getThumbnailUrl());
@@ -1569,7 +1567,7 @@ public void handleResult(@NonNull final StreamInfo info) {
         showMetaInfoInTextView(info.getMetaInfo(), detailMetaInfoTextView, detailMetaInfoSeparator);
 
 
-        if (player == null || player.isPlayerStopped()) {
+        if (player == null || player.isStopped()) {
             updateOverlayData(info.getName(), info.getUploaderName(), info.getThumbnailUrl());
         }
 
@@ -1797,7 +1795,7 @@ public void onPlaybackUpdate(final int state,
         setOverlayPlayPauseImage(player != null && player.isPlaying());
 
         switch (state) {
-            case BasePlayer.STATE_PLAYING:
+            case Player.STATE_PLAYING:
                 if (positionView.getAlpha() != 1.0f
                         && player.getPlayQueue() != null
                         && player.getPlayQueue().getItem() != null
@@ -1814,7 +1812,7 @@ public void onProgressUpdate(final int currentProgress,
                                  final int duration,
                                  final int bufferPercent) {
         // Progress updates every second even if media is paused. It's useless until playing
-        if (!player.getPlayer().isPlaying() || playQueue == null) {
+        if (!player.isPlaying() || playQueue == null) {
             return;
         }
 
@@ -2020,9 +2018,7 @@ public void hideSystemUiIfNeeded() {
     }
 
     private boolean playerIsNotStopped() {
-        return player != null
-                && player.getPlayer() != null
-                && player.getPlayer().getPlaybackState() != Player.STATE_IDLE;
+        return player != null && !player.isStopped();
     }
 
     private void restoreDefaultBrightness() {
@@ -2073,7 +2069,7 @@ private void checkLandscape() {
         player.checkLandscape();
         // Let's give a user time to look at video information page if video is not playing
         if (globalScreenOrientationLocked(activity) && !player.isPlaying()) {
-            player.onPlay();
+            player.play();
         }
     }
 
@@ -2287,7 +2283,7 @@ public void onStateChanged(@NonNull final View bottomSheet, final int newState)
                         // Re-enable clicks
                         setOverlayElementsClickable(true);
                         if (player != null) {
-                            player.onQueueClosed();
+                            player.closeQueue();
                         }
                         setOverlayLook(appBarLayout, behavior, 0);
                         break;
diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
index 2fc710fb0b3..eb1c74dadaa 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
@@ -26,15 +26,15 @@ public Intent getBindIntent() {
 
     @Override
     public void startPlayerListener() {
-        if (player instanceof VideoPlayerImpl) {
-            ((VideoPlayerImpl) player).setActivityListener(this);
+        if (player != null) {
+            player.setActivityListener(this);
         }
     }
 
     @Override
     public void stopPlayerListener() {
-        if (player instanceof VideoPlayerImpl) {
-            ((VideoPlayerImpl) player).removeActivityListener(this);
+        if (player != null) {
+            player.removeActivityListener(this);
         }
     }
 
@@ -45,13 +45,11 @@ public int getPlayerOptionMenuResource() {
 
     @Override
     public void setupMenu(final Menu menu) {
-        if (player == null) {
-            return;
+        if (player != null) {
+            menu.findItem(R.id.action_switch_popup)
+                    .setVisible(!player.popupPlayerSelected());
+            menu.findItem(R.id.action_switch_background)
+                    .setVisible(!player.audioPlayerSelected());
         }
-
-        menu.findItem(R.id.action_switch_popup)
-                .setVisible(!((VideoPlayerImpl) player).popupPlayerSelected());
-        menu.findItem(R.id.action_switch_background)
-                .setVisible(!((VideoPlayerImpl) player).audioPlayerSelected());
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
deleted file mode 100644
index ea16574e942..00000000000
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ /dev/null
@@ -1,1615 +0,0 @@
-/*
- * Copyright 2017 Mauricio Colli <mauriciocolli@outlook.com>
- * BasePlayer.java is part of NewPipe
- *
- * License: GPL-3.0+
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.schabi.newpipe.player;
-
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.AudioManager;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceManager;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
-import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.LoadControl;
-import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.BehindLiveWindowException;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.disposables.SerialDisposable;
-import java.io.IOException;
-import org.schabi.newpipe.DownloaderImpl;
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.helper.AudioReactor;
-import org.schabi.newpipe.player.helper.LoadController;
-import org.schabi.newpipe.player.helper.MediaSessionManager;
-import org.schabi.newpipe.player.helper.PlayerDataSource;
-import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.playback.BasePlayerMediaSession;
-import org.schabi.newpipe.player.playback.CustomTrackSelector;
-import org.schabi.newpipe.player.playback.MediaSourceManager;
-import org.schabi.newpipe.player.playback.PlaybackListener;
-import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import org.schabi.newpipe.player.resolver.MediaSourceTag;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.SerializedCache;
-
-/**
- * Base for the players, joining the common properties.
- *
- * @author mauriciocolli
- */
-@SuppressWarnings({"WeakerAccess"})
-public abstract class BasePlayer implements
-        Player.EventListener, PlaybackListener, ImageLoadingListener {
-    public static final boolean DEBUG = MainActivity.DEBUG;
-    @NonNull
-    public static final String TAG = "BasePlayer";
-
-    public static final int STATE_PREFLIGHT = -1;
-    public static final int STATE_BLOCKED = 123;
-    public static final int STATE_PLAYING = 124;
-    public static final int STATE_BUFFERING = 125;
-    public static final int STATE_PAUSED = 126;
-    public static final int STATE_PAUSED_SEEK = 127;
-    public static final int STATE_COMPLETED = 128;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Intent
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @NonNull
-    public static final String REPEAT_MODE = "repeat_mode";
-    @NonNull
-    public static final String PLAYBACK_QUALITY = "playback_quality";
-    @NonNull
-    public static final String PLAY_QUEUE_KEY = "play_queue_key";
-    @NonNull
-    public static final String APPEND_ONLY = "append_only";
-    @NonNull
-    public static final String RESUME_PLAYBACK = "resume_playback";
-    @NonNull
-    public static final String PLAY_WHEN_READY = "play_when_ready";
-    @NonNull
-    public static final String SELECT_ON_APPEND = "select_on_append";
-    @NonNull
-    public static final String PLAYER_TYPE = "player_type";
-    @NonNull
-    public static final String IS_MUTED = "is_muted";
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playback
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected static final float[] PLAYBACK_SPEEDS = {0.5f, 0.75f, 1.0f, 1.25f, 1.5f, 1.75f, 2.0f};
-
-    protected PlayQueue playQueue;
-    protected PlayQueueAdapter playQueueAdapter;
-
-    @Nullable
-    protected MediaSourceManager playbackManager;
-
-    @Nullable
-    private PlayQueueItem currentItem;
-    @Nullable
-    private MediaSourceTag currentMetadata;
-    @Nullable
-    private Bitmap currentThumbnail;
-
-    @Nullable
-    protected Toast errorToast;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Player
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected static final int PLAY_PREV_ACTIVATION_LIMIT_MILLIS = 5000; // 5 seconds
-    protected static final int PROGRESS_LOOP_INTERVAL_MILLIS = 500;
-
-    public static final int PLAYER_TYPE_VIDEO = 0;
-    public static final int PLAYER_TYPE_AUDIO = 1;
-    public static final int PLAYER_TYPE_POPUP = 2;
-
-    protected SimpleExoPlayer simpleExoPlayer;
-    protected AudioReactor audioReactor;
-    protected MediaSessionManager mediaSessionManager;
-
-
-    @NonNull
-    protected final Context context;
-    @NonNull
-    protected final BroadcastReceiver broadcastReceiver;
-    @NonNull
-    protected final IntentFilter intentFilter;
-    @NonNull
-    protected final HistoryRecordManager recordManager;
-    @NonNull
-    protected final SharedPreferences sharedPreferences;
-    @NonNull
-    protected final CustomTrackSelector trackSelector;
-    @NonNull
-    protected final PlayerDataSource dataSource;
-    @NonNull
-    private final LoadControl loadControl;
-
-    @NonNull
-    private final RenderersFactory renderFactory;
-    @NonNull
-    private final SerialDisposable progressUpdateReactor;
-    @NonNull
-    private final CompositeDisposable databaseUpdateReactor;
-
-    private boolean isPrepared = false;
-    private Disposable stateLoader;
-
-    protected int currentState = STATE_PREFLIGHT;
-
-    public BasePlayer(@NonNull final Context context) {
-        this.context = context;
-
-        this.broadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(final Context ctx, final Intent intent) {
-                onBroadcastReceived(intent);
-            }
-        };
-        this.intentFilter = new IntentFilter();
-        setupBroadcastReceiver(intentFilter);
-
-        this.recordManager = new HistoryRecordManager(context);
-        this.sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-
-        this.progressUpdateReactor = new SerialDisposable();
-        this.databaseUpdateReactor = new CompositeDisposable();
-
-        final String userAgent = DownloaderImpl.USER_AGENT;
-        final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter.Builder(context)
-                .build();
-        this.dataSource = new PlayerDataSource(context, userAgent, bandwidthMeter);
-
-        final TrackSelection.Factory trackSelectionFactory = PlayerHelper
-                .getQualitySelector();
-        this.trackSelector = new CustomTrackSelector(context, trackSelectionFactory);
-
-        this.loadControl = new LoadController();
-        this.renderFactory = new DefaultRenderersFactory(context);
-    }
-
-    public void initPlayer(final boolean playOnReady) {
-        if (DEBUG) {
-            Log.d(TAG, "initPlayer() called with: playOnReady = [" + playOnReady + "]");
-        }
-
-        simpleExoPlayer = new SimpleExoPlayer.Builder(context, renderFactory)
-                .setTrackSelector(trackSelector)
-                .setLoadControl(loadControl)
-                .build();
-        simpleExoPlayer.addListener(this);
-        simpleExoPlayer.setPlayWhenReady(playOnReady);
-        simpleExoPlayer.setSeekParameters(PlayerHelper.getSeekParameters(context));
-        simpleExoPlayer.setWakeMode(C.WAKE_MODE_NETWORK);
-        simpleExoPlayer.setHandleAudioBecomingNoisy(true);
-
-        audioReactor = new AudioReactor(context, simpleExoPlayer);
-        mediaSessionManager = new MediaSessionManager(context, simpleExoPlayer,
-                new BasePlayerMediaSession(this));
-
-        registerBroadcastReceiver();
-    }
-
-    public void initListeners() {
-    }
-
-    public void handleIntent(final Intent intent) {
-        if (DEBUG) {
-            Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
-        }
-        if (intent == null) {
-            return;
-        }
-
-        // Resolve play queue
-        if (!intent.hasExtra(PLAY_QUEUE_KEY)) {
-            return;
-        }
-        final String intentCacheKey = intent.getStringExtra(PLAY_QUEUE_KEY);
-        final PlayQueue queue = SerializedCache.getInstance().take(intentCacheKey, PlayQueue.class);
-        if (queue == null) {
-            return;
-        }
-
-        // Resolve append intents
-        if (intent.getBooleanExtra(APPEND_ONLY, false) && playQueue != null) {
-            final int sizeBeforeAppend = playQueue.size();
-            playQueue.append(queue.getStreams());
-
-            if ((intent.getBooleanExtra(SELECT_ON_APPEND, false)
-                    || getCurrentState() == STATE_COMPLETED) && queue.getStreams().size() > 0) {
-                playQueue.setIndex(sizeBeforeAppend);
-            }
-
-            return;
-        }
-
-        final PlaybackParameters savedParameters = retrievePlaybackParametersFromPreferences();
-        final float playbackSpeed = savedParameters.speed;
-        final float playbackPitch = savedParameters.pitch;
-        final boolean playbackSkipSilence = savedParameters.skipSilence;
-
-        final boolean samePlayQueue = playQueue != null && playQueue.equals(queue);
-
-        final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
-        final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
-        final boolean isMuted = intent
-                .getBooleanExtra(IS_MUTED, simpleExoPlayer != null && isMuted());
-
-        /*
-         * There are 3 situations when playback shouldn't be started from scratch (zero timestamp):
-         * 1. User pressed on a timestamp link and the same video should be rewound to the timestamp
-         * 2. User changed a player from, for example. main to popup, or from audio to main, etc
-         * 3. User chose to resume a video based on a saved timestamp from history of played videos
-         * In those cases time will be saved because re-init of the play queue is a not an instant
-         *  task and requires network calls
-         * */
-        // seek to timestamp if stream is already playing
-        if (simpleExoPlayer != null
-                && queue.size() == 1
-                && playQueue != null
-                && playQueue.size() == 1
-                && playQueue.getItem() != null
-                && queue.getItem().getUrl().equals(playQueue.getItem().getUrl())
-                && queue.getItem().getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
-            // Player can have state = IDLE when playback is stopped or failed
-            // and we should retry() in this case
-            if (simpleExoPlayer.getPlaybackState() == Player.STATE_IDLE) {
-                simpleExoPlayer.retry();
-            }
-            simpleExoPlayer.seekTo(playQueue.getIndex(), queue.getItem().getRecoveryPosition());
-            simpleExoPlayer.setPlayWhenReady(playWhenReady);
-
-        } else if (simpleExoPlayer != null
-                && samePlayQueue
-                && playQueue != null
-                && !playQueue.isDisposed()) {
-            // Do not re-init the same PlayQueue. Save time
-            // Player can have state = IDLE when playback is stopped or failed
-            // and we should retry() in this case
-            if (simpleExoPlayer.getPlaybackState() == Player.STATE_IDLE) {
-                simpleExoPlayer.retry();
-            }
-            simpleExoPlayer.setPlayWhenReady(playWhenReady);
-
-        } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false)
-            && isPlaybackResumeEnabled()
-            && !samePlayQueue
-            && !queue.isEmpty()
-            && queue.getItem().getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
-            stateLoader = recordManager.loadStreamState(queue.getItem())
-                .observeOn(AndroidSchedulers.mainThread())
-                // Do not place initPlayback() in doFinally() because
-                // it restarts playback after destroy()
-                //.doFinally()
-                .subscribe(
-                    state -> {
-                        queue.setRecovery(queue.getIndex(), state.getProgressTime());
-                        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                            playbackSkipSilence, playWhenReady, isMuted);
-                    },
-                    error -> {
-                        if (DEBUG) {
-                            error.printStackTrace();
-                        }
-                        // In case any error we can start playback without history
-                        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                            playbackSkipSilence, playWhenReady, isMuted);
-                    },
-                    () -> {
-                        // Completed but not found in history
-                                    initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                                            playbackSkipSilence, playWhenReady, isMuted);
-                                }
-                        );
-                databaseUpdateReactor.add(stateLoader);
-        } else {
-            // Good to go...
-            // In a case of equal PlayQueues we can re-init old one but only when it is disposed
-            initPlayback(samePlayQueue ? playQueue : queue, repeatMode, playbackSpeed,
-                    playbackPitch, playbackSkipSilence, playWhenReady, isMuted);
-        }
-    }
-
-    private PlaybackParameters retrievePlaybackParametersFromPreferences() {
-        final SharedPreferences preferences =
-                PreferenceManager.getDefaultSharedPreferences(context);
-
-        final float speed = preferences.getFloat(
-                context.getString(R.string.playback_speed_key), getPlaybackSpeed());
-        final float pitch = preferences.getFloat(
-                context.getString(R.string.playback_pitch_key), getPlaybackPitch());
-        final boolean skipSilence = preferences.getBoolean(
-                context.getString(R.string.playback_skip_silence_key), getPlaybackSkipSilence());
-        return new PlaybackParameters(speed, pitch, skipSilence);
-    }
-
-    protected void initPlayback(@NonNull final PlayQueue queue,
-                                @Player.RepeatMode final int repeatMode,
-                                final float playbackSpeed,
-                                final float playbackPitch,
-                                final boolean playbackSkipSilence,
-                                final boolean playOnReady,
-                                final boolean isMuted) {
-        destroyPlayer();
-        initPlayer(playOnReady);
-        setRepeatMode(repeatMode);
-        setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
-
-        playQueue = queue;
-        playQueue.init();
-        if (playbackManager != null) {
-            playbackManager.dispose();
-        }
-        playbackManager = new MediaSourceManager(this, playQueue);
-
-        if (playQueueAdapter != null) {
-            playQueueAdapter.dispose();
-        }
-        playQueueAdapter = new PlayQueueAdapter(context, playQueue);
-
-        simpleExoPlayer.setVolume(isMuted ? 0 : 1);
-    }
-
-    public void destroyPlayer() {
-        if (DEBUG) {
-            Log.d(TAG, "destroyPlayer() called");
-        }
-        if (simpleExoPlayer != null) {
-            simpleExoPlayer.removeListener(this);
-            simpleExoPlayer.stop();
-            simpleExoPlayer.release();
-        }
-        if (isProgressLoopRunning()) {
-            stopProgressLoop();
-        }
-        if (playQueue != null) {
-            playQueue.dispose();
-        }
-        if (audioReactor != null) {
-            audioReactor.dispose();
-        }
-        if (playbackManager != null) {
-            playbackManager.dispose();
-        }
-        if (mediaSessionManager != null) {
-            mediaSessionManager.dispose();
-        }
-        if (stateLoader != null) {
-            stateLoader.dispose();
-        }
-
-        if (playQueueAdapter != null) {
-            playQueueAdapter.unsetSelectedListener();
-            playQueueAdapter.dispose();
-        }
-    }
-
-    public void destroy() {
-        if (DEBUG) {
-            Log.d(TAG, "destroy() called");
-        }
-        destroyPlayer();
-        unregisterBroadcastReceiver();
-
-        databaseUpdateReactor.clear();
-        progressUpdateReactor.set(null);
-        ImageLoader.getInstance().stop();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Thumbnail Loading
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void initThumbnail(final String url) {
-        if (DEBUG) {
-            Log.d(TAG, "Thumbnail - initThumbnail() called");
-        }
-        if (url == null || url.isEmpty()) {
-            return;
-        }
-        ImageLoader.getInstance().resume();
-        ImageLoader.getInstance()
-                .loadImage(url, ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, this);
-    }
-
-    @Override
-    public void onLoadingStarted(final String imageUri, final View view) {
-        if (DEBUG) {
-            Log.d(TAG, "Thumbnail - onLoadingStarted() called on: "
-                    + "imageUri = [" + imageUri + "], view = [" + view + "]");
-        }
-    }
-
-    @Override
-    public void onLoadingFailed(final String imageUri, final View view,
-                                final FailReason failReason) {
-        Log.e(TAG, "Thumbnail - onLoadingFailed() called on imageUri = [" + imageUri + "]",
-                failReason.getCause());
-        currentThumbnail = null;
-    }
-
-    @Override
-    public void onLoadingComplete(final String imageUri, final View view,
-                                  final Bitmap loadedImage) {
-        final float width = Math.min(
-                context.getResources().getDimension(R.dimen.player_notification_thumbnail_width),
-                loadedImage.getWidth());
-        currentThumbnail = Bitmap.createScaledBitmap(loadedImage,
-                (int) width,
-                (int) (loadedImage.getHeight() / (loadedImage.getWidth() / width)), true);
-        if (DEBUG) {
-            Log.d(TAG, "Thumbnail - onLoadingComplete() called with: "
-                    + "imageUri = [" + imageUri + "], view = [" + view + "], "
-                    + "loadedImage = [" + loadedImage + "], "
-                    + loadedImage.getWidth() + "x" + loadedImage.getHeight()
-            + ", scaled width = " + width);
-        }
-    }
-
-    @Override
-    public void onLoadingCancelled(final String imageUri, final View view) {
-        if (DEBUG) {
-            Log.d(TAG, "Thumbnail - onLoadingCancelled() called with: "
-                    + "imageUri = [" + imageUri + "], view = [" + view + "]");
-        }
-        currentThumbnail = null;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Broadcast Receiver
-    //////////////////////////////////////////////////////////////////////////*/
-
-    /**
-     * Add your action in the intentFilter.
-     *
-     * @param intentFltr intent filter that will be used for register the receiver
-     */
-    protected void setupBroadcastReceiver(final IntentFilter intentFltr) {
-        intentFltr.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
-    }
-
-    public void onBroadcastReceived(final Intent intent) {
-        if (intent == null || intent.getAction() == null) {
-            return;
-        }
-        switch (intent.getAction()) {
-            case AudioManager.ACTION_AUDIO_BECOMING_NOISY:
-                onPause();
-                break;
-        }
-    }
-
-    protected void registerBroadcastReceiver() {
-        // Try to unregister current first
-        unregisterBroadcastReceiver();
-        context.registerReceiver(broadcastReceiver, intentFilter);
-    }
-
-    protected void unregisterBroadcastReceiver() {
-        try {
-            context.unregisterReceiver(broadcastReceiver);
-        } catch (final IllegalArgumentException unregisteredException) {
-            Log.w(TAG, "Broadcast receiver already unregistered "
-                    + "(" + unregisteredException.getMessage() + ")");
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // States Implementation
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public void changeState(final int state) {
-        if (DEBUG) {
-            Log.d(TAG, "changeState() called with: state = [" + state + "]");
-        }
-        currentState = state;
-        switch (state) {
-            case STATE_BLOCKED:
-                onBlocked();
-                break;
-            case STATE_PLAYING:
-                onPlaying();
-                break;
-            case STATE_BUFFERING:
-                onBuffering();
-                break;
-            case STATE_PAUSED:
-                onPaused();
-                break;
-            case STATE_PAUSED_SEEK:
-                onPausedSeek();
-                break;
-            case STATE_COMPLETED:
-                onCompleted();
-                break;
-        }
-    }
-
-    public void onBlocked() {
-        if (DEBUG) {
-            Log.d(TAG, "onBlocked() called");
-        }
-        if (!isProgressLoopRunning()) {
-            startProgressLoop();
-        }
-    }
-
-    public void onPlaying() {
-        if (DEBUG) {
-            Log.d(TAG, "onPlaying() called");
-        }
-        if (!isProgressLoopRunning()) {
-            startProgressLoop();
-        }
-    }
-
-    public void onBuffering() {
-    }
-
-    public void onPaused() {
-        if (isProgressLoopRunning()) {
-            stopProgressLoop();
-        }
-    }
-
-    public void onPausedSeek() {
-    }
-
-    public void onCompleted() {
-        if (DEBUG) {
-            Log.d(TAG, "onCompleted() called");
-        }
-        if (playQueue.getIndex() < playQueue.size() - 1) {
-            playQueue.offsetIndex(+1);
-        }
-        if (isProgressLoopRunning()) {
-            stopProgressLoop();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Repeat and shuffle
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public void onRepeatClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onRepeatClicked() called");
-        }
-
-        final int mode;
-
-        switch (getRepeatMode()) {
-            case Player.REPEAT_MODE_OFF:
-                mode = Player.REPEAT_MODE_ONE;
-                break;
-            case Player.REPEAT_MODE_ONE:
-                mode = Player.REPEAT_MODE_ALL;
-                break;
-            case Player.REPEAT_MODE_ALL:
-            default:
-                mode = Player.REPEAT_MODE_OFF;
-                break;
-        }
-
-        setRepeatMode(mode);
-        if (DEBUG) {
-            Log.d(TAG, "onRepeatClicked() currentRepeatMode = " + getRepeatMode());
-        }
-    }
-
-    public void onShuffleClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onShuffleClicked() called");
-        }
-
-        if (simpleExoPlayer == null) {
-            return;
-        }
-        simpleExoPlayer.setShuffleModeEnabled(!simpleExoPlayer.getShuffleModeEnabled());
-    }
-    /*//////////////////////////////////////////////////////////////////////////
-    // Mute / Unmute
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public void onMuteUnmuteButtonClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onMuteUnmuteButtonClicked() called");
-        }
-        simpleExoPlayer.setVolume(isMuted() ? 1 : 0);
-    }
-
-    public boolean isMuted() {
-        return simpleExoPlayer.getVolume() == 0;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Progress Updates
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public abstract void onUpdateProgress(int currentProgress, int duration, int bufferPercent);
-
-    protected void startProgressLoop() {
-        progressUpdateReactor.set(getProgressReactor());
-    }
-
-    protected void stopProgressLoop() {
-        progressUpdateReactor.set(null);
-    }
-
-    public void triggerProgressUpdate() {
-        if (simpleExoPlayer == null) {
-            return;
-        }
-        onUpdateProgress(
-                Math.max((int) simpleExoPlayer.getCurrentPosition(), 0),
-                (int) simpleExoPlayer.getDuration(),
-                simpleExoPlayer.getBufferedPercentage()
-        );
-    }
-
-    private Disposable getProgressReactor() {
-        return Observable.interval(PROGRESS_LOOP_INTERVAL_MILLIS, MILLISECONDS,
-                AndroidSchedulers.mainThread())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(ignored -> triggerProgressUpdate(),
-                        error -> Log.e(TAG, "Progress update failure: ", error));
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // ExoPlayer Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onTimelineChanged(final Timeline timeline, final int reason) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onTimelineChanged() called with "
-                    + "timeline size = [" + timeline.getWindowCount() + "], "
-                    + "reason = [" + reason + "]");
-        }
-
-        maybeUpdateCurrentMetadata();
-    }
-
-    @Override
-    public void onTracksChanged(final TrackGroupArray trackGroups,
-                                final TrackSelectionArray trackSelections) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onTracksChanged(), "
-                    + "track group size = " + trackGroups.length);
-        }
-
-        maybeUpdateCurrentMetadata();
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(final PlaybackParameters playbackParameters) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - playbackParameters(), "
-                    + "speed: " + playbackParameters.speed + ", "
-                    + "pitch: " + playbackParameters.pitch);
-        }
-    }
-
-    @Override
-    public void onLoadingChanged(final boolean isLoading) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onLoadingChanged() called with: "
-                    + "isLoading = [" + isLoading + "]");
-        }
-
-        if (!isLoading && getCurrentState() == STATE_PAUSED && isProgressLoopRunning()) {
-            stopProgressLoop();
-        } else if (isLoading && !isProgressLoopRunning()) {
-            startProgressLoop();
-        }
-
-        maybeUpdateCurrentMetadata();
-    }
-
-    @Override
-    public void onPlayerStateChanged(final boolean playWhenReady, final int playbackState) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onPlayerStateChanged() called with: "
-                    + "playWhenReady = [" + playWhenReady + "], "
-                    + "playbackState = [" + playbackState + "]");
-        }
-
-        if (getCurrentState() == STATE_PAUSED_SEEK) {
-            if (DEBUG) {
-                Log.d(TAG, "ExoPlayer - onPlayerStateChanged() is currently blocked");
-            }
-            return;
-        }
-
-        switch (playbackState) {
-            case Player.STATE_IDLE: // 1
-                isPrepared = false;
-                break;
-            case Player.STATE_BUFFERING: // 2
-                if (isPrepared) {
-                    changeState(STATE_BUFFERING);
-                }
-                break;
-            case Player.STATE_READY: //3
-                maybeUpdateCurrentMetadata();
-                maybeCorrectSeekPosition();
-                if (!isPrepared) {
-                    isPrepared = true;
-                    onPrepared(playWhenReady);
-                    break;
-                }
-                changeState(playWhenReady ? STATE_PLAYING : STATE_PAUSED);
-                break;
-            case Player.STATE_ENDED: // 4
-                changeState(STATE_COMPLETED);
-                if (currentMetadata != null) {
-                    resetPlaybackState(currentMetadata.getMetadata());
-                }
-                isPrepared = false;
-                break;
-        }
-    }
-
-    private void maybeCorrectSeekPosition() {
-        if (playQueue == null || simpleExoPlayer == null || currentMetadata == null) {
-            return;
-        }
-
-        final PlayQueueItem currentSourceItem = playQueue.getItem();
-        if (currentSourceItem == null) {
-            return;
-        }
-
-        final StreamInfo currentInfo = currentMetadata.getMetadata();
-        final long presetStartPositionMillis = currentInfo.getStartPosition() * 1000;
-        if (presetStartPositionMillis > 0L) {
-            // Has another start position?
-            if (DEBUG) {
-                Log.d(TAG, "Playback - Seeking to preset start "
-                        + "position=[" + presetStartPositionMillis + "]");
-            }
-            seekTo(presetStartPositionMillis);
-        }
-    }
-
-    /**
-     * Process exceptions produced by {@link com.google.android.exoplayer2.ExoPlayer ExoPlayer}.
-     * <p>There are multiple types of errors:</p>
-     * <ul>
-     * <li>{@link ExoPlaybackException#TYPE_SOURCE TYPE_SOURCE}</li>
-     * <li>{@link ExoPlaybackException#TYPE_UNEXPECTED TYPE_UNEXPECTED}:
-     * If a runtime error occurred, then we can try to recover it by restarting the playback
-     * after setting the timestamp recovery.</li>
-     * <li>{@link ExoPlaybackException#TYPE_RENDERER TYPE_RENDERER}:
-     * If the renderer failed, treat the error as unrecoverable.</li>
-     * </ul>
-     *
-     * @see #processSourceError(IOException)
-     * @see Player.EventListener#onPlayerError(ExoPlaybackException)
-     */
-    @Override
-    public void onPlayerError(final ExoPlaybackException error) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onPlayerError() called with: " + "error = [" + error + "]");
-        }
-        if (errorToast != null) {
-            errorToast.cancel();
-            errorToast = null;
-        }
-
-        savePlaybackState();
-
-        switch (error.type) {
-            case ExoPlaybackException.TYPE_SOURCE:
-                processSourceError(error.getSourceException());
-                showStreamError(error);
-                break;
-            case ExoPlaybackException.TYPE_UNEXPECTED:
-                showRecoverableError(error);
-                setRecovery();
-                reload();
-                break;
-            default:
-                showUnrecoverableError(error);
-                onPlaybackShutdown();
-                break;
-        }
-    }
-
-    private void processSourceError(final IOException error) {
-        if (simpleExoPlayer == null || playQueue == null) {
-            return;
-        }
-        setRecovery();
-
-        if (error instanceof BehindLiveWindowException) {
-            reload();
-        } else {
-            playQueue.error();
-        }
-    }
-
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason final int reason) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onPositionDiscontinuity() called with "
-                    + "reason = [" + reason + "]");
-        }
-        if (playQueue == null) {
-            return;
-        }
-
-        // Refresh the playback if there is a transition to the next video
-        final int newWindowIndex = simpleExoPlayer.getCurrentWindowIndex();
-        switch (reason) {
-            case DISCONTINUITY_REASON_PERIOD_TRANSITION:
-                // When player is in single repeat mode and a period transition occurs,
-                // we need to register a view count here since no metadata has changed
-                if (getRepeatMode() == Player.REPEAT_MODE_ONE
-                        && newWindowIndex == playQueue.getIndex()) {
-                    registerView();
-                    break;
-                }
-            case DISCONTINUITY_REASON_SEEK:
-            case DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
-            case DISCONTINUITY_REASON_INTERNAL:
-                if (playQueue.getIndex() != newWindowIndex) {
-                    resetPlaybackState(playQueue.getItem());
-                    playQueue.setIndex(newWindowIndex);
-                }
-                break;
-        }
-
-        maybeUpdateCurrentMetadata();
-    }
-
-    @Override
-    public void onRepeatModeChanged(@Player.RepeatMode final int reason) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onRepeatModeChanged() called with: "
-                    + "mode = [" + reason + "]");
-        }
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(final boolean shuffleModeEnabled) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onShuffleModeEnabledChanged() called with: "
-                    + "mode = [" + shuffleModeEnabled + "]");
-        }
-        if (playQueue == null) {
-            return;
-        }
-        if (shuffleModeEnabled) {
-            playQueue.shuffle();
-        } else {
-            playQueue.unshuffle();
-        }
-    }
-
-    @Override
-    public void onSeekProcessed() {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
-        }
-        if (isPrepared) {
-            savePlaybackState();
-        }
-    }
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playback Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public boolean isApproachingPlaybackEdge(final long timeToEndMillis) {
-        // If live, then not near playback edge
-        // If not playing, then not approaching playback edge
-        if (simpleExoPlayer == null || isLive() || !isPlaying()) {
-            return false;
-        }
-
-        final long currentPositionMillis = simpleExoPlayer.getCurrentPosition();
-        final long currentDurationMillis = simpleExoPlayer.getDuration();
-        return currentDurationMillis - currentPositionMillis < timeToEndMillis;
-    }
-
-    @Override
-    public void onPlaybackBlock() {
-        if (simpleExoPlayer == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "Playback - onPlaybackBlock() called");
-        }
-
-        currentItem = null;
-        currentMetadata = null;
-        simpleExoPlayer.stop();
-        isPrepared = false;
-
-        changeState(STATE_BLOCKED);
-    }
-
-    @Override
-    public void onPlaybackUnblock(final MediaSource mediaSource) {
-        if (simpleExoPlayer == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "Playback - onPlaybackUnblock() called");
-        }
-
-        if (getCurrentState() == STATE_BLOCKED) {
-            changeState(STATE_BUFFERING);
-        }
-
-        simpleExoPlayer.prepare(mediaSource);
-    }
-
-    public void onPlaybackSynchronize(@NonNull final PlayQueueItem item) {
-        if (DEBUG) {
-            Log.d(TAG, "Playback - onPlaybackSynchronize() called with "
-                    + "item=[" + item.getTitle() + "], url=[" + item.getUrl() + "]");
-        }
-        if (simpleExoPlayer == null || playQueue == null) {
-            return;
-        }
-
-        final boolean onPlaybackInitial = currentItem == null;
-        final boolean hasPlayQueueItemChanged = currentItem != item;
-
-        final int currentPlayQueueIndex = playQueue.indexOf(item);
-        final int currentPlaylistIndex = simpleExoPlayer.getCurrentWindowIndex();
-        final int currentPlaylistSize = simpleExoPlayer.getCurrentTimeline().getWindowCount();
-
-        // If nothing to synchronize
-        if (!hasPlayQueueItemChanged) {
-            return;
-        }
-        currentItem = item;
-
-        // Check if on wrong window
-        if (currentPlayQueueIndex != playQueue.getIndex()) {
-            Log.e(TAG, "Playback - Play Queue may be desynchronized: item "
-                    + "index=[" + currentPlayQueueIndex + "], "
-                    + "queue index=[" + playQueue.getIndex() + "]");
-
-            // Check if bad seek position
-        } else if ((currentPlaylistSize > 0 && currentPlayQueueIndex >= currentPlaylistSize)
-                || currentPlayQueueIndex < 0) {
-            Log.e(TAG, "Playback - Trying to seek to invalid "
-                    + "index=[" + currentPlayQueueIndex + "] with "
-                    + "playlist length=[" + currentPlaylistSize + "]");
-
-        } else if (currentPlaylistIndex != currentPlayQueueIndex || onPlaybackInitial
-                || !isPlaying()) {
-            if (DEBUG) {
-                Log.d(TAG, "Playback - Rewinding to correct "
-                        + "index=[" + currentPlayQueueIndex + "], "
-                        + "from=[" + currentPlaylistIndex + "], "
-                        + "size=[" + currentPlaylistSize + "].");
-            }
-
-            if (item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
-                simpleExoPlayer.seekTo(currentPlayQueueIndex, item.getRecoveryPosition());
-                playQueue.unsetRecovery(currentPlayQueueIndex);
-            } else {
-                simpleExoPlayer.seekToDefaultPosition(currentPlayQueueIndex);
-            }
-        }
-    }
-
-    protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
-        final StreamInfo info = tag.getMetadata();
-        if (DEBUG) {
-            Log.d(TAG, "Playback - onMetadataChanged() called, playing: " + info.getName());
-        }
-
-        initThumbnail(info.getThumbnailUrl());
-        registerView();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // General Player
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public void showStreamError(final Exception exception) {
-        exception.printStackTrace();
-
-        if (errorToast == null) {
-            errorToast = Toast
-                    .makeText(context, R.string.player_stream_failure, Toast.LENGTH_SHORT);
-            errorToast.show();
-        }
-    }
-
-    public void showRecoverableError(final Exception exception) {
-        exception.printStackTrace();
-
-        if (errorToast == null) {
-            errorToast = Toast
-                    .makeText(context, R.string.player_recoverable_failure, Toast.LENGTH_SHORT);
-            errorToast.show();
-        }
-    }
-
-    public void showUnrecoverableError(final Exception exception) {
-        exception.printStackTrace();
-
-        if (errorToast != null) {
-            errorToast.cancel();
-        }
-        errorToast = Toast
-                .makeText(context, R.string.player_unrecoverable_failure, Toast.LENGTH_SHORT);
-        errorToast.show();
-    }
-
-    public void onPrepared(final boolean playWhenReady) {
-        if (DEBUG) {
-            Log.d(TAG, "onPrepared() called with: playWhenReady = [" + playWhenReady + "]");
-        }
-        if (playWhenReady) {
-            audioReactor.requestAudioFocus();
-        }
-        changeState(playWhenReady ? STATE_PLAYING : STATE_PAUSED);
-    }
-
-    public void onPlay() {
-        if (DEBUG) {
-            Log.d(TAG, "onPlay() called");
-        }
-        if (audioReactor == null || playQueue == null || simpleExoPlayer == null) {
-            return;
-        }
-
-        audioReactor.requestAudioFocus();
-
-        if (getCurrentState() == STATE_COMPLETED) {
-            if (playQueue.getIndex() == 0) {
-                seekToDefault();
-            } else {
-                playQueue.setIndex(0);
-            }
-        }
-
-        simpleExoPlayer.setPlayWhenReady(true);
-        savePlaybackState();
-    }
-
-    public void onPause() {
-        if (DEBUG) {
-            Log.d(TAG, "onPause() called");
-        }
-        if (audioReactor == null || simpleExoPlayer == null) {
-            return;
-        }
-
-        audioReactor.abandonAudioFocus();
-        simpleExoPlayer.setPlayWhenReady(false);
-        savePlaybackState();
-    }
-
-    public void onPlayPause() {
-        if (DEBUG) {
-            Log.d(TAG, "onPlayPause() called");
-        }
-
-        if (isPlaying()) {
-            onPause();
-        } else {
-            onPlay();
-        }
-    }
-
-    public void onFastRewind() {
-        if (DEBUG) {
-            Log.d(TAG, "onFastRewind() called");
-        }
-        seekBy(-getSeekDuration());
-        triggerProgressUpdate();
-    }
-
-    public void onFastForward() {
-        if (DEBUG) {
-            Log.d(TAG, "onFastForward() called");
-        }
-        seekBy(getSeekDuration());
-        triggerProgressUpdate();
-    }
-
-    private int getSeekDuration() {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        final String key = context.getString(R.string.seek_duration_key);
-        final String value = prefs
-                .getString(key, context.getString(R.string.seek_duration_default_value));
-        return Integer.parseInt(value);
-    }
-
-    public void onPlayPrevious() {
-        if (simpleExoPlayer == null || playQueue == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "onPlayPrevious() called");
-        }
-
-        /* If current playback has run for PLAY_PREV_ACTIVATION_LIMIT_MILLIS milliseconds,
-         * restart current track. Also restart the track if the current track
-         * is the first in a queue.*/
-        if (simpleExoPlayer.getCurrentPosition() > PLAY_PREV_ACTIVATION_LIMIT_MILLIS
-                || playQueue.getIndex() == 0) {
-            seekToDefault();
-            playQueue.offsetIndex(0);
-        } else {
-            savePlaybackState();
-            playQueue.offsetIndex(-1);
-        }
-    }
-
-    public void onPlayNext() {
-        if (playQueue == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "onPlayNext() called");
-        }
-
-        savePlaybackState();
-        playQueue.offsetIndex(+1);
-    }
-
-    public void onSelected(final PlayQueueItem item) {
-        if (playQueue == null || simpleExoPlayer == null) {
-            return;
-        }
-
-        final int index = playQueue.indexOf(item);
-        if (index == -1) {
-            return;
-        }
-
-        if (playQueue.getIndex() == index && simpleExoPlayer.getCurrentWindowIndex() == index) {
-            seekToDefault();
-        } else {
-            savePlaybackState();
-        }
-        playQueue.setIndex(index);
-    }
-
-    public void seekTo(final long positionMillis) {
-        if (DEBUG) {
-            Log.d(TAG, "seekBy() called with: position = [" + positionMillis + "]");
-        }
-        if (simpleExoPlayer != null) {
-            // prevent invalid positions when fast-forwarding/-rewinding
-            long normalizedPositionMillis = positionMillis;
-            if (normalizedPositionMillis < 0) {
-                normalizedPositionMillis = 0;
-            } else if (normalizedPositionMillis > simpleExoPlayer.getDuration()) {
-                normalizedPositionMillis = simpleExoPlayer.getDuration();
-            }
-
-            simpleExoPlayer.seekTo(normalizedPositionMillis);
-        }
-    }
-
-    public void seekBy(final long offsetMillis) {
-        if (DEBUG) {
-            Log.d(TAG, "seekBy() called with: offsetMillis = [" + offsetMillis + "]");
-        }
-        seekTo(simpleExoPlayer.getCurrentPosition() + offsetMillis);
-    }
-
-    public boolean isCurrentWindowValid() {
-        return simpleExoPlayer != null && simpleExoPlayer.getDuration() >= 0
-                && simpleExoPlayer.getCurrentPosition() >= 0;
-    }
-
-    public void seekToDefault() {
-        if (simpleExoPlayer != null) {
-            simpleExoPlayer.seekToDefaultPosition();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void registerView() {
-        if (currentMetadata == null) {
-            return;
-        }
-        final StreamInfo currentInfo = currentMetadata.getMetadata();
-        final Disposable viewRegister = recordManager.onViewed(currentInfo).onErrorComplete()
-                .subscribe(
-                        ignored -> { /* successful */ },
-                        error -> Log.e(TAG, "Player onViewed() failure: ", error)
-                );
-        databaseUpdateReactor.add(viewRegister);
-    }
-
-    protected void reload() {
-        if (playbackManager != null) {
-            playbackManager.dispose();
-        }
-
-        if (playQueue != null) {
-            playbackManager = new MediaSourceManager(this, playQueue);
-        }
-    }
-
-    private void savePlaybackState(final StreamInfo info, final long progress) {
-        if (info == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "savePlaybackState() called");
-        }
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        if (prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) {
-            final Disposable stateSaver = recordManager.saveStreamState(info, progress)
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .doOnError((e) -> {
-                        if (DEBUG) {
-                            e.printStackTrace();
-                        }
-                    })
-                    .onErrorComplete()
-                    .subscribe();
-            databaseUpdateReactor.add(stateSaver);
-        }
-    }
-
-    private void resetPlaybackState(final PlayQueueItem queueItem) {
-        if (queueItem == null) {
-            return;
-        }
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        if (prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) {
-            final Disposable stateSaver = queueItem.getStream()
-                    .flatMapCompletable(info -> recordManager.saveStreamState(info, 0))
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .doOnError((e) -> {
-                        if (DEBUG) {
-                            e.printStackTrace();
-                        }
-                    })
-                    .onErrorComplete()
-                    .subscribe();
-            databaseUpdateReactor.add(stateSaver);
-        }
-    }
-
-    public void resetPlaybackState(final StreamInfo info) {
-        savePlaybackState(info, 0);
-    }
-
-    public void savePlaybackState() {
-        if (simpleExoPlayer == null || currentMetadata == null) {
-            return;
-        }
-        final StreamInfo currentInfo = currentMetadata.getMetadata();
-        if (playQueue != null) {
-            // Save current position. It will help to restore this position once a user
-            // wants to play prev or next stream from the queue
-            playQueue.setRecovery(playQueue.getIndex(), simpleExoPlayer.getContentPosition());
-        }
-        savePlaybackState(currentInfo, simpleExoPlayer.getCurrentPosition());
-    }
-
-    private void maybeUpdateCurrentMetadata() {
-        if (simpleExoPlayer == null) {
-            return;
-        }
-
-        final MediaSourceTag metadata;
-        try {
-            metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
-        } catch (IndexOutOfBoundsException | ClassCastException error) {
-            if (DEBUG) {
-                Log.d(TAG, "Could not update metadata: " + error.getMessage());
-                error.printStackTrace();
-            }
-            return;
-        }
-
-        if (metadata == null) {
-            return;
-        }
-        maybeAutoQueueNextStream(metadata);
-
-        if (currentMetadata == metadata) {
-            return;
-        }
-        currentMetadata = metadata;
-        onMetadataChanged(metadata);
-    }
-
-    private void maybeAutoQueueNextStream(@NonNull final MediaSourceTag metadata) {
-        if (playQueue == null || playQueue.getIndex() != playQueue.size() - 1
-                || getRepeatMode() != Player.REPEAT_MODE_OFF
-                || !PlayerHelper.isAutoQueueEnabled(context)) {
-            return;
-        }
-        // auto queue when starting playback on the last item when not repeating
-        final PlayQueue autoQueue = PlayerHelper.autoQueueOf(metadata.getMetadata(),
-                playQueue.getStreams());
-        if (autoQueue != null) {
-            playQueue.append(autoQueue.getStreams());
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Getters and Setters
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public SimpleExoPlayer getPlayer() {
-        return simpleExoPlayer;
-    }
-
-    public AudioReactor getAudioReactor() {
-        return audioReactor;
-    }
-
-    public int getCurrentState() {
-        return currentState;
-    }
-
-    @Nullable
-    public MediaSourceTag getCurrentMetadata() {
-        return currentMetadata;
-    }
-
-    @NonNull
-    public LoadController getLoadController() {
-        return (LoadController) loadControl;
-    }
-
-    @NonNull
-    public String getVideoUrl() {
-        return currentMetadata == null
-                ? context.getString(R.string.unknown_content)
-                : currentMetadata.getMetadata().getUrl();
-    }
-
-    @NonNull
-    public String getVideoTitle() {
-        return currentMetadata == null
-                ? context.getString(R.string.unknown_content)
-                : currentMetadata.getMetadata().getName();
-    }
-
-    @NonNull
-    public String getUploaderName() {
-        return currentMetadata == null
-                ? context.getString(R.string.unknown_content)
-                : currentMetadata.getMetadata().getUploaderName();
-    }
-
-    @Nullable
-    public Bitmap getThumbnail() {
-        return currentThumbnail == null
-                ? BitmapFactory.decodeResource(context.getResources(), R.drawable.dummy_thumbnail)
-                : currentThumbnail;
-    }
-
-    /**
-     * Checks if the current playback is a livestream AND is playing at or beyond the live edge.
-     *
-     * @return whether the livestream is playing at or beyond the edge
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    public boolean isLiveEdge() {
-        if (simpleExoPlayer == null || !isLive()) {
-            return false;
-        }
-
-        final Timeline currentTimeline = simpleExoPlayer.getCurrentTimeline();
-        final int currentWindowIndex = simpleExoPlayer.getCurrentWindowIndex();
-        if (currentTimeline.isEmpty() || currentWindowIndex < 0
-                || currentWindowIndex >= currentTimeline.getWindowCount()) {
-            return false;
-        }
-
-        final Timeline.Window timelineWindow = new Timeline.Window();
-        currentTimeline.getWindow(currentWindowIndex, timelineWindow);
-        return timelineWindow.getDefaultPositionMs() <= simpleExoPlayer.getCurrentPosition();
-    }
-
-    public boolean isLive() {
-        if (simpleExoPlayer == null) {
-            return false;
-        }
-        try {
-            return simpleExoPlayer.isCurrentWindowDynamic();
-        } catch (@NonNull final IndexOutOfBoundsException e) {
-            // Why would this even happen =(
-            // But lets log it anyway. Save is save
-            if (DEBUG) {
-                Log.d(TAG, "Could not update metadata: " + e.getMessage());
-                e.printStackTrace();
-            }
-            return false;
-        }
-    }
-
-    public boolean isPlaying() {
-        return simpleExoPlayer != null && simpleExoPlayer.isPlaying();
-    }
-
-    public boolean isLoading() {
-        return simpleExoPlayer != null && simpleExoPlayer.isLoading();
-    }
-
-    @Player.RepeatMode
-    public int getRepeatMode() {
-        return simpleExoPlayer == null
-                ? Player.REPEAT_MODE_OFF
-                : simpleExoPlayer.getRepeatMode();
-    }
-
-    public void setRepeatMode(@Player.RepeatMode final int repeatMode) {
-        if (simpleExoPlayer != null) {
-            simpleExoPlayer.setRepeatMode(repeatMode);
-        }
-    }
-
-    public float getPlaybackSpeed() {
-        return getPlaybackParameters().speed;
-    }
-
-    public void setPlaybackSpeed(final float speed) {
-        setPlaybackParameters(speed, getPlaybackPitch(), getPlaybackSkipSilence());
-    }
-
-    public float getPlaybackPitch() {
-        return getPlaybackParameters().pitch;
-    }
-
-    public boolean getPlaybackSkipSilence() {
-        return getPlaybackParameters().skipSilence;
-    }
-
-    public PlaybackParameters getPlaybackParameters() {
-        if (simpleExoPlayer == null) {
-            return PlaybackParameters.DEFAULT;
-        }
-        return simpleExoPlayer.getPlaybackParameters();
-    }
-
-    /**
-     * Sets the playback parameters of the player, and also saves them to shared preferences.
-     * Speed and pitch are rounded up to 2 decimal places before being used or saved.
-     *
-     * @param speed       the playback speed, will be rounded to up to 2 decimal places
-     * @param pitch       the playback pitch, will be rounded to up to 2 decimal places
-     * @param skipSilence skip silence during playback
-     */
-    public void setPlaybackParameters(final float speed, final float pitch,
-                                      final boolean skipSilence) {
-        final float roundedSpeed = Math.round(speed * 100.0f) / 100.0f;
-        final float roundedPitch = Math.round(pitch * 100.0f) / 100.0f;
-
-        savePlaybackParametersToPreferences(roundedSpeed, roundedPitch, skipSilence);
-        simpleExoPlayer.setPlaybackParameters(
-                new PlaybackParameters(roundedSpeed, roundedPitch, skipSilence));
-    }
-
-    private void savePlaybackParametersToPreferences(final float speed, final float pitch,
-                                                     final boolean skipSilence) {
-        PreferenceManager.getDefaultSharedPreferences(context)
-                .edit()
-                .putFloat(context.getString(R.string.playback_speed_key), speed)
-                .putFloat(context.getString(R.string.playback_pitch_key), pitch)
-                .putBoolean(context.getString(R.string.playback_skip_silence_key), skipSilence)
-                .apply();
-    }
-
-    public PlayQueue getPlayQueue() {
-        return playQueue;
-    }
-
-    public PlayQueueAdapter getPlayQueueAdapter() {
-        return playQueueAdapter;
-    }
-
-    public boolean isPrepared() {
-        return isPrepared;
-    }
-
-    public boolean isProgressLoopRunning() {
-        return progressUpdateReactor.get() != null;
-    }
-
-    public void setRecovery() {
-        if (playQueue == null || simpleExoPlayer == null) {
-            return;
-        }
-
-        final int queuePos = playQueue.getIndex();
-        final long windowPos = simpleExoPlayer.getCurrentPosition();
-
-        if (windowPos > 0 && windowPos <= simpleExoPlayer.getDuration()) {
-            setRecovery(queuePos, windowPos);
-        }
-    }
-
-    public void setRecovery(final int queuePos, final long windowPos) {
-        if (playQueue.size() <= queuePos) {
-            return;
-        }
-
-        if (DEBUG) {
-            Log.d(TAG, "Setting recovery, queue: " + queuePos + ", pos: " + windowPos);
-        }
-        playQueue.setRecovery(queuePos, windowPos);
-    }
-
-    public boolean gotDestroyed() {
-        return simpleExoPlayer == null;
-    }
-
-    private boolean isPlaybackResumeEnabled() {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
-                && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true);
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index fc9f110e68d..c4099e67eae 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -48,9 +48,9 @@
  */
 public final class MainPlayer extends Service {
     private static final String TAG = "MainPlayer";
-    private static final boolean DEBUG = BasePlayer.DEBUG;
+    private static final boolean DEBUG = Player.DEBUG;
 
-    private VideoPlayerImpl playerImpl;
+    private Player player;
     private WindowManager windowManager;
 
     private final IBinder mBinder = new MainPlayer.LocalBinder();
@@ -69,8 +69,6 @@ public enum PlayerType {
             = App.PACKAGE_NAME + ".player.MainPlayer.CLOSE";
     static final String ACTION_PLAY_PAUSE
             = App.PACKAGE_NAME + ".player.MainPlayer.PLAY_PAUSE";
-    static final String ACTION_OPEN_CONTROLS
-            = App.PACKAGE_NAME + ".player.MainPlayer.OPEN_CONTROLS";
     static final String ACTION_REPEAT
             = App.PACKAGE_NAME + ".player.MainPlayer.REPEAT";
     static final String ACTION_PLAY_NEXT
@@ -105,11 +103,10 @@ public void onCreate() {
     private void createView() {
         final PlayerBinding binding = PlayerBinding.inflate(LayoutInflater.from(this));
 
-        playerImpl = new VideoPlayerImpl(this);
-        playerImpl.setup(binding);
-        playerImpl.shouldUpdateOnProgress = true;
+        player = new Player(this);
+        player.setupFromView(binding);
 
-        NotificationUtil.getInstance().createNotificationAndStartForeground(playerImpl, this);
+        NotificationUtil.getInstance().createNotificationAndStartForeground(player, this);
     }
 
     @Override
@@ -119,19 +116,19 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
                     + "], flags = [" + flags + "], startId = [" + startId + "]");
         }
         if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())
-                && playerImpl.playQueue == null) {
+                && player.getPlayQueue() == null) {
             // Player is not working, no need to process media button's action
             return START_NOT_STICKY;
         }
 
         if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())
-                || intent.getStringExtra(VideoPlayer.PLAY_QUEUE_KEY) != null) {
-            NotificationUtil.getInstance().createNotificationAndStartForeground(playerImpl, this);
+                || intent.getStringExtra(Player.PLAY_QUEUE_KEY) != null) {
+            NotificationUtil.getInstance().createNotificationAndStartForeground(player, this);
         }
 
-        playerImpl.handleIntent(intent);
-        if (playerImpl.mediaSessionManager != null) {
-            playerImpl.mediaSessionManager.handleMediaButtonIntent(intent);
+        player.handleIntent(intent);
+        if (player.getMediaSessionManager() != null) {
+            player.getMediaSessionManager().handleMediaButtonIntent(intent);
         }
         return START_NOT_STICKY;
     }
@@ -141,20 +138,20 @@ public void stop(final boolean autoplayEnabled) {
             Log.d(TAG, "stop() called");
         }
 
-        if (playerImpl.getPlayer() != null) {
-            playerImpl.wasPlaying = playerImpl.getPlayer().getPlayWhenReady();
+        if (!player.exoPlayerIsNull()) {
+            player.saveWasPlaying();
             // Releases wifi & cpu, disables keepScreenOn, etc.
             if (!autoplayEnabled) {
-                playerImpl.onPause();
+                player.pause();
             }
             // We can't just pause the player here because it will make transition
             // from one stream to a new stream not smooth
-            playerImpl.getPlayer().stop(false);
-            playerImpl.setRecovery();
+            player.smoothStopPlayer();
+            player.setRecovery();
             // Android TV will handle back button in case controls will be visible
             // (one more additional unneeded click while the player is hidden)
-            playerImpl.hideControls(0, 0);
-            playerImpl.onQueueClosed();
+            player.hideControls(0, 0);
+            player.closeQueue();
             // Notification shows information about old stream but if a user selects
             // a stream from backStack it's not actual anymore
             // So we should hide the notification at all.
@@ -168,7 +165,7 @@ public void stop(final boolean autoplayEnabled) {
     @Override
     public void onTaskRemoved(final Intent rootIntent) {
         super.onTaskRemoved(rootIntent);
-        if (!playerImpl.videoPlayerSelected()) {
+        if (!player.videoPlayerSelected()) {
             return;
         }
         onDestroy();
@@ -181,7 +178,23 @@ public void onDestroy() {
         if (DEBUG) {
             Log.d(TAG, "destroy() called");
         }
-        onClose();
+
+        if (player != null) {
+            // Exit from fullscreen when user closes the player via notification
+            if (player.isFullscreen()) {
+                player.toggleFullscreen();
+            }
+            removeViewFromParent();
+
+            player.saveStreamProgressState();
+            player.setRecovery();
+            player.stopActivityBinding();
+            player.removePopupFromView();
+            player.destroy();
+        }
+
+        NotificationUtil.getInstance().cancelNotificationAndStopForeground(this);
+        stopSelf();
     }
 
     @Override
@@ -194,32 +207,6 @@ public IBinder onBind(final Intent intent) {
         return mBinder;
     }
 
-    /*//////////////////////////////////////////////////////////////////////////
-    // Actions
-    //////////////////////////////////////////////////////////////////////////*/
-    private void onClose() {
-        if (DEBUG) {
-            Log.d(TAG, "onClose() called");
-        }
-
-        if (playerImpl != null) {
-            // Exit from fullscreen when user closes the player via notification
-            if (playerImpl.isFullscreen()) {
-                playerImpl.toggleFullscreen();
-            }
-            removeViewFromParent();
-
-            playerImpl.setRecovery();
-            playerImpl.savePlaybackState();
-            playerImpl.stopActivityBinding();
-            playerImpl.removePopupFromView();
-            playerImpl.destroy();
-        }
-
-        NotificationUtil.getInstance().cancelNotificationAndStopForeground(this);
-        stopSelf();
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
@@ -227,25 +214,25 @@ private void onClose() {
     boolean isLandscape() {
         // DisplayMetrics from activity context knows about MultiWindow feature
         // while DisplayMetrics from app context doesn't
-        final DisplayMetrics metrics = (playerImpl != null
-                && playerImpl.getParentActivity() != null
-                ? playerImpl.getParentActivity().getResources()
+        final DisplayMetrics metrics = (player != null
+                && player.getParentActivity() != null
+                ? player.getParentActivity().getResources()
                 : getResources()).getDisplayMetrics();
         return metrics.heightPixels < metrics.widthPixels;
     }
 
     @Nullable
     public View getView() {
-        if (playerImpl == null) {
+        if (player == null) {
             return null;
         }
 
-        return playerImpl.getRootView();
+        return player.getRootView();
     }
 
     public void removeViewFromParent() {
         if (getView() != null && getView().getParent() != null) {
-            if (playerImpl.getParentActivity() != null) {
+            if (player.getParentActivity() != null) {
                 // This means view was added to fragment
                 final ViewGroup parent = (ViewGroup) getView().getParent();
                 parent.removeView(getView());
@@ -263,8 +250,8 @@ public MainPlayer getService() {
             return MainPlayer.this;
         }
 
-        public VideoPlayerImpl getPlayer() {
-            return MainPlayer.this.playerImpl;
+        public Player getPlayer() {
+            return MainPlayer.this.player;
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
index c1c2e4eba87..43c1b4405fa 100644
--- a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
@@ -43,7 +43,7 @@
  */
 public final class NotificationUtil {
     private static final String TAG = NotificationUtil.class.getSimpleName();
-    private static final boolean DEBUG = BasePlayer.DEBUG;
+    private static final boolean DEBUG = Player.DEBUG;
     private static final int NOTIFICATION_ID = 123789;
 
     @Nullable private static NotificationUtil instance = null;
@@ -76,7 +76,7 @@ public static NotificationUtil getInstance() {
      * @param forceRecreate whether to force the recreation of the notification even if it already
      *                      exists
      */
-    synchronized void createNotificationIfNeededAndUpdate(final VideoPlayerImpl player,
+    synchronized void createNotificationIfNeededAndUpdate(final Player player,
                                                           final boolean forceRecreate) {
         if (forceRecreate || notificationBuilder == null) {
             notificationBuilder = createNotification(player);
@@ -85,14 +85,14 @@ synchronized void createNotificationIfNeededAndUpdate(final VideoPlayerImpl play
         notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
     }
 
-    private synchronized NotificationCompat.Builder createNotification(
-            final VideoPlayerImpl player) {
+    private synchronized NotificationCompat.Builder createNotification(final Player player) {
         if (DEBUG) {
             Log.d(TAG, "createNotification()");
         }
-        notificationManager = NotificationManagerCompat.from(player.context);
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(player.context,
-                player.context.getString(R.string.notification_channel_id));
+        notificationManager = NotificationManagerCompat.from(player.getContext());
+        final NotificationCompat.Builder builder =
+                new NotificationCompat.Builder(player.getContext(),
+                player.getContext().getString(R.string.notification_channel_id));
 
         initializeNotificationSlots(player);
 
@@ -107,25 +107,25 @@ private synchronized NotificationCompat.Builder createNotification(
 
         // build the compact slot indices array (need code to convert from Integer... because Java)
         final List<Integer> compactSlotList = NotificationConstants.getCompactSlotsFromPreferences(
-                player.context, player.sharedPreferences, nonNothingSlotCount);
+                player.getContext(), player.getPrefs(), nonNothingSlotCount);
         final int[] compactSlots = new int[compactSlotList.size()];
         for (int i = 0; i < compactSlotList.size(); i++) {
             compactSlots[i] = compactSlotList.get(i);
         }
 
         builder.setStyle(new androidx.media.app.NotificationCompat.MediaStyle()
-                    .setMediaSession(player.mediaSessionManager.getSessionToken())
+                    .setMediaSession(player.getMediaSessionManager().getSessionToken())
                     .setShowActionsInCompactView(compactSlots))
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setCategory(NotificationCompat.CATEGORY_TRANSPORT)
                 .setShowWhen(false)
                 .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
-                .setColor(ContextCompat.getColor(player.context, R.color.dark_background_color))
-                .setColorized(player.sharedPreferences.getBoolean(
-                        player.context.getString(R.string.notification_colorize_key),
-                        true))
-                .setDeleteIntent(PendingIntent.getBroadcast(player.context, NOTIFICATION_ID,
+                .setColor(ContextCompat.getColor(player.getContext(),
+                        R.color.dark_background_color))
+                .setColorized(player.getPrefs().getBoolean(
+                        player.getContext().getString(R.string.notification_colorize_key), true))
+                .setDeleteIntent(PendingIntent.getBroadcast(player.getContext(), NOTIFICATION_ID,
                         new Intent(ACTION_CLOSE), FLAG_UPDATE_CURRENT));
 
         return builder;
@@ -135,20 +135,20 @@ private synchronized NotificationCompat.Builder createNotification(
      * Updates the notification builder and the button icons depending on the playback state.
      * @param player the player currently open, to take data from
      */
-    private synchronized void updateNotification(final VideoPlayerImpl player) {
+    private synchronized void updateNotification(final Player player) {
         if (DEBUG) {
             Log.d(TAG, "updateNotification()");
         }
 
         // also update content intent, in case the user switched players
-        notificationBuilder.setContentIntent(PendingIntent.getActivity(player.context,
+        notificationBuilder.setContentIntent(PendingIntent.getActivity(player.getContext(),
                 NOTIFICATION_ID, getIntentForNotification(player), FLAG_UPDATE_CURRENT));
         notificationBuilder.setContentTitle(player.getVideoTitle());
         notificationBuilder.setContentText(player.getUploaderName());
         notificationBuilder.setTicker(player.getVideoTitle());
         updateActions(notificationBuilder, player);
-        final boolean showThumbnail = player.sharedPreferences.getBoolean(
-                player.context.getString(R.string.show_thumbnail_key), true);
+        final boolean showThumbnail = player.getPrefs().getBoolean(
+                player.getContext().getString(R.string.show_thumbnail_key), true);
         if (showThumbnail) {
             setLargeIcon(notificationBuilder, player);
         }
@@ -174,7 +174,7 @@ boolean shouldUpdateBufferingSlot() {
     }
 
 
-    void createNotificationAndStartForeground(final VideoPlayerImpl player, final Service service) {
+    void createNotificationAndStartForeground(final Player player, final Service service) {
         if (notificationBuilder == null) {
             notificationBuilder = createNotification(player);
         }
@@ -203,17 +203,16 @@ void cancelNotificationAndStopForeground(final Service service) {
     // ACTIONS
     /////////////////////////////////////////////////////
 
-    private void initializeNotificationSlots(final VideoPlayerImpl player) {
+    private void initializeNotificationSlots(final Player player) {
         for (int i = 0; i < 5; ++i) {
-            notificationSlots[i] = player.sharedPreferences.getInt(
-                    player.context.getString(NotificationConstants.SLOT_PREF_KEYS[i]),
+            notificationSlots[i] = player.getPrefs().getInt(
+                    player.getContext().getString(NotificationConstants.SLOT_PREF_KEYS[i]),
                     NotificationConstants.SLOT_DEFAULTS[i]);
         }
     }
 
     @SuppressLint("RestrictedApi")
-    private void updateActions(final NotificationCompat.Builder builder,
-                               final VideoPlayerImpl player) {
+    private void updateActions(final NotificationCompat.Builder builder, final Player player) {
         builder.mActions.clear();
         for (int i = 0; i < 5; ++i) {
             addAction(builder, player, notificationSlots[i]);
@@ -221,7 +220,7 @@ private void updateActions(final NotificationCompat.Builder builder,
     }
 
     private void addAction(final NotificationCompat.Builder builder,
-                           final VideoPlayerImpl player,
+                           final Player player,
                            @NotificationConstants.Action final int slot) {
         final NotificationCompat.Action action = getAction(player, slot);
         if (action != null) {
@@ -231,7 +230,7 @@ private void addAction(final NotificationCompat.Builder builder,
 
     @Nullable
     private NotificationCompat.Action getAction(
-            final VideoPlayerImpl player,
+            final Player player,
             @NotificationConstants.Action final int selectedAction) {
         final int baseActionIcon = NotificationConstants.ACTION_ICONS[selectedAction];
         switch (selectedAction) {
@@ -252,7 +251,7 @@ private NotificationCompat.Action getAction(
                         R.string.exo_controls_fastforward_description, ACTION_FAST_FORWARD);
 
             case NotificationConstants.SMART_REWIND_PREVIOUS:
-                if (player.playQueue != null && player.playQueue.size() > 1) {
+                if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) {
                     return getAction(player, R.drawable.exo_notification_previous,
                             R.string.exo_controls_previous_description, ACTION_PLAY_PREVIOUS);
                 } else {
@@ -261,7 +260,7 @@ private NotificationCompat.Action getAction(
                 }
 
             case NotificationConstants.SMART_FORWARD_NEXT:
-                if (player.playQueue != null && player.playQueue.size() > 1) {
+                if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) {
                     return getAction(player, R.drawable.exo_notification_next,
                             R.string.exo_controls_next_description, ACTION_PLAY_NEXT);
                 } else {
@@ -270,23 +269,23 @@ private NotificationCompat.Action getAction(
                 }
 
             case NotificationConstants.PLAY_PAUSE_BUFFERING:
-                if (player.getCurrentState() == BasePlayer.STATE_PREFLIGHT
-                        || player.getCurrentState() == BasePlayer.STATE_BLOCKED
-                        || player.getCurrentState() == BasePlayer.STATE_BUFFERING) {
+                if (player.getCurrentState() == Player.STATE_PREFLIGHT
+                        || player.getCurrentState() == Player.STATE_BLOCKED
+                        || player.getCurrentState() == Player.STATE_BUFFERING) {
                     // null intent -> show hourglass icon that does nothing when clicked
                     return new NotificationCompat.Action(R.drawable.ic_hourglass_top_white_24dp_png,
-                            player.context.getString(R.string.notification_action_buffering),
+                            player.getContext().getString(R.string.notification_action_buffering),
                             null);
                 }
 
             case NotificationConstants.PLAY_PAUSE:
-                if (player.getCurrentState() == BasePlayer.STATE_COMPLETED) {
+                if (player.getCurrentState() == Player.STATE_COMPLETED) {
                     return getAction(player, R.drawable.ic_replay_white_24dp_png,
                             R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE);
                 } else if (player.isPlaying()
-                        || player.getCurrentState() == BasePlayer.STATE_PREFLIGHT
-                        || player.getCurrentState() == BasePlayer.STATE_BLOCKED
-                        || player.getCurrentState() == BasePlayer.STATE_BUFFERING) {
+                        || player.getCurrentState() == Player.STATE_PREFLIGHT
+                        || player.getCurrentState() == Player.STATE_BLOCKED
+                        || player.getCurrentState() == Player.STATE_BUFFERING) {
                     return getAction(player, R.drawable.exo_notification_pause,
                             R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE);
                 } else {
@@ -307,7 +306,7 @@ private NotificationCompat.Action getAction(
                 }
 
             case NotificationConstants.SHUFFLE:
-                if (player.playQueue != null && player.playQueue.isShuffled()) {
+                if (player.getPlayQueue() != null && player.getPlayQueue().isShuffled()) {
                     return getAction(player, R.drawable.exo_controls_shuffle_on,
                             R.string.exo_controls_shuffle_on_description, ACTION_SHUFFLE);
                 } else {
@@ -326,23 +325,23 @@ private NotificationCompat.Action getAction(
         }
     }
 
-    private NotificationCompat.Action getAction(final VideoPlayerImpl player,
+    private NotificationCompat.Action getAction(final Player player,
                                                 @DrawableRes final int drawable,
                                                 @StringRes final int title,
                                                 final String intentAction) {
-        return new NotificationCompat.Action(drawable, player.context.getString(title),
-                PendingIntent.getBroadcast(player.context, NOTIFICATION_ID,
+        return new NotificationCompat.Action(drawable, player.getContext().getString(title),
+                PendingIntent.getBroadcast(player.getContext(), NOTIFICATION_ID,
                         new Intent(intentAction), FLAG_UPDATE_CURRENT));
     }
 
-    private Intent getIntentForNotification(final VideoPlayerImpl player) {
+    private Intent getIntentForNotification(final Player player) {
         if (player.audioPlayerSelected() || player.popupPlayerSelected()) {
             // Means we play in popup or audio only. Let's show the play queue
-            return NavigationHelper.getPlayQueueActivityIntent(player.context);
+            return NavigationHelper.getPlayQueueActivityIntent(player.getContext());
         } else {
             // We are playing in fragment. Don't open another activity just show fragment. That's it
             final Intent intent = NavigationHelper.getPlayerIntent(
-                    player.context, MainActivity.class, null, true);
+                    player.getContext(), MainActivity.class, null, true);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.setAction(Intent.ACTION_MAIN);
             intent.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -355,10 +354,9 @@ private Intent getIntentForNotification(final VideoPlayerImpl player) {
     // BITMAP
     /////////////////////////////////////////////////////
 
-    private void setLargeIcon(final NotificationCompat.Builder builder,
-                              final VideoPlayerImpl player) {
-        final boolean scaleImageToSquareAspectRatio = player.sharedPreferences.getBoolean(
-                player.context.getString(R.string.scale_to_square_image_in_notifications_key),
+    private void setLargeIcon(final NotificationCompat.Builder builder, final Player player) {
+        final boolean scaleImageToSquareAspectRatio = player.getPrefs().getBoolean(
+                player.getContext().getString(R.string.scale_to_square_image_in_notifications_key),
                 false);
         if (scaleImageToSquareAspectRatio) {
             builder.setLargeIcon(getBitmapWithSquareAspectRatio(player.getThumbnail()));
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
new file mode 100644
index 00000000000..490a0a693fb
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -0,0 +1,3973 @@
+package org.schabi.newpipe.player;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.animation.AnticipateInterpolator;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.DisplayCutoutCompat;
+import androidx.core.view.ViewCompat;
+import androidx.preference.PreferenceManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.BehindLiveWindowException;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.text.CaptionStyleCompat;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.ui.SubtitleView;
+import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer2.video.VideoListener;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
+
+import org.schabi.newpipe.DownloaderImpl;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.PlayerBinding;
+import org.schabi.newpipe.databinding.PlayerPopupCloseOverlayBinding;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
+import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.player.MainPlayer.PlayerType;
+import org.schabi.newpipe.player.event.PlayerEventListener;
+import org.schabi.newpipe.player.event.PlayerGestureListener;
+import org.schabi.newpipe.player.event.PlayerServiceEventListener;
+import org.schabi.newpipe.player.helper.AudioReactor;
+import org.schabi.newpipe.player.helper.LoadController;
+import org.schabi.newpipe.player.helper.MediaSessionManager;
+import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
+import org.schabi.newpipe.player.helper.PlayerDataSource;
+import org.schabi.newpipe.player.helper.PlayerHelper;
+import org.schabi.newpipe.player.playback.CustomTrackSelector;
+import org.schabi.newpipe.player.playback.MediaSourceManager;
+import org.schabi.newpipe.player.playback.PlaybackListener;
+import org.schabi.newpipe.player.playback.PlayerMediaSession;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
+import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder;
+import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
+import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
+import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.DeviceUtils;
+import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.KoreUtil;
+import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.SerializedCache;
+import org.schabi.newpipe.util.ShareUtils;
+import org.schabi.newpipe.views.ExpandableSurfaceView;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.SerialDisposable;
+
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_AD_INSERTION;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
+import static com.google.android.exoplayer2.Player.DiscontinuityReason;
+import static com.google.android.exoplayer2.Player.EventListener;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
+import static com.google.android.exoplayer2.Player.RepeatMode;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.schabi.newpipe.extractor.ServiceList.YouTube;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_CLOSE;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PAUSE;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_REPEAT;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
+import static org.schabi.newpipe.player.helper.PlayerHelper.buildCloseOverlayLayoutParams;
+import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getMinimizeOnExitAction;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getMinimumVideoHeight;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
+import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
+import static org.schabi.newpipe.player.helper.PlayerHelper.isPlaybackResumeEnabled;
+import static org.schabi.newpipe.player.helper.PlayerHelper.nextRepeatMode;
+import static org.schabi.newpipe.player.helper.PlayerHelper.nextResizeModeAndSaveToPrefs;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePlaybackParametersFromPrefs;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePlayerTypeFromIntent;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePopupLayoutParamsFromPrefs;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrieveSeekDurationFromPreferences;
+import static org.schabi.newpipe.player.helper.PlayerHelper.savePlaybackParametersToPrefs;
+import static org.schabi.newpipe.util.AnimationUtils.Type.SLIDE_AND_ALPHA;
+import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
+import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import static org.schabi.newpipe.util.Localization.containsCaseInsensitive;
+
+public final class Player implements
+        EventListener,
+        PlaybackListener,
+        ImageLoadingListener,
+        VideoListener,
+        SeekBar.OnSeekBarChangeListener,
+        View.OnClickListener,
+        PopupMenu.OnMenuItemClickListener,
+        PopupMenu.OnDismissListener,
+        View.OnLongClickListener {
+    public static final boolean DEBUG = MainActivity.DEBUG;
+    public static final String TAG = Player.class.getSimpleName();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // States
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final int STATE_PREFLIGHT = -1;
+    public static final int STATE_BLOCKED = 123;
+    public static final int STATE_PLAYING = 124;
+    public static final int STATE_BUFFERING = 125;
+    public static final int STATE_PAUSED = 126;
+    public static final int STATE_PAUSED_SEEK = 127;
+    public static final int STATE_COMPLETED = 128;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Intent
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final String REPEAT_MODE = "repeat_mode";
+    public static final String PLAYBACK_QUALITY = "playback_quality";
+    public static final String PLAY_QUEUE_KEY = "play_queue_key";
+    public static final String APPEND_ONLY = "append_only";
+    public static final String RESUME_PLAYBACK = "resume_playback";
+    public static final String PLAY_WHEN_READY = "play_when_ready";
+    public static final String SELECT_ON_APPEND = "select_on_append";
+    public static final String PLAYER_TYPE = "player_type";
+    public static final String IS_MUTED = "is_muted";
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Time constants
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final int PLAY_PREV_ACTIVATION_LIMIT_MILLIS = 5000; // 5 seconds
+    public static final int PROGRESS_LOOP_INTERVAL_MILLIS = 500; // 500 millis
+    public static final int DEFAULT_CONTROLS_DURATION = 300; // 300 millis
+    public static final int DEFAULT_CONTROLS_HIDE_TIME = 2000;  // 2 Seconds
+    public static final int DPAD_CONTROLS_HIDE_TIME = 7000;  // 7 Seconds
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Other constants
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private static final float[] PLAYBACK_SPEEDS = {0.5f, 0.75f, 1.0f, 1.25f, 1.5f, 1.75f, 2.0f};
+
+    private static final int RENDERER_UNAVAILABLE = -1;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private PlayQueue playQueue;
+    private PlayQueueAdapter playQueueAdapter;
+
+    @Nullable private MediaSourceManager playQueueManager;
+
+    @Nullable private PlayQueueItem currentItem;
+    @Nullable private MediaSourceTag currentMetadata;
+    @Nullable private Bitmap currentThumbnail;
+
+    @Nullable private Toast errorToast;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Player
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private SimpleExoPlayer simpleExoPlayer;
+    private AudioReactor audioReactor;
+    private MediaSessionManager mediaSessionManager;
+
+    @NonNull private final CustomTrackSelector trackSelector;
+    @NonNull private final LoadController loadController;
+    @NonNull private final RenderersFactory renderFactory;
+
+    @NonNull private final VideoPlaybackResolver videoResolver;
+    @NonNull private final AudioPlaybackResolver audioResolver;
+
+    private final MainPlayer service; //TODO try to remove and replace everything with context
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Player states
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private PlayerType playerType = PlayerType.VIDEO;
+    private int currentState = STATE_PREFLIGHT;
+
+    // audio only mode does not mean that player type is background, but that the player was
+    // minimized to background but will resume automatically to the original player type
+    private boolean isAudioOnly = false;
+    private boolean isPrepared = false;
+    private boolean wasPlaying = false;
+    private boolean isFullscreen = false;
+    private boolean isVerticalVideo = false;
+    private boolean fragmentIsVisible = false;
+
+    private List<VideoStream> availableStreams;
+    private int selectedStreamIndex;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private PlayerBinding binding;
+
+    private ValueAnimator controlViewAnimator;
+    private final Handler controlsVisibilityHandler = new Handler();
+
+    // fullscreen player
+    private boolean isQueueVisible = false;
+    private ItemTouchHelper itemTouchHelper;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Popup menus ("popup" means that they pop up, not that they belong to the popup player)
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private static final int POPUP_MENU_ID_QUALITY = 69;
+    private static final int POPUP_MENU_ID_PLAYBACK_SPEED = 79;
+    private static final int POPUP_MENU_ID_CAPTION = 89;
+
+    private boolean isSomePopupMenuVisible = false;
+    private PopupMenu qualityPopupMenu;
+    private PopupMenu playbackSpeedPopupMenu;
+    private PopupMenu captionPopupMenu;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Popup player
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private PlayerPopupCloseOverlayBinding closeOverlayBinding;
+
+    private boolean isPopupClosing = false;
+
+    private float screenWidth;
+    private float screenHeight;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Popup player window manager
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final int IDLE_WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+    public static final int ONGOING_PLAYBACK_WINDOW_FLAGS = IDLE_WINDOW_FLAGS
+            | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
+
+    @Nullable private WindowManager.LayoutParams popupLayoutParams; // null if player is not popup
+    @Nullable private final WindowManager windowManager;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Gestures
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private static final float MAX_GESTURE_LENGTH = 0.75f;
+
+    private int maxGestureLength; // scaled
+    private GestureDetector gestureDetector;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Listeners and disposables
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private BroadcastReceiver broadcastReceiver;
+    private IntentFilter intentFilter;
+    private PlayerServiceEventListener fragmentListener;
+    private PlayerEventListener activityListener;
+    private ContentObserver settingsContentObserver;
+
+    @NonNull private final SerialDisposable progressUpdateDisposable = new SerialDisposable();
+    @NonNull private final CompositeDisposable databaseUpdateDisposable = new CompositeDisposable();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @NonNull private final Context context;
+    @NonNull private final SharedPreferences prefs;
+    @NonNull private final HistoryRecordManager recordManager;
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Constructor
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public Player(@NonNull final MainPlayer service) {
+        this.service = service;
+        context = service;
+        prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        recordManager = new HistoryRecordManager(context);
+
+        setupBroadcastReceiver();
+
+        trackSelector = new CustomTrackSelector(context, PlayerHelper.getQualitySelector());
+        final PlayerDataSource dataSource = new PlayerDataSource(context, DownloaderImpl.USER_AGENT,
+                new DefaultBandwidthMeter.Builder(context).build());
+        loadController = new LoadController();
+        renderFactory = new DefaultRenderersFactory(context);
+
+        videoResolver = new VideoPlaybackResolver(context, dataSource, getQualityResolver());
+        audioResolver = new AudioPlaybackResolver(context, dataSource);
+
+        windowManager = ContextCompat.getSystemService(context, WindowManager.class);
+    }
+
+    private VideoPlaybackResolver.QualityResolver getQualityResolver() {
+        return new VideoPlaybackResolver.QualityResolver() {
+            @Override
+            public int getDefaultResolutionIndex(final List<VideoStream> sortedVideos) {
+                return videoPlayerSelected()
+                        ? ListHelper.getDefaultResolutionIndex(context, sortedVideos)
+                        : ListHelper.getPopupDefaultResolutionIndex(context, sortedVideos);
+            }
+
+            @Override
+            public int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
+                                                  final String playbackQuality) {
+                return videoPlayerSelected()
+                        ? getResolutionIndex(context, sortedVideos, playbackQuality)
+                        : getPopupResolutionIndex(context, sortedVideos, playbackQuality);
+            }
+        };
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Setup and initialization
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public void setupFromView(@NonNull final PlayerBinding playerBinding) {
+        initViews(playerBinding);
+        if (exoPlayerIsNull()) {
+            initPlayer(true);
+        }
+        initListeners();
+    }
+
+    private void initViews(@NonNull final PlayerBinding playerBinding) {
+        binding = playerBinding;
+        setupSubtitleView();
+
+        binding.resizeTextView
+                .setText(PlayerHelper.resizeTypeOf(context, binding.surfaceView.getResizeMode()));
+
+        binding.playbackSeekBar.getThumb()
+                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
+        binding.playbackSeekBar.getProgressDrawable()
+                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY));
+
+        qualityPopupMenu = new PopupMenu(context, binding.qualityTextView);
+        playbackSpeedPopupMenu = new PopupMenu(context, binding.playbackSpeed);
+        captionPopupMenu = new PopupMenu(context, binding.captionTextView);
+
+        binding.progressBarLoadingPanel.getIndeterminateDrawable()
+                .setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
+
+        binding.titleTextView.setSelected(true);
+        binding.channelTextView.setSelected(true);
+
+        // Prevent hiding of bottom sheet via swipe inside queue
+        binding.playQueue.setNestedScrollingEnabled(false);
+    }
+
+    private void initPlayer(final boolean playOnReady) {
+        if (DEBUG) {
+            Log.d(TAG, "initPlayer() called with: playOnReady = [" + playOnReady + "]");
+        }
+
+        simpleExoPlayer = new SimpleExoPlayer.Builder(context, renderFactory)
+                .setTrackSelector(trackSelector)
+                .setLoadControl(loadController)
+                .build();
+        simpleExoPlayer.addListener(this);
+        simpleExoPlayer.setPlayWhenReady(playOnReady);
+        simpleExoPlayer.setSeekParameters(PlayerHelper.getSeekParameters(context));
+        simpleExoPlayer.setWakeMode(C.WAKE_MODE_NETWORK);
+        simpleExoPlayer.setHandleAudioBecomingNoisy(true);
+
+        audioReactor = new AudioReactor(context, simpleExoPlayer);
+        mediaSessionManager = new MediaSessionManager(context, simpleExoPlayer,
+                new PlayerMediaSession(this));
+
+        registerBroadcastReceiver();
+
+        // Setup video view
+        simpleExoPlayer.setVideoSurfaceView(binding.surfaceView);
+        simpleExoPlayer.addVideoListener(this);
+
+        // Setup subtitle view
+        simpleExoPlayer.addTextOutput(binding.subtitleView);
+
+        // Setup audio session with onboard equalizer
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            trackSelector.setParameters(trackSelector.buildUponParameters()
+                    .setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context)));
+        }
+    }
+
+    private void initListeners() {
+        binding.playbackSeekBar.setOnSeekBarChangeListener(this);
+        binding.playbackSpeed.setOnClickListener(this);
+        binding.qualityTextView.setOnClickListener(this);
+        binding.captionTextView.setOnClickListener(this);
+        binding.resizeTextView.setOnClickListener(this);
+        binding.playbackLiveSync.setOnClickListener(this);
+
+        final PlayerGestureListener listener = new PlayerGestureListener(this, service);
+        gestureDetector = new GestureDetector(context, listener);
+        binding.getRoot().setOnTouchListener(listener);
+
+        binding.queueButton.setOnClickListener(this);
+        binding.repeatButton.setOnClickListener(this);
+        binding.shuffleButton.setOnClickListener(this);
+
+        binding.playPauseButton.setOnClickListener(this);
+        binding.playPreviousButton.setOnClickListener(this);
+        binding.playNextButton.setOnClickListener(this);
+
+        binding.moreOptionsButton.setOnClickListener(this);
+        binding.moreOptionsButton.setOnLongClickListener(this);
+        binding.share.setOnClickListener(this);
+        binding.fullScreenButton.setOnClickListener(this);
+        binding.screenRotationButton.setOnClickListener(this);
+        binding.playWithKodi.setOnClickListener(this);
+        binding.openInBrowser.setOnClickListener(this);
+        binding.playerCloseButton.setOnClickListener(this);
+        binding.switchMute.setOnClickListener(this);
+
+        settingsContentObserver = new ContentObserver(new Handler()) {
+            @Override
+            public void onChange(final boolean selfChange) {
+                setupScreenRotationButton();
+            }
+        };
+        context.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), false,
+                settingsContentObserver);
+        binding.getRoot().addOnLayoutChangeListener(this::onLayoutChange);
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.playQueuePanel, (view, windowInsets) -> {
+            final DisplayCutoutCompat cutout = windowInsets.getDisplayCutout();
+            if (cutout != null) {
+                view.setPadding(cutout.getSafeInsetLeft(), cutout.getSafeInsetTop(),
+                        cutout.getSafeInsetRight(), cutout.getSafeInsetBottom());
+            }
+            return windowInsets;
+        });
+
+        // PlaybackControlRoot already consumed window insets but we should pass them to
+        // player_overlays too. Without it they will be off-centered
+        binding.playbackControlRoot.addOnLayoutChangeListener(
+                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) ->
+                        binding.playerOverlays.setPadding(
+                                v.getPaddingLeft(),
+                                v.getPaddingTop(),
+                                v.getPaddingRight(),
+                                v.getPaddingBottom()));
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback initialization via intent
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public void handleIntent(@NonNull final Intent intent) {
+        // fail fast if no play queue was provided
+        final String queueCache = intent.getStringExtra(PLAY_QUEUE_KEY);
+        if (queueCache == null) {
+            return;
+        }
+        final PlayQueue newQueue = SerializedCache.getInstance().take(queueCache, PlayQueue.class);
+        if (newQueue == null) {
+            return;
+        }
+
+        final PlayerType oldPlayerType = playerType;
+        playerType = retrievePlayerTypeFromIntent(intent);
+        // We need to setup audioOnly before super(), see "sourceOf"
+        isAudioOnly = audioPlayerSelected();
+
+        if (intent.hasExtra(PLAYBACK_QUALITY)) {
+            setPlaybackQuality(intent.getStringExtra(PLAYBACK_QUALITY));
+        }
+
+        // Resolve append intents
+        if (intent.getBooleanExtra(APPEND_ONLY, false) && playQueue != null) {
+            final int sizeBeforeAppend = playQueue.size();
+            playQueue.append(newQueue.getStreams());
+
+            if ((intent.getBooleanExtra(SELECT_ON_APPEND, false)
+                    || currentState == STATE_COMPLETED) && newQueue.getStreams().size() > 0) {
+                playQueue.setIndex(sizeBeforeAppend);
+            }
+
+            return;
+        }
+
+        final PlaybackParameters savedParameters = retrievePlaybackParametersFromPrefs(this);
+        final float playbackSpeed = savedParameters.speed;
+        final float playbackPitch = savedParameters.pitch;
+        final boolean playbackSkipSilence = savedParameters.skipSilence;
+
+        final boolean samePlayQueue = playQueue != null && playQueue.equals(newQueue);
+        final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
+        final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
+        final boolean isMuted = intent.getBooleanExtra(IS_MUTED, isMuted());
+
+        /*
+         * There are 3 situations when playback shouldn't be started from scratch (zero timestamp):
+         * 1. User pressed on a timestamp link and the same video should be rewound to the timestamp
+         * 2. User changed a player from, for example. main to popup, or from audio to main, etc
+         * 3. User chose to resume a video based on a saved timestamp from history of played videos
+         * In those cases time will be saved because re-init of the play queue is a not an instant
+         *  task and requires network calls
+         * */
+        // seek to timestamp if stream is already playing
+        if (!exoPlayerIsNull()
+                && newQueue.size() == 1 && newQueue.getItem() != null
+                && playQueue != null && playQueue.size() == 1 && playQueue.getItem() != null
+                && newQueue.getItem().getUrl().equals(playQueue.getItem().getUrl())
+                && newQueue.getItem().getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
+            // Player can have state = IDLE when playback is stopped or failed
+            // and we should retry() in this case
+            if (simpleExoPlayer.getPlaybackState()
+                    == com.google.android.exoplayer2.Player.STATE_IDLE) {
+                simpleExoPlayer.retry();
+            }
+            simpleExoPlayer.seekTo(playQueue.getIndex(), newQueue.getItem().getRecoveryPosition());
+            simpleExoPlayer.setPlayWhenReady(playWhenReady);
+
+        } else if (!exoPlayerIsNull()
+                && samePlayQueue
+                && playQueue != null
+                && !playQueue.isDisposed()) {
+            // Do not re-init the same PlayQueue. Save time
+            // Player can have state = IDLE when playback is stopped or failed
+            // and we should retry() in this case
+            if (simpleExoPlayer.getPlaybackState()
+                    == com.google.android.exoplayer2.Player.STATE_IDLE) {
+                simpleExoPlayer.retry();
+            }
+            simpleExoPlayer.setPlayWhenReady(playWhenReady);
+
+        } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false)
+                && isPlaybackResumeEnabled(this)
+                && !samePlayQueue
+                && !newQueue.isEmpty()
+                && newQueue.getItem().getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
+            databaseUpdateDisposable.add(recordManager.loadStreamState(newQueue.getItem())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    // Do not place initPlayback() in doFinally() because
+                    // it restarts playback after destroy()
+                    //.doFinally()
+                    .subscribe(
+                            state -> {
+                                newQueue.setRecovery(newQueue.getIndex(), state.getProgressTime());
+                                initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
+                                        playbackSkipSilence, playWhenReady, isMuted);
+                            },
+                            error -> {
+                                if (DEBUG) {
+                                    error.printStackTrace();
+                                }
+                                // In case any error we can start playback without history
+                                initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
+                                        playbackSkipSilence, playWhenReady, isMuted);
+                            },
+                            () -> {
+                                    // Completed but not found in history
+                                    initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
+                                            playbackSkipSilence, playWhenReady, isMuted);
+                                }
+                        ));
+        } else {
+            // Good to go...
+            // In a case of equal PlayQueues we can re-init old one but only when it is disposed
+            initPlayback(samePlayQueue ? playQueue : newQueue, repeatMode, playbackSpeed,
+                    playbackPitch, playbackSkipSilence, playWhenReady, isMuted);
+        }
+
+        if (oldPlayerType != playerType && playQueue != null) {
+            // If playerType changes from one to another we should reload the player
+            // (to disable/enable video stream or to set quality)
+            setRecovery();
+            reloadPlayQueueManager();
+        }
+
+        setupElementsVisibility();
+        setupElementsSize();
+
+        if (audioPlayerSelected()) {
+            service.removeViewFromParent();
+        } else if (popupPlayerSelected()) {
+            binding.getRoot().setVisibility(View.VISIBLE);
+            initPopup();
+            initPopupCloseOverlay();
+            binding.playPauseButton.requestFocus();
+        } else {
+            binding.getRoot().setVisibility(View.VISIBLE);
+            initVideoPlayer();
+            closeQueue();
+            // Android TV: without it focus will frame the whole player
+            binding.playPauseButton.requestFocus();
+
+            if (simpleExoPlayer.getPlayWhenReady()) {
+                play();
+            } else {
+                pause();
+            }
+        }
+        NavigationHelper.sendPlayerStartedEvent(context);
+    }
+
+    private void initPlayback(@NonNull final PlayQueue queue,
+                              @RepeatMode final int repeatMode,
+                              final float playbackSpeed,
+                              final float playbackPitch,
+                              final boolean playbackSkipSilence,
+                              final boolean playOnReady,
+                              final boolean isMuted) {
+        destroyPlayer();
+        initPlayer(playOnReady);
+        setRepeatMode(repeatMode);
+        setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
+
+        playQueue = queue;
+        playQueue.init();
+        reloadPlayQueueManager();
+
+        if (playQueueAdapter != null) {
+            playQueueAdapter.dispose();
+        }
+        playQueueAdapter = new PlayQueueAdapter(context, playQueue);
+
+        simpleExoPlayer.setVolume(isMuted ? 0 : 1);
+        notifyQueueUpdateToListeners();
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Destroy and recovery
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void destroyPlayer() {
+        if (DEBUG) {
+            Log.d(TAG, "destroyPlayer() called");
+        }
+        if (!exoPlayerIsNull()) {
+            simpleExoPlayer.removeListener(this);
+            simpleExoPlayer.stop();
+            simpleExoPlayer.release();
+        }
+        if (isProgressLoopRunning()) {
+            stopProgressLoop();
+        }
+        if (playQueue != null) {
+            playQueue.dispose();
+        }
+        if (audioReactor != null) {
+            audioReactor.dispose();
+        }
+        if (playQueueManager != null) {
+            playQueueManager.dispose();
+        }
+        if (mediaSessionManager != null) {
+            mediaSessionManager.dispose();
+        }
+
+        if (playQueueAdapter != null) {
+            playQueueAdapter.unsetSelectedListener();
+            playQueueAdapter.dispose();
+        }
+    }
+
+    public void destroy() {
+        if (DEBUG) {
+            Log.d(TAG, "destroy() called");
+        }
+        destroyPlayer();
+        unregisterBroadcastReceiver();
+
+        databaseUpdateDisposable.clear();
+        progressUpdateDisposable.set(null);
+        ImageLoader.getInstance().stop();
+
+        if (binding != null) {
+            binding.endScreen.setImageBitmap(null);
+        }
+
+        context.getContentResolver().unregisterContentObserver(settingsContentObserver);
+    }
+
+    public void setRecovery() {
+        if (playQueue == null || exoPlayerIsNull()) {
+            return;
+        }
+
+        final int queuePos = playQueue.getIndex();
+        final long windowPos = simpleExoPlayer.getCurrentPosition();
+
+        if (windowPos > 0 && windowPos <= simpleExoPlayer.getDuration()) {
+            setRecovery(queuePos, windowPos);
+        }
+    }
+
+    private void setRecovery(final int queuePos, final long windowPos) {
+        if (playQueue.size() <= queuePos) {
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "Setting recovery, queue: " + queuePos + ", pos: " + windowPos);
+        }
+        playQueue.setRecovery(queuePos, windowPos);
+    }
+
+    private void reloadPlayQueueManager() {
+        if (playQueueManager != null) {
+            playQueueManager.dispose();
+        }
+
+        if (playQueue != null) {
+            playQueueManager = new MediaSourceManager(this, playQueue);
+        }
+    }
+
+    @Override // own playback listener
+    public void onPlaybackShutdown() {
+        if (DEBUG) {
+            Log.d(TAG, "onPlaybackShutdown() called");
+        }
+        // destroys the service, which in turn will destroy the player
+        service.onDestroy();
+    }
+
+    public void smoothStopPlayer() {
+        // Pausing would make transition from one stream to a new stream not smooth, so only stop
+        simpleExoPlayer.stop(false);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Player type specific setup
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void initVideoPlayer() {
+        // restore last resize mode
+        setResizeMode(prefs.getInt(context.getString(R.string.last_resize_mode),
+                AspectRatioFrameLayout.RESIZE_MODE_FIT));
+        binding.getRoot().setLayoutParams(new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+    }
+
+    @SuppressLint("RtlHardcoded")
+    private void initPopup() {
+        if (DEBUG) {
+            Log.d(TAG, "initPopup() called");
+        }
+
+        // Popup is already added to windowManager
+        if (popupHasParent()) {
+            return;
+        }
+
+        updateScreenSize();
+
+        popupLayoutParams = retrievePopupLayoutParamsFromPrefs(this);
+        binding.surfaceView.setHeights(popupLayoutParams.height, popupLayoutParams.height);
+
+        checkPopupPositionBounds();
+
+        binding.loadingPanel.setMinimumWidth(popupLayoutParams.width);
+        binding.loadingPanel.setMinimumHeight(popupLayoutParams.height);
+
+        service.removeViewFromParent();
+        Objects.requireNonNull(windowManager).addView(binding.getRoot(), popupLayoutParams);
+
+        // Popup doesn't have aspectRatio selector, using FIT automatically
+        setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);
+    }
+
+    @SuppressLint("RtlHardcoded")
+    private void initPopupCloseOverlay() {
+        if (DEBUG) {
+            Log.d(TAG, "initPopupCloseOverlay() called");
+        }
+
+        // closeOverlayView is already added to windowManager
+        if (closeOverlayBinding != null) {
+            return;
+        }
+
+        closeOverlayBinding = PlayerPopupCloseOverlayBinding.inflate(LayoutInflater.from(context));
+
+        final WindowManager.LayoutParams closeOverlayLayoutParams = buildCloseOverlayLayoutParams();
+        closeOverlayBinding.closeButton.setVisibility(View.GONE);
+        Objects.requireNonNull(windowManager).addView(
+                closeOverlayBinding.getRoot(), closeOverlayLayoutParams);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Elements visibility and size: popup and main players have different look
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    /**
+     * This method ensures that popup and main players have different look.
+     * We use one layout for both players and need to decide what to show and what to hide.
+     * Additional measuring should be done inside {@link #setupElementsSize}.
+     */
+    private void setupElementsVisibility() {
+        if (popupPlayerSelected()) {
+            binding.fullScreenButton.setVisibility(View.VISIBLE);
+            binding.screenRotationButton.setVisibility(View.GONE);
+            binding.resizeTextView.setVisibility(View.GONE);
+            binding.getRoot().findViewById(R.id.metadataView).setVisibility(View.GONE);
+            binding.queueButton.setVisibility(View.GONE);
+            binding.moreOptionsButton.setVisibility(View.GONE);
+            binding.topControls.setOrientation(LinearLayout.HORIZONTAL);
+            binding.primaryControls.getLayoutParams().width
+                    = LinearLayout.LayoutParams.WRAP_CONTENT;
+            binding.secondaryControls.setAlpha(1.0f);
+            binding.secondaryControls.setVisibility(View.VISIBLE);
+            binding.secondaryControls.setTranslationY(0);
+            binding.share.setVisibility(View.GONE);
+            binding.playWithKodi.setVisibility(View.GONE);
+            binding.openInBrowser.setVisibility(View.GONE);
+            binding.switchMute.setVisibility(View.GONE);
+            binding.playerCloseButton.setVisibility(View.GONE);
+            binding.topControls.bringToFront();
+            binding.topControls.setClickable(false);
+            binding.topControls.setFocusable(false);
+            binding.bottomControls.bringToFront();
+            closeQueue();
+        } else if (videoPlayerSelected()) {
+            binding.fullScreenButton.setVisibility(View.GONE);
+            setupScreenRotationButton();
+            binding.resizeTextView.setVisibility(View.VISIBLE);
+            binding.getRoot().findViewById(R.id.metadataView).setVisibility(View.VISIBLE);
+            binding.moreOptionsButton.setVisibility(View.VISIBLE);
+            binding.topControls.setOrientation(LinearLayout.VERTICAL);
+            binding.primaryControls.getLayoutParams().width
+                    = LinearLayout.LayoutParams.MATCH_PARENT;
+            binding.secondaryControls.setVisibility(View.INVISIBLE);
+            binding.moreOptionsButton.setImageDrawable(AppCompatResources.getDrawable(context,
+                    R.drawable.ic_expand_more_white_24dp));
+            binding.share.setVisibility(View.VISIBLE);
+            binding.openInBrowser.setVisibility(View.VISIBLE);
+            binding.switchMute.setVisibility(View.VISIBLE);
+            binding.playerCloseButton.setVisibility(isFullscreen ? View.GONE : View.VISIBLE);
+            // Top controls have a large minHeight which is allows to drag the player
+            // down in fullscreen mode (just larger area to make easy to locate by finger)
+            binding.topControls.setClickable(true);
+            binding.topControls.setFocusable(true);
+        }
+        showHideKodiButton();
+
+        if (isFullscreen) {
+            binding.titleTextView.setVisibility(View.VISIBLE);
+            binding.channelTextView.setVisibility(View.VISIBLE);
+        } else {
+            binding.titleTextView.setVisibility(View.GONE);
+            binding.channelTextView.setVisibility(View.GONE);
+        }
+        setMuteButton(binding.switchMute, isMuted());
+
+        animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION, 0);
+    }
+
+    /**
+     * Changes padding, size of elements based on player selected right now.
+     * Popup player has small padding in comparison with the main player
+     */
+    private void setupElementsSize() {
+        final Resources res = context.getResources();
+        final int buttonsMinWidth;
+        final int playerTopPad;
+        final int controlsPad;
+        final int buttonsPad;
+
+        if (popupPlayerSelected()) {
+            buttonsMinWidth = 0;
+            playerTopPad = 0;
+            controlsPad = res.getDimensionPixelSize(R.dimen.player_popup_controls_padding);
+            buttonsPad = res.getDimensionPixelSize(R.dimen.player_popup_buttons_padding);
+        } else if (videoPlayerSelected()) {
+            buttonsMinWidth = res.getDimensionPixelSize(R.dimen.player_main_buttons_min_width);
+            playerTopPad = res.getDimensionPixelSize(R.dimen.player_main_top_padding);
+            controlsPad = res.getDimensionPixelSize(R.dimen.player_main_controls_padding);
+            buttonsPad = res.getDimensionPixelSize(R.dimen.player_main_buttons_padding);
+        } else {
+            return;
+        }
+
+        binding.topControls.setPaddingRelative(controlsPad, playerTopPad, controlsPad, 0);
+        binding.bottomControls.setPaddingRelative(controlsPad, 0, controlsPad, 0);
+        binding.qualityTextView.setPadding(buttonsPad, buttonsPad, buttonsPad, buttonsPad);
+        binding.playbackSpeed.setPadding(buttonsPad, buttonsPad, buttonsPad, buttonsPad);
+        binding.playbackSpeed.setMinimumWidth(buttonsMinWidth);
+        binding.captionTextView.setPadding(buttonsPad, buttonsPad, buttonsPad, buttonsPad);
+    }
+
+    private void showHideKodiButton() {
+        // show kodi button if it supports the current service and it is enabled in settings
+        binding.playWithKodi.setVisibility(videoPlayerSelected()
+                && playQueue != null && playQueue.getItem() != null
+                && KoreUtil.shouldShowPlayWithKodi(context, playQueue.getItem().getServiceId())
+                ? View.VISIBLE : View.GONE);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Broadcast receiver
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void setupBroadcastReceiver() {
+        if (DEBUG) {
+            Log.d(TAG, "setupBroadcastReceiver() called");
+        }
+
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(final Context ctx, final Intent intent) {
+                onBroadcastReceived(intent);
+            }
+        };
+        intentFilter = new IntentFilter();
+
+        intentFilter.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+
+        intentFilter.addAction(ACTION_CLOSE);
+        intentFilter.addAction(ACTION_PLAY_PAUSE);
+        intentFilter.addAction(ACTION_PLAY_PREVIOUS);
+        intentFilter.addAction(ACTION_PLAY_NEXT);
+        intentFilter.addAction(ACTION_FAST_REWIND);
+        intentFilter.addAction(ACTION_FAST_FORWARD);
+        intentFilter.addAction(ACTION_REPEAT);
+        intentFilter.addAction(ACTION_SHUFFLE);
+        intentFilter.addAction(ACTION_RECREATE_NOTIFICATION);
+
+        intentFilter.addAction(VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED);
+        intentFilter.addAction(VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED);
+
+        intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
+        intentFilter.addAction(Intent.ACTION_SCREEN_ON);
+        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+        intentFilter.addAction(Intent.ACTION_HEADSET_PLUG);
+    }
+
+    private void onBroadcastReceived(final Intent intent) {
+        if (intent == null || intent.getAction() == null) {
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "onBroadcastReceived() called with: intent = [" + intent + "]");
+        }
+
+        switch (intent.getAction()) {
+            case AudioManager.ACTION_AUDIO_BECOMING_NOISY:
+                pause();
+                break;
+            case ACTION_CLOSE:
+                service.onDestroy();
+                break;
+            case ACTION_PLAY_PAUSE:
+                playPause();
+                if (!fragmentIsVisible) {
+                    // Ensure that we have audio-only stream playing when a user
+                    // started to play from notification's play button from outside of the app
+                    onFragmentStopped();
+                }
+                break;
+            case ACTION_PLAY_PREVIOUS:
+                playPrevious();
+                break;
+            case ACTION_PLAY_NEXT:
+                playNext();
+                break;
+            case ACTION_FAST_REWIND:
+                fastRewind();
+                break;
+            case ACTION_FAST_FORWARD:
+                fastForward();
+                break;
+            case ACTION_REPEAT:
+                onRepeatClicked();
+                break;
+            case ACTION_SHUFFLE:
+                onShuffleClicked();
+                break;
+            case ACTION_RECREATE_NOTIFICATION:
+                NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, true);
+                break;
+            case VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED:
+                fragmentIsVisible = true;
+                useVideoSource(true);
+                break;
+            case VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED:
+                fragmentIsVisible = false;
+                onFragmentStopped();
+                break;
+            case Intent.ACTION_CONFIGURATION_CHANGED:
+                assureCorrectAppLanguage(service);
+                if (DEBUG) {
+                    Log.d(TAG, "onConfigurationChanged() called");
+                }
+                if (popupPlayerSelected()) {
+                    updateScreenSize();
+                    changePopupSize(popupLayoutParams.width);
+                    checkPopupPositionBounds();
+                }
+                // Close it because when changing orientation from portrait
+                // (in fullscreen mode) the size of queue layout can be larger than the screen size
+                closeQueue();
+                break;
+            case Intent.ACTION_SCREEN_ON:
+                // Interrupt playback only when screen turns on
+                // and user is watching video in popup player.
+                // Same actions for video player will be handled in ACTION_VIDEO_FRAGMENT_RESUMED
+                if (popupPlayerSelected() && (isPlaying() || isLoading())) {
+                    useVideoSource(true);
+                }
+                break;
+            case Intent.ACTION_SCREEN_OFF:
+                // Interrupt playback only when screen turns off with popup player working
+                if (popupPlayerSelected() && (isPlaying() || isLoading())) {
+                    useVideoSource(false);
+                }
+                break;
+            case Intent.ACTION_HEADSET_PLUG: //FIXME
+                /*notificationManager.cancel(NOTIFICATION_ID);
+                mediaSessionManager.dispose();
+                mediaSessionManager.enable(getBaseContext(), basePlayerImpl.simpleExoPlayer);*/
+                break;
+        }
+    }
+
+    private void registerBroadcastReceiver() {
+        // Try to unregister current first
+        unregisterBroadcastReceiver();
+        context.registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    private void unregisterBroadcastReceiver() {
+        try {
+            context.unregisterReceiver(broadcastReceiver);
+        } catch (final IllegalArgumentException unregisteredException) {
+            Log.w(TAG, "Broadcast receiver already unregistered: "
+                    + unregisteredException.getMessage());
+        }
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Thumbnail loading
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void initThumbnail(final String url) {
+        if (DEBUG) {
+            Log.d(TAG, "Thumbnail - initThumbnail() called");
+        }
+        if (url == null || url.isEmpty()) {
+            return;
+        }
+        ImageLoader.getInstance().resume();
+        ImageLoader.getInstance()
+                .loadImage(url, ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, this);
+    }
+
+    @Override
+    public void onLoadingStarted(final String imageUri, final View view) {
+        if (DEBUG) {
+            Log.d(TAG, "Thumbnail - onLoadingStarted() called on: "
+                    + "imageUri = [" + imageUri + "], view = [" + view + "]");
+        }
+    }
+
+    @Override
+    public void onLoadingFailed(final String imageUri, final View view,
+                                final FailReason failReason) {
+        Log.e(TAG, "Thumbnail - onLoadingFailed() called on imageUri = [" + imageUri + "]",
+                failReason.getCause());
+        currentThumbnail = null;
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    @Override
+    public void onLoadingComplete(final String imageUri, final View view,
+                                  final Bitmap loadedImage) {
+        final float width = Math.min(
+                context.getResources().getDimension(R.dimen.player_notification_thumbnail_width),
+                loadedImage.getWidth());
+
+        if (DEBUG) {
+            Log.d(TAG, "Thumbnail - onLoadingComplete() called with: "
+                    + "imageUri = [" + imageUri + "], view = [" + view + "], "
+                    + "loadedImage = [" + loadedImage + "], "
+                    + loadedImage.getWidth() + "x" + loadedImage.getHeight()
+                    + ", scaled width = " + width);
+        }
+
+        currentThumbnail = Bitmap.createScaledBitmap(loadedImage,
+                (int) width,
+                (int) (loadedImage.getHeight() / (loadedImage.getWidth() / width)), true);
+        binding.endScreen.setImageBitmap(loadedImage);
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    @Override
+    public void onLoadingCancelled(final String imageUri, final View view) {
+        if (DEBUG) {
+            Log.d(TAG, "Thumbnail - onLoadingCancelled() called with: "
+                    + "imageUri = [" + imageUri + "], view = [" + view + "]");
+        }
+        currentThumbnail = null;
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Popup player utils
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    /**
+     * Check if {@link #popupLayoutParams}' position is within a arbitrary boundary
+     * that goes from (0, 0) to (screenWidth, screenHeight).
+     * <p>
+     * If it's out of these boundaries, {@link #popupLayoutParams}' position is changed
+     * and {@code true} is returned to represent this change.
+     * </p>
+     */
+    public void checkPopupPositionBounds() {
+        if (DEBUG) {
+            Log.d(TAG, "checkPopupPositionBounds() called with: "
+                    + "screenWidth = [" + screenWidth + "], "
+                    + "screenHeight = [" + screenHeight + "]");
+        }
+        if (popupLayoutParams == null) {
+            return;
+        }
+
+        if (popupLayoutParams.x < 0) {
+            popupLayoutParams.x = 0;
+        } else if (popupLayoutParams.x > screenWidth - popupLayoutParams.width) {
+            popupLayoutParams.x = (int) (screenWidth - popupLayoutParams.width);
+        }
+
+        if (popupLayoutParams.y < 0) {
+            popupLayoutParams.y = 0;
+        } else if (popupLayoutParams.y > screenHeight - popupLayoutParams.height) {
+            popupLayoutParams.y = (int) (screenHeight - popupLayoutParams.height);
+        }
+    }
+
+    public void updateScreenSize() {
+        if (windowManager != null) {
+            final DisplayMetrics metrics = new DisplayMetrics();
+            windowManager.getDefaultDisplay().getMetrics(metrics);
+
+            screenWidth = metrics.widthPixels;
+            screenHeight = metrics.heightPixels;
+            if (DEBUG) {
+                Log.d(TAG, "updateScreenSize() called: screenWidth = ["
+                        + screenWidth + "], screenHeight = [" + screenHeight + "]");
+            }
+        }
+    }
+
+    /**
+     * Changes the size of the popup based on the width.
+     * @param width the new width, height is calculated with
+     *              {@link PlayerHelper#getMinimumVideoHeight(float)}
+     */
+    public void changePopupSize(final int width) {
+        if (DEBUG) {
+            Log.d(TAG, "changePopupSize() called with: width = [" + width + "]");
+        }
+
+        if (anyPopupViewIsNull()) {
+            return;
+        }
+
+        final float minimumWidth = context.getResources().getDimension(R.dimen.popup_minimum_width);
+        final int actualWidth = (int) (width > screenWidth ? screenWidth
+                : (width < minimumWidth ? minimumWidth : width));
+        final int actualHeight = (int) getMinimumVideoHeight(width);
+        if (DEBUG) {
+            Log.d(TAG, "updatePopupSize() updated values:"
+                    + "  width = [" + actualWidth + "], height = [" + actualHeight + "]");
+        }
+
+        popupLayoutParams.width = actualWidth;
+        popupLayoutParams.height = actualHeight;
+        binding.surfaceView.setHeights(popupLayoutParams.height, popupLayoutParams.height);
+        Objects.requireNonNull(windowManager)
+                .updateViewLayout(binding.getRoot(), popupLayoutParams);
+    }
+
+    private void changePopupWindowFlags(final int flags) {
+        if (DEBUG) {
+            Log.d(TAG, "changePopupWindowFlags() called with: flags = [" + flags + "]");
+        }
+
+        if (!anyPopupViewIsNull()) {
+            popupLayoutParams.flags = flags;
+            Objects.requireNonNull(windowManager)
+                    .updateViewLayout(binding.getRoot(), popupLayoutParams);
+        }
+    }
+
+    public void closePopup() {
+        if (DEBUG) {
+            Log.d(TAG, "closePopup() called, isPopupClosing = " + isPopupClosing);
+        }
+        if (isPopupClosing) {
+            return;
+        }
+        isPopupClosing = true;
+
+        saveStreamProgressState();
+        Objects.requireNonNull(windowManager).removeView(binding.getRoot());
+
+        animatePopupOverlayAndFinishService();
+    }
+
+    public void removePopupFromView() {
+        if (windowManager != null) {
+            final boolean isCloseOverlayHasParent = closeOverlayBinding != null
+                    && closeOverlayBinding.closeButton.getParent() != null;
+            if (popupHasParent()) {
+                windowManager.removeView(binding.getRoot());
+            }
+            if (isCloseOverlayHasParent) {
+                windowManager.removeView(closeOverlayBinding.getRoot());
+            }
+        }
+    }
+
+    private void animatePopupOverlayAndFinishService() {
+        final int targetTranslationY =
+                (int) (closeOverlayBinding.closeButton.getRootView().getHeight()
+                        - closeOverlayBinding.closeButton.getY());
+
+        closeOverlayBinding.closeButton.animate().setListener(null).cancel();
+        closeOverlayBinding.closeButton.animate()
+                .setInterpolator(new AnticipateInterpolator())
+                .translationY(targetTranslationY)
+                .setDuration(400)
+                .setListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationCancel(final Animator animation) {
+                        end();
+                    }
+
+                    @Override
+                    public void onAnimationEnd(final Animator animation) {
+                        end();
+                    }
+
+                    private void end() {
+                        Objects.requireNonNull(windowManager)
+                                .removeView(closeOverlayBinding.getRoot());
+                        closeOverlayBinding = null;
+                        service.onDestroy();
+                    }
+                }).start();
+    }
+
+    private boolean popupHasParent() {
+        return binding != null
+                && binding.getRoot().getLayoutParams() instanceof WindowManager.LayoutParams
+                && binding.getRoot().getParent() != null;
+    }
+
+    private boolean anyPopupViewIsNull() {
+        // TODO understand why checking getParentActivity() != null
+        return popupLayoutParams == null || windowManager == null
+                || getParentActivity() != null || binding.getRoot().getParent() == null;
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback parameters
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public float getPlaybackSpeed() {
+        return getPlaybackParameters().speed;
+    }
+
+    private void setPlaybackSpeed(final float speed) {
+        setPlaybackParameters(speed, getPlaybackPitch(), getPlaybackSkipSilence());
+    }
+
+    public float getPlaybackPitch() {
+        return getPlaybackParameters().pitch;
+    }
+
+    public boolean getPlaybackSkipSilence() {
+        return getPlaybackParameters().skipSilence;
+    }
+
+    public PlaybackParameters getPlaybackParameters() {
+        if (exoPlayerIsNull()) {
+            return PlaybackParameters.DEFAULT;
+        }
+        return simpleExoPlayer.getPlaybackParameters();
+    }
+
+    /**
+     * Sets the playback parameters of the player, and also saves them to shared preferences.
+     * Speed and pitch are rounded up to 2 decimal places before being used or saved.
+     *
+     * @param speed       the playback speed, will be rounded to up to 2 decimal places
+     * @param pitch       the playback pitch, will be rounded to up to 2 decimal places
+     * @param skipSilence skip silence during playback
+     */
+    public void setPlaybackParameters(final float speed, final float pitch,
+                                      final boolean skipSilence) {
+        final float roundedSpeed = Math.round(speed * 100.0f) / 100.0f;
+        final float roundedPitch = Math.round(pitch * 100.0f) / 100.0f;
+
+        savePlaybackParametersToPrefs(this, roundedSpeed, roundedPitch, skipSilence);
+        simpleExoPlayer.setPlaybackParameters(
+                new PlaybackParameters(roundedSpeed, roundedPitch, skipSilence));
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Progress loop and updates
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void onUpdateProgress(final int currentProgress,
+                                  final int duration,
+                                  final int bufferPercent) {
+        if (!isPrepared) {
+            return;
+        }
+
+        if (duration != binding.playbackSeekBar.getMax()) {
+            binding.playbackEndTime.setText(getTimeString(duration));
+            binding.playbackSeekBar.setMax(duration);
+        }
+        if (currentState != STATE_PAUSED) {
+            if (currentState != STATE_PAUSED_SEEK) {
+                binding.playbackSeekBar.setProgress(currentProgress);
+            }
+            binding.playbackCurrentTime.setText(getTimeString(currentProgress));
+        }
+        if (simpleExoPlayer.isLoading() || bufferPercent > 90) {
+            binding.playbackSeekBar.setSecondaryProgress(
+                    (int) (binding.playbackSeekBar.getMax() * ((float) bufferPercent / 100)));
+        }
+        if (DEBUG && bufferPercent % 20 == 0) { //Limit log
+            Log.d(TAG, "notifyProgressUpdateToListeners() called with: "
+                    + "isVisible = " + isControlsVisible() + ", "
+                    + "currentProgress = [" + currentProgress + "], "
+                    + "duration = [" + duration + "], bufferPercent = [" + bufferPercent + "]");
+        }
+        binding.playbackLiveSync.setClickable(!isLiveEdge());
+
+        notifyProgressUpdateToListeners(currentProgress, duration, bufferPercent);
+
+        final boolean showThumbnail = prefs.getBoolean(
+                context.getString(R.string.show_thumbnail_key), true);
+        // setMetadata only updates the metadata when any of the metadata keys are null
+        mediaSessionManager.setMetadata(getVideoTitle(), getUploaderName(),
+                showThumbnail ? getThumbnail() : null, duration);
+    }
+
+    private void startProgressLoop() {
+        progressUpdateDisposable.set(getProgressUpdateDisposable());
+    }
+
+    private void stopProgressLoop() {
+        progressUpdateDisposable.set(null);
+    }
+
+    private boolean isProgressLoopRunning() {
+        return progressUpdateDisposable.get() != null;
+    }
+
+    private void triggerProgressUpdate() {
+        if (exoPlayerIsNull()) {
+            return;
+        }
+        onUpdateProgress(
+                Math.max((int) simpleExoPlayer.getCurrentPosition(), 0),
+                (int) simpleExoPlayer.getDuration(),
+                simpleExoPlayer.getBufferedPercentage()
+        );
+    }
+
+    private Disposable getProgressUpdateDisposable() {
+        return Observable.interval(PROGRESS_LOOP_INTERVAL_MILLIS, MILLISECONDS,
+                AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(ignored -> triggerProgressUpdate(),
+                        error -> Log.e(TAG, "Progress update failure: ", error));
+    }
+
+    @Override // seekbar listener
+    public void onProgressChanged(final SeekBar seekBar, final int progress,
+                                  final boolean fromUser) {
+        if (DEBUG && fromUser) {
+            Log.d(TAG, "onProgressChanged() called with: "
+                    + "seekBar = [" + seekBar + "], progress = [" + progress + "]");
+        }
+        if (fromUser) {
+            binding.currentDisplaySeek.setText(getTimeString(progress));
+        }
+    }
+
+    @Override // seekbar listener
+    public void onStartTrackingTouch(final SeekBar seekBar) {
+        if (DEBUG) {
+            Log.d(TAG, "onStartTrackingTouch() called with: seekBar = [" + seekBar + "]");
+        }
+        if (currentState != STATE_PAUSED_SEEK) {
+            changeState(STATE_PAUSED_SEEK);
+        }
+
+        saveWasPlaying();
+        if (isPlaying()) {
+            simpleExoPlayer.setPlayWhenReady(false);
+        }
+
+        showControls(0);
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true,
+                DEFAULT_CONTROLS_DURATION);
+    }
+
+    @Override // seekbar listener
+    public void onStopTrackingTouch(final SeekBar seekBar) {
+        if (DEBUG) {
+            Log.d(TAG, "onStopTrackingTouch() called with: seekBar = [" + seekBar + "]");
+        }
+
+        seekTo(seekBar.getProgress());
+        if (wasPlaying || simpleExoPlayer.getDuration() == seekBar.getProgress()) {
+            simpleExoPlayer.setPlayWhenReady(true);
+        }
+
+        binding.playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+
+        if (currentState == STATE_PAUSED_SEEK) {
+            changeState(STATE_BUFFERING);
+        }
+        if (!isProgressLoopRunning()) {
+            startProgressLoop();
+        }
+        if (wasPlaying) {
+            showControlsThenHide();
+        }
+    }
+
+    public void saveWasPlaying() {
+        this.wasPlaying = simpleExoPlayer.getPlayWhenReady();
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Controls showing / hiding
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public boolean isControlsVisible() {
+        return binding != null && binding.playbackControlRoot.getVisibility() == View.VISIBLE;
+    }
+
+    /**
+     * Show a animation, and depending on goneOnEnd, will stay on the screen or be gone.
+     *
+     * @param drawableId the drawable that will be used to animate,
+     *                   pass -1 to clear any animation that is visible
+     * @param goneOnEnd  will set the animation view to GONE on the end of the animation
+     */
+    public void showAndAnimateControl(final int drawableId, final boolean goneOnEnd) {
+        if (DEBUG) {
+            Log.d(TAG, "showAndAnimateControl() called with: "
+                    + "drawableId = [" + drawableId + "], goneOnEnd = [" + goneOnEnd + "]");
+        }
+        if (controlViewAnimator != null && controlViewAnimator.isRunning()) {
+            if (DEBUG) {
+                Log.d(TAG, "showAndAnimateControl: controlViewAnimator.isRunning");
+            }
+            controlViewAnimator.end();
+        }
+
+        if (drawableId == -1) {
+            if (binding.controlAnimationView.getVisibility() == View.VISIBLE) {
+                controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(
+                        binding.controlAnimationView,
+                        PropertyValuesHolder.ofFloat(View.ALPHA, 1.0f, 0.0f),
+                        PropertyValuesHolder.ofFloat(View.SCALE_X, 1.4f, 1.0f),
+                        PropertyValuesHolder.ofFloat(View.SCALE_Y, 1.4f, 1.0f)
+                ).setDuration(DEFAULT_CONTROLS_DURATION);
+                controlViewAnimator.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(final Animator animation) {
+                        binding.controlAnimationView.setVisibility(View.GONE);
+                    }
+                });
+                controlViewAnimator.start();
+            }
+            return;
+        }
+
+        final float scaleFrom = goneOnEnd ? 1f : 1f;
+        final float scaleTo = goneOnEnd ? 1.8f : 1.4f;
+        final float alphaFrom = goneOnEnd ? 1f : 0f;
+        final float alphaTo = goneOnEnd ? 0f : 1f;
+
+
+        controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(
+                binding.controlAnimationView,
+                PropertyValuesHolder.ofFloat(View.ALPHA, alphaFrom, alphaTo),
+                PropertyValuesHolder.ofFloat(View.SCALE_X, scaleFrom, scaleTo),
+                PropertyValuesHolder.ofFloat(View.SCALE_Y, scaleFrom, scaleTo)
+        );
+        controlViewAnimator.setDuration(goneOnEnd ? 1000 : 500);
+        controlViewAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(final Animator animation) {
+                binding.controlAnimationView.setVisibility(goneOnEnd ? View.GONE : View.VISIBLE);
+            }
+        });
+
+
+        binding.controlAnimationView.setVisibility(View.VISIBLE);
+        binding.controlAnimationView.setImageDrawable(
+                AppCompatResources.getDrawable(context, drawableId));
+        controlViewAnimator.start();
+    }
+
+    public void showControlsThenHide() {
+        if (DEBUG) {
+            Log.d(TAG, "showControlsThenHide() called");
+        }
+        showOrHideButtons();
+        showSystemUIPartially();
+
+        final int hideTime = binding.playbackControlRoot.isInTouchMode()
+                ? DEFAULT_CONTROLS_HIDE_TIME
+                : DPAD_CONTROLS_HIDE_TIME;
+
+        showHideShadow(true, DEFAULT_CONTROLS_DURATION);
+        animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0,
+                () -> hideControls(DEFAULT_CONTROLS_DURATION, hideTime));
+    }
+
+    public void showControls(final long duration) {
+        if (DEBUG) {
+            Log.d(TAG, "showControls() called");
+        }
+        showOrHideButtons();
+        showSystemUIPartially();
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        showHideShadow(true, duration);
+        animateView(binding.playbackControlRoot, true, duration);
+    }
+
+    public void hideControls(final long duration, final long delay) {
+        if (DEBUG) {
+            Log.d(TAG, "hideControls() called with: duration = [" + duration
+                    + "], delay = [" + delay + "]");
+        }
+
+        showOrHideButtons();
+
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        controlsVisibilityHandler.postDelayed(() -> {
+                    showHideShadow(false, duration);
+                    animateView(binding.playbackControlRoot, false, duration, 0,
+                            this::hideSystemUIIfNeeded);
+                }, delay);
+    }
+
+    private void showHideShadow(final boolean show, final long duration) {
+        animateView(binding.playerTopShadow, show, duration, 0, null);
+        animateView(binding.playerBottomShadow, show, duration, 0, null);
+    }
+
+    private void showOrHideButtons() {
+        if (playQueue == null) {
+            return;
+        }
+
+        final boolean showPrev = playQueue.getIndex() != 0;
+        final boolean showNext = playQueue.getIndex() + 1 != playQueue.getStreams().size();
+        final boolean showQueue = playQueue.getStreams().size() > 1 && !popupPlayerSelected();
+
+        binding.playPreviousButton.setVisibility(showPrev ? View.VISIBLE : View.INVISIBLE);
+        binding.playPreviousButton.setAlpha(showPrev ? 1.0f : 0.0f);
+        binding.playNextButton.setVisibility(showNext ? View.VISIBLE : View.INVISIBLE);
+        binding.playNextButton.setAlpha(showNext ? 1.0f : 0.0f);
+        binding.queueButton.setVisibility(showQueue ? View.VISIBLE : View.GONE);
+        binding.queueButton.setAlpha(showQueue ? 1.0f : 0.0f);
+    }
+
+    private void showSystemUIPartially() {
+        final AppCompatActivity activity = getParentActivity();
+        if (isFullscreen && activity != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
+                activity.getWindow().setNavigationBarColor(Color.TRANSPARENT);
+            }
+            final int visibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+            activity.getWindow().getDecorView().setSystemUiVisibility(visibility);
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+    }
+
+    private void hideSystemUIIfNeeded() {
+        if (fragmentListener != null) {
+            fragmentListener.hideSystemUiIfNeeded();
+        }
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback states
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    @Override // exoplayer listener
+    public void onPlayerStateChanged(final boolean playWhenReady, final int playbackState) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onPlayerStateChanged() called with: "
+                    + "playWhenReady = [" + playWhenReady + "], "
+                    + "playbackState = [" + playbackState + "]");
+        }
+
+        if (currentState == STATE_PAUSED_SEEK) {
+            if (DEBUG) {
+                Log.d(TAG, "ExoPlayer - onPlayerStateChanged() is currently blocked");
+            }
+            return;
+        }
+
+        switch (playbackState) {
+            case com.google.android.exoplayer2.Player.STATE_IDLE: // 1
+                isPrepared = false;
+                break;
+            case com.google.android.exoplayer2.Player.STATE_BUFFERING: // 2
+                if (isPrepared) {
+                    changeState(STATE_BUFFERING);
+                }
+                break;
+            case com.google.android.exoplayer2.Player.STATE_READY: //3
+                maybeUpdateCurrentMetadata();
+                maybeCorrectSeekPosition();
+                if (!isPrepared) {
+                    isPrepared = true;
+                    onPrepared(playWhenReady);
+                }
+                changeState(playWhenReady ? STATE_PLAYING : STATE_PAUSED);
+                break;
+            case com.google.android.exoplayer2.Player.STATE_ENDED: // 4
+                changeState(STATE_COMPLETED);
+                if (currentMetadata != null) {
+                    resetStreamProgressState(currentMetadata.getMetadata());
+                }
+                isPrepared = false;
+                break;
+        }
+    }
+
+    @Override // exoplayer listener
+    public void onLoadingChanged(final boolean isLoading) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onLoadingChanged() called with: "
+                    + "isLoading = [" + isLoading + "]");
+        }
+
+        if (!isLoading && currentState == STATE_PAUSED && isProgressLoopRunning()) {
+            stopProgressLoop();
+        } else if (isLoading && !isProgressLoopRunning()) {
+            startProgressLoop();
+        }
+
+        maybeUpdateCurrentMetadata();
+    }
+
+    @Override // own playback listener
+    public void onPlaybackBlock() {
+        if (exoPlayerIsNull()) {
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "Playback - onPlaybackBlock() called");
+        }
+
+        currentItem = null;
+        currentMetadata = null;
+        simpleExoPlayer.stop();
+        isPrepared = false;
+
+        changeState(STATE_BLOCKED);
+    }
+
+    @Override // own playback listener
+    public void onPlaybackUnblock(final MediaSource mediaSource) {
+        if (DEBUG) {
+            Log.d(TAG, "Playback - onPlaybackUnblock() called");
+        }
+
+        if (exoPlayerIsNull()) {
+            return;
+        }
+        if (currentState == STATE_BLOCKED) {
+            changeState(STATE_BUFFERING);
+        }
+        simpleExoPlayer.prepare(mediaSource);
+    }
+
+    public void changeState(final int state) {
+        if (DEBUG) {
+            Log.d(TAG, "changeState() called with: state = [" + state + "]");
+        }
+        currentState = state;
+        switch (state) {
+            case STATE_BLOCKED:
+                onBlocked();
+                break;
+            case STATE_PLAYING:
+                onPlaying();
+                break;
+            case STATE_BUFFERING:
+                onBuffering();
+                break;
+            case STATE_PAUSED:
+                onPaused();
+                break;
+            case STATE_PAUSED_SEEK:
+                onPausedSeek();
+                break;
+            case STATE_COMPLETED:
+                onCompleted();
+                break;
+        }
+        notifyPlaybackUpdateToListeners();
+    }
+
+    private void onPrepared(final boolean playWhenReady) {
+        if (DEBUG) {
+            Log.d(TAG, "onPrepared() called with: playWhenReady = [" + playWhenReady + "]");
+        }
+
+        binding.playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
+        binding.playbackEndTime.setText(getTimeString((int) simpleExoPlayer.getDuration()));
+        binding.playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
+
+        if (playWhenReady) {
+            audioReactor.requestAudioFocus();
+        }
+    }
+
+    private void onBlocked() {
+        if (DEBUG) {
+            Log.d(TAG, "onBlocked() called");
+        }
+        if (!isProgressLoopRunning()) {
+            startProgressLoop();
+        }
+
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        animateView(binding.playbackControlRoot, false, DEFAULT_CONTROLS_DURATION);
+
+        binding.playbackSeekBar.setEnabled(false);
+        binding.playbackSeekBar.getThumb()
+                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
+
+        binding.loadingPanel.setBackgroundColor(Color.BLACK);
+        animateView(binding.loadingPanel, true, 0);
+        animateView(binding.surfaceForeground, true, 100);
+
+        binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
+        animatePlayButtons(false, 100);
+        binding.getRoot().setKeepScreenOn(false);
+
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    private void onPlaying() {
+        if (DEBUG) {
+            Log.d(TAG, "onPlaying() called");
+        }
+        if (!isProgressLoopRunning()) {
+            startProgressLoop();
+        }
+
+        updateStreamRelatedViews();
+
+        showAndAnimateControl(-1, true);
+
+        binding.playbackSeekBar.setEnabled(true);
+        binding.playbackSeekBar.getThumb()
+                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
+
+        binding.loadingPanel.setVisibility(View.GONE);
+
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0,
+                () -> {
+                    binding.playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
+                    animatePlayButtons(true, 200);
+                    if (!isQueueVisible) {
+                        binding.playPauseButton.requestFocus();
+                    }
+                });
+
+        changePopupWindowFlags(ONGOING_PLAYBACK_WINDOW_FLAGS);
+        checkLandscape();
+        binding.getRoot().setKeepScreenOn(true);
+
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    private void onBuffering() {
+        if (DEBUG) {
+            Log.d(TAG, "onBuffering() called");
+        }
+        binding.loadingPanel.setBackgroundColor(Color.TRANSPARENT);
+
+        binding.getRoot().setKeepScreenOn(true);
+
+        if (NotificationUtil.getInstance().shouldUpdateBufferingSlot()) {
+            NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+        }
+    }
+
+    private void onPaused() {
+        if (DEBUG) {
+            Log.d(TAG, "onPaused() called");
+        }
+
+        if (isProgressLoopRunning()) {
+            stopProgressLoop();
+        }
+
+        showControls(400);
+        binding.loadingPanel.setVisibility(View.GONE);
+
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0,
+                () -> {
+                    binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
+                    animatePlayButtons(true, 200);
+                    if (!isQueueVisible) {
+                        binding.playPauseButton.requestFocus();
+                    }
+                });
+
+        changePopupWindowFlags(IDLE_WINDOW_FLAGS);
+
+        // Remove running notification when user does not want minimization to background or popup
+        if (PlayerHelper.isMinimizeOnExitDisabled(context) && videoPlayerSelected()) {
+            NotificationUtil.getInstance().cancelNotificationAndStopForeground(service);
+        } else {
+            NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+        }
+
+        binding.getRoot().setKeepScreenOn(false);
+    }
+
+    private void onPausedSeek() {
+        if (DEBUG) {
+            Log.d(TAG, "onPausedSeek() called");
+        }
+        showAndAnimateControl(-1, true);
+
+        animatePlayButtons(false, 100);
+        binding.getRoot().setKeepScreenOn(true);
+
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    private void onCompleted() {
+        if (DEBUG) {
+            Log.d(TAG, "onCompleted() called");
+        }
+
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0,
+                () -> {
+                    binding.playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
+                    animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
+                });
+
+        binding.getRoot().setKeepScreenOn(false);
+        changePopupWindowFlags(IDLE_WINDOW_FLAGS);
+
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+        if (isFullscreen) {
+            toggleFullscreen();
+        }
+
+        if (playQueue.getIndex() < playQueue.size() - 1) {
+            playQueue.offsetIndex(+1);
+        }
+        if (isProgressLoopRunning()) {
+            stopProgressLoop();
+        }
+
+        showControls(500);
+        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        binding.loadingPanel.setVisibility(View.GONE);
+        animateView(binding.surfaceForeground, true, 100);
+    }
+
+    private void animatePlayButtons(final boolean show, final int duration) {
+        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+
+        boolean showQueueButtons = show;
+        if (playQueue == null) {
+            showQueueButtons = false;
+        }
+
+        if (!showQueueButtons || playQueue.getIndex() > 0) {
+            animateView(
+                    binding.playPreviousButton,
+                    AnimationUtils.Type.SCALE_AND_ALPHA,
+                    showQueueButtons,
+                    duration);
+        }
+        if (!showQueueButtons || playQueue.getIndex() + 1 < playQueue.getStreams().size()) {
+            animateView(
+                    binding.playNextButton,
+                    AnimationUtils.Type.SCALE_AND_ALPHA,
+                    showQueueButtons,
+                    duration);
+        }
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Repeat and shuffle
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public void onRepeatClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onRepeatClicked() called");
+        }
+        setRepeatMode(nextRepeatMode(getRepeatMode()));
+    }
+
+    public void onShuffleClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onShuffleClicked() called");
+        }
+
+        if (exoPlayerIsNull()) {
+            return;
+        }
+        simpleExoPlayer.setShuffleModeEnabled(!simpleExoPlayer.getShuffleModeEnabled());
+    }
+
+    @RepeatMode
+    public int getRepeatMode() {
+        return exoPlayerIsNull() ? REPEAT_MODE_OFF : simpleExoPlayer.getRepeatMode();
+    }
+
+    private void setRepeatMode(@RepeatMode final int repeatMode) {
+        if (!exoPlayerIsNull()) {
+            simpleExoPlayer.setRepeatMode(repeatMode);
+        }
+    }
+
+    @Override
+    public void onRepeatModeChanged(@RepeatMode final int repeatMode) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onRepeatModeChanged() called with: "
+                    + "repeatMode = [" + repeatMode + "]");
+        }
+        setRepeatModeButton(binding.repeatButton, repeatMode);
+        onShuffleOrRepeatModeChanged();
+    }
+
+    @Override
+    public void onShuffleModeEnabledChanged(final boolean shuffleModeEnabled) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onShuffleModeEnabledChanged() called with: "
+                    + "mode = [" + shuffleModeEnabled + "]");
+        }
+
+        if (playQueue != null) {
+            if (shuffleModeEnabled) {
+                playQueue.shuffle();
+            } else {
+                playQueue.unshuffle();
+            }
+        }
+
+        setShuffleButton(binding.shuffleButton, shuffleModeEnabled);
+        onShuffleOrRepeatModeChanged();
+    }
+
+    private void onShuffleOrRepeatModeChanged() {
+        notifyPlaybackUpdateToListeners();
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    private void setRepeatModeButton(final ImageButton imageButton, final int repeatMode) {
+        switch (repeatMode) {
+            case REPEAT_MODE_OFF:
+                imageButton.setImageResource(R.drawable.exo_controls_repeat_off);
+                break;
+            case REPEAT_MODE_ONE:
+                imageButton.setImageResource(R.drawable.exo_controls_repeat_one);
+                break;
+            case REPEAT_MODE_ALL:
+                imageButton.setImageResource(R.drawable.exo_controls_repeat_all);
+                break;
+        }
+    }
+
+    private void setShuffleButton(final ImageButton button, final boolean shuffled) {
+        button.setImageAlpha(shuffled ? 255 : 77);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Mute / Unmute
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public void onMuteUnmuteButtonClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onMuteUnmuteButtonClicked() called");
+        }
+        simpleExoPlayer.setVolume(isMuted() ? 1 : 0);
+        notifyPlaybackUpdateToListeners();
+        setMuteButton(binding.switchMute, isMuted());
+    }
+
+    boolean isMuted() {
+        return !exoPlayerIsNull() && simpleExoPlayer.getVolume() == 0;
+    }
+
+    private void setMuteButton(final ImageButton button, final boolean isMuted) {
+        button.setImageDrawable(AppCompatResources.getDrawable(context, isMuted
+                ? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp));
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // ExoPlayer listeners (that didn't fit in other categories)
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    @Override
+    public void onTimelineChanged(@NonNull final Timeline timeline, final int reason) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onTimelineChanged() called with "
+                    + "timeline size = [" + timeline.getWindowCount() + "], "
+                    + "reason = [" + reason + "]");
+        }
+
+        maybeUpdateCurrentMetadata();
+        // force recreate notification to ensure seek bar is shown when preparation finishes
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, true);
+    }
+
+    @Override
+    public void onTracksChanged(@NonNull final TrackGroupArray trackGroups,
+                                @NonNull final TrackSelectionArray trackSelections) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onTracksChanged(), "
+                    + "track group size = " + trackGroups.length);
+        }
+        maybeUpdateCurrentMetadata();
+        onTextTracksChanged();
+    }
+
+    @Override
+    public void onPlaybackParametersChanged(@NonNull final PlaybackParameters playbackParameters) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - playbackParameters(), speed = [" + playbackParameters.speed
+                    + "], pitch = [" + playbackParameters.pitch + "]");
+        }
+        binding.playbackSpeed.setText(formatSpeed(playbackParameters.speed));
+    }
+
+    @Override
+    public void onPositionDiscontinuity(@DiscontinuityReason final int discontinuityReason) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onPositionDiscontinuity() called with "
+                    + "discontinuityReason = [" + discontinuityReason + "]");
+        }
+        if (playQueue == null) {
+            return;
+        }
+
+        // Refresh the playback if there is a transition to the next video
+        final int newWindowIndex = simpleExoPlayer.getCurrentWindowIndex();
+        switch (discontinuityReason) {
+            case DISCONTINUITY_REASON_PERIOD_TRANSITION:
+                // When player is in single repeat mode and a period transition occurs,
+                // we need to register a view count here since no metadata has changed
+                if (getRepeatMode() == REPEAT_MODE_ONE && newWindowIndex == playQueue.getIndex()) {
+                    registerStreamViewed();
+                    break;
+                }
+            case DISCONTINUITY_REASON_SEEK:
+            case DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
+            case DISCONTINUITY_REASON_INTERNAL:
+                if (playQueue.getIndex() != newWindowIndex) {
+                    resetStreamProgressState(playQueue.getItem());
+                    playQueue.setIndex(newWindowIndex);
+                }
+                break;
+            case DISCONTINUITY_REASON_AD_INSERTION:
+                break; // only makes Android Studio linter happy, as there are no ads
+        }
+
+        maybeUpdateCurrentMetadata();
+    }
+
+    @Override
+    public void onRenderedFirstFrame() {
+        //TODO check if this causes black screen when switching to fullscreen
+        animateView(binding.surfaceForeground, false, DEFAULT_CONTROLS_DURATION);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Errors
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+    /**
+     * Process exceptions produced by {@link com.google.android.exoplayer2.ExoPlayer ExoPlayer}.
+     * <p>There are multiple types of errors:</p>
+     * <ul>
+     * <li>{@link ExoPlaybackException#TYPE_SOURCE TYPE_SOURCE}</li>
+     * <li>{@link ExoPlaybackException#TYPE_UNEXPECTED TYPE_UNEXPECTED}:
+     * If a runtime error occurred, then we can try to recover it by restarting the playback
+     * after setting the timestamp recovery.</li>
+     * <li>{@link ExoPlaybackException#TYPE_RENDERER TYPE_RENDERER}:
+     * If the renderer failed, treat the error as unrecoverable.</li>
+     * </ul>
+     *
+     * @see #processSourceError(IOException)
+     * @see com.google.android.exoplayer2.Player.EventListener#onPlayerError(ExoPlaybackException)
+     */
+    @Override
+    public void onPlayerError(@NonNull final ExoPlaybackException error) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onPlayerError() called with: " + "error = [" + error + "]");
+        }
+        if (errorToast != null) {
+            errorToast.cancel();
+            errorToast = null;
+        }
+
+        saveStreamProgressState();
+
+        switch (error.type) {
+            case ExoPlaybackException.TYPE_SOURCE:
+                processSourceError(error.getSourceException());
+                showStreamError(error);
+                break;
+            case ExoPlaybackException.TYPE_UNEXPECTED:
+                showRecoverableError(error);
+                setRecovery();
+                reloadPlayQueueManager();
+                break;
+            case ExoPlaybackException.TYPE_OUT_OF_MEMORY:
+            case ExoPlaybackException.TYPE_REMOTE:
+            case ExoPlaybackException.TYPE_RENDERER:
+            default:
+                showUnrecoverableError(error);
+                onPlaybackShutdown();
+                break;
+        }
+
+        if (fragmentListener != null) {
+            fragmentListener.onPlayerError(error);
+        }
+    }
+
+    private void processSourceError(final IOException error) {
+        if (exoPlayerIsNull() || playQueue == null) {
+            return;
+        }
+        setRecovery();
+
+        if (error instanceof BehindLiveWindowException) {
+            reloadPlayQueueManager();
+        } else {
+            playQueue.error();
+        }
+    }
+
+    private void showStreamError(final Exception exception) {
+        exception.printStackTrace();
+
+        if (errorToast == null) {
+            errorToast = Toast
+                    .makeText(context, R.string.player_stream_failure, Toast.LENGTH_SHORT);
+            errorToast.show();
+        }
+    }
+
+    private void showRecoverableError(final Exception exception) {
+        exception.printStackTrace();
+
+        if (errorToast == null) {
+            errorToast = Toast
+                    .makeText(context, R.string.player_recoverable_failure, Toast.LENGTH_SHORT);
+            errorToast.show();
+        }
+    }
+
+    private void showUnrecoverableError(final Exception exception) {
+        exception.printStackTrace();
+
+        if (errorToast != null) {
+            errorToast.cancel();
+        }
+        errorToast = Toast
+                .makeText(context, R.string.player_unrecoverable_failure, Toast.LENGTH_SHORT);
+        errorToast.show();
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback position and seek
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    @Override // own playback listener (this is a getter)
+    public boolean isApproachingPlaybackEdge(final long timeToEndMillis) {
+        // If live, then not near playback edge
+        // If not playing, then not approaching playback edge
+        if (exoPlayerIsNull() || isLive() || !isPlaying()) {
+            return false;
+        }
+
+        final long currentPositionMillis = simpleExoPlayer.getCurrentPosition();
+        final long currentDurationMillis = simpleExoPlayer.getDuration();
+        return currentDurationMillis - currentPositionMillis < timeToEndMillis;
+    }
+
+    /**
+     * Checks if the current playback is a livestream AND is playing at or beyond the live edge.
+     *
+     * @return whether the livestream is playing at or beyond the edge
+     */
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    public boolean isLiveEdge() {
+        if (exoPlayerIsNull() || !isLive()) {
+            return false;
+        }
+
+        final Timeline currentTimeline = simpleExoPlayer.getCurrentTimeline();
+        final int currentWindowIndex = simpleExoPlayer.getCurrentWindowIndex();
+        if (currentTimeline.isEmpty() || currentWindowIndex < 0
+                || currentWindowIndex >= currentTimeline.getWindowCount()) {
+            return false;
+        }
+
+        final Timeline.Window timelineWindow = new Timeline.Window();
+        currentTimeline.getWindow(currentWindowIndex, timelineWindow);
+        return timelineWindow.getDefaultPositionMs() <= simpleExoPlayer.getCurrentPosition();
+    }
+
+    @Override // own playback listener
+    public void onPlaybackSynchronize(@NonNull final PlayQueueItem item) {
+        if (DEBUG) {
+            Log.d(TAG, "Playback - onPlaybackSynchronize() called with "
+                    + "item=[" + item.getTitle() + "], url=[" + item.getUrl() + "]");
+        }
+        if (exoPlayerIsNull() || playQueue == null) {
+            return;
+        }
+
+        final boolean onPlaybackInitial = currentItem == null;
+        final boolean hasPlayQueueItemChanged = currentItem != item;
+
+        final int currentPlayQueueIndex = playQueue.indexOf(item);
+        final int currentPlaylistIndex = simpleExoPlayer.getCurrentWindowIndex();
+        final int currentPlaylistSize = simpleExoPlayer.getCurrentTimeline().getWindowCount();
+
+        // If nothing to synchronize
+        if (!hasPlayQueueItemChanged) {
+            return;
+        }
+        currentItem = item;
+
+        // Check if on wrong window
+        if (currentPlayQueueIndex != playQueue.getIndex()) {
+            Log.e(TAG, "Playback - Play Queue may be desynchronized: item "
+                    + "index=[" + currentPlayQueueIndex + "], "
+                    + "queue index=[" + playQueue.getIndex() + "]");
+
+            // Check if bad seek position
+        } else if ((currentPlaylistSize > 0 && currentPlayQueueIndex >= currentPlaylistSize)
+                || currentPlayQueueIndex < 0) {
+            Log.e(TAG, "Playback - Trying to seek to invalid "
+                    + "index=[" + currentPlayQueueIndex + "] with "
+                    + "playlist length=[" + currentPlaylistSize + "]");
+
+        } else if (currentPlaylistIndex != currentPlayQueueIndex || onPlaybackInitial
+                || !isPlaying()) {
+            if (DEBUG) {
+                Log.d(TAG, "Playback - Rewinding to correct "
+                        + "index=[" + currentPlayQueueIndex + "], "
+                        + "from=[" + currentPlaylistIndex + "], "
+                        + "size=[" + currentPlaylistSize + "].");
+            }
+
+            if (item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
+                simpleExoPlayer.seekTo(currentPlayQueueIndex, item.getRecoveryPosition());
+                playQueue.unsetRecovery(currentPlayQueueIndex);
+            } else {
+                simpleExoPlayer.seekToDefaultPosition(currentPlayQueueIndex);
+            }
+        }
+    }
+
+    private void maybeCorrectSeekPosition() {
+        if (playQueue == null || exoPlayerIsNull() || currentMetadata == null) {
+            return;
+        }
+
+        final PlayQueueItem currentSourceItem = playQueue.getItem();
+        if (currentSourceItem == null) {
+            return;
+        }
+
+        final StreamInfo currentInfo = currentMetadata.getMetadata();
+        final long presetStartPositionMillis = currentInfo.getStartPosition() * 1000;
+        if (presetStartPositionMillis > 0L) {
+            // Has another start position?
+            if (DEBUG) {
+                Log.d(TAG, "Playback - Seeking to preset start "
+                        + "position=[" + presetStartPositionMillis + "]");
+            }
+            seekTo(presetStartPositionMillis);
+        }
+    }
+
+    public void seekTo(final long positionMillis) {
+        if (DEBUG) {
+            Log.d(TAG, "seekBy() called with: position = [" + positionMillis + "]");
+        }
+        if (!exoPlayerIsNull()) {
+            // prevent invalid positions when fast-forwarding/-rewinding
+            long normalizedPositionMillis = positionMillis;
+            if (normalizedPositionMillis < 0) {
+                normalizedPositionMillis = 0;
+            } else if (normalizedPositionMillis > simpleExoPlayer.getDuration()) {
+                normalizedPositionMillis = simpleExoPlayer.getDuration();
+            }
+
+            simpleExoPlayer.seekTo(normalizedPositionMillis);
+        }
+    }
+
+    private void seekBy(final long offsetMillis) {
+        if (DEBUG) {
+            Log.d(TAG, "seekBy() called with: offsetMillis = [" + offsetMillis + "]");
+        }
+        seekTo(simpleExoPlayer.getCurrentPosition() + offsetMillis);
+    }
+
+    public void seekToDefault() {
+        if (!exoPlayerIsNull()) {
+            simpleExoPlayer.seekToDefaultPosition();
+        }
+    }
+
+    @Override // exoplayer override
+    public void onSeekProcessed() {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
+        }
+        if (isPrepared) {
+            saveStreamProgressState();
+        }
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Player actions (play, pause, previous, fast-forward, ...)
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public void play() {
+        if (DEBUG) {
+            Log.d(TAG, "play() called");
+        }
+        if (audioReactor == null || playQueue == null || exoPlayerIsNull()) {
+            return;
+        }
+
+        audioReactor.requestAudioFocus();
+
+        if (currentState == STATE_COMPLETED) {
+            if (playQueue.getIndex() == 0) {
+                seekToDefault();
+            } else {
+                playQueue.setIndex(0);
+            }
+        }
+
+        simpleExoPlayer.setPlayWhenReady(true);
+        saveStreamProgressState();
+    }
+
+    public void pause() {
+        if (DEBUG) {
+            Log.d(TAG, "pause() called");
+        }
+        if (audioReactor == null || exoPlayerIsNull()) {
+            return;
+        }
+
+        audioReactor.abandonAudioFocus();
+        simpleExoPlayer.setPlayWhenReady(false);
+        saveStreamProgressState();
+    }
+
+    public void playPause() {
+        if (DEBUG) {
+            Log.d(TAG, "onPlayPause() called");
+        }
+
+        if (isPlaying()) {
+            pause();
+        } else {
+            play();
+        }
+    }
+
+    public void playPrevious() {
+        if (DEBUG) {
+            Log.d(TAG, "onPlayPrevious() called");
+        }
+        if (exoPlayerIsNull() || playQueue == null) {
+            return;
+        }
+
+        /* If current playback has run for PLAY_PREV_ACTIVATION_LIMIT_MILLIS milliseconds,
+         * restart current track. Also restart the track if the current track
+         * is the first in a queue.*/
+        if (simpleExoPlayer.getCurrentPosition() > PLAY_PREV_ACTIVATION_LIMIT_MILLIS
+                || playQueue.getIndex() == 0) {
+            seekToDefault();
+            playQueue.offsetIndex(0);
+        } else {
+            saveStreamProgressState();
+            playQueue.offsetIndex(-1);
+        }
+        triggerProgressUpdate();
+    }
+
+    public void playNext() {
+        if (DEBUG) {
+            Log.d(TAG, "onPlayNext() called");
+        }
+        if (playQueue == null) {
+            return;
+        }
+
+        saveStreamProgressState();
+        playQueue.offsetIndex(+1);
+        triggerProgressUpdate();
+    }
+
+    public void fastForward() {
+        if (DEBUG) {
+            Log.d(TAG, "fastRewind() called");
+        }
+        seekBy(retrieveSeekDurationFromPreferences(this));
+        triggerProgressUpdate();
+        showAndAnimateControl(R.drawable.ic_fast_forward_white_24dp, true);
+    }
+
+    public void fastRewind() {
+        if (DEBUG) {
+            Log.d(TAG, "fastRewind() called");
+        }
+        seekBy(-retrieveSeekDurationFromPreferences(this));
+        triggerProgressUpdate();
+        showAndAnimateControl(R.drawable.ic_fast_rewind_white_24dp, true);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // StreamInfo history: views and progress
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void registerStreamViewed() {
+        if (currentMetadata != null) {
+            databaseUpdateDisposable.add(recordManager.onViewed(currentMetadata.getMetadata())
+                    .onErrorComplete().subscribe());
+        }
+    }
+
+    private void saveStreamProgressState(final StreamInfo info, final long progress) {
+        if (info == null) {
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "saveStreamProgressState() called");
+        }
+        if (prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) {
+            final Disposable stateSaver = recordManager.saveStreamState(info, progress)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doOnError((e) -> {
+                        if (DEBUG) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .onErrorComplete()
+                    .subscribe();
+            databaseUpdateDisposable.add(stateSaver);
+        }
+    }
+
+    private void resetStreamProgressState(final PlayQueueItem queueItem) {
+        if (queueItem == null) {
+            return;
+        }
+        if (prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) {
+            final Disposable stateSaver = queueItem.getStream()
+                    .flatMapCompletable(info -> recordManager.saveStreamState(info, 0))
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doOnError((e) -> {
+                        if (DEBUG) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .onErrorComplete()
+                    .subscribe();
+            databaseUpdateDisposable.add(stateSaver);
+        }
+    }
+
+    private void resetStreamProgressState(final StreamInfo info) {
+        saveStreamProgressState(info, 0);
+    }
+
+    public void saveStreamProgressState() {
+        if (exoPlayerIsNull() || currentMetadata == null) {
+            return;
+        }
+        final StreamInfo currentInfo = currentMetadata.getMetadata();
+        if (playQueue != null) {
+            // Save current position. It will help to restore this position once a user
+            // wants to play prev or next stream from the queue
+            playQueue.setRecovery(playQueue.getIndex(), simpleExoPlayer.getContentPosition());
+        }
+        saveStreamProgressState(currentInfo, simpleExoPlayer.getCurrentPosition());
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Metadata
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+        final StreamInfo info = tag.getMetadata();
+        if (DEBUG) {
+            Log.d(TAG, "Playback - onMetadataChanged() called, playing: " + info.getName());
+        }
+
+        initThumbnail(info.getThumbnailUrl());
+        registerStreamViewed();
+        updateStreamRelatedViews();
+        showHideKodiButton();
+
+        binding.titleTextView.setText(tag.getMetadata().getName());
+        binding.channelTextView.setText(tag.getMetadata().getUploaderName());
+
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+        notifyMetadataUpdateToListeners();
+    }
+
+    private void maybeUpdateCurrentMetadata() {
+        if (exoPlayerIsNull()) {
+            return;
+        }
+
+        final MediaSourceTag metadata;
+        try {
+            metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
+        } catch (IndexOutOfBoundsException | ClassCastException error) {
+            if (DEBUG) {
+                Log.d(TAG, "Could not update metadata: " + error.getMessage());
+                error.printStackTrace();
+            }
+            return;
+        }
+
+        if (metadata == null) {
+            return;
+        }
+        maybeAutoQueueNextStream(metadata);
+
+        if (currentMetadata == metadata) {
+            return;
+        }
+        currentMetadata = metadata;
+        onMetadataChanged(metadata);
+    }
+
+    @NonNull
+    private String getVideoUrl() {
+        return currentMetadata == null
+                ? context.getString(R.string.unknown_content)
+                : currentMetadata.getMetadata().getUrl();
+    }
+
+    @NonNull
+    public String getVideoTitle() {
+        return currentMetadata == null
+                ? context.getString(R.string.unknown_content)
+                : currentMetadata.getMetadata().getName();
+    }
+
+    @NonNull
+    public String getUploaderName() {
+        return currentMetadata == null
+                ? context.getString(R.string.unknown_content)
+                : currentMetadata.getMetadata().getUploaderName();
+    }
+
+    @Nullable
+    public Bitmap getThumbnail() {
+        return currentThumbnail == null
+                ? BitmapFactory.decodeResource(context.getResources(), R.drawable.dummy_thumbnail)
+                : currentThumbnail;
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Play queue and streams
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void maybeAutoQueueNextStream(@NonNull final MediaSourceTag metadata) {
+        if (playQueue == null || playQueue.getIndex() != playQueue.size() - 1
+                || getRepeatMode() != REPEAT_MODE_OFF
+                || !PlayerHelper.isAutoQueueEnabled(context)) {
+            return;
+        }
+        // auto queue when starting playback on the last item when not repeating
+        final PlayQueue autoQueue = PlayerHelper.autoQueueOf(metadata.getMetadata(),
+                playQueue.getStreams());
+        if (autoQueue != null) {
+            playQueue.append(autoQueue.getStreams());
+        }
+    }
+
+    public void selectQueueItem(final PlayQueueItem item) {
+        if (playQueue == null || exoPlayerIsNull()) {
+            return;
+        }
+
+        final int index = playQueue.indexOf(item);
+        if (index == -1) {
+            return;
+        }
+
+        if (playQueue.getIndex() == index && simpleExoPlayer.getCurrentWindowIndex() == index) {
+            seekToDefault();
+        } else {
+            saveStreamProgressState();
+        }
+        playQueue.setIndex(index);
+    }
+
+    @Override
+    public void onPlayQueueEdited() {
+        notifyPlaybackUpdateToListeners();
+        showOrHideButtons();
+        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+    }
+
+    private void onQueueClicked() {
+        isQueueVisible = true;
+
+        hideSystemUIIfNeeded();
+        buildQueue();
+        //updatePlaybackButtons();//TODO verify this can be removed
+
+        hideControls(0, 0);
+        binding.playQueuePanel.requestFocus();
+        animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, true,
+                DEFAULT_CONTROLS_DURATION);
+
+        binding.playQueue.scrollToPosition(playQueue.getIndex());
+    }
+
+    private void buildQueue() {
+        binding.playQueue.setAdapter(playQueueAdapter);
+        binding.playQueue.setClickable(true);
+        binding.playQueue.setLongClickable(true);
+
+        binding.playQueue.clearOnScrollListeners();
+        binding.playQueue.addOnScrollListener(getQueueScrollListener());
+
+        itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
+        itemTouchHelper.attachToRecyclerView(binding.playQueue);
+
+        playQueueAdapter.setSelectedListener(getOnSelectedListener());
+
+        binding.playQueueClose.setOnClickListener(view -> closeQueue());
+    }
+
+    public void closeQueue() {
+        if (isQueueVisible) {
+            isQueueVisible = false;
+            animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, false,
+                    DEFAULT_CONTROLS_DURATION, 0, () -> {
+                        // Even when queueLayout is GONE it receives touch events
+                        // and ruins normal behavior of the app. This line fixes it
+                        binding.playQueuePanel.setTranslationY(
+                                -binding.playQueuePanel.getHeight() * 5);
+                    });
+            binding.playPauseButton.requestFocus();
+        }
+    }
+
+    private OnScrollBelowItemsListener getQueueScrollListener() {
+        return new OnScrollBelowItemsListener() {
+            @Override
+            public void onScrolledDown(final RecyclerView recyclerView) {
+                if (playQueue != null && !playQueue.isComplete()) {
+                    playQueue.fetch();
+                } else if (binding != null) {
+                    binding.playQueue.clearOnScrollListeners();
+                }
+            }
+        };
+    }
+
+    private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
+        return new PlayQueueItemTouchCallback() {
+            @Override
+            public void onMove(final int sourceIndex, final int targetIndex) {
+                if (playQueue != null) {
+                    playQueue.move(sourceIndex, targetIndex);
+                }
+            }
+
+            @Override
+            public void onSwiped(final int index) {
+                if (index != -1) {
+                    playQueue.remove(index);
+                }
+            }
+        };
+    }
+
+    private PlayQueueItemBuilder.OnSelectedListener getOnSelectedListener() {
+        return new PlayQueueItemBuilder.OnSelectedListener() {
+            @Override
+            public void selected(final PlayQueueItem item, final View view) {
+                selectQueueItem(item);
+            }
+
+            @Override
+            public void held(final PlayQueueItem item, final View view) {
+                final int index = playQueue.indexOf(item);
+                if (index != -1) {
+                    playQueue.remove(index);
+                }
+            }
+
+            @Override
+            public void onStartDrag(final PlayQueueItemHolder viewHolder) {
+                if (itemTouchHelper != null) {
+                    itemTouchHelper.startDrag(viewHolder);
+                }
+            }
+        };
+    }
+
+    @Override // own playback listener
+    @Nullable
+    public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
+        return (isAudioOnly ? audioResolver : videoResolver).resolve(info);
+    }
+
+    public void disablePreloadingOfCurrentTrack() {
+        loadController.disablePreloadingOfCurrentTrack();
+    }
+
+    @Nullable
+    public VideoStream getSelectedVideoStream() {
+        return (selectedStreamIndex >= 0 && availableStreams != null
+                && availableStreams.size() > selectedStreamIndex)
+                ? availableStreams.get(selectedStreamIndex) : null;
+    }
+
+    private void updateStreamRelatedViews() {
+        if (currentMetadata == null) {
+            return;
+        }
+        final StreamInfo info = currentMetadata.getMetadata();
+
+        binding.qualityTextView.setVisibility(View.GONE);
+        binding.playbackSpeed.setVisibility(View.GONE);
+
+        binding.playbackEndTime.setVisibility(View.GONE);
+        binding.playbackLiveSync.setVisibility(View.GONE);
+
+        switch (info.getStreamType()) {
+            case AUDIO_STREAM:
+                binding.surfaceView.setVisibility(View.GONE);
+                binding.endScreen.setVisibility(View.VISIBLE);
+                binding.playbackEndTime.setVisibility(View.VISIBLE);
+                break;
+
+            case AUDIO_LIVE_STREAM:
+                binding.surfaceView.setVisibility(View.GONE);
+                binding.endScreen.setVisibility(View.VISIBLE);
+                binding.playbackLiveSync.setVisibility(View.VISIBLE);
+                break;
+
+            case LIVE_STREAM:
+                binding.surfaceView.setVisibility(View.VISIBLE);
+                binding.endScreen.setVisibility(View.GONE);
+                binding.playbackLiveSync.setVisibility(View.VISIBLE);
+                break;
+
+            case VIDEO_STREAM:
+                if (info.getVideoStreams().size() + info.getVideoOnlyStreams().size() == 0) {
+                    break;
+                }
+
+                availableStreams = currentMetadata.getSortedAvailableVideoStreams();
+                selectedStreamIndex = currentMetadata.getSelectedVideoStreamIndex();
+                buildQualityMenu();
+
+                binding.qualityTextView.setVisibility(View.VISIBLE);
+                binding.surfaceView.setVisibility(View.VISIBLE);
+            default:
+                binding.endScreen.setVisibility(View.GONE);
+                binding.playbackEndTime.setVisibility(View.VISIBLE);
+                break;
+        }
+
+        buildPlaybackSpeedMenu();
+        binding.playbackSpeed.setVisibility(View.VISIBLE);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Popup menus ("popup" means that they pop up, not that they belong to the popup player)
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void buildQualityMenu() {
+        if (qualityPopupMenu == null) {
+            return;
+        }
+        qualityPopupMenu.getMenu().removeGroup(POPUP_MENU_ID_QUALITY);
+
+        for (int i = 0; i < availableStreams.size(); i++) {
+            final VideoStream videoStream = availableStreams.get(i);
+            qualityPopupMenu.getMenu().add(POPUP_MENU_ID_QUALITY, i, Menu.NONE, MediaFormat
+                    .getNameById(videoStream.getFormatId()) + " " + videoStream.resolution);
+        }
+        if (getSelectedVideoStream() != null) {
+            binding.qualityTextView.setText(getSelectedVideoStream().resolution);
+        }
+        qualityPopupMenu.setOnMenuItemClickListener(this);
+        qualityPopupMenu.setOnDismissListener(this);
+    }
+
+    private void buildPlaybackSpeedMenu() {
+        if (playbackSpeedPopupMenu == null) {
+            return;
+        }
+        playbackSpeedPopupMenu.getMenu().removeGroup(POPUP_MENU_ID_PLAYBACK_SPEED);
+
+        for (int i = 0; i < PLAYBACK_SPEEDS.length; i++) {
+            playbackSpeedPopupMenu.getMenu().add(POPUP_MENU_ID_PLAYBACK_SPEED, i, Menu.NONE,
+                    formatSpeed(PLAYBACK_SPEEDS[i]));
+        }
+        binding.playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
+        playbackSpeedPopupMenu.setOnMenuItemClickListener(this);
+        playbackSpeedPopupMenu.setOnDismissListener(this);
+    }
+
+    private void buildCaptionMenu(final List<String> availableLanguages) {
+        if (captionPopupMenu == null) {
+            return;
+        }
+        captionPopupMenu.getMenu().removeGroup(POPUP_MENU_ID_CAPTION);
+
+        final String userPreferredLanguage =
+                prefs.getString(context.getString(R.string.caption_user_set_key), null);
+        /*
+         * only search for autogenerated cc as fallback
+         * if "(auto-generated)" was not already selected
+         * we are only looking for "(" instead of "(auto-generated)" to hopefully get all
+         * internationalized variants such as "(automatisch-erzeugt)" and so on
+         */
+        boolean searchForAutogenerated = userPreferredLanguage != null
+                && !userPreferredLanguage.contains("(");
+
+        // Add option for turning off caption
+        final MenuItem captionOffItem = captionPopupMenu.getMenu().add(POPUP_MENU_ID_CAPTION,
+                0, Menu.NONE, R.string.caption_none);
+        captionOffItem.setOnMenuItemClickListener(menuItem -> {
+            final int textRendererIndex = getCaptionRendererIndex();
+            if (textRendererIndex != RENDERER_UNAVAILABLE) {
+                trackSelector.setParameters(trackSelector.buildUponParameters()
+                        .setRendererDisabled(textRendererIndex, true));
+            }
+            prefs.edit().remove(context.getString(R.string.caption_user_set_key)).apply();
+            return true;
+        });
+
+        // Add all available captions
+        for (int i = 0; i < availableLanguages.size(); i++) {
+            final String captionLanguage = availableLanguages.get(i);
+            final MenuItem captionItem = captionPopupMenu.getMenu().add(POPUP_MENU_ID_CAPTION,
+                    i + 1, Menu.NONE, captionLanguage);
+            captionItem.setOnMenuItemClickListener(menuItem -> {
+                final int textRendererIndex = getCaptionRendererIndex();
+                if (textRendererIndex != RENDERER_UNAVAILABLE) {
+                    trackSelector.setPreferredTextLanguage(captionLanguage);
+                    trackSelector.setParameters(trackSelector.buildUponParameters()
+                            .setRendererDisabled(textRendererIndex, false));
+                    prefs.edit().putString(context.getString(R.string.caption_user_set_key),
+                            captionLanguage).apply();
+                }
+                return true;
+            });
+            // apply caption language from previous user preference
+            if (userPreferredLanguage != null
+                    && (captionLanguage.equals(userPreferredLanguage)
+                    || (searchForAutogenerated && captionLanguage.startsWith(userPreferredLanguage))
+                    || (userPreferredLanguage.contains("(") && captionLanguage.startsWith(
+                    userPreferredLanguage.substring(0, userPreferredLanguage.indexOf('(')))))) {
+                final int textRendererIndex = getCaptionRendererIndex();
+                if (textRendererIndex != RENDERER_UNAVAILABLE) {
+                    trackSelector.setPreferredTextLanguage(captionLanguage);
+                    trackSelector.setParameters(trackSelector.buildUponParameters()
+                            .setRendererDisabled(textRendererIndex, false));
+                }
+                searchForAutogenerated = false;
+            }
+        }
+        captionPopupMenu.setOnDismissListener(this);
+    }
+
+    /**
+     * Called when an item of the quality selector or the playback speed selector is selected.
+     */
+    @Override
+    public boolean onMenuItemClick(final MenuItem menuItem) {
+        if (DEBUG) {
+            Log.d(TAG, "onMenuItemClick() called with: "
+                    + "menuItem = [" + menuItem + "], "
+                    + "menuItem.getItemId = [" + menuItem.getItemId() + "]");
+        }
+
+        if (menuItem.getGroupId() == POPUP_MENU_ID_QUALITY) {
+            final int menuItemIndex = menuItem.getItemId();
+            if (selectedStreamIndex == menuItemIndex || availableStreams == null
+                    || availableStreams.size() <= menuItemIndex) {
+                return true;
+            }
+
+            saveStreamProgressState(); //TODO added, check if good
+            final String newResolution = availableStreams.get(menuItemIndex).resolution;
+            setRecovery();
+            setPlaybackQuality(newResolution);
+            reloadPlayQueueManager();
+
+            binding.qualityTextView.setText(menuItem.getTitle());
+            return true;
+        } else if (menuItem.getGroupId() == POPUP_MENU_ID_PLAYBACK_SPEED) {
+            final int speedIndex = menuItem.getItemId();
+            final float speed = PLAYBACK_SPEEDS[speedIndex];
+
+            setPlaybackSpeed(speed);
+            binding.playbackSpeed.setText(formatSpeed(speed));
+        }
+
+        return false;
+    }
+
+    /**
+     * Called when some popup menu is dismissed.
+     */
+    @Override
+    public void onDismiss(final PopupMenu menu) {
+        if (DEBUG) {
+            Log.d(TAG, "onDismiss() called with: menu = [" + menu + "]");
+        }
+        isSomePopupMenuVisible = false; //TODO check if this works
+        if (getSelectedVideoStream() != null) {
+            binding.qualityTextView.setText(getSelectedVideoStream().resolution);
+        }
+        if (isPlaying()) {
+            hideControls(DEFAULT_CONTROLS_DURATION, 0);
+            hideSystemUIIfNeeded();
+        }
+    }
+
+    private void onQualitySelectorClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onQualitySelectorClicked() called");
+        }
+        qualityPopupMenu.show();
+        isSomePopupMenuVisible = true;
+
+        final VideoStream videoStream = getSelectedVideoStream();
+        if (videoStream != null) {
+            final String qualityText = MediaFormat.getNameById(videoStream.getFormatId()) + " "
+                    + videoStream.resolution;
+            binding.qualityTextView.setText(qualityText);
+        }
+
+        saveWasPlaying();
+    }
+
+    private void onPlaybackSpeedClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onPlaybackSpeedClicked() called");
+        }
+        if (videoPlayerSelected()) {
+            PlaybackParameterDialog.newInstance(getPlaybackSpeed(), getPlaybackPitch(),
+                    getPlaybackSkipSilence(), this::setPlaybackParameters)
+                    .show(getParentActivity().getSupportFragmentManager(), null);
+        } else {
+            playbackSpeedPopupMenu.show();
+            isSomePopupMenuVisible = true;
+        }
+    }
+
+    private void onCaptionClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onCaptionClicked() called");
+        }
+        captionPopupMenu.show();
+        isSomePopupMenuVisible = true;
+    }
+
+    private void setPlaybackQuality(final String quality) {
+        videoResolver.setPlaybackQuality(quality);
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Captions (text tracks)
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void setupSubtitleView() {
+        final float captionScale = PlayerHelper.getCaptionScale(context);
+        final CaptionStyleCompat captionStyle = PlayerHelper.getCaptionStyle(context);
+        if (popupPlayerSelected()) {
+            final float captionRatio = (captionScale - 1.0f) / 5.0f + 1.0f;
+            binding.subtitleView.setFractionalTextSize(
+                    SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * captionRatio);
+        } else {
+            final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+            final int minimumLength = Math.min(metrics.heightPixels, metrics.widthPixels);
+            final float captionRatioInverse = 20f + 4f * (1.0f - captionScale);
+            binding.subtitleView.setFixedTextSize(
+                    TypedValue.COMPLEX_UNIT_PX, (float) minimumLength / captionRatioInverse);
+        }
+        binding.subtitleView.setApplyEmbeddedStyles(captionStyle == CaptionStyleCompat.DEFAULT);
+        binding.subtitleView.setStyle(captionStyle);
+    }
+
+    private void onTextTracksChanged() {
+        final int textRenderer = getCaptionRendererIndex();
+
+        if (binding == null) {
+            return;
+        }
+        if (trackSelector.getCurrentMappedTrackInfo() == null
+                || textRenderer == RENDERER_UNAVAILABLE) {
+            binding.captionTextView.setVisibility(View.GONE);
+            return;
+        }
+
+        final TrackGroupArray textTracks = trackSelector.getCurrentMappedTrackInfo()
+                .getTrackGroups(textRenderer);
+
+        // Extract all loaded languages
+        final List<String> availableLanguages = new ArrayList<>(textTracks.length);
+        for (int i = 0; i < textTracks.length; i++) {
+            final TrackGroup textTrack = textTracks.get(i);
+            if (textTrack.length > 0 && textTrack.getFormat(0) != null) {
+                availableLanguages.add(textTrack.getFormat(0).language);
+            }
+        }
+
+        // Normalize mismatching language strings
+        final String preferredLanguage = trackSelector.getPreferredTextLanguage();
+        // Build UI
+        buildCaptionMenu(availableLanguages);
+        if (trackSelector.getParameters().getRendererDisabled(textRenderer)
+                || preferredLanguage == null || (!availableLanguages.contains(preferredLanguage)
+                && !containsCaseInsensitive(availableLanguages, preferredLanguage))) {
+            binding.captionTextView.setText(R.string.caption_none);
+        } else {
+            binding.captionTextView.setText(preferredLanguage);
+        }
+        binding.captionTextView.setVisibility(
+                availableLanguages.isEmpty() ? View.GONE : View.VISIBLE);
+    }
+
+    private int getCaptionRendererIndex() {
+        if (exoPlayerIsNull()) {
+            return RENDERER_UNAVAILABLE;
+        }
+
+        for (int t = 0; t < simpleExoPlayer.getRendererCount(); t++) {
+            if (simpleExoPlayer.getRendererType(t) == C.TRACK_TYPE_TEXT) {
+                return t;
+            }
+        }
+
+        return RENDERER_UNAVAILABLE;
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Click listeners
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    @Override
+    public void onClick(final View v) {
+        if (DEBUG) {
+            Log.d(TAG, "onClick() called with: v = [" + v + "]");
+        }
+        if (v.getId() == binding.qualityTextView.getId()) {
+            onQualitySelectorClicked();
+        } else if (v.getId() == binding.playbackSpeed.getId()) {
+            onPlaybackSpeedClicked();
+        } else if (v.getId() == binding.resizeTextView.getId()) {
+            onResizeClicked();
+        } else if (v.getId() == binding.captionTextView.getId()) {
+            onCaptionClicked();
+        } else if (v.getId() == binding.playbackLiveSync.getId()) {
+            seekToDefault();
+        } else if (v.getId() == binding.playPauseButton.getId()) {
+            playPause();
+        } else if (v.getId() == binding.playPreviousButton.getId()) {
+            playPrevious();
+        } else if (v.getId() == binding.playNextButton.getId()) {
+            playNext();
+        } else if (v.getId() == binding.queueButton.getId()) {
+            onQueueClicked();
+            return;
+        } else if (v.getId() == binding.repeatButton.getId()) {
+            onRepeatClicked();
+            return;
+        } else if (v.getId() == binding.shuffleButton.getId()) {
+            onShuffleClicked();
+            return;
+        } else if (v.getId() == binding.moreOptionsButton.getId()) {
+            onMoreOptionsClicked();
+        } else if (v.getId() == binding.share.getId()) {
+            onShareClicked();
+        } else if (v.getId() == binding.playWithKodi.getId()) {
+            onPlayWithKodiClicked();
+        } else if (v.getId() == binding.openInBrowser.getId()) {
+            onOpenInBrowserClicked();
+        } else if (v.getId() == binding.fullScreenButton.getId()) {
+            setRecovery();
+            NavigationHelper.playOnMainPlayer(context, playQueue, true);
+            return;
+        } else if (v.getId() == binding.screenRotationButton.getId()) {
+            // Only if it's not a vertical video or vertical video but in landscape with locked
+            // orientation a screen orientation can be changed automatically
+            if (!isVerticalVideo
+                    || (service.isLandscape() && globalScreenOrientationLocked(context))) {
+                fragmentListener.onScreenRotationButtonClicked();
+            } else {
+                toggleFullscreen();
+            }
+        } else if (v.getId() == binding.switchMute.getId()) {
+            onMuteUnmuteButtonClicked();
+        } else if (v.getId() == binding.playerCloseButton.getId()) {
+            context.sendBroadcast(new Intent(VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER));
+        }
+
+        if (currentState != STATE_COMPLETED) {
+            controlsVisibilityHandler.removeCallbacksAndMessages(null);
+            showHideShadow(true, DEFAULT_CONTROLS_DURATION);
+            animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0, () -> {
+                if (currentState == STATE_PLAYING && !isSomePopupMenuVisible) {
+                    if (v.getId() == binding.playPauseButton.getId()
+                            // Hide controls in fullscreen immediately
+                            || (v.getId() == binding.screenRotationButton.getId()
+                            && isFullscreen)) {
+                        hideControls(0, 0);
+                    } else {
+                        hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean onLongClick(final View v) {
+        if (v.getId() == binding.moreOptionsButton.getId() && isFullscreen) {
+            fragmentListener.onMoreOptionsLongClicked();
+            hideControls(0, 0);
+            hideSystemUIIfNeeded();
+        }
+        return true;
+    }
+
+    public boolean onKeyDown(final int keyCode) {
+        switch (keyCode) {
+            default:
+                break;
+            case KeyEvent.KEYCODE_SPACE:
+                if (isFullscreen) {
+                    playPause();
+                }
+                break;
+            case KeyEvent.KEYCODE_BACK:
+                if (DeviceUtils.isTv(context) && isControlsVisible()) {
+                    hideControls(0, 0);
+                    return true;
+                }
+                break;
+            case KeyEvent.KEYCODE_DPAD_UP:
+            case KeyEvent.KEYCODE_DPAD_LEFT:
+            case KeyEvent.KEYCODE_DPAD_DOWN:
+            case KeyEvent.KEYCODE_DPAD_RIGHT:
+            case KeyEvent.KEYCODE_DPAD_CENTER:
+                if (binding.getRoot().hasFocus() && !binding.playbackControlRoot.hasFocus()) {
+                    // do not interfere with focus in playlist etc.
+                    return false;
+                }
+
+                if (currentState == Player.STATE_BLOCKED) {
+                    return true;
+                }
+
+                if (!isControlsVisible()) {
+                    if (!isQueueVisible) {
+                        binding.playPauseButton.requestFocus();
+                    }
+                    showControlsThenHide();
+                    showSystemUIPartially();
+                    return true;
+                } else {
+                    hideControls(DEFAULT_CONTROLS_DURATION, DPAD_CONTROLS_HIDE_TIME);
+                }
+                break;
+        }
+
+        return false;
+    }
+
+    private void onMoreOptionsClicked() {
+        if (DEBUG) {
+            Log.d(TAG, "onMoreOptionsClicked() called");
+        }
+
+        final boolean isMoreControlsVisible =
+                binding.secondaryControls.getVisibility() == View.VISIBLE;
+
+        animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION,
+                isMoreControlsVisible ? 0 : 180);
+        animateView(binding.secondaryControls, SLIDE_AND_ALPHA, !isMoreControlsVisible,
+                DEFAULT_CONTROLS_DURATION, 0,
+                () -> {
+                    // Fix for a ripple effect on background drawable.
+                    // When view returns from GONE state it takes more milliseconds than returning
+                    // from INVISIBLE state. And the delay makes ripple background end to fast
+                    if (isMoreControlsVisible) {
+                        binding.secondaryControls.setVisibility(View.INVISIBLE);
+                    }
+                });
+        showControls(DEFAULT_CONTROLS_DURATION);
+    }
+
+    private void onShareClicked() {
+        // share video at the current time (youtube.com/watch?v=ID&t=SECONDS)
+        // Timestamp doesn't make sense in a live stream so drop it
+
+        final int ts = binding.playbackSeekBar.getProgress() / 1000;
+        String videoUrl = getVideoUrl();
+        if (!isLive() && ts >= 0 && currentMetadata != null
+                && currentMetadata.getMetadata().getServiceId() == YouTube.getServiceId()) {
+            videoUrl += ("&t=" + ts);
+        }
+        ShareUtils.shareUrl(context, getVideoTitle(), videoUrl);
+    }
+
+    private void onPlayWithKodiClicked() {
+        if (currentMetadata != null) {
+            pause();
+            try {
+                NavigationHelper.playWithKore(context, Uri.parse(getVideoUrl()));
+            } catch (final Exception e) {
+                if (DEBUG) {
+                    Log.i(TAG, "Failed to start kore", e);
+                }
+                KoreUtil.showInstallKoreDialog(getParentActivity());
+            }
+        }
+    }
+
+    private void onOpenInBrowserClicked() {
+        if (currentMetadata != null) {
+            ShareUtils.openUrlInBrowser(getParentActivity(),
+                    currentMetadata.getMetadata().getOriginalUrl());
+        }
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Video size, resize, orientation, fullscreen
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    private void setupScreenRotationButton() {
+        binding.screenRotationButton.setVisibility(videoPlayerSelected()
+                && (globalScreenOrientationLocked(context) || isVerticalVideo
+                        || DeviceUtils.isTablet(context))
+                ? View.VISIBLE : View.GONE);
+        binding.screenRotationButton.setImageDrawable(AppCompatResources.getDrawable(context,
+                isFullscreen ? R.drawable.ic_fullscreen_exit_white_24dp
+                : R.drawable.ic_fullscreen_white_24dp));
+    }
+
+    private void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
+        binding.surfaceView.setResizeMode(resizeMode);
+        binding.resizeTextView.setText(PlayerHelper.resizeTypeOf(context, resizeMode));
+    }
+
+    void onResizeClicked() {
+        if (binding != null) {
+            setResizeMode(nextResizeModeAndSaveToPrefs(this, binding.surfaceView.getResizeMode()));
+        }
+    }
+
+    @Override // exoplayer listener
+    public void onVideoSizeChanged(final int width, final int height,
+                                   final int unappliedRotationDegrees,
+                                   final float pixelWidthHeightRatio) {
+        if (DEBUG) {
+            Log.d(TAG, "onVideoSizeChanged() called with: "
+                    + "width / height = [" + width + " / " + height
+                    + " = " + (((float) width) / height) + "], "
+                    + "unappliedRotationDegrees = [" + unappliedRotationDegrees + "], "
+                    + "pixelWidthHeightRatio = [" + pixelWidthHeightRatio + "]");
+        }
+
+        binding.surfaceView.setAspectRatio(((float) width) / height);
+        isVerticalVideo = width < height;
+
+        if (globalScreenOrientationLocked(context)
+                && isFullscreen
+                && service.isLandscape() == isVerticalVideo
+                && !DeviceUtils.isTv(context)
+                && !DeviceUtils.isTablet(context)
+                && fragmentListener != null) {
+            // set correct orientation
+            fragmentListener.onScreenRotationButtonClicked();
+        }
+
+        setupScreenRotationButton();
+    }
+
+    public void toggleFullscreen() {
+        if (DEBUG) {
+            Log.d(TAG, "toggleFullscreen() called");
+        }
+        if (popupPlayerSelected() || exoPlayerIsNull() || currentMetadata == null
+                || fragmentListener == null) {
+            return;
+        }
+        //changeState(STATE_BLOCKED); TODO check what this does
+
+        isFullscreen = !isFullscreen;
+        if (!isFullscreen) {
+            // Apply window insets because Android will not do it when orientation changes
+            // from landscape to portrait (open vertical video to reproduce)
+            binding.playbackControlRoot.setPadding(0, 0, 0, 0);
+        } else {
+            // Android needs tens milliseconds to send new insets but a user is able to see
+            // how controls changes it's position from `0` to `nav bar height` padding.
+            // So just hide the controls to hide this visual inconsistency
+            hideControls(0, 0);
+        }
+        fragmentListener.onFullscreenStateChanged(isFullscreen);
+
+        if (isFullscreen) {
+            binding.titleTextView.setVisibility(View.VISIBLE);
+            binding.channelTextView.setVisibility(View.VISIBLE);
+            binding.playerCloseButton.setVisibility(View.GONE);
+        } else {
+            binding.titleTextView.setVisibility(View.GONE);
+            binding.channelTextView.setVisibility(View.GONE);
+            binding.playerCloseButton.setVisibility(
+                    videoPlayerSelected() ? View.VISIBLE : View.GONE);
+        }
+        setupScreenRotationButton();
+    }
+
+    public void checkLandscape() {
+        final AppCompatActivity parent = getParentActivity();
+        final boolean videoInLandscapeButNotInFullscreen =
+                service.isLandscape() && !isFullscreen && videoPlayerSelected() && !isAudioOnly;
+
+        final boolean notPaused = currentState != STATE_COMPLETED && currentState != STATE_PAUSED;
+        if (parent != null
+                && videoInLandscapeButNotInFullscreen
+                && notPaused
+                && !DeviceUtils.isTablet(context)) {
+            toggleFullscreen();
+        }
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Gestures
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    @SuppressWarnings("checkstyle:ParameterNumber")
+    private void onLayoutChange(final View view, final int l, final int t, final int r, final int b,
+                                final int ol, final int ot, final int or, final int ob) {
+        if (l != ol || t != ot || r != or || b != ob) {
+            // Use smaller value to be consistent between screen orientations
+            // (and to make usage easier)
+            final int width = r - l;
+            final int height = b - t;
+            final int min = Math.min(width, height);
+            maxGestureLength = (int) (min * MAX_GESTURE_LENGTH);
+
+            if (DEBUG) {
+                Log.d(TAG, "maxGestureLength = " + maxGestureLength);
+            }
+
+            binding.volumeProgressBar.setMax(maxGestureLength);
+            binding.brightnessProgressBar.setMax(maxGestureLength);
+
+            setInitialGestureValues();
+            binding.playQueuePanel.getLayoutParams().height
+                    = height - binding.playQueuePanel.getTop();
+        }
+    }
+
+    private void setInitialGestureValues() {
+        if (audioReactor != null) {
+            final float currentVolumeNormalized =
+                    (float) audioReactor.getVolume() / audioReactor.getMaxVolume();
+            binding.volumeProgressBar.setProgress(
+                    (int) (binding.volumeProgressBar.getMax() * currentVolumeNormalized));
+        }
+    }
+
+    private int distanceFromCloseButton(final MotionEvent popupMotionEvent) {
+        final int closeOverlayButtonX = closeOverlayBinding.closeButton.getLeft()
+                + closeOverlayBinding.closeButton.getWidth() / 2;
+        final int closeOverlayButtonY = closeOverlayBinding.closeButton.getTop()
+                + closeOverlayBinding.closeButton.getHeight() / 2;
+
+        final float fingerX = popupLayoutParams.x + popupMotionEvent.getX();
+        final float fingerY = popupLayoutParams.y + popupMotionEvent.getY();
+
+        return (int) Math.sqrt(Math.pow(closeOverlayButtonX - fingerX, 2)
+                + Math.pow(closeOverlayButtonY - fingerY, 2));
+    }
+
+    private float getClosingRadius() {
+        final int buttonRadius = closeOverlayBinding.closeButton.getWidth() / 2;
+        // 20% wider than the button itself
+        return buttonRadius * 1.2f;
+    }
+
+    public boolean isInsideClosingRadius(final MotionEvent popupMotionEvent) {
+        return distanceFromCloseButton(popupMotionEvent) <= getClosingRadius();
+    }
+    //endregion
+
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Activity / fragment binding
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public void setFragmentListener(final PlayerServiceEventListener listener) {
+        fragmentListener = listener;
+        fragmentIsVisible = true;
+        // Apply window insets because Android will not do it when orientation changes
+        // from landscape to portrait
+        if (!isFullscreen) {
+            binding.playbackControlRoot.setPadding(0, 0, 0, 0);
+        }
+        binding.playQueuePanel.setPadding(0, 0, 0, 0);
+        notifyQueueUpdateToListeners();
+        notifyMetadataUpdateToListeners();
+        notifyPlaybackUpdateToListeners();
+        triggerProgressUpdate();
+    }
+
+    public void removeFragmentListener(final PlayerServiceEventListener listener) {
+        if (fragmentListener == listener) {
+            fragmentListener = null;
+        }
+    }
+
+    void setActivityListener(final PlayerEventListener listener) {
+        activityListener = listener;
+        // TODO why not queue update?
+        notifyMetadataUpdateToListeners();
+        notifyPlaybackUpdateToListeners();
+        triggerProgressUpdate();
+    }
+
+    void removeActivityListener(final PlayerEventListener listener) {
+        if (activityListener == listener) {
+            activityListener = null;
+        }
+    }
+
+    void stopActivityBinding() {
+        if (fragmentListener != null) {
+            fragmentListener.onServiceStopped();
+            fragmentListener = null;
+        }
+        if (activityListener != null) {
+            activityListener.onServiceStopped();
+            activityListener = null;
+        }
+    }
+
+    /**
+     * This will be called when a user goes to another app/activity, turns off a screen.
+     * We don't want to interrupt playback and don't want to see notification so
+     * next lines of code will enable audio-only playback only if needed
+     */
+    private void onFragmentStopped() {
+        if (videoPlayerSelected() && (isPlaying() || isLoading())) {
+            switch (getMinimizeOnExitAction(context)) {
+                case MINIMIZE_ON_EXIT_MODE_BACKGROUND:
+                    useVideoSource(false);
+                case MINIMIZE_ON_EXIT_MODE_POPUP:
+                    setRecovery();
+                    NavigationHelper.playOnPopupPlayer(getParentActivity(), playQueue, true);
+                case MINIMIZE_ON_EXIT_MODE_NONE: default:
+                    pause();
+            }
+        }
+    }
+
+    private void notifyQueueUpdateToListeners() {
+        if (fragmentListener != null && playQueue != null) {
+            fragmentListener.onQueueUpdate(playQueue);
+        }
+        if (activityListener != null && playQueue != null) {
+            activityListener.onQueueUpdate(playQueue);
+        }
+    }
+
+    private void notifyMetadataUpdateToListeners() {
+        if (fragmentListener != null && currentMetadata != null) {
+            fragmentListener.onMetadataUpdate(currentMetadata.getMetadata(), playQueue);
+        }
+        if (activityListener != null && currentMetadata != null) {
+            activityListener.onMetadataUpdate(currentMetadata.getMetadata(), playQueue);
+        }
+    }
+
+    private void notifyPlaybackUpdateToListeners() {
+        if (fragmentListener != null && !exoPlayerIsNull() && playQueue != null) {
+            fragmentListener.onPlaybackUpdate(currentState, getRepeatMode(),
+                    playQueue.isShuffled(), simpleExoPlayer.getPlaybackParameters());
+        }
+        if (activityListener != null && !exoPlayerIsNull() && playQueue != null) {
+            activityListener.onPlaybackUpdate(currentState, getRepeatMode(),
+                    playQueue.isShuffled(), getPlaybackParameters());
+        }
+    }
+
+    private void notifyProgressUpdateToListeners(final int currentProgress,
+                                                 final int duration,
+                                                 final int bufferPercent) {
+        if (fragmentListener != null) {
+            fragmentListener.onProgressUpdate(currentProgress, duration, bufferPercent);
+        }
+        if (activityListener != null) {
+            activityListener.onProgressUpdate(currentProgress, duration, bufferPercent);
+        }
+    }
+
+    public AppCompatActivity getParentActivity() {
+        // ! instanceof ViewGroup means that view was added via windowManager for Popup
+        if (binding == null || !(binding.getRoot().getParent() instanceof ViewGroup)) {
+            return null;
+        }
+
+        return (AppCompatActivity) ((ViewGroup) binding.getRoot().getParent()).getContext();
+    }
+
+    private void useVideoSource(final boolean video) {
+        if (playQueue == null || isAudioOnly == !video || audioPlayerSelected()) {
+            return;
+        }
+
+        isAudioOnly = !video;
+        // When a user returns from background controls could be hidden
+        // but systemUI will be shown 100%. Hide it
+        if (!isAudioOnly && !isControlsVisible()) {
+            hideSystemUIIfNeeded();
+        }
+        setRecovery();
+        reloadPlayQueueManager();
+    }
+    //endregion
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Getters
+    //////////////////////////////////////////////////////////////////////////*/
+    //region
+
+    public int getCurrentState() {
+        return currentState;
+    }
+
+    public boolean exoPlayerIsNull() {
+        return simpleExoPlayer == null;
+    }
+
+    public boolean isStopped() {
+        return exoPlayerIsNull()
+                || simpleExoPlayer.getPlaybackState() == SimpleExoPlayer.STATE_IDLE;
+    }
+
+    public boolean isPlaying() {
+        return !exoPlayerIsNull() && simpleExoPlayer.isPlaying();
+    }
+
+    private boolean isLoading() {
+        return !exoPlayerIsNull() && simpleExoPlayer.isLoading();
+    }
+
+    private boolean isLive() {
+        try {
+            return !exoPlayerIsNull() && simpleExoPlayer.isCurrentWindowDynamic();
+        } catch (@NonNull final IndexOutOfBoundsException e) {
+            // Why would this even happen =(... but lets log it anyway, better safe than sorry
+            if (DEBUG) {
+                Log.d(TAG, "player.isCurrentWindowDynamic() failed: " + e.getMessage());
+                e.printStackTrace();
+            }
+            return false;
+        }
+    }
+
+
+    @NonNull
+    public Context getContext() {
+        return context;
+    }
+
+    @NonNull
+    public SharedPreferences getPrefs() {
+        return prefs;
+    }
+
+    public MediaSessionManager getMediaSessionManager() {
+        return mediaSessionManager;
+    }
+
+
+    public PlayerType getPlayerType() {
+        return playerType;
+    }
+
+    public boolean audioPlayerSelected() {
+        return playerType == PlayerType.AUDIO;
+    }
+
+    public boolean videoPlayerSelected() {
+        return playerType == PlayerType.VIDEO;
+    }
+
+    public boolean popupPlayerSelected() {
+        return playerType == PlayerType.POPUP;
+    }
+
+
+    public PlayQueue getPlayQueue() {
+        return playQueue;
+    }
+
+    public AudioReactor getAudioReactor() {
+        return audioReactor;
+    }
+
+    public GestureDetector getGestureDetector() {
+        return gestureDetector;
+    }
+
+    public boolean isFullscreen() {
+        return isFullscreen;
+    }
+
+    public boolean isVerticalVideo() {
+        return isVerticalVideo;
+    }
+
+    public boolean isPopupClosing() {
+        return isPopupClosing;
+    }
+
+
+    public boolean isSomePopupMenuVisible() {
+        return isSomePopupMenuVisible;
+    }
+
+    public ImageButton getPlayPauseButton() {
+        return binding.playPauseButton;
+    }
+
+    public View getClosingOverlayView() {
+        return closeOverlayBinding.getRoot();
+    }
+
+    public ProgressBar getVolumeProgressBar() {
+        return binding.volumeProgressBar;
+    }
+
+    public ProgressBar getBrightnessProgressBar() {
+        return binding.brightnessProgressBar;
+    }
+
+    public int getMaxGestureLength() {
+        return maxGestureLength;
+    }
+
+    public ImageView getVolumeImageView() {
+        return binding.volumeImageView;
+    }
+
+    public RelativeLayout getVolumeRelativeLayout() {
+        return binding.volumeRelativeLayout;
+    }
+
+    public ImageView getBrightnessImageView() {
+        return binding.brightnessImageView;
+    }
+
+    public RelativeLayout getBrightnessRelativeLayout() {
+        return binding.brightnessRelativeLayout;
+    }
+
+    public FloatingActionButton getCloseOverlayButton() {
+        return closeOverlayBinding.closeButton;
+    }
+
+    public View getLoadingPanel() {
+        return binding.loadingPanel;
+    }
+
+    public TextView getCurrentDisplaySeek() {
+        return binding.currentDisplaySeek;
+    }
+
+    public TextView getResizingIndicator() {
+        return binding.resizingIndicator;
+    }
+
+    @Nullable
+    public WindowManager.LayoutParams getPopupLayoutParams() {
+        return popupLayoutParams;
+    }
+
+    @Nullable
+    public WindowManager getWindowManager() {
+        return windowManager;
+    }
+
+    public float getScreenWidth() {
+        return screenWidth;
+    }
+
+    public float getScreenHeight() {
+        return screenHeight;
+    }
+
+    public View getRootView() {
+        return binding.getRoot();
+    }
+
+    public ExpandableSurfaceView getSurfaceView() {
+        return binding.surfaceView;
+    }
+
+    public PlayQueueAdapter getPlayQueueAdapter() {
+        return playQueueAdapter;
+    }
+
+    //endregion
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java b/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java
index e8bd7dc8585..5c28c6c7b1b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java
@@ -5,13 +5,13 @@
 import androidx.annotation.NonNull;
 
 class PlayerServiceBinder extends Binder {
-    private final BasePlayer basePlayer;
+    private final Player player;
 
-    PlayerServiceBinder(@NonNull final BasePlayer basePlayer) {
-        this.basePlayer = basePlayer;
+    PlayerServiceBinder(@NonNull final Player player) {
+        this.player = player;
     }
 
-    BasePlayer getPlayerInstance() {
-        return basePlayer;
+    Player getPlayerInstance() {
+        return player;
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index fd20fd175b2..283c25e4f64 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -22,7 +22,6 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.ActivityPlayerQueueControlBinding;
@@ -55,7 +54,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     private static final int RECYCLER_ITEM_POPUP_MENU_GROUP_ID = 47;
     private static final int SMOOTH_SCROLL_MAXIMUM_DISTANCE = 80;
 
-    protected BasePlayer player;
+    protected Player player;
 
     private boolean serviceBound;
     private ServiceConnection serviceConnection;
@@ -167,14 +166,14 @@ public boolean onOptionsItemSelected(final MenuItem item) {
             case R.id.action_switch_popup:
                 if (PermissionHelper.isPopupEnabled(this)) {
                     this.player.setRecovery();
-                    NavigationHelper.playOnPopupPlayer(this, player.playQueue, true);
+                    NavigationHelper.playOnPopupPlayer(this, player.getPlayQueue(), true);
                 } else {
                     PermissionHelper.showPopupEnablementToast(this);
                 }
                 return true;
             case R.id.action_switch_background:
                 this.player.setRecovery();
-                NavigationHelper.playOnBackgroundPlayer(this, player.playQueue, true);
+                NavigationHelper.playOnBackgroundPlayer(this, player.getPlayQueue(), true);
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -235,7 +234,7 @@ public void onServiceConnected(final ComponentName name, final IBinder service)
                 }
 
                 if (player == null || player.getPlayQueue() == null
-                        || player.getPlayQueueAdapter() == null || player.getPlayer() == null) {
+                        || player.getPlayQueueAdapter() == null || player.exoPlayerIsNull()) {
                     unbind();
                     finish();
                 } else {
@@ -375,7 +374,7 @@ private PlayQueueItemBuilder.OnSelectedListener getOnSelectedListener() {
             @Override
             public void selected(final PlayQueueItem item, final View view) {
                 if (player != null) {
-                    player.onSelected(item);
+                    player.selectQueueItem(item);
                 }
             }
 
@@ -436,15 +435,15 @@ public void onClick(final View view) {
         if (view.getId() == queueControlBinding.controlRepeat.getId()) {
             player.onRepeatClicked();
         } else if (view.getId() == queueControlBinding.controlBackward.getId()) {
-            player.onPlayPrevious();
+            player.playPrevious();
         } else if (view.getId() == queueControlBinding.controlFastRewind.getId()) {
-            player.onFastRewind();
+            player.fastRewind();
         } else if (view.getId() == queueControlBinding.controlPlayPause.getId()) {
-            player.onPlayPause();
+            player.playPause();
         } else if (view.getId() == queueControlBinding.controlFastForward.getId()) {
-            player.onFastForward();
+            player.fastForward();
         } else if (view.getId() == queueControlBinding.controlForward.getId()) {
-            player.onPlayNext();
+            player.playNext();
         } else if (view.getId() == queueControlBinding.controlShuffle.getId()) {
             player.onShuffleClicked();
         } else if (view.getId() == queueControlBinding.metadata.getId()) {
@@ -616,15 +615,15 @@ public void onServiceStopped() {
 
     private void onStateChanged(final int state) {
         switch (state) {
-            case BasePlayer.STATE_PAUSED:
+            case Player.STATE_PAUSED:
                 queueControlBinding.controlPlayPause
                         .setImageResource(R.drawable.ic_play_arrow_white_24dp);
                 break;
-            case BasePlayer.STATE_PLAYING:
+            case Player.STATE_PLAYING:
                 queueControlBinding.controlPlayPause
                         .setImageResource(R.drawable.ic_pause_white_24dp);
                 break;
-            case BasePlayer.STATE_COMPLETED:
+            case Player.STATE_COMPLETED:
                 queueControlBinding.controlPlayPause
                         .setImageResource(R.drawable.ic_replay_white_24dp);
                 break;
@@ -633,9 +632,9 @@ private void onStateChanged(final int state) {
         }
 
         switch (state) {
-            case BasePlayer.STATE_PAUSED:
-            case BasePlayer.STATE_PLAYING:
-            case BasePlayer.STATE_COMPLETED:
+            case Player.STATE_PAUSED:
+            case Player.STATE_PLAYING:
+            case Player.STATE_COMPLETED:
                 queueControlBinding.controlPlayPause.setClickable(true);
                 queueControlBinding.controlPlayPause.setVisibility(View.VISIBLE);
                 queueControlBinding.controlProgressBar.setVisibility(View.GONE);
@@ -650,15 +649,15 @@ private void onStateChanged(final int state) {
 
     private void onPlayModeChanged(final int repeatMode, final boolean shuffled) {
         switch (repeatMode) {
-            case Player.REPEAT_MODE_OFF:
+            case com.google.android.exoplayer2.Player.REPEAT_MODE_OFF:
                 queueControlBinding.controlRepeat
                         .setImageResource(R.drawable.exo_controls_repeat_off);
                 break;
-            case Player.REPEAT_MODE_ONE:
+            case com.google.android.exoplayer2.Player.REPEAT_MODE_ONE:
                 queueControlBinding.controlRepeat
                         .setImageResource(R.drawable.exo_controls_repeat_one);
                 break;
-            case Player.REPEAT_MODE_ALL:
+            case com.google.android.exoplayer2.Player.REPEAT_MODE_ALL:
                 queueControlBinding.controlRepeat
                         .setImageResource(R.drawable.exo_controls_repeat_all);
                 break;
@@ -700,9 +699,7 @@ private void onMaybeMuteChanged() {
             // using rootView.getContext() because getApplicationContext() didn't work
             final Context context = queueControlBinding.getRoot().getContext();
             item.setIcon(ThemeHelper.resolveResourceIdFromAttr(context,
-                    player.isMuted()
-                            ? R.attr.ic_volume_off
-                            : R.attr.ic_volume_up));
+                    player.isMuted() ? R.attr.ic_volume_off : R.attr.ic_volume_up));
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
deleted file mode 100644
index 8894646c089..00000000000
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*
- * Copyright 2017 Mauricio Colli <mauriciocolli@outlook.com>
- * VideoPlayer.java is part of NewPipe
- *
- * License: GPL-3.0+
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.schabi.newpipe.player;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.os.Build;
-import android.os.Handler;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.PopupMenu;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.preference.PreferenceManager;
-
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.text.CaptionStyleCompat;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
-import com.google.android.exoplayer2.ui.SubtitleView;
-import com.google.android.exoplayer2.video.VideoListener;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.PlayerBinding;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import org.schabi.newpipe.player.resolver.MediaSourceTag;
-import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
-import org.schabi.newpipe.util.AnimationUtils;
-import org.schabi.newpipe.views.ExpandableSurfaceView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
-
-/**
- * Base for <b>video</b> players.
- *
- * @author mauriciocolli
- */
-@SuppressWarnings({"WeakerAccess"})
-public abstract class VideoPlayer extends BasePlayer
-        implements VideoListener,
-        SeekBar.OnSeekBarChangeListener,
-        View.OnClickListener,
-        Player.EventListener,
-        PopupMenu.OnMenuItemClickListener,
-        PopupMenu.OnDismissListener {
-    public final String TAG;
-    public static final boolean DEBUG = BasePlayer.DEBUG;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Player
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public static final int DEFAULT_CONTROLS_DURATION = 300; // 300 millis
-    public static final int DEFAULT_CONTROLS_HIDE_TIME = 2000;  // 2 Seconds
-    public static final int DPAD_CONTROLS_HIDE_TIME = 7000;  // 7 Seconds
-
-    protected static final int RENDERER_UNAVAILABLE = -1;
-
-    @NonNull
-    private final VideoPlaybackResolver resolver;
-
-    private List<VideoStream> availableStreams;
-    private int selectedStreamIndex;
-
-    protected boolean wasPlaying = false;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Views
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected PlayerBinding binding;
-
-    protected SeekBar playbackSeekBar;
-    protected TextView qualityTextView;
-    protected TextView playbackSpeed;
-
-    private ValueAnimator controlViewAnimator;
-    private final Handler controlsVisibilityHandler = new Handler();
-
-    boolean isSomePopupMenuVisible = false;
-
-    private final int qualityPopupMenuGroupId = 69;
-    private PopupMenu qualityPopupMenu;
-
-    private final int playbackSpeedPopupMenuGroupId = 79;
-    private PopupMenu playbackSpeedPopupMenu;
-
-    private final int captionPopupMenuGroupId = 89;
-    private PopupMenu captionPopupMenu;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    protected VideoPlayer(final String debugTag, final Context context) {
-        super(context);
-        this.TAG = debugTag;
-        this.resolver = new VideoPlaybackResolver(context, dataSource, getQualityResolver());
-    }
-
-    // workaround to match normalized captions like english to English or deutsch to Deutsch
-    private static boolean containsCaseInsensitive(final List<String> list, final String toFind) {
-        for (final String i : list) {
-            if (i.equalsIgnoreCase(toFind)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void setup(@NonNull final PlayerBinding playerBinding) {
-        initViews(playerBinding);
-        if (simpleExoPlayer == null) {
-            initPlayer(true);
-        }
-        initListeners();
-    }
-
-    public void initViews(@NonNull final PlayerBinding playerBinding) {
-        binding = playerBinding;
-        playbackSeekBar = (SeekBar) binding.playbackSeekBar;
-        qualityTextView = (TextView) binding.qualityTextView;
-        playbackSpeed = (TextView) binding.playbackSpeed;
-
-        final float captionScale = PlayerHelper.getCaptionScale(context);
-        final CaptionStyleCompat captionStyle = PlayerHelper.getCaptionStyle(context);
-        setupSubtitleView(binding.subtitleView, captionScale, captionStyle);
-
-        ((TextView) binding.resizeTextView).setText(PlayerHelper.resizeTypeOf(context,
-                binding.surfaceView.getResizeMode()));
-
-        playbackSeekBar.getThumb().setColorFilter(new PorterDuffColorFilter(Color.RED,
-                PorterDuff.Mode.SRC_IN));
-        playbackSeekBar.getProgressDrawable().setColorFilter(new PorterDuffColorFilter(Color.RED,
-                PorterDuff.Mode.MULTIPLY));
-
-        qualityPopupMenu = new PopupMenu(context, qualityTextView);
-        playbackSpeedPopupMenu = new PopupMenu(context, playbackSpeed);
-        captionPopupMenu = new PopupMenu(context, binding.captionTextView);
-
-        binding.progressBarLoadingPanel.getIndeterminateDrawable()
-                .setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
-    }
-
-    protected abstract void setupSubtitleView(@NonNull SubtitleView view, float captionScale,
-                                              @NonNull CaptionStyleCompat captionStyle);
-
-    @Override
-    public void initListeners() {
-        playbackSeekBar.setOnSeekBarChangeListener(this);
-        binding.playbackSpeed.setOnClickListener(this);
-        binding.qualityTextView.setOnClickListener(this);
-        binding.captionTextView.setOnClickListener(this);
-        binding.resizeTextView.setOnClickListener(this);
-        binding.playbackLiveSync.setOnClickListener(this);
-    }
-
-    @Override
-    public void initPlayer(final boolean playOnReady) {
-        super.initPlayer(playOnReady);
-
-        // Setup video view
-        simpleExoPlayer.setVideoSurfaceView(binding.surfaceView);
-        simpleExoPlayer.addVideoListener(this);
-
-        // Setup subtitle view
-        simpleExoPlayer.addTextOutput(binding.subtitleView);
-
-        // Setup audio session with onboard equalizer
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            trackSelector.setParameters(trackSelector.buildUponParameters()
-                    .setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context)));
-        }
-    }
-
-    @Override
-    public void handleIntent(final Intent intent) {
-        if (intent == null) {
-            return;
-        }
-
-        if (intent.hasExtra(PLAYBACK_QUALITY)) {
-            setPlaybackQuality(intent.getStringExtra(PLAYBACK_QUALITY));
-        }
-
-        super.handleIntent(intent);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // UI Builders
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public void buildQualityMenu() {
-        if (qualityPopupMenu == null) {
-            return;
-        }
-
-        qualityPopupMenu.getMenu().removeGroup(qualityPopupMenuGroupId);
-        for (int i = 0; i < availableStreams.size(); i++) {
-            final VideoStream videoStream = availableStreams.get(i);
-            qualityPopupMenu.getMenu().add(qualityPopupMenuGroupId, i, Menu.NONE, MediaFormat
-                    .getNameById(videoStream.getFormatId()) + " " + videoStream.resolution);
-        }
-        if (getSelectedVideoStream() != null) {
-            qualityTextView.setText(getSelectedVideoStream().resolution);
-        }
-        qualityPopupMenu.setOnMenuItemClickListener(this);
-        qualityPopupMenu.setOnDismissListener(this);
-    }
-
-    private void buildPlaybackSpeedMenu() {
-        if (playbackSpeedPopupMenu == null) {
-            return;
-        }
-
-        playbackSpeedPopupMenu.getMenu().removeGroup(playbackSpeedPopupMenuGroupId);
-        for (int i = 0; i < PLAYBACK_SPEEDS.length; i++) {
-            playbackSpeedPopupMenu.getMenu().add(playbackSpeedPopupMenuGroupId, i, Menu.NONE,
-                    formatSpeed(PLAYBACK_SPEEDS[i]));
-        }
-        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
-        playbackSpeedPopupMenu.setOnMenuItemClickListener(this);
-        playbackSpeedPopupMenu.setOnDismissListener(this);
-    }
-
-    private void buildCaptionMenu(final List<String> availableLanguages) {
-        if (captionPopupMenu == null) {
-            return;
-        }
-        captionPopupMenu.getMenu().removeGroup(captionPopupMenuGroupId);
-
-        final String userPreferredLanguage = PreferenceManager.getDefaultSharedPreferences(context)
-                .getString(context.getString(R.string.caption_user_set_key), null);
-        /*
-         * only search for autogenerated cc as fallback
-         * if "(auto-generated)" was not already selected
-         * we are only looking for "(" instead of "(auto-generated)" to hopefully get all
-         * internationalized variants such as "(automatisch-erzeugt)" and so on
-         */
-        boolean searchForAutogenerated = userPreferredLanguage != null
-                && !userPreferredLanguage.contains("(");
-
-        // Add option for turning off caption
-        final MenuItem captionOffItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
-                0, Menu.NONE, R.string.caption_none);
-        captionOffItem.setOnMenuItemClickListener(menuItem -> {
-            final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
-            if (textRendererIndex != RENDERER_UNAVAILABLE) {
-                trackSelector.setParameters(trackSelector.buildUponParameters()
-                        .setRendererDisabled(textRendererIndex, true));
-            }
-            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            prefs.edit().remove(context.getString(R.string.caption_user_set_key)).commit();
-            return true;
-        });
-
-        // Add all available captions
-        for (int i = 0; i < availableLanguages.size(); i++) {
-            final String captionLanguage = availableLanguages.get(i);
-            final MenuItem captionItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
-                    i + 1, Menu.NONE, captionLanguage);
-            captionItem.setOnMenuItemClickListener(menuItem -> {
-                final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
-                if (textRendererIndex != RENDERER_UNAVAILABLE) {
-                    trackSelector.setPreferredTextLanguage(captionLanguage);
-                    trackSelector.setParameters(trackSelector.buildUponParameters()
-                            .setRendererDisabled(textRendererIndex, false));
-                    final SharedPreferences prefs = PreferenceManager
-                            .getDefaultSharedPreferences(context);
-                    prefs.edit().putString(context.getString(R.string.caption_user_set_key),
-                            captionLanguage).commit();
-                }
-                return true;
-            });
-            // apply caption language from previous user preference
-            if (userPreferredLanguage != null
-                    && (captionLanguage.equals(userPreferredLanguage)
-                    || (searchForAutogenerated && captionLanguage.startsWith(userPreferredLanguage))
-                    || (userPreferredLanguage.contains("(") && captionLanguage.startsWith(
-                    userPreferredLanguage.substring(0, userPreferredLanguage.indexOf('(')))))) {
-                final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
-                if (textRendererIndex != RENDERER_UNAVAILABLE) {
-                    trackSelector.setPreferredTextLanguage(captionLanguage);
-                    trackSelector.setParameters(trackSelector.buildUponParameters()
-                            .setRendererDisabled(textRendererIndex, false));
-                }
-                searchForAutogenerated = false;
-            }
-        }
-        captionPopupMenu.setOnDismissListener(this);
-    }
-
-    private void updateStreamRelatedViews() {
-        if (getCurrentMetadata() == null) {
-            return;
-        }
-
-        final MediaSourceTag tag = getCurrentMetadata();
-        final StreamInfo metadata = tag.getMetadata();
-
-        binding.qualityTextView.setVisibility(View.GONE);
-        binding.playbackSpeed.setVisibility(View.GONE);
-
-        binding.playbackEndTime.setVisibility(View.GONE);
-        binding.playbackLiveSync.setVisibility(View.GONE);
-
-        switch (metadata.getStreamType()) {
-            case AUDIO_STREAM:
-                binding.surfaceView.setVisibility(View.GONE);
-                binding.endScreen.setVisibility(View.VISIBLE);
-                binding.playbackEndTime.setVisibility(View.VISIBLE);
-                break;
-
-            case AUDIO_LIVE_STREAM:
-                binding.surfaceView.setVisibility(View.GONE);
-                binding.endScreen.setVisibility(View.VISIBLE);
-                binding.playbackLiveSync.setVisibility(View.VISIBLE);
-                break;
-
-            case LIVE_STREAM:
-                binding.surfaceView.setVisibility(View.VISIBLE);
-                binding.endScreen.setVisibility(View.GONE);
-                binding.playbackLiveSync.setVisibility(View.VISIBLE);
-                break;
-
-            case VIDEO_STREAM:
-                if (metadata.getVideoStreams().size() + metadata.getVideoOnlyStreams().size()
-                        == 0) {
-                    break;
-                }
-
-                availableStreams = tag.getSortedAvailableVideoStreams();
-                selectedStreamIndex = tag.getSelectedVideoStreamIndex();
-                buildQualityMenu();
-
-                binding.qualityTextView.setVisibility(View.VISIBLE);
-                binding.surfaceView.setVisibility(View.VISIBLE);
-            default:
-                binding.endScreen.setVisibility(View.GONE);
-                binding.playbackEndTime.setVisibility(View.VISIBLE);
-                break;
-        }
-
-        buildPlaybackSpeedMenu();
-        binding.playbackSpeed.setVisibility(View.VISIBLE);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playback Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected abstract VideoPlaybackResolver.QualityResolver getQualityResolver();
-
-    @Override
-    protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
-        super.onMetadataChanged(tag);
-        updateStreamRelatedViews();
-    }
-
-    @Override
-    @Nullable
-    public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
-        return resolver.resolve(info);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // States Implementation
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onBlocked() {
-        super.onBlocked();
-
-        controlsVisibilityHandler.removeCallbacksAndMessages(null);
-        animateView(binding.playbackControlRoot, false, DEFAULT_CONTROLS_DURATION);
-
-        playbackSeekBar.setEnabled(false);
-        playbackSeekBar.getThumb().setColorFilter(new PorterDuffColorFilter(Color.RED,
-                PorterDuff.Mode.SRC_IN));
-
-        binding.loadingPanel.setBackgroundColor(Color.BLACK);
-        animateView(binding.loadingPanel, true, 0);
-        animateView(binding.surfaceForeground, true, 100);
-    }
-
-    @Override
-    public void onPlaying() {
-        super.onPlaying();
-
-        updateStreamRelatedViews();
-
-        showAndAnimateControl(-1, true);
-
-        playbackSeekBar.setEnabled(true);
-        playbackSeekBar.getThumb().setColorFilter(new PorterDuffColorFilter(Color.RED,
-                PorterDuff.Mode.SRC_IN));
-
-        binding.loadingPanel.setVisibility(View.GONE);
-
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false,
-                200);
-    }
-
-    @Override
-    public void onBuffering() {
-        if (DEBUG) {
-            Log.d(TAG, "onBuffering() called");
-        }
-        binding.loadingPanel.setBackgroundColor(Color.TRANSPARENT);
-    }
-
-    @Override
-    public void onPaused() {
-        if (DEBUG) {
-            Log.d(TAG, "onPaused() called");
-        }
-        showControls(400);
-        binding.loadingPanel.setVisibility(View.GONE);
-    }
-
-    @Override
-    public void onPausedSeek() {
-        if (DEBUG) {
-            Log.d(TAG, "onPausedSeek() called");
-        }
-        showAndAnimateControl(-1, true);
-    }
-
-    @Override
-    public void onCompleted() {
-        super.onCompleted();
-
-        showControls(500);
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false,
-                200);
-        binding.loadingPanel.setVisibility(View.GONE);
-
-        animateView(binding.surfaceForeground, true, 100);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // ExoPlayer Video Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onTracksChanged(@NonNull final TrackGroupArray trackGroups,
-                                @NonNull final TrackSelectionArray trackSelections) {
-        super.onTracksChanged(trackGroups, trackSelections);
-        onTextTrackUpdate();
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(@NonNull final PlaybackParameters playbackParameters) {
-        super.onPlaybackParametersChanged(playbackParameters);
-        playbackSpeed.setText(formatSpeed(playbackParameters.speed));
-    }
-
-    @Override
-    public void onVideoSizeChanged(final int width, final int height,
-                                   final int unappliedRotationDegrees,
-                                   final float pixelWidthHeightRatio) {
-        if (DEBUG) {
-            Log.d(TAG, "onVideoSizeChanged() called with: "
-                    + "width / height = [" + width + " / " + height
-                    + " = " + (((float) width) / height) + "], "
-                    + "unappliedRotationDegrees = [" + unappliedRotationDegrees + "], "
-                    + "pixelWidthHeightRatio = [" + pixelWidthHeightRatio + "]");
-        }
-        binding.surfaceView.setAspectRatio(((float) width) / height);
-    }
-
-    @Override
-    public void onRenderedFirstFrame() {
-        animateView(binding.surfaceForeground, false, 100);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // ExoPlayer Track Updates
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void onTextTrackUpdate() {
-        final int textRenderer = getRendererIndex(C.TRACK_TYPE_TEXT);
-
-        if (binding == null) {
-            return;
-        }
-        if (trackSelector.getCurrentMappedTrackInfo() == null
-                || textRenderer == RENDERER_UNAVAILABLE) {
-            binding.captionTextView.setVisibility(View.GONE);
-            return;
-        }
-
-        final TrackGroupArray textTracks = trackSelector.getCurrentMappedTrackInfo()
-                .getTrackGroups(textRenderer);
-
-        // Extract all loaded languages
-        final List<String> availableLanguages = new ArrayList<>(textTracks.length);
-        for (int i = 0; i < textTracks.length; i++) {
-            final TrackGroup textTrack = textTracks.get(i);
-            if (textTrack.length > 0 && textTrack.getFormat(0) != null) {
-                availableLanguages.add(textTrack.getFormat(0).language);
-            }
-        }
-
-        // Normalize mismatching language strings
-        final String preferredLanguage = trackSelector.getPreferredTextLanguage();
-        // Build UI
-        buildCaptionMenu(availableLanguages);
-        if (trackSelector.getParameters().getRendererDisabled(textRenderer)
-                || preferredLanguage == null || (!availableLanguages.contains(preferredLanguage)
-                && !containsCaseInsensitive(availableLanguages, preferredLanguage))) {
-            binding.captionTextView.setText(R.string.caption_none);
-        } else {
-            binding.captionTextView.setText(preferredLanguage);
-        }
-        binding.captionTextView.setVisibility(availableLanguages.isEmpty() ? View.GONE
-                : View.VISIBLE);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // General Player
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onPrepared(final boolean playWhenReady) {
-        if (DEBUG) {
-            Log.d(TAG, "onPrepared() called with: playWhenReady = [" + playWhenReady + "]");
-        }
-
-        playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
-        binding.playbackEndTime.setText(getTimeString((int) simpleExoPlayer.getDuration()));
-        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
-
-        super.onPrepared(playWhenReady);
-    }
-
-    @Override
-    public void destroy() {
-        super.destroy();
-        if (binding != null) {
-            binding.endScreen.setImageBitmap(null);
-        }
-    }
-
-    @Override
-    public void onUpdateProgress(final int currentProgress, final int duration,
-                                 final int bufferPercent) {
-        if (!isPrepared()) {
-            return;
-        }
-
-        if (duration != playbackSeekBar.getMax()) {
-            binding.playbackEndTime.setText(getTimeString(duration));
-            playbackSeekBar.setMax(duration);
-        }
-        if (currentState != STATE_PAUSED) {
-            if (currentState != STATE_PAUSED_SEEK) {
-                playbackSeekBar.setProgress(currentProgress);
-            }
-            binding.playbackCurrentTime.setText(getTimeString(currentProgress));
-        }
-        if (simpleExoPlayer.isLoading() || bufferPercent > 90) {
-            playbackSeekBar.setSecondaryProgress(
-                    (int) (playbackSeekBar.getMax() * ((float) bufferPercent / 100)));
-        }
-        if (DEBUG && bufferPercent % 20 == 0) { //Limit log
-            Log.d(TAG, "updateProgress() called with: "
-                    + "isVisible = " + isControlsVisible() + ", "
-                    + "currentProgress = [" + currentProgress + "], "
-                    + "duration = [" + duration + "], bufferPercent = [" + bufferPercent + "]");
-        }
-        binding.playbackLiveSync.setClickable(!isLiveEdge());
-    }
-
-    @Override
-    public void onLoadingComplete(final String imageUri, final View view,
-                                  final Bitmap loadedImage) {
-        super.onLoadingComplete(imageUri, view, loadedImage);
-        if (loadedImage != null) {
-            binding.endScreen.setImageBitmap(loadedImage);
-        }
-    }
-
-    protected void toggleFullscreen() {
-        changeState(STATE_BLOCKED);
-    }
-
-    @Override
-    public void onFastRewind() {
-        super.onFastRewind();
-        showAndAnimateControl(R.drawable.ic_fast_rewind_white_24dp, true);
-    }
-
-    @Override
-    public void onFastForward() {
-        super.onFastForward();
-        showAndAnimateControl(R.drawable.ic_fast_forward_white_24dp, true);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // OnClick related
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onClick(final View v) {
-        if (DEBUG) {
-            Log.d(TAG, "onClick() called with: v = [" + v + "]");
-        }
-        if (v.getId() == binding.qualityTextView.getId()) {
-            onQualitySelectorClicked();
-        } else if (v.getId() == binding.playbackSpeed.getId()) {
-            onPlaybackSpeedClicked();
-        } else if (v.getId() == binding.resizeTextView.getId()) {
-            onResizeClicked();
-        } else if (v.getId() == binding.captionTextView.getId()) {
-            onCaptionClicked();
-        } else if (v.getId() == binding.playbackLiveSync.getId()) {
-            seekToDefault();
-        }
-    }
-
-    /**
-     * Called when an item of the quality selector or the playback speed selector is selected.
-     */
-    @Override
-    public boolean onMenuItemClick(final MenuItem menuItem) {
-        if (DEBUG) {
-            Log.d(TAG, "onMenuItemClick() called with: "
-                    + "menuItem = [" + menuItem + "], "
-                    + "menuItem.getItemId = [" + menuItem.getItemId() + "]");
-        }
-
-        if (qualityPopupMenuGroupId == menuItem.getGroupId()) {
-            final int menuItemIndex = menuItem.getItemId();
-            if (selectedStreamIndex == menuItemIndex || availableStreams == null
-                    || availableStreams.size() <= menuItemIndex) {
-                return true;
-            }
-
-            final String newResolution = availableStreams.get(menuItemIndex).resolution;
-            setRecovery();
-            setPlaybackQuality(newResolution);
-            reload();
-
-            qualityTextView.setText(menuItem.getTitle());
-            return true;
-        } else if (playbackSpeedPopupMenuGroupId == menuItem.getGroupId()) {
-            final int speedIndex = menuItem.getItemId();
-            final float speed = PLAYBACK_SPEEDS[speedIndex];
-
-            setPlaybackSpeed(speed);
-            playbackSpeed.setText(formatSpeed(speed));
-        }
-
-        return false;
-    }
-
-    /**
-     * Called when some popup menu is dismissed.
-     */
-    @Override
-    public void onDismiss(final PopupMenu menu) {
-        if (DEBUG) {
-            Log.d(TAG, "onDismiss() called with: menu = [" + menu + "]");
-        }
-        isSomePopupMenuVisible = false;
-        if (getSelectedVideoStream() != null) {
-            qualityTextView.setText(getSelectedVideoStream().resolution);
-        }
-    }
-
-    public void onQualitySelectorClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onQualitySelectorClicked() called");
-        }
-        qualityPopupMenu.show();
-        isSomePopupMenuVisible = true;
-
-        final VideoStream videoStream = getSelectedVideoStream();
-        if (videoStream != null) {
-            final String qualityText = MediaFormat.getNameById(videoStream.getFormatId()) + " "
-                    + videoStream.resolution;
-            qualityTextView.setText(qualityText);
-        }
-
-        wasPlaying = simpleExoPlayer.getPlayWhenReady();
-    }
-
-    public void onPlaybackSpeedClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onPlaybackSpeedClicked() called");
-        }
-        playbackSpeedPopupMenu.show();
-        isSomePopupMenuVisible = true;
-    }
-
-    private void onCaptionClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onCaptionClicked() called");
-        }
-        captionPopupMenu.show();
-        isSomePopupMenuVisible = true;
-    }
-
-    void onResizeClicked() {
-        if (binding != null) {
-            final int currentResizeMode = binding.surfaceView.getResizeMode();
-            final int newResizeMode = nextResizeMode(currentResizeMode);
-            setResizeMode(newResizeMode);
-        }
-    }
-
-    protected void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
-        binding.surfaceView.setResizeMode(resizeMode);
-        ((TextView) binding.resizeTextView).setText(PlayerHelper.resizeTypeOf(context,
-                resizeMode));
-    }
-
-    protected abstract int nextResizeMode(@AspectRatioFrameLayout.ResizeMode int resizeMode);
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // SeekBar Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onProgressChanged(final SeekBar seekBar, final int progress,
-                                  final boolean fromUser) {
-        if (DEBUG && fromUser) {
-            Log.d(TAG, "onProgressChanged() called with: "
-                    + "seekBar = [" + seekBar + "], progress = [" + progress + "]");
-        }
-        if (fromUser) {
-            binding.currentDisplaySeek.setText(getTimeString(progress));
-        }
-    }
-
-    @Override
-    public void onStartTrackingTouch(final SeekBar seekBar) {
-        if (DEBUG) {
-            Log.d(TAG, "onStartTrackingTouch() called with: seekBar = [" + seekBar + "]");
-        }
-        if (getCurrentState() != STATE_PAUSED_SEEK) {
-            changeState(STATE_PAUSED_SEEK);
-        }
-
-        wasPlaying = simpleExoPlayer.getPlayWhenReady();
-        if (isPlaying()) {
-            simpleExoPlayer.setPlayWhenReady(false);
-        }
-
-        showControls(0);
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true,
-                DEFAULT_CONTROLS_DURATION);
-    }
-
-    @Override
-    public void onStopTrackingTouch(final SeekBar seekBar) {
-        if (DEBUG) {
-            Log.d(TAG, "onStopTrackingTouch() called with: seekBar = [" + seekBar + "]");
-        }
-
-        seekTo(seekBar.getProgress());
-        if (wasPlaying || simpleExoPlayer.getDuration() == seekBar.getProgress()) {
-            simpleExoPlayer.setPlayWhenReady(true);
-        }
-
-        binding.playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false,
-                200);
-
-        if (getCurrentState() == STATE_PAUSED_SEEK) {
-            changeState(STATE_BUFFERING);
-        }
-        if (!isProgressLoopRunning()) {
-            startProgressLoop();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public int getRendererIndex(final int trackIndex) {
-        if (simpleExoPlayer == null) {
-            return RENDERER_UNAVAILABLE;
-        }
-
-        for (int t = 0; t < simpleExoPlayer.getRendererCount(); t++) {
-            if (simpleExoPlayer.getRendererType(t) == trackIndex) {
-                return t;
-            }
-        }
-
-        return RENDERER_UNAVAILABLE;
-    }
-
-    public boolean isControlsVisible() {
-        return binding != null
-                && binding.playbackControlRoot.getVisibility() == View.VISIBLE;
-    }
-
-    /**
-     * Show a animation, and depending on goneOnEnd, will stay on the screen or be gone.
-     *
-     * @param drawableId the drawable that will be used to animate,
-     *                   pass -1 to clear any animation that is visible
-     * @param goneOnEnd  will set the animation view to GONE on the end of the animation
-     */
-    public void showAndAnimateControl(final int drawableId, final boolean goneOnEnd) {
-        if (DEBUG) {
-            Log.d(TAG, "showAndAnimateControl() called with: "
-                    + "drawableId = [" + drawableId + "], goneOnEnd = [" + goneOnEnd + "]");
-        }
-        if (controlViewAnimator != null && controlViewAnimator.isRunning()) {
-            if (DEBUG) {
-                Log.d(TAG, "showAndAnimateControl: controlViewAnimator.isRunning");
-            }
-            controlViewAnimator.end();
-        }
-
-        if (drawableId == -1) {
-            if (binding.controlAnimationView.getVisibility() == View.VISIBLE) {
-                controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(
-                        binding.controlAnimationView,
-                        PropertyValuesHolder.ofFloat(View.ALPHA, 1.0f, 0.0f),
-                        PropertyValuesHolder.ofFloat(View.SCALE_X, 1.4f, 1.0f),
-                        PropertyValuesHolder.ofFloat(View.SCALE_Y, 1.4f, 1.0f)
-                ).setDuration(DEFAULT_CONTROLS_DURATION);
-                controlViewAnimator.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(final Animator animation) {
-                        binding.controlAnimationView.setVisibility(View.GONE);
-                    }
-                });
-                controlViewAnimator.start();
-            }
-            return;
-        }
-
-        final float scaleFrom = goneOnEnd ? 1f : 1f;
-        final float scaleTo = goneOnEnd ? 1.8f : 1.4f;
-        final float alphaFrom = goneOnEnd ? 1f : 0f;
-        final float alphaTo = goneOnEnd ? 0f : 1f;
-
-
-        controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(
-                binding.controlAnimationView,
-                PropertyValuesHolder.ofFloat(View.ALPHA, alphaFrom, alphaTo),
-                PropertyValuesHolder.ofFloat(View.SCALE_X, scaleFrom, scaleTo),
-                PropertyValuesHolder.ofFloat(View.SCALE_Y, scaleFrom, scaleTo)
-        );
-        controlViewAnimator.setDuration(goneOnEnd ? 1000 : 500);
-        controlViewAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                binding.controlAnimationView.setVisibility(goneOnEnd ? View.GONE
-                        : View.VISIBLE);
-            }
-        });
-
-        binding.controlAnimationView.setVisibility(View.VISIBLE);
-        binding.controlAnimationView.setImageDrawable(AppCompatResources.getDrawable(context,
-                drawableId));
-        controlViewAnimator.start();
-    }
-
-    public boolean isSomePopupMenuVisible() {
-        return isSomePopupMenuVisible;
-    }
-
-    public void showControlsThenHide() {
-        if (DEBUG) {
-            Log.d(TAG, "showControlsThenHide() called");
-        }
-
-        final int hideTime = binding.playbackControlRoot.isInTouchMode()
-                ? DEFAULT_CONTROLS_HIDE_TIME
-                : DPAD_CONTROLS_HIDE_TIME;
-
-        showHideShadow(true, DEFAULT_CONTROLS_DURATION, 0);
-        animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0,
-                () -> hideControls(DEFAULT_CONTROLS_DURATION, hideTime));
-    }
-
-    public void showControls(final long duration) {
-        if (DEBUG) {
-            Log.d(TAG, "showControls() called");
-        }
-        controlsVisibilityHandler.removeCallbacksAndMessages(null);
-        showHideShadow(true, duration, 0);
-        animateView(binding.playbackControlRoot, true, duration);
-    }
-
-    public void safeHideControls(final long duration, final long delay) {
-        if (DEBUG) {
-            Log.d(TAG, "safeHideControls() called with: delay = [" + delay + "]");
-        }
-        if (binding.getRoot().isInTouchMode()) {
-            controlsVisibilityHandler.removeCallbacksAndMessages(null);
-            controlsVisibilityHandler.postDelayed(
-                    () -> animateView(binding.playbackControlRoot, false, duration),
-                    delay);
-        }
-    }
-
-    public void hideControls(final long duration, final long delay) {
-        if (DEBUG) {
-            Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
-        }
-        controlsVisibilityHandler.removeCallbacksAndMessages(null);
-        controlsVisibilityHandler.postDelayed(() -> {
-            showHideShadow(false, duration, 0);
-            animateView(binding.playbackControlRoot, false, duration);
-        }, delay);
-    }
-
-    public void hideControlsAndButton(final long duration, final long delay, final View button) {
-        if (DEBUG) {
-            Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
-        }
-        controlsVisibilityHandler.removeCallbacksAndMessages(null);
-        controlsVisibilityHandler
-                .postDelayed(hideControlsAndButtonHandler(duration, button), delay);
-    }
-
-    private Runnable hideControlsAndButtonHandler(final long duration, final View videoPlayPause) {
-        return () -> {
-            videoPlayPause.setVisibility(View.INVISIBLE);
-            animateView(binding.playbackControlRoot, false, duration);
-        };
-    }
-
-    void showHideShadow(final boolean show, final long duration, final long delay) {
-        animateView(binding.playerTopShadow, show, duration, delay, null);
-        animateView(binding.playerBottomShadow, show, duration, delay, null);
-    }
-
-    public abstract void hideSystemUIIfNeeded();
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Getters and Setters
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Nullable
-    public String getPlaybackQuality() {
-        return resolver.getPlaybackQuality();
-    }
-
-    public void setPlaybackQuality(final String quality) {
-        this.resolver.setPlaybackQuality(quality);
-    }
-
-    public ExpandableSurfaceView getSurfaceView() {
-        return binding.surfaceView;
-    }
-
-    public boolean wasPlaying() {
-        return wasPlaying;
-    }
-
-    @Nullable
-    public VideoStream getSelectedVideoStream() {
-        return (selectedStreamIndex >= 0 && availableStreams != null
-                && availableStreams.size() > selectedStreamIndex)
-                ? availableStreams.get(selectedStreamIndex) : null;
-    }
-
-    public Handler getControlsVisibilityHandler() {
-        return controlsVisibilityHandler;
-    }
-
-    @NonNull
-    public View getRootView() {
-        return binding.getRoot();
-    }
-
-    @NonNull
-    public View getLoadingPanel() {
-        return binding.loadingPanel;
-    }
-
-    @NonNull
-    public View getPlaybackControlRoot() {
-        return binding.playbackControlRoot;
-    }
-
-    @NonNull
-    public TextView getCurrentDisplaySeek() {
-        return binding.currentDisplaySeek;
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
deleted file mode 100644
index 949b11374c7..00000000000
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ /dev/null
@@ -1,2076 +0,0 @@
-/*
- * Copyright 2017 Mauricio Colli <mauriciocolli@outlook.com>
- * Part of NewPipe
- *
- * License: GPL-3.0+
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.schabi.newpipe.player;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.database.ContentObserver;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.PixelFormat;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Handler;
-import android.provider.Settings;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.GestureDetector;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.animation.AnticipateInterpolator;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.DisplayCutoutCompat;
-import androidx.core.view.ViewCompat;
-import androidx.preference.PreferenceManager;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.text.CaptionStyleCompat;
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
-import com.google.android.exoplayer2.ui.SubtitleView;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.PlayerBinding;
-import org.schabi.newpipe.databinding.PlayerPopupCloseOverlayBinding;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
-import org.schabi.newpipe.player.event.PlayerEventListener;
-import org.schabi.newpipe.player.event.PlayerGestureListener;
-import org.schabi.newpipe.player.event.PlayerServiceEventListener;
-import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
-import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
-import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder;
-import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
-import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
-import org.schabi.newpipe.player.resolver.MediaSourceTag;
-import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
-import org.schabi.newpipe.util.AnimationUtils;
-import org.schabi.newpipe.util.DeviceUtils;
-import org.schabi.newpipe.util.KoreUtil;
-import org.schabi.newpipe.util.ListHelper;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.ShareUtils;
-
-import java.util.List;
-
-import static org.schabi.newpipe.extractor.ServiceList.YouTube;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_CLOSE;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_OPEN_CONTROLS;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PAUSE;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_REPEAT;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
-import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
-import static org.schabi.newpipe.util.AnimationUtils.Type.SLIDE_AND_ALPHA;
-import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
-import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
-import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
-/**
- * Unified UI for all players.
- *
- * @author mauriciocolli
- */
-
-public class VideoPlayerImpl extends VideoPlayer
-        implements View.OnLayoutChangeListener,
-        PlaybackParameterDialog.Callback,
-        View.OnLongClickListener {
-    private static final String TAG = ".VideoPlayerImpl";
-
-    static final String POPUP_SAVED_WIDTH = "popup_saved_width";
-    static final String POPUP_SAVED_X = "popup_saved_x";
-    static final String POPUP_SAVED_Y = "popup_saved_y";
-    private static final int IDLE_WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-            | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
-    private static final int ONGOING_PLAYBACK_WINDOW_FLAGS = IDLE_WINDOW_FLAGS
-            | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-
-    private static final float MAX_GESTURE_LENGTH = 0.75f;
-
-    private ItemTouchHelper itemTouchHelper;
-
-    private boolean queueVisible;
-    private MainPlayer.PlayerType playerType = MainPlayer.PlayerType.VIDEO;
-
-    private int maxGestureLength;
-
-    private boolean audioOnly = false;
-    private boolean isFullscreen = false;
-    private boolean isVerticalVideo = false;
-    private boolean fragmentIsVisible = false;
-    boolean shouldUpdateOnProgress;
-
-    private final MainPlayer service;
-    private PlayerServiceEventListener fragmentListener;
-    private PlayerEventListener activityListener;
-    private GestureDetector gestureDetector;
-    private final SharedPreferences defaultPreferences;
-    private ContentObserver settingsContentObserver;
-    @NonNull
-    private final AudioPlaybackResolver resolver;
-
-    // Popup
-    private WindowManager.LayoutParams popupLayoutParams;
-    public WindowManager windowManager;
-
-    private PlayerPopupCloseOverlayBinding closeOverlayBinding;
-
-    public boolean isPopupClosing = false;
-
-    private float screenWidth;
-    private float screenHeight;
-    private float popupWidth;
-    private float popupHeight;
-    private float minimumWidth;
-    private float minimumHeight;
-    private float maximumWidth;
-    private float maximumHeight;
-    // Popup end
-
-
-    @Override
-    public void handleIntent(final Intent intent) {
-        if (intent.getStringExtra(VideoPlayer.PLAY_QUEUE_KEY) == null) {
-            return;
-        }
-
-        final MainPlayer.PlayerType oldPlayerType = playerType;
-        choosePlayerTypeFromIntent(intent);
-        audioOnly = audioPlayerSelected();
-
-        // We need to setup audioOnly before super(), see "sourceOf"
-        super.handleIntent(intent);
-
-        if (oldPlayerType != playerType && playQueue != null) {
-            // If playerType changes from one to another we should reload the player
-            // (to disable/enable video stream or to set quality)
-            setRecovery();
-            reload();
-        }
-
-        setupElementsVisibility();
-        setupElementsSize();
-
-        if (audioPlayerSelected()) {
-            service.removeViewFromParent();
-        } else if (popupPlayerSelected()) {
-            getRootView().setVisibility(View.VISIBLE);
-            initPopup();
-            initPopupCloseOverlay();
-            binding.playPauseButton.requestFocus();
-        } else {
-            getRootView().setVisibility(View.VISIBLE);
-            initVideoPlayer();
-            onQueueClosed();
-            // Android TV: without it focus will frame the whole player
-            binding.playPauseButton.requestFocus();
-
-            if (simpleExoPlayer.getPlayWhenReady()) {
-                onPlay();
-            } else {
-                onPause();
-            }
-        }
-        NavigationHelper.sendPlayerStartedEvent(service);
-    }
-
-    VideoPlayerImpl(final MainPlayer service) {
-        super("MainPlayer" + TAG, service);
-        this.service = service;
-        this.shouldUpdateOnProgress = true;
-        this.windowManager = ContextCompat.getSystemService(service, WindowManager.class);
-        this.defaultPreferences = PreferenceManager.getDefaultSharedPreferences(service);
-        this.resolver = new AudioPlaybackResolver(context, dataSource);
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void initViews(@NonNull final PlayerBinding binding) {
-        super.initViews(binding);
-
-        binding.titleTextView.setSelected(true);
-        binding.channelTextView.setSelected(true);
-
-        // Prevent hiding of bottom sheet via swipe inside queue
-        binding.playQueue.setNestedScrollingEnabled(false);
-    }
-
-    @Override
-    protected void setupSubtitleView(final @NonNull SubtitleView view,
-                                     final float captionScale,
-                                     @NonNull final CaptionStyleCompat captionStyle) {
-        if (popupPlayerSelected()) {
-            final float captionRatio = (captionScale - 1.0f) / 5.0f + 1.0f;
-            view.setFractionalTextSize(SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * captionRatio);
-        } else {
-            final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-            final int minimumLength = Math.min(metrics.heightPixels, metrics.widthPixels);
-            final float captionRatioInverse = 20f + 4f * (1.0f - captionScale);
-            view.setFixedTextSize(TypedValue.COMPLEX_UNIT_PX,
-                    (float) minimumLength / captionRatioInverse);
-        }
-        view.setApplyEmbeddedStyles(captionStyle == CaptionStyleCompat.DEFAULT);
-        view.setStyle(captionStyle);
-    }
-
-    /**
-     * This method ensures that popup and main players have different look.
-     * We use one layout for both players and need to decide what to show and what to hide.
-     * Additional measuring should be done inside {@link #setupElementsSize}.
-     */
-    private void setupElementsVisibility() {
-        if (popupPlayerSelected()) {
-            binding.fullScreenButton.setVisibility(View.VISIBLE);
-            binding.screenRotationButton.setVisibility(View.GONE);
-            binding.resizeTextView.setVisibility(View.GONE);
-            binding.metadataView.setVisibility(View.GONE);
-            binding.queueButton.setVisibility(View.GONE);
-            binding.moreOptionsButton.setVisibility(View.GONE);
-            binding.topControls.setOrientation(LinearLayout.HORIZONTAL);
-            binding.primaryControls.getLayoutParams().width =
-                    LinearLayout.LayoutParams.WRAP_CONTENT;
-            binding.secondaryControls.setAlpha(1.0f);
-            binding.secondaryControls.setVisibility(View.VISIBLE);
-            binding.secondaryControls.setTranslationY(0);
-            binding.share.setVisibility(View.GONE);
-            binding.playWithKodi.setVisibility(View.GONE);
-            binding.openInBrowser.setVisibility(View.GONE);
-            binding.switchMute.setVisibility(View.GONE);
-            binding.playerCloseButton.setVisibility(View.GONE);
-            binding.topControls.bringToFront();
-            binding.topControls.setClickable(false);
-            binding.topControls.setFocusable(false);
-            binding.bottomControls.bringToFront();
-            onQueueClosed();
-        } else {
-            binding.fullScreenButton.setVisibility(View.GONE);
-            setupScreenRotationButton();
-            binding.resizeTextView.setVisibility(View.VISIBLE);
-            binding.metadataView.setVisibility(View.VISIBLE);
-            binding.moreOptionsButton.setVisibility(View.VISIBLE);
-            binding.topControls.setOrientation(LinearLayout.VERTICAL);
-            binding.primaryControls.getLayoutParams().width =
-                    LinearLayout.LayoutParams.MATCH_PARENT;
-            binding.secondaryControls.setVisibility(View.INVISIBLE);
-            binding.moreOptionsButton.setImageDrawable(AppCompatResources.getDrawable(service,
-                    R.drawable.ic_expand_more_white_24dp));
-            binding.share.setVisibility(View.VISIBLE);
-            showHideKodiButton();
-            binding.openInBrowser.setVisibility(View.VISIBLE);
-            binding.switchMute.setVisibility(View.VISIBLE);
-            binding.playerCloseButton.setVisibility(isFullscreen ? View.GONE : View.VISIBLE);
-            // Top controls have a large minHeight which is allows to drag the player
-            // down in fullscreen mode (just larger area to make easy to locate by finger)
-            binding.topControls.setClickable(true);
-            binding.topControls.setFocusable(true);
-        }
-        if (!isFullscreen()) {
-            binding.titleTextView.setVisibility(View.GONE);
-            binding.channelTextView.setVisibility(View.GONE);
-        } else {
-            binding.titleTextView.setVisibility(View.VISIBLE);
-            binding.channelTextView.setVisibility(View.VISIBLE);
-        }
-        setMuteButton(binding.switchMute, isMuted());
-
-        animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION, 0);
-    }
-
-    /**
-     * Changes padding, size of elements based on player selected right now.
-     * Popup player has small padding in comparison with the main player
-     */
-    private void setupElementsSize() {
-        if (popupPlayerSelected()) {
-            final int controlsPadding = service.getResources()
-                    .getDimensionPixelSize(R.dimen.player_popup_controls_padding);
-            final int buttonsPadding = service.getResources()
-                    .getDimensionPixelSize(R.dimen.player_popup_buttons_padding);
-            binding.topControls.setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
-            binding.bottomControls.setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
-            binding.qualityTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
-                    buttonsPadding);
-            binding.playbackSpeed.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
-                    buttonsPadding);
-            binding.captionTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
-                    buttonsPadding);
-            binding.playbackSpeed.setMinimumWidth(0);
-        } else if (videoPlayerSelected()) {
-            final int buttonsMinWidth = service.getResources()
-                    .getDimensionPixelSize(R.dimen.player_main_buttons_min_width);
-            final int playerTopPadding = service.getResources()
-                    .getDimensionPixelSize(R.dimen.player_main_top_padding);
-            final int controlsPadding = service.getResources()
-                    .getDimensionPixelSize(R.dimen.player_main_controls_padding);
-            final int buttonsPadding = service.getResources()
-                    .getDimensionPixelSize(R.dimen.player_main_buttons_padding);
-            binding.topControls.setPaddingRelative(controlsPadding, playerTopPadding,
-                    controlsPadding, 0);
-            binding.bottomControls.setPaddingRelative(controlsPadding, 0, controlsPadding, 0);
-            binding.qualityTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
-                    buttonsPadding);
-            binding.playbackSpeed.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
-                    buttonsPadding);
-            binding.playbackSpeed.setMinimumWidth(buttonsMinWidth);
-            binding.captionTextView.setPadding(buttonsPadding, buttonsPadding, buttonsPadding,
-                    buttonsPadding);
-        }
-    }
-
-    @Override
-    public void initListeners() {
-        super.initListeners();
-
-        final PlayerGestureListener listener = new PlayerGestureListener(this, service);
-        gestureDetector = new GestureDetector(context, listener);
-        getRootView().setOnTouchListener(listener);
-
-        binding.queueButton.setOnClickListener(this);
-        binding.repeatButton.setOnClickListener(this);
-        binding.shuffleButton.setOnClickListener(this);
-
-        binding.playPauseButton.setOnClickListener(this);
-        binding.playPreviousButton.setOnClickListener(this);
-        binding.playNextButton.setOnClickListener(this);
-
-        binding.moreOptionsButton.setOnClickListener(this);
-        binding.moreOptionsButton.setOnLongClickListener(this);
-        binding.share.setOnClickListener(this);
-        binding.fullScreenButton.setOnClickListener(this);
-        binding.screenRotationButton.setOnClickListener(this);
-        binding.playWithKodi.setOnClickListener(this);
-        binding.openInBrowser.setOnClickListener(this);
-        binding.playerCloseButton.setOnClickListener(this);
-        binding.switchMute.setOnClickListener(this);
-
-        settingsContentObserver = new ContentObserver(new Handler()) {
-            @Override
-            public void onChange(final boolean selfChange) {
-                setupScreenRotationButton();
-            }
-        };
-        service.getContentResolver().registerContentObserver(
-                Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), false,
-                settingsContentObserver);
-        getRootView().addOnLayoutChangeListener(this);
-
-        ViewCompat.setOnApplyWindowInsetsListener(binding.playQueuePanel,
-                (view, windowInsets) -> {
-                    final DisplayCutoutCompat cutout = windowInsets.getDisplayCutout();
-                    if (cutout != null) {
-                        view.setPadding(cutout.getSafeInsetLeft(), cutout.getSafeInsetTop(),
-                                cutout.getSafeInsetRight(), cutout.getSafeInsetBottom());
-                    }
-                    return windowInsets;
-                });
-
-        // PlaybackControlRoot already consumed window insets but we should pass them to
-        // player_overlays too. Without it they will be off-centered
-        binding.playbackControlRoot.addOnLayoutChangeListener(
-                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) ->
-                        binding.playerOverlays.setPadding(
-                                v.getPaddingLeft(),
-                                v.getPaddingTop(),
-                                v.getPaddingRight(),
-                                v.getPaddingBottom()));
-    }
-
-    public boolean onKeyDown(final int keyCode) {
-        switch (keyCode) {
-            default:
-                break;
-            case KeyEvent.KEYCODE_SPACE:
-                if (isFullscreen) {
-                    onPlayPause();
-                }
-                break;
-            case KeyEvent.KEYCODE_BACK:
-                if (DeviceUtils.isTv(service) && isControlsVisible()) {
-                    hideControls(0, 0);
-                    return true;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_UP:
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-            case KeyEvent.KEYCODE_DPAD_CENTER:
-                if (getRootView().hasFocus() && !binding.playbackControlRoot.hasFocus()) {
-                    // do not interfere with focus in playlist etc.
-                    return false;
-                }
-
-                if (getCurrentState() == BasePlayer.STATE_BLOCKED) {
-                    return true;
-                }
-
-                if (!isControlsVisible()) {
-                    if (!queueVisible) {
-                        binding.playPauseButton.requestFocus();
-                    }
-                    showControlsThenHide();
-                    showSystemUIPartially();
-                    return true;
-                } else {
-                    hideControls(DEFAULT_CONTROLS_DURATION, DPAD_CONTROLS_HIDE_TIME);
-                }
-                break;
-        }
-
-        return false;
-    }
-
-    public AppCompatActivity getParentActivity() {
-        // ! instanceof ViewGroup means that view was added via windowManager for Popup
-        if (binding == null || binding.getRoot().getParent() == null
-                || !(binding.getRoot().getParent() instanceof ViewGroup)) {
-            return null;
-        }
-
-        final ViewGroup parent = (ViewGroup) binding.getRoot().getParent();
-        return (AppCompatActivity) parent.getContext();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // View
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void setRepeatModeButton(final ImageButton imageButton, final int repeatMode) {
-        switch (repeatMode) {
-            case Player.REPEAT_MODE_OFF:
-                imageButton.setImageResource(R.drawable.exo_controls_repeat_off);
-                break;
-            case Player.REPEAT_MODE_ONE:
-                imageButton.setImageResource(R.drawable.exo_controls_repeat_one);
-                break;
-            case Player.REPEAT_MODE_ALL:
-                imageButton.setImageResource(R.drawable.exo_controls_repeat_all);
-                break;
-        }
-    }
-
-    private void setShuffleButton(final ImageButton button, final boolean shuffled) {
-        final int shuffleAlpha = shuffled ? 255 : 77;
-        button.setImageAlpha(shuffleAlpha);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Playback Parameters Listener
-    ////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void onPlaybackParameterChanged(final float playbackTempo, final float playbackPitch,
-                                           final boolean playbackSkipSilence) {
-        setPlaybackParameters(playbackTempo, playbackPitch, playbackSkipSilence);
-    }
-
-    @Override
-    public void onVideoSizeChanged(final int width, final int height,
-                                   final int unappliedRotationDegrees,
-                                   final float pixelWidthHeightRatio) {
-        super.onVideoSizeChanged(width, height, unappliedRotationDegrees, pixelWidthHeightRatio);
-        isVerticalVideo = width < height;
-        prepareOrientation();
-        setupScreenRotationButton();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // ExoPlayer Video Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    void onShuffleOrRepeatModeChanged() {
-        updatePlaybackButtons();
-        updatePlayback();
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    @Override
-    public void onRepeatModeChanged(final int i) {
-        super.onRepeatModeChanged(i);
-        onShuffleOrRepeatModeChanged();
-    }
-
-    @Override
-    public void onShuffleClicked() {
-        super.onShuffleClicked();
-        onShuffleOrRepeatModeChanged();
-
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playback Listener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onPlayerError(final ExoPlaybackException error) {
-        super.onPlayerError(error);
-
-        if (fragmentListener != null) {
-            fragmentListener.onPlayerError(error);
-        }
-    }
-
-    @Override
-    public void onTimelineChanged(final Timeline timeline, final int reason) {
-        super.onTimelineChanged(timeline, reason);
-        // force recreate notification to ensure seek bar is shown when preparation finishes
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, true);
-    }
-
-    @Override
-    protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
-        super.onMetadataChanged(tag);
-
-        showHideKodiButton();
-
-        binding.titleTextView.setText(tag.getMetadata().getName());
-        binding.channelTextView.setText(tag.getMetadata().getUploaderName());
-
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-        updateMetadata();
-    }
-
-    @Override
-    public void onPlaybackShutdown() {
-        if (DEBUG) {
-            Log.d(TAG, "onPlaybackShutdown() called");
-        }
-        service.onDestroy();
-    }
-
-    @Override
-    public void onMuteUnmuteButtonClicked() {
-        super.onMuteUnmuteButtonClicked();
-        updatePlayback();
-        setMuteButton(binding.switchMute, isMuted());
-    }
-
-    @Override
-    public void onUpdateProgress(final int currentProgress,
-                                 final int duration, final int bufferPercent) {
-        super.onUpdateProgress(currentProgress, duration, bufferPercent);
-        updateProgress(currentProgress, duration, bufferPercent);
-
-        final boolean showThumbnail =
-                sharedPreferences.getBoolean(
-                        context.getString(R.string.show_thumbnail_key),
-                        true);
-        // setMetadata only updates the metadata when any of the metadata keys are null
-        mediaSessionManager.setMetadata(getVideoTitle(), getUploaderName(),
-                showThumbnail ? getThumbnail() : null, duration);
-    }
-
-    @Override
-    public void onPlayQueueEdited() {
-        updatePlayback();
-        showOrHideButtons();
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    @Override
-    @Nullable
-    public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
-        // For LiveStream or video/popup players we can use super() method
-        // but not for audio player
-        if (!audioOnly) {
-            return super.sourceOf(item, info);
-        } else {
-            return resolver.resolve(info);
-        }
-    }
-
-    @Override
-    public void onPlayPrevious() {
-        super.onPlayPrevious();
-        triggerProgressUpdate();
-    }
-
-    @Override
-    public void onPlayNext() {
-        super.onPlayNext();
-        triggerProgressUpdate();
-    }
-
-    @Override
-    protected void initPlayback(@NonNull final PlayQueue queue, final int repeatMode,
-                                final float playbackSpeed, final float playbackPitch,
-                                final boolean playbackSkipSilence,
-                                final boolean playOnReady, final boolean isMuted) {
-        super.initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                playbackSkipSilence, playOnReady, isMuted);
-        updateQueue();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Player Overrides
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void toggleFullscreen() {
-        if (DEBUG) {
-            Log.d(TAG, "toggleFullscreen() called");
-        }
-        if (popupPlayerSelected()
-                || simpleExoPlayer == null
-                || getCurrentMetadata() == null
-                || fragmentListener == null) {
-            return;
-        }
-
-        isFullscreen = !isFullscreen;
-        if (!isFullscreen) {
-            // Apply window insets because Android will not do it when orientation changes
-            // from landscape to portrait (open vertical video to reproduce)
-            getPlaybackControlRoot().setPadding(0, 0, 0, 0);
-        } else {
-            // Android needs tens milliseconds to send new insets but a user is able to see
-            // how controls changes it's position from `0` to `nav bar height` padding.
-            // So just hide the controls to hide this visual inconsistency
-            hideControls(0, 0);
-        }
-        fragmentListener.onFullscreenStateChanged(isFullscreen());
-
-        if (!isFullscreen()) {
-            binding.titleTextView.setVisibility(View.GONE);
-            binding.channelTextView.setVisibility(View.GONE);
-            binding.playerCloseButton.setVisibility(videoPlayerSelected()
-                    ? View.VISIBLE : View.GONE);
-        } else {
-            binding.titleTextView.setVisibility(View.VISIBLE);
-            binding.channelTextView.setVisibility(View.VISIBLE);
-            binding.playerCloseButton.setVisibility(View.GONE);
-        }
-        setupScreenRotationButton();
-    }
-
-    @Override
-    public void onClick(final View v) {
-        super.onClick(v);
-        if (v.getId() == binding.playPauseButton.getId()) {
-            onPlayPause();
-        } else if (v.getId() == binding.playPreviousButton.getId()) {
-            onPlayPrevious();
-        } else if (v.getId() == binding.playNextButton.getId()) {
-            onPlayNext();
-        } else if (v.getId() == binding.queueButton.getId()) {
-            onQueueClicked();
-            return;
-        } else if (v.getId() == binding.repeatButton.getId()) {
-            onRepeatClicked();
-            return;
-        } else if (v.getId() == binding.shuffleButton.getId()) {
-            onShuffleClicked();
-            return;
-        } else if (v.getId() == binding.moreOptionsButton.getId()) {
-            onMoreOptionsClicked();
-        } else if (v.getId() == binding.share.getId()) {
-            onShareClicked();
-        } else if (v.getId() == binding.playWithKodi.getId()) {
-            onPlayWithKodiClicked();
-        } else if (v.getId() == binding.openInBrowser.getId()) {
-            onOpenInBrowserClicked();
-        } else if (v.getId() == binding.fullScreenButton.getId()) {
-            setRecovery();
-            NavigationHelper.playOnMainPlayer(context, getPlayQueue(), true);
-            return;
-        } else if (v.getId() == binding.screenRotationButton.getId()) {
-            // Only if it's not a vertical video or vertical video but in landscape with locked
-            // orientation a screen orientation can be changed automatically
-            if (!isVerticalVideo
-                    || (service.isLandscape() && globalScreenOrientationLocked(service))) {
-                fragmentListener.onScreenRotationButtonClicked();
-            } else {
-                toggleFullscreen();
-            }
-        } else if (v.getId() == binding.switchMute.getId()) {
-            onMuteUnmuteButtonClicked();
-        } else if (v.getId() == binding.playerCloseButton.getId()) {
-            service.sendBroadcast(new Intent(VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER));
-        }
-
-        if (getCurrentState() != STATE_COMPLETED) {
-            getControlsVisibilityHandler().removeCallbacksAndMessages(null);
-            showHideShadow(true, DEFAULT_CONTROLS_DURATION, 0);
-            animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0,
-                    () -> {
-                        if (getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible()) {
-                            if (v.getId() == binding.playPauseButton.getId()
-                                    // Hide controls in fullscreen immediately
-                                    || (v.getId() == binding.screenRotationButton.getId()
-                                    && isFullscreen)) {
-                                hideControls(0, 0);
-                            } else {
-                                hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
-                            }
-                        }
-                    });
-        }
-    }
-
-    @Override
-    public boolean onLongClick(final View v) {
-        if (v.getId() == binding.moreOptionsButton.getId() && isFullscreen()) {
-            fragmentListener.onMoreOptionsLongClicked();
-            hideControls(0, 0);
-            hideSystemUIIfNeeded();
-        }
-        return true;
-    }
-
-    private void onQueueClicked() {
-        queueVisible = true;
-
-        hideSystemUIIfNeeded();
-        buildQueue();
-        updatePlaybackButtons();
-
-        hideControls(0, 0);
-        binding.playQueuePanel.requestFocus();
-        animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, true,
-                DEFAULT_CONTROLS_DURATION);
-
-        binding.playQueue.scrollToPosition(playQueue.getIndex());
-    }
-
-    public void onQueueClosed() {
-        if (!queueVisible) {
-            return;
-        }
-
-        animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, false,
-                DEFAULT_CONTROLS_DURATION, 0, () -> {
-                    // Even when queueLayout is GONE it receives touch events
-                    // and ruins normal behavior of the app. This line fixes it
-                    binding.playQueuePanel
-                            .setTranslationY(-binding.playQueuePanel.getHeight() * 5);
-                });
-        queueVisible = false;
-        binding.playPauseButton.requestFocus();
-    }
-
-    private void onMoreOptionsClicked() {
-        if (DEBUG) {
-            Log.d(TAG, "onMoreOptionsClicked() called");
-        }
-
-        final boolean isMoreControlsVisible =
-                binding.secondaryControls.getVisibility() == View.VISIBLE;
-
-        animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION,
-                isMoreControlsVisible ? 0 : 180);
-        animateView(binding.secondaryControls, SLIDE_AND_ALPHA, !isMoreControlsVisible,
-                DEFAULT_CONTROLS_DURATION, 0,
-                () -> {
-                    // Fix for a ripple effect on background drawable.
-                    // When view returns from GONE state it takes more milliseconds than returning
-                    // from INVISIBLE state. And the delay makes ripple background end to fast
-                    if (isMoreControlsVisible) {
-                        binding.secondaryControls.setVisibility(View.INVISIBLE);
-                    }
-                });
-        showControls(DEFAULT_CONTROLS_DURATION);
-    }
-
-    private void onShareClicked() {
-        // share video at the current time (youtube.com/watch?v=ID&t=SECONDS)
-        // Timestamp doesn't make sense in a live stream so drop it
-
-        final int ts = playbackSeekBar.getProgress() / 1000;
-        final MediaSourceTag metadata = getCurrentMetadata();
-        String videoUrl = getVideoUrl();
-        if (!isLive() && ts >= 0 && metadata != null
-                && metadata.getMetadata().getServiceId() == YouTube.getServiceId()) {
-            videoUrl += ("&t=" + ts);
-        }
-        ShareUtils.shareUrl(service,
-                getVideoTitle(),
-                videoUrl);
-    }
-
-    private void onPlayWithKodiClicked() {
-        if (getCurrentMetadata() == null) {
-            return;
-        }
-        onPause();
-        try {
-            NavigationHelper.playWithKore(getParentActivity(), Uri.parse(getVideoUrl()));
-        } catch (final Exception e) {
-            if (DEBUG) {
-                Log.i(TAG, "Failed to start kore", e);
-            }
-            KoreUtil.showInstallKoreDialog(getParentActivity());
-        }
-    }
-
-    private void onOpenInBrowserClicked() {
-        if (getCurrentMetadata() == null) {
-            return;
-        }
-
-        ShareUtils.openUrlInBrowser(getParentActivity(),
-                getCurrentMetadata().getMetadata().getOriginalUrl());
-    }
-
-    private void showHideKodiButton() {
-        final boolean kodiEnabled = defaultPreferences.getBoolean(
-                service.getString(R.string.show_play_with_kodi_key), false);
-        // show kodi button if it supports the current service and it is enabled in settings
-        final boolean showKodiButton = playQueue != null && playQueue.getItem() != null
-                && KoreUtil.shouldShowPlayWithKodi(context, playQueue.getItem().getServiceId());
-        binding.playWithKodi.setVisibility(videoPlayerSelected() && kodiEnabled
-                && showKodiButton ? View.VISIBLE : View.GONE);
-    }
-
-    private void setupScreenRotationButton() {
-        final boolean orientationLocked = PlayerHelper.globalScreenOrientationLocked(service);
-        final boolean showButton = videoPlayerSelected()
-                && (orientationLocked || isVerticalVideo || DeviceUtils.isTablet(service));
-        binding.screenRotationButton.setVisibility(showButton ? View.VISIBLE : View.GONE);
-        binding.screenRotationButton.setImageDrawable(AppCompatResources.getDrawable(service,
-                isFullscreen() ? R.drawable.ic_fullscreen_exit_white_24dp
-                        : R.drawable.ic_fullscreen_white_24dp));
-    }
-
-    private void prepareOrientation() {
-        final boolean orientationLocked = PlayerHelper.globalScreenOrientationLocked(service);
-        if (orientationLocked
-                && isFullscreen()
-                && service.isLandscape() == isVerticalVideo
-                && !DeviceUtils.isTv(service)
-                && !DeviceUtils.isTablet(service)
-                && fragmentListener != null) {
-            fragmentListener.onScreenRotationButtonClicked();
-        }
-    }
-
-    @Override
-    public void onPlaybackSpeedClicked() {
-        if (videoPlayerSelected()) {
-            PlaybackParameterDialog
-                    .newInstance(
-                            getPlaybackSpeed(), getPlaybackPitch(), getPlaybackSkipSilence(), this)
-                    .show(getParentActivity().getSupportFragmentManager(), null);
-        } else {
-            super.onPlaybackSpeedClicked();
-        }
-    }
-
-    @Override
-    public void onStopTrackingTouch(final SeekBar seekBar) {
-        super.onStopTrackingTouch(seekBar);
-        if (wasPlaying()) {
-            showControlsThenHide();
-        }
-    }
-
-    @Override
-    public void onDismiss(final PopupMenu menu) {
-        super.onDismiss(menu);
-        if (isPlaying()) {
-            hideControls(DEFAULT_CONTROLS_DURATION, 0);
-            hideSystemUIIfNeeded();
-        }
-    }
-
-    @Override
-    @SuppressWarnings("checkstyle:ParameterNumber")
-    public void onLayoutChange(final View view, final int l, final int t, final int r, final int b,
-                               final int ol, final int ot, final int or, final int ob) {
-        if (l != ol || t != ot || r != or || b != ob) {
-            // Use smaller value to be consistent between screen orientations
-            // (and to make usage easier)
-            final int width = r - l;
-            final int height = b - t;
-            final int min = Math.min(width, height);
-            maxGestureLength = (int) (min * MAX_GESTURE_LENGTH);
-
-            if (DEBUG) {
-                Log.d(TAG, "maxGestureLength = " + maxGestureLength);
-            }
-
-            binding.volumeProgressBar.setMax(maxGestureLength);
-            binding.brightnessProgressBar.setMax(maxGestureLength);
-
-            setInitialGestureValues();
-            binding.playQueuePanel.getLayoutParams().height = height
-                    - binding.playQueuePanel.getTop();
-        }
-    }
-
-    @Override
-    protected int nextResizeMode(final int currentResizeMode) {
-        final int newResizeMode;
-        switch (currentResizeMode) {
-            case AspectRatioFrameLayout.RESIZE_MODE_FIT:
-                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FILL;
-                break;
-            case AspectRatioFrameLayout.RESIZE_MODE_FILL:
-                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
-                break;
-            default:
-                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
-                break;
-        }
-
-        storeResizeMode(newResizeMode);
-        return newResizeMode;
-    }
-
-    private void storeResizeMode(final @AspectRatioFrameLayout.ResizeMode int resizeMode) {
-        defaultPreferences.edit()
-                .putInt(service.getString(R.string.last_resize_mode), resizeMode)
-                .apply();
-    }
-
-    private void restoreResizeMode() {
-        setResizeMode(defaultPreferences.getInt(
-                service.getString(R.string.last_resize_mode),
-                AspectRatioFrameLayout.RESIZE_MODE_FIT));
-    }
-
-    @Override
-    protected VideoPlaybackResolver.QualityResolver getQualityResolver() {
-        return new VideoPlaybackResolver.QualityResolver() {
-            @Override
-            public int getDefaultResolutionIndex(final List<VideoStream> sortedVideos) {
-                return videoPlayerSelected()
-                        ? ListHelper.getDefaultResolutionIndex(context, sortedVideos)
-                        : ListHelper.getPopupDefaultResolutionIndex(context, sortedVideos);
-            }
-
-            @Override
-            public int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
-                                                  final String playbackQuality) {
-                return videoPlayerSelected()
-                        ? getResolutionIndex(context, sortedVideos, playbackQuality)
-                        : getPopupResolutionIndex(context, sortedVideos, playbackQuality);
-            }
-        };
-    }
-
-        /*//////////////////////////////////////////////////////////////////////////
-        // States
-        //////////////////////////////////////////////////////////////////////////*/
-
-    private void animatePlayButtons(final boolean show, final int duration) {
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show,
-                duration);
-
-        boolean showQueueButtons = show;
-        if (playQueue == null) {
-            showQueueButtons = false;
-        }
-
-        if (!showQueueButtons || playQueue.getIndex() > 0) {
-            animateView(
-                binding.playPreviousButton,
-                AnimationUtils.Type.SCALE_AND_ALPHA,
-                showQueueButtons,
-                duration);
-        }
-        if (!showQueueButtons || playQueue.getIndex() + 1 < playQueue.getStreams().size()) {
-            animateView(
-                binding.playNextButton,
-                AnimationUtils.Type.SCALE_AND_ALPHA,
-                showQueueButtons,
-                duration);
-        }
-    }
-
-    @Override
-    public void changeState(final int state) {
-        super.changeState(state);
-        updatePlayback();
-    }
-
-    @Override
-    public void onBlocked() {
-        super.onBlocked();
-        binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
-        animatePlayButtons(false, 100);
-        getRootView().setKeepScreenOn(false);
-
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    @Override
-    public void onBuffering() {
-        super.onBuffering();
-        getRootView().setKeepScreenOn(true);
-
-        if (NotificationUtil.getInstance().shouldUpdateBufferingSlot()) {
-            NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-        }
-    }
-
-    @Override
-    public void onPlaying() {
-        super.onPlaying();
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false,
-                80, 0, () -> {
-                    binding.playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
-                    animatePlayButtons(true, 200);
-                    if (!queueVisible) {
-                        binding.playPauseButton.requestFocus();
-                    }
-                });
-
-        updateWindowFlags(ONGOING_PLAYBACK_WINDOW_FLAGS);
-        checkLandscape();
-        getRootView().setKeepScreenOn(true);
-
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    @Override
-    public void onPaused() {
-        super.onPaused();
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA,
-                false, 80, 0, () -> {
-                    binding.playPauseButton
-                            .setImageResource(R.drawable.ic_play_arrow_white_24dp);
-                    animatePlayButtons(true, 200);
-                    if (!queueVisible) {
-                        binding.playPauseButton.requestFocus();
-                    }
-                });
-
-        updateWindowFlags(IDLE_WINDOW_FLAGS);
-
-        // Remove running notification when user don't want music (or video in popup)
-        // to be played in background
-        if (!minimizeOnPopupEnabled() && !backgroundPlaybackEnabled() && videoPlayerSelected()) {
-            NotificationUtil.getInstance().cancelNotificationAndStopForeground(service);
-        } else {
-            NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-        }
-
-        getRootView().setKeepScreenOn(false);
-    }
-
-    @Override
-    public void onPausedSeek() {
-        super.onPausedSeek();
-        animatePlayButtons(false, 100);
-        getRootView().setKeepScreenOn(true);
-
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-
-    @Override
-    public void onCompleted() {
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false,
-                0, 0, () -> {
-                    binding.playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
-                    animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
-                });
-
-        getRootView().setKeepScreenOn(false);
-        updateWindowFlags(IDLE_WINDOW_FLAGS);
-
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-        if (isFullscreen) {
-            toggleFullscreen();
-        }
-        super.onCompleted();
-    }
-
-    @Override
-    public void destroy() {
-        super.destroy();
-        service.getContentResolver().unregisterContentObserver(settingsContentObserver);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Broadcast Receiver
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    protected void setupBroadcastReceiver(final IntentFilter intentFilter) {
-        super.setupBroadcastReceiver(intentFilter);
-        if (DEBUG) {
-            Log.d(TAG, "setupBroadcastReceiver() called with: "
-                    + "intentFilter = [" + intentFilter + "]");
-        }
-
-        intentFilter.addAction(ACTION_CLOSE);
-        intentFilter.addAction(ACTION_PLAY_PAUSE);
-        intentFilter.addAction(ACTION_OPEN_CONTROLS);
-        intentFilter.addAction(ACTION_REPEAT);
-        intentFilter.addAction(ACTION_PLAY_PREVIOUS);
-        intentFilter.addAction(ACTION_PLAY_NEXT);
-        intentFilter.addAction(ACTION_FAST_REWIND);
-        intentFilter.addAction(ACTION_FAST_FORWARD);
-        intentFilter.addAction(ACTION_SHUFFLE);
-        intentFilter.addAction(ACTION_RECREATE_NOTIFICATION);
-
-        intentFilter.addAction(VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED);
-        intentFilter.addAction(VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED);
-
-        intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
-        intentFilter.addAction(Intent.ACTION_SCREEN_ON);
-        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-
-        intentFilter.addAction(Intent.ACTION_HEADSET_PLUG);
-    }
-
-    @Override
-    public void onBroadcastReceived(final Intent intent) {
-        super.onBroadcastReceived(intent);
-        if (intent == null || intent.getAction() == null) {
-            return;
-        }
-
-        if (DEBUG) {
-            Log.d(TAG, "onBroadcastReceived() called with: intent = [" + intent + "]");
-        }
-
-        switch (intent.getAction()) {
-            case ACTION_CLOSE:
-                service.onDestroy();
-                break;
-            case ACTION_PLAY_NEXT:
-                onPlayNext();
-                break;
-            case ACTION_PLAY_PREVIOUS:
-                onPlayPrevious();
-                break;
-            case ACTION_FAST_FORWARD:
-                onFastForward();
-                break;
-            case ACTION_FAST_REWIND:
-                onFastRewind();
-                break;
-            case ACTION_PLAY_PAUSE:
-                onPlayPause();
-                if (!fragmentIsVisible) {
-                    // Ensure that we have audio-only stream playing when a user
-                    // started to play from notification's play button from outside of the app
-                    onFragmentStopped();
-                }
-                break;
-            case ACTION_REPEAT:
-                onRepeatClicked();
-                break;
-            case ACTION_SHUFFLE:
-                onShuffleClicked();
-                break;
-            case ACTION_RECREATE_NOTIFICATION:
-                NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, true);
-                break;
-            case Intent.ACTION_HEADSET_PLUG: //FIXME
-                /*notificationManager.cancel(NOTIFICATION_ID);
-                mediaSessionManager.dispose();
-                mediaSessionManager.enable(getBaseContext(), basePlayerImpl.simpleExoPlayer);*/
-                break;
-            case VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED:
-                fragmentIsVisible = true;
-                useVideoSource(true);
-                break;
-            case VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED:
-                fragmentIsVisible = false;
-                onFragmentStopped();
-                break;
-            case Intent.ACTION_CONFIGURATION_CHANGED:
-                assureCorrectAppLanguage(service);
-                if (DEBUG) {
-                    Log.d(TAG, "onConfigurationChanged() called");
-                }
-                if (popupPlayerSelected()) {
-                    updateScreenSize();
-                    updatePopupSize(getPopupLayoutParams().width, -1);
-                    checkPopupPositionBounds();
-                }
-                // Close it because when changing orientation from portrait
-                // (in fullscreen mode) the size of queue layout can be larger than the screen size
-                onQueueClosed();
-                break;
-            case Intent.ACTION_SCREEN_ON:
-                shouldUpdateOnProgress = true;
-                // Interrupt playback only when screen turns on
-                // and user is watching video in popup player.
-                // Same actions for video player will be handled in ACTION_VIDEO_FRAGMENT_RESUMED
-                if (popupPlayerSelected() && (isPlaying() || isLoading())) {
-                    useVideoSource(true);
-                }
-                break;
-            case Intent.ACTION_SCREEN_OFF:
-                shouldUpdateOnProgress = false;
-                // Interrupt playback only when screen turns off with popup player working
-                if (popupPlayerSelected() && (isPlaying() || isLoading())) {
-                    useVideoSource(false);
-                }
-                break;
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Thumbnail Loading
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onLoadingComplete(final String imageUri,
-                                  final View view,
-                                  final Bitmap loadedImage) {
-        super.onLoadingComplete(imageUri, view, loadedImage);
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    @Override
-    public void onLoadingFailed(final String imageUri,
-                                final View view,
-                                final FailReason failReason) {
-        super.onLoadingFailed(imageUri, view, failReason);
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    @Override
-    public void onLoadingCancelled(final String imageUri, final View view) {
-        super.onLoadingCancelled(imageUri, view);
-        NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void setInitialGestureValues() {
-        if (getAudioReactor() != null) {
-            final float currentVolumeNormalized = (float) getAudioReactor()
-                    .getVolume() / getAudioReactor().getMaxVolume();
-            binding.volumeProgressBar.setProgress(
-                    (int) (binding.volumeProgressBar.getMax() * currentVolumeNormalized));
-        }
-    }
-
-    private void choosePlayerTypeFromIntent(final Intent intent) {
-        // If you want to open popup from the app just include Constants.POPUP_ONLY into an extra
-        if (intent.getIntExtra(PLAYER_TYPE, PLAYER_TYPE_VIDEO) == PLAYER_TYPE_AUDIO) {
-            playerType = MainPlayer.PlayerType.AUDIO;
-        } else if (intent.getIntExtra(PLAYER_TYPE, PLAYER_TYPE_VIDEO) == PLAYER_TYPE_POPUP) {
-            playerType = MainPlayer.PlayerType.POPUP;
-        } else {
-            playerType = MainPlayer.PlayerType.VIDEO;
-        }
-    }
-
-    public boolean backgroundPlaybackEnabled() {
-        return PlayerHelper.getMinimizeOnExitAction(service) == MINIMIZE_ON_EXIT_MODE_BACKGROUND;
-    }
-
-    public boolean minimizeOnPopupEnabled() {
-        return PlayerHelper.getMinimizeOnExitAction(service)
-                == PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
-    }
-
-    public boolean audioPlayerSelected() {
-        return playerType == MainPlayer.PlayerType.AUDIO;
-    }
-
-    public boolean videoPlayerSelected() {
-        return playerType == MainPlayer.PlayerType.VIDEO;
-    }
-
-    public boolean popupPlayerSelected() {
-        return playerType == MainPlayer.PlayerType.POPUP;
-    }
-
-    public boolean isPlayerStopped() {
-        return getPlayer() == null || getPlayer().getPlaybackState() == SimpleExoPlayer.STATE_IDLE;
-    }
-
-    private int distanceFromCloseButton(final MotionEvent popupMotionEvent) {
-        final int closeOverlayButtonX = closeOverlayBinding.closeButton.getLeft()
-                + closeOverlayBinding.closeButton.getWidth() / 2;
-        final int closeOverlayButtonY = closeOverlayBinding.closeButton.getTop()
-                + closeOverlayBinding.closeButton.getHeight() / 2;
-
-        final float fingerX = popupLayoutParams.x + popupMotionEvent.getX();
-        final float fingerY = popupLayoutParams.y + popupMotionEvent.getY();
-
-        return (int) Math.sqrt(Math.pow(closeOverlayButtonX - fingerX, 2)
-                + Math.pow(closeOverlayButtonY - fingerY, 2));
-    }
-
-    private float getClosingRadius() {
-        final int buttonRadius = closeOverlayBinding.closeButton.getWidth() / 2;
-        // 20% wider than the button itself
-        return buttonRadius * 1.2f;
-    }
-
-    public boolean isInsideClosingRadius(final MotionEvent popupMotionEvent) {
-        return distanceFromCloseButton(popupMotionEvent) <= getClosingRadius();
-    }
-
-    public boolean isFullscreen() {
-        return isFullscreen;
-    }
-
-    public void showControlsThenHide() {
-        if (DEBUG) {
-            Log.d(TAG, "showControlsThenHide() called");
-        }
-        showOrHideButtons();
-        showSystemUIPartially();
-        super.showControlsThenHide();
-    }
-
-    @Override
-    public void showControls(final long duration) {
-        if (DEBUG) {
-            Log.d(TAG, "showControls() called with: duration = [" + duration + "]");
-        }
-        showOrHideButtons();
-        showSystemUIPartially();
-        super.showControls(duration);
-    }
-
-    @Override
-    public void hideControls(final long duration, final long delay) {
-        if (DEBUG) {
-            Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
-        }
-
-        showOrHideButtons();
-
-        getControlsVisibilityHandler().removeCallbacksAndMessages(null);
-        getControlsVisibilityHandler().postDelayed(() -> {
-                    showHideShadow(false, duration, 0);
-                    animateView(binding.playbackControlRoot, false, duration, 0,
-                            this::hideSystemUIIfNeeded);
-                }, delay
-        );
-    }
-
-    @Override
-    public void safeHideControls(final long duration, final long delay) {
-        if (binding.playbackControlRoot.isInTouchMode()) {
-            hideControls(duration, delay);
-        }
-    }
-
-    private void showOrHideButtons() {
-        if (playQueue == null) {
-            return;
-        }
-
-        final boolean showPrev = playQueue.getIndex() != 0;
-        final boolean showNext = playQueue.getIndex() + 1 != playQueue.getStreams().size();
-        final boolean showQueue = playQueue.getStreams().size() > 1 && !popupPlayerSelected();
-
-        binding.playPreviousButton.setVisibility(showPrev ? View.VISIBLE : View.INVISIBLE);
-        binding.playPreviousButton.setAlpha(showPrev ? 1.0f : 0.0f);
-        binding.playNextButton.setVisibility(showNext ? View.VISIBLE : View.INVISIBLE);
-        binding.playNextButton.setAlpha(showNext ? 1.0f : 0.0f);
-        binding.queueButton.setVisibility(showQueue ? View.VISIBLE : View.GONE);
-        binding.queueButton.setAlpha(showQueue ? 1.0f : 0.0f);
-    }
-
-    private void showSystemUIPartially() {
-        final AppCompatActivity activity = getParentActivity();
-        if (isFullscreen() && activity != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
-                activity.getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            }
-            final int visibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
-            activity.getWindow().getDecorView().setSystemUiVisibility(visibility);
-            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-    }
-
-    @Override
-    public void hideSystemUIIfNeeded() {
-        if (fragmentListener != null) {
-            fragmentListener.hideSystemUiIfNeeded();
-        }
-    }
-
-    public void disablePreloadingOfCurrentTrack() {
-        getLoadController().disablePreloadingOfCurrentTrack();
-    }
-
-    protected void setMuteButton(final ImageButton button, final boolean isMuted) {
-        button.setImageDrawable(AppCompatResources.getDrawable(service, isMuted
-                ? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp));
-    }
-
-    /**
-     * @return true if main player is attached to activity and activity inside multiWindow mode
-     */
-    private boolean isInMultiWindow() {
-        final AppCompatActivity parent = getParentActivity();
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                && parent != null
-                && parent.isInMultiWindowMode();
-    }
-
-    private void updatePlaybackButtons() {
-        if (binding == null || simpleExoPlayer == null || playQueue == null) {
-            return;
-        }
-
-        setRepeatModeButton(binding.repeatButton, getRepeatMode());
-        setShuffleButton(binding.shuffleButton, playQueue.isShuffled());
-    }
-
-    public void checkLandscape() {
-        final AppCompatActivity parent = getParentActivity();
-        final boolean videoInLandscapeButNotInFullscreen = service.isLandscape()
-                && !isFullscreen()
-                && videoPlayerSelected()
-                && !audioOnly;
-
-        final boolean playingState = getCurrentState() != STATE_COMPLETED
-                && getCurrentState() != STATE_PAUSED;
-        if (parent != null
-                && videoInLandscapeButNotInFullscreen
-                && playingState
-                && !DeviceUtils.isTablet(service)) {
-            toggleFullscreen();
-        }
-    }
-
-    private void buildQueue() {
-        binding.playQueue.setAdapter(playQueueAdapter);
-        binding.playQueue.setClickable(true);
-        binding.playQueue.setLongClickable(true);
-
-        binding.playQueue.clearOnScrollListeners();
-        binding.playQueue.addOnScrollListener(getQueueScrollListener());
-
-        itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
-        itemTouchHelper.attachToRecyclerView(binding.playQueue);
-
-        playQueueAdapter.setSelectedListener(getOnSelectedListener());
-
-        binding.playQueueClose.setOnClickListener(view -> onQueueClosed());
-    }
-
-    public void useVideoSource(final boolean video) {
-        if (playQueue == null || audioOnly == !video || audioPlayerSelected()) {
-            return;
-        }
-
-        audioOnly = !video;
-        // When a user returns from background controls could be hidden
-        // but systemUI will be shown 100%. Hide it
-        if (!audioOnly && !isControlsVisible()) {
-            hideSystemUIIfNeeded();
-        }
-        setRecovery();
-        reload();
-    }
-
-    private OnScrollBelowItemsListener getQueueScrollListener() {
-        return new OnScrollBelowItemsListener() {
-            @Override
-            public void onScrolledDown(final RecyclerView recyclerView) {
-                if (playQueue != null && !playQueue.isComplete()) {
-                    playQueue.fetch();
-                } else if (binding != null) {
-                    binding.playQueue.clearOnScrollListeners();
-                }
-            }
-        };
-    }
-
-    private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
-        return new PlayQueueItemTouchCallback() {
-            @Override
-            public void onMove(final int sourceIndex, final int targetIndex) {
-                if (playQueue != null) {
-                    playQueue.move(sourceIndex, targetIndex);
-                }
-            }
-
-            @Override
-            public void onSwiped(final int index) {
-                if (index != -1) {
-                    playQueue.remove(index);
-                }
-            }
-        };
-    }
-
-    private PlayQueueItemBuilder.OnSelectedListener getOnSelectedListener() {
-        return new PlayQueueItemBuilder.OnSelectedListener() {
-            @Override
-            public void selected(final PlayQueueItem item, final View view) {
-                onSelected(item);
-            }
-
-            @Override
-            public void held(final PlayQueueItem item, final View view) {
-                final int index = playQueue.indexOf(item);
-                if (index != -1) {
-                    playQueue.remove(index);
-                }
-            }
-
-            @Override
-            public void onStartDrag(final PlayQueueItemHolder viewHolder) {
-                if (itemTouchHelper != null) {
-                    itemTouchHelper.startDrag(viewHolder);
-                }
-            }
-        };
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Init
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @SuppressLint("RtlHardcoded")
-    private void initPopup() {
-        if (DEBUG) {
-            Log.d(TAG, "initPopup() called");
-        }
-
-        // Popup is already added to windowManager
-        if (popupHasParent()) {
-            return;
-        }
-
-        updateScreenSize();
-
-        final boolean popupRememberSizeAndPos = PlayerHelper.isRememberingPopupDimensions(service);
-        final float defaultSize = service.getResources().getDimension(R.dimen.popup_default_width);
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(service);
-        popupWidth = popupRememberSizeAndPos
-                ? sharedPreferences.getFloat(POPUP_SAVED_WIDTH, defaultSize)
-                : defaultSize;
-        popupHeight = getMinimumVideoHeight(popupWidth);
-
-        popupLayoutParams = new WindowManager.LayoutParams(
-                (int) popupWidth, (int) popupHeight,
-                popupLayoutParamType(),
-                IDLE_WINDOW_FLAGS,
-                PixelFormat.TRANSLUCENT);
-        popupLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
-        popupLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
-        getSurfaceView().setHeights((int) popupHeight, (int) popupHeight);
-
-        final int centerX = (int) (screenWidth / 2f - popupWidth / 2f);
-        final int centerY = (int) (screenHeight / 2f - popupHeight / 2f);
-        popupLayoutParams.x = popupRememberSizeAndPos
-                ? sharedPreferences.getInt(POPUP_SAVED_X, centerX) : centerX;
-        popupLayoutParams.y = popupRememberSizeAndPos
-                ? sharedPreferences.getInt(POPUP_SAVED_Y, centerY) : centerY;
-
-        checkPopupPositionBounds();
-
-        binding.loadingPanel.setMinimumWidth(popupLayoutParams.width);
-        binding.loadingPanel.setMinimumHeight(popupLayoutParams.height);
-
-        service.removeViewFromParent();
-        windowManager.addView(getRootView(), popupLayoutParams);
-
-        // Popup doesn't have aspectRatio selector, using FIT automatically
-        setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);
-    }
-
-    @SuppressLint("RtlHardcoded")
-    private void initPopupCloseOverlay() {
-        if (DEBUG) {
-            Log.d(TAG, "initPopupCloseOverlay() called");
-        }
-
-        // closeOverlayView is already added to windowManager
-        if (closeOverlayBinding != null) {
-            return;
-        }
-
-        closeOverlayBinding = PlayerPopupCloseOverlayBinding.inflate(LayoutInflater.from(service));
-
-        final int flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-                | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
-                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
-
-        final WindowManager.LayoutParams closeOverlayLayoutParams = new WindowManager.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
-                popupLayoutParamType(),
-                flags,
-                PixelFormat.TRANSLUCENT);
-        closeOverlayLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
-        closeOverlayLayoutParams.softInputMode =
-                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
-
-        closeOverlayBinding.closeButton.setVisibility(View.GONE);
-        windowManager.addView(closeOverlayBinding.getRoot(), closeOverlayLayoutParams);
-    }
-
-    private void initVideoPlayer() {
-        restoreResizeMode();
-        getRootView().setLayoutParams(new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Popup utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    /**
-     * @return if the popup was out of bounds and have been moved back to it
-     * @see #checkPopupPositionBounds(float, float)
-     */
-    @SuppressWarnings("UnusedReturnValue")
-    public boolean checkPopupPositionBounds() {
-        return checkPopupPositionBounds(screenWidth, screenHeight);
-    }
-
-    /**
-     * Check if {@link #popupLayoutParams}' position is within a arbitrary boundary
-     * that goes from (0, 0) to (boundaryWidth, boundaryHeight).
-     * <p>
-     * If it's out of these boundaries, {@link #popupLayoutParams}' position is changed
-     * and {@code true} is returned to represent this change.
-     * </p>
-     *
-     * @param boundaryWidth  width of the boundary
-     * @param boundaryHeight height of the boundary
-     * @return if the popup was out of bounds and have been moved back to it
-     */
-    public boolean checkPopupPositionBounds(final float boundaryWidth, final float boundaryHeight) {
-        if (DEBUG) {
-            Log.d(TAG, "checkPopupPositionBounds() called with: "
-                    + "boundaryWidth = [" + boundaryWidth + "], "
-                    + "boundaryHeight = [" + boundaryHeight + "]");
-        }
-
-        if (popupLayoutParams.x < 0) {
-            popupLayoutParams.x = 0;
-            return true;
-        } else if (popupLayoutParams.x > boundaryWidth - popupLayoutParams.width) {
-            popupLayoutParams.x = (int) (boundaryWidth - popupLayoutParams.width);
-            return true;
-        }
-
-        if (popupLayoutParams.y < 0) {
-            popupLayoutParams.y = 0;
-            return true;
-        } else if (popupLayoutParams.y > boundaryHeight - popupLayoutParams.height) {
-            popupLayoutParams.y = (int) (boundaryHeight - popupLayoutParams.height);
-            return true;
-        }
-
-        return false;
-    }
-
-    public void savePositionAndSize() {
-        final SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(service);
-        sharedPreferences.edit().putInt(POPUP_SAVED_X, popupLayoutParams.x).apply();
-        sharedPreferences.edit().putInt(POPUP_SAVED_Y, popupLayoutParams.y).apply();
-        sharedPreferences.edit().putFloat(POPUP_SAVED_WIDTH, popupLayoutParams.width).apply();
-    }
-
-    private float getMinimumVideoHeight(final float width) {
-        final float height = width / (16.0f / 9.0f); // Respect the 16:9 ratio that most videos have
-        /*if (DEBUG) {
-            Log.d(TAG, "getMinimumVideoHeight() called with: width = ["
-            + width + "], returned: " + height);
-        }*/
-        return height;
-    }
-
-    public void updateScreenSize() {
-        final DisplayMetrics metrics = new DisplayMetrics();
-        windowManager.getDefaultDisplay().getMetrics(metrics);
-
-        screenWidth = metrics.widthPixels;
-        screenHeight = metrics.heightPixels;
-        if (DEBUG) {
-            Log.d(TAG, "updateScreenSize() called > screenWidth = "
-                    + screenWidth + ", screenHeight = " + screenHeight);
-        }
-
-        popupWidth = service.getResources().getDimension(R.dimen.popup_default_width);
-        popupHeight = getMinimumVideoHeight(popupWidth);
-
-        minimumWidth = service.getResources().getDimension(R.dimen.popup_minimum_width);
-        minimumHeight = getMinimumVideoHeight(minimumWidth);
-
-        maximumWidth = screenWidth;
-        maximumHeight = screenHeight;
-    }
-
-    public void updatePopupSize(final int width, final int height) {
-        if (DEBUG) {
-            Log.d(TAG, "updatePopupSize() called with: width = ["
-                    + width + "], height = [" + height + "]");
-        }
-
-        if (popupLayoutParams == null
-                || windowManager == null
-                || getParentActivity() != null
-                || getRootView().getParent() == null) {
-            return;
-        }
-
-        final int actualWidth = (int) (width > maximumWidth
-                ? maximumWidth : width < minimumWidth ? minimumWidth : width);
-        final int actualHeight;
-        if (height == -1) {
-            actualHeight = (int) getMinimumVideoHeight(width);
-        } else {
-            actualHeight = (int) (height > maximumHeight
-                    ? maximumHeight : height < minimumHeight
-                    ? minimumHeight : height);
-        }
-
-        popupLayoutParams.width = actualWidth;
-        popupLayoutParams.height = actualHeight;
-        popupWidth = actualWidth;
-        popupHeight = actualHeight;
-        getSurfaceView().setHeights((int) popupHeight, (int) popupHeight);
-
-        if (DEBUG) {
-            Log.d(TAG, "updatePopupSize() updated values:"
-                    + "  width = [" + actualWidth + "], height = [" + actualHeight + "]");
-        }
-        windowManager.updateViewLayout(getRootView(), popupLayoutParams);
-    }
-
-    private void updateWindowFlags(final int flags) {
-        if (popupLayoutParams == null
-                || windowManager == null
-                || getParentActivity() != null
-                || getRootView().getParent() == null) {
-            return;
-        }
-
-        popupLayoutParams.flags = flags;
-        windowManager.updateViewLayout(getRootView(), popupLayoutParams);
-    }
-
-    private int popupLayoutParamType() {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.O
-                ? WindowManager.LayoutParams.TYPE_PHONE
-                : WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Misc
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public void closePopup() {
-        if (DEBUG) {
-            Log.d(TAG, "closePopup() called, isPopupClosing = " + isPopupClosing);
-        }
-        if (isPopupClosing) {
-            return;
-        }
-        isPopupClosing = true;
-
-        savePlaybackState();
-        windowManager.removeView(getRootView());
-
-        animateOverlayAndFinishService();
-    }
-
-    public void removePopupFromView() {
-        final boolean isCloseOverlayHasParent = closeOverlayBinding != null
-                && closeOverlayBinding.getRoot().getParent() != null;
-        if (popupHasParent()) {
-            windowManager.removeView(getRootView());
-        }
-        if (isCloseOverlayHasParent) {
-            windowManager.removeView(closeOverlayBinding.getRoot());
-        }
-    }
-
-    private void animateOverlayAndFinishService() {
-        final int targetTranslationY =
-                (int) (closeOverlayBinding.closeButton.getRootView().getHeight()
-                        - closeOverlayBinding.closeButton.getY());
-
-        closeOverlayBinding.closeButton.animate().setListener(null).cancel();
-        closeOverlayBinding.closeButton.animate()
-                .setInterpolator(new AnticipateInterpolator())
-                .translationY(targetTranslationY)
-                .setDuration(400)
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationCancel(final Animator animation) {
-                        end();
-                    }
-
-                    @Override
-                    public void onAnimationEnd(final Animator animation) {
-                        end();
-                    }
-
-                    private void end() {
-                        windowManager.removeView(closeOverlayBinding.getRoot());
-                        closeOverlayBinding = null;
-
-                        service.onDestroy();
-                    }
-                }).start();
-    }
-
-    private boolean popupHasParent() {
-        return binding != null
-                && binding.getRoot().getLayoutParams() instanceof WindowManager.LayoutParams
-                && binding.getRoot().getParent() != null;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Manipulations with listener
-    ///////////////////////////////////////////////////////////////////////////
-
-    public void setFragmentListener(final PlayerServiceEventListener listener) {
-        fragmentListener = listener;
-        fragmentIsVisible = true;
-        // Apply window insets because Android will not do it when orientation changes
-        // from landscape to portrait
-        if (!isFullscreen) {
-            binding.playbackControlRoot.setPadding(0, 0, 0, 0);
-        }
-        binding.playQueuePanel.setPadding(0, 0, 0, 0);
-        updateQueue();
-        updateMetadata();
-        updatePlayback();
-        triggerProgressUpdate();
-    }
-
-    public void removeFragmentListener(final PlayerServiceEventListener listener) {
-        if (fragmentListener == listener) {
-            fragmentListener = null;
-        }
-    }
-
-    void setActivityListener(final PlayerEventListener listener) {
-        activityListener = listener;
-        updateMetadata();
-        updatePlayback();
-        triggerProgressUpdate();
-    }
-
-    void removeActivityListener(final PlayerEventListener listener) {
-        if (activityListener == listener) {
-            activityListener = null;
-        }
-    }
-
-    private void updateQueue() {
-        if (fragmentListener != null && playQueue != null) {
-            fragmentListener.onQueueUpdate(playQueue);
-        }
-        if (activityListener != null && playQueue != null) {
-            activityListener.onQueueUpdate(playQueue);
-        }
-    }
-
-    private void updateMetadata() {
-        if (fragmentListener != null && getCurrentMetadata() != null) {
-            fragmentListener.onMetadataUpdate(getCurrentMetadata().getMetadata(), playQueue);
-        }
-        if (activityListener != null && getCurrentMetadata() != null) {
-            activityListener.onMetadataUpdate(getCurrentMetadata().getMetadata(), playQueue);
-        }
-    }
-
-    private void updatePlayback() {
-        if (fragmentListener != null && simpleExoPlayer != null && playQueue != null) {
-            fragmentListener.onPlaybackUpdate(currentState, getRepeatMode(),
-                    playQueue.isShuffled(), simpleExoPlayer.getPlaybackParameters());
-        }
-        if (activityListener != null && simpleExoPlayer != null && playQueue != null) {
-            activityListener.onPlaybackUpdate(currentState, getRepeatMode(),
-                    playQueue.isShuffled(), getPlaybackParameters());
-        }
-    }
-
-    private void updateProgress(final int currentProgress, final int duration,
-                                final int bufferPercent) {
-        if (fragmentListener != null) {
-            fragmentListener.onProgressUpdate(currentProgress, duration, bufferPercent);
-        }
-        if (activityListener != null) {
-            activityListener.onProgressUpdate(currentProgress, duration, bufferPercent);
-        }
-    }
-
-    void stopActivityBinding() {
-        if (fragmentListener != null) {
-            fragmentListener.onServiceStopped();
-            fragmentListener = null;
-        }
-        if (activityListener != null) {
-            activityListener.onServiceStopped();
-            activityListener = null;
-        }
-    }
-
-    /**
-     * This will be called when a user goes to another app/activity, turns off a screen.
-     * We don't want to interrupt playback and don't want to see notification so
-     * next lines of code will enable audio-only playback only if needed
-     */
-    private void onFragmentStopped() {
-        if (videoPlayerSelected() && (isPlaying() || isLoading())) {
-            if (backgroundPlaybackEnabled()) {
-                useVideoSource(false);
-            } else if (minimizeOnPopupEnabled()) {
-                setRecovery();
-                NavigationHelper.playOnPopupPlayer(getParentActivity(), playQueue, true);
-            } else {
-                onPause();
-            }
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Getters
-    ///////////////////////////////////////////////////////////////////////////
-
-    public RelativeLayout getVolumeRelativeLayout() {
-        return binding.volumeRelativeLayout;
-    }
-
-    public ProgressBar getVolumeProgressBar() {
-        return binding.volumeProgressBar;
-    }
-
-    public ImageView getVolumeImageView() {
-        return binding.volumeImageView;
-    }
-
-    public RelativeLayout getBrightnessRelativeLayout() {
-        return binding.brightnessRelativeLayout;
-    }
-
-    public ProgressBar getBrightnessProgressBar() {
-        return binding.brightnessProgressBar;
-    }
-
-    public ImageView getBrightnessImageView() {
-        return binding.brightnessImageView;
-    }
-
-    public ImageButton getPlayPauseButton() {
-        return binding.playPauseButton;
-    }
-
-    public int getMaxGestureLength() {
-        return maxGestureLength;
-    }
-
-    public TextView getResizingIndicator() {
-        return binding.resizingIndicator;
-    }
-
-    public GestureDetector getGestureDetector() {
-        return gestureDetector;
-    }
-
-    public WindowManager.LayoutParams getPopupLayoutParams() {
-        return popupLayoutParams;
-    }
-
-    public MainPlayer.PlayerType getPlayerType() {
-        return playerType;
-    }
-
-    public float getScreenWidth() {
-        return screenWidth;
-    }
-
-    public float getScreenHeight() {
-        return screenHeight;
-    }
-
-    public float getPopupWidth() {
-        return popupWidth;
-    }
-
-    public float getPopupHeight() {
-        return popupHeight;
-    }
-
-    public void setPopupWidth(final float width) {
-        popupWidth = width;
-    }
-
-    public void setPopupHeight(final float height) {
-        popupHeight = height;
-    }
-
-    public View getCloseButton() {
-        return closeOverlayBinding.closeButton;
-    }
-
-    public View getClosingOverlay() {
-        return binding.closingOverlay;
-    }
-
-    public boolean isVerticalVideo() {
-        return isVerticalVideo;
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
index d34746ca50c..46502a27074 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
@@ -7,10 +7,10 @@ import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewConfiguration
-import org.schabi.newpipe.player.BasePlayer
 import org.schabi.newpipe.player.MainPlayer
-import org.schabi.newpipe.player.VideoPlayerImpl
+import org.schabi.newpipe.player.Player
 import org.schabi.newpipe.player.helper.PlayerHelper
+import org.schabi.newpipe.player.helper.PlayerHelper.savePopupPositionAndSizeToPrefs
 import org.schabi.newpipe.util.AnimationUtils
 import kotlin.math.abs
 import kotlin.math.hypot
@@ -18,14 +18,14 @@ import kotlin.math.max
 import kotlin.math.min
 
 /**
- * Base gesture handling for [VideoPlayerImpl]
+ * Base gesture handling for [Player]
  *
  * This class contains the logic for the player gestures like View preparations
  * and provides some abstract methods to make it easier separating the logic from the UI.
  */
 abstract class BasePlayerGestureListener(
     @JvmField
-    protected val playerImpl: VideoPlayerImpl,
+    protected val player: Player,
     @JvmField
     protected val service: MainPlayer
 ) : GestureDetector.SimpleOnGestureListener(), View.OnTouchListener {
@@ -78,7 +78,7 @@ abstract class BasePlayerGestureListener(
     // ///////////////////////////////////////////////////////////////////
 
     override fun onTouch(v: View, event: MotionEvent): Boolean {
-        return if (playerImpl.popupPlayerSelected()) {
+        return if (player.popupPlayerSelected()) {
             onTouchInPopup(v, event)
         } else {
             onTouchInMain(v, event)
@@ -86,14 +86,14 @@ abstract class BasePlayerGestureListener(
     }
 
     private fun onTouchInMain(v: View, event: MotionEvent): Boolean {
-        playerImpl.gestureDetector.onTouchEvent(event)
+        player.gestureDetector.onTouchEvent(event)
         if (event.action == MotionEvent.ACTION_UP && isMovingInMain) {
             isMovingInMain = false
             onScrollEnd(MainPlayer.PlayerType.VIDEO, event)
         }
         return when (event.action) {
             MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
-                v.parent.requestDisallowInterceptTouchEvent(playerImpl.isFullscreen)
+                v.parent.requestDisallowInterceptTouchEvent(player.isFullscreen)
                 true
             }
             MotionEvent.ACTION_UP -> {
@@ -105,7 +105,7 @@ abstract class BasePlayerGestureListener(
     }
 
     private fun onTouchInPopup(v: View, event: MotionEvent): Boolean {
-        playerImpl.gestureDetector.onTouchEvent(event)
+        player.gestureDetector.onTouchEvent(event)
         if (event.pointerCount == 2 && !isMovingInPopup && !isResizing) {
             if (DEBUG) {
                 Log.d(TAG, "onTouch() 2 finger pointer detected, enabling resizing.")
@@ -157,10 +157,10 @@ abstract class BasePlayerGestureListener(
                 initSecPointerY = (-1).toFloat()
 
                 onPopupResizingEnd()
-                playerImpl.changeState(playerImpl.currentState)
+                player.changeState(player.currentState)
             }
-            if (!playerImpl.isPopupClosing) {
-                playerImpl.savePositionAndSize()
+            if (!player.isPopupClosing) {
+                savePopupPositionAndSizeToPrefs(player)
             }
         }
 
@@ -190,19 +190,15 @@ abstract class BasePlayerGestureListener(
                     event.getY(0) - event.getY(1).toDouble()
                 )
 
-                val popupWidth = playerImpl.popupWidth.toDouble()
+                val popupWidth = player.popupLayoutParams!!.width.toDouble()
                 // change co-ordinates of popup so the center stays at the same position
                 val newWidth = popupWidth * currentPointerDistance / initPointerDistance
                 initPointerDistance = currentPointerDistance
-                playerImpl.popupLayoutParams.x += ((popupWidth - newWidth) / 2.0).toInt()
+                player.popupLayoutParams!!.x += ((popupWidth - newWidth) / 2.0).toInt()
 
-                playerImpl.checkPopupPositionBounds()
-                playerImpl.updateScreenSize()
-
-                playerImpl.updatePopupSize(
-                    min(playerImpl.screenWidth.toDouble(), newWidth).toInt(),
-                    -1
-                )
+                player.checkPopupPositionBounds()
+                player.updateScreenSize()
+                player.changePopupSize(min(player.screenWidth.toDouble(), newWidth).toInt())
                 return true
             }
         }
@@ -222,7 +218,7 @@ abstract class BasePlayerGestureListener(
             return true
         }
 
-        return if (playerImpl.popupPlayerSelected())
+        return if (player.popupPlayerSelected())
             onDownInPopup(e)
         else
             true
@@ -231,12 +227,10 @@ abstract class BasePlayerGestureListener(
     private fun onDownInPopup(e: MotionEvent): Boolean {
         // Fix popup position when the user touch it, it may have the wrong one
         // because the soft input is visible (the draggable area is currently resized).
-        playerImpl.updateScreenSize()
-        playerImpl.checkPopupPositionBounds()
-        initialPopupX = playerImpl.popupLayoutParams.x
-        initialPopupY = playerImpl.popupLayoutParams.y
-        playerImpl.popupWidth = playerImpl.popupLayoutParams.width.toFloat()
-        playerImpl.popupHeight = playerImpl.popupLayoutParams.height.toFloat()
+        player.updateScreenSize()
+        player.checkPopupPositionBounds()
+        initialPopupX = player.popupLayoutParams!!.x
+        initialPopupY = player.popupLayoutParams!!.y
         return super.onDown(e)
     }
 
@@ -255,15 +249,15 @@ abstract class BasePlayerGestureListener(
         if (isDoubleTapping)
             return true
 
-        if (playerImpl.popupPlayerSelected()) {
-            if (playerImpl.player == null)
+        if (player.popupPlayerSelected()) {
+            if (player.exoPlayerIsNull())
                 return false
 
             onSingleTap(MainPlayer.PlayerType.POPUP)
             return true
         } else {
             super.onSingleTapConfirmed(e)
-            if (playerImpl.currentState == BasePlayer.STATE_BLOCKED)
+            if (player.currentState == Player.STATE_BLOCKED)
                 return true
 
             onSingleTap(MainPlayer.PlayerType.VIDEO)
@@ -272,10 +266,10 @@ abstract class BasePlayerGestureListener(
     }
 
     override fun onLongPress(e: MotionEvent?) {
-        if (playerImpl.popupPlayerSelected()) {
-            playerImpl.updateScreenSize()
-            playerImpl.checkPopupPositionBounds()
-            playerImpl.updatePopupSize(playerImpl.screenWidth.toInt(), -1)
+        if (player.popupPlayerSelected()) {
+            player.updateScreenSize()
+            player.checkPopupPositionBounds()
+            player.changePopupSize(player.screenWidth.toInt())
         }
     }
 
@@ -285,7 +279,7 @@ abstract class BasePlayerGestureListener(
         distanceX: Float,
         distanceY: Float
     ): Boolean {
-        return if (playerImpl.popupPlayerSelected()) {
+        return if (player.popupPlayerSelected()) {
             onScrollInPopup(initialEvent, movingEvent, distanceX, distanceY)
         } else {
             onScrollInMain(initialEvent, movingEvent, distanceX, distanceY)
@@ -298,19 +292,18 @@ abstract class BasePlayerGestureListener(
         velocityX: Float,
         velocityY: Float
     ): Boolean {
-        return if (playerImpl.popupPlayerSelected()) {
+        return if (player.popupPlayerSelected()) {
             val absVelocityX = abs(velocityX)
             val absVelocityY = abs(velocityY)
             if (absVelocityX.coerceAtLeast(absVelocityY) > tossFlingVelocity) {
                 if (absVelocityX > tossFlingVelocity) {
-                    playerImpl.popupLayoutParams.x = velocityX.toInt()
+                    player.popupLayoutParams!!.x = velocityX.toInt()
                 }
                 if (absVelocityY > tossFlingVelocity) {
-                    playerImpl.popupLayoutParams.y = velocityY.toInt()
+                    player.popupLayoutParams!!.y = velocityY.toInt()
                 }
-                playerImpl.checkPopupPositionBounds()
-                playerImpl.windowManager
-                    .updateViewLayout(playerImpl.rootView, playerImpl.popupLayoutParams)
+                player.checkPopupPositionBounds()
+                player.windowManager!!.updateViewLayout(player.rootView, player.popupLayoutParams)
                 return true
             }
             return false
@@ -326,13 +319,13 @@ abstract class BasePlayerGestureListener(
         distanceY: Float
     ): Boolean {
 
-        if (!playerImpl.isFullscreen) {
+        if (!player.isFullscreen) {
             return false
         }
 
         val isTouchingStatusBar: Boolean = initialEvent.y < getStatusBarHeight(service)
         val isTouchingNavigationBar: Boolean =
-            initialEvent.y > (playerImpl.rootView.height - getNavigationBarHeight(service))
+            initialEvent.y > (player.rootView.height - getNavigationBarHeight(service))
         if (isTouchingStatusBar || isTouchingNavigationBar) {
             return false
         }
@@ -340,7 +333,7 @@ abstract class BasePlayerGestureListener(
         val insideThreshold = abs(movingEvent.y - initialEvent.y) <= MOVEMENT_THRESHOLD
         if (
             !isMovingInMain && (insideThreshold || abs(distanceX) > abs(distanceY)) ||
-            playerImpl.currentState == BasePlayer.STATE_COMPLETED
+            player.currentState == Player.STATE_COMPLETED
         ) {
             return false
         }
@@ -371,7 +364,7 @@ abstract class BasePlayerGestureListener(
         }
 
         if (!isMovingInPopup) {
-            AnimationUtils.animateView(playerImpl.closeButton, true, 200)
+            AnimationUtils.animateView(player.closeOverlayButton, true, 200)
         }
 
         isMovingInPopup = true
@@ -381,20 +374,20 @@ abstract class BasePlayerGestureListener(
         val diffY: Float = (movingEvent.rawY - initialEvent.rawY)
         var posY: Float = (initialPopupY + diffY)
 
-        if (posX > playerImpl.screenWidth - playerImpl.popupWidth) {
-            posX = (playerImpl.screenWidth - playerImpl.popupWidth)
+        if (posX > player.screenWidth - player.popupLayoutParams!!.width) {
+            posX = (player.screenWidth - player.popupLayoutParams!!.width)
         } else if (posX < 0) {
             posX = 0f
         }
 
-        if (posY > playerImpl.screenHeight - playerImpl.popupHeight) {
-            posY = (playerImpl.screenHeight - playerImpl.popupHeight)
+        if (posY > player.screenHeight - player.popupLayoutParams!!.height) {
+            posY = (player.screenHeight - player.popupLayoutParams!!.height)
         } else if (posY < 0) {
             posY = 0f
         }
 
-        playerImpl.popupLayoutParams.x = posX.toInt()
-        playerImpl.popupLayoutParams.y = posY.toInt()
+        player.popupLayoutParams!!.x = posX.toInt()
+        player.popupLayoutParams!!.y = posY.toInt()
 
         onScroll(
             MainPlayer.PlayerType.POPUP,
@@ -405,8 +398,7 @@ abstract class BasePlayerGestureListener(
             distanceY
         )
 
-        playerImpl.windowManager
-            .updateViewLayout(playerImpl.rootView, playerImpl.popupLayoutParams)
+        player.windowManager!!.updateViewLayout(player.rootView, player.popupLayoutParams)
         return true
     }
 
@@ -474,16 +466,16 @@ abstract class BasePlayerGestureListener(
     // ///////////////////////////////////////////////////////////////////
 
     private fun getDisplayPortion(e: MotionEvent): DisplayPortion {
-        return if (playerImpl.playerType == MainPlayer.PlayerType.POPUP) {
+        return if (player.playerType == MainPlayer.PlayerType.POPUP) {
             when {
-                e.x < playerImpl.popupWidth / 3.0 -> DisplayPortion.LEFT
-                e.x > playerImpl.popupWidth * 2.0 / 3.0 -> DisplayPortion.RIGHT
+                e.x < player.popupLayoutParams!!.width / 3.0 -> DisplayPortion.LEFT
+                e.x > player.popupLayoutParams!!.width * 2.0 / 3.0 -> DisplayPortion.RIGHT
                 else -> DisplayPortion.MIDDLE
             }
         } else /* MainPlayer.PlayerType.VIDEO */ {
             when {
-                e.x < playerImpl.rootView.width / 3.0 -> DisplayPortion.LEFT
-                e.x > playerImpl.rootView.width * 2.0 / 3.0 -> DisplayPortion.RIGHT
+                e.x < player.rootView.width / 3.0 -> DisplayPortion.LEFT
+                e.x > player.rootView.width * 2.0 / 3.0 -> DisplayPortion.RIGHT
                 else -> DisplayPortion.MIDDLE
             }
         }
@@ -491,14 +483,14 @@ abstract class BasePlayerGestureListener(
 
     // Currently needed for scrolling since there is no action more the middle portion
     private fun getDisplayHalfPortion(e: MotionEvent): DisplayPortion {
-        return if (playerImpl.playerType == MainPlayer.PlayerType.POPUP) {
+        return if (player.playerType == MainPlayer.PlayerType.POPUP) {
             when {
-                e.x < playerImpl.popupWidth / 2.0 -> DisplayPortion.LEFT_HALF
+                e.x < player.popupLayoutParams!!.width / 2.0 -> DisplayPortion.LEFT_HALF
                 else -> DisplayPortion.RIGHT_HALF
             }
         } else /* MainPlayer.PlayerType.VIDEO */ {
             when {
-                e.x < playerImpl.rootView.width / 2.0 -> DisplayPortion.LEFT_HALF
+                e.x < player.rootView.width / 2.0 -> DisplayPortion.LEFT_HALF
                 else -> DisplayPortion.RIGHT_HALF
             }
         }
@@ -522,7 +514,7 @@ abstract class BasePlayerGestureListener(
 
     companion object {
         private const val TAG = "BasePlayerGestListener"
-        private val DEBUG = BasePlayer.DEBUG
+        private val DEBUG = Player.DEBUG
 
         private const val DOUBLE_TAP_DELAY = 550L
         private const val MOVEMENT_THRESHOLD = 40
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index 8f95147810d..887e32a23d3 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -11,15 +11,15 @@
 import androidx.appcompat.content.res.AppCompatResources;
 
 import org.jetbrains.annotations.NotNull;
+import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.player.BasePlayer;
 import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.VideoPlayerImpl;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 
-import static org.schabi.newpipe.player.BasePlayer.STATE_PLAYING;
-import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_DURATION;
-import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME;
+import static org.schabi.newpipe.player.Player.STATE_PLAYING;
+import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_DURATION;
+import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_HIDE_TIME;
 import static org.schabi.newpipe.util.AnimationUtils.Type.SCALE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
@@ -33,14 +33,14 @@
 public class PlayerGestureListener
         extends BasePlayerGestureListener
         implements View.OnTouchListener {
-    private static final String TAG = ".PlayerGestureListener";
-    private static final boolean DEBUG = BasePlayer.DEBUG;
+    private static final String TAG = PlayerGestureListener.class.getSimpleName();
+    private static final boolean DEBUG = MainActivity.DEBUG;
 
     private final int maxVolume;
 
-    public PlayerGestureListener(final VideoPlayerImpl playerImpl, final MainPlayer service) {
-        super(playerImpl, service);
-        maxVolume = playerImpl.getAudioReactor().getMaxVolume();
+    public PlayerGestureListener(final Player player, final MainPlayer service) {
+        super(player, service);
+        maxVolume = player.getAudioReactor().getMaxVolume();
     }
 
     @Override
@@ -48,46 +48,44 @@ public void onDoubleTap(@NotNull final MotionEvent event,
                             @NotNull final DisplayPortion portion) {
         if (DEBUG) {
             Log.d(TAG, "onDoubleTap called with playerType = ["
-                    + playerImpl.getPlayerType() + "], portion = ["
-                    + portion + "]");
+                    + player.getPlayerType() + "], portion = [" + portion + "]");
         }
-        if (playerImpl.isSomePopupMenuVisible()) {
-            playerImpl.hideControls(0, 0);
+        if (player.isSomePopupMenuVisible()) {
+            player.hideControls(0, 0);
         }
 
         if (portion == DisplayPortion.LEFT) {
-            playerImpl.onFastRewind();
+            player.fastRewind();
         } else if (portion == DisplayPortion.MIDDLE) {
-            playerImpl.onPlayPause();
+            player.playPause();
         } else if (portion == DisplayPortion.RIGHT) {
-            playerImpl.onFastForward();
+            player.fastForward();
         }
     }
 
     @Override
     public void onSingleTap(@NotNull final MainPlayer.PlayerType playerType) {
         if (DEBUG) {
-            Log.d(TAG, "onSingleTap called with playerType = ["
-                + playerImpl.getPlayerType() + "]");
+            Log.d(TAG, "onSingleTap called with playerType = [" + player.getPlayerType() + "]");
         }
         if (playerType == MainPlayer.PlayerType.POPUP) {
 
-            if (playerImpl.isControlsVisible()) {
-                playerImpl.hideControls(100, 100);
+            if (player.isControlsVisible()) {
+                player.hideControls(100, 100);
             } else {
-                playerImpl.getPlayPauseButton().requestFocus();
-                playerImpl.showControlsThenHide();
+                player.getPlayPauseButton().requestFocus();
+                player.showControlsThenHide();
             }
 
         } else /* playerType == MainPlayer.PlayerType.VIDEO */ {
 
-            if (playerImpl.isControlsVisible()) {
-                playerImpl.hideControls(150, 0);
+            if (player.isControlsVisible()) {
+                player.hideControls(150, 0);
             } else {
-                if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
-                    playerImpl.showControls(0);
+                if (player.getCurrentState() == Player.STATE_COMPLETED) {
+                    player.showControls(0);
                 } else {
-                    playerImpl.showControlsThenHide();
+                    player.showControlsThenHide();
                 }
             }
         }
@@ -101,8 +99,7 @@ public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
                          final float distanceX, final float distanceY) {
         if (DEBUG) {
             Log.d(TAG, "onScroll called with playerType = ["
-                + playerImpl.getPlayerType() + "], portion = ["
-                + portion + "]");
+                + player.getPlayerType() + "], portion = [" + portion + "]");
         }
         if (playerType == MainPlayer.PlayerType.VIDEO) {
             final boolean isBrightnessGestureEnabled =
@@ -123,8 +120,8 @@ public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
             }
 
         } else /* MainPlayer.PlayerType.POPUP */ {
-            final View closingOverlayView = playerImpl.getClosingOverlay();
-            if (playerImpl.isInsideClosingRadius(movingEvent)) {
+            final View closingOverlayView = player.getClosingOverlayView();
+            if (player.isInsideClosingRadius(movingEvent)) {
                 if (closingOverlayView.getVisibility() == View.GONE) {
                     animateView(closingOverlayView, true, 250);
                 }
@@ -137,17 +134,17 @@ public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
     }
 
     private void onScrollMainVolume(final float distanceX, final float distanceY) {
-        playerImpl.getVolumeProgressBar().incrementProgressBy((int) distanceY);
-        final float currentProgressPercent = (float) playerImpl
-                .getVolumeProgressBar().getProgress() / playerImpl.getMaxGestureLength();
+        player.getVolumeProgressBar().incrementProgressBy((int) distanceY);
+        final float currentProgressPercent = (float) player
+                .getVolumeProgressBar().getProgress() / player.getMaxGestureLength();
         final int currentVolume = (int) (maxVolume * currentProgressPercent);
-        playerImpl.getAudioReactor().setVolume(currentVolume);
+        player.getAudioReactor().setVolume(currentVolume);
 
         if (DEBUG) {
             Log.d(TAG, "onScroll().volumeControl, currentVolume = " + currentVolume);
         }
 
-        playerImpl.getVolumeImageView().setImageDrawable(
+        player.getVolumeImageView().setImageDrawable(
                 AppCompatResources.getDrawable(service, currentProgressPercent <= 0
                         ? R.drawable.ic_volume_off_white_24dp
                         : currentProgressPercent < 0.25 ? R.drawable.ic_volume_mute_white_24dp
@@ -155,23 +152,23 @@ private void onScrollMainVolume(final float distanceX, final float distanceY) {
                         : R.drawable.ic_volume_up_white_24dp)
         );
 
-        if (playerImpl.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
-            animateView(playerImpl.getVolumeRelativeLayout(), SCALE_AND_ALPHA, true, 200);
+        if (player.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
+            animateView(player.getVolumeRelativeLayout(), SCALE_AND_ALPHA, true, 200);
         }
-        if (playerImpl.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
-            playerImpl.getBrightnessRelativeLayout().setVisibility(View.GONE);
+        if (player.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
+            player.getBrightnessRelativeLayout().setVisibility(View.GONE);
         }
     }
 
     private void onScrollMainBrightness(final float distanceX, final float distanceY) {
-        final Activity parent = playerImpl.getParentActivity();
+        final Activity parent = player.getParentActivity();
         if (parent == null) {
             return;
         }
 
         final Window window = parent.getWindow();
         final WindowManager.LayoutParams layoutParams = window.getAttributes();
-        final ProgressBar bar = playerImpl.getBrightnessProgressBar();
+        final ProgressBar bar = player.getBrightnessProgressBar();
         final float oldBrightness = layoutParams.screenBrightness;
         bar.setProgress((int) (bar.getMax() * Math.max(0, Math.min(1, oldBrightness))));
         bar.incrementProgressBy((int) distanceY);
@@ -188,7 +185,7 @@ private void onScrollMainBrightness(final float distanceX, final float distanceY
                     + "currentBrightness = " + currentProgressPercent);
         }
 
-        playerImpl.getBrightnessImageView().setImageDrawable(
+        player.getBrightnessImageView().setImageDrawable(
                 AppCompatResources.getDrawable(service,
                         currentProgressPercent < 0.25
                                 ? R.drawable.ic_brightness_low_white_24dp
@@ -197,11 +194,11 @@ private void onScrollMainBrightness(final float distanceX, final float distanceY
                                 : R.drawable.ic_brightness_high_white_24dp)
         );
 
-        if (playerImpl.getBrightnessRelativeLayout().getVisibility() != View.VISIBLE) {
-            animateView(playerImpl.getBrightnessRelativeLayout(), SCALE_AND_ALPHA, true, 200);
+        if (player.getBrightnessRelativeLayout().getVisibility() != View.VISIBLE) {
+            animateView(player.getBrightnessRelativeLayout(), SCALE_AND_ALPHA, true, 200);
         }
-        if (playerImpl.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
-            playerImpl.getVolumeRelativeLayout().setVisibility(View.GONE);
+        if (player.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
+            player.getVolumeRelativeLayout().setVisibility(View.GONE);
         }
     }
 
@@ -210,40 +207,40 @@ public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
                             @NotNull final MotionEvent event) {
         if (DEBUG) {
             Log.d(TAG, "onScrollEnd called with playerType = ["
-                + playerImpl.getPlayerType() + "]");
+                + player.getPlayerType() + "]");
         }
         if (playerType == MainPlayer.PlayerType.VIDEO) {
             if (DEBUG) {
                 Log.d(TAG, "onScrollEnd() called");
             }
 
-            if (playerImpl.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
-                animateView(playerImpl.getVolumeRelativeLayout(), SCALE_AND_ALPHA,
+            if (player.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
+                animateView(player.getVolumeRelativeLayout(), SCALE_AND_ALPHA,
                         false, 200, 200);
             }
-            if (playerImpl.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
-                animateView(playerImpl.getBrightnessRelativeLayout(), SCALE_AND_ALPHA,
+            if (player.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
+                animateView(player.getBrightnessRelativeLayout(), SCALE_AND_ALPHA,
                         false, 200, 200);
             }
 
-            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == STATE_PLAYING) {
-                playerImpl.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+            if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
+                player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
             }
         } else {
-            if (playerImpl == null) {
+            if (player == null) {
                 return;
             }
-            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == STATE_PLAYING) {
-                playerImpl.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+            if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
+                player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
             }
 
-            if (playerImpl.isInsideClosingRadius(event)) {
-                playerImpl.closePopup();
+            if (player.isInsideClosingRadius(event)) {
+                player.closePopup();
             } else {
-                animateView(playerImpl.getClosingOverlay(), false, 0);
+                animateView(player.getClosingOverlayView(), false, 0);
 
-                if (!playerImpl.isPopupClosing) {
-                    animateView(playerImpl.getCloseButton(), false, 200);
+                if (!player.isPopupClosing()) {
+                    animateView(player.getCloseOverlayButton(), false, 200);
                 }
             }
         }
@@ -254,12 +251,12 @@ public void onPopupResizingStart() {
         if (DEBUG) {
             Log.d(TAG, "onPopupResizingStart called");
         }
-        playerImpl.showAndAnimateControl(-1, true);
-        playerImpl.getLoadingPanel().setVisibility(View.GONE);
+        player.showAndAnimateControl(-1, true);
+        player.getLoadingPanel().setVisibility(View.GONE);
 
-        playerImpl.hideControls(0, 0);
-        animateView(playerImpl.getCurrentDisplaySeek(), false, 0, 0);
-        animateView(playerImpl.getResizingIndicator(), true, 200, 0);
+        player.hideControls(0, 0);
+        animateView(player.getCurrentDisplaySeek(), false, 0, 0);
+        animateView(player.getResizingIndicator(), true, 200, 0);
     }
 
     @Override
@@ -267,7 +264,7 @@ public void onPopupResizingEnd() {
         if (DEBUG) {
             Log.d(TAG, "onPopupResizingEnd called");
         }
-        animateView(playerImpl.getResizingIndicator(), false, 100, 0);
+        animateView(player.getResizingIndicator(), false, 100, 0);
     }
 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceExtendedEventListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceExtendedEventListener.java
index 93952a81182..f774c90a0e7 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceExtendedEventListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceExtendedEventListener.java
@@ -1,10 +1,10 @@
 package org.schabi.newpipe.player.event;
 
 import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.VideoPlayerImpl;
+import org.schabi.newpipe.player.Player;
 
 public interface PlayerServiceExtendedEventListener extends PlayerServiceEventListener {
-    void onServiceConnected(VideoPlayerImpl player,
+    void onServiceConnected(Player player,
                             MainPlayer playerService,
                             boolean playAfterConnect);
     void onServiceDisconnected();
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 8b2c0e92515..253f0fbbad7 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -18,7 +18,7 @@
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.SliderStrategy;
 
-import static org.schabi.newpipe.player.BasePlayer.DEBUG;
+import static org.schabi.newpipe.player.Player.DEBUG;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class PlaybackParameterDialog extends DialogFragment {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index d89b5dd1930..54021b6169b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -1,8 +1,15 @@
 package org.schabi.newpipe.player.helper;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.PixelFormat;
+import android.os.Build;
 import android.provider.Settings;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.accessibility.CaptioningManager;
 
 import androidx.annotation.IntDef;
@@ -11,11 +18,14 @@
 import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player.RepeatMode;
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
 import com.google.android.exoplayer2.util.MimeTypes;
 
 import org.schabi.newpipe.R;
@@ -27,6 +37,8 @@
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.extractor.utils.Utils;
+import org.schabi.newpipe.player.MainPlayer;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
@@ -41,13 +53,16 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FILL;
-import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
-import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
+import static org.schabi.newpipe.player.Player.IDLE_WINDOW_FLAGS;
+import static org.schabi.newpipe.player.Player.PLAYER_TYPE;
 import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_ALWAYS;
 import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_NEVER;
 import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_WIFI;
@@ -71,6 +86,15 @@ public final class PlayerHelper {
         int AUTOPLAY_TYPE_NEVER = 2;
     }
 
+    @Retention(SOURCE)
+    @IntDef({MINIMIZE_ON_EXIT_MODE_NONE, MINIMIZE_ON_EXIT_MODE_BACKGROUND,
+            MINIMIZE_ON_EXIT_MODE_POPUP})
+    public @interface MinimizeMode {
+        int MINIMIZE_ON_EXIT_MODE_NONE = 0;
+        int MINIMIZE_ON_EXIT_MODE_BACKGROUND = 1;
+        int MINIMIZE_ON_EXIT_MODE_POPUP = 2;
+    }
+
     private PlayerHelper() { }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -121,14 +145,16 @@ public static String captionLanguageOf(@NonNull final Context context,
 
     @NonNull
     public static String resizeTypeOf(@NonNull final Context context,
-                                      @AspectRatioFrameLayout.ResizeMode final int resizeMode) {
+                                      @ResizeMode final int resizeMode) {
         switch (resizeMode) {
-            case RESIZE_MODE_FIT:
+            case AspectRatioFrameLayout.RESIZE_MODE_FIT:
                 return context.getResources().getString(R.string.resize_fit);
-            case RESIZE_MODE_FILL:
+            case AspectRatioFrameLayout.RESIZE_MODE_FILL:
                 return context.getResources().getString(R.string.resize_fill);
-            case RESIZE_MODE_ZOOM:
+            case AspectRatioFrameLayout.RESIZE_MODE_ZOOM:
                 return context.getResources().getString(R.string.resize_zoom);
+            case AspectRatioFrameLayout.RESIZE_MODE_FIXED_HEIGHT:
+            case AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH:
             default:
                 throw new IllegalArgumentException("Unrecognized resize mode: " + resizeMode);
         }
@@ -199,23 +225,23 @@ public static PlayQueue autoQueueOf(@NonNull final StreamInfo info,
     ////////////////////////////////////////////////////////////////////////////
 
     public static boolean isResumeAfterAudioFocusGain(@NonNull final Context context) {
-        return isResumeAfterAudioFocusGain(context, false);
+        return getPreferences(context)
+                .getBoolean(context.getString(R.string.resume_on_audio_focus_gain_key), false);
     }
 
     public static boolean isVolumeGestureEnabled(@NonNull final Context context) {
-        return isVolumeGestureEnabled(context, true);
+        return getPreferences(context)
+                .getBoolean(context.getString(R.string.volume_gesture_control_key), true);
     }
 
     public static boolean isBrightnessGestureEnabled(@NonNull final Context context) {
-        return isBrightnessGestureEnabled(context, true);
-    }
-
-    public static boolean isRememberingPopupDimensions(@NonNull final Context context) {
-        return isRememberingPopupDimensions(context, true);
+        return getPreferences(context)
+                .getBoolean(context.getString(R.string.brightness_gesture_control_key), true);
     }
 
     public static boolean isAutoQueueEnabled(@NonNull final Context context) {
-        return isAutoQueueEnabled(context, false);
+        return getPreferences(context)
+                .getBoolean(context.getString(R.string.auto_queue_key), false);
     }
 
     public static boolean isClearingQueueConfirmationRequired(@NonNull final Context context) {
@@ -229,7 +255,8 @@ public static int getMinimizeOnExitAction(@NonNull final Context context) {
         final String popupAction = context.getString(R.string.minimize_on_exit_popup_key);
         final String backgroundAction = context.getString(R.string.minimize_on_exit_background_key);
 
-        final String action = getMinimizeOnExitAction(context, defaultAction);
+        final String action = getPreferences(context)
+                .getString(context.getString(R.string.minimize_on_exit_key), defaultAction);
         if (action.equals(popupAction)) {
             return MINIMIZE_ON_EXIT_MODE_POPUP;
         } else if (action.equals(backgroundAction)) {
@@ -239,9 +266,23 @@ public static int getMinimizeOnExitAction(@NonNull final Context context) {
         }
     }
 
+    public static boolean isMinimizeOnExitToPopup(@NonNull final Context context) {
+        return getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_POPUP;
+    }
+
+    public static boolean isMinimizeOnExitToBackground(@NonNull final Context context) {
+        return getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_BACKGROUND;
+    }
+
+    public static boolean isMinimizeOnExitDisabled(@NonNull final Context context) {
+        return getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_NONE;
+    }
+
     @AutoplayType
     public static int getAutoplayType(@NonNull final Context context) {
-        final String type = getAutoplayType(context, context.getString(R.string.autoplay_wifi_key));
+        final String type = getPreferences(context).getString(
+                context.getString(R.string.autoplay_key),
+                context.getString(R.string.autoplay_wifi_key));
         if (type.equals(context.getString(R.string.autoplay_always_key))) {
             return AUTOPLAY_TYPE_ALWAYS;
         } else if (type.equals(context.getString(R.string.autoplay_never_key))) {
@@ -350,14 +391,32 @@ public static float getCaptionScale(@NonNull final Context context) {
         return captioningManager.getFontScale();
     }
 
+    /**
+     * @param context the Android context
+     * @return the screen brightness to use. A value less than 0 (the default) means to use the
+     *         preferred screen brightness
+     */
     public static float getScreenBrightness(@NonNull final Context context) {
-        //a value of less than 0, the default, means to use the preferred screen brightness
-        return getScreenBrightness(context, -1);
+        final SharedPreferences sp = getPreferences(context);
+        final long timestamp =
+                sp.getLong(context.getString(R.string.screen_brightness_timestamp_key), 0);
+        // Hypothesis: 4h covers a viewing block, e.g. evening.
+        // External lightning conditions will change in the next
+        // viewing block so we fall back to the default brightness
+        if ((System.currentTimeMillis() - timestamp) > TimeUnit.HOURS.toMillis(4)) {
+            return -1;
+        } else {
+            return sp.getFloat(context.getString(R.string.screen_brightness_key), -1);
+        }
     }
 
     public static void setScreenBrightness(@NonNull final Context context,
-                                           final float setScreenBrightness) {
-        setScreenBrightness(context, setScreenBrightness, System.currentTimeMillis());
+                                           final float screenBrightness) {
+        getPreferences(context).edit()
+                .putFloat(context.getString(R.string.screen_brightness_key), screenBrightness)
+                .putLong(context.getString(R.string.screen_brightness_timestamp_key),
+                        System.currentTimeMillis())
+                .apply();
     }
 
     public static boolean globalScreenOrientationLocked(final Context context) {
@@ -376,88 +435,180 @@ private static SharedPreferences getPreferences(@NonNull final Context context)
         return PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-    private static boolean isResumeAfterAudioFocusGain(@NonNull final Context context,
-                                                       final boolean b) {
+    private static boolean isUsingInexactSeek(@NonNull final Context context) {
         return getPreferences(context)
-                .getBoolean(context.getString(R.string.resume_on_audio_focus_gain_key), b);
+                .getBoolean(context.getString(R.string.use_inexact_seek_key), false);
     }
 
-    private static boolean isVolumeGestureEnabled(@NonNull final Context context,
-                                                  final boolean b) {
-        return getPreferences(context)
-                .getBoolean(context.getString(R.string.volume_gesture_control_key), b);
+    private static SinglePlayQueue getAutoQueuedSinglePlayQueue(
+            final StreamInfoItem streamInfoItem) {
+        final SinglePlayQueue singlePlayQueue = new SinglePlayQueue(streamInfoItem);
+        singlePlayQueue.getItem().setAutoQueued(true);
+        return singlePlayQueue;
     }
 
-    private static boolean isBrightnessGestureEnabled(@NonNull final Context context,
-                                                      final boolean b) {
-        return getPreferences(context)
-                .getBoolean(context.getString(R.string.brightness_gesture_control_key), b);
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Utils used by player
+    ////////////////////////////////////////////////////////////////////////////
+
+    public static MainPlayer.PlayerType retrievePlayerTypeFromIntent(final Intent intent) {
+        // If you want to open popup from the app just include Constants.POPUP_ONLY into an extra
+        return MainPlayer.PlayerType.values()[
+                intent.getIntExtra(PLAYER_TYPE, MainPlayer.PlayerType.VIDEO.ordinal())];
     }
 
-    private static boolean isRememberingPopupDimensions(@NonNull final Context context,
-                                                        final boolean b) {
-        return getPreferences(context)
-                .getBoolean(context.getString(R.string.popup_remember_size_pos_key), b);
+    public static boolean isPlaybackResumeEnabled(final Player player) {
+        return player.getPrefs().getBoolean(
+                player.getContext().getString(R.string.enable_watch_history_key), true)
+                && player.getPrefs().getBoolean(
+                player.getContext().getString(R.string.enable_playback_resume_key), true);
     }
 
-    private static boolean isUsingInexactSeek(@NonNull final Context context) {
-        return getPreferences(context)
-                .getBoolean(context.getString(R.string.use_inexact_seek_key), false);
+    @RepeatMode
+    public static int nextRepeatMode(@RepeatMode final int repeatMode) {
+        switch (repeatMode) {
+            case REPEAT_MODE_OFF:
+                return REPEAT_MODE_ONE;
+            case REPEAT_MODE_ONE:
+                return REPEAT_MODE_ALL;
+            case REPEAT_MODE_ALL: default:
+                return REPEAT_MODE_OFF;
+        }
+    }
+
+    @ResizeMode
+    public static int retrieveResizeModeFromPrefs(final Player player) {
+        return player.getPrefs().getInt(player.getContext().getString(R.string.last_resize_mode),
+                AspectRatioFrameLayout.RESIZE_MODE_FIT);
     }
 
-    private static boolean isAutoQueueEnabled(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.auto_queue_key), b);
+    @SuppressLint("SwitchIntDef") // only fit, fill and zoom are supported by NewPipe
+    @ResizeMode
+    public static int nextResizeModeAndSaveToPrefs(final Player player,
+                                                   @ResizeMode final int resizeMode) {
+        final int newResizeMode;
+        switch (resizeMode) {
+            case AspectRatioFrameLayout.RESIZE_MODE_FIT:
+                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FILL;
+                break;
+            case AspectRatioFrameLayout.RESIZE_MODE_FILL:
+                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+                break;
+            case AspectRatioFrameLayout.RESIZE_MODE_ZOOM:
+            default:
+                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
+                break;
+        }
+
+        player.getPrefs().edit().putInt(
+                player.getContext().getString(R.string.last_resize_mode), resizeMode).apply();
+        return newResizeMode;
     }
 
-    private static void setScreenBrightness(@NonNull final Context context,
-                                            final float screenBrightness, final long timestamp) {
-        final SharedPreferences.Editor editor = getPreferences(context).edit();
-        editor.putFloat(context.getString(R.string.screen_brightness_key), screenBrightness);
-        editor.putLong(context.getString(R.string.screen_brightness_timestamp_key), timestamp);
-        editor.apply();
+    public static PlaybackParameters retrievePlaybackParametersFromPrefs(final Player player) {
+        final float speed = player.getPrefs().getFloat(player.getContext().getString(
+                R.string.playback_speed_key), player.getPlaybackSpeed());
+        final float pitch = player.getPrefs().getFloat(player.getContext().getString(
+                R.string.playback_pitch_key), player.getPlaybackPitch());
+        final boolean skipSilence = player.getPrefs().getBoolean(player.getContext().getString(
+                R.string.playback_skip_silence_key), player.getPlaybackSkipSilence());
+        return new PlaybackParameters(speed, pitch, skipSilence);
     }
 
-    private static float getScreenBrightness(@NonNull final Context context,
-                                             final float screenBrightness) {
-        final SharedPreferences sp = getPreferences(context);
-        final long timestamp = sp
-                .getLong(context.getString(R.string.screen_brightness_timestamp_key), 0);
-        // Hypothesis: 4h covers a viewing block, e.g. evening.
-        // External lightning conditions will change in the next
-        // viewing block so we fall back to the default brightness
-        if ((System.currentTimeMillis() - timestamp) > TimeUnit.HOURS.toMillis(4)) {
-            return screenBrightness;
-        } else {
-            return sp
-                    .getFloat(context.getString(R.string.screen_brightness_key), screenBrightness);
+    public static void savePlaybackParametersToPrefs(final Player player,
+                                                     final float speed,
+                                                     final float pitch,
+                                                     final boolean skipSilence) {
+        player.getPrefs().edit()
+                .putFloat(player.getContext().getString(R.string.playback_speed_key), speed)
+                .putFloat(player.getContext().getString(R.string.playback_pitch_key), pitch)
+                .putBoolean(player.getContext().getString(R.string.playback_skip_silence_key),
+                        skipSilence)
+                .apply();
+    }
+
+    /**
+     * @param player {@code screenWidth} and {@code screenHeight} must have been initialized
+     * @return the popup starting layout params
+     */
+    @SuppressLint("RtlHardcoded")
+    public static WindowManager.LayoutParams retrievePopupLayoutParamsFromPrefs(
+            final Player player) {
+        final boolean popupRememberSizeAndPos = player.getPrefs().getBoolean(
+                player.getContext().getString(R.string.popup_remember_size_pos_key), true);
+        final float defaultSize =
+                player.getContext().getResources().getDimension(R.dimen.popup_default_width);
+        final float popupWidth = popupRememberSizeAndPos
+                ? player.getPrefs().getFloat(player.getContext().getString(
+                        R.string.popup_saved_width_key), defaultSize)
+                : defaultSize;
+        final float popupHeight = getMinimumVideoHeight(popupWidth);
+
+        final WindowManager.LayoutParams popupLayoutParams = new WindowManager.LayoutParams(
+                (int) popupWidth, (int) popupHeight,
+                popupLayoutParamType(),
+                IDLE_WINDOW_FLAGS,
+                PixelFormat.TRANSLUCENT);
+        popupLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        popupLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
+
+        final int centerX = (int) (player.getScreenWidth() / 2f - popupWidth / 2f);
+        final int centerY = (int) (player.getScreenHeight() / 2f - popupHeight / 2f);
+        popupLayoutParams.x = popupRememberSizeAndPos
+                ? player.getPrefs().getInt(player.getContext().getString(
+                        R.string.popup_saved_x_key), centerX) : centerX;
+        popupLayoutParams.y = popupRememberSizeAndPos
+                ? player.getPrefs().getInt(player.getContext().getString(
+                        R.string.popup_saved_y_key), centerY) : centerY;
+
+        return popupLayoutParams;
+    }
+
+    public static void savePopupPositionAndSizeToPrefs(final Player player) {
+        if (player.getPopupLayoutParams() != null) {
+            player.getPrefs().edit()
+                    .putFloat(player.getContext().getString(R.string.popup_saved_width_key),
+                            player.getPopupLayoutParams().width)
+                    .putInt(player.getContext().getString(R.string.popup_saved_x_key),
+                            player.getPopupLayoutParams().x)
+                    .putInt(player.getContext().getString(R.string.popup_saved_y_key),
+                            player.getPopupLayoutParams().y)
+                    .apply();
         }
     }
 
-    private static String getMinimizeOnExitAction(@NonNull final Context context,
-                                                  final String key) {
-        return getPreferences(context)
-                .getString(context.getString(R.string.minimize_on_exit_key), key);
+    public static float getMinimumVideoHeight(final float width) {
+        return width / (16.0f / 9.0f); // Respect the 16:9 ratio that most videos have
     }
 
-    private static String getAutoplayType(@NonNull final Context context,
-                                                  final String key) {
-        return getPreferences(context).getString(context.getString(R.string.autoplay_key),
-                key);
+    @SuppressLint("RtlHardcoded")
+    public static WindowManager.LayoutParams buildCloseOverlayLayoutParams() {
+        final int flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+
+        final WindowManager.LayoutParams closeOverlayLayoutParams = new WindowManager.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
+                popupLayoutParamType(),
+                flags,
+                PixelFormat.TRANSLUCENT);
+
+        closeOverlayLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        closeOverlayLayoutParams.softInputMode =
+                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
+        return closeOverlayLayoutParams;
     }
 
-    private static SinglePlayQueue getAutoQueuedSinglePlayQueue(
-            final StreamInfoItem streamInfoItem) {
-        final SinglePlayQueue singlePlayQueue = new SinglePlayQueue(streamInfoItem);
-        singlePlayQueue.getItem().setAutoQueued(true);
-        return singlePlayQueue;
+    public static int popupLayoutParamType() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+                ? WindowManager.LayoutParams.TYPE_PHONE
+                : WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
     }
 
-    @Retention(SOURCE)
-    @IntDef({MINIMIZE_ON_EXIT_MODE_NONE, MINIMIZE_ON_EXIT_MODE_BACKGROUND,
-            MINIMIZE_ON_EXIT_MODE_POPUP})
-    public @interface MinimizeMode {
-        int MINIMIZE_ON_EXIT_MODE_NONE = 0;
-        int MINIMIZE_ON_EXIT_MODE_BACKGROUND = 1;
-        int MINIMIZE_ON_EXIT_MODE_POPUP = 2;
+    public static int retrieveSeekDurationFromPreferences(final Player player) {
+        return Integer.parseInt(Objects.requireNonNull(player.getPrefs().getString(
+                player.getContext().getString(R.string.seek_duration_key),
+                player.getContext().getString(R.string.seek_duration_default_value))));
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
index 854e3eb2b26..da1238c8133 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
@@ -16,7 +16,7 @@
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.VideoPlayerImpl;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.PlayerServiceEventListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -33,7 +33,7 @@ private PlayerHolder() {
     private static ServiceConnection serviceConnection;
     public static boolean bound;
     private static MainPlayer playerService;
-    private static VideoPlayerImpl player;
+    private static Player player;
 
     /**
      * Returns the current {@link MainPlayer.PlayerType} of the {@link MainPlayer} service,
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java
index 883d9bb4fd0..c4b02d9857f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java
@@ -3,11 +3,11 @@
 import android.support.v4.media.MediaDescriptionCompat;
 
 public interface MediaSessionCallback {
-    void onSkipToPrevious();
+    void playPrevious();
 
-    void onSkipToNext();
+    void playNext();
 
-    void onSkipToIndex(int index);
+    void playItemAtIndex(int index);
 
     int getCurrentPlayingIndex();
 
@@ -15,7 +15,7 @@ public interface MediaSessionCallback {
 
     MediaDescriptionCompat getQueueMetadata(int index);
 
-    void onPlay();
+    void play();
 
-    void onPause();
+    void pause();
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
index 764c375afae..62664c8270d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
@@ -65,18 +65,18 @@ public long getActiveQueueItemId(@Nullable final Player player) {
 
     @Override
     public void onSkipToPrevious(final Player player, final ControlDispatcher controlDispatcher) {
-        callback.onSkipToPrevious();
+        callback.playPrevious();
     }
 
     @Override
     public void onSkipToQueueItem(final Player player, final ControlDispatcher controlDispatcher,
                                   final long id) {
-        callback.onSkipToIndex((int) id);
+        callback.playItemAtIndex((int) id);
     }
 
     @Override
     public void onSkipToNext(final Player player, final ControlDispatcher controlDispatcher) {
-        callback.onSkipToNext();
+        callback.playNext();
     }
 
     private void publishFloatingQueueWindow() {
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java
index 21c99859c3a..8bfbcde6bb9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java
@@ -14,9 +14,9 @@ public PlayQueuePlaybackController(final MediaSessionCallback callback) {
     @Override
     public boolean dispatchSetPlayWhenReady(final Player player, final boolean playWhenReady) {
         if (playWhenReady) {
-            callback.onPlay();
+            callback.play();
         } else {
-            callback.onPause();
+            callback.pause();
         }
         return true;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
similarity index 77%
rename from app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
rename to app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
index 5b20077c396..9dcb12344f6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
@@ -5,33 +5,33 @@
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.MediaMetadataCompat;
 
-import org.schabi.newpipe.player.BasePlayer;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
-public class BasePlayerMediaSession implements MediaSessionCallback {
-    private final BasePlayer player;
+public class PlayerMediaSession implements MediaSessionCallback {
+    private final Player player;
 
-    public BasePlayerMediaSession(final BasePlayer player) {
+    public PlayerMediaSession(final Player player) {
         this.player = player;
     }
 
     @Override
-    public void onSkipToPrevious() {
-        player.onPlayPrevious();
+    public void playPrevious() {
+        player.playPrevious();
     }
 
     @Override
-    public void onSkipToNext() {
-        player.onPlayNext();
+    public void playNext() {
+        player.playNext();
     }
 
     @Override
-    public void onSkipToIndex(final int index) {
+    public void playItemAtIndex(final int index) {
         if (player.getPlayQueue() == null) {
             return;
         }
-        player.onSelected(player.getPlayQueue().getItem(index));
+        player.selectQueueItem(player.getPlayQueue().getItem(index));
     }
 
     @Override
@@ -52,11 +52,14 @@ public int getQueueSize() {
 
     @Override
     public MediaDescriptionCompat getQueueMetadata(final int index) {
-        if (player.getPlayQueue() == null || player.getPlayQueue().getItem(index) == null) {
+        if (player.getPlayQueue() == null) {
             return null;
         }
-
         final PlayQueueItem item = player.getPlayQueue().getItem(index);
+        if (item == null) {
+            return null;
+        }
+
         final MediaDescriptionCompat.Builder descriptionBuilder
                 = new MediaDescriptionCompat.Builder()
                 .setMediaId(String.valueOf(index))
@@ -83,12 +86,12 @@ public MediaDescriptionCompat getQueueMetadata(final int index) {
     }
 
     @Override
-    public void onPlay() {
-        player.onPlay();
+    public void play() {
+        player.play();
     }
 
     @Override
-    public void onPause() {
-        player.onPause();
+    public void pause() {
+        player.pause();
     }
 }
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 978f558c46a..9493fbc927d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -354,4 +354,19 @@ public static void assureCorrectAppLanguage(final Context c) {
     private static double round(final double value, final int places) {
         return new BigDecimal(value).setScale(places, RoundingMode.HALF_UP).doubleValue();
     }
+
+    /**
+     * Workaround to match normalized captions like english to English or deutsch to Deutsch.
+     * @param list the list to search into
+     * @param toFind the string to look for
+     * @return whether the string was found or not
+     */
+    public static boolean containsCaseInsensitive(final List<String> list, final String toFind) {
+        for (final String i : list) {
+            if (i.equalsIgnoreCase(toFind)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index b45a1e7b9bc..ea02e0f6be3 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -47,9 +47,8 @@
 import org.schabi.newpipe.local.subscription.SubscriptionFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionsImportFragment;
 import org.schabi.newpipe.player.BackgroundPlayerActivity;
-import org.schabi.newpipe.player.BasePlayer;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.VideoPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -78,11 +77,11 @@ public static <T> Intent getPlayerIntent(@NonNull final Context context,
         if (playQueue != null) {
             final String cacheKey = SerializedCache.getInstance().put(playQueue, PlayQueue.class);
             if (cacheKey != null) {
-                intent.putExtra(VideoPlayer.PLAY_QUEUE_KEY, cacheKey);
+                intent.putExtra(Player.PLAY_QUEUE_KEY, cacheKey);
             }
         }
-        intent.putExtra(VideoPlayer.RESUME_PLAYBACK, resumePlayback);
-        intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_VIDEO);
+        intent.putExtra(Player.RESUME_PLAYBACK, resumePlayback);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.VIDEO.ordinal());
 
         return intent;
     }
@@ -94,7 +93,7 @@ public static <T> Intent getPlayerIntent(@NonNull final Context context,
                                              final boolean resumePlayback,
                                              final boolean playWhenReady) {
         return getPlayerIntent(context, targetClazz, playQueue, resumePlayback)
-                .putExtra(BasePlayer.PLAY_WHEN_READY, playWhenReady);
+                .putExtra(Player.PLAY_WHEN_READY, playWhenReady);
     }
 
     @NonNull
@@ -104,8 +103,8 @@ public static <T> Intent getPlayerEnqueueIntent(@NonNull final Context context,
                                                     final boolean selectOnAppend,
                                                     final boolean resumePlayback) {
         return getPlayerIntent(context, targetClazz, playQueue, resumePlayback)
-                .putExtra(BasePlayer.APPEND_ONLY, true)
-                .putExtra(BasePlayer.SELECT_ON_APPEND, selectOnAppend);
+                .putExtra(Player.APPEND_ONLY, true)
+                .putExtra(Player.SELECT_ON_APPEND, selectOnAppend);
     }
 
     public static void playOnMainPlayer(final AppCompatActivity activity,
@@ -135,7 +134,7 @@ public static void playOnPopupPlayer(final Context context,
 
         Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
         final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
-        intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_POPUP);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
@@ -145,7 +144,7 @@ public static void playOnBackgroundPlayer(final Context context,
         Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
                 .show();
         final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
-        intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_AUDIO);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
@@ -162,7 +161,7 @@ public static void enqueueOnVideoPlayer(final Context context, final PlayQueue q
         final Intent intent = getPlayerEnqueueIntent(
                 context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
 
-        intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_VIDEO);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.VIDEO.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
@@ -182,7 +181,7 @@ public static void enqueueOnPopupPlayer(final Context context, final PlayQueue q
         Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show();
         final Intent intent = getPlayerEnqueueIntent(
                 context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
-        intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_POPUP);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
@@ -198,7 +197,7 @@ public static void enqueueOnBackgroundPlayer(final Context context,
         Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show();
         final Intent intent = getPlayerEnqueueIntent(
                 context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
-        intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_AUDIO);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
@@ -493,7 +492,7 @@ public static void openVideoDetail(final Context context,
         if (playQueue != null) {
             final String cacheKey = SerializedCache.getInstance().put(playQueue, PlayQueue.class);
             if (cacheKey != null) {
-                intent.putExtra(VideoPlayer.PLAY_QUEUE_KEY, cacheKey);
+                intent.putExtra(Player.PLAY_QUEUE_KEY, cacheKey);
             }
         }
         context.startActivity(intent);
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index e9d951520dc..1e74f25a6fd 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -21,7 +21,6 @@
 
     <string name="use_external_video_player_key" translatable="false">use_external_video_player</string>
     <string name="use_external_audio_player_key" translatable="false">use_external_audio_player</string>
-    <string name="use_old_player_key" translatable="false">use_oldplayer</string>
 
     <string name="volume_gesture_control_key" translatable="false">volume_gesture_control</string>
     <string name="brightness_gesture_control_key" translatable="false">brightness_gesture_control</string>
@@ -33,6 +32,10 @@
     <string name="screen_brightness_timestamp_key" translatable="false">screen_brightness_timestamp_key</string>
     <string name="clear_queue_confirmation_key" translatable="false">clear_queue_confirmation_key</string>
 
+    <string name="popup_saved_width_key" translatable="false">popup_saved_width</string>
+    <string name="popup_saved_x_key" translatable="false">popup_saved_x</string>
+    <string name="popup_saved_y_key" translatable="false">popup_saved_y</string>
+
     <string name="seek_duration_key" translatable="false">seek_duration</string>
     <string name="seek_duration_default_value" translatable="false">10000</string>
     <string-array name="seek_duration_description" translatable="false">
@@ -70,7 +73,6 @@
         <item>@string/minimize_on_exit_popup_description</item>
     </string-array>
 
-
     <string name="autoplay_key" translatable="false">autoplay_key</string>
     <string name="autoplay_value" translatable="false">@string/autoplay_wifi_key</string>
     <string name="autoplay_always_key" translatable="false">autoplay_always_key</string>
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 0a5190b295d..400a91a2918 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -25,7 +25,7 @@
       lines="156,158"/>
 
   <suppress checks="FileLength"
-            files="VideoPlayerImpl.java"/>
+            files="Player.java"/>
 
   <suppress checks="FileLength"
             files="VideoDetailFragment.java"/>

From 4a12b0ab2d4069200f5608dc01924dfc030e1a41 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Mon, 11 Jan 2021 15:06:40 +0100
Subject: [PATCH 054/131] Revert hiding detail fragment tabs when in fullscreen

---
 .../schabi/newpipe/fragments/detail/VideoDetailFragment.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index b9f4ef6a97b..33c125072f7 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1889,10 +1889,8 @@ public void onFullscreenStateChanged(final boolean fullscreen) {
 
         if (fullscreen) {
             hideSystemUiIfNeeded();
-            viewPager.setVisibility(View.GONE);
         } else {
             showSystemUi();
-            viewPager.setVisibility(View.VISIBLE);
         }
 
         if (relatedStreamsLayout != null) {

From cece83328a882d9522bfbe8eb1c09fe3598181f9 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Mon, 11 Jan 2021 15:12:44 +0100
Subject: [PATCH 055/131] Fix wrong speed indicator in queue activity

---
 .../java/org/schabi/newpipe/player/ServicePlayerActivity.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 283c25e4f64..6e13554d203 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -128,6 +128,7 @@ public boolean onCreateOptionsMenu(final Menu m) {
         getMenuInflater().inflate(R.menu.menu_play_queue, m);
         getMenuInflater().inflate(getPlayerOptionMenuResource(), m);
         onMaybeMuteChanged();
+        onPlaybackParameterChanged(player.getPlaybackParameters());
         return true;
     }
 

From 059bb7622dbb04af314b0745cfd2e8cf7708ecf5 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 12 Jan 2021 21:15:06 +0100
Subject: [PATCH 056/131] Merge and rename into PlayQueueActivity

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../player/BackgroundPlayerActivity.java      | 55 ---------------
 ...erActivity.java => PlayQueueActivity.java} | 68 +++++++------------
 .../schabi/newpipe/util/NavigationHelper.java |  4 +-
 .../activity_player_queue_control.xml         |  2 +-
 .../layout/activity_player_queue_control.xml  |  2 +-
 app/src/main/res/menu/menu_play_queue.xml     |  2 +-
 7 files changed, 31 insertions(+), 104 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
 rename app/src/main/java/org/schabi/newpipe/player/{ServicePlayerActivity.java => PlayQueueActivity.java} (94%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3509f2d1331..ac33a7f0f4d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
         </service>
 
         <activity
-            android:name=".player.BackgroundPlayerActivity"
+            android:name=".player.PlayQueueActivity"
             android:label="@string/title_activity_play_queue"
             android:launchMode="singleTask" />
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
deleted file mode 100644
index eb1c74dadaa..00000000000
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.schabi.newpipe.player;
-
-import android.content.Intent;
-import android.view.Menu;
-
-import org.schabi.newpipe.R;
-
-public final class BackgroundPlayerActivity extends ServicePlayerActivity {
-
-    private static final String TAG = "BackgroundPlayerActivity";
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public String getSupportActionTitle() {
-        return getResources().getString(R.string.title_activity_play_queue);
-    }
-
-    @Override
-    public Intent getBindIntent() {
-        return new Intent(this, MainPlayer.class);
-    }
-
-    @Override
-    public void startPlayerListener() {
-        if (player != null) {
-            player.setActivityListener(this);
-        }
-    }
-
-    @Override
-    public void stopPlayerListener() {
-        if (player != null) {
-            player.removeActivityListener(this);
-        }
-    }
-
-    @Override
-    public int getPlayerOptionMenuResource() {
-        return R.menu.menu_play_queue_bg;
-    }
-
-    @Override
-    public void setupMenu(final Menu menu) {
-        if (player != null) {
-            menu.findItem(R.id.action_switch_popup)
-                    .setVisible(!player.popupPlayerSelected());
-            menu.findItem(R.id.action_switch_background)
-                    .setVisible(!player.audioPlayerSelected());
-        }
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
similarity index 94%
rename from app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
rename to app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index 6e13554d203..6ea7ecda348 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -16,7 +16,6 @@
 import android.widget.SeekBar;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -48,9 +47,12 @@
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
-public abstract class ServicePlayerActivity extends AppCompatActivity
+public final class PlayQueueActivity extends AppCompatActivity
         implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,
         View.OnClickListener, PlaybackParameterDialog.Callback {
+
+    private static final String TAG = PlayQueueActivity.class.getSimpleName();
+
     private static final int RECYCLER_ITEM_POPUP_MENU_GROUP_ID = 47;
     private static final int SMOOTH_SCROLL_MAXIMUM_DISTANCE = 80;
 
@@ -60,7 +62,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     private ServiceConnection serviceConnection;
 
     private boolean seeking;
-    private boolean redraw;
 
     ////////////////////////////////////////////////////////////////////////////
     // Views
@@ -72,24 +73,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     private Menu menu;
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Abstracts
-    ////////////////////////////////////////////////////////////////////////////
-
-    public abstract String getTag();
-
-    public abstract String getSupportActionTitle();
-
-    public abstract Intent getBindIntent();
-
-    public abstract void startPlayerListener();
-
-    public abstract void stopPlayerListener();
-
-    public abstract int getPlayerOptionMenuResource();
-
-    public abstract void setupMenu(Menu m);
-
     ////////////////////////////////////////////////////////////////////////////
     // Activity Lifecycle
     ////////////////////////////////////////////////////////////////////////////
@@ -106,27 +89,18 @@ protected void onCreate(final Bundle savedInstanceState) {
         setSupportActionBar(queueControlBinding.toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setTitle(getSupportActionTitle());
+            getSupportActionBar().setTitle(R.string.title_activity_play_queue);
         }
 
         serviceConnection = getServiceConnection();
         bind();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (redraw) {
-            ActivityCompat.recreate(this);
-            redraw = false;
-        }
-    }
-
     @Override
     public boolean onCreateOptionsMenu(final Menu m) {
         this.menu = m;
         getMenuInflater().inflate(R.menu.menu_play_queue, m);
-        getMenuInflater().inflate(getPlayerOptionMenuResource(), m);
+        getMenuInflater().inflate(R.menu.menu_play_queue_bg, m);
         onMaybeMuteChanged();
         onPlaybackParameterChanged(player.getPlaybackParameters());
         return true;
@@ -135,7 +109,12 @@ public boolean onCreateOptionsMenu(final Menu m) {
     // Allow to setup visibility of menuItems
     @Override
     public boolean onPrepareOptionsMenu(final Menu m) {
-        setupMenu(m);
+        if (player != null) {
+            menu.findItem(R.id.action_switch_popup)
+                    .setVisible(!player.popupPlayerSelected());
+            menu.findItem(R.id.action_switch_background)
+                    .setVisible(!player.audioPlayerSelected());
+        }
         return super.onPrepareOptionsMenu(m);
     }
 
@@ -191,7 +170,8 @@ protected void onDestroy() {
     ////////////////////////////////////////////////////////////////////////////
 
     private void bind() {
-        final boolean success = bindService(getBindIntent(), serviceConnection, BIND_AUTO_CREATE);
+        final Intent bindIntent = new Intent(this, MainPlayer.class);
+        final boolean success = bindService(bindIntent, serviceConnection, BIND_AUTO_CREATE);
         if (!success) {
             unbindService(serviceConnection);
         }
@@ -202,7 +182,9 @@ private void unbind() {
         if (serviceBound) {
             unbindService(serviceConnection);
             serviceBound = false;
-            stopPlayerListener();
+            if (player != null) {
+                player.removeActivityListener(this);
+            }
 
             if (player != null && player.getPlayQueueAdapter() != null) {
                 player.getPlayQueueAdapter().unsetSelectedListener();
@@ -221,12 +203,12 @@ private ServiceConnection getServiceConnection() {
         return new ServiceConnection() {
             @Override
             public void onServiceDisconnected(final ComponentName name) {
-                Log.d(getTag(), "Player service is disconnected");
+                Log.d(TAG, "Player service is disconnected");
             }
 
             @Override
             public void onServiceConnected(final ComponentName name, final IBinder service) {
-                Log.d(getTag(), "Player service is connected");
+                Log.d(TAG, "Player service is connected");
 
                 if (service instanceof PlayerServiceBinder) {
                     player = ((PlayerServiceBinder) service).getPlayerInstance();
@@ -240,7 +222,9 @@ public void onServiceConnected(final ComponentName name, final IBinder service)
                     finish();
                 } else {
                     buildComponents();
-                    startPlayerListener();
+                    if (player != null) {
+                        player.setActivityListener(PlayQueueActivity.this);
+                    }
                 }
             }
         };
@@ -463,7 +447,7 @@ private void openPlaybackParameterDialog() {
             return;
         }
         PlaybackParameterDialog.newInstance(player.getPlaybackSpeed(), player.getPlaybackPitch(),
-                player.getPlaybackSkipSilence(), this).show(getSupportFragmentManager(), getTag());
+                player.getPlaybackSkipSilence(), this).show(getSupportFragmentManager(), TAG);
     }
 
     @Override
@@ -517,10 +501,8 @@ private void openPlaylistAppendDialog(final List<PlayQueueItem> playlist) {
         final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(playlist);
 
         PlaylistAppendDialog.onPlaylistFound(getApplicationContext(),
-            () -> d.show(getSupportFragmentManager(), getTag()),
-            () -> PlaylistCreationDialog.newInstance(d)
-                    .show(getSupportFragmentManager(), getTag()
-        ));
+            () -> d.show(getSupportFragmentManager(), TAG),
+            () -> PlaylistCreationDialog.newInstance(d).show(getSupportFragmentManager(), TAG));
     }
 
     ////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index ea02e0f6be3..c90bb302577 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -46,7 +46,7 @@
 import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionsImportFragment;
-import org.schabi.newpipe.player.BackgroundPlayerActivity;
+import org.schabi.newpipe.player.PlayQueueActivity;
 import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -530,7 +530,7 @@ public static void openDownloads(final Activity activity) {
     }
 
     public static Intent getPlayQueueActivityIntent(final Context context) {
-        final Intent intent = new Intent(context, BackgroundPlayerActivity.class);
+        final Intent intent = new Intent(context, PlayQueueActivity.class);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         }
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index 2adea98683c..b106e743788 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.schabi.newpipe.player.BackgroundPlayerActivity">
+    tools:context="org.schabi.newpipe.player.PlayQueueActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index 69e603e7629..c7c86a0699c 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.schabi.newpipe.player.BackgroundPlayerActivity">
+    tools:context="org.schabi.newpipe.player.PlayQueueActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
diff --git a/app/src/main/res/menu/menu_play_queue.xml b/app/src/main/res/menu/menu_play_queue.xml
index 8e54d79608f..7eff1807742 100644
--- a/app/src/main/res/menu/menu_play_queue.xml
+++ b/app/src/main/res/menu/menu_play_queue.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".player.BackgroundPlayerActivity">
+    tools:context=".player.PlayQueueActivity">
 
     <item
         android:id="@+id/action_append_playlist"

From 8378789f6ac51bf78ebc12c9f9701ccbc78c9b36 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 14 Jan 2021 10:11:44 +0100
Subject: [PATCH 057/131] Fix view binding types

---
 app/src/main/res/layout-large-land/player.xml | 12 +++++-------
 app/src/main/res/layout/player.xml            |  7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 145d1e2f891..7213f402047 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -145,7 +145,7 @@
                             tools:text="The Video Artist  LONG very LONG very Long" />
                     </LinearLayout>
 
-                    <Button
+                    <TextView
                         android:id="@+id/qualityTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="35dp"
@@ -154,13 +154,12 @@
                         android:gravity="center"
                         android:minWidth="0dp"
                         android:padding="@dimen/player_main_buttons_padding"
-                        android:text="720p"
-                        android:textAllCaps="false"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
-                        tools:ignore="HardcodedText,RtlHardcoded" />
+                        tools:ignore="HardcodedText,RtlHardcoded"
+                        tools:text="720p" />
 
-                    <Button
+                    <TextView
                         android:id="@+id/playbackSpeed"
                         android:layout_width="wrap_content"
                         android:layout_height="35dp"
@@ -169,7 +168,6 @@
                         android:gravity="center"
                         android:minWidth="0dp"
                         android:padding="@dimen/player_main_buttons_padding"
-                        android:textAllCaps="false"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
                         tools:ignore="RtlHardcoded,RtlSymmetry"
@@ -216,7 +214,7 @@
                     tools:ignore="RtlHardcoded"
                     tools:visibility="visible">
 
-                    <Button
+                    <TextView
                         android:id="@+id/resizeTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="35dp"
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 11b8bc5db36..bc8e292f45b 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -156,11 +156,10 @@
                         android:gravity="center"
                         android:minWidth="0dp"
                         android:padding="@dimen/player_main_buttons_padding"
-                        android:text="720p"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
-                        android:visibility="visible"
-                        tools:ignore="HardcodedText,RtlHardcoded" />
+                        tools:ignore="HardcodedText,RtlHardcoded"
+                        tools:text="720p" />
 
                     <TextView
                         android:id="@+id/playbackSpeed"
@@ -350,7 +349,7 @@
                     tools:text="1:06:29" />
 
 
-                <androidx.appcompat.widget.AppCompatSeekBar
+                <org.schabi.newpipe.views.FocusAwareSeekBar
                     android:id="@+id/playbackSeekBar"
                     style="@style/Widget.AppCompat.SeekBar"
                     android:layout_width="0dp"

From 41968918bb55d549565a6c84e47a8f2cacb35cab Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 13 Jan 2021 16:18:19 +0100
Subject: [PATCH 058/131] Checkout branch in CI process for pull requests

This way the debug build app id contains the branch name again.
---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6419c65dd52..1f8960bdc4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: create and checkout branch
+        # push events already checked out the branch
+        if: github.event_name == 'pull_request'
+        run: git checkout -B ${{ github.head_ref }}
+
       - name: set up JDK 1.8
         uses: actions/setup-java@v1.4.3
         with:

From 37aa41afaed3a3f7698fa894e6a5f6cfb12088e5 Mon Sep 17 00:00:00 2001
From: vkay94 <viktor.krez94@gmail.com>
Date: Thu, 14 Jan 2021 21:58:19 +0100
Subject: [PATCH 059/131] Add stream segments to player

---
 .../material/appbar/FlingBehavior.java        |   2 +-
 .../fragments/detail/VideoDetailFragment.java |   2 +-
 .../newpipe/info_list/StreamSegmentAdapter.kt |  66 +++++++
 .../newpipe/info_list/StreamSegmentItem.kt    |  47 +++++
 .../org/schabi/newpipe/player/MainPlayer.java |   2 +-
 .../org/schabi/newpipe/player/Player.java     | 172 ++++++++++++++----
 .../event/CustomBottomSheetBehavior.java      |   2 +-
 .../ic_format_list_numbered_white_24.xml      |  10 +
 app/src/main/res/layout-large-land/player.xml |  44 ++++-
 .../main/res/layout/item_stream_segment.xml   |  64 +++++++
 app/src/main/res/layout/player.xml            |  43 ++++-
 app/src/main/res/values/strings.xml           |   1 +
 12 files changed, 406 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt
 create mode 100644 app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentItem.kt
 create mode 100644 app/src/main/res/drawable/ic_format_list_numbered_white_24.xml
 create mode 100644 app/src/main/res/layout/item_stream_segment.xml

diff --git a/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
index 3518aa139cf..6106d04370b 100644
--- a/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
+++ b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
@@ -27,7 +27,7 @@ public FlingBehavior(final Context context, final AttributeSet attrs) {
     private boolean allowScroll = true;
     private final Rect globalRect = new Rect();
     private final List<Integer> skipInterceptionOfElements = Arrays.asList(
-            R.id.playQueuePanel, R.id.playbackSeekBar,
+            R.id.itemsListPanel, R.id.playbackSeekBar,
             R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index cc845ca46db..b25d23694a9 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -2283,7 +2283,7 @@ public void onStateChanged(@NonNull final View bottomSheet, final int newState)
                         // Re-enable clicks
                         setOverlayElementsClickable(true);
                         if (player != null) {
-                            player.closeQueue();
+                            player.closeItemsList();
                         }
                         setOverlayLook(appBarLayout, behavior, 0);
                         break;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt b/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt
new file mode 100644
index 00000000000..62a06e29b39
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt
@@ -0,0 +1,66 @@
+package org.schabi.newpipe.info_list
+
+import android.util.Log
+import com.xwray.groupie.GroupAdapter
+import com.xwray.groupie.GroupieViewHolder
+import org.schabi.newpipe.extractor.stream.StreamInfo
+import kotlin.math.max
+
+/**
+ * Custom RecyclerView.Adapter/GroupieAdapter for [StreamSegmentItem] for handling selection state.
+ */
+class StreamSegmentAdapter(
+    private val listener: StreamSegmentListener
+) : GroupAdapter<GroupieViewHolder>() {
+
+    var currentIndex: Int = 0
+        private set
+
+    /**
+     * Returns `true` if the provided [StreamInfo] contains segments, `false` otherwise.
+     */
+    fun setItems(info: StreamInfo): Boolean {
+        if (info.streamSegments.isNotEmpty()) {
+            clear()
+            addAll(info.streamSegments.map { StreamSegmentItem(it, listener) })
+            return true
+        }
+        return false
+    }
+
+    fun selectSegment(segment: StreamSegmentItem) {
+        unSelectCurrentSegment()
+        currentIndex = max(0, getAdapterPosition(segment))
+        segment.isSelected = true
+        segment.notifyChanged(StreamSegmentItem.PAYLOAD_SELECT)
+    }
+
+    fun selectSegmentAt(position: Int) {
+        try {
+            selectSegment(getGroupAtAdapterPosition(position) as StreamSegmentItem)
+        } catch (e: IndexOutOfBoundsException) {
+            // Just to make sure that getGroupAtAdapterPosition doesn't close the app
+            // Shouldn't happen since setItems is always called before select-methods but just in case
+            currentIndex = 0
+            Log.e("StreamSegmentAdapter", "selectSegmentAt: ${e.message}")
+        }
+    }
+
+    private fun unSelectCurrentSegment() {
+        try {
+            val segmentItem = getGroupAtAdapterPosition(currentIndex) as StreamSegmentItem
+            currentIndex = 0
+            segmentItem.isSelected = false
+            segmentItem.notifyChanged(StreamSegmentItem.PAYLOAD_SELECT)
+        } catch (e: IndexOutOfBoundsException) {
+            // Just to make sure that getGroupAtAdapterPosition doesn't close the app
+            // Shouldn't happen since setItems is always called before select-methods but just in case
+            currentIndex = 0
+            Log.e("StreamSegmentAdapter", "unSelectCurrentSegment: ${e.message}")
+        }
+    }
+
+    interface StreamSegmentListener {
+        fun onItemClick(item: StreamSegmentItem, seconds: Int)
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentItem.kt b/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentItem.kt
new file mode 100644
index 00000000000..798b9b287b7
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentItem.kt
@@ -0,0 +1,47 @@
+package org.schabi.newpipe.info_list
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.nostra13.universalimageloader.core.ImageLoader
+import com.xwray.groupie.GroupieViewHolder
+import com.xwray.groupie.Item
+import org.schabi.newpipe.R
+import org.schabi.newpipe.extractor.stream.StreamSegment
+import org.schabi.newpipe.util.ImageDisplayConstants
+import org.schabi.newpipe.util.Localization
+
+class StreamSegmentItem(
+    private val item: StreamSegment,
+    private val onClick: StreamSegmentAdapter.StreamSegmentListener
+) : Item<GroupieViewHolder>() {
+
+    companion object {
+        const val PAYLOAD_SELECT = 1
+    }
+
+    var isSelected = false
+
+    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
+        item.previewUrl?.let {
+            ImageLoader.getInstance().displayImage(
+                it, viewHolder.root.findViewById<ImageView>(R.id.previewImage),
+                ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS
+            )
+        }
+        viewHolder.root.findViewById<TextView>(R.id.textViewTitle).text = item.title
+        viewHolder.root.findViewById<TextView>(R.id.textViewStartSeconds).text =
+            Localization.getDurationString(item.startTimeSeconds.toLong())
+        viewHolder.root.setOnClickListener { onClick.onItemClick(this, item.startTimeSeconds) }
+        viewHolder.root.isSelected = isSelected
+    }
+
+    override fun bind(viewHolder: GroupieViewHolder, position: Int, payloads: MutableList<Any>) {
+        if (payloads.contains(PAYLOAD_SELECT)) {
+            viewHolder.root.isSelected = isSelected
+            return
+        }
+        super.bind(viewHolder, position, payloads)
+    }
+
+    override fun getLayout() = R.layout.item_stream_segment
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index c4099e67eae..e9ae1a1db70 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -151,7 +151,7 @@ public void stop(final boolean autoplayEnabled) {
             // Android TV will handle back button in case controls will be visible
             // (one more additional unneeded click while the player is hidden)
             player.hideControls(0, 0);
-            player.closeQueue();
+            player.closeItemsList();
             // Notification shows information about old stream but if a user selects
             // a stream from backStack it's not actual anymore
             // So we should hide the notification at all.
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 490a0a693fb..4e2edaa1034 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -87,9 +87,11 @@
 import org.schabi.newpipe.databinding.PlayerPopupCloseOverlayBinding;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.StreamSegment;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+import org.schabi.newpipe.info_list.StreamSegmentAdapter;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.event.PlayerEventListener;
@@ -245,6 +247,7 @@ public final class Player implements
 
     private PlayQueue playQueue;
     private PlayQueueAdapter playQueueAdapter;
+    private StreamSegmentAdapter segmentAdapter;
 
     @Nullable private MediaSourceManager playQueueManager;
 
@@ -301,6 +304,7 @@ public final class Player implements
 
     // fullscreen player
     private boolean isQueueVisible = false;
+    private boolean areSegmentsVisible = false;
     private ItemTouchHelper itemTouchHelper;
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -454,7 +458,7 @@ private void initViews(@NonNull final PlayerBinding playerBinding) {
         binding.channelTextView.setSelected(true);
 
         // Prevent hiding of bottom sheet via swipe inside queue
-        binding.playQueue.setNestedScrollingEnabled(false);
+        binding.itemsList.setNestedScrollingEnabled(false);
     }
 
     private void initPlayer(final boolean playOnReady) {
@@ -505,6 +509,7 @@ private void initListeners() {
         binding.getRoot().setOnTouchListener(listener);
 
         binding.queueButton.setOnClickListener(this);
+        binding.segmentsButton.setOnClickListener(this);
         binding.repeatButton.setOnClickListener(this);
         binding.shuffleButton.setOnClickListener(this);
 
@@ -533,7 +538,7 @@ public void onChange(final boolean selfChange) {
                 settingsContentObserver);
         binding.getRoot().addOnLayoutChangeListener(this::onLayoutChange);
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.playQueuePanel, (view, windowInsets) -> {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.itemsListPanel, (view, windowInsets) -> {
             final DisplayCutoutCompat cutout = windowInsets.getDisplayCutout();
             if (cutout != null) {
                 view.setPadding(cutout.getSafeInsetLeft(), cutout.getSafeInsetTop(),
@@ -665,11 +670,11 @@ && isPlaybackResumeEnabled(this)
                                         playbackSkipSilence, playWhenReady, isMuted);
                             },
                             () -> {
-                                    // Completed but not found in history
-                                    initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
-                                            playbackSkipSilence, playWhenReady, isMuted);
-                                }
-                        ));
+                                // Completed but not found in history
+                                initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
+                                        playbackSkipSilence, playWhenReady, isMuted);
+                            }
+                    ));
         } else {
             // Good to go...
             // In a case of equal PlayQueues we can re-init old one but only when it is disposed
@@ -697,7 +702,7 @@ && isPlaybackResumeEnabled(this)
         } else {
             binding.getRoot().setVisibility(View.VISIBLE);
             initVideoPlayer();
-            closeQueue();
+            closeItemsList();
             // Android TV: without it focus will frame the whole player
             binding.playPauseButton.requestFocus();
 
@@ -730,6 +735,7 @@ private void initPlayback(@NonNull final PlayQueue queue,
             playQueueAdapter.dispose();
         }
         playQueueAdapter = new PlayQueueAdapter(context, playQueue);
+        segmentAdapter = new StreamSegmentAdapter(getStreamSegmentListener());
 
         simpleExoPlayer.setVolume(isMuted ? 0 : 1);
         notifyQueueUpdateToListeners();
@@ -923,6 +929,7 @@ private void setupElementsVisibility() {
             binding.resizeTextView.setVisibility(View.GONE);
             binding.getRoot().findViewById(R.id.metadataView).setVisibility(View.GONE);
             binding.queueButton.setVisibility(View.GONE);
+            binding.segmentsButton.setVisibility(View.GONE);
             binding.moreOptionsButton.setVisibility(View.GONE);
             binding.topControls.setOrientation(LinearLayout.HORIZONTAL);
             binding.primaryControls.getLayoutParams().width
@@ -939,7 +946,7 @@ private void setupElementsVisibility() {
             binding.topControls.setClickable(false);
             binding.topControls.setFocusable(false);
             binding.bottomControls.bringToFront();
-            closeQueue();
+            closeItemsList();
         } else if (videoPlayerSelected()) {
             binding.fullScreenButton.setVisibility(View.GONE);
             setupScreenRotationButton();
@@ -1123,7 +1130,7 @@ private void onBroadcastReceived(final Intent intent) {
                 }
                 // Close it because when changing orientation from portrait
                 // (in fullscreen mode) the size of queue layout can be larger than the screen size
-                closeQueue();
+                closeItemsList();
                 break;
             case Intent.ACTION_SCREEN_ON:
                 // Interrupt playback only when screen turns on
@@ -1484,6 +1491,10 @@ private void onUpdateProgress(final int currentProgress,
 
         notifyProgressUpdateToListeners(currentProgress, duration, bufferPercent);
 
+        if (areSegmentsVisible) {
+            segmentAdapter.selectSegmentAt(getNearestStreamSegmentPosition(currentProgress));
+        }
+
         final boolean showThumbnail = prefs.getBoolean(
                 context.getString(R.string.show_thumbnail_key), true);
         // setMetadata only updates the metadata when any of the metadata keys are null
@@ -1696,10 +1707,10 @@ public void hideControls(final long duration, final long delay) {
 
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
         controlsVisibilityHandler.postDelayed(() -> {
-                    showHideShadow(false, duration);
-                    animateView(binding.playbackControlRoot, false, duration, 0,
-                            this::hideSystemUIIfNeeded);
-                }, delay);
+            showHideShadow(false, duration);
+            animateView(binding.playbackControlRoot, false, duration, 0,
+                    this::hideSystemUIIfNeeded);
+        }, delay);
     }
 
     private void showHideShadow(final boolean show, final long duration) {
@@ -1715,6 +1726,11 @@ private void showOrHideButtons() {
         final boolean showPrev = playQueue.getIndex() != 0;
         final boolean showNext = playQueue.getIndex() + 1 != playQueue.getStreams().size();
         final boolean showQueue = playQueue.getStreams().size() > 1 && !popupPlayerSelected();
+        boolean showSegment = false;
+        if (currentMetadata != null) {
+            showSegment = !currentMetadata.getMetadata().getStreamSegments().isEmpty()
+                    && !popupPlayerSelected();
+        }
 
         binding.playPreviousButton.setVisibility(showPrev ? View.VISIBLE : View.INVISIBLE);
         binding.playPreviousButton.setAlpha(showPrev ? 1.0f : 0.0f);
@@ -1722,6 +1738,8 @@ private void showOrHideButtons() {
         binding.playNextButton.setAlpha(showNext ? 1.0f : 0.0f);
         binding.queueButton.setVisibility(showQueue ? View.VISIBLE : View.GONE);
         binding.queueButton.setAlpha(showQueue ? 1.0f : 0.0f);
+        binding.segmentsButton.setVisibility(showSegment ? View.VISIBLE : View.GONE);
+        binding.segmentsButton.setAlpha(showSegment ? 1.0f : 0.0f);
     }
 
     private void showSystemUIPartially() {
@@ -2725,6 +2743,17 @@ private void onMetadataChanged(@NonNull final MediaSourceTag tag) {
 
         NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
         notifyMetadataUpdateToListeners();
+
+        if (areSegmentsVisible) {
+            if (segmentAdapter.setItems(info)) {
+                final int adapterPosition = getNearestStreamSegmentPosition(
+                        simpleExoPlayer.getCurrentPosition());
+                segmentAdapter.selectSegmentAt(adapterPosition);
+                binding.itemsList.scrollToPosition(adapterPosition);
+            } else {
+                closeItemsList();
+            }
+        }
     }
 
     private void maybeUpdateCurrentMetadata() {
@@ -2787,7 +2816,7 @@ public Bitmap getThumbnail() {
 
 
     /*//////////////////////////////////////////////////////////////////////////
-    // Play queue and streams
+    // Play queue, segments and streams
     //////////////////////////////////////////////////////////////////////////*/
     //region
 
@@ -2835,41 +2864,90 @@ private void onQueueClicked() {
 
         hideSystemUIIfNeeded();
         buildQueue();
-        //updatePlaybackButtons();//TODO verify this can be removed
+
+        binding.itemsListHeaderTitle.setVisibility(View.GONE);
+        binding.shuffleButton.setVisibility(View.VISIBLE);
+        binding.repeatButton.setVisibility(View.VISIBLE);
 
         hideControls(0, 0);
-        binding.playQueuePanel.requestFocus();
-        animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, true,
+        binding.itemsListPanel.requestFocus();
+        animateView(binding.itemsListPanel, SLIDE_AND_ALPHA, true,
                 DEFAULT_CONTROLS_DURATION);
 
-        binding.playQueue.scrollToPosition(playQueue.getIndex());
+        binding.itemsList.scrollToPosition(playQueue.getIndex());
     }
 
     private void buildQueue() {
-        binding.playQueue.setAdapter(playQueueAdapter);
-        binding.playQueue.setClickable(true);
-        binding.playQueue.setLongClickable(true);
+        binding.itemsList.setAdapter(playQueueAdapter);
+        binding.itemsList.setClickable(true);
+        binding.itemsList.setLongClickable(true);
 
-        binding.playQueue.clearOnScrollListeners();
-        binding.playQueue.addOnScrollListener(getQueueScrollListener());
+        binding.itemsList.clearOnScrollListeners();
+        binding.itemsList.addOnScrollListener(getQueueScrollListener());
 
         itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
-        itemTouchHelper.attachToRecyclerView(binding.playQueue);
+        itemTouchHelper.attachToRecyclerView(binding.itemsList);
 
         playQueueAdapter.setSelectedListener(getOnSelectedListener());
 
-        binding.playQueueClose.setOnClickListener(view -> closeQueue());
+        binding.itemsListClose.setOnClickListener(view -> closeItemsList());
+    }
+
+    private void onSegmentsClicked() {
+        areSegmentsVisible = true;
+
+        hideSystemUIIfNeeded();
+        buildSegments();
+
+        binding.itemsListHeaderTitle.setVisibility(View.VISIBLE);
+        binding.shuffleButton.setVisibility(View.GONE);
+        binding.repeatButton.setVisibility(View.GONE);
+
+        hideControls(0, 0);
+        binding.itemsListPanel.requestFocus();
+        animateView(binding.itemsListPanel, SLIDE_AND_ALPHA, true,
+                DEFAULT_CONTROLS_DURATION);
+
+        final int adapterPosition = getNearestStreamSegmentPosition(simpleExoPlayer
+                .getCurrentPosition());
+        segmentAdapter.selectSegmentAt(adapterPosition);
+        binding.itemsList.scrollToPosition(adapterPosition);
     }
 
-    public void closeQueue() {
-        if (isQueueVisible) {
+    private void buildSegments() {
+        binding.itemsList.setAdapter(segmentAdapter);
+        binding.itemsList.setClickable(true);
+        binding.itemsList.setLongClickable(false);
+
+        binding.itemsList.clearOnScrollListeners();
+        if (itemTouchHelper != null) {
+            itemTouchHelper.attachToRecyclerView(null);
+        }
+
+        if (currentMetadata != null) {
+            segmentAdapter.setItems(currentMetadata.getMetadata());
+        }
+
+        binding.shuffleButton.setVisibility(View.GONE);
+        binding.repeatButton.setVisibility(View.GONE);
+        binding.itemsListClose.setOnClickListener(view -> closeItemsList());
+    }
+
+    public void closeItemsList() {
+        if (isQueueVisible || areSegmentsVisible) {
             isQueueVisible = false;
-            animateView(binding.playQueuePanel, SLIDE_AND_ALPHA, false,
+            areSegmentsVisible = false;
+
+            if (itemTouchHelper != null) {
+                itemTouchHelper.attachToRecyclerView(null);
+            }
+
+            animateView(binding.itemsListPanel, SLIDE_AND_ALPHA, false,
                     DEFAULT_CONTROLS_DURATION, 0, () -> {
                         // Even when queueLayout is GONE it receives touch events
                         // and ruins normal behavior of the app. This line fixes it
-                        binding.playQueuePanel.setTranslationY(
-                                -binding.playQueuePanel.getHeight() * 5);
+                        binding.itemsListPanel.setTranslationY(
+                                -binding.itemsListPanel.getHeight() * 5);
                     });
             binding.playPauseButton.requestFocus();
         }
@@ -2882,12 +2960,33 @@ public void onScrolledDown(final RecyclerView recyclerView) {
                 if (playQueue != null && !playQueue.isComplete()) {
                     playQueue.fetch();
                 } else if (binding != null) {
-                    binding.playQueue.clearOnScrollListeners();
+                    binding.itemsList.clearOnScrollListeners();
                 }
             }
         };
     }
 
+    private StreamSegmentAdapter.StreamSegmentListener getStreamSegmentListener() {
+        return (item, seconds) -> {
+            segmentAdapter.selectSegment(item);
+            seekTo(seconds * 1000);
+            triggerProgressUpdate();
+        };
+    }
+
+    private int getNearestStreamSegmentPosition(final long playbackPosition) {
+        int nearestPosition = 0;
+        final List<StreamSegment> segments = currentMetadata.getMetadata().getStreamSegments();
+
+        for (int i = 0; i < segments.size(); i++) {
+            if (segments.get(i).getStartTimeSeconds() * 1000 > playbackPosition) {
+                break;
+            }
+            nearestPosition++;
+        }
+        return Math.max(0, nearestPosition - 1);
+    }
+
     private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
         return new PlayQueueItemTouchCallback() {
             @Override
@@ -3313,6 +3412,9 @@ public void onClick(final View v) {
         } else if (v.getId() == binding.queueButton.getId()) {
             onQueueClicked();
             return;
+        } else if (v.getId() == binding.segmentsButton.getId()) {
+            onSegmentsClicked();
+            return;
         } else if (v.getId() == binding.repeatButton.getId()) {
             onRepeatClicked();
             return;
@@ -3610,8 +3712,8 @@ private void onLayoutChange(final View view, final int l, final int t, final int
             binding.brightnessProgressBar.setMax(maxGestureLength);
 
             setInitialGestureValues();
-            binding.playQueuePanel.getLayoutParams().height
-                    = height - binding.playQueuePanel.getTop();
+            binding.itemsListPanel.getLayoutParams().height
+                    = height - binding.itemsListPanel.getTop();
         }
     }
 
@@ -3663,7 +3765,7 @@ public void setFragmentListener(final PlayerServiceEventListener listener) {
         if (!isFullscreen) {
             binding.playbackControlRoot.setPadding(0, 0, 0, 0);
         }
-        binding.playQueuePanel.setPadding(0, 0, 0, 0);
+        binding.itemsListPanel.setPadding(0, 0, 0, 0);
         notifyQueueUpdateToListeners();
         notifyMetadataUpdateToListeners();
         notifyPlaybackUpdateToListeners();
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
index 26ecb187105..347118de54b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
@@ -24,7 +24,7 @@ public CustomBottomSheetBehavior(final Context context, final AttributeSet attrs
     private boolean skippingInterception = false;
     private final List<Integer> skipInterceptionOfElements = Arrays.asList(
             R.id.detail_content_root_layout, R.id.relatedStreamsLayout,
-            R.id.playQueuePanel, R.id.viewpager, R.id.bottomControls,
+            R.id.itemsListPanel, R.id.viewpager, R.id.bottomControls,
             R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
 
     @Override
diff --git a/app/src/main/res/drawable/ic_format_list_numbered_white_24.xml b/app/src/main/res/drawable/ic_format_list_numbered_white_24.xml
new file mode 100644
index 00000000000..429616ec98a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_list_numbered_white_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z" />
+</vector>
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 7213f402047..bc484cd9742 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -191,6 +191,24 @@
                         tools:ignore="ContentDescription,RtlHardcoded"
                         tools:visibility="visible" />
 
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/segmentsButton"
+                        android:layout_width="35dp"
+                        android:layout_height="35dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:paddingStart="3dp"
+                        android:paddingTop="5dp"
+                        android:paddingEnd="3dp"
+                        android:paddingBottom="3dp"
+                        android:scaleType="fitCenter"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_format_list_numbered_white_24"
+                        tools:ignore="ContentDescription,RtlHardcoded"
+                        tools:visibility="visible" />
+
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/moreOptionsButton"
                         android:layout_width="wrap_content"
@@ -452,7 +470,7 @@
     </RelativeLayout>
 
     <RelativeLayout
-        android:id="@+id/playQueuePanel"
+        android:id="@+id/itemsListPanel"
         android:layout_width="380dp"
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
@@ -461,14 +479,30 @@
         tools:visibility="visible">
 
         <RelativeLayout
-            android:id="@+id/playQueueControl"
+            android:id="@+id/itemsListControl"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:clickable="true"
             android:focusable="true">
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/itemsListHeaderTitle"
+                style="@style/TextAppearance.AppCompat.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignEnd="@id/itemsListClose"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="56dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:text="@string/chapters"
+                android:textColor="@android:color/white"
+                android:visibility="gone" />
+
             <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/playQueueClose"
+                android:id="@+id/itemsListClose"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_alignParentEnd="true"
@@ -517,10 +551,10 @@
         </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/playQueue"
+            android:id="@+id/itemsList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/playQueueControl"
+            android:layout_below="@id/itemsListControl"
             android:scrollbars="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/play_queue_item" />
diff --git a/app/src/main/res/layout/item_stream_segment.xml b/app/src/main/res/layout/item_stream_segment.xml
new file mode 100644
index 00000000000..7ae66bc700d
--- /dev/null
+++ b/app/src/main/res/layout/item_stream_segment.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selector"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingTop="4dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="4dp">
+
+    <ImageView
+        android:id="@+id/previewImage"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/play_queue_thumbnail_width"
+        android:scaleType="centerCrop"
+        android:src="@drawable/dummy_thumbnail"
+        app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <LinearLayout
+        android:id="@+id/textContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="0dp"
+        app:layout_constraintBottom_toBottomOf="@id/previewImage"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/previewImage"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/textViewTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="@dimen/video_item_search_title_text_size"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Lorem ipusum is widely used to create long sample text which is used here too" />
+
+        <TextView
+            android:id="@+id/textViewStartSeconds"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_upload_date_text_size"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/textViewTitle"
+            tools:text="04:26" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index bc8e292f45b..a5b6ee62b04 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -192,6 +192,23 @@
                         app:srcCompat="@drawable/ic_list_white_24dp"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/segmentsButton"
+                        android:layout_width="35dp"
+                        android:layout_height="35dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:paddingStart="6dp"
+                        android:paddingTop="5dp"
+                        android:paddingEnd="6dp"
+                        android:paddingBottom="3dp"
+                        android:scaleType="fitCenter"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_format_list_numbered_white_24"
+                        tools:ignore="ContentDescription,RtlHardcoded" />
+
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/moreOptionsButton"
                         android:layout_width="wrap_content"
@@ -450,7 +467,7 @@
     </RelativeLayout>
 
     <RelativeLayout
-        android:id="@+id/playQueuePanel"
+        android:id="@+id/itemsListPanel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/queue_background_color"
@@ -458,14 +475,30 @@
         tools:visibility="visible">
 
         <RelativeLayout
-            android:id="@+id/playQueueControl"
+            android:id="@+id/itemsListControl"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:clickable="true"
             android:focusable="true">
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/itemsListHeaderTitle"
+                style="@style/TextAppearance.AppCompat.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignEnd="@id/itemsListClose"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="56dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:text="@string/chapters"
+                android:textColor="@android:color/white"
+                android:visibility="gone" />
+
             <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/playQueueClose"
+                android:id="@+id/itemsListClose"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_alignParentEnd="true"
@@ -514,10 +547,10 @@
         </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/playQueue"
+            android:id="@+id/itemsList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/playQueueControl"
+            android:layout_below="@id/itemsListControl"
             android:scrollbars="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/play_queue_item" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c70b56e9762..8ac951b695e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -692,4 +692,5 @@
     <string name="show_thumbnail_title">Show thumbnail</string>
     <string name="show_thumbnail_summary">Use thumbnail for both lock screen background and notifications</string>
     <string name="recent">Recent</string>
+    <string name="chapters">Chapters</string>
 </resources>
\ No newline at end of file

From 87568b6590a7fcb7ca69d8011ac64a6fb683626e Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 15 Jan 2021 06:45:07 +0530
Subject: [PATCH 060/131] Fix the crash that occurs on navigating back to the
 main fragment.

---
 .../newpipe/fragments/MainFragment.java       |  5 ---
 .../schabi/newpipe/local/feed/FeedFragment.kt |  8 ++--
 .../subscription/SubscriptionFragment.kt      |  8 ++--
 .../subscription/dialog/FeedGroupDialog.kt    | 37 ++++++++++++-------
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
index 9487fa385a9..4765e62653d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -117,11 +117,6 @@ public void onResume() {
     public void onDestroy() {
         super.onDestroy();
         tabsManager.unsetSavedTabsListener();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
         if (binding != null) {
             binding.pager.setAdapter(null);
             binding = null;
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index f767f8f22b7..6df15c8b255 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -251,7 +251,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
         }
 
         feedBinding.loadingProgressBar.isIndeterminate = isIndeterminate ||
-                (progressState.maxProgress > 0 && progressState.currentProgress == 0)
+            (progressState.maxProgress > 0 && progressState.currentProgress == 0)
         feedBinding.loadingProgressBar.progress = progressState.currentProgress
 
         feedBinding.loadingProgressBar.max = progressState.maxProgress
@@ -269,8 +269,10 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
         val loadedCount = loadedState.notLoadedCount > 0
         feedBinding.refreshSubtitleText.isVisible = loadedCount
         if (loadedCount) {
-            feedBinding.refreshSubtitleText.text = getString(R.string.feed_subscription_not_loaded_count,
-                    loadedState.notLoadedCount)
+            feedBinding.refreshSubtitleText.text = getString(
+                R.string.feed_subscription_not_loaded_count,
+                loadedState.notLoadedCount
+            )
         }
 
         if (loadedState.itemsErrors.isNotEmpty()) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index c745ae39e12..c4454186efa 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -311,10 +311,10 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         dialogTitleBinding.itemAdditionalDetails.visibility = View.GONE
 
         AlertDialog.Builder(requireContext())
-                .setCustomTitle(dialogTitleBinding.root)
-                .setItems(commands, actions)
-                .create()
-                .show()
+            .setCustomTitle(dialogTitleBinding.root)
+            .setItems(commands, actions)
+            .create()
+            .show()
     }
 
     private fun deleteChannel(selectedItem: ChannelInfoItem) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
index 8260f0fb9d2..7c7ebdea900 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@@ -368,7 +368,8 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         val selectedCount = this.selectedSubscriptions.size
         val selectedCountText = resources.getQuantityString(
             R.plurals.feed_group_dialog_selection_count,
-            selectedCount, selectedCount)
+            selectedCount, selectedCount
+        )
         feedGroupCreateBinding.selectedSubscriptionCountView.text = selectedCountText
         feedGroupCreateBinding.subscriptionsHeaderInfo.text = selectedCountText
     }
@@ -423,10 +424,12 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         feedGroupCreateBinding.separator.onlyVisibleIn(SubscriptionsPickerScreen, IconPickerScreen)
         feedGroupCreateBinding.cancelButton.onlyVisibleIn(InitialScreen, DeleteScreen)
 
-        feedGroupCreateBinding.confirmButton.setText(when {
-            currentScreen == InitialScreen && groupId == NO_GROUP_SELECTED -> R.string.create
-            else -> android.R.string.ok
-        })
+        feedGroupCreateBinding.confirmButton.setText(
+            when {
+                currentScreen == InitialScreen && groupId == NO_GROUP_SELECTED -> R.string.create
+                else -> android.R.string.ok
+            }
+        )
 
         feedGroupCreateBinding.deleteButton.isGone = currentScreen != InitialScreen || groupId == NO_GROUP_SELECTED
 
@@ -471,27 +474,35 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
     private fun showKeyboardSearch() {
         if (searchLayoutBinding.toolbarSearchEditText.requestFocus()) {
-            inputMethodManager.showSoftInput(searchLayoutBinding.toolbarSearchEditText,
-                    InputMethodManager.SHOW_IMPLICIT)
+            inputMethodManager.showSoftInput(
+                searchLayoutBinding.toolbarSearchEditText,
+                InputMethodManager.SHOW_IMPLICIT
+            )
         }
     }
 
     private fun hideKeyboardSearch() {
-        inputMethodManager.hideSoftInputFromWindow(searchLayoutBinding.toolbarSearchEditText.windowToken,
-            InputMethodManager.RESULT_UNCHANGED_SHOWN)
+        inputMethodManager.hideSoftInputFromWindow(
+            searchLayoutBinding.toolbarSearchEditText.windowToken,
+            InputMethodManager.RESULT_UNCHANGED_SHOWN
+        )
         searchLayoutBinding.toolbarSearchEditText.clearFocus()
     }
 
     private fun showKeyboard() {
         if (feedGroupCreateBinding.groupNameInput.requestFocus()) {
-            inputMethodManager.showSoftInput(feedGroupCreateBinding.groupNameInput,
-                    InputMethodManager.SHOW_IMPLICIT)
+            inputMethodManager.showSoftInput(
+                feedGroupCreateBinding.groupNameInput,
+                InputMethodManager.SHOW_IMPLICIT
+            )
         }
     }
 
     private fun hideKeyboard() {
-        inputMethodManager.hideSoftInputFromWindow(feedGroupCreateBinding.groupNameInput.windowToken,
-            InputMethodManager.RESULT_UNCHANGED_SHOWN)
+        inputMethodManager.hideSoftInputFromWindow(
+            feedGroupCreateBinding.groupNameInput.windowToken,
+            InputMethodManager.RESULT_UNCHANGED_SHOWN
+        )
         feedGroupCreateBinding.groupNameInput.clearFocus()
     }
 

From 14ddf379885f5341fa75fdac9097a46193499f29 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 15 Jan 2021 12:13:47 +0530
Subject: [PATCH 061/131] Combine the two Constants files into one file.

---
 .../org/schabi/newpipe/util/Constants.java    | 17 ----------------
 .../java/org/schabi/newpipe/util/Constants.kt | 20 +++++++++++++++++++
 .../org/schabi/newpipe/util/ConstantsKt.kt    |  6 ------
 3 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/Constants.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/util/Constants.kt
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt

diff --git a/app/src/main/java/org/schabi/newpipe/util/Constants.java b/app/src/main/java/org/schabi/newpipe/util/Constants.java
deleted file mode 100644
index e71dd16f9e6..00000000000
--- a/app/src/main/java/org/schabi/newpipe/util/Constants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.schabi.newpipe.util;
-
-public final class Constants {
-    public static final String KEY_SERVICE_ID = "key_service_id";
-    public static final String KEY_URL = "key_url";
-    public static final String KEY_TITLE = "key_title";
-    public static final String KEY_LINK_TYPE = "key_link_type";
-    public static final String KEY_OPEN_SEARCH = "key_open_search";
-    public static final String KEY_SEARCH_STRING = "key_search_string";
-
-    public static final String KEY_THEME_CHANGE = "key_theme_change";
-    public static final String KEY_MAIN_PAGE_CHANGE = "key_main_page_change";
-
-    public static final int NO_SERVICE_ID = -1;
-
-    private Constants() { }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/Constants.kt b/app/src/main/java/org/schabi/newpipe/util/Constants.kt
new file mode 100644
index 00000000000..054aadd7078
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/Constants.kt
@@ -0,0 +1,20 @@
+@file:JvmName("Constants")
+
+package org.schabi.newpipe.util
+
+/**
+ * Default duration when using throttle functions across the app, in milliseconds.
+ */
+const val DEFAULT_THROTTLE_TIMEOUT = 120L
+
+const val KEY_SERVICE_ID = "key_service_id"
+const val KEY_URL = "key_url"
+const val KEY_TITLE = "key_title"
+const val KEY_LINK_TYPE = "key_link_type"
+const val KEY_OPEN_SEARCH = "key_open_search"
+const val KEY_SEARCH_STRING = "key_search_string"
+
+const val KEY_THEME_CHANGE = "key_theme_change"
+const val KEY_MAIN_PAGE_CHANGE = "key_main_page_change"
+
+const val NO_SERVICE_ID = -1
diff --git a/app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt b/app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt
deleted file mode 100644
index 8d24cb04e91..00000000000
--- a/app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.schabi.newpipe.util
-
-/**
- * Default duration when using throttle functions across the app, in milliseconds.
- */
-const val DEFAULT_THROTTLE_TIMEOUT = 120L

From d8665366efcdfa38a75e790a760c8822982cd07e Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 15 Jan 2021 09:38:59 +0100
Subject: [PATCH 062/131] =?UTF-8?q?Linked=20with=20Brazilian=20Portuguese?=
 =?UTF-8?q?=20Readme=20Linked=20with=20Brazilian=20Portuguese=20Readme=20S?=
 =?UTF-8?q?oomaali=20Linked=20with=20Brazilian=20Portuguese=20Readme=20?=
 =?UTF-8?q?=ED=95=9C=EA=B5=AD=EC=96=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.ko.md | 2 +-
 README.md    | 2 +-
 README.so.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.ko.md b/README.ko.md
index 8af84d3dfe1..f5dc31ced96 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 
diff --git a/README.md b/README.md
index 87e03f05961..b0c0640568a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 
diff --git a/README.so.md b/README.so.md
index adbeafc37e9..e62acf988fc 100644
--- a/README.so.md
+++ b/README.so.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
-*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md).*
+*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
 
 <b>DIGNIIN: MIDKAN [NOOCA APP-KA EE HADDA] WALI TIJAABO AYUU KU JIRAA (BETA), SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
 

From 91305771bc28dfc8bc8b791d63876ae4b810e563 Mon Sep 17 00:00:00 2001
From: mhmdanas <6daf084a-8eaf-40fb-86c7-8500077c3b69@anonaddy.me>
Date: Fri, 15 Jan 2021 18:13:52 +0300
Subject: [PATCH 063/131] Rename updates section to installation

Also added a hidden span so that old links won't break.
---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b29e2c758fa..96835a1fe26 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 <a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
-<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#updates">Updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#installation">Installation</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a> &bull; <a href="https://newpipe.schabi.org/FAQ/">FAQ</a> &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
 <hr>
 
@@ -80,12 +80,14 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 * media.ccc.de \[beta\]
 * PeerTube instances \[beta\]
 
-## Updates
-When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:
+<!-- Hidden span to keep old links compatible -->
+<span id="updates"></span>
 
- 1. Add our custom repo to F-Droid and install it from there as soon as we publish a release. The instructions are here: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
- 2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it as soon as we publish a release.
- 3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users. (**IMPORTANT**: as of the time of writing, an F-Droid bug is preventing updates later than 0.20.1 from being published. Thus, till this bug is solved, if you want to use install updates from F-Droid, we recommend method 1.)
+## Installation
+You can install NewPipe using one of the following methods:
+ 1. Add our custom repo to F-Droid and install it from there. The instructions are here: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
+ 2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
+ 3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users. (**IMPORTANT**: as of the time of writing, an issue is preventing releases later than 0.20.1 from being published. Thus, till this issue is solved, if you want to use F-Droid, we recommend method 1.)
  4. Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
 
 We recommend method 1 for most users. APKs installed using method 1 or 2 are compatible with each other, but not with those installed using method 3. This is due to the same signing key (ours) being used for 1 and 2, but a different signing key (F-Droid's) being used for 3. Building a debug APK using method 4 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app.

From 337662bd40064686f516caf6e786e87f5d418293 Mon Sep 17 00:00:00 2001
From: mhmdanas <6daf084a-8eaf-40fb-86c7-8500077c3b69@anonaddy.me>
Date: Fri, 15 Jan 2021 18:16:28 +0300
Subject: [PATCH 064/131] Hide F-Droid badge

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 96835a1fe26..12b874f2541 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 <p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
 <h4 align="center">A libre lightweight streaming frontend for Android.</h4>
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
+
+<!-- F-Droid is extremely out of date, so we hide this for now. -->
+<!-- <p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> -->
 
 <p align="center">
 <a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>

From 7455dc93ac716394fb3ca9d1fac3e54bd60b3507 Mon Sep 17 00:00:00 2001
From: mhmdanas <6daf084a-8eaf-40fb-86c7-8500077c3b69@anonaddy.me>
Date: Fri, 15 Jan 2021 18:16:45 +0300
Subject: [PATCH 065/131] Add period to end of comment

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12b874f2541..2f3612bbbb5 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 * media.ccc.de \[beta\]
 * PeerTube instances \[beta\]
 
-<!-- Hidden span to keep old links compatible -->
+<!-- Hidden span to keep old links compatible. -->
 <span id="updates"></span>
 
 ## Installation

From a7ff73dbfd4b3c1010a19165cb8a5601d9e868c1 Mon Sep 17 00:00:00 2001
From: mhmdanas <6daf084a-8eaf-40fb-86c7-8500077c3b69@anonaddy.me>
Date: Fri, 15 Jan 2021 22:18:49 +0300
Subject: [PATCH 066/131] Rename installation to installation and updates

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d61c6565392..141bedb101b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 <a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
-<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#installation">Installation</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#installation-and-updates">Installation and updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
@@ -85,7 +85,7 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 <!-- Hidden span to keep old links compatible. -->
 <span id="updates"></span>
 
-## Installation
+## Installation and updates
 You can install NewPipe using one of the following methods:
  1. Add our custom repo to F-Droid and install it from there. The instructions are here: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
  2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.

From ca0b2118540e3caf5bf6bd80be43fe0b166e4a09 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 15 Jan 2021 21:00:39 +0100
Subject: [PATCH 067/131] Use underscore for contry code in README trnaslations

---
 README.ko.md                       | 2 +-
 README.md                          | 2 +-
 README.pt.br.md => README.pt_br.md | 2 +-
 README.so.md                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename README.pt.br.md => README.pt_br.md (99%)

diff --git a/README.ko.md b/README.ko.md
index f5dc31ced96..0ecfa485458 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 
diff --git a/README.md b/README.md
index 141bedb101b..8ba54410ee6 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 
diff --git a/README.pt.br.md b/README.pt_br.md
similarity index 99%
rename from README.pt.br.md
rename to README.pt_br.md
index 4b2662cefd7..8115d1a9155 100644
--- a/README.pt.br.md
+++ b/README.pt_br.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Site</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
 
 <b>AVISO: ESTA É UMA VERSÃO BETA, PORTANTO, VOCÊ PODE ENCONTRAR BUGS. ENCONTROU ALGUM, ABRA UM ISSUE ATRAVÉS DO NOSSO REPOSITÓRIO GITHUB.</b>
 
diff --git a/README.so.md b/README.so.md
index e62acf988fc..9bd3bd5cad7 100644
--- a/README.so.md
+++ b/README.so.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
-*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md).*
+*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
 
 <b>DIGNIIN: MIDKAN [NOOCA APP-KA EE HADDA] WALI TIJAABO AYUU KU JIRAA (BETA), SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
 

From 17746f35f9dce51d6bc4c0c0e7d1eb1c5ad539c6 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 15 Jan 2021 21:04:41 +0100
Subject: [PATCH 068/131] User uppercase for country code in pt br readme

---
 README.ko.md                       | 2 +-
 README.md                          | 2 +-
 README.pt_br.md => README.pt_BR.md | 2 +-
 README.so.md                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename README.pt_br.md => README.pt_BR.md (99%)

diff --git a/README.ko.md b/README.ko.md
index 0ecfa485458..dca3b171a4a 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 
diff --git a/README.md b/README.md
index 8ba54410ee6..a7b1e24af0d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 
diff --git a/README.pt_br.md b/README.pt_BR.md
similarity index 99%
rename from README.pt_br.md
rename to README.pt_BR.md
index 8115d1a9155..2229bca217e 100644
--- a/README.pt_br.md
+++ b/README.pt_BR.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Site</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
 
 <b>AVISO: ESTA É UMA VERSÃO BETA, PORTANTO, VOCÊ PODE ENCONTRAR BUGS. ENCONTROU ALGUM, ABRA UM ISSUE ATRAVÉS DO NOSSO REPOSITÓRIO GITHUB.</b>
 
diff --git a/README.so.md b/README.so.md
index 9bd3bd5cad7..21b20a9e4f1 100644
--- a/README.so.md
+++ b/README.so.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
-*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_br.md).*
+*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
 
 <b>DIGNIIN: MIDKAN [NOOCA APP-KA EE HADDA] WALI TIJAABO AYUU KU JIRAA (BETA), SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
 

From 920e560b4b9b602c52c8661b3359ddfa6e89f695 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 16 Jan 2021 09:02:01 +0530
Subject: [PATCH 069/131] Convert AnimationUtils functions to extension
 functions.

---
 .../newpipe/fragments/BaseStateFragment.java  |  26 +-
 .../fragments/detail/VideoDetailFragment.java |  47 +-
 .../fragments/list/BaseListFragment.java      |  12 +-
 .../list/channel/ChannelFragment.java         |  16 +-
 .../list/comments/CommentsFragment.java       |   8 +-
 .../fragments/list/kiosk/KioskFragment.java   |   4 +-
 .../list/playlist/PlaylistFragment.java       |  12 +-
 .../fragments/list/search/SearchFragment.java |  14 +-
 .../list/videos/RelatedVideosFragment.java    |   4 +-
 .../holder/StreamMiniInfoItemHolder.java      |   6 +-
 .../java/org/schabi/newpipe/ktx/TextView.kt   |  47 ++
 .../main/java/org/schabi/newpipe/ktx/View.kt  | 324 ++++++++++++
 .../newpipe/local/BaseLocalListFragment.java  |  14 +-
 .../schabi/newpipe/local/feed/FeedFragment.kt |  50 +-
 .../holder/LocalPlaylistStreamItemHolder.java |   6 +-
 .../LocalStatisticStreamItemHolder.java       |   6 +-
 .../local/playlist/LocalPlaylistFragment.java |  12 +-
 .../subscription/SubscriptionFragment.kt      |   6 +-
 .../subscription/item/FeedImportExportItem.kt |   5 +-
 .../item/PickerSubscriptionItem.kt            |   9 +-
 .../org/schabi/newpipe/player/Player.java     | 103 ++--
 .../player/event/BasePlayerGestureListener.kt |   4 +-
 .../player/event/PlayerGestureListener.java   |  36 +-
 .../schabi/newpipe/util/AnimationUtils.java   | 478 ------------------
 .../schabi/newpipe/views/CollapsibleView.java |   6 +-
 25 files changed, 568 insertions(+), 687 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/ktx/TextView.kt
 create mode 100644 app/src/main/java/org/schabi/newpipe/ktx/View.kt
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
index 9f1f5799879..88f9b78b88d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -37,7 +37,7 @@
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 
 public abstract class BaseStateFragment<I> extends BaseFragment implements ViewContract<I> {
     @State
@@ -131,35 +131,35 @@ protected void startLoading(final boolean forceLoad) {
     @Override
     public void showLoading() {
         if (emptyStateView != null) {
-            animateView(emptyStateView, false, 150);
+            animate(emptyStateView, false, 150);
         }
         if (loadingProgressBar != null) {
-            animateView(loadingProgressBar, true, 400);
+            animate(loadingProgressBar, true, 400);
         }
-        animateView(errorPanelRoot, false, 150);
+        animate(errorPanelRoot, false, 150);
     }
 
     @Override
     public void hideLoading() {
         if (emptyStateView != null) {
-            animateView(emptyStateView, false, 150);
+            animate(emptyStateView, false, 150);
         }
         if (loadingProgressBar != null) {
-            animateView(loadingProgressBar, false, 0);
+            animate(loadingProgressBar, false, 0);
         }
-        animateView(errorPanelRoot, false, 150);
+        animate(errorPanelRoot, false, 150);
     }
 
     @Override
     public void showEmptyState() {
         isLoading.set(false);
         if (emptyStateView != null) {
-            animateView(emptyStateView, true, 200);
+            animate(emptyStateView, true, 200);
         }
         if (loadingProgressBar != null) {
-            animateView(loadingProgressBar, false, 0);
+            animate(loadingProgressBar, false, 0);
         }
-        animateView(errorPanelRoot, false, 150);
+        animate(errorPanelRoot, false, 150);
     }
 
     @Override
@@ -174,11 +174,11 @@ public void showError(final String message, final boolean showRetryButton) {
 
         errorTextView.setText(message);
         if (showRetryButton) {
-            animateView(errorButtonRetry, true, 600);
+            animate(errorButtonRetry, true, 600);
         } else {
-            animateView(errorButtonRetry, false, 0);
+            animate(errorButtonRetry, false, 0);
         }
-        animateView(errorPanelRoot, true, 300);
+        animate(errorPanelRoot, true, 300);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index b25d23694a9..8c9ed2bef5c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -76,11 +76,12 @@
 import org.schabi.newpipe.fragments.EmptyFragment;
 import org.schabi.newpipe.fragments.list.comments.CommentsFragment;
 import org.schabi.newpipe.fragments.list.videos.RelatedVideosFragment;
+import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.MainPlayer;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
 import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -125,7 +126,7 @@
 import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
 import static org.schabi.newpipe.player.helper.PlayerHelper.isClearingQueueConfirmationRequired;
 import static org.schabi.newpipe.player.playqueue.PlayQueueItem.RECOVERY_UNSET;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
 
 public final class VideoDetailFragment
@@ -745,8 +746,10 @@ private View.OnTouchListener getOnControlsTouchListener() {
             }
 
             if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                animateView(appendControlsDetail, true, 250, 0, () ->
-                        animateView(appendControlsDetail, false, 1500, 1000));
+                animate(appendControlsDetail, true, 250, AnimationType.ALPHA,
+                        0, () ->
+                        animate(appendControlsDetail, false, 1500,
+                                AnimationType.ALPHA, 1000));
             }
             return false;
         };
@@ -1334,8 +1337,8 @@ private void setErrorImage(final int imageResource) {
 
         thumbnailImageView.setImageDrawable(
                 AppCompatResources.getDrawable(requireContext(), imageResource));
-        animateView(thumbnailImageView, false, 0, 0,
-                () -> animateView(thumbnailImageView, true, 500));
+        animate(thumbnailImageView, false, 0, AnimationType.ALPHA, 0,
+                () -> animate(thumbnailImageView, true, 500));
     }
 
     @Override
@@ -1417,14 +1420,14 @@ public void showLoading() {
             contentRootLayoutHiding.setVisibility(View.INVISIBLE);
         }
 
-        animateView(thumbnailPlayButton, false, 50);
-        animateView(detailDurationView, false, 100);
-        animateView(detailPositionView, false, 100);
-        animateView(positionView, false, 50);
+        animate(thumbnailPlayButton, false, 50);
+        animate(detailDurationView, false, 100);
+        animate(detailPositionView, false, 100);
+        animate(positionView, false, 50);
 
         videoTitleTextView.setText(title);
         videoTitleTextView.setMaxLines(1);
-        animateView(videoTitleTextView, true, 0);
+        animate(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
         videoTitleToggleArrow.setVisibility(View.GONE);
@@ -1466,7 +1469,7 @@ public void handleResult(@NonNull final StreamInfo info) {
                         player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
             }
         }
-        animateView(thumbnailPlayButton, true, 200);
+        animate(thumbnailPlayButton, true, 200);
         videoTitleTextView.setText(title);
 
         if (!isEmpty(info.getSubChannelName())) {
@@ -1530,12 +1533,12 @@ public void handleResult(@NonNull final StreamInfo info) {
             detailDurationView.setText(Localization.getDurationString(info.getDuration()));
             detailDurationView.setBackgroundColor(
                     ContextCompat.getColor(activity, R.color.duration_background_color));
-            animateView(detailDurationView, true, 100);
+            animate(detailDurationView, true, 100);
         } else if (info.getStreamType() == StreamType.LIVE_STREAM) {
             detailDurationView.setText(R.string.duration_live);
             detailDurationView.setBackgroundColor(
                     ContextCompat.getColor(activity, R.color.live_duration_background_color));
-            animateView(detailDurationView, true, 100);
+            animate(detailDurationView, true, 100);
         } else {
             detailDurationView.setVisibility(View.GONE);
         }
@@ -1703,8 +1706,8 @@ private void updateProgressInfo(@NonNull final StreamInfo info) {
                 // Show saved position from backStack if user allows it
                 showPlaybackProgress(playQueue.getItem().getRecoveryPosition(),
                         playQueue.getItem().getDuration() * 1000);
-                animateView(positionView, true, 500);
-                animateView(detailPositionView, true, 500);
+                animate(positionView, true, 500);
+                animate(detailPositionView, true, 500);
             }
             return;
         }
@@ -1718,8 +1721,8 @@ private void updateProgressInfo(@NonNull final StreamInfo info) {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(state -> {
                     showPlaybackProgress(state.getProgressTime(), info.getDuration() * 1000);
-                    animateView(positionView, true, 500);
-                    animateView(detailPositionView, true, 500);
+                    animate(positionView, true, 500);
+                    animate(detailPositionView, true, 500);
                 }, e -> {
                     if (DEBUG) {
                         e.printStackTrace();
@@ -1747,8 +1750,8 @@ private void showPlaybackProgress(final long progress, final long duration) {
             detailPositionView.setText(position);
         }
         if (positionView.getVisibility() != View.VISIBLE) {
-            animateView(positionView, true, 100);
-            animateView(detailPositionView, true, 100);
+            animate(positionView, true, 100);
+            animate(detailPositionView, true, 100);
         }
     }
 
@@ -1802,8 +1805,8 @@ public void onPlaybackUpdate(final int state,
                         && player.getPlayQueue() != null
                         && player.getPlayQueue().getItem() != null
                         && player.getPlayQueue().getItem().getUrl().equals(url)) {
-                    animateView(positionView, true, 100);
-                    animateView(detailPositionView, true, 100);
+                    animate(positionView, true, 100);
+                    animate(detailPositionView, true, 100);
                 }
                 break;
         }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 02c7a48183a..b251d4b9396 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -46,7 +46,7 @@
 import java.util.List;
 import java.util.Queue;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 
 public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         implements ListViewContract<I, N>, StateSaver.WriteRead,
@@ -406,23 +406,17 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
     // Contract
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void showLoading() {
-        super.showLoading();
-        // animateView(itemsList, false, 400);
-    }
-
     @Override
     public void hideLoading() {
         super.hideLoading();
-        animateView(itemsList, true, 300);
+        animate(itemsList, true, 300);
     }
 
     @Override
     public void showError(final String message, final boolean showRetryButton) {
         super.showError(message, showRetryButton);
         showListFooter(false);
-        animateView(itemsList, false, 200);
+        animate(itemsList, false, 200);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 003893517f7..834d8052fd6 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -37,12 +37,12 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
@@ -64,9 +64,9 @@
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateBackgroundColor;
-import static org.schabi.newpipe.util.AnimationUtils.animateTextColor;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.TextViewUtils.animateTextColor;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateBackgroundColor;
 
 public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
         implements View.OnClickListener {
@@ -224,7 +224,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
 
     private void monitorSubscription(final ChannelInfo info) {
         final Consumer<Throwable> onError = (Throwable throwable) -> {
-            animateView(headerBinding.channelSubscribeButton, false, 100);
+            animate(headerBinding.channelSubscribeButton, false, 100);
             showSnackBarError(throwable, UserAction.SUBSCRIPTION,
                     NewPipe.getNameOfService(currentInfo.getServiceId()),
                     "Get subscription status", 0);
@@ -379,8 +379,8 @@ private void updateSubscribeButton(final boolean isSubscribed) {
                     subscribedText);
         }
 
-        animateView(headerBinding.channelSubscribeButton, AnimationUtils.Type.LIGHT_SCALE_AND_ALPHA,
-                true, 100);
+        animate(headerBinding.channelSubscribeButton, true, 100,
+                AnimationType.LIGHT_SCALE_AND_ALPHA);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -436,7 +436,7 @@ public void showLoading() {
         IMAGE_LOADER.cancelDisplayTask(headerBinding.channelBannerImage);
         IMAGE_LOADER.cancelDisplayTask(headerBinding.channelAvatarView);
         IMAGE_LOADER.cancelDisplayTask(headerBinding.subChannelAvatarView);
-        animateView(headerBinding.channelSubscribeButton, false, 100);
+        animate(headerBinding.channelSubscribeButton, false, 100);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
index 68b0d823a2a..c0abc469beb 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
@@ -16,8 +16,8 @@
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.comments.CommentsInfo;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 
 import io.reactivex.rxjava3.core.Single;
@@ -84,16 +84,14 @@ public void showLoading() {
     public void handleResult(@NonNull final CommentsInfo result) {
         super.handleResult(result);
 
-        AnimationUtils.slideUp(requireView(), 120, 150, 0.06f);
+        ViewUtils.slideUp(requireView(), 120, 150, 0.06f);
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(), UserAction.REQUESTED_COMMENTS,
                     NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
         }
 
-        if (disposables != null) {
-            disposables.clear();
-        }
+        disposables.clear();
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
index 8770e6936ea..2e5e6453953 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -28,7 +28,7 @@
 import icepick.State;
 import io.reactivex.rxjava3.core.Single;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 
 /**
  * Created by Christian Schabesberger on 23.09.17.
@@ -160,7 +160,7 @@ public Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
     @Override
     public void showLoading() {
         super.showLoading();
-        animateView(itemsList, false, 100);
+        animate(itemsList, false, 100);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 6e723a686ee..58985e38a3c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -61,7 +61,7 @@
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;
 
 public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
@@ -261,19 +261,19 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     @Override
     public void showLoading() {
         super.showLoading();
-        animateView(headerBinding.getRoot(), false, 200);
-        animateView(itemsList, false, 100);
+        animate(headerBinding.getRoot(), false, 200);
+        animate(itemsList, false, 100);
 
         IMAGE_LOADER.cancelDisplayTask(headerBinding.uploaderAvatarView);
-        animateView(headerBinding.uploaderLayout, false, 200);
+        animate(headerBinding.uploaderLayout, false, 200);
     }
 
     @Override
     public void handleResult(@NonNull final PlaylistInfo result) {
         super.handleResult(result);
 
-        animateView(headerBinding.getRoot(), true, 100);
-        animateView(headerBinding.uploaderLayout, true, 300);
+        animate(headerBinding.getRoot(), true, 100);
+        animate(headerBinding.uploaderLayout, true, 300);
         headerBinding.uploaderLayout.setOnClickListener(null);
         // If we have an uploader put them into the UI
         if (!TextUtils.isEmpty(result.getUploaderName())) {
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 511040827e1..67663a0738a 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
@@ -51,12 +51,12 @@
 import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
+import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -82,7 +82,7 @@
 
 import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
 import static java.util.Arrays.asList;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
 
 public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.InfoItemsPage<?>>
@@ -413,7 +413,7 @@ public void reloadContent() {
                 searchEditText.setText("");
                 showKeyboardSearch();
             }
-            animateView(errorPanelRoot, false, 200);
+            animate(errorPanelRoot, false, 200);
         }
     }
 
@@ -644,8 +644,8 @@ private void showSuggestionsPanel() {
             Log.d(TAG, "showSuggestionsPanel() called");
         }
         suggestionsPanelVisible = true;
-        animateView(searchBinding.suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA,
-                true, 200);
+        animate(searchBinding.suggestionsPanel, true, 200,
+                AnimationType.LIGHT_SLIDE_AND_ALPHA);
     }
 
     private void hideSuggestionsPanel() {
@@ -653,8 +653,8 @@ private void hideSuggestionsPanel() {
             Log.d(TAG, "hideSuggestionsPanel() called");
         }
         suggestionsPanelVisible = false;
-        animateView(searchBinding.suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA,
-                false, 200);
+        animate(searchBinding.suggestionsPanel, false, 200,
+                AnimationType.LIGHT_SLIDE_AND_ALPHA);
     }
 
     private void showKeyboardSearch() {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
index 7fb41f0e558..f185c912203 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
@@ -20,8 +20,8 @@
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.RelatedStreamInfo;
 
 import java.io.Serializable;
@@ -123,7 +123,7 @@ public void handleResult(@NonNull final RelatedStreamInfo result) {
         if (headerBinding != null) {
             headerBinding.getRoot().setVisibility(View.VISIBLE);
         }
-        AnimationUtils.slideUp(getView(), 120, 96, 0.06f);
+        ViewUtils.slideUp(requireView(), 120, 96, 0.06f);
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(), UserAction.REQUESTED_STREAM,
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
index 12eab473427..227c11f91a5 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
@@ -13,8 +13,8 @@
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.views.AnimatedProgressBar;
@@ -125,10 +125,10 @@ public void updateState(final InfoItem infoItem,
             } else {
                 itemProgressView.setProgress((int) TimeUnit.MILLISECONDS
                         .toSeconds(state.getProgressTime()));
-                AnimationUtils.animateView(itemProgressView, true, 500);
+                ViewUtils.animate(itemProgressView, true, 500);
             }
         } else if (itemProgressView.getVisibility() == View.VISIBLE) {
-            AnimationUtils.animateView(itemProgressView, false, 500);
+            ViewUtils.animate(itemProgressView, false, 500);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/ktx/TextView.kt b/app/src/main/java/org/schabi/newpipe/ktx/TextView.kt
new file mode 100644
index 00000000000..cfb13a10733
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/ktx/TextView.kt
@@ -0,0 +1,47 @@
+@file:JvmName("TextViewUtils")
+
+package org.schabi.newpipe.ktx
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import android.util.Log
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import org.schabi.newpipe.MainActivity
+
+private const val TAG = "TextViewUtils"
+
+/**
+ * Animate the text color of any view that extends [TextView] (Buttons, EditText...).
+ *
+ * @param duration   the duration of the animation
+ * @param colorStart the text color to start with
+ * @param colorEnd   the text color to end with
+ */
+fun TextView.animateTextColor(duration: Long, @ColorInt colorStart: Int, @ColorInt colorEnd: Int) {
+    if (MainActivity.DEBUG) {
+        Log.d(
+            TAG,
+            "animateTextColor() called with: " +
+                "view = [" + this + "], duration = [" + duration + "], " +
+                "colorStart = [" + colorStart + "], colorEnd = [" + colorEnd + "]"
+        )
+    }
+    val viewPropertyAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorStart, colorEnd)
+    viewPropertyAnimator.interpolator = FastOutSlowInInterpolator()
+    viewPropertyAnimator.duration = duration
+    viewPropertyAnimator.addUpdateListener { setTextColor(it.animatedValue as Int) }
+    viewPropertyAnimator.addListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationEnd(animation: Animator) {
+            setTextColor(colorEnd)
+        }
+
+        override fun onAnimationCancel(animation: Animator) {
+            setTextColor(colorEnd)
+        }
+    })
+    viewPropertyAnimator.start()
+}
diff --git a/app/src/main/java/org/schabi/newpipe/ktx/View.kt b/app/src/main/java/org/schabi/newpipe/ktx/View.kt
new file mode 100644
index 00000000000..0f769671ee8
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/ktx/View.kt
@@ -0,0 +1,324 @@
+@file:JvmName("ViewUtils")
+
+package org.schabi.newpipe.ktx
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import android.content.res.ColorStateList
+import android.util.Log
+import android.view.View
+import androidx.annotation.ColorInt
+import androidx.annotation.FloatRange
+import androidx.core.view.ViewCompat
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import org.schabi.newpipe.MainActivity
+
+private const val TAG = "ViewUtils"
+
+inline var View.backgroundTintListCompat: ColorStateList?
+    get() = ViewCompat.getBackgroundTintList(this)
+    set(value) = ViewCompat.setBackgroundTintList(this, value)
+
+/**
+ * Animate the view.
+ *
+ * @param enterOrExit   true to enter, false to exit
+ * @param duration      how long the animation will take, in milliseconds
+ * @param animationType Type of the animation
+ * @param delay         how long the animation will wait to start, in milliseconds
+ * @param execOnEnd     runnable that will be executed when the animation ends
+ */
+@JvmOverloads
+fun View.animate(
+    enterOrExit: Boolean,
+    duration: Long,
+    animationType: AnimationType = AnimationType.ALPHA,
+    delay: Long = 0,
+    execOnEnd: Runnable? = null
+) {
+    if (MainActivity.DEBUG) {
+        val id = try {
+            resources.getResourceEntryName(id)
+        } catch (e: Exception) {
+            id.toString() + ""
+        }
+        val msg = String.format(
+            "%8s →  [%s:%s] [%s %s:%s] execOnEnd=%s", enterOrExit,
+            javaClass.simpleName, id, animationType, duration, delay, execOnEnd
+        )
+        Log.d(TAG, "animate(): $msg")
+    }
+    if (isVisible && enterOrExit) {
+        if (MainActivity.DEBUG) {
+            Log.d(TAG, "animate(): view was already visible > view = [$this]")
+        }
+        animate().setListener(null).cancel()
+        isVisible = true
+        alpha = 1f
+        execOnEnd?.run()
+        return
+    } else if ((isGone || isInvisible) && !enterOrExit) {
+        if (MainActivity.DEBUG) {
+            Log.d(TAG, "animate(): view was already gone > view = [$this]")
+        }
+        animate().setListener(null).cancel()
+        isGone = true
+        alpha = 0f
+        execOnEnd?.run()
+        return
+    }
+    animate().setListener(null).cancel()
+    isVisible = true
+    when (animationType) {
+        AnimationType.ALPHA -> animateAlpha(enterOrExit, duration, delay, execOnEnd)
+        AnimationType.SCALE_AND_ALPHA -> animateScaleAndAlpha(enterOrExit, duration, delay, execOnEnd)
+        AnimationType.LIGHT_SCALE_AND_ALPHA -> animateLightScaleAndAlpha(enterOrExit, duration, delay, execOnEnd)
+        AnimationType.SLIDE_AND_ALPHA -> animateSlideAndAlpha(enterOrExit, duration, delay, execOnEnd)
+        AnimationType.LIGHT_SLIDE_AND_ALPHA -> animateLightSlideAndAlpha(enterOrExit, duration, delay, execOnEnd)
+    }
+}
+
+/**
+ * Animate the background color of a view.
+ *
+ * @param duration   the duration of the animation
+ * @param colorStart the background color to start with
+ * @param colorEnd   the background color to end with
+ */
+fun View.animateBackgroundColor(duration: Long, @ColorInt colorStart: Int, @ColorInt colorEnd: Int) {
+    if (MainActivity.DEBUG) {
+        Log.d(
+            TAG,
+            "animateBackgroundColor() called with: " +
+                "view = [" + this + "], duration = [" + duration + "], " +
+                "colorStart = [" + colorStart + "], colorEnd = [" + colorEnd + "]"
+        )
+    }
+    val empty = arrayOf(IntArray(0))
+    val viewPropertyAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorStart, colorEnd)
+    viewPropertyAnimator.interpolator = FastOutSlowInInterpolator()
+    viewPropertyAnimator.duration = duration
+    viewPropertyAnimator.addUpdateListener { animation: ValueAnimator ->
+        backgroundTintListCompat = ColorStateList(empty, intArrayOf(animation.animatedValue as Int))
+    }
+    viewPropertyAnimator.addListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationEnd(animation: Animator) {
+            backgroundTintListCompat = ColorStateList(empty, intArrayOf(colorEnd))
+        }
+
+        override fun onAnimationCancel(animation: Animator) {
+            onAnimationEnd(animation)
+        }
+    })
+    viewPropertyAnimator.start()
+}
+
+fun View.animateHeight(duration: Long, targetHeight: Int): ValueAnimator {
+    if (MainActivity.DEBUG) {
+        Log.d(
+            TAG,
+            "animateHeight: duration = [" + duration + "], " +
+                "from " + height + " to → " + targetHeight + " in: " + this
+        )
+    }
+    val animator = ValueAnimator.ofFloat(height.toFloat(), targetHeight.toFloat())
+    animator.interpolator = FastOutSlowInInterpolator()
+    animator.duration = duration
+    animator.addUpdateListener { animation: ValueAnimator ->
+        val value = animation.animatedValue as Float
+        layoutParams.height = value.toInt()
+        requestLayout()
+    }
+    animator.addListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationEnd(animation: Animator) {
+            layoutParams.height = targetHeight
+            requestLayout()
+        }
+
+        override fun onAnimationCancel(animation: Animator) {
+            layoutParams.height = targetHeight
+            requestLayout()
+        }
+    })
+    animator.start()
+    return animator
+}
+
+fun View.animateRotation(duration: Long, targetRotation: Int) {
+    if (MainActivity.DEBUG) {
+        Log.d(
+            TAG,
+            "animateRotation: duration = [" + duration + "], " +
+                "from " + rotation + " to → " + targetRotation + " in: " + this
+        )
+    }
+    animate().setListener(null).cancel()
+    animate()
+        .rotation(targetRotation.toFloat()).setDuration(duration)
+        .setInterpolator(FastOutSlowInInterpolator())
+        .setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationCancel(animation: Animator) {
+                rotation = targetRotation.toFloat()
+            }
+
+            override fun onAnimationEnd(animation: Animator) {
+                rotation = targetRotation.toFloat()
+            }
+        }).start()
+}
+
+private fun View.animateAlpha(enterOrExit: Boolean, duration: Long, delay: Long, execOnEnd: Runnable?) {
+    if (enterOrExit) {
+        animate().setInterpolator(FastOutSlowInInterpolator()).alpha(1f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    execOnEnd?.run()
+                }
+            }).start()
+    } else {
+        animate().setInterpolator(FastOutSlowInInterpolator()).alpha(0f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    isGone = true
+                    execOnEnd?.run()
+                }
+            }).start()
+    }
+}
+
+private fun View.animateScaleAndAlpha(enterOrExit: Boolean, duration: Long, delay: Long, execOnEnd: Runnable?) {
+    if (enterOrExit) {
+        scaleX = .8f
+        scaleY = .8f
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(1f).scaleX(1f).scaleY(1f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    execOnEnd?.run()
+                }
+            }).start()
+    } else {
+        scaleX = 1f
+        scaleY = 1f
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(0f).scaleX(.8f).scaleY(.8f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    isGone = true
+                    execOnEnd?.run()
+                }
+            }).start()
+    }
+}
+
+private fun View.animateLightScaleAndAlpha(enterOrExit: Boolean, duration: Long, delay: Long, execOnEnd: Runnable?) {
+    if (enterOrExit) {
+        alpha = .5f
+        scaleX = .95f
+        scaleY = .95f
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(1f).scaleX(1f).scaleY(1f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    execOnEnd?.run()
+                }
+            }).start()
+    } else {
+        alpha = 1f
+        scaleX = 1f
+        scaleY = 1f
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(0f).scaleX(.95f).scaleY(.95f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    isGone = true
+                    execOnEnd?.run()
+                }
+            }).start()
+    }
+}
+
+private fun View.animateSlideAndAlpha(enterOrExit: Boolean, duration: Long, delay: Long, execOnEnd: Runnable?) {
+    if (enterOrExit) {
+        translationY = -height.toFloat()
+        alpha = 0f
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator()).alpha(1f).translationY(0f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    execOnEnd?.run()
+                }
+            }).start()
+    } else {
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(0f).translationY(-height.toFloat())
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    isGone = true
+                    execOnEnd?.run()
+                }
+            }).start()
+    }
+}
+
+private fun View.animateLightSlideAndAlpha(enterOrExit: Boolean, duration: Long, delay: Long, execOnEnd: Runnable?) {
+    if (enterOrExit) {
+        translationY = -height / 2.0f
+        alpha = 0f
+        animate()
+            .setInterpolator(FastOutSlowInInterpolator()).alpha(1f).translationY(0f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    execOnEnd?.run()
+                }
+            }).start()
+    } else {
+        animate().setInterpolator(FastOutSlowInInterpolator())
+            .alpha(0f).translationY(-height / 2.0f)
+            .setDuration(duration).setStartDelay(delay)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    isGone = true
+                    execOnEnd?.run()
+                }
+            }).start()
+    }
+}
+
+fun View.slideUp(duration: Long, delay: Long, @FloatRange(from = 0.0, to = 1.0) translationPercent: Float) {
+    val newTranslationY = (resources.displayMetrics.heightPixels * translationPercent).toInt()
+    animate().setListener(null).cancel()
+    alpha = 0f
+    translationY = newTranslationY.toFloat()
+    visibility = View.VISIBLE
+    animate()
+        .alpha(1f)
+        .translationY(0f)
+        .setStartDelay(delay)
+        .setDuration(duration)
+        .setInterpolator(FastOutSlowInInterpolator())
+        .start()
+}
+
+enum class AnimationType {
+    ALPHA, SCALE_AND_ALPHA, LIGHT_SCALE_AND_ALPHA, SLIDE_AND_ALPHA, LIGHT_SLIDE_AND_ALPHA
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 38ecc1c631c..d454da08b8a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -24,7 +24,7 @@
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.list.ListViewContract;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 
 /**
  * This fragment is design to be used with persistent data such as
@@ -185,10 +185,10 @@ public void startLoading(final boolean forceLoad) {
     public void showLoading() {
         super.showLoading();
         if (itemsList != null) {
-            animateView(itemsList, false, 200);
+            animate(itemsList, false, 200);
         }
         if (headerRootBinding != null) {
-            animateView(headerRootBinding.getRoot(), false, 200);
+            animate(headerRootBinding.getRoot(), false, 200);
         }
     }
 
@@ -196,10 +196,10 @@ public void showLoading() {
     public void hideLoading() {
         super.hideLoading();
         if (itemsList != null) {
-            animateView(itemsList, true, 200);
+            animate(itemsList, true, 200);
         }
         if (headerRootBinding != null) {
-            animateView(headerRootBinding.getRoot(), true, 200);
+            animate(headerRootBinding.getRoot(), true, 200);
         }
     }
 
@@ -209,10 +209,10 @@ public void showError(final String message, final boolean showRetryButton) {
         showListFooter(false);
 
         if (itemsList != null) {
-            animateView(itemsList, false, 200);
+            animate(itemsList, false, 200);
         }
         if (headerRootBinding != null) {
-            animateView(headerRootBinding.getRoot(), false, 200);
+            animate(headerRootBinding.getRoot(), false, 200);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index 6df15c8b255..6e95f009f4f 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -42,9 +42,9 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.databinding.ErrorRetryBinding
 import org.schabi.newpipe.databinding.FragmentFeedBinding
 import org.schabi.newpipe.fragments.list.BaseListFragment
+import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.local.feed.service.FeedLoadService
 import org.schabi.newpipe.report.UserAction
-import org.schabi.newpipe.util.AnimationUtils.animateView
 import org.schabi.newpipe.util.Localization
 import java.util.Calendar
 
@@ -180,50 +180,50 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
     // /////////////////////////////////////////////////////////////////////////
 
     override fun showLoading() {
-        animateView(feedBinding.refreshRootView, false, 0)
-        animateView(feedBinding.itemsList, false, 0)
+        feedBinding.refreshRootView.animate(false, 0)
+        feedBinding.itemsList.animate(false, 0)
 
-        animateView(feedBinding.loadingProgressBar, true, 200)
-        animateView(feedBinding.loadingProgressText, true, 200)
+        feedBinding.loadingProgressBar.animate(true, 200)
+        feedBinding.loadingProgressText.animate(true, 200)
 
-        animateView(feedBinding.emptyStateView.root, false, 0)
-        animateView(errorBinding.root, false, 0)
+        feedBinding.emptyStateView.root.animate(false, 0)
+        errorBinding.root.animate(false, 0)
     }
 
     override fun hideLoading() {
-        animateView(feedBinding.refreshRootView, true, 200)
-        animateView(feedBinding.itemsList, true, 300)
+        feedBinding.refreshRootView.animate(true, 200)
+        feedBinding.itemsList.animate(true, 300)
 
-        animateView(feedBinding.loadingProgressBar, false, 0)
-        animateView(feedBinding.loadingProgressText, false, 0)
+        feedBinding.loadingProgressBar.animate(false, 0)
+        feedBinding.loadingProgressText.animate(false, 0)
 
-        animateView(feedBinding.emptyStateView.root, false, 0)
-        animateView(errorBinding.root, false, 0)
+        feedBinding.emptyStateView.root.animate(false, 0)
+        errorBinding.root.animate(false, 0)
         feedBinding.swiperefresh.isRefreshing = false
     }
 
     override fun showEmptyState() {
-        animateView(feedBinding.refreshRootView, true, 200)
-        animateView(feedBinding.itemsList, false, 0)
+        feedBinding.refreshRootView.animate(true, 200)
+        feedBinding.itemsList.animate(false, 0)
 
-        animateView(feedBinding.loadingProgressBar, false, 0)
-        animateView(feedBinding.loadingProgressText, false, 0)
+        feedBinding.loadingProgressBar.animate(false, 0)
+        feedBinding.loadingProgressText.animate(false, 0)
 
-        animateView(feedBinding.emptyStateView.root, true, 800)
-        animateView(errorBinding.root, false, 0)
+        feedBinding.emptyStateView.root.animate(true, 800)
+        errorBinding.root.animate(false, 0)
     }
 
     override fun showError(message: String, showRetryButton: Boolean) {
         infoListAdapter.clearStreamItemList()
-        animateView(feedBinding.refreshRootView, false, 120)
-        animateView(feedBinding.itemsList, false, 120)
+        feedBinding.refreshRootView.animate(false, 120)
+        feedBinding.itemsList.animate(false, 120)
 
-        animateView(feedBinding.loadingProgressBar, false, 120)
-        animateView(feedBinding.loadingProgressText, false, 120)
+        feedBinding.loadingProgressBar.animate(false, 120)
+        feedBinding.loadingProgressText.animate(false, 120)
 
         errorBinding.errorMessageView.text = message
-        animateView(errorBinding.errorButtonRetry, showRetryButton, if (showRetryButton) 600 else 0)
-        animateView(errorBinding.root, true, 300)
+        errorBinding.errorButtonRetry.animate(showRetryButton, if (showRetryButton) 600 else 0)
+        errorBinding.root.animate(true, 300)
     }
 
     override fun handleResult(result: FeedState) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
index 703271c4203..fd6c8d1d1e5 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
@@ -12,9 +12,9 @@
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.views.AnimatedProgressBar;
@@ -117,10 +117,10 @@ public void updateState(final LocalItem localItem,
             } else {
                 itemProgressView.setProgress((int) TimeUnit.MILLISECONDS
                         .toSeconds(item.getProgressTime()));
-                AnimationUtils.animateView(itemProgressView, true, 500);
+                ViewUtils.animate(itemProgressView, true, 500);
             }
         } else if (itemProgressView.getVisibility() == View.VISIBLE) {
-            AnimationUtils.animateView(itemProgressView, false, 500);
+            ViewUtils.animate(itemProgressView, false, 500);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
index 95768b5c23f..7c4e47c3654 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -12,9 +12,9 @@
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.views.AnimatedProgressBar;
@@ -148,10 +148,10 @@ public void updateState(final LocalItem localItem,
             } else {
                 itemProgressView.setProgress((int) TimeUnit.MILLISECONDS
                         .toSeconds(item.getProgressTime()));
-                AnimationUtils.animateView(itemProgressView, true, 500);
+                ViewUtils.animate(itemProgressView, true, 500);
             }
         } else if (itemProgressView.getVisibility() == View.VISIBLE) {
-            AnimationUtils.animateView(itemProgressView, false, 500);
+            ViewUtils.animate(itemProgressView, false, 500);
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 08b7101e66a..3137de9e6f7 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -58,14 +58,14 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import icepick.State;
-import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 
 public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistStreamEntry>, Void> {
     // Save the list 10 seconds after the last change occurred
@@ -201,8 +201,8 @@ public void drag(final LocalItem selectedItem,
     public void showLoading() {
         super.showLoading();
         if (headerBinding != null) {
-            animateView(headerBinding.getRoot(), false, 200);
-            animateView(playlistControlBinding.getRoot(), false, 200);
+            animate(headerBinding.getRoot(), false, 200);
+            animate(playlistControlBinding.getRoot(), false, 200);
         }
     }
 
@@ -210,8 +210,8 @@ public void showLoading() {
     public void hideLoading() {
         super.hideLoading();
         if (headerBinding != null) {
-            animateView(headerBinding.getRoot(), true, 200);
-            animateView(playlistControlBinding.getRoot(), true, 200);
+            animate(headerBinding.getRoot(), true, 200);
+            animate(playlistControlBinding.getRoot(), true, 200);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index c4454186efa..8be281dc3b4 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -36,6 +36,7 @@ import org.schabi.newpipe.databinding.DialogTitleBinding
 import org.schabi.newpipe.databinding.FragmentSubscriptionBinding
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
 import org.schabi.newpipe.fragments.BaseStateFragment
+import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.local.subscription.SubscriptionViewModel.SubscriptionState
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialog
@@ -56,7 +57,6 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE
 import org.schabi.newpipe.report.UserAction
-import org.schabi.newpipe.util.AnimationUtils.animateView
 import org.schabi.newpipe.util.FilePickerActivityHelper
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.OnClickGesture
@@ -407,12 +407,12 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     override fun showLoading() {
         super.showLoading()
-        animateView(binding.itemsList, false, 100)
+        binding.itemsList.animate(false, 100)
     }
 
     override fun hideLoading() {
         super.hideLoading()
-        animateView(binding.itemsList, true, 200)
+        binding.itemsList.animate(true, 200)
     }
 
     // /////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
index 5fd70a684f2..00de83538a9 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.feed_import_export_group.import_from_optio
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
-import org.schabi.newpipe.util.AnimationUtils
+import org.schabi.newpipe.ktx.animateRotation
 import org.schabi.newpipe.util.ServiceHelper
 import org.schabi.newpipe.util.ThemeHelper
 import org.schabi.newpipe.views.CollapsibleView
@@ -49,8 +49,7 @@ class FeedImportExportItem(
 
         expandIconListener?.let { viewHolder.import_export_options.removeListener(it) }
         expandIconListener = CollapsibleView.StateListener { newState ->
-            AnimationUtils.animateRotation(
-                viewHolder.import_export_expand_icon,
+            viewHolder.import_export_expand_icon.animateRotation(
                 250, if (newState == CollapsibleView.COLLAPSED) 0 else 180
             )
         }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
index fd98d044756..0138b1ffe68 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
@@ -9,8 +9,8 @@ import kotlinx.android.synthetic.main.picker_subscription_item.*
 import kotlinx.android.synthetic.main.picker_subscription_item.view.*
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
-import org.schabi.newpipe.util.AnimationUtils
-import org.schabi.newpipe.util.AnimationUtils.animateView
+import org.schabi.newpipe.ktx.AnimationType
+import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.util.ImageDisplayConstants
 
 data class PickerSubscriptionItem(
@@ -41,9 +41,6 @@ data class PickerSubscriptionItem(
 
     fun updateSelected(containerView: View, isSelected: Boolean) {
         this.isSelected = isSelected
-        animateView(
-            containerView.selected_highlight,
-            AnimationUtils.Type.LIGHT_SCALE_AND_ALPHA, isSelected, 150
-        )
+        containerView.selected_highlight.animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 4e2edaa1034..2453117f3c6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -92,6 +92,7 @@
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.info_list.StreamSegmentAdapter;
+import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.event.PlayerEventListener;
@@ -116,7 +117,6 @@
 import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
 import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
-import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.KoreUtil;
@@ -150,6 +150,8 @@
 import static com.google.android.exoplayer2.Player.RepeatMode;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
 import static org.schabi.newpipe.player.MainPlayer.ACTION_CLOSE;
 import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD;
 import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND;
@@ -176,9 +178,6 @@
 import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePopupLayoutParamsFromPrefs;
 import static org.schabi.newpipe.player.helper.PlayerHelper.retrieveSeekDurationFromPreferences;
 import static org.schabi.newpipe.player.helper.PlayerHelper.savePlaybackParametersToPrefs;
-import static org.schabi.newpipe.util.AnimationUtils.Type.SLIDE_AND_ALPHA;
-import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
 import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
 import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
@@ -1560,8 +1559,8 @@ public void onStartTrackingTouch(final SeekBar seekBar) {
         }
 
         showControls(0);
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true,
-                DEFAULT_CONTROLS_DURATION);
+        animate(binding.currentDisplaySeek, true, DEFAULT_CONTROLS_DURATION,
+                AnimationType.SCALE_AND_ALPHA);
     }
 
     @Override // seekbar listener
@@ -1576,7 +1575,7 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
         }
 
         binding.playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        animate(binding.currentDisplaySeek, false, 200, AnimationType.SCALE_AND_ALPHA);
 
         if (currentState == STATE_PAUSED_SEEK) {
             changeState(STATE_BUFFERING);
@@ -1682,8 +1681,8 @@ public void showControlsThenHide() {
                 : DPAD_CONTROLS_HIDE_TIME;
 
         showHideShadow(true, DEFAULT_CONTROLS_DURATION);
-        animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0,
-                () -> hideControls(DEFAULT_CONTROLS_DURATION, hideTime));
+        animate(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION,
+                AnimationType.ALPHA, 0, () -> hideControls(DEFAULT_CONTROLS_DURATION, hideTime));
     }
 
     public void showControls(final long duration) {
@@ -1694,7 +1693,7 @@ public void showControls(final long duration) {
         showSystemUIPartially();
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
         showHideShadow(true, duration);
-        animateView(binding.playbackControlRoot, true, duration);
+        animate(binding.playbackControlRoot, true, duration);
     }
 
     public void hideControls(final long duration, final long delay) {
@@ -1708,14 +1707,14 @@ public void hideControls(final long duration, final long delay) {
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
         controlsVisibilityHandler.postDelayed(() -> {
             showHideShadow(false, duration);
-            animateView(binding.playbackControlRoot, false, duration, 0,
-                    this::hideSystemUIIfNeeded);
+            animate(binding.playbackControlRoot, false, duration, AnimationType.ALPHA,
+                    0, this::hideSystemUIIfNeeded);
         }, delay);
     }
 
     private void showHideShadow(final boolean show, final long duration) {
-        animateView(binding.playerTopShadow, show, duration, 0, null);
-        animateView(binding.playerBottomShadow, show, duration, 0, null);
+        animate(binding.playerTopShadow, show, duration, AnimationType.ALPHA, 0, null);
+        animate(binding.playerBottomShadow, show, duration, AnimationType.ALPHA, 0, null);
     }
 
     private void showOrHideButtons() {
@@ -1913,15 +1912,15 @@ private void onBlocked() {
         }
 
         controlsVisibilityHandler.removeCallbacksAndMessages(null);
-        animateView(binding.playbackControlRoot, false, DEFAULT_CONTROLS_DURATION);
+        animate(binding.playbackControlRoot, false, DEFAULT_CONTROLS_DURATION);
 
         binding.playbackSeekBar.setEnabled(false);
         binding.playbackSeekBar.getThumb()
                 .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
 
         binding.loadingPanel.setBackgroundColor(Color.BLACK);
-        animateView(binding.loadingPanel, true, 0);
-        animateView(binding.surfaceForeground, true, 100);
+        animate(binding.loadingPanel, true, 0);
+        animate(binding.surfaceForeground, true, 100);
 
         binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
         animatePlayButtons(false, 100);
@@ -1948,9 +1947,9 @@ private void onPlaying() {
 
         binding.loadingPanel.setVisibility(View.GONE);
 
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        animate(binding.currentDisplaySeek, false, 200, AnimationType.SCALE_AND_ALPHA);
 
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0,
+        animate(binding.playPauseButton, false, 80, AnimationType.SCALE_AND_ALPHA, 0,
                 () -> {
                     binding.playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
                     animatePlayButtons(true, 200);
@@ -1991,7 +1990,7 @@ private void onPaused() {
         showControls(400);
         binding.loadingPanel.setVisibility(View.GONE);
 
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0,
+        animate(binding.playPauseButton, false, 80, AnimationType.SCALE_AND_ALPHA, 0,
                 () -> {
                     binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
                     animatePlayButtons(true, 200);
@@ -2029,7 +2028,7 @@ private void onCompleted() {
             Log.d(TAG, "onCompleted() called");
         }
 
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0,
+        animate(binding.playPauseButton, false, 0, AnimationType.SCALE_AND_ALPHA, 0,
                 () -> {
                     binding.playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
                     animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
@@ -2051,13 +2050,13 @@ private void onCompleted() {
         }
 
         showControls(500);
-        animateView(binding.currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        animate(binding.currentDisplaySeek, false, 200, AnimationType.SCALE_AND_ALPHA);
         binding.loadingPanel.setVisibility(View.GONE);
-        animateView(binding.surfaceForeground, true, 100);
+        animate(binding.surfaceForeground, true, 100);
     }
 
     private void animatePlayButtons(final boolean show, final int duration) {
-        animateView(binding.playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+        animate(binding.playPauseButton, show, duration, AnimationType.SCALE_AND_ALPHA);
 
         boolean showQueueButtons = show;
         if (playQueue == null) {
@@ -2065,18 +2064,18 @@ private void animatePlayButtons(final boolean show, final int duration) {
         }
 
         if (!showQueueButtons || playQueue.getIndex() > 0) {
-            animateView(
+            animate(
                     binding.playPreviousButton,
-                    AnimationUtils.Type.SCALE_AND_ALPHA,
                     showQueueButtons,
-                    duration);
+                    duration,
+                    AnimationType.SCALE_AND_ALPHA);
         }
         if (!showQueueButtons || playQueue.getIndex() + 1 < playQueue.getStreams().size()) {
-            animateView(
+            animate(
                     binding.playNextButton,
-                    AnimationUtils.Type.SCALE_AND_ALPHA,
                     showQueueButtons,
-                    duration);
+                    duration,
+                    AnimationType.SCALE_AND_ALPHA);
         }
     }
     //endregion
@@ -2274,7 +2273,7 @@ public void onPositionDiscontinuity(@DiscontinuityReason final int discontinuity
     @Override
     public void onRenderedFirstFrame() {
         //TODO check if this causes black screen when switching to fullscreen
-        animateView(binding.surfaceForeground, false, DEFAULT_CONTROLS_DURATION);
+        animate(binding.surfaceForeground, false, DEFAULT_CONTROLS_DURATION);
     }
     //endregion
 
@@ -2871,8 +2870,8 @@ private void onQueueClicked() {
 
         hideControls(0, 0);
         binding.itemsListPanel.requestFocus();
-        animateView(binding.itemsListPanel, SLIDE_AND_ALPHA, true,
-                DEFAULT_CONTROLS_DURATION);
+        animate(binding.itemsListPanel, true, DEFAULT_CONTROLS_DURATION,
+                AnimationType.SLIDE_AND_ALPHA);
 
         binding.itemsList.scrollToPosition(playQueue.getIndex());
     }
@@ -2905,8 +2904,8 @@ private void onSegmentsClicked() {
 
         hideControls(0, 0);
         binding.itemsListPanel.requestFocus();
-        animateView(binding.itemsListPanel, SLIDE_AND_ALPHA, true,
-                DEFAULT_CONTROLS_DURATION);
+        animate(binding.itemsListPanel, true, DEFAULT_CONTROLS_DURATION,
+                AnimationType.SLIDE_AND_ALPHA);
 
         final int adapterPosition = getNearestStreamSegmentPosition(simpleExoPlayer
                 .getCurrentPosition());
@@ -2942,8 +2941,8 @@ public void closeItemsList() {
                 itemTouchHelper.attachToRecyclerView(null);
             }
 
-            animateView(binding.itemsListPanel, SLIDE_AND_ALPHA, false,
-                    DEFAULT_CONTROLS_DURATION, 0, () -> {
+            animate(binding.itemsListPanel, false, DEFAULT_CONTROLS_DURATION,
+                    AnimationType.SLIDE_AND_ALPHA, 0, () -> {
                         // Even when queueLayout is GONE it receives touch events
                         // and ruins normal behavior of the app. This line fixes it
                         binding.itemsListPanel.setTranslationY(
@@ -3451,18 +3450,19 @@ public void onClick(final View v) {
         if (currentState != STATE_COMPLETED) {
             controlsVisibilityHandler.removeCallbacksAndMessages(null);
             showHideShadow(true, DEFAULT_CONTROLS_DURATION);
-            animateView(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION, 0, () -> {
-                if (currentState == STATE_PLAYING && !isSomePopupMenuVisible) {
-                    if (v.getId() == binding.playPauseButton.getId()
-                            // Hide controls in fullscreen immediately
-                            || (v.getId() == binding.screenRotationButton.getId()
-                            && isFullscreen)) {
-                        hideControls(0, 0);
-                    } else {
-                        hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
-                    }
-                }
-            });
+            animate(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION,
+                    AnimationType.ALPHA, 0, () -> {
+                        if (currentState == STATE_PLAYING && !isSomePopupMenuVisible) {
+                            if (v.getId() == binding.playPauseButton.getId()
+                                    // Hide controls in fullscreen immediately
+                                    || (v.getId() == binding.screenRotationButton.getId()
+                                    && isFullscreen)) {
+                                hideControls(0, 0);
+                            } else {
+                                hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+                            }
+                        }
+                    });
         }
     }
 
@@ -3531,9 +3531,8 @@ private void onMoreOptionsClicked() {
 
         animateRotation(binding.moreOptionsButton, DEFAULT_CONTROLS_DURATION,
                 isMoreControlsVisible ? 0 : 180);
-        animateView(binding.secondaryControls, SLIDE_AND_ALPHA, !isMoreControlsVisible,
-                DEFAULT_CONTROLS_DURATION, 0,
-                () -> {
+        animate(binding.secondaryControls, !isMoreControlsVisible, DEFAULT_CONTROLS_DURATION,
+                AnimationType.SLIDE_AND_ALPHA, 0, () -> {
                     // Fix for a ripple effect on background drawable.
                     // When view returns from GONE state it takes more milliseconds than returning
                     // from INVISIBLE state. And the delay makes ripple background end to fast
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
index 46502a27074..989c78c57cb 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
@@ -7,11 +7,11 @@ import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewConfiguration
+import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.player.MainPlayer
 import org.schabi.newpipe.player.Player
 import org.schabi.newpipe.player.helper.PlayerHelper
 import org.schabi.newpipe.player.helper.PlayerHelper.savePopupPositionAndSizeToPrefs
-import org.schabi.newpipe.util.AnimationUtils
 import kotlin.math.abs
 import kotlin.math.hypot
 import kotlin.math.max
@@ -364,7 +364,7 @@ abstract class BasePlayerGestureListener(
         }
 
         if (!isMovingInPopup) {
-            AnimationUtils.animateView(player.closeOverlayButton, true, 200)
+            player.closeOverlayButton.animate(true, 200)
         }
 
         isMovingInPopup = true
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index 887e32a23d3..ecc57ff2fbe 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -17,11 +17,12 @@
 import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 
-import static org.schabi.newpipe.player.Player.STATE_PLAYING;
+import static org.schabi.newpipe.ktx.AnimationType.ALPHA;
+import static org.schabi.newpipe.ktx.AnimationType.SCALE_AND_ALPHA;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_DURATION;
 import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_HIDE_TIME;
-import static org.schabi.newpipe.util.AnimationUtils.Type.SCALE_AND_ALPHA;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.player.Player.STATE_PLAYING;
 
 /**
  * GestureListener for the player
@@ -123,11 +124,11 @@ public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
             final View closingOverlayView = player.getClosingOverlayView();
             if (player.isInsideClosingRadius(movingEvent)) {
                 if (closingOverlayView.getVisibility() == View.GONE) {
-                    animateView(closingOverlayView, true, 250);
+                    animate(closingOverlayView, true, 250);
                 }
             } else {
                 if (closingOverlayView.getVisibility() == View.VISIBLE) {
-                    animateView(closingOverlayView, false, 0);
+                    animate(closingOverlayView, false, 0);
                 }
             }
         }
@@ -153,7 +154,7 @@ private void onScrollMainVolume(final float distanceX, final float distanceY) {
         );
 
         if (player.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
-            animateView(player.getVolumeRelativeLayout(), SCALE_AND_ALPHA, true, 200);
+            animate(player.getVolumeRelativeLayout(), true, 200, SCALE_AND_ALPHA);
         }
         if (player.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
             player.getBrightnessRelativeLayout().setVisibility(View.GONE);
@@ -195,7 +196,7 @@ private void onScrollMainBrightness(final float distanceX, final float distanceY
         );
 
         if (player.getBrightnessRelativeLayout().getVisibility() != View.VISIBLE) {
-            animateView(player.getBrightnessRelativeLayout(), SCALE_AND_ALPHA, true, 200);
+            animate(player.getBrightnessRelativeLayout(), true, 200, SCALE_AND_ALPHA);
         }
         if (player.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
             player.getVolumeRelativeLayout().setVisibility(View.GONE);
@@ -215,21 +216,18 @@ public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
             }
 
             if (player.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
-                animateView(player.getVolumeRelativeLayout(), SCALE_AND_ALPHA,
-                        false, 200, 200);
+                animate(player.getVolumeRelativeLayout(), false, 200, SCALE_AND_ALPHA,
+                        200);
             }
             if (player.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
-                animateView(player.getBrightnessRelativeLayout(), SCALE_AND_ALPHA,
-                        false, 200, 200);
+                animate(player.getBrightnessRelativeLayout(), false, 200, SCALE_AND_ALPHA,
+                        200);
             }
 
             if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
                 player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
             }
         } else {
-            if (player == null) {
-                return;
-            }
             if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
                 player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
             }
@@ -237,10 +235,10 @@ public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
             if (player.isInsideClosingRadius(event)) {
                 player.closePopup();
             } else {
-                animateView(player.getClosingOverlayView(), false, 0);
+                animate(player.getClosingOverlayView(), false, 0);
 
                 if (!player.isPopupClosing()) {
-                    animateView(player.getCloseOverlayButton(), false, 200);
+                    animate(player.getCloseOverlayButton(), false, 200);
                 }
             }
         }
@@ -255,8 +253,8 @@ public void onPopupResizingStart() {
         player.getLoadingPanel().setVisibility(View.GONE);
 
         player.hideControls(0, 0);
-        animateView(player.getCurrentDisplaySeek(), false, 0, 0);
-        animateView(player.getResizingIndicator(), true, 200, 0);
+        animate(player.getCurrentDisplaySeek(), false, 0, ALPHA, 0);
+        animate(player.getResizingIndicator(), true, 200, ALPHA, 0);
     }
 
     @Override
@@ -264,7 +262,7 @@ public void onPopupResizingEnd() {
         if (DEBUG) {
             Log.d(TAG, "onPopupResizingEnd called");
         }
-        animateView(player.getResizingIndicator(), false, 100, 0);
+        animate(player.getResizingIndicator(), false, 100, ALPHA, 0);
     }
 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java b/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java
deleted file mode 100644
index 2675c2240e8..00000000000
--- a/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * Copyright 2018 Mauricio Colli <mauriciocolli@outlook.com>
- * AnimationUtils.java is part of NewPipe
- *
- * License: GPL-3.0+
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.schabi.newpipe.util;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ArgbEvaluator;
-import android.animation.ValueAnimator;
-import android.content.res.ColorStateList;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.FloatRange;
-import androidx.core.view.ViewCompat;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
-
-import org.schabi.newpipe.MainActivity;
-
-public final class AnimationUtils {
-    private static final String TAG = "AnimationUtils";
-    private static final boolean DEBUG = MainActivity.DEBUG;
-
-    private AnimationUtils() { }
-
-    public static void animateView(final View view, final boolean enterOrExit,
-                                   final long duration) {
-        animateView(view, Type.ALPHA, enterOrExit, duration, 0, null);
-    }
-
-    public static void animateView(final View view, final boolean enterOrExit,
-                                   final long duration, final long delay) {
-        animateView(view, Type.ALPHA, enterOrExit, duration, delay, null);
-    }
-
-    public static void animateView(final View view, final boolean enterOrExit, final long duration,
-                                   final long delay, final Runnable execOnEnd) {
-        animateView(view, Type.ALPHA, enterOrExit, duration, delay, execOnEnd);
-    }
-
-    public static void animateView(final View view, final Type animationType,
-                                   final boolean enterOrExit, final long duration) {
-        animateView(view, animationType, enterOrExit, duration, 0, null);
-    }
-
-    public static void animateView(final View view, final Type animationType,
-                                   final boolean enterOrExit, final long duration,
-                                   final long delay) {
-        animateView(view, animationType, enterOrExit, duration, delay, null);
-    }
-
-    /**
-     * Animate the view.
-     *
-     * @param view          view that will be animated
-     * @param animationType {@link Type} of the animation
-     * @param enterOrExit   true to enter, false to exit
-     * @param duration      how long the animation will take, in milliseconds
-     * @param delay         how long the animation will wait to start, in milliseconds
-     * @param execOnEnd     runnable that will be executed when the animation ends
-     */
-    public static void animateView(final View view, final Type animationType,
-                                   final boolean enterOrExit, final long duration,
-                                   final long delay, final Runnable execOnEnd) {
-        if (DEBUG) {
-            String id;
-            try {
-                id = view.getResources().getResourceEntryName(view.getId());
-            } catch (final Exception e) {
-                id = view.getId() + "";
-            }
-
-            final String msg = String.format("%8s →  [%s:%s] [%s %s:%s] execOnEnd=%s", enterOrExit,
-                    view.getClass().getSimpleName(), id, animationType, duration, delay, execOnEnd);
-            Log.d(TAG, "animateView()" + msg);
-        }
-
-        if (view.getVisibility() == View.VISIBLE && enterOrExit) {
-            if (DEBUG) {
-                Log.d(TAG, "animateView() view was already visible > view = [" + view + "]");
-            }
-            view.animate().setListener(null).cancel();
-            view.setVisibility(View.VISIBLE);
-            view.setAlpha(1f);
-            if (execOnEnd != null) {
-                execOnEnd.run();
-            }
-            return;
-        } else if ((view.getVisibility() == View.GONE || view.getVisibility() == View.INVISIBLE)
-                && !enterOrExit) {
-            if (DEBUG) {
-                Log.d(TAG, "animateView() view was already gone > view = [" + view + "]");
-            }
-            view.animate().setListener(null).cancel();
-            view.setVisibility(View.GONE);
-            view.setAlpha(0f);
-            if (execOnEnd != null) {
-                execOnEnd.run();
-            }
-            return;
-        }
-
-        view.animate().setListener(null).cancel();
-        view.setVisibility(View.VISIBLE);
-
-        switch (animationType) {
-            case ALPHA:
-                animateAlpha(view, enterOrExit, duration, delay, execOnEnd);
-                break;
-            case SCALE_AND_ALPHA:
-                animateScaleAndAlpha(view, enterOrExit, duration, delay, execOnEnd);
-                break;
-            case LIGHT_SCALE_AND_ALPHA:
-                animateLightScaleAndAlpha(view, enterOrExit, duration, delay, execOnEnd);
-                break;
-            case SLIDE_AND_ALPHA:
-                animateSlideAndAlpha(view, enterOrExit, duration, delay, execOnEnd);
-                break;
-            case LIGHT_SLIDE_AND_ALPHA:
-                animateLightSlideAndAlpha(view, enterOrExit, duration, delay, execOnEnd);
-                break;
-        }
-    }
-
-    /**
-     * Animate the background color of a view.
-     *
-     * @param view       the view to animate
-     * @param duration   the duration of the animation
-     * @param colorStart the background color to start with
-     * @param colorEnd   the background color to end with
-     */
-    public static void animateBackgroundColor(final View view, final long duration,
-                                              @ColorInt final int colorStart,
-                                              @ColorInt final int colorEnd) {
-        if (DEBUG) {
-            Log.d(TAG, "animateBackgroundColor() called with: "
-                    + "view = [" + view + "], duration = [" + duration + "], "
-                    + "colorStart = [" + colorStart + "], colorEnd = [" + colorEnd + "]");
-        }
-
-        final int[][] empty = {new int[0]};
-        final ValueAnimator viewPropertyAnimator = ValueAnimator
-                .ofObject(new ArgbEvaluator(), colorStart, colorEnd);
-        viewPropertyAnimator.setInterpolator(new FastOutSlowInInterpolator());
-        viewPropertyAnimator.setDuration(duration);
-        viewPropertyAnimator.addUpdateListener(animation ->
-                ViewCompat.setBackgroundTintList(view,
-                        new ColorStateList(empty, new int[]{(int) animation.getAnimatedValue()})));
-        viewPropertyAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                ViewCompat.setBackgroundTintList(view,
-                        new ColorStateList(empty, new int[]{colorEnd}));
-            }
-
-            @Override
-            public void onAnimationCancel(final Animator animation) {
-                onAnimationEnd(animation);
-            }
-        });
-        viewPropertyAnimator.start();
-    }
-
-    /**
-     * Animate the text color of any view that extends {@link TextView} (Buttons, EditText...).
-     *
-     * @param view       the text view to animate
-     * @param duration   the duration of the animation
-     * @param colorStart the text color to start with
-     * @param colorEnd   the text color to end with
-     */
-    public static void animateTextColor(final TextView view, final long duration,
-                                        @ColorInt final int colorStart,
-                                        @ColorInt final int colorEnd) {
-        if (DEBUG) {
-            Log.d(TAG, "animateTextColor() called with: "
-                    + "view = [" + view + "], duration = [" + duration + "], "
-                    + "colorStart = [" + colorStart + "], colorEnd = [" + colorEnd + "]");
-        }
-
-        final ValueAnimator viewPropertyAnimator = ValueAnimator
-                .ofObject(new ArgbEvaluator(), colorStart, colorEnd);
-        viewPropertyAnimator.setInterpolator(new FastOutSlowInInterpolator());
-        viewPropertyAnimator.setDuration(duration);
-        viewPropertyAnimator.addUpdateListener(animation ->
-                view.setTextColor((int) animation.getAnimatedValue()));
-        viewPropertyAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                view.setTextColor(colorEnd);
-            }
-
-            @Override
-            public void onAnimationCancel(final Animator animation) {
-                view.setTextColor(colorEnd);
-            }
-        });
-        viewPropertyAnimator.start();
-    }
-
-    public static ValueAnimator animateHeight(final View view, final long duration,
-                                              final int targetHeight) {
-        final int height = view.getHeight();
-        if (DEBUG) {
-            Log.d(TAG, "animateHeight: duration = [" + duration + "], "
-                    + "from " + height + " to → " + targetHeight + " in: " + view);
-        }
-
-        final ValueAnimator animator = ValueAnimator.ofFloat(height, targetHeight);
-        animator.setInterpolator(new FastOutSlowInInterpolator());
-        animator.setDuration(duration);
-        animator.addUpdateListener(animation -> {
-            final float value = (float) animation.getAnimatedValue();
-            view.getLayoutParams().height = (int) value;
-            view.requestLayout();
-        });
-        animator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                view.getLayoutParams().height = targetHeight;
-                view.requestLayout();
-            }
-
-            @Override
-            public void onAnimationCancel(final Animator animation) {
-                view.getLayoutParams().height = targetHeight;
-                view.requestLayout();
-            }
-        });
-        animator.start();
-
-        return animator;
-    }
-
-    public static void animateRotation(final View view, final long duration,
-                                       final int targetRotation) {
-        if (DEBUG) {
-            Log.d(TAG, "animateRotation: duration = [" + duration + "], "
-                    + "from " + view.getRotation() + " to → " + targetRotation + " in: " + view);
-        }
-        view.animate().setListener(null).cancel();
-
-        view.animate()
-                .rotation(targetRotation).setDuration(duration)
-                .setInterpolator(new FastOutSlowInInterpolator())
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationCancel(final Animator animation) {
-                        view.setRotation(targetRotation);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(final Animator animation) {
-                        view.setRotation(targetRotation);
-                    }
-                }).start();
-    }
-
-    private static void animateAlpha(final View view, final boolean enterOrExit,
-                                     final long duration, final long delay,
-                                     final Runnable execOnEnd) {
-        if (enterOrExit) {
-            view.animate().setInterpolator(new FastOutSlowInInterpolator()).alpha(1f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        } else {
-            view.animate().setInterpolator(new FastOutSlowInInterpolator()).alpha(0f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    view.setVisibility(View.GONE);
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Internals
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private static void animateScaleAndAlpha(final View view, final boolean enterOrExit,
-                                             final long duration, final long delay,
-                                             final Runnable execOnEnd) {
-        if (enterOrExit) {
-            view.setScaleX(.8f);
-            view.setScaleY(.8f);
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator())
-                    .alpha(1f).scaleX(1f).scaleY(1f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        } else {
-            view.setScaleX(1f);
-            view.setScaleY(1f);
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator())
-                    .alpha(0f).scaleX(.8f).scaleY(.8f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    view.setVisibility(View.GONE);
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        }
-    }
-
-    private static void animateLightScaleAndAlpha(final View view, final boolean enterOrExit,
-                                                  final long duration, final long delay,
-                                                  final Runnable execOnEnd) {
-        if (enterOrExit) {
-            view.setAlpha(.5f);
-            view.setScaleX(.95f);
-            view.setScaleY(.95f);
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator())
-                    .alpha(1f).scaleX(1f).scaleY(1f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        } else {
-            view.setAlpha(1f);
-            view.setScaleX(1f);
-            view.setScaleY(1f);
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator())
-                    .alpha(0f).scaleX(.95f).scaleY(.95f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    view.setVisibility(View.GONE);
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        }
-    }
-
-    private static void animateSlideAndAlpha(final View view, final boolean enterOrExit,
-                                             final long duration, final long delay,
-                                             final Runnable execOnEnd) {
-        if (enterOrExit) {
-            view.setTranslationY(-view.getHeight());
-            view.setAlpha(0f);
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator()).alpha(1f).translationY(0)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        } else {
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator())
-                    .alpha(0f).translationY(-view.getHeight())
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    view.setVisibility(View.GONE);
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        }
-    }
-
-    private static void animateLightSlideAndAlpha(final View view, final boolean enterOrExit,
-                                                  final long duration, final long delay,
-                                                  final Runnable execOnEnd) {
-        if (enterOrExit) {
-            view.setTranslationY(-view.getHeight() / 2.0f);
-            view.setAlpha(0f);
-            view.animate()
-                    .setInterpolator(new FastOutSlowInInterpolator()).alpha(1f).translationY(0)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        } else {
-            view.animate().setInterpolator(new FastOutSlowInInterpolator())
-                    .alpha(0f).translationY(-view.getHeight() / 2.0f)
-                    .setDuration(duration).setStartDelay(delay)
-                    .setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    view.setVisibility(View.GONE);
-                    if (execOnEnd != null) {
-                        execOnEnd.run();
-                    }
-                }
-            }).start();
-        }
-    }
-
-    public static void slideUp(final View view, final long duration, final long delay,
-                               @FloatRange(from = 0.0f, to = 1.0f)
-                               final float translationPercent) {
-        final int translationY = (int) (view.getResources().getDisplayMetrics().heightPixels
-                * (translationPercent));
-
-        view.animate().setListener(null).cancel();
-        view.setAlpha(0f);
-        view.setTranslationY(translationY);
-        view.setVisibility(View.VISIBLE);
-        view.animate()
-                .alpha(1f)
-                .translationY(0)
-                .setStartDelay(delay)
-                .setDuration(duration)
-                .setInterpolator(new FastOutSlowInInterpolator())
-                .start();
-    }
-
-    public enum Type {
-        ALPHA,
-        SCALE_AND_ALPHA, LIGHT_SCALE_AND_ALPHA,
-        SLIDE_AND_ALPHA, LIGHT_SLIDE_AND_ALPHA
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
index b34a6be637c..e1ada4f9bdb 100644
--- a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
@@ -31,7 +31,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.ktx.ViewUtils;
 
 import java.lang.annotation.Retention;
 import java.util.ArrayList;
@@ -128,7 +128,7 @@ public void collapse() {
         if (currentAnimator != null && currentAnimator.isRunning()) {
             currentAnimator.cancel();
         }
-        currentAnimator = AnimationUtils.animateHeight(this, ANIMATION_DURATION, 0);
+        currentAnimator = ViewUtils.animateHeight(this, ANIMATION_DURATION, 0);
 
         setCurrentState(COLLAPSED);
     }
@@ -151,7 +151,7 @@ public void expand() {
         if (currentAnimator != null && currentAnimator.isRunning()) {
             currentAnimator.cancel();
         }
-        currentAnimator = AnimationUtils.animateHeight(this, ANIMATION_DURATION, this.targetHeight);
+        currentAnimator = ViewUtils.animateHeight(this, ANIMATION_DURATION, this.targetHeight);
         setCurrentState(EXPANDED);
     }
 

From a57fd69fb4787d08982c6cfb0d867f365588d6dc Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Tue, 15 Dec 2020 20:11:55 +0100
Subject: [PATCH 070/131] External sharing improvements

Improve NewPipe's share on some devices + fix crash when no browser is set on some devices

Catching ActivityNotFoundException when trying to open the default browser
Use an ACTION_CHOOSER intent and put as an extra intent the intent to
open an URI / share an URI when no default app is set.

Add a LinkHelper class which set a custom action when clicking web links
in the description of a content. This class also helps to implement a confirmation dialog when trying to open web links in an external app.
---
 .../schabi/newpipe/about/AboutActivity.java   |  12 +-
 .../fragments/detail/VideoDetailFragment.java |  28 ++--
 .../list/channel/ChannelFragment.java         |   5 +-
 .../schabi/newpipe/report/ErrorActivity.java  |  14 +-
 .../util/CommentTextOnTouchListener.java      |   3 +-
 .../schabi/newpipe/util/ExtractorHelper.java  |   4 +-
 .../org/schabi/newpipe/util/LinkHelper.java   | 116 +++++++++++++++
 .../schabi/newpipe/util/NavigationHelper.java |  27 +---
 .../org/schabi/newpipe/util/ShareUtils.java   | 136 ++++++++++++++----
 .../giga/ui/adapter/MissionAdapter.java       |  30 ++--
 app/src/main/res/values-fr/strings.xml        |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 checkstyle-suppressions.xml                   |  17 ++-
 13 files changed, 284 insertions(+), 110 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/util/LinkHelper.java

diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 2569f4a9404..d11978c6b74 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -146,16 +146,20 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
             aboutBinding.appVersion.setText(BuildConfig.VERSION_NAME);
 
             aboutBinding.githubLink.setOnClickListener(nv ->
-                    openUrlInBrowser(context, context.getString(R.string.github_url)));
+                    openUrlInBrowser(context, context.getString(R.string.github_url),
+                            false));
 
             aboutBinding.donationLink.setOnClickListener(v ->
-                    openUrlInBrowser(context, context.getString(R.string.donation_url)));
+                    openUrlInBrowser(context, context.getString(R.string.donation_url),
+                            false));
 
             aboutBinding.websiteLink.setOnClickListener(nv ->
-                    openUrlInBrowser(context, context.getString(R.string.website_url)));
+                    openUrlInBrowser(context, context.getString(R.string.website_url),
+                            false));
 
             aboutBinding.privacyPolicyLink.setOnClickListener(v ->
-                    openUrlInBrowser(context, context.getString(R.string.privacy_policy_url)));
+                    openUrlInBrowser(context, context.getString(R.string.privacy_policy_url),
+                            false));
 
             return aboutBinding.getRoot();
         }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 8c9ed2bef5c..c9913a80853 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -16,7 +16,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.text.util.Linkify;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -96,6 +95,7 @@
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.LinkHelper;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -112,10 +112,7 @@
 import java.util.concurrent.TimeUnit;
 
 import icepick.State;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.linkify.LinkifyPlugin;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -1233,26 +1230,17 @@ private void prepareDescription(final Description description) {
         }
 
         if (description.getType() == Description.HTML) {
-            disposables.add(Single.just(description.getContent())
-                    .map(descriptionText ->
-                            HtmlCompat.fromHtml(descriptionText,
-                                    HtmlCompat.FROM_HTML_MODE_LEGACY))
-                    .subscribeOn(Schedulers.computation())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(spanned -> {
-                        videoDescriptionView.setText(spanned);
-                        videoDescriptionView.setVisibility(View.VISIBLE);
-                    }));
+            LinkHelper.createLinksFromHtmlBlock(requireContext(), description.getContent(),
+                    videoDescriptionView, HtmlCompat.FROM_HTML_MODE_LEGACY);
+            videoDescriptionView.setVisibility(View.VISIBLE);
         } else if (description.getType() == Description.MARKDOWN) {
-            final Markwon markwon = Markwon.builder(requireContext())
-                    .usePlugin(LinkifyPlugin.create())
-                    .build();
-            markwon.setMarkdown(videoDescriptionView, description.getContent());
+            LinkHelper.createLinksFromMarkdownText(requireContext(), description.getContent(),
+                    videoDescriptionView);
             videoDescriptionView.setVisibility(View.VISIBLE);
         } else {
             //== Description.PLAIN_TEXT
-            videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
-            videoDescriptionView.setText(description.getContent(), TextView.BufferType.SPANNABLE);
+            LinkHelper.createLinksFromPlainText(requireContext(), description.getContent(),
+                    videoDescriptionView);
             videoDescriptionView.setVisibility(View.VISIBLE);
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 834d8052fd6..6bcaac63036 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -1,8 +1,6 @@
 package org.schabi.newpipe.fragments.list.channel;
 
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -188,8 +186,7 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
     private void openRssFeed() {
         final ChannelInfo info = currentInfo;
         if (info != null) {
-            final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(info.getFeedUrl()));
-            startActivity(intent);
+            ShareUtils.openUrlInBrowser(requireContext(), info.getFeedUrl(), false);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index a4b6af2ab01..0321d197a72 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -14,7 +14,6 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -207,8 +206,7 @@ protected void onCreate(final Bundle savedInstanceState) {
                 openPrivacyPolicyDialog(this, "EMAIL"));
 
         activityErrorBinding.errorReportCopyButton.setOnClickListener(v -> {
-            ShareUtils.copyToClipboard(this, buildMarkdown());
-            Toast.makeText(this, R.string.msg_copied, Toast.LENGTH_SHORT).show();
+                ShareUtils.copyToClipboard(this, buildMarkdown());
         });
 
         activityErrorBinding.errorReportGitHubButton.setOnClickListener(v ->
@@ -246,11 +244,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 goToReturnActivity();
                 break;
             case R.id.menu_item_share_error:
-                final Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_SEND);
-                intent.putExtra(Intent.EXTRA_TEXT, buildJson());
-                intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+                ShareUtils.shareUrl(this, getString(R.string.error_report_title), buildJson());
                 break;
         }
         return false;
@@ -273,10 +267,10 @@ private void openPrivacyPolicyDialog(final Context context, final String action)
                                 .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT)
                                 .putExtra(Intent.EXTRA_TEXT, buildJson());
                         if (i.resolveActivity(getPackageManager()) != null) {
-                            startActivity(i);
+                            ShareUtils.openContentInApp(context, i);
                         }
                     } else if (action.equals("GITHUB")) { // open the NewPipe issue page on GitHub
-                        ShareUtils.openUrlInBrowser(this, ERROR_GITHUB_ISSUE_URL);
+                        ShareUtils.openUrlInBrowser(this, ERROR_GITHUB_ISSUE_URL, false);
                     }
 
                 })
diff --git a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
index 36f39a6e554..5c7eb4c3f92 100644
--- a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
+++ b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
@@ -69,7 +69,8 @@ public boolean onTouch(final View v, final MotionEvent event) {
                             handled = handleUrl(v.getContext(), (URLSpan) link[0]);
                         }
                         if (!handled) {
-                            link[0].onClick(widget);
+                            ShareUtils.openUrlInBrowser(v.getContext(),
+                                    ((URLSpan) link[0]).getURL(), false);
                         }
                     } else if (action == MotionEvent.ACTION_DOWN) {
                         Selection.setSelection(buffer,
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index 103d9a72b95..7046b8e49a9 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -365,8 +365,8 @@ public static void showMetaInfoInTextView(@Nullable final List<MetaInfo> metaInf
                 }
             }
 
-            metaInfoTextView.setText(HtmlCompat.fromHtml(stringBuilder.toString(),
-                    HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING));
+            LinkHelper.createLinksFromHtmlBlock(context, stringBuilder.toString(),
+                    metaInfoTextView, HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING);
             metaInfoTextView.setMovementMethod(LinkMovementMethod.getInstance());
             metaInfoTextView.setVisibility(View.VISIBLE);
             metaInfoSeparator.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/schabi/newpipe/util/LinkHelper.java b/app/src/main/java/org/schabi/newpipe/util/LinkHelper.java
new file mode 100644
index 00000000000..fba30758fc7
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/LinkHelper.java
@@ -0,0 +1,116 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.URLSpan;
+import android.text.util.Linkify;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.core.text.HtmlCompat;
+
+import io.noties.markwon.Markwon;
+import io.noties.markwon.linkify.LinkifyPlugin;
+
+public final class LinkHelper {
+    private LinkHelper() {
+    }
+
+    /**
+     * Create web links for contents with an HTML description.
+     * <p>
+     * This will call
+     * {@link LinkHelper#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
+     * after linked the URLs with {@link HtmlCompat#fromHtml(String, int)}.
+     *
+     * @param context        the context to use
+     * @param htmlBlock      the htmlBlock to be linked
+     * @param textView       the TextView to set the htmlBlock linked
+     * @param htmlCompatFlag the int flag to be set when {@link HtmlCompat#fromHtml(String, int)}
+     *                       will be called
+     */
+    public static void createLinksFromHtmlBlock(final Context context,
+                                                final String htmlBlock,
+                                                final TextView textView,
+                                                final int htmlCompatFlag) {
+        changeIntentsOfDescriptionLinks(context, HtmlCompat.fromHtml(htmlBlock, htmlCompatFlag),
+                textView);
+    }
+
+    /**
+     * Create web links for contents with a plain text description.
+     * <p>
+     * This will call
+     * {@link LinkHelper#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
+     * after linked the URLs with {@link TextView#setAutoLinkMask(int)} and
+     * {@link TextView#setText(CharSequence, TextView.BufferType)}.
+     *
+     * @param context        the context to use
+     * @param plainTextBlock the block of plain text to be linked
+     * @param textView       the TextView to set the plain text block linked
+     */
+    public static void createLinksFromPlainText(final Context context,
+                                                final String plainTextBlock,
+                                                final TextView textView) {
+        textView.setAutoLinkMask(Linkify.WEB_URLS);
+        textView.setText(plainTextBlock, TextView.BufferType.SPANNABLE);
+        changeIntentsOfDescriptionLinks(context, textView.getText(), textView);
+    }
+
+    /**
+     * Create web links for contents with a markdown description.
+     * <p>
+     * This will call
+     * {@link LinkHelper#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
+     * after creating an {@link Markwon} object and using
+     * {@link Markwon#setMarkdown(TextView, String)}.
+     *
+     * @param context       the context to use
+     * @param markdownBlock the block of markdown text to be linked
+     * @param textView      the TextView to set the plain text block linked
+     */
+    public static void createLinksFromMarkdownText(final Context context,
+                                                   final String markdownBlock,
+                                                   final TextView textView) {
+        final Markwon markwon = Markwon.builder(context).usePlugin(LinkifyPlugin.create()).build();
+        markwon.setMarkdown(textView, markdownBlock);
+        changeIntentsOfDescriptionLinks(context, textView.getText(), textView);
+    }
+
+    /**
+     * Change links generated by libraries in the description of a content to a custom link action.
+     * <p>
+     * Instead of using an ACTION_VIEW intent in the description of a content, this method will
+     * parse the CharSequence and replace all current web links with
+     * {@link ShareUtils#openUrlInBrowser(Context, String, Boolean)}.
+     * <p>
+     * This method is required in order to intercept links and maybe, show a confirmation dialog
+     * before opening a web link.
+     *
+     * @param context  the context to use
+     * @param chars    the CharSequence to be parsed
+     * @param textView the TextView in which the converted CharSequence will be applied
+     */
+    private static void changeIntentsOfDescriptionLinks(final Context context,
+                                                        final CharSequence chars,
+                                                        final TextView textView) {
+        final SpannableStringBuilder textBlockLinked = new SpannableStringBuilder(chars);
+        final URLSpan[] urls = textBlockLinked.getSpans(0, chars.length(), URLSpan.class);
+
+        for (final URLSpan span : urls) {
+            final ClickableSpan clickableSpan = new ClickableSpan() {
+                public void onClick(final View view) {
+                    ShareUtils.openUrlInBrowser(context, span.getURL(), false);
+                }
+            };
+            textBlockLinked.setSpan(clickableSpan, textBlockLinked.getSpanStart(span),
+                    textBlockLinked.getSpanEnd(span), textBlockLinked.getSpanFlags(span));
+            textBlockLinked.removeSpan(span);
+        }
+
+        textView.setText(textBlockLinked);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index c90bb302577..936b4595cb4 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -246,16 +246,14 @@ public static void playOnExternalPlayer(final Context context, final String name
 
     public static void resolveActivityOrAskToInstall(final Context context, final Intent intent) {
         if (intent.resolveActivity(context.getPackageManager()) != null) {
-            context.startActivity(intent);
+            ShareUtils.openContentInApp(context, intent);
         } else {
             if (context instanceof Activity) {
                 new AlertDialog.Builder(context)
                         .setMessage(R.string.no_player_found)
                         .setPositiveButton(R.string.install, (dialog, which) -> {
-                            final Intent i = new Intent();
-                            i.setAction(Intent.ACTION_VIEW);
-                            i.setData(Uri.parse(context.getString(R.string.fdroid_vlc_url)));
-                            context.startActivity(i);
+                            ShareUtils.openUrlInBrowser(context,
+                                    context.getString(R.string.fdroid_vlc_url), false);
                         })
                         .setNegativeButton(R.string.cancel, (dialog, which)
                                 -> Log.i("NavigationHelper", "You unlocked a secret unicorn."))
@@ -568,27 +566,14 @@ public static Intent getIntentByLink(final Context context,
         return getOpenIntent(context, url, service.getServiceId(), linkType);
     }
 
-    private static Uri openMarketUrl(final String packageName) {
-        return Uri.parse("market://details")
-                .buildUpon()
-                .appendQueryParameter("id", packageName)
-                .build();
-    }
-
-    private static Uri getGooglePlayUrl(final String packageName) {
-        return Uri.parse("https://play.google.com/store/apps/details")
-                .buildUpon()
-                .appendQueryParameter("id", packageName)
-                .build();
-    }
-
     private static void installApp(final Context context, final String packageName) {
         try {
             // Try market:// scheme
-            context.startActivity(new Intent(Intent.ACTION_VIEW, openMarketUrl(packageName)));
+            ShareUtils.openUrlInBrowser(context, "market://details?id=" + packageName, false);
         } catch (final ActivityNotFoundException e) {
             // Fall back to google play URL (don't worry F-Droid can handle it :)
-            context.startActivity(new Intent(Intent.ACTION_VIEW, getGooglePlayUrl(packageName)));
+            ShareUtils.openUrlInBrowser(context,
+                    "https://play.google.com/store/apps/details?id=" + packageName, false);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
index b631f19da53..142b2b20cc5 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.util;
 
+import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -21,22 +22,80 @@ private ShareUtils() {
      * Open the url with the system default browser.
      * <p>
      * If no browser is set as default, fallbacks to
-     * {@link ShareUtils#openInDefaultApp(Context, String)}
+     * {@link ShareUtils#openInDefaultApp(Context, Intent)}
+     *
+     * @param context                the context to use
+     * @param url                    the url to browse
+     * @param httpDefaultBrowserTest the boolean to set if the
+     *                               test for the default browser will be for HTTP protocol
+     *                               or for the created intent
+     */
+    public static void openUrlInBrowser(final Context context, final String url,
+                                        final Boolean httpDefaultBrowserTest) {
+        final String defaultPackageName;
+        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (httpDefaultBrowserTest) {
+            defaultPackageName = getDefaultBrowserPackageName(context);
+        } else {
+            defaultPackageName = getDefaultAppPackageName(context, intent);
+        }
+
+        if (defaultPackageName.equals("android")) {
+            // no browser set as default (doesn't work on some devices)
+            openInDefaultApp(context, intent);
+        } else {
+            try {
+                intent.setPackage(defaultPackageName);
+                context.startActivity(intent);
+            } catch (final ActivityNotFoundException e) {
+                // not a browser but an app chooser because of OEMs changes
+                intent.setPackage(null);
+                openInDefaultApp(context, intent);
+            }
+        }
+    }
+
+    /**
+     * Open the url with the system default browser.
+     * <p>
+     * If no browser is set as default, fallbacks to
+     * {@link ShareUtils#openInDefaultApp(Context, Intent)}
+     * <p>
+     * This call {@link ShareUtils#openUrlInBrowser(Context, String, Boolean)} with true
+     * for the boolean parameter
      *
      * @param context the context to use
      * @param url     the url to browse
-     */
+     **/
     public static void openUrlInBrowser(final Context context, final String url) {
-        final String defaultBrowserPackageName = getDefaultBrowserPackageName(context);
+        openUrlInBrowser(context, url, true);
+    }
+
+    /**
+     * Open a content with the system default browser.
+     * <p>
+     * If no app is set as default, fallbacks to
+     * {@link ShareUtils#openInDefaultApp(Context, Intent)}
+     *
+     * @param context the context to use
+     * @param intent  the intent of the file to open
+     */
+    public static void openContentInApp(final Context context, final Intent intent) {
+        final String defaultAppPackageName = getDefaultAppPackageName(context, intent);
 
-        if (defaultBrowserPackageName.equals("android")) {
-            // no browser set as default
-            openInDefaultApp(context, url);
+        if (defaultAppPackageName.equals("android")) {
+            // no app set as default (doesn't work on some devices)
+            openInDefaultApp(context, intent);
         } else {
-            final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                    .setPackage(defaultBrowserPackageName)
-                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(intent);
+            try {
+                intent.setPackage(defaultAppPackageName);
+                context.startActivity(intent);
+            } catch (final ActivityNotFoundException e) {
+                // not an app to open a file but an app chooser because of OEMs changes
+                intent.setPackage(null);
+                openInDefaultApp(context, intent);
+            }
         }
     }
 
@@ -45,20 +104,38 @@ public static void openUrlInBrowser(final Context context, final String url) {
      * <p>
      * If no app is set as default, it will open a chooser
      *
+     * @param context    the context to use
+     * @param viewIntent the intent to open
+     */
+    private static void openInDefaultApp(final Context context, final Intent viewIntent) {
+        final Intent intent = new Intent(Intent.ACTION_CHOOSER);
+        intent.putExtra(Intent.EXTRA_INTENT, viewIntent);
+        intent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.open_with));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    /**
+     * Get the default app package name.
+     * <p>
+     * If no app is set as default, it will return "android".
+     * <p>
+     * Note: it doesn't return "android" on some devices because some OEMs changed the app chooser.
+     *
      * @param context the context to use
-     * @param url     the url to browse
+     * @param intent  the intent to get default app
+     * @return the package name of the default app, or the app chooser if there's no default
      */
-    private static void openInDefaultApp(final Context context, final String url) {
-        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-        context.startActivity(Intent.createChooser(
-                intent, context.getString(R.string.share_dialog_title))
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+    private static String getDefaultAppPackageName(final Context context, final Intent intent) {
+        return context.getPackageManager().resolveActivity(intent,
+                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
     }
 
     /**
      * Get the default browser package name.
      * <p>
      * If no browser is set as default, it will return "android"
+     * Note: it doesn't return "android" on some devices because some OEMs changed the app chooser.
      *
      * @param context the context to use
      * @return the package name of the default browser, or "android" if there's no default
@@ -66,8 +143,8 @@ private static void openInDefaultApp(final Context context, final String url) {
     private static String getDefaultBrowserPackageName(final Context context) {
         final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(
-                intent, PackageManager.MATCH_DEFAULT_ONLY);
+        final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
         return resolveInfo.activityInfo.packageName;
     }
 
@@ -79,13 +156,15 @@ private static String getDefaultBrowserPackageName(final Context context) {
      * @param url     the url to share
      */
     public static void shareUrl(final Context context, final String subject, final String url) {
-        final Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType("text/plain");
-        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        intent.putExtra(Intent.EXTRA_TEXT, url);
-        context.startActivity(Intent.createChooser(
-                intent, context.getString(R.string.share_dialog_title))
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        final Intent shareIntent = new Intent(Intent.ACTION_SEND);
+        shareIntent.setType("text/plain");
+        shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        shareIntent.putExtra(Intent.EXTRA_TEXT, url);
+        final Intent intent = new Intent(Intent.ACTION_CHOOSER);
+        intent.putExtra(Intent.EXTRA_INTENT, shareIntent);
+        intent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.share_dialog_title));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
     }
 
     /**
@@ -100,14 +179,11 @@ public static void copyToClipboard(final Context context, final String text) {
                 ContextCompat.getSystemService(context, ClipboardManager.class);
 
         if (clipboardManager == null) {
-            Toast.makeText(context,
-                    R.string.permission_denied,
-                    Toast.LENGTH_LONG).show();
+            Toast.makeText(context, R.string.permission_denied, Toast.LENGTH_LONG).show();
             return;
         }
 
         clipboardManager.setPrimaryClip(ClipData.newPlainText(null, text));
-        Toast.makeText(context, R.string.msg_copied, Toast.LENGTH_SHORT)
-                .show();
+        Toast.makeText(context, R.string.msg_copied, Toast.LENGTH_SHORT).show();
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index f102206c132..79b91cb5782 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.NotificationManager;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -44,6 +45,7 @@
 import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ShareUtils;
 
 import java.io.File;
 import java.net.URI;
@@ -346,10 +348,9 @@ private void viewWithFileProvider(Mission mission) {
         if (BuildConfig.DEBUG)
             Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider");
 
-        Uri uri = resolveShareableUri(mission);
+        final Uri uri = resolveShareableUri(mission);
 
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_VIEW);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setDataAndType(uri, mimeType);
         intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
 
@@ -363,7 +364,7 @@ private void viewWithFileProvider(Mission mission) {
         //mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
         if (intent.resolveActivity(mContext.getPackageManager()) != null) {
-            mContext.startActivity(intent);
+            ShareUtils.openContentInApp(mContext, intent);
         } else {
             Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG).show();
         }
@@ -372,12 +373,23 @@ private void viewWithFileProvider(Mission mission) {
     private void shareFile(Mission mission) {
         if (checkInvalidFile(mission)) return;
 
-        Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType(resolveMimeType(mission));
-        intent.putExtra(Intent.EXTRA_STREAM, resolveShareableUri(mission));
-        intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+        final Intent shareIntent = new Intent(Intent.ACTION_SEND);
+        shareIntent.setType(resolveMimeType(mission));
+        shareIntent.putExtra(Intent.EXTRA_STREAM, resolveShareableUri(mission));
+        shareIntent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+        final Intent intent = new Intent(Intent.ACTION_CHOOSER);
+        intent.putExtra(Intent.EXTRA_INTENT, shareIntent);
+        intent.putExtra(Intent.EXTRA_TITLE, mContext.getString(R.string.share_dialog_title));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-        mContext.startActivity(Intent.createChooser(intent, null));
+        try {
+            intent.setPackage("android");
+            mContext.startActivity(intent);
+        } catch (final ActivityNotFoundException e) {
+            // falling back to OEM chooser if Android's system chooser was removed by the OEM
+            intent.setPackage(null);
+            mContext.startActivity(intent);
+        }
     }
 
     /**
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c128c42149e..a6b64da7120 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -651,4 +651,5 @@
     <string name="notification_colorize_summary">Demander à Android de personnaliser la couleur de la notification en fonction de la couleur principale de la miniature (noter que cela n’est pas disponible sur tous les appareils)</string>
     <string name="show_thumbnail_title">Afficher la miniature</string>
     <string name="show_thumbnail_summary">Utiliser la miniature pour l\'arrière-plan de l’écran de verrouillage et les notifications</string>
+    <string name="open_with">Ouvrir avec</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ac951b695e..82a5bda6c62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="fdroid_vlc_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Open in browser</string>
     <string name="open_in_popup_mode">Open in popup mode</string>
+    <string name="open_with">Open with</string>
     <string name="share">Share</string>
     <string name="download">Download</string>
     <string name="controls_download_desc">Download stream file</string>
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 400a91a2918..0aca3c4ab13 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -12,21 +12,20 @@
     lines="253,325"/>
 
   <suppress checks="FinalParameters"
-      files="ListHelper.java"
-      lines="281,313"/>
+    files="ListHelper.java"
+    lines="281,313"/>
 
   <suppress checks="EmptyBlock"
-      files="ContentSettingsFragment.java"
-      lines="227,245"/>
+    files="ContentSettingsFragment.java"
+    lines="227,245"/>
 
-  <!-- org.schabi.newpipe.streams -->
   <suppress checks="LineLength"
-      files="WebMWriter.java"
-      lines="156,158"/>
+    files="WebMWriter.java"
+    lines="156,158"/>
 
   <suppress checks="FileLength"
-            files="Player.java"/>
+    files="Player.java"/>
 
   <suppress checks="FileLength"
-            files="VideoDetailFragment.java"/>
+    files="VideoDetailFragment.java"/>
 </suppressions>

From 79e98db3bd58adfe2bc298ce672e963587facf33 Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Fri, 15 Jan 2021 17:11:04 +0100
Subject: [PATCH 071/131] Apply the requested changes and little improvements
 Apply the requested changes, use ShareUtils.shareText to share an stream in
 the play queue and optimize imports for Java files, using Android Studio
 functionality.

Apply the requested changes and do little improvements
Apply the requested changes, use ShareUtils.shareText to share an stream in the play queue and optimize imports for Java files, using Android Studio functionality.
---
 .../material/appbar/FlingBehavior.java        |  1 +
 app/src/main/java/org/schabi/newpipe/App.java | 31 +++++-----
 .../org/schabi/newpipe/DownloaderImpl.java    |  2 +-
 .../org/schabi/newpipe/ImageDownloader.java   |  1 +
 .../java/org/schabi/newpipe/MainActivity.java | 14 +++--
 .../org/schabi/newpipe/RouterActivity.java    |  2 +-
 .../schabi/newpipe/about/AboutActivity.java   |  9 +--
 .../fragments/detail/VideoDetailFragment.java |  8 +--
 .../list/channel/ChannelFragment.java         |  2 +-
 .../list/playlist/PlaylistFragment.java       |  2 +-
 .../holder/CommentsMiniInfoItemHolder.java    |  3 +-
 .../holder/StreamInfoItemHolder.java          |  3 +-
 .../newpipe/local/BaseLocalListFragment.java  |  5 +-
 .../local/bookmark/BookmarkFragment.java      |  2 +-
 .../subscription/SubscriptionFragment.kt      |  2 +-
 .../org/schabi/newpipe/player/MainPlayer.java |  2 +-
 .../newpipe/player/PlayQueueActivity.java     | 15 +----
 .../org/schabi/newpipe/player/Player.java     |  2 +-
 .../event/CustomBottomSheetBehavior.java      |  3 +
 .../helper/PlaybackParameterDialog.java       |  2 +-
 .../newpipe/player/playqueue/PlayQueue.java   |  2 +-
 .../schabi/newpipe/report/ErrorActivity.java  |  4 +-
 .../settings/BasePreferenceFragment.java      |  2 +-
 .../settings/SelectChannelFragment.java       |  2 +-
 .../custom/NotificationActionsPreference.java |  5 +-
 .../newpipe/settings/tabs/TabsManager.java    |  3 +-
 .../util/CommentTextOnTouchListener.java      |  2 +-
 .../schabi/newpipe/util/ExtractorHelper.java  |  2 +-
 .../schabi/newpipe/util/FilenameUtils.java    |  1 +
 .../org/schabi/newpipe/util/ListHelper.java   |  5 +-
 .../org/schabi/newpipe/util/Localization.java | 15 +++--
 .../schabi/newpipe/util/NavigationHelper.java | 18 ++----
 .../schabi/newpipe/util/PeertubeHelper.java   |  1 +
 .../schabi/newpipe/util/ServiceHelper.java    |  2 +-
 .../org/schabi/newpipe/util/ShareUtils.java   | 56 +++++++++++++------
 .../newpipe/util/StreamDialogEntry.java       |  2 +-
 .../{LinkHelper.java => TextLinkifier.java}   | 13 +++--
 .../org/schabi/newpipe/util/ThemeHelper.java  |  2 +-
 .../views/CustomCollapsingToolbarLayout.java  |  2 +
 .../newpipe/views/ExpandableSurfaceView.java  |  1 +
 .../newpipe/views/FocusAwareCoordinator.java  |  3 +-
 .../giga/service/DownloadManagerService.java  |  7 +--
 .../giga/ui/adapter/MissionAdapter.java       |  2 +-
 .../giga/ui/fragment/MissionsFragment.java    |  2 +-
 checkstyle-suppressions.xml                   |  2 +-
 45 files changed, 145 insertions(+), 122 deletions(-)
 rename app/src/main/java/org/schabi/newpipe/util/{LinkHelper.java => TextLinkifier.java} (92%)

diff --git a/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
index 6106d04370b..743ff1ff20e 100644
--- a/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
+++ b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
@@ -10,6 +10,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import org.schabi.newpipe.R;
 
 import java.lang.reflect.Field;
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 342ce3498a9..cd4a04d9abe 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -6,26 +6,16 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
+
 import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.CompositeException;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
-import io.reactivex.rxjava3.exceptions.UndeliverableException;
-import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.SocketException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+
 import org.acra.ACRA;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.CoreConfiguration;
@@ -41,6 +31,21 @@
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
+import io.reactivex.rxjava3.exceptions.UndeliverableException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
 /*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
  * App.java is part of NewPipe.
diff --git a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
index 431b8034acf..50972fb2f37 100644
--- a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
@@ -2,10 +2,10 @@
 
 import android.content.Context;
 import android.os.Build;
-import androidx.preference.PreferenceManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.downloader.Request;
diff --git a/app/src/main/java/org/schabi/newpipe/ImageDownloader.java b/app/src/main/java/org/schabi/newpipe/ImageDownloader.java
index c2897cff19d..ceae117778d 100644
--- a/app/src/main/java/org/schabi/newpipe/ImageDownloader.java
+++ b/app/src/main/java/org/schabi/newpipe/ImageDownloader.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+
 import androidx.preference.PreferenceManager;
 
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 5cecbc6d239..27720921145 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -20,8 +20,6 @@
 
 package org.schabi.newpipe;
 
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -43,6 +41,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.Spinner;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -53,10 +52,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
+
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+
 import org.schabi.newpipe.databinding.ActivityMainBinding;
 import org.schabi.newpipe.databinding.DrawerHeaderBinding;
 import org.schabi.newpipe.databinding.DrawerLayoutBinding;
@@ -89,6 +87,12 @@
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index 98a0921e4ea..7f935d0070e 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -188,7 +188,7 @@ private void showUnsupportedUrlDialog(final String url) {
                 .setPositiveButton(R.string.open_in_browser,
                         (dialog, which) -> ShareUtils.openUrlInBrowser(this, url))
                 .setNegativeButton(R.string.share,
-                        (dialog, which) -> ShareUtils.shareUrl(this, "", url)) // no subject
+                        (dialog, which) -> ShareUtils.shareText(this, "", url)) // no subject
                 .setNeutralButton(R.string.cancel, null)
                 .setOnDismissListener(dialog -> finish())
                 .show();
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index d11978c6b74..ec28be237ef 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -146,16 +146,13 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
             aboutBinding.appVersion.setText(BuildConfig.VERSION_NAME);
 
             aboutBinding.githubLink.setOnClickListener(nv ->
-                    openUrlInBrowser(context, context.getString(R.string.github_url),
-                            false));
+                    openUrlInBrowser(context, context.getString(R.string.github_url), false));
 
             aboutBinding.donationLink.setOnClickListener(v ->
-                    openUrlInBrowser(context, context.getString(R.string.donation_url),
-                            false));
+                    openUrlInBrowser(context, context.getString(R.string.donation_url), false));
 
             aboutBinding.websiteLink.setOnClickListener(nv ->
-                    openUrlInBrowser(context, context.getString(R.string.website_url),
-                            false));
+                    openUrlInBrowser(context, context.getString(R.string.website_url), false));
 
             aboutBinding.privacyPolicyLink.setOnClickListener(v ->
                     openUrlInBrowser(context, context.getString(R.string.privacy_policy_url),
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index c9913a80853..7ebf6639079 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -95,12 +95,12 @@
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.LinkHelper;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ShareUtils;
+import org.schabi.newpipe.util.TextLinkifier;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;
 import org.schabi.newpipe.views.LargeTextMovementMethod;
@@ -1230,16 +1230,16 @@ private void prepareDescription(final Description description) {
         }
 
         if (description.getType() == Description.HTML) {
-            LinkHelper.createLinksFromHtmlBlock(requireContext(), description.getContent(),
+            TextLinkifier.createLinksFromHtmlBlock(requireContext(), description.getContent(),
                     videoDescriptionView, HtmlCompat.FROM_HTML_MODE_LEGACY);
             videoDescriptionView.setVisibility(View.VISIBLE);
         } else if (description.getType() == Description.MARKDOWN) {
-            LinkHelper.createLinksFromMarkdownText(requireContext(), description.getContent(),
+            TextLinkifier.createLinksFromMarkdownText(requireContext(), description.getContent(),
                     videoDescriptionView);
             videoDescriptionView.setVisibility(View.VISIBLE);
         } else {
             //== Description.PLAIN_TEXT
-            LinkHelper.createLinksFromPlainText(requireContext(), description.getContent(),
+            TextLinkifier.createLinksFromPlainText(requireContext(), description.getContent(),
                     videoDescriptionView);
             videoDescriptionView.setVisibility(View.VISIBLE);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 6bcaac63036..b4dd45e9334 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -206,7 +206,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 break;
             case R.id.menu_item_share:
                 if (currentInfo != null) {
-                    ShareUtils.shareUrl(requireContext(), name, currentInfo.getOriginalUrl());
+                    ShareUtils.shareText(requireContext(), name, currentInfo.getOriginalUrl());
                 }
                 break;
             default:
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 58985e38a3c..85dea83dcee 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -242,7 +242,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 ShareUtils.openUrlInBrowser(requireContext(), url);
                 break;
             case R.id.menu_item_share:
-                ShareUtils.shareUrl(requireContext(), name, url);
+                ShareUtils.shareText(requireContext(), name, url);
                 break;
             case R.id.menu_item_bookmark:
                 onBookmarkClicked();
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
index e6cae0c7ebc..fe35a18c404 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -13,15 +13,14 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.CommentTextOnTouchListener;
+import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
index 3440fbe3c47..1915ff28323 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
@@ -1,10 +1,11 @@
 package org.schabi.newpipe.info_list.holder;
 
-import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.preference.PreferenceManager;
+
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index d454da08b8a..84908e41a05 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -4,16 +4,15 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index d5241ae02ff..ee77db89f19 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -33,9 +33,9 @@
 import java.util.List;
 
 import icepick.State;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index 8be281dc3b4..a84745dbf6a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -300,7 +300,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
         val actions = DialogInterface.OnClickListener { _, i ->
             when (i) {
-                0 -> ShareUtils.shareUrl(requireContext(), selectedItem.name, selectedItem.url)
+                0 -> ShareUtils.shareText(requireContext(), selectedItem.name, selectedItem.url)
                 1 -> deleteChannel(selectedItem)
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index e9ae1a1db70..945bc9a044a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -34,8 +34,8 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import org.schabi.newpipe.databinding.PlayerBinding;
 import org.schabi.newpipe.App;
+import org.schabi.newpipe.databinding.PlayerBinding;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index 6ea7ecda348..d757a926844 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -46,6 +46,7 @@
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import static org.schabi.newpipe.util.ShareUtils.shareText;
 
 public final class PlayQueueActivity extends AppCompatActivity
         implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,
@@ -311,7 +312,7 @@ private void buildItemPopupMenu(final PlayQueueItem item, final View view) {
         final MenuItem share = popupMenu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 3,
                 Menu.NONE, R.string.share);
         share.setOnMenuItemClickListener(menuItem -> {
-            shareUrl(item.getTitle(), item.getUrl());
+            shareText(getApplicationContext(), item.getTitle(), item.getUrl());
             return true;
         });
 
@@ -505,18 +506,6 @@ private void openPlaylistAppendDialog(final List<PlayQueueItem> playlist) {
             () -> PlaylistCreationDialog.newInstance(d).show(getSupportFragmentManager(), TAG));
     }
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Share
-    ////////////////////////////////////////////////////////////////////////////
-
-    private void shareUrl(final String subject, final String url) {
-        final Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType("text/plain");
-        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        intent.putExtra(Intent.EXTRA_TEXT, url);
-        startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
-    }
-
     ////////////////////////////////////////////////////////////////////////////
     // Binding Service Listener
     ////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 2453117f3c6..b2b65477abf 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -3553,7 +3553,7 @@ private void onShareClicked() {
                 && currentMetadata.getMetadata().getServiceId() == YouTube.getServiceId()) {
             videoUrl += ("&t=" + ts);
         }
-        ShareUtils.shareUrl(context, getVideoTitle(), videoUrl);
+        ShareUtils.shareText(context, getVideoTitle(), videoUrl);
     }
 
     private void onPlayWithKodiClicked() {
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
index 347118de54b..00ce3e616d5 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
@@ -6,9 +6,12 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
+
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+
 import org.schabi.newpipe.R;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 253f0fbbad7..a9a36e2f52a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -3,7 +3,6 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
@@ -14,6 +13,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.SliderStrategy;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
index 90a979872e9..6131d856545 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.rxjava3.core.BackpressureStrategy;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index 0321d197a72..e76af3944da 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -244,7 +244,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 goToReturnActivity();
                 break;
             case R.id.menu_item_share_error:
-                ShareUtils.shareUrl(this, getString(R.string.error_report_title), buildJson());
+                ShareUtils.shareText(this, getString(R.string.error_report_title), buildJson());
                 break;
         }
         return false;
@@ -267,7 +267,7 @@ private void openPrivacyPolicyDialog(final Context context, final String action)
                                 .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT)
                                 .putExtra(Intent.EXTRA_TEXT, buildJson());
                         if (i.resolveActivity(getPackageManager()) != null) {
-                            ShareUtils.openContentInApp(context, i);
+                            ShareUtils.openIntentInApp(context, i);
                         }
                     } else if (action.equals("GITHUB")) { // open the NewPipe issue page on GitHub
                         ShareUtils.openUrlInBrowser(this, ERROR_GITHUB_ISSUE_URL, false);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java b/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
index 7a42c9bea3b..b64543d2732 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
@@ -2,12 +2,12 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import androidx.preference.PreferenceManager;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.util.ThemeHelper;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
index 90537564a02..afe42d5d812 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
@@ -30,8 +30,8 @@
 import java.util.Vector;
 
 import de.hdodenhof.circleimageview.CircleImageView;
-import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
index 1fe405552db..e50c858caf1 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
@@ -15,6 +15,7 @@
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -22,7 +23,7 @@
 import androidx.core.widget.TextViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
-import java.util.List;
+
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.NotificationConstants;
@@ -30,6 +31,8 @@
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
+import java.util.List;
+
 public class NotificationActionsPreference extends Preference {
 
     public NotificationActionsPreference(final Context context, final AttributeSet attrs) {
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java
index 02b0c3df5c3..2836fe52b5b 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java
@@ -2,9 +2,10 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.preference.PreferenceManager;
 import android.widget.Toast;
 
+import androidx.preference.PreferenceManager;
+
 import org.schabi.newpipe.R;
 
 import java.util.List;
diff --git a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
index 5c7eb4c3f92..d26116139f0 100644
--- a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
+++ b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
@@ -23,8 +23,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class CommentTextOnTouchListener implements View.OnTouchListener {
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index 7046b8e49a9..6938cf4cc8b 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -365,7 +365,7 @@ public static void showMetaInfoInTextView(@Nullable final List<MetaInfo> metaInf
                 }
             }
 
-            LinkHelper.createLinksFromHtmlBlock(context, stringBuilder.toString(),
+            TextLinkifier.createLinksFromHtmlBlock(context, stringBuilder.toString(),
                     metaInfoTextView, HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING);
             metaInfoTextView.setMovementMethod(LinkMovementMethod.getInstance());
             metaInfoTextView.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java b/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java
index 27e1f304887..edcb565a04b 100644
--- a/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+
 import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index 5f8fb589831..eb3c2182755 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -4,11 +4,10 @@
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 
-import androidx.core.content.ContextCompat;
-import androidx.preference.PreferenceManager;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.MediaFormat;
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 c235d7d676d..f62f959c47d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -9,10 +9,19 @@
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
 import androidx.preference.PreferenceManager;
+
+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 org.schabi.newpipe.ktx.OffsetDateTimeKt;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
@@ -24,12 +33,6 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
-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 org.schabi.newpipe.ktx.OffsetDateTimeKt;
 
 
 /*
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index 936b4595cb4..4f4fd528360 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -2,7 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -46,9 +45,9 @@
 import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionsImportFragment;
+import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.PlayQueueActivity;
 import org.schabi.newpipe.player.Player;
-import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -57,6 +56,8 @@
 
 import java.util.ArrayList;
 
+import static org.schabi.newpipe.util.ShareUtils.installApp;
+
 public final class NavigationHelper {
     public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
     public static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag";
@@ -246,7 +247,7 @@ public static void playOnExternalPlayer(final Context context, final String name
 
     public static void resolveActivityOrAskToInstall(final Context context, final Intent intent) {
         if (intent.resolveActivity(context.getPackageManager()) != null) {
-            ShareUtils.openContentInApp(context, intent);
+            ShareUtils.openIntentInApp(context, intent);
         } else {
             if (context instanceof Activity) {
                 new AlertDialog.Builder(context)
@@ -566,17 +567,6 @@ public static Intent getIntentByLink(final Context context,
         return getOpenIntent(context, url, service.getServiceId(), linkType);
     }
 
-    private static void installApp(final Context context, final String packageName) {
-        try {
-            // Try market:// scheme
-            ShareUtils.openUrlInBrowser(context, "market://details?id=" + packageName, false);
-        } catch (final ActivityNotFoundException e) {
-            // Fall back to google play URL (don't worry F-Droid can handle it :)
-            ShareUtils.openUrlInBrowser(context,
-                    "https://play.google.com/store/apps/details?id=" + packageName, false);
-        }
-    }
-
     /**
      * Start an activity to install Kore.
      *
diff --git a/app/src/main/java/org/schabi/newpipe/util/PeertubeHelper.java b/app/src/main/java/org/schabi/newpipe/util/PeertubeHelper.java
index e2809579885..dcc39eccf6d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/PeertubeHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/PeertubeHelper.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+
 import androidx.preference.PreferenceManager;
 
 import com.grack.nanojson.JsonArray;
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 a6756991c5c..b38edfeb433 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -2,10 +2,10 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.preference.PreferenceManager;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import androidx.preference.PreferenceManager;
 
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
diff --git a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
index 142b2b20cc5..ffb965ae7dd 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.widget.Toast;
 
@@ -18,6 +17,27 @@ public final class ShareUtils {
     private ShareUtils() {
     }
 
+    /**
+     * Open an Intent to install an app.
+     * <p>
+     * This method will first try open to Google Play Store with the market scheme and falls back to
+     * Google Play Store web url if this first cannot be found.
+     *
+     * @param context the context to use
+     * @param packageName the package to be installed
+     */
+    public static void installApp(final Context context, final String packageName) {
+        try {
+            // Try market:// scheme
+            openIntentInApp(context, new Intent(Intent.ACTION_VIEW,
+                    Uri.parse("market://details?id=" + packageName)));
+        } catch (final ActivityNotFoundException e) {
+            // Fall back to Google Play Store Web URL (don't worry, F-Droid can handle it :))
+            openUrlInBrowser(context,
+                    "https://play.google.com/store/apps/details?id=" + packageName, false);
+        }
+    }
+
     /**
      * Open the url with the system default browser.
      * <p>
@@ -26,12 +46,11 @@ private ShareUtils() {
      *
      * @param context                the context to use
      * @param url                    the url to browse
-     * @param httpDefaultBrowserTest the boolean to set if the
-     *                               test for the default browser will be for HTTP protocol
-     *                               or for the created intent
+     * @param httpDefaultBrowserTest the boolean to set if the test for the default browser will be
+     *                               for HTTP protocol or for the created intent
      */
     public static void openUrlInBrowser(final Context context, final String url,
-                                        final Boolean httpDefaultBrowserTest) {
+                                        final boolean httpDefaultBrowserTest) {
         final String defaultPackageName;
         final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url))
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -42,14 +61,14 @@ public static void openUrlInBrowser(final Context context, final String url,
         }
 
         if (defaultPackageName.equals("android")) {
-            // no browser set as default (doesn't work on some devices)
+            // No browser set as default (doesn't work on some devices)
             openInDefaultApp(context, intent);
         } else {
             try {
                 intent.setPackage(defaultPackageName);
                 context.startActivity(intent);
             } catch (final ActivityNotFoundException e) {
-                // not a browser but an app chooser because of OEMs changes
+                // Not a browser but an app chooser because of OEMs changes
                 intent.setPackage(null);
                 openInDefaultApp(context, intent);
             }
@@ -62,7 +81,7 @@ public static void openUrlInBrowser(final Context context, final String url,
      * If no browser is set as default, fallbacks to
      * {@link ShareUtils#openInDefaultApp(Context, Intent)}
      * <p>
-     * This call {@link ShareUtils#openUrlInBrowser(Context, String, Boolean)} with true
+     * This calls {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} with true
      * for the boolean parameter
      *
      * @param context the context to use
@@ -73,26 +92,29 @@ public static void openUrlInBrowser(final Context context, final String url) {
     }
 
     /**
-     * Open a content with the system default browser.
+     * Open an intent with the system default app.
+     * <p>
+     * The intent can be of every type, excepted a web intent for which
+     * {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} should be used.
      * <p>
      * If no app is set as default, fallbacks to
      * {@link ShareUtils#openInDefaultApp(Context, Intent)}
      *
      * @param context the context to use
-     * @param intent  the intent of the file to open
+     * @param intent  the intent to open
      */
-    public static void openContentInApp(final Context context, final Intent intent) {
+    public static void openIntentInApp(final Context context, final Intent intent) {
         final String defaultAppPackageName = getDefaultAppPackageName(context, intent);
 
         if (defaultAppPackageName.equals("android")) {
-            // no app set as default (doesn't work on some devices)
+            // No app set as default (doesn't work on some devices)
             openInDefaultApp(context, intent);
         } else {
             try {
                 intent.setPackage(defaultAppPackageName);
                 context.startActivity(intent);
             } catch (final ActivityNotFoundException e) {
-                // not an app to open a file but an app chooser because of OEMs changes
+                // Not an app to open the intent but an app chooser because of OEMs changes
                 intent.setPackage(null);
                 openInDefaultApp(context, intent);
             }
@@ -143,9 +165,8 @@ private static String getDefaultAppPackageName(final Context context, final Inte
     private static String getDefaultBrowserPackageName(final Context context) {
         final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
-                PackageManager.MATCH_DEFAULT_ONLY);
-        return resolveInfo.activityInfo.packageName;
+        return context.getPackageManager().resolveActivity(intent,
+                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
     }
 
     /**
@@ -155,11 +176,12 @@ private static String getDefaultBrowserPackageName(final Context context) {
      * @param subject the url subject, typically the title
      * @param url     the url to share
      */
-    public static void shareUrl(final Context context, final String subject, final String url) {
+    public static void shareText(final Context context, final String subject, final String url) {
         final Intent shareIntent = new Intent(Intent.ACTION_SEND);
         shareIntent.setType("text/plain");
         shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
         shareIntent.putExtra(Intent.EXTRA_TEXT, url);
+
         final Intent intent = new Intent(Intent.ACTION_CHOOSER);
         intent.putExtra(Intent.EXTRA_INTENT, shareIntent);
         intent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.share_dialog_title));
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index 153ba7cf48d..73fee32f7f5 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -81,7 +81,7 @@ public enum StreamDialogEntry {
     }),
 
     share(R.string.share, (fragment, item) ->
-            ShareUtils.shareUrl(fragment.getContext(), item.getName(), item.getUrl()));
+            ShareUtils.shareText(fragment.getContext(), item.getName(), item.getUrl()));
 
 
     ///////////////
diff --git a/app/src/main/java/org/schabi/newpipe/util/LinkHelper.java b/app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java
similarity index 92%
rename from app/src/main/java/org/schabi/newpipe/util/LinkHelper.java
rename to app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java
index fba30758fc7..eb729661106 100644
--- a/app/src/main/java/org/schabi/newpipe/util/LinkHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java
@@ -14,15 +14,15 @@
 import io.noties.markwon.Markwon;
 import io.noties.markwon.linkify.LinkifyPlugin;
 
-public final class LinkHelper {
-    private LinkHelper() {
+public final class TextLinkifier {
+    private TextLinkifier() {
     }
 
     /**
      * Create web links for contents with an HTML description.
      * <p>
      * This will call
-     * {@link LinkHelper#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
+     * {@link TextLinkifier#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
      * after linked the URLs with {@link HtmlCompat#fromHtml(String, int)}.
      *
      * @param context        the context to use
@@ -43,7 +43,7 @@ public static void createLinksFromHtmlBlock(final Context context,
      * Create web links for contents with a plain text description.
      * <p>
      * This will call
-     * {@link LinkHelper#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
+     * {@link TextLinkifier#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
      * after linked the URLs with {@link TextView#setAutoLinkMask(int)} and
      * {@link TextView#setText(CharSequence, TextView.BufferType)}.
      *
@@ -63,7 +63,7 @@ public static void createLinksFromPlainText(final Context context,
      * Create web links for contents with a markdown description.
      * <p>
      * This will call
-     * {@link LinkHelper#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
+     * {@link TextLinkifier#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
      * after creating an {@link Markwon} object and using
      * {@link Markwon#setMarkdown(TextView, String)}.
      *
@@ -84,7 +84,7 @@ public static void createLinksFromMarkdownText(final Context context,
      * <p>
      * Instead of using an ACTION_VIEW intent in the description of a content, this method will
      * parse the CharSequence and replace all current web links with
-     * {@link ShareUtils#openUrlInBrowser(Context, String, Boolean)}.
+     * {@link ShareUtils#openUrlInBrowser(Context, String, boolean)}.
      * <p>
      * This method is required in order to intercept links and maybe, show a confirmation dialog
      * before opening a web link.
@@ -105,6 +105,7 @@ public void onClick(final View view) {
                     ShareUtils.openUrlInBrowser(context, span.getURL(), false);
                 }
             };
+
             textBlockLinked.setSpan(clickableSpan, textBlockLinked.getSpanStart(span),
                     textBlockLinked.getSpanEnd(span), textBlockLinked.getSpanFlags(span));
             textBlockLinked.removeSpan(span);
diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
index a1af0387acf..5ac4de84ce3 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@@ -22,7 +22,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
-import androidx.preference.PreferenceManager;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
@@ -32,6 +31,7 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.NewPipe;
diff --git a/app/src/main/java/org/schabi/newpipe/views/CustomCollapsingToolbarLayout.java b/app/src/main/java/org/schabi/newpipe/views/CustomCollapsingToolbarLayout.java
index 23e16ff585d..dc667b22a39 100644
--- a/app/src/main/java/org/schabi/newpipe/views/CustomCollapsingToolbarLayout.java
+++ b/app/src/main/java/org/schabi/newpipe/views/CustomCollapsingToolbarLayout.java
@@ -2,10 +2,12 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 public class CustomCollapsingToolbarLayout extends CollapsingToolbarLayout {
diff --git a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
index e7a028d508d..cfa17e20c0b 100644
--- a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
@@ -4,6 +4,7 @@
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.SurfaceView;
+
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 
 import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
diff --git a/app/src/main/java/org/schabi/newpipe/views/FocusAwareCoordinator.java b/app/src/main/java/org/schabi/newpipe/views/FocusAwareCoordinator.java
index f400b62b157..798d08c729c 100644
--- a/app/src/main/java/org/schabi/newpipe/views/FocusAwareCoordinator.java
+++ b/app/src/main/java/org/schabi/newpipe/views/FocusAwareCoordinator.java
@@ -24,11 +24,12 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-
 import android.view.WindowInsets;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import org.schabi.newpipe.R;
 
 public final class FocusAwareCoordinator extends CoordinatorLayout {
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index e7719644581..568c3497add 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -24,10 +24,6 @@
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Parcelable;
-
-import androidx.core.app.ServiceCompat;
-import androidx.core.content.ContextCompat;
-import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.util.SparseArray;
 import android.widget.Toast;
@@ -37,6 +33,9 @@
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.ServiceCompat;
+import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.download.DownloadActivity;
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 79b91cb5782..bea4b6f9420 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -364,7 +364,7 @@ private void viewWithFileProvider(Mission mission) {
         //mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
         if (intent.resolveActivity(mContext.getPackageManager()) != null) {
-            ShareUtils.openContentInApp(mContext, intent);
+            ShareUtils.openIntentInApp(mContext, intent);
         } else {
             Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG).show();
         }
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 9632c4ae072..3270b2b6f72 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -11,7 +11,6 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
-import androidx.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,6 +20,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 0aca3c4ab13..2ff7ae68d76 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -13,7 +13,7 @@
 
   <suppress checks="FinalParameters"
     files="ListHelper.java"
-    lines="281,313"/>
+    lines="280,312"/>
 
   <suppress checks="EmptyBlock"
     files="ContentSettingsFragment.java"

From 594f0b10ba379b24669bfcb4c04a0f5c3537ea50 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 15 Jan 2021 20:57:19 +0100
Subject: [PATCH 072/131] Move TextLinkifier computation out of main thread

---
 .../fragments/detail/VideoDetailFragment.java |  31 +++---
 .../fragments/list/search/SearchFragment.java |   8 +-
 .../schabi/newpipe/util/ExtractorHelper.java  |  16 +--
 .../schabi/newpipe/util/TextLinkifier.java    | 100 +++++++++++-------
 4 files changed, 92 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 7ebf6639079..9079c47cae6 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1229,19 +1229,20 @@ private void prepareDescription(final Description description) {
             return;
         }
 
-        if (description.getType() == Description.HTML) {
-            TextLinkifier.createLinksFromHtmlBlock(requireContext(), description.getContent(),
-                    videoDescriptionView, HtmlCompat.FROM_HTML_MODE_LEGACY);
-            videoDescriptionView.setVisibility(View.VISIBLE);
-        } else if (description.getType() == Description.MARKDOWN) {
-            TextLinkifier.createLinksFromMarkdownText(requireContext(), description.getContent(),
-                    videoDescriptionView);
-            videoDescriptionView.setVisibility(View.VISIBLE);
-        } else {
-            //== Description.PLAIN_TEXT
-            TextLinkifier.createLinksFromPlainText(requireContext(), description.getContent(),
-                    videoDescriptionView);
-            videoDescriptionView.setVisibility(View.VISIBLE);
+        switch (description.getType()) {
+            case Description.HTML:
+                disposables.add(TextLinkifier.createLinksFromHtmlBlock(requireContext(),
+                        description.getContent(), videoDescriptionView,
+                        HtmlCompat.FROM_HTML_MODE_LEGACY));
+                break;
+            case Description.MARKDOWN:
+                disposables.add(TextLinkifier.createLinksFromMarkdownText(requireContext(),
+                        description.getContent(), videoDescriptionView));
+                break;
+            case Description.PLAIN_TEXT: default:
+                disposables.add(TextLinkifier.createLinksFromPlainText(requireContext(),
+                        description.getContent(), videoDescriptionView));
+                break;
         }
     }
 
@@ -1557,8 +1558,8 @@ public void handleResult(@NonNull final StreamInfo info) {
         prepareDescription(info.getDescription());
         updateProgressInfo(info);
         initThumbnailViews(info);
-        showMetaInfoInTextView(info.getMetaInfo(), detailMetaInfoTextView, detailMetaInfoSeparator);
-
+        disposables.add(showMetaInfoInTextView(info.getMetaInfo(), detailMetaInfoTextView,
+                detailMetaInfoSeparator));
 
         if (player == null || player.isStopped()) {
             updateOverlayData(info.getName(), info.getUploaderName(), info.getThumbnailUrl());
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 67663a0738a..b15bb97f2d5 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
@@ -280,8 +280,8 @@ public void onResume() {
 
         handleSearchSuggestion();
 
-        showMetaInfoInTextView(metaInfo == null ? null : Arrays.asList(metaInfo),
-                    metaInfoTextView, metaInfoSeparator);
+        disposables.add(showMetaInfoInTextView(metaInfo == null ? null : Arrays.asList(metaInfo),
+                    metaInfoTextView, metaInfoSeparator));
 
         if (suggestionDisposable == null || suggestionDisposable.isDisposed()) {
             initSuggestionObserver();
@@ -1002,11 +1002,11 @@ public void handleResult(@NonNull final SearchInfo result) {
         // List<MetaInfo> cannot be bundled without creating some containers
         metaInfo = new MetaInfo[result.getMetaInfo().size()];
         metaInfo = result.getMetaInfo().toArray(metaInfo);
+        disposables.add(showMetaInfoInTextView(result.getMetaInfo(), metaInfoTextView,
+                metaInfoSeparator));
 
         handleSearchSuggestion();
 
-        showMetaInfoInTextView(result.getMetaInfo(), metaInfoTextView, metaInfoSeparator);
-
         lastSearchedString = searchString;
         nextPage = result.getNextPage();
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index 6938cf4cc8b..6ee69dcd9a4 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -22,7 +22,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
@@ -68,6 +67,7 @@
 
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
 
@@ -325,10 +325,11 @@ public static void handleGeneralException(final Context context, final int servi
      * @param metaInfos a list of meta information, can be null or empty
      * @param metaInfoTextView the text view in which to show the formatted HTML
      * @param metaInfoSeparator another view to be shown or hidden accordingly to the text view
+     * @return a disposable to be stored somewhere and disposed when activity/fragment is destroyed
      */
-    public static void showMetaInfoInTextView(@Nullable final List<MetaInfo> metaInfos,
-                                              final TextView metaInfoTextView,
-                                              final View metaInfoSeparator) {
+    public static Disposable showMetaInfoInTextView(@Nullable final List<MetaInfo> metaInfos,
+                                                    final TextView metaInfoTextView,
+                                                    final View metaInfoSeparator) {
         final Context context = metaInfoTextView.getContext();
         final boolean showMetaInfo = PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(context.getString(R.string.show_meta_info_key), true);
@@ -336,6 +337,7 @@ public static void showMetaInfoInTextView(@Nullable final List<MetaInfo> metaInf
         if (!showMetaInfo || metaInfos == null || metaInfos.isEmpty()) {
             metaInfoTextView.setVisibility(View.GONE);
             metaInfoSeparator.setVisibility(View.GONE);
+            return Disposable.empty();
 
         } else {
             final StringBuilder stringBuilder = new StringBuilder();
@@ -365,11 +367,9 @@ public static void showMetaInfoInTextView(@Nullable final List<MetaInfo> metaInf
                 }
             }
 
-            TextLinkifier.createLinksFromHtmlBlock(context, stringBuilder.toString(),
-                    metaInfoTextView, HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING);
-            metaInfoTextView.setMovementMethod(LinkMovementMethod.getInstance());
-            metaInfoTextView.setVisibility(View.VISIBLE);
             metaInfoSeparator.setVisibility(View.VISIBLE);
+            return TextLinkifier.createLinksFromHtmlBlock(context, stringBuilder.toString(),
+                    metaInfoTextView, HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java b/app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java
index eb729661106..08767733339 100644
--- a/app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java
+++ b/app/src/main/java/org/schabi/newpipe/util/TextLinkifier.java
@@ -6,15 +6,23 @@
 import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.core.text.HtmlCompat;
 
 import io.noties.markwon.Markwon;
 import io.noties.markwon.linkify.LinkifyPlugin;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public final class TextLinkifier {
+    public static final String TAG = TextLinkifier.class.getSimpleName();
+
     private TextLinkifier() {
     }
 
@@ -23,20 +31,21 @@ private TextLinkifier() {
      * <p>
      * This will call
      * {@link TextLinkifier#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
-     * after linked the URLs with {@link HtmlCompat#fromHtml(String, int)}.
+     * after having linked the URLs with {@link HtmlCompat#fromHtml(String, int)}.
      *
      * @param context        the context to use
      * @param htmlBlock      the htmlBlock to be linked
      * @param textView       the TextView to set the htmlBlock linked
      * @param htmlCompatFlag the int flag to be set when {@link HtmlCompat#fromHtml(String, int)}
      *                       will be called
+     * @return a disposable to be stored somewhere and disposed when activity/fragment is destroyed
      */
-    public static void createLinksFromHtmlBlock(final Context context,
-                                                final String htmlBlock,
-                                                final TextView textView,
-                                                final int htmlCompatFlag) {
-        changeIntentsOfDescriptionLinks(context, HtmlCompat.fromHtml(htmlBlock, htmlCompatFlag),
-                textView);
+    public static Disposable createLinksFromHtmlBlock(final Context context,
+                                                      final String htmlBlock,
+                                                      final TextView textView,
+                                                      final int htmlCompatFlag) {
+        return changeIntentsOfDescriptionLinks(context,
+                HtmlCompat.fromHtml(htmlBlock, htmlCompatFlag), textView);
     }
 
     /**
@@ -44,19 +53,20 @@ public static void createLinksFromHtmlBlock(final Context context,
      * <p>
      * This will call
      * {@link TextLinkifier#changeIntentsOfDescriptionLinks(Context, CharSequence, TextView)}
-     * after linked the URLs with {@link TextView#setAutoLinkMask(int)} and
+     * after having linked the URLs with {@link TextView#setAutoLinkMask(int)} and
      * {@link TextView#setText(CharSequence, TextView.BufferType)}.
      *
      * @param context        the context to use
      * @param plainTextBlock the block of plain text to be linked
      * @param textView       the TextView to set the plain text block linked
+     * @return a disposable to be stored somewhere and disposed when activity/fragment is destroyed
      */
-    public static void createLinksFromPlainText(final Context context,
-                                                final String plainTextBlock,
-                                                final TextView textView) {
+    public static Disposable createLinksFromPlainText(final Context context,
+                                                      final String plainTextBlock,
+                                                      final TextView textView) {
         textView.setAutoLinkMask(Linkify.WEB_URLS);
         textView.setText(plainTextBlock, TextView.BufferType.SPANNABLE);
-        changeIntentsOfDescriptionLinks(context, textView.getText(), textView);
+        return changeIntentsOfDescriptionLinks(context, textView.getText(), textView);
     }
 
     /**
@@ -70,48 +80,66 @@ public static void createLinksFromPlainText(final Context context,
      * @param context       the context to use
      * @param markdownBlock the block of markdown text to be linked
      * @param textView      the TextView to set the plain text block linked
+     * @return a disposable to be stored somewhere and disposed when activity/fragment is destroyed
      */
-    public static void createLinksFromMarkdownText(final Context context,
-                                                   final String markdownBlock,
-                                                   final TextView textView) {
+    public static Disposable createLinksFromMarkdownText(final Context context,
+                                                         final String markdownBlock,
+                                                         final TextView textView) {
         final Markwon markwon = Markwon.builder(context).usePlugin(LinkifyPlugin.create()).build();
         markwon.setMarkdown(textView, markdownBlock);
-        changeIntentsOfDescriptionLinks(context, textView.getText(), textView);
+        return changeIntentsOfDescriptionLinks(context, textView.getText(), textView);
     }
 
     /**
      * Change links generated by libraries in the description of a content to a custom link action.
      * <p>
-     * Instead of using an ACTION_VIEW intent in the description of a content, this method will
-     * parse the CharSequence and replace all current web links with
-     * {@link ShareUtils#openUrlInBrowser(Context, String, boolean)}.
+     * Instead of using an {@link android.content.Intent#ACTION_VIEW} intent in the description of a
+     * content, this method will parse the {@link CharSequence} and replace all current web links
+     * with {@link ShareUtils#openUrlInBrowser(Context, String, boolean)}.
      * <p>
-     * This method is required in order to intercept links and maybe, show a confirmation dialog
+     * This method is required in order to intercept links and e.g. show a confirmation dialog
      * before opening a web link.
      *
      * @param context  the context to use
      * @param chars    the CharSequence to be parsed
      * @param textView the TextView in which the converted CharSequence will be applied
+     * @return a disposable to be stored somewhere and disposed when activity/fragment is destroyed
      */
-    private static void changeIntentsOfDescriptionLinks(final Context context,
-                                                        final CharSequence chars,
-                                                        final TextView textView) {
-        final SpannableStringBuilder textBlockLinked = new SpannableStringBuilder(chars);
-        final URLSpan[] urls = textBlockLinked.getSpans(0, chars.length(), URLSpan.class);
+    private static Disposable changeIntentsOfDescriptionLinks(final Context context,
+                                                              final CharSequence chars,
+                                                              final TextView textView) {
+        return Single.fromCallable(() -> {
+            final SpannableStringBuilder textBlockLinked = new SpannableStringBuilder(chars);
+            final URLSpan[] urls = textBlockLinked.getSpans(0, chars.length(), URLSpan.class);
+
+            for (final URLSpan span : urls) {
+                final ClickableSpan clickableSpan = new ClickableSpan() {
+                    public void onClick(@NonNull final View view) {
+                        ShareUtils.openUrlInBrowser(context, span.getURL(), false);
+                    }
+                };
 
-        for (final URLSpan span : urls) {
-            final ClickableSpan clickableSpan = new ClickableSpan() {
-                public void onClick(final View view) {
-                    ShareUtils.openUrlInBrowser(context, span.getURL(), false);
-                }
-            };
+                textBlockLinked.setSpan(clickableSpan, textBlockLinked.getSpanStart(span),
+                        textBlockLinked.getSpanEnd(span), textBlockLinked.getSpanFlags(span));
+                textBlockLinked.removeSpan(span);
+            }
 
-            textBlockLinked.setSpan(clickableSpan, textBlockLinked.getSpanStart(span),
-                    textBlockLinked.getSpanEnd(span), textBlockLinked.getSpanFlags(span));
-            textBlockLinked.removeSpan(span);
-        }
+            return textBlockLinked;
+        }).subscribeOn(Schedulers.computation())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        textBlockLinked -> setTextViewCharSequence(textView, textBlockLinked),
+                        throwable -> {
+                            Log.e(TAG, "Unable to linkify text", throwable);
+                            // this should never happen, but if it does, just fallback to it
+                            setTextViewCharSequence(textView, chars);
+                        });
+    }
 
-        textView.setText(textBlockLinked);
+    private static void setTextViewCharSequence(final TextView textView,
+                                                final CharSequence charSequence) {
+        textView.setText(charSequence);
         textView.setMovementMethod(LinkMovementMethod.getInstance());
+        textView.setVisibility(View.VISIBLE);
     }
 }

From 68be87724ae4470aae7a6058f98082f4e0b7316f Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 31 Oct 2020 10:07:18 +0530
Subject: [PATCH 073/131] Switch to Groupie view binding module.

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab34497845e..6647b413dd9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -217,7 +217,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     implementation "com.xwray:groupie:${groupieVersion}"
-    implementation "com.xwray:groupie-kotlin-android-extensions:${groupieVersion}"
+    implementation "com.xwray:groupie-viewbinding:${groupieVersion}"
 
     implementation "de.hdodenhof:circleimageview:3.1.0"
     implementation "com.nostra13.universalimageloader:universal-image-loader:1.9.5"

From 46afe5153f6d7e774fd63e0a07007eb485d42e84 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 27 Nov 2020 20:18:38 +0530
Subject: [PATCH 074/131] Use BindableItem in EmptyPlaceholderItem.

---
 .../local/subscription/item/EmptyPlaceholderItem.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt
index ef7eb93cd00..59bef55cfb2 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt
@@ -1,11 +1,13 @@
 package org.schabi.newpipe.local.subscription.item
 
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
+import android.view.View
+import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.ListEmptyViewBinding
 
-class EmptyPlaceholderItem : Item() {
+class EmptyPlaceholderItem : BindableItem<ListEmptyViewBinding>() {
     override fun getLayout(): Int = R.layout.list_empty_view
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {}
+    override fun bind(viewBinding: ListEmptyViewBinding, position: Int) {}
     override fun getSpanSize(spanCount: Int, position: Int): Int = spanCount
+    override fun initializeViewBinding(view: View) = ListEmptyViewBinding.bind(view)
 }

From b387946d34e388a7c9a54a745b5c693a9d445c0a Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 27 Nov 2020 20:19:48 +0530
Subject: [PATCH 075/131] Use BindableItem in FeedGroupAddItem.

---
 .../local/subscription/item/FeedGroupAddItem.kt        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt
index 1bc4d167379..434b4f29add 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt
@@ -1,10 +1,12 @@
 package org.schabi.newpipe.local.subscription.item
 
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
+import android.view.View
+import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.FeedGroupAddNewItemBinding
 
-class FeedGroupAddItem : Item() {
+class FeedGroupAddItem : BindableItem<FeedGroupAddNewItemBinding>() {
     override fun getLayout(): Int = R.layout.feed_group_add_new_item
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {}
+    override fun bind(viewBinding: FeedGroupAddNewItemBinding, position: Int) {}
+    override fun initializeViewBinding(view: View) = FeedGroupAddNewItemBinding.bind(view)
 }

From ee94b296ae77054e8097c3ba3817761a0648737f Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 27 Nov 2020 20:22:06 +0530
Subject: [PATCH 076/131] Use BindableItem in FeedGroupCardItem.

---
 .../subscription/item/FeedGroupCardItem.kt      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt
index 12ff47b3f40..a9731df8a7b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt
@@ -1,18 +1,17 @@
 package org.schabi.newpipe.local.subscription.item
 
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.feed_group_card_item.icon
-import kotlinx.android.synthetic.main.feed_group_card_item.title
+import android.view.View
+import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.databinding.FeedGroupCardItemBinding
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
 data class FeedGroupCardItem(
     val groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
     val name: String,
     val icon: FeedGroupIcon
-) : Item() {
+) : BindableItem<FeedGroupCardItemBinding>() {
     constructor (feedGroupEntity: FeedGroupEntity) : this(feedGroupEntity.uid, feedGroupEntity.name, feedGroupEntity.icon)
 
     override fun getId(): Long {
@@ -24,8 +23,10 @@ data class FeedGroupCardItem(
 
     override fun getLayout(): Int = R.layout.feed_group_card_item
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.title.text = name
-        viewHolder.icon.setImageResource(icon.getDrawableRes(viewHolder.containerView.context))
+    override fun bind(viewBinding: FeedGroupCardItemBinding, position: Int) {
+        viewBinding.title.text = name
+        viewBinding.icon.setImageResource(icon.getDrawableRes(viewBinding.root.context))
     }
+
+    override fun initializeViewBinding(view: View) = FeedGroupCardItemBinding.bind(view)
 }

From 761f6568fa1e4a3da0964552e60376224158e5e0 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 13:32:39 +0530
Subject: [PATCH 077/131] Use BindableItem in FeedGroupCarouselItem.

---
 .../subscription/SubscriptionFragment.kt      | 24 +++++++-----------
 .../item/FeedGroupCarouselItem.kt             | 25 +++++++++++--------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index a84745dbf6a..61a6601fa67 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -17,7 +17,6 @@ import android.view.MenuInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
@@ -27,12 +26,13 @@ import com.xwray.groupie.Group
 import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.Item
 import com.xwray.groupie.Section
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
+import com.xwray.groupie.viewbinding.GroupieViewHolder
 import icepick.State
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.databinding.DialogTitleBinding
+import org.schabi.newpipe.databinding.FeedItemCarouselBinding
 import org.schabi.newpipe.databinding.FragmentSubscriptionBinding
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
 import org.schabi.newpipe.fragments.BaseStateFragment
@@ -79,7 +79,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     private var subscriptionBroadcastReceiver: BroadcastReceiver? = null
 
-    private val groupAdapter = GroupAdapter<GroupieViewHolder>()
+    private val groupAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>()
     private val feedGroupsSection = Section()
     private var feedGroupsCarousel: FeedGroupCarouselItem? = null
     private lateinit var importExportItem: FeedImportExportItem
@@ -234,7 +234,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     private fun setupInitialLayout() {
         Section().apply {
-            val carouselAdapter = GroupAdapter<GroupieViewHolder>()
+            val carouselAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>()
 
             carouselAdapter.add(FeedGroupCardItem(-1, getString(R.string.all), FeedGroupIcon.RSS))
             carouselAdapter.add(feedGroupsSection)
@@ -288,15 +288,12 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         binding.itemsList.adapter = groupAdapter
 
         viewModel = ViewModelProvider(this).get(SubscriptionViewModel::class.java)
-        viewModel.stateLiveData.observe(viewLifecycleOwner, Observer { it?.let(this::handleResult) })
-        viewModel.feedGroupsLiveData.observe(viewLifecycleOwner, Observer { it?.let(this::handleFeedGroups) })
+        viewModel.stateLiveData.observe(viewLifecycleOwner, { it?.let(this::handleResult) })
+        viewModel.feedGroupsLiveData.observe(viewLifecycleOwner, { it?.let(this::handleFeedGroups) })
     }
 
     private fun showLongTapDialog(selectedItem: ChannelInfoItem) {
-        val commands = arrayOf(
-            getString(R.string.share),
-            getString(R.string.unsubscribe)
-        )
+        val commands = arrayOf(getString(R.string.share), getString(R.string.unsubscribe))
 
         val actions = DialogInterface.OnClickListener { _, i ->
             when (i) {
@@ -439,11 +436,8 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         return when (listMode) {
             getString(R.string.list_view_mode_auto_key) -> {
                 val configuration = resources.configuration
-
-                (
-                    configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
-                        configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
-                    )
+                configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                        && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
             }
             getString(R.string.list_view_mode_grid_key) -> true
             else -> false
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCarouselItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCarouselItem.kt
index dfffce59c19..44af16280f2 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCarouselItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCarouselItem.kt
@@ -6,13 +6,16 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.feed_item_carousel.recycler_view
+import com.xwray.groupie.viewbinding.BindableItem
+import com.xwray.groupie.viewbinding.GroupieViewHolder
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.FeedItemCarouselBinding
 import org.schabi.newpipe.local.subscription.decoration.FeedGroupCarouselDecoration
 
-class FeedGroupCarouselItem(context: Context, private val carouselAdapter: GroupAdapter<GroupieViewHolder>) : Item() {
+class FeedGroupCarouselItem(
+    context: Context,
+    private val carouselAdapter: GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>
+) : BindableItem<FeedItemCarouselBinding>() {
     private val feedGroupCarouselDecoration = FeedGroupCarouselDecoration(context)
 
     private var linearLayoutManager: LinearLayoutManager? = null
@@ -30,12 +33,12 @@ class FeedGroupCarouselItem(context: Context, private val carouselAdapter: Group
         listState = state
     }
 
-    override fun createViewHolder(itemView: View): GroupieViewHolder {
-        val viewHolder = super.createViewHolder(itemView)
+    override fun initializeViewBinding(view: View): FeedItemCarouselBinding {
+        val viewHolder = FeedItemCarouselBinding.bind(view)
 
-        linearLayoutManager = LinearLayoutManager(itemView.context, RecyclerView.HORIZONTAL, false)
+        linearLayoutManager = LinearLayoutManager(view.context, RecyclerView.HORIZONTAL, false)
 
-        viewHolder.recycler_view.apply {
+        viewHolder.recyclerView.apply {
             layoutManager = linearLayoutManager
             adapter = carouselAdapter
             addItemDecoration(feedGroupCarouselDecoration)
@@ -44,12 +47,12 @@ class FeedGroupCarouselItem(context: Context, private val carouselAdapter: Group
         return viewHolder
     }
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.recycler_view.apply { adapter = carouselAdapter }
+    override fun bind(viewBinding: FeedItemCarouselBinding, position: Int) {
+        viewBinding.recyclerView.apply { adapter = carouselAdapter }
         linearLayoutManager?.onRestoreInstanceState(listState)
     }
 
-    override fun unbind(viewHolder: GroupieViewHolder) {
+    override fun unbind(viewHolder: GroupieViewHolder<FeedItemCarouselBinding>) {
         super.unbind(viewHolder)
 
         listState = linearLayoutManager?.onSaveInstanceState()

From 9d27d49c1f849b3a6170bfb6efa2680761406ee2 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 13:43:15 +0530
Subject: [PATCH 078/131] Use BindableItem in FeedGroupReorderItem.

---
 .../subscription/item/FeedGroupReorderItem.kt | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt
index e56bb408cd8..48b06b08afe 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt
@@ -1,16 +1,15 @@
 package org.schabi.newpipe.local.subscription.item
 
 import android.view.MotionEvent
+import android.view.View
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ItemTouchHelper.DOWN
 import androidx.recyclerview.widget.ItemTouchHelper.UP
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.feed_group_reorder_item.group_icon
-import kotlinx.android.synthetic.main.feed_group_reorder_item.group_name
-import kotlinx.android.synthetic.main.feed_group_reorder_item.handle
+import com.xwray.groupie.viewbinding.BindableItem
+import com.xwray.groupie.viewbinding.GroupieViewHolder
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.databinding.FeedGroupReorderItemBinding
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
 data class FeedGroupReorderItem(
@@ -18,7 +17,7 @@ data class FeedGroupReorderItem(
     val name: String,
     val icon: FeedGroupIcon,
     val dragCallback: ItemTouchHelper
-) : Item() {
+) : BindableItem<FeedGroupReorderItemBinding>() {
     constructor (feedGroupEntity: FeedGroupEntity, dragCallback: ItemTouchHelper) :
         this(feedGroupEntity.uid, feedGroupEntity.name, feedGroupEntity.icon, dragCallback)
 
@@ -31,12 +30,12 @@ data class FeedGroupReorderItem(
 
     override fun getLayout(): Int = R.layout.feed_group_reorder_item
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.group_name.text = name
-        viewHolder.group_icon.setImageResource(icon.getDrawableRes(viewHolder.containerView.context))
-        viewHolder.handle.setOnTouchListener { _, event ->
+    override fun bind(viewBinding: FeedGroupReorderItemBinding, position: Int) {
+        viewBinding.groupName.text = name
+        viewBinding.groupIcon.setImageResource(icon.getDrawableRes(viewBinding.root.context))
+        viewBinding.handle.setOnTouchListener { _, event ->
             if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-                dragCallback.startDrag(viewHolder)
+                dragCallback.startDrag(GroupieViewHolder(viewBinding))
                 return@setOnTouchListener true
             }
 
@@ -47,4 +46,6 @@ data class FeedGroupReorderItem(
     override fun getDragDirs(): Int {
         return UP or DOWN
     }
+
+    override fun initializeViewBinding(view: View) = FeedGroupReorderItemBinding.bind(view)
 }

From 51a948bfcf2b733e5497c67432e0d9145f1b7376 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 13:51:39 +0530
Subject: [PATCH 079/131] Use BindableItem in FeedImportExportItem.

---
 .../subscription/item/FeedImportExportItem.kt | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
index 00de83538a9..afca7064f98 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
@@ -7,14 +7,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.DrawableRes
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.feed_import_export_group.export_to_options
-import kotlinx.android.synthetic.main.feed_import_export_group.import_export
-import kotlinx.android.synthetic.main.feed_import_export_group.import_export_expand_icon
-import kotlinx.android.synthetic.main.feed_import_export_group.import_export_options
-import kotlinx.android.synthetic.main.feed_import_export_group.import_from_options
+import com.xwray.groupie.viewbinding.BindableItem
+import com.xwray.groupie.viewbinding.GroupieViewHolder
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.FeedImportExportGroupBinding
 import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.ktx.animateRotation
@@ -27,50 +23,52 @@ class FeedImportExportItem(
     val onImportFromServiceSelected: (Int) -> Unit,
     val onExportSelected: () -> Unit,
     var isExpanded: Boolean = false
-) : Item() {
+) : BindableItem<FeedImportExportGroupBinding>() {
     companion object {
         const val REFRESH_EXPANDED_STATUS = 123
     }
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int, payloads: MutableList<Any>) {
+    override fun bind(viewBinding: FeedImportExportGroupBinding, position: Int, payloads: MutableList<Any>) {
         if (payloads.contains(REFRESH_EXPANDED_STATUS)) {
-            viewHolder.import_export_options.apply { if (isExpanded) expand() else collapse() }
+            viewBinding.importExportOptions.apply { if (isExpanded) expand() else collapse() }
             return
         }
 
-        super.bind(viewHolder, position, payloads)
+        super.bind(viewBinding, position, payloads)
     }
 
     override fun getLayout(): Int = R.layout.feed_import_export_group
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        if (viewHolder.import_from_options.childCount == 0) setupImportFromItems(viewHolder.import_from_options)
-        if (viewHolder.export_to_options.childCount == 0) setupExportToItems(viewHolder.export_to_options)
+    override fun bind(viewBinding: FeedImportExportGroupBinding, position: Int) {
+        if (viewBinding.importFromOptions.childCount == 0) setupImportFromItems(viewBinding.importFromOptions)
+        if (viewBinding.exportToOptions.childCount == 0) setupExportToItems(viewBinding.exportToOptions)
 
-        expandIconListener?.let { viewHolder.import_export_options.removeListener(it) }
+        expandIconListener?.let { viewBinding.importExportOptions.removeListener(it) }
         expandIconListener = CollapsibleView.StateListener { newState ->
-            viewHolder.import_export_expand_icon.animateRotation(
+            viewBinding.importExportExpandIcon.animateRotation(
                 250, if (newState == CollapsibleView.COLLAPSED) 0 else 180
             )
         }
 
-        viewHolder.import_export_options.currentState = if (isExpanded) CollapsibleView.EXPANDED else CollapsibleView.COLLAPSED
-        viewHolder.import_export_expand_icon.rotation = if (isExpanded) 180F else 0F
-        viewHolder.import_export_options.ready()
+        viewBinding.importExportOptions.currentState = if (isExpanded) CollapsibleView.EXPANDED else CollapsibleView.COLLAPSED
+        viewBinding.importExportExpandIcon.rotation = if (isExpanded) 180F else 0F
+        viewBinding.importExportOptions.ready()
 
-        viewHolder.import_export_options.addListener(expandIconListener)
-        viewHolder.import_export.setOnClickListener {
-            viewHolder.import_export_options.switchState()
-            isExpanded = viewHolder.import_export_options.currentState == CollapsibleView.EXPANDED
+        viewBinding.importExportOptions.addListener(expandIconListener)
+        viewBinding.importExport.setOnClickListener {
+            viewBinding.importExportOptions.switchState()
+            isExpanded = viewBinding.importExportOptions.currentState == CollapsibleView.EXPANDED
         }
     }
 
-    override fun unbind(viewHolder: GroupieViewHolder) {
+    override fun unbind(viewHolder: GroupieViewHolder<FeedImportExportGroupBinding>) {
         super.unbind(viewHolder)
-        expandIconListener?.let { viewHolder.import_export_options.removeListener(it) }
+        expandIconListener?.let { viewHolder.binding.importExportOptions.removeListener(it) }
         expandIconListener = null
     }
 
+    override fun initializeViewBinding(view: View) = FeedImportExportGroupBinding.bind(view)
+
     private var expandIconListener: CollapsibleView.StateListener? = null
 
     private fun addItemView(title: String, @DrawableRes icon: Int, container: ViewGroup): View {
@@ -117,7 +115,8 @@ class FeedImportExportItem(
     private fun setupExportToItems(listHolder: ViewGroup) {
         val previousBackupItem = addItemView(
             listHolder.context.getString(R.string.file),
-            ThemeHelper.resolveResourceIdFromAttr(listHolder.context, R.attr.ic_save), listHolder
+            ThemeHelper.resolveResourceIdFromAttr(listHolder.context, R.attr.ic_save),
+            listHolder
         )
         previousBackupItem.setOnClickListener { onExportSelected() }
     }

From 9e5f079cf254d741b9e3357075f0c43cb81730ab Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 13:58:34 +0530
Subject: [PATCH 080/131] Use BindableItem in HeaderItem.

---
 .../local/subscription/item/HeaderItem.kt     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderItem.kt
index 9798dac1bbe..e0416457350 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderItem.kt
@@ -1,19 +1,23 @@
 package org.schabi.newpipe.local.subscription.item
 
+import android.view.View
 import android.view.View.OnClickListener
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.header_item.header_title
+import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.HeaderItemBinding
 
-class HeaderItem(val title: String, private val onClickListener: (() -> Unit)? = null) : Item() {
-
+class HeaderItem(
+    val title: String,
+    private val onClickListener: (() -> Unit)? = null
+) : BindableItem<HeaderItemBinding>() {
     override fun getLayout(): Int = R.layout.header_item
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.header_title.text = title
+    override fun bind(viewBinding: HeaderItemBinding, position: Int) {
+        viewBinding.headerTitle.text = title
 
         val listener: OnClickListener? = if (onClickListener != null) OnClickListener { onClickListener.invoke() } else null
-        viewHolder.root.setOnClickListener(listener)
+        viewBinding.root.setOnClickListener(listener)
     }
+
+    override fun initializeViewBinding(view: View) = HeaderItemBinding.bind(view)
 }

From a188125982626a9cdb2d5584fa2bfa82ef530119 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 14:01:30 +0530
Subject: [PATCH 081/131] Use BindableItem in HeaderWithMenuItem.

---
 .../subscription/item/HeaderWithMenuItem.kt   | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt
index b5aa6b1d0f5..55f56b3f5a7 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt
@@ -1,13 +1,12 @@
 package org.schabi.newpipe.local.subscription.item
 
+import android.view.View
 import android.view.View.OnClickListener
 import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.header_with_menu_item.header_menu_item
-import kotlinx.android.synthetic.main.header_with_menu_item.header_title
+import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.HeaderWithMenuItemBinding
 
 class HeaderWithMenuItem(
     val title: String,
@@ -15,37 +14,39 @@ class HeaderWithMenuItem(
     var showMenuItem: Boolean = true,
     private val onClickListener: (() -> Unit)? = null,
     private val menuItemOnClickListener: (() -> Unit)? = null
-) : Item() {
+) : BindableItem<HeaderWithMenuItemBinding>() {
     companion object {
         const val PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM = 1
     }
 
     override fun getLayout(): Int = R.layout.header_with_menu_item
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int, payloads: MutableList<Any>) {
+    override fun bind(viewBinding: HeaderWithMenuItemBinding, position: Int, payloads: MutableList<Any>) {
         if (payloads.contains(PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM)) {
-            updateMenuItemVisibility(viewHolder)
+            updateMenuItemVisibility(viewBinding)
             return
         }
 
-        super.bind(viewHolder, position, payloads)
+        super.bind(viewBinding, position, payloads)
     }
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.header_title.text = title
-        viewHolder.header_menu_item.setImageResource(itemIcon)
+    override fun bind(viewBinding: HeaderWithMenuItemBinding, position: Int) {
+        viewBinding.headerTitle.text = title
+        viewBinding.headerMenuItem.setImageResource(itemIcon)
 
         val listener: OnClickListener? =
-            onClickListener?.let { OnClickListener { onClickListener.invoke() } }
-        viewHolder.root.setOnClickListener(listener)
+                onClickListener?.let { OnClickListener { onClickListener.invoke() } }
+        viewBinding.root.setOnClickListener(listener)
 
         val menuItemListener: OnClickListener? =
-            menuItemOnClickListener?.let { OnClickListener { menuItemOnClickListener.invoke() } }
-        viewHolder.header_menu_item.setOnClickListener(menuItemListener)
-        updateMenuItemVisibility(viewHolder)
+                menuItemOnClickListener?.let { OnClickListener { menuItemOnClickListener.invoke() } }
+        viewBinding.headerMenuItem.setOnClickListener(menuItemListener)
+        updateMenuItemVisibility(viewBinding)
     }
 
-    private fun updateMenuItemVisibility(viewHolder: GroupieViewHolder) {
-        viewHolder.header_menu_item.isVisible = showMenuItem
+    override fun initializeViewBinding(view: View) = HeaderWithMenuItemBinding.bind(view)
+
+    private fun updateMenuItemVisibility(viewBinding: HeaderWithMenuItemBinding) {
+        viewBinding.headerMenuItem.isVisible = showMenuItem
     }
 }

From e2dd058430ef92c315b0e2fd59c88efa141e8944 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 14:03:26 +0530
Subject: [PATCH 082/131] Use BindableItem in PickerIconItem.

---
 .../local/subscription/item/PickerIconItem.kt   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
index 4f3678e9572..11fc4833a51 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
@@ -1,20 +1,25 @@
 package org.schabi.newpipe.local.subscription.item
 
 import android.content.Context
+import android.view.View
 import androidx.annotation.DrawableRes
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.picker_icon_item.icon_view
+import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.PickerIconItemBinding
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
-class PickerIconItem(context: Context, val icon: FeedGroupIcon) : Item() {
+class PickerIconItem(
+    context: Context,
+    val icon: FeedGroupIcon
+) : BindableItem<PickerIconItemBinding>() {
     @DrawableRes
     val iconRes: Int = icon.getDrawableRes(context)
 
     override fun getLayout(): Int = R.layout.picker_icon_item
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.icon_view.setImageResource(iconRes)
+    override fun bind(viewBinding: PickerIconItemBinding, position: Int) {
+        viewBinding.iconView.setImageResource(iconRes)
     }
+
+    override fun initializeViewBinding(view: View) = PickerIconItemBinding.bind(view)
 }

From 77675b361fa5f516b96d03d045d11ccf1250db20 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 14:08:24 +0530
Subject: [PATCH 083/131] Use BindableItem in PickerSubscriptionItem.

---
 .../item/PickerSubscriptionItem.kt            | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
index 0138b1ffe68..3540e6938c4 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
@@ -1,14 +1,14 @@
 package org.schabi.newpipe.local.subscription.item
 
 import android.view.View
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.nostra13.universalimageloader.core.ImageLoader
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.picker_subscription_item.*
-import kotlinx.android.synthetic.main.picker_subscription_item.view.*
+import com.xwray.groupie.viewbinding.BindableItem
+import com.xwray.groupie.viewbinding.GroupieViewHolder
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
+import org.schabi.newpipe.databinding.PickerSubscriptionItemBinding
 import org.schabi.newpipe.ktx.AnimationType
 import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.util.ImageDisplayConstants
@@ -16,31 +16,36 @@ import org.schabi.newpipe.util.ImageDisplayConstants
 data class PickerSubscriptionItem(
     val subscriptionEntity: SubscriptionEntity,
     var isSelected: Boolean = false
-) : Item() {
+) : BindableItem<PickerSubscriptionItemBinding>() {
     override fun getId(): Long = subscriptionEntity.uid
     override fun getLayout(): Int = R.layout.picker_subscription_item
     override fun getSpanSize(spanCount: Int, position: Int): Int = 1
 
-    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
+    override fun bind(viewBinding: PickerSubscriptionItemBinding, position: Int) {
         ImageLoader.getInstance().displayImage(
             subscriptionEntity.avatarUrl,
-            viewHolder.thumbnail_view, ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS
+            viewBinding.thumbnailView, ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS
         )
 
-        viewHolder.title_view.text = subscriptionEntity.name
-        viewHolder.selected_highlight.isVisible = isSelected
+        viewBinding.titleView.text = subscriptionEntity.name
+        viewBinding.selectedHighlight.isVisible = isSelected
     }
 
-    override fun unbind(viewHolder: GroupieViewHolder) {
+    override fun unbind(viewHolder: GroupieViewHolder<PickerSubscriptionItemBinding>) {
         super.unbind(viewHolder)
 
-        viewHolder.selected_highlight.animate().setListener(null).cancel()
-        viewHolder.selected_highlight.visibility = View.GONE
-        viewHolder.selected_highlight.alpha = 1F
+        viewHolder.binding.selectedHighlight.apply {
+            animate().setListener(null).cancel()
+            isGone = true
+            alpha = 1F
+        }
     }
 
+    override fun initializeViewBinding(view: View) = PickerSubscriptionItemBinding.bind(view)
+
     fun updateSelected(containerView: View, isSelected: Boolean) {
         this.isSelected = isSelected
-        containerView.selected_highlight.animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
+        PickerSubscriptionItemBinding.bind(containerView).selectedHighlight
+                .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
     }
 }

From e0de66b1bea0ca70859261f1872955734b5db2da Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 28 Nov 2020 14:31:39 +0530
Subject: [PATCH 084/131] Fix some issues.

---
 .../newpipe/local/subscription/SubscriptionFragment.kt      | 4 ++--
 .../newpipe/local/subscription/item/HeaderWithMenuItem.kt   | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index 61a6601fa67..b74288a340b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -436,8 +436,8 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         return when (listMode) {
             getString(R.string.list_view_mode_auto_key) -> {
                 val configuration = resources.configuration
-                configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
-                        && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
+                configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
+                    configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
             }
             getString(R.string.list_view_mode_grid_key) -> true
             else -> false
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt
index 55f56b3f5a7..79a272178de 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt
@@ -34,12 +34,10 @@ class HeaderWithMenuItem(
         viewBinding.headerTitle.text = title
         viewBinding.headerMenuItem.setImageResource(itemIcon)
 
-        val listener: OnClickListener? =
-                onClickListener?.let { OnClickListener { onClickListener.invoke() } }
+        val listener = onClickListener?.let { OnClickListener { onClickListener.invoke() } }
         viewBinding.root.setOnClickListener(listener)
 
-        val menuItemListener: OnClickListener? =
-                menuItemOnClickListener?.let { OnClickListener { menuItemOnClickListener.invoke() } }
+        val menuItemListener = menuItemOnClickListener?.let { OnClickListener { menuItemOnClickListener.invoke() } }
         viewBinding.headerMenuItem.setOnClickListener(menuItemListener)
         updateMenuItemVisibility(viewBinding)
     }

From 01396923f112e965ead4a92f1c92f41ceec2ae24 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sun, 29 Nov 2020 16:08:54 +0530
Subject: [PATCH 085/131] Use the base Groupie library in ChannelItem.

---
 .../subscription/dialog/FeedGroupDialog.kt    |  2 +-
 .../dialog/FeedGroupReorderDialog.kt          |  2 +-
 .../local/subscription/item/ChannelItem.kt    | 32 +++++++++++--------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
index 7c7ebdea900..6f821f43267 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@@ -19,9 +19,9 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.xwray.groupie.GroupAdapter
+import com.xwray.groupie.GroupieViewHolder
 import com.xwray.groupie.OnItemClickListener
 import com.xwray.groupie.Section
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import icepick.Icepick
 import icepick.State
 import org.schabi.newpipe.R
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
index 3b74ddc7433..2b09a3b3bbc 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.xwray.groupie.GroupAdapter
+import com.xwray.groupie.GroupieViewHolder
 import com.xwray.groupie.TouchCallback
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import icepick.Icepick
 import icepick.State
 import org.schabi.newpipe.R
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt
index 8089f6480c2..a87ffb6954b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt
@@ -1,13 +1,11 @@
 package org.schabi.newpipe.local.subscription.item
 
 import android.content.Context
+import android.widget.ImageView
+import android.widget.TextView
 import com.nostra13.universalimageloader.core.ImageLoader
-import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
-import com.xwray.groupie.kotlinandroidextensions.Item
-import kotlinx.android.synthetic.main.list_channel_item.itemAdditionalDetails
-import kotlinx.android.synthetic.main.list_channel_item.itemChannelDescriptionView
-import kotlinx.android.synthetic.main.list_channel_item.itemThumbnailView
-import kotlinx.android.synthetic.main.list_channel_item.itemTitleView
+import com.xwray.groupie.GroupieViewHolder
+import com.xwray.groupie.Item
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
 import org.schabi.newpipe.util.ImageDisplayConstants
@@ -19,8 +17,7 @@ class ChannelItem(
     private val subscriptionId: Long = -1L,
     var itemVersion: ItemVersion = ItemVersion.NORMAL,
     var gesturesListener: OnClickGesture<ChannelInfoItem>? = null
-) : Item() {
-
+) : Item<GroupieViewHolder>() {
     override fun getId(): Long = if (subscriptionId == -1L) super.getId() else subscriptionId
 
     enum class ItemVersion { NORMAL, MINI, GRID }
@@ -32,18 +29,25 @@ class ChannelItem(
     }
 
     override fun bind(viewHolder: GroupieViewHolder, position: Int) {
-        viewHolder.itemTitleView.text = infoItem.name
-        viewHolder.itemAdditionalDetails.text = getDetailLine(viewHolder.root.context)
-        if (itemVersion == ItemVersion.NORMAL) viewHolder.itemChannelDescriptionView.text = infoItem.description
+        val itemTitleView = viewHolder.root.findViewById<TextView>(R.id.itemTitleView)
+        val itemAdditionalDetails = viewHolder.root.findViewById<TextView>(R.id.itemAdditionalDetails)
+        val itemChannelDescriptionView = viewHolder.root.findViewById<TextView>(R.id.itemChannelDescriptionView)
+        val itemThumbnailView = viewHolder.root.findViewById<ImageView>(R.id.itemThumbnailView)
+
+        itemTitleView.text = infoItem.name
+        itemAdditionalDetails.text = getDetailLine(viewHolder.root.context)
+        if (itemVersion == ItemVersion.NORMAL) {
+            itemChannelDescriptionView.text = infoItem.description
+        }
 
         ImageLoader.getInstance().displayImage(
-            infoItem.thumbnailUrl, viewHolder.itemThumbnailView,
+            infoItem.thumbnailUrl, itemThumbnailView,
             ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS
         )
 
         gesturesListener?.run {
-            viewHolder.containerView.setOnClickListener { selected(infoItem) }
-            viewHolder.containerView.setOnLongClickListener { held(infoItem); true }
+            viewHolder.root.setOnClickListener { selected(infoItem) }
+            viewHolder.root.setOnLongClickListener { held(infoItem); true }
         }
     }
 

From fe92abde0e3f55711bad82c5d66a3d7f721fa632 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sun, 17 Jan 2021 09:51:11 +0530
Subject: [PATCH 086/131] Use view binding in VideoDetailFragment.

---
 .../fragments/detail/VideoDetailFragment.java | 543 +++++++-----------
 .../item/PickerSubscriptionItem.kt            |   2 +-
 .../event/CustomBottomSheetBehavior.java      |   2 +-
 .../fragment_video_detail.xml                 |   6 +-
 .../main/res/layout/fragment_video_detail.xml |   6 +-
 5 files changed, 226 insertions(+), 333 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 9079c47cae6..0ac49cd7e84 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -26,11 +26,7 @@
 import android.view.WindowManager;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -44,13 +40,11 @@
 import androidx.core.text.HtmlCompat;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
-import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.tabs.TabLayout;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
@@ -58,6 +52,7 @@
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.databinding.FragmentVideoDetailBinding;
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -102,7 +97,6 @@
 import org.schabi.newpipe.util.ShareUtils;
 import org.schabi.newpipe.util.TextLinkifier;
 import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.views.AnimatedProgressBar;
 import org.schabi.newpipe.views.LargeTextMovementMethod;
 
 import java.util.Iterator;
@@ -120,10 +114,10 @@
 import static android.text.TextUtils.isEmpty;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
 import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
 import static org.schabi.newpipe.player.helper.PlayerHelper.isClearingQueueConfirmationRequired;
 import static org.schabi.newpipe.player.playqueue.PlayQueueItem.RECOVERY_UNSET;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
 
 public final class VideoDetailFragment
@@ -194,66 +188,14 @@ public final class VideoDetailFragment
     // Views
     //////////////////////////////////////////////////////////////////////////*/
 
-    private LinearLayout contentRootLayoutHiding;
-
-    private View thumbnailBackgroundButton;
-    private ImageView thumbnailImageView;
-    private ImageView thumbnailPlayButton;
-    private AnimatedProgressBar positionView;
-    private ViewGroup playerPlaceholder;
-
-    private View videoTitleRoot;
-    private TextView videoTitleTextView;
-    private ImageView videoTitleToggleArrow;
-    private TextView videoCountView;
-
-    private TextView detailControlsBackground;
-    private TextView detailControlsPopup;
-    private TextView detailControlsAddToPlaylist;
-    private TextView detailControlsDownload;
-    private TextView appendControlsDetail;
-    private TextView detailDurationView;
-    private TextView detailPositionView;
-
-    private View detailMetaInfoSeparator;
-    private TextView detailMetaInfoTextView;
-
-    private LinearLayout videoDescriptionRootLayout;
-    private TextView videoUploadDateView;
-    private TextView videoDescriptionView;
-
-    private View uploaderRootLayout;
-    private TextView uploaderTextView;
-    private ImageView uploaderThumb;
-    private TextView subChannelTextView;
-    private ImageView subChannelThumb;
-
-    private TextView thumbsUpTextView;
-    private ImageView thumbsUpImageView;
-    private TextView thumbsDownTextView;
-    private ImageView thumbsDownImageView;
-    private TextView thumbsDisabledTextView;
-
-    private RelativeLayout overlay;
-    private LinearLayout overlayMetadata;
-    private ImageView overlayThumbnailImageView;
-    private TextView overlayTitleTextView;
-    private TextView overlayChannelTextView;
-    private LinearLayout overlayButtons;
-    private ImageButton overlayPlayPauseButton;
-    private ImageButton overlayCloseButton;
-
-    private AppBarLayout appBarLayout;
-    private ViewPager viewPager;
+    private FragmentVideoDetailBinding binding;
+
     private TabAdapter pageAdapter;
-    private TabLayout tabLayout;
-    private FrameLayout relatedStreamsLayout;
 
     private ContentObserver settingsContentObserver;
     private MainPlayer playerService;
     private Player player;
 
-
     /*//////////////////////////////////////////////////////////////////////////
     // Service management
     //////////////////////////////////////////////////////////////////////////*/
@@ -373,7 +315,7 @@ public void onPause() {
         PreferenceManager.getDefaultSharedPreferences(requireContext())
                 .edit()
                 .putString(getString(R.string.stream_info_selected_tab_key),
-                        pageAdapter.getItemTitle(viewPager.getCurrentItem()))
+                        pageAdapter.getItemTitle(binding.viewPager.getCurrentItem()))
                 .apply();
     }
 
@@ -416,6 +358,7 @@ public void onStop() {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        binding = null;
 
         // Stop the service when user leaves the app with double back press
         // if video player is selected. Otherwise unbind
@@ -580,9 +523,7 @@ public boolean onLongClick(final View v) {
                 break;
             case R.id.overlay_thumbnail:
             case R.id.overlay_metadata_layout:
-                if (currentInfo != null) {
-                    openChannel(currentInfo.getUploaderUrl(), currentInfo.getUploaderName());
-                }
+                openChannel(currentInfo.getUploaderUrl(), currentInfo.getUploaderName());
                 break;
             case R.id.detail_uploader_root_layout:
                 if (isEmpty(currentInfo.getSubChannelUrl())) {
@@ -594,7 +535,7 @@ public boolean onLongClick(final View v) {
                 break;
             case R.id.detail_title_root_layout:
                 ShareUtils.copyToClipboard(requireContext(),
-                        videoTitleTextView.getText().toString());
+                        binding.detailVideoTitleView.getText().toString());
                 break;
         }
 
@@ -602,18 +543,18 @@ public boolean onLongClick(final View v) {
     }
 
     private void toggleTitleAndDescription() {
-        if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
-            videoTitleTextView.setMaxLines(1);
-            videoDescriptionRootLayout.setVisibility(View.GONE);
-            videoDescriptionView.setFocusable(false);
-            videoTitleToggleArrow.setImageResource(
+        if (binding.detailDescriptionRootLayout.getVisibility() == View.VISIBLE) {
+            binding.detailVideoTitleView.setMaxLines(1);
+            binding.detailDescriptionRootLayout.setVisibility(View.GONE);
+            binding.detailDescriptionView.setFocusable(false);
+            binding.detailToggleDescriptionView.setImageResource(
                     ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
         } else {
-            videoTitleTextView.setMaxLines(10);
-            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
-            videoDescriptionView.setFocusable(true);
-            videoDescriptionView.setMovementMethod(new LargeTextMovementMethod());
-            videoTitleToggleArrow.setImageResource(
+            binding.detailVideoTitleView.setMaxLines(10);
+            binding.detailDescriptionRootLayout.setVisibility(View.VISIBLE);
+            binding.detailDescriptionView.setFocusable(true);
+            binding.detailDescriptionView.setMovementMethod(new LargeTextMovementMethod());
+            binding.detailToggleDescriptionView.setImageResource(
                     ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_less));
         }
     }
@@ -625,107 +566,55 @@ private void toggleTitleAndDescription() {
     @Override
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
-        thumbnailBackgroundButton = rootView.findViewById(R.id.detail_thumbnail_root_layout);
-        thumbnailImageView = rootView.findViewById(R.id.detail_thumbnail_image_view);
-        thumbnailPlayButton = rootView.findViewById(R.id.detail_thumbnail_play_button);
-        playerPlaceholder = rootView.findViewById(R.id.player_placeholder);
-
-        contentRootLayoutHiding = rootView.findViewById(R.id.detail_content_root_hiding);
-
-        videoTitleRoot = rootView.findViewById(R.id.detail_title_root_layout);
-        videoTitleTextView = rootView.findViewById(R.id.detail_video_title_view);
-        videoTitleToggleArrow = rootView.findViewById(R.id.detail_toggle_description_view);
-        videoCountView = rootView.findViewById(R.id.detail_view_count_view);
-        positionView = rootView.findViewById(R.id.position_view);
-
-        detailControlsBackground = rootView.findViewById(R.id.detail_controls_background);
-        detailControlsPopup = rootView.findViewById(R.id.detail_controls_popup);
-        detailControlsAddToPlaylist = rootView.findViewById(R.id.detail_controls_playlist_append);
-        detailControlsDownload = rootView.findViewById(R.id.detail_controls_download);
-        appendControlsDetail = rootView.findViewById(R.id.touch_append_detail);
-        detailDurationView = rootView.findViewById(R.id.detail_duration_view);
-        detailPositionView = rootView.findViewById(R.id.detail_position_view);
-
-        detailMetaInfoSeparator = rootView.findViewById(R.id.detail_meta_info_separator);
-        detailMetaInfoTextView = rootView.findViewById(R.id.detail_meta_info_text_view);
-
-        videoDescriptionRootLayout = rootView.findViewById(R.id.detail_description_root_layout);
-        videoUploadDateView = rootView.findViewById(R.id.detail_upload_date_view);
-        videoDescriptionView = rootView.findViewById(R.id.detail_description_view);
-
-        thumbsUpTextView = rootView.findViewById(R.id.detail_thumbs_up_count_view);
-        thumbsUpImageView = rootView.findViewById(R.id.detail_thumbs_up_img_view);
-        thumbsDownTextView = rootView.findViewById(R.id.detail_thumbs_down_count_view);
-        thumbsDownImageView = rootView.findViewById(R.id.detail_thumbs_down_img_view);
-        thumbsDisabledTextView = rootView.findViewById(R.id.detail_thumbs_disabled_view);
-
-        uploaderRootLayout = rootView.findViewById(R.id.detail_uploader_root_layout);
-        uploaderTextView = rootView.findViewById(R.id.detail_uploader_text_view);
-        uploaderThumb = rootView.findViewById(R.id.detail_uploader_thumbnail_view);
-        subChannelTextView = rootView.findViewById(R.id.detail_sub_channel_text_view);
-        subChannelThumb = rootView.findViewById(R.id.detail_sub_channel_thumbnail_view);
-
-        overlay = rootView.findViewById(R.id.overlay_layout);
-        overlayMetadata = rootView.findViewById(R.id.overlay_metadata_layout);
-        overlayThumbnailImageView = rootView.findViewById(R.id.overlay_thumbnail);
-        overlayTitleTextView = rootView.findViewById(R.id.overlay_title_text_view);
-        overlayChannelTextView = rootView.findViewById(R.id.overlay_channel_text_view);
-        overlayButtons = rootView.findViewById(R.id.overlay_buttons_layout);
-        overlayPlayPauseButton = rootView.findViewById(R.id.overlay_play_pause_button);
-        overlayCloseButton = rootView.findViewById(R.id.overlay_close_button);
-
-        appBarLayout = rootView.findViewById(R.id.appbarlayout);
-        viewPager = rootView.findViewById(R.id.viewpager);
-        pageAdapter = new TabAdapter(getChildFragmentManager());
-        viewPager.setAdapter(pageAdapter);
-        tabLayout = rootView.findViewById(R.id.tablayout);
-        tabLayout.setupWithViewPager(viewPager);
+        binding = FragmentVideoDetailBinding.bind(rootView);
 
-        relatedStreamsLayout = rootView.findViewById(R.id.relatedStreamsLayout);
+        pageAdapter = new TabAdapter(getChildFragmentManager());
+        binding.viewPager.setAdapter(pageAdapter);
+        binding.tabLayout.setupWithViewPager(binding.viewPager);
 
-        thumbnailBackgroundButton.requestFocus();
+        binding.detailThumbnailRootLayout.requestFocus();
 
         if (DeviceUtils.isTv(getContext())) {
             // remove ripple effects from detail controls
-            final int transparent = getResources().getColor(R.color.transparent_background_color);
-            detailControlsAddToPlaylist.setBackgroundColor(transparent);
-            detailControlsBackground.setBackgroundColor(transparent);
-            detailControlsPopup.setBackgroundColor(transparent);
-            detailControlsDownload.setBackgroundColor(transparent);
+            final int transparent = ContextCompat.getColor(requireContext(),
+                    R.color.transparent_background_color);
+            binding.detailControlsPlaylistAppend.setBackgroundColor(transparent);
+            binding.detailControlsBackground.setBackgroundColor(transparent);
+            binding.detailControlsPopup.setBackgroundColor(transparent);
+            binding.detailControlsDownload.setBackgroundColor(transparent);
         }
-
     }
 
     @Override
     protected void initListeners() {
         super.initListeners();
 
-        videoTitleRoot.setOnLongClickListener(this);
-        uploaderRootLayout.setOnClickListener(this);
-        uploaderRootLayout.setOnLongClickListener(this);
-        videoTitleRoot.setOnClickListener(this);
-        thumbnailBackgroundButton.setOnClickListener(this);
-        detailControlsBackground.setOnClickListener(this);
-        detailControlsPopup.setOnClickListener(this);
-        detailControlsAddToPlaylist.setOnClickListener(this);
-        detailControlsDownload.setOnClickListener(this);
-        detailControlsDownload.setOnLongClickListener(this);
-
-        detailControlsBackground.setLongClickable(true);
-        detailControlsPopup.setLongClickable(true);
-        detailControlsBackground.setOnLongClickListener(this);
-        detailControlsPopup.setOnLongClickListener(this);
-
-        overlayThumbnailImageView.setOnClickListener(this);
-        overlayThumbnailImageView.setOnLongClickListener(this);
-        overlayMetadata.setOnClickListener(this);
-        overlayMetadata.setOnLongClickListener(this);
-        overlayButtons.setOnClickListener(this);
-        overlayCloseButton.setOnClickListener(this);
-        overlayPlayPauseButton.setOnClickListener(this);
-
-        detailControlsBackground.setOnTouchListener(getOnControlsTouchListener());
-        detailControlsPopup.setOnTouchListener(getOnControlsTouchListener());
+        binding.detailTitleRootLayout.setOnLongClickListener(this);
+        binding.detailUploaderRootLayout.setOnClickListener(this);
+        binding.detailUploaderRootLayout.setOnLongClickListener(this);
+        binding.detailTitleRootLayout.setOnClickListener(this);
+        binding.detailThumbnailRootLayout.setOnClickListener(this);
+        binding.detailControlsBackground.setOnClickListener(this);
+        binding.detailControlsPopup.setOnClickListener(this);
+        binding.detailControlsPlaylistAppend.setOnClickListener(this);
+        binding.detailControlsDownload.setOnClickListener(this);
+        binding.detailControlsDownload.setOnLongClickListener(this);
+
+        binding.detailControlsBackground.setLongClickable(true);
+        binding.detailControlsPopup.setLongClickable(true);
+        binding.detailControlsBackground.setOnLongClickListener(this);
+        binding.detailControlsPopup.setOnLongClickListener(this);
+
+        binding.overlayThumbnail.setOnClickListener(this);
+        binding.overlayThumbnail.setOnLongClickListener(this);
+        binding.overlayMetadataLayout.setOnClickListener(this);
+        binding.overlayMetadataLayout.setOnLongClickListener(this);
+        binding.overlayButtonsLayout.setOnClickListener(this);
+        binding.overlayCloseButton.setOnClickListener(this);
+        binding.overlayPlayPauseButton.setOnClickListener(this);
+
+        binding.detailControlsBackground.setOnTouchListener(getOnControlsTouchListener());
+        binding.detailControlsPopup.setOnTouchListener(getOnControlsTouchListener());
 
         setupBottomPlayer();
         if (!PlayerHolder.bound) {
@@ -743,9 +632,9 @@ private View.OnTouchListener getOnControlsTouchListener() {
             }
 
             if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                animate(appendControlsDetail, true, 250, AnimationType.ALPHA,
+                animate(binding.touchAppendDetail, true, 250, AnimationType.ALPHA,
                         0, () ->
-                        animate(appendControlsDetail, false, 1500,
+                        animate(binding.touchAppendDetail, false, 1500,
                                 AnimationType.ALPHA, 1000));
             }
             return false;
@@ -753,7 +642,7 @@ private View.OnTouchListener getOnControlsTouchListener() {
     }
 
     private void initThumbnailViews(@NonNull final StreamInfo info) {
-        thumbnailImageView.setImageResource(R.drawable.dummy_thumbnail_dark);
+        binding.detailThumbnailImageView.setImageResource(R.drawable.dummy_thumbnail_dark);
 
         if (!isEmpty(info.getThumbnailUrl())) {
             final String infoServiceName = NewPipe.getNameOfService(info.getServiceId());
@@ -766,17 +655,19 @@ public void onLoadingFailed(final String imageUri, final View view,
                 }
             };
 
-            IMAGE_LOADER.displayImage(info.getThumbnailUrl(), thumbnailImageView,
+            IMAGE_LOADER.displayImage(info.getThumbnailUrl(), binding.detailThumbnailImageView,
                     ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, onFailListener);
         }
 
         if (!isEmpty(info.getSubChannelAvatarUrl())) {
-            IMAGE_LOADER.displayImage(info.getSubChannelAvatarUrl(), subChannelThumb,
+            IMAGE_LOADER.displayImage(info.getSubChannelAvatarUrl(),
+                    binding.detailSubChannelThumbnailView,
                     ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
         }
 
         if (!isEmpty(info.getUploaderAvatarUrl())) {
-            IMAGE_LOADER.displayImage(info.getUploaderAvatarUrl(), uploaderThumb,
+            IMAGE_LOADER.displayImage(info.getUploaderAvatarUrl(),
+                    binding.detailUploaderThumbnailView,
                     ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
         }
     }
@@ -896,7 +787,7 @@ private void prepareAndHandleInfoIfNeededAfterDelay(final StreamInfo info,
                 return;
             }
             // Data can already be drawn, don't spend time twice
-            if (info.getName().equals(videoTitleTextView.getText().toString())) {
+            if (info.getName().equals(binding.detailVideoTitleView.getText().toString())) {
                 return;
             }
             prepareAndHandleInfo(info, scrollToTop);
@@ -984,7 +875,7 @@ private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
 
     private void initTabs() {
         if (pageAdapter.getCount() != 0) {
-            selectedTabTag = pageAdapter.getItemTitle(viewPager.getCurrentItem());
+            selectedTabTag = pageAdapter.getItemTitle(binding.viewPager.getCurrentItem());
         }
         pageAdapter.clearAllItems();
 
@@ -993,7 +884,7 @@ private void initTabs() {
                     CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
         }
 
-        if (showRelatedStreams && null == relatedStreamsLayout) {
+        if (showRelatedStreams && binding.relatedStreamsLayout == null) {
             //temp empty fragment. will be updated in handleResult
             pageAdapter.addFragment(new Fragment(), RELATED_TAB_TAG);
         }
@@ -1005,13 +896,13 @@ private void initTabs() {
         pageAdapter.notifyDataSetUpdate();
 
         if (pageAdapter.getCount() < 2) {
-            tabLayout.setVisibility(View.GONE);
+            binding.tabLayout.setVisibility(View.GONE);
         } else {
             final int position = pageAdapter.getItemPositionByTitle(selectedTabTag);
             if (position != -1) {
-                viewPager.setCurrentItem(position);
+                binding.viewPager.setCurrentItem(position);
             }
-            tabLayout.setVisibility(View.VISIBLE);
+            binding.tabLayout.setVisibility(View.VISIBLE);
         }
     }
 
@@ -1027,7 +918,7 @@ private boolean shouldShowComments() {
     }
 
     public void scrollToTop() {
-        appBarLayout.setExpanded(true, true);
+        binding.appBarLayout.setExpanded(true, true);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -1197,14 +1088,14 @@ private void addVideoPlayerView() {
         }
 
         // Check if viewHolder already contains a child
-        if (player.getRootView().getParent() != playerPlaceholder) {
+        if (player.getRootView().getParent() != binding.playerPlaceholder) {
             playerService.removeViewFromParent();
         }
         setHeightThumbnail();
 
         // Prevent from re-adding a view multiple times
         if (player.getRootView().getParent() == null) {
-            playerPlaceholder.addView(player.getRootView());
+            binding.playerPlaceholder.addView(player.getRootView());
         }
     }
 
@@ -1219,8 +1110,8 @@ private void makeDefaultHeightForVideoPlaceholder() {
             return;
         }
 
-        playerPlaceholder.getLayoutParams().height = FrameLayout.LayoutParams.MATCH_PARENT;
-        playerPlaceholder.requestLayout();
+        binding.playerPlaceholder.getLayoutParams().height = FrameLayout.LayoutParams.MATCH_PARENT;
+        binding.playerPlaceholder.requestLayout();
     }
 
     private void prepareDescription(final Description description) {
@@ -1232,16 +1123,16 @@ private void prepareDescription(final Description description) {
         switch (description.getType()) {
             case Description.HTML:
                 disposables.add(TextLinkifier.createLinksFromHtmlBlock(requireContext(),
-                        description.getContent(), videoDescriptionView,
+                        description.getContent(), binding.detailDescriptionView,
                         HtmlCompat.FROM_HTML_MODE_LEGACY));
                 break;
             case Description.MARKDOWN:
                 disposables.add(TextLinkifier.createLinksFromMarkdownText(requireContext(),
-                        description.getContent(), videoDescriptionView));
+                        description.getContent(), binding.detailDescriptionView));
                 break;
             case Description.PLAIN_TEXT: default:
                 disposables.add(TextLinkifier.createLinksFromPlainText(requireContext(),
-                        description.getContent(), videoDescriptionView));
+                        description.getContent(), binding.detailDescriptionView));
                 break;
         }
     }
@@ -1294,10 +1185,10 @@ private void setHeightThumbnail() {
     }
 
     private void setHeightThumbnail(final int newHeight, final DisplayMetrics metrics) {
-        thumbnailImageView.setLayoutParams(
+        binding.detailThumbnailImageView.setLayoutParams(
                 new FrameLayout.LayoutParams(
                         RelativeLayout.LayoutParams.MATCH_PARENT, newHeight));
-        thumbnailImageView.setMinimumHeight(newHeight);
+        binding.detailThumbnailImageView.setMinimumHeight(newHeight);
         if (player != null) {
             final int maxHeight = (int) (metrics.heightPixels * MAX_PLAYER_HEIGHT);
             player.getSurfaceView()
@@ -1306,7 +1197,7 @@ private void setHeightThumbnail(final int newHeight, final DisplayMetrics metric
     }
 
     private void showContent() {
-        contentRootLayoutHiding.setVisibility(View.VISIBLE);
+        binding.detailContentRootHiding.setVisibility(View.VISIBLE);
     }
 
     protected void setInitialData(final int newServiceId,
@@ -1320,14 +1211,14 @@ protected void setInitialData(final int newServiceId,
     }
 
     private void setErrorImage(final int imageResource) {
-        if (thumbnailImageView == null || activity == null) {
+        if (binding == null || activity == null) {
             return;
         }
 
-        thumbnailImageView.setImageDrawable(
+        binding.detailThumbnailImageView.setImageDrawable(
                 AppCompatResources.getDrawable(requireContext(), imageResource));
-        animate(thumbnailImageView, false, 0, AnimationType.ALPHA, 0,
-                () -> animate(thumbnailImageView, true, 500));
+        animate(binding.detailThumbnailImageView, false, 0, AnimationType.ALPHA,
+                0, () -> animate(binding.detailThumbnailImageView, true, 500));
     }
 
     @Override
@@ -1406,35 +1297,35 @@ public void showLoading() {
 
         //if data is already cached, transition from VISIBLE -> INVISIBLE -> VISIBLE is not required
         if (!ExtractorHelper.isCached(serviceId, url, InfoItem.InfoType.STREAM)) {
-            contentRootLayoutHiding.setVisibility(View.INVISIBLE);
+            binding.detailContentRootHiding.setVisibility(View.INVISIBLE);
         }
 
-        animate(thumbnailPlayButton, false, 50);
-        animate(detailDurationView, false, 100);
-        animate(detailPositionView, false, 100);
-        animate(positionView, false, 50);
+        animate(binding.detailThumbnailPlayButton, false, 50);
+        animate(binding.detailDurationView, false, 100);
+        animate(binding.detailPositionView, false, 100);
+        animate(binding.positionView, false, 50);
 
-        videoTitleTextView.setText(title);
-        videoTitleTextView.setMaxLines(1);
-        animate(videoTitleTextView, true, 0);
+        binding.detailVideoTitleView.setText(title);
+        binding.detailVideoTitleView.setMaxLines(1);
+        animate(binding.detailVideoTitleView, true, 0);
 
-        videoDescriptionRootLayout.setVisibility(View.GONE);
-        videoTitleToggleArrow.setVisibility(View.GONE);
-        videoTitleRoot.setClickable(false);
+        binding.detailDescriptionRootLayout.setVisibility(View.GONE);
+        binding.detailToggleDescriptionView.setVisibility(View.GONE);
+        binding.detailTitleRootLayout.setClickable(false);
 
-        if (relatedStreamsLayout != null) {
+        if (binding.relatedStreamsLayout != null) {
             if (showRelatedStreams) {
-                relatedStreamsLayout.setVisibility(
+                binding.relatedStreamsLayout.setVisibility(
                         player != null && player.isFullscreen() ? View.GONE : View.INVISIBLE);
             } else {
-                relatedStreamsLayout.setVisibility(View.GONE);
+                binding.relatedStreamsLayout.setVisibility(View.GONE);
             }
         }
 
-        IMAGE_LOADER.cancelDisplayTask(thumbnailImageView);
-        IMAGE_LOADER.cancelDisplayTask(subChannelThumb);
-        thumbnailImageView.setImageBitmap(null);
-        subChannelThumb.setImageBitmap(null);
+        IMAGE_LOADER.cancelDisplayTask(binding.detailThumbnailImageView);
+        IMAGE_LOADER.cancelDisplayTask(binding.detailSubChannelThumbnailView);
+        binding.detailThumbnailImageView.setImageBitmap(null);
+        binding.detailSubChannelThumbnailView.setImageBitmap(null);
     }
 
     @Override
@@ -1445,7 +1336,7 @@ public void handleResult(@NonNull final StreamInfo info) {
         setInitialData(info.getServiceId(), info.getOriginalUrl(), info.getName(), playQueue);
 
         if (showRelatedStreams) {
-            if (null == relatedStreamsLayout) { //phone
+            if (binding.relatedStreamsLayout == null) { //phone
                 pageAdapter.updateItem(RELATED_TAB_TAG,
                         RelatedVideosFragment.getInstance(info));
                 pageAdapter.notifyDataSetUpdate();
@@ -1454,98 +1345,100 @@ public void handleResult(@NonNull final StreamInfo info) {
                         .replace(R.id.relatedStreamsLayout,
                                 RelatedVideosFragment.getInstance(info))
                         .commitAllowingStateLoss();
-                relatedStreamsLayout.setVisibility(
+                binding.relatedStreamsLayout.setVisibility(
                         player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
             }
         }
-        animate(thumbnailPlayButton, true, 200);
-        videoTitleTextView.setText(title);
+        animate(binding.detailThumbnailPlayButton, true, 200);
+        binding.detailVideoTitleView.setText(title);
 
         if (!isEmpty(info.getSubChannelName())) {
             displayBothUploaderAndSubChannel(info);
         } else if (!isEmpty(info.getUploaderName())) {
             displayUploaderAsSubChannel(info);
         } else {
-            uploaderTextView.setVisibility(View.GONE);
-            uploaderThumb.setVisibility(View.GONE);
+            binding.detailUploadDateView.setVisibility(View.GONE);
+            binding.detailUploaderThumbnailView.setVisibility(View.GONE);
         }
 
         final Drawable buddyDrawable = AppCompatResources.getDrawable(activity, R.drawable.buddy);
-        subChannelThumb.setImageDrawable(buddyDrawable);
-        uploaderThumb.setImageDrawable(buddyDrawable);
+        binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
+        binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
 
         if (info.getViewCount() >= 0) {
             if (info.getStreamType().equals(StreamType.AUDIO_LIVE_STREAM)) {
-                videoCountView.setText(Localization.listeningCount(activity, info.getViewCount()));
+                binding.detailViewCountView.setText(Localization.listeningCount(activity,
+                        info.getViewCount()));
             } else if (info.getStreamType().equals(StreamType.LIVE_STREAM)) {
-                videoCountView.setText(Localization
+                binding.detailViewCountView.setText(Localization
                         .localizeWatchingCount(activity, info.getViewCount()));
             } else {
-                videoCountView.setText(Localization
+                binding.detailViewCountView.setText(Localization
                         .localizeViewCount(activity, info.getViewCount()));
             }
-            videoCountView.setVisibility(View.VISIBLE);
+            binding.detailViewCountView.setVisibility(View.VISIBLE);
         } else {
-            videoCountView.setVisibility(View.GONE);
+            binding.detailViewCountView.setVisibility(View.GONE);
         }
 
         if (info.getDislikeCount() == -1 && info.getLikeCount() == -1) {
-            thumbsDownImageView.setVisibility(View.VISIBLE);
-            thumbsUpImageView.setVisibility(View.VISIBLE);
-            thumbsUpTextView.setVisibility(View.GONE);
-            thumbsDownTextView.setVisibility(View.GONE);
+            binding.detailThumbsDownImgView.setVisibility(View.VISIBLE);
+            binding.detailThumbsUpImgView.setVisibility(View.VISIBLE);
+            binding.detailThumbsUpCountView.setVisibility(View.GONE);
+            binding.detailThumbsDownCountView.setVisibility(View.GONE);
 
-            thumbsDisabledTextView.setVisibility(View.VISIBLE);
+            binding.detailThumbsDisabledView.setVisibility(View.VISIBLE);
         } else {
             if (info.getDislikeCount() >= 0) {
-                thumbsDownTextView.setText(Localization
+                binding.detailThumbsDownCountView.setText(Localization
                         .shortCount(activity, info.getDislikeCount()));
-                thumbsDownTextView.setVisibility(View.VISIBLE);
-                thumbsDownImageView.setVisibility(View.VISIBLE);
+                binding.detailThumbsDownCountView.setVisibility(View.VISIBLE);
+                binding.detailThumbsDownImgView.setVisibility(View.VISIBLE);
             } else {
-                thumbsDownTextView.setVisibility(View.GONE);
-                thumbsDownImageView.setVisibility(View.GONE);
+                binding.detailThumbsDownCountView.setVisibility(View.GONE);
+                binding.detailThumbsDownImgView.setVisibility(View.GONE);
             }
 
             if (info.getLikeCount() >= 0) {
-                thumbsUpTextView.setText(Localization.shortCount(activity, info.getLikeCount()));
-                thumbsUpTextView.setVisibility(View.VISIBLE);
-                thumbsUpImageView.setVisibility(View.VISIBLE);
+                binding.detailThumbsUpCountView.setText(Localization.shortCount(activity,
+                        info.getLikeCount()));
+                binding.detailThumbsUpCountView.setVisibility(View.VISIBLE);
+                binding.detailThumbsUpImgView.setVisibility(View.VISIBLE);
             } else {
-                thumbsUpTextView.setVisibility(View.GONE);
-                thumbsUpImageView.setVisibility(View.GONE);
+                binding.detailThumbsUpCountView.setVisibility(View.GONE);
+                binding.detailThumbsUpImgView.setVisibility(View.GONE);
             }
-            thumbsDisabledTextView.setVisibility(View.GONE);
+            binding.detailThumbsDisabledView.setVisibility(View.GONE);
         }
 
         if (info.getDuration() > 0) {
-            detailDurationView.setText(Localization.getDurationString(info.getDuration()));
-            detailDurationView.setBackgroundColor(
+            binding.detailDurationView.setText(Localization.getDurationString(info.getDuration()));
+            binding.detailDurationView.setBackgroundColor(
                     ContextCompat.getColor(activity, R.color.duration_background_color));
-            animate(detailDurationView, true, 100);
+            animate(binding.detailDurationView, true, 100);
         } else if (info.getStreamType() == StreamType.LIVE_STREAM) {
-            detailDurationView.setText(R.string.duration_live);
-            detailDurationView.setBackgroundColor(
+            binding.detailDurationView.setText(R.string.duration_live);
+            binding.detailDurationView.setBackgroundColor(
                     ContextCompat.getColor(activity, R.color.live_duration_background_color));
-            animate(detailDurationView, true, 100);
+            animate(binding.detailDurationView, true, 100);
         } else {
-            detailDurationView.setVisibility(View.GONE);
+            binding.detailDurationView.setVisibility(View.GONE);
         }
 
-        videoDescriptionView.setVisibility(View.GONE);
-        videoTitleRoot.setClickable(true);
-        videoTitleToggleArrow.setImageResource(
+        binding.detailDescriptionView.setVisibility(View.GONE);
+        binding.detailTitleRootLayout.setClickable(true);
+        binding.detailToggleDescriptionView.setImageResource(
                 ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
-        videoTitleToggleArrow.setVisibility(View.VISIBLE);
-        videoDescriptionRootLayout.setVisibility(View.GONE);
+        binding.detailToggleDescriptionView.setVisibility(View.VISIBLE);
+        binding.detailDescriptionRootLayout.setVisibility(View.GONE);
 
         if (info.getUploadDate() != null) {
-            videoUploadDateView.setText(Localization
+            binding.detailUploadDateView.setText(Localization
                     .localizeUploadDate(activity, info.getUploadDate().offsetDateTime()));
-            videoUploadDateView.setVisibility(View.VISIBLE);
+            binding.detailUploadDateView.setVisibility(View.VISIBLE);
         } else {
-            videoUploadDateView.setText(null);
-            videoUploadDateView.setVisibility(View.GONE);
+            binding.detailUploadDateView.setText(null);
+            binding.detailUploadDateView.setVisibility(View.GONE);
         }
 
         sortedVideoStreams = ListHelper.getSortedStreamVideosList(
@@ -1558,8 +1451,8 @@ public void handleResult(@NonNull final StreamInfo info) {
         prepareDescription(info.getDescription());
         updateProgressInfo(info);
         initThumbnailViews(info);
-        disposables.add(showMetaInfoInTextView(info.getMetaInfo(), detailMetaInfoTextView,
-                detailMetaInfoSeparator));
+        disposables.add(showMetaInfoInTextView(info.getMetaInfo(), binding.detailMetaInfoTextView,
+                binding.detailMetaInfoSeparator));
 
         if (player == null || player.isStopped()) {
             updateOverlayData(info.getName(), info.getUploaderName(), info.getThumbnailUrl());
@@ -1573,15 +1466,15 @@ public void handleResult(@NonNull final StreamInfo info) {
                     0);
         }
 
-        detailControlsDownload.setVisibility(info.getStreamType() == StreamType.LIVE_STREAM
+        binding.detailControlsDownload.setVisibility(info.getStreamType() == StreamType.LIVE_STREAM
                 || info.getStreamType() == StreamType.AUDIO_LIVE_STREAM ? View.GONE : View.VISIBLE);
-        detailControlsBackground.setVisibility(info.getAudioStreams().isEmpty()
+        binding.detailControlsBackground.setVisibility(info.getAudioStreams().isEmpty()
                 ? View.GONE : View.VISIBLE);
 
         final boolean noVideoStreams =
                 info.getVideoStreams().isEmpty() && info.getVideoOnlyStreams().isEmpty();
-        detailControlsPopup.setVisibility(noVideoStreams ? View.GONE : View.VISIBLE);
-        thumbnailPlayButton.setImageResource(
+        binding.detailControlsPopup.setVisibility(noVideoStreams ? View.GONE : View.VISIBLE);
+        binding.detailThumbnailPlayButton.setImageResource(
                 noVideoStreams ? R.drawable.ic_headset_shadow : R.drawable.ic_play_arrow_shadow);
     }
 
@@ -1589,39 +1482,38 @@ private void hideAgeRestrictedContent() {
         showError(getString(R.string.restricted_video,
                 getString(R.string.show_age_restricted_content_title)), false);
 
-        if (relatedStreamsLayout != null) { // tablet
-            relatedStreamsLayout.setVisibility(View.INVISIBLE);
+        if (binding.relatedStreamsLayout != null) { // tablet
+            binding.relatedStreamsLayout.setVisibility(View.INVISIBLE);
         }
 
-        viewPager.setVisibility(View.GONE);
-        tabLayout.setVisibility(View.GONE);
+        binding.viewPager.setVisibility(View.GONE);
+        binding.tabLayout.setVisibility(View.GONE);
     }
 
     private void displayUploaderAsSubChannel(final StreamInfo info) {
-        subChannelTextView.setText(info.getUploaderName());
-        subChannelTextView.setVisibility(View.VISIBLE);
-        subChannelTextView.setSelected(true);
-        uploaderTextView.setVisibility(View.GONE);
+        binding.detailSubChannelTextView.setText(info.getUploaderName());
+        binding.detailSubChannelTextView.setVisibility(View.VISIBLE);
+        binding.detailSubChannelTextView.setSelected(true);
+        binding.detailUploadDateView.setVisibility(View.GONE);
     }
 
     private void displayBothUploaderAndSubChannel(final StreamInfo info) {
-        subChannelTextView.setText(info.getSubChannelName());
-        subChannelTextView.setVisibility(View.VISIBLE);
-        subChannelTextView.setSelected(true);
+        binding.detailSubChannelTextView.setText(info.getSubChannelName());
+        binding.detailSubChannelTextView.setVisibility(View.VISIBLE);
+        binding.detailSubChannelTextView.setSelected(true);
 
-        subChannelThumb.setVisibility(View.VISIBLE);
+        binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
 
         if (!isEmpty(info.getUploaderName())) {
-            uploaderTextView.setText(
+            binding.detailUploadDateView.setText(
                     String.format(getString(R.string.video_detail_by), info.getUploaderName()));
-            uploaderTextView.setVisibility(View.VISIBLE);
-            uploaderTextView.setSelected(true);
+            binding.detailUploadDateView.setVisibility(View.VISIBLE);
+            binding.detailUploadDateView.setSelected(true);
         } else {
-            uploaderTextView.setVisibility(View.GONE);
+            binding.detailUploadDateView.setVisibility(View.GONE);
         }
     }
 
-
     public void openDownloadDialog() {
         try {
             final DownloadDialog downloadDialog = DownloadDialog.newInstance(currentInfo);
@@ -1683,8 +1575,8 @@ private void updateProgressInfo(@NonNull final StreamInfo info) {
             if (playQueue == null || playQueue.getStreams().isEmpty()
                     || playQueue.getItem().getRecoveryPosition() == RECOVERY_UNSET
                     || !showPlaybackPosition) {
-                positionView.setVisibility(View.INVISIBLE);
-                detailPositionView.setVisibility(View.GONE);
+                binding.positionView.setVisibility(View.INVISIBLE);
+                binding.detailPositionView.setVisibility(View.GONE);
                 // TODO: Remove this check when separation of concerns is done.
                 //  (live streams weren't getting updated because they are mixed)
                 if (!info.getStreamType().equals(StreamType.LIVE_STREAM)
@@ -1695,8 +1587,8 @@ private void updateProgressInfo(@NonNull final StreamInfo info) {
                 // Show saved position from backStack if user allows it
                 showPlaybackProgress(playQueue.getItem().getRecoveryPosition(),
                         playQueue.getItem().getDuration() * 1000);
-                animate(positionView, true, 500);
-                animate(detailPositionView, true, 500);
+                animate(binding.positionView, true, 500);
+                animate(binding.detailPositionView, true, 500);
             }
             return;
         }
@@ -1710,15 +1602,15 @@ private void updateProgressInfo(@NonNull final StreamInfo info) {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(state -> {
                     showPlaybackProgress(state.getProgressTime(), info.getDuration() * 1000);
-                    animate(positionView, true, 500);
-                    animate(detailPositionView, true, 500);
+                    animate(binding.positionView, true, 500);
+                    animate(binding.detailPositionView, true, 500);
                 }, e -> {
                     if (DEBUG) {
                         e.printStackTrace();
                     }
                 }, () -> {
-                    positionView.setVisibility(View.GONE);
-                    detailPositionView.setVisibility(View.GONE);
+                    binding.positionView.setVisibility(View.GONE);
+                    binding.detailPositionView.setVisibility(View.GONE);
                 });
     }
 
@@ -1727,20 +1619,21 @@ private void showPlaybackProgress(final long progress, final long duration) {
         final int durationSeconds = (int) TimeUnit.MILLISECONDS.toSeconds(duration);
         // If the old and the new progress values have a big difference then use
         // animation. Otherwise don't because it affects CPU
-        final boolean shouldAnimate = Math.abs(positionView.getProgress() - progressSeconds) > 2;
-        positionView.setMax(durationSeconds);
+        final boolean shouldAnimate = Math.abs(binding.positionView.getProgress()
+                - progressSeconds) > 2;
+        binding.positionView.setMax(durationSeconds);
         if (shouldAnimate) {
-            positionView.setProgressAnimated(progressSeconds);
+            binding.positionView.setProgressAnimated(progressSeconds);
         } else {
-            positionView.setProgress(progressSeconds);
+            binding.positionView.setProgress(progressSeconds);
         }
         final String position = Localization.getDurationString(progressSeconds);
-        if (position != detailPositionView.getText()) {
-            detailPositionView.setText(position);
+        if (position != binding.detailPositionView.getText()) {
+            binding.detailPositionView.setText(position);
         }
-        if (positionView.getVisibility() != View.VISIBLE) {
-            animate(positionView, true, 100);
-            animate(detailPositionView, true, 100);
+        if (binding.positionView.getVisibility() != View.VISIBLE) {
+            animate(binding.positionView, true, 100);
+            animate(binding.detailPositionView, true, 100);
         }
     }
 
@@ -1790,12 +1683,12 @@ public void onPlaybackUpdate(final int state,
 
         switch (state) {
             case Player.STATE_PLAYING:
-                if (positionView.getAlpha() != 1.0f
+                if (binding.positionView.getAlpha() != 1.0f
                         && player.getPlayQueue() != null
                         && player.getPlayQueue().getItem() != null
                         && player.getPlayQueue().getItem().getUrl().equals(url)) {
-                    animate(positionView, true, 100);
-                    animate(detailPositionView, true, 100);
+                    animate(binding.positionView, true, 100);
+                    animate(binding.detailPositionView, true, 100);
                 }
                 break;
         }
@@ -1887,8 +1780,8 @@ public void onFullscreenStateChanged(final boolean fullscreen) {
             showSystemUi();
         }
 
-        if (relatedStreamsLayout != null) {
-            relatedStreamsLayout.setVisibility(fullscreen ? View.GONE : View.VISIBLE);
+        if (binding.relatedStreamsLayout != null) {
+            binding.relatedStreamsLayout.setVisibility(fullscreen ? View.GONE : View.VISIBLE);
         }
         scrollToTop();
 
@@ -1926,14 +1819,14 @@ public void onScreenRotationButtonClicked() {
     @Override
     public void onMoreOptionsLongClicked() {
         final CoordinatorLayout.LayoutParams params =
-                (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
+                (CoordinatorLayout.LayoutParams) binding.appBarLayout.getLayoutParams();
         final AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) params.getBehavior();
         final ValueAnimator valueAnimator = ValueAnimator
-                .ofInt(0, -playerPlaceholder.getHeight());
+                .ofInt(0, -binding.playerPlaceholder.getHeight());
         valueAnimator.setInterpolator(new DecelerateInterpolator());
         valueAnimator.addUpdateListener(animation -> {
             behavior.setTopAndBottomOffset((int) animation.getAnimatedValue());
-            appBarLayout.requestLayout();
+            binding.appBarLayout.requestLayout();
         });
         valueAnimator.setInterpolator(new DecelerateInterpolator());
         valueAnimator.setDuration(500);
@@ -2185,7 +2078,7 @@ private void moveFocusToMainFragment(final boolean toMain) {
             mainFragment.setDescendantFocusability(blockDescendants);
             toolbar.setDescendantFocusability(blockDescendants);
             ((ViewGroup) requireView()).setDescendantFocusability(afterDescendants);
-            thumbnailBackgroundButton.requestFocus();
+            binding.detailThumbnailRootLayout.requestFocus();
         }
     }
 
@@ -2215,7 +2108,7 @@ private void manageSpaceAtTheBottom(final boolean showMore) {
 
     private void setupBottomPlayer() {
         final CoordinatorLayout.LayoutParams params =
-                (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
+                (CoordinatorLayout.LayoutParams) binding.appBarLayout.getLayoutParams();
         final AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) params.getBehavior();
 
         final FrameLayout bottomSheetLayout = activity.findViewById(R.id.fragment_player_holder);
@@ -2226,9 +2119,9 @@ private void setupBottomPlayer() {
             manageSpaceAtTheBottom(false);
             bottomSheetBehavior.setPeekHeight(peekHeight);
             if (bottomSheetState == BottomSheetBehavior.STATE_COLLAPSED) {
-                overlay.setAlpha(MAX_OVERLAY_ALPHA);
+                binding.overlayLayout.setAlpha(MAX_OVERLAY_ALPHA);
             } else if (bottomSheetState == BottomSheetBehavior.STATE_EXPANDED) {
-                overlay.setAlpha(0);
+                binding.overlayLayout.setAlpha(0);
                 setOverlayElementsClickable(false);
             }
         }
@@ -2264,7 +2157,7 @@ public void onStateChanged(@NonNull final View bottomSheet, final int newState)
                                 && player.videoPlayerSelected()) {
                             player.toggleFullscreen();
                         }
-                        setOverlayLook(appBarLayout, behavior, 1);
+                        setOverlayLook(binding.appBarLayout, behavior, 1);
                         break;
                     case BottomSheetBehavior.STATE_COLLAPSED:
                         moveFocusToMainFragment(true);
@@ -2277,7 +2170,7 @@ public void onStateChanged(@NonNull final View bottomSheet, final int newState)
                         if (player != null) {
                             player.closeItemsList();
                         }
-                        setOverlayLook(appBarLayout, behavior, 0);
+                        setOverlayLook(binding.appBarLayout, behavior, 0);
                         break;
                     case BottomSheetBehavior.STATE_DRAGGING:
                     case BottomSheetBehavior.STATE_SETTLING:
@@ -2293,7 +2186,7 @@ public void onStateChanged(@NonNull final View bottomSheet, final int newState)
 
             @Override
             public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
-                setOverlayLook(appBarLayout, behavior, slideOffset);
+                setOverlayLook(binding.appBarLayout, behavior, slideOffset);
             }
         });
 
@@ -2308,11 +2201,11 @@ public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
     private void updateOverlayData(@Nullable final String overlayTitle,
                                    @Nullable final String uploader,
                                    @Nullable final String thumbnailUrl) {
-        overlayTitleTextView.setText(isEmpty(title) ? "" : title);
-        overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
-        overlayThumbnailImageView.setImageResource(R.drawable.dummy_thumbnail_dark);
+        binding.overlayTitleTextView.setText(isEmpty(title) ? "" : title);
+        binding.overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
+        binding.overlayThumbnail.setImageResource(R.drawable.dummy_thumbnail_dark);
         if (!isEmpty(thumbnailUrl)) {
-            IMAGE_LOADER.displayImage(thumbnailUrl, overlayThumbnailImageView,
+            IMAGE_LOADER.displayImage(thumbnailUrl, binding.overlayThumbnail,
                     ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, null);
         }
     }
@@ -2321,7 +2214,7 @@ private void setOverlayPlayPauseImage(final boolean playerIsPlaying) {
         final int attr = playerIsPlaying
                 ? R.attr.ic_pause
                 : R.attr.ic_play_arrow;
-        overlayPlayPauseButton.setImageResource(
+        binding.overlayPlayPauseButton.setImageResource(
                 ThemeHelper.resolveResourceIdFromAttr(activity, attr));
     }
 
@@ -2333,20 +2226,20 @@ private void setOverlayLook(final AppBarLayout appBar,
         if (behavior == null || slideOffset < 0) {
             return;
         }
-        overlay.setAlpha(Math.min(MAX_OVERLAY_ALPHA, 1 - slideOffset));
+        binding.overlayLayout.setAlpha(Math.min(MAX_OVERLAY_ALPHA, 1 - slideOffset));
         // These numbers are not special. They just do a cool transition
         behavior.setTopAndBottomOffset(
-                (int) (-thumbnailImageView.getHeight() * 2 * (1 - slideOffset) / 3));
+                (int) (-binding.detailThumbnailImageView.getHeight() * 2 * (1 - slideOffset) / 3));
         appBar.requestLayout();
     }
 
     private void setOverlayElementsClickable(final boolean enable) {
-        overlayThumbnailImageView.setClickable(enable);
-        overlayThumbnailImageView.setLongClickable(enable);
-        overlayMetadata.setClickable(enable);
-        overlayMetadata.setLongClickable(enable);
-        overlayButtons.setClickable(enable);
-        overlayPlayPauseButton.setClickable(enable);
-        overlayCloseButton.setClickable(enable);
+        binding.overlayThumbnail.setClickable(enable);
+        binding.overlayThumbnail.setLongClickable(enable);
+        binding.overlayMetadataLayout.setClickable(enable);
+        binding.overlayMetadataLayout.setLongClickable(enable);
+        binding.overlayButtonsLayout.setClickable(enable);
+        binding.overlayPlayPauseButton.setClickable(enable);
+        binding.overlayCloseButton.setClickable(enable);
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
index 3540e6938c4..d4d4e7db196 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
@@ -46,6 +46,6 @@ data class PickerSubscriptionItem(
     fun updateSelected(containerView: View, isSelected: Boolean) {
         this.isSelected = isSelected
         PickerSubscriptionItemBinding.bind(containerView).selectedHighlight
-                .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
+            .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
index 00ce3e616d5..830d1c55c6d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
@@ -27,7 +27,7 @@ public CustomBottomSheetBehavior(final Context context, final AttributeSet attrs
     private boolean skippingInterception = false;
     private final List<Integer> skipInterceptionOfElements = Arrays.asList(
             R.id.detail_content_root_layout, R.id.relatedStreamsLayout,
-            R.id.itemsListPanel, R.id.viewpager, R.id.bottomControls,
+            R.id.itemsListPanel, R.id.view_pager, R.id.bottomControls,
             R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
 
     @Override
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index d90c782ef24..73af54d63e2 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -23,7 +23,7 @@
             android:isScrollContainer="true">
 
             <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/appbarlayout"
+                android:id="@+id/app_bar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
@@ -583,13 +583,13 @@
             </com.google.android.material.appbar.AppBarLayout>
 
             <androidx.viewpager.widget.ViewPager
-                android:id="@+id/viewpager"
+                android:id="@+id/view_pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
                 <com.google.android.material.tabs.TabLayout
-                    android:id="@+id/tablayout"
+                    android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_gravity="bottom|center"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 758a88f1993..305167ba1f8 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbarlayout"
+            android:id="@+id/app_bar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -564,13 +564,13 @@
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.viewpager.widget.ViewPager
-            android:id="@+id/viewpager"
+            android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tablayout"
+                android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
                 android:layout_gravity="bottom|center"

From d1c807487a277119def8f15a51333960cc9be92f Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Sun, 17 Jan 2021 07:50:05 +0300
Subject: [PATCH 087/131] Update README.so.md

---
 README.so.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.so.md b/README.so.md
index 21b20a9e4f1..dc9ec154778 100644
--- a/README.so.md
+++ b/README.so.md
@@ -12,13 +12,13 @@
 <a href="https://www.bountysource.com/teams/newpipe" alt="Kuwa Bountysource "><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
-<p align="center"><a href="#screenshots">Sawir-shaashadeed</a> &bull; <a href="#description">Faahfaahin</a> &bull; <a href="#features">Waxqabadka</a> &bull; <a href="#updates">Cusboonaysiin</a> &bull; <a href="#contribution">Kusoo Kordhin</a> &bull; <a href="#donate">Ugu Deeq</a> &bull; <a href="#license">Laysinka</a></p>
+<p align="center"><a href="#screenshots">Sawir-shaashadeed</a> &bull; <a href="#description">Faahfaahin</a> &bull; <a href="#features">Waxqabadka</a> &bull; <a href="#updates">Kushubida iyo cusboonaysiinta</a> &bull; <a href="#contribution">Kusoo Kordhin</a> &bull; <a href="#donate">Ugu Deeq</a> &bull; <a href="#license">Laysinka</a></p>
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
 *Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
 
-<b>DIGNIIN: MIDKAN [NOOCA APP-KA EE HADDA] WALI TIJAABO AYUU KU JIRAA (BETA), SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
+<b>DIGNIIN: MIDKAN, NOOCA APP-KA EE HADDA WALI TIJAABO AYUU KU JIRAA, SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
 
 <b>NEWPIPE AMA KUWA KU SALAYSAN PLAYSTORE-KA IN LA GALIYO WAXAY KA HOR IMANAYSAA SHARCIGA IYO SHURUUDAHA AY LEEYIHIIN.</b>
 
@@ -80,7 +80,7 @@ NewPipe wuxuu taageeraa adeegyo badan. [warqadan](https://teamnewpipe.github.io/
 * media.ccc.de \[tijaabo\]
 * PeerTube instances \[tijaabo\]
 
-## Cusboonaysiin
+## Kushubida iyo cusboonaysiinta
 Marka koodhka NewPipe isbadal ku dhaco (wax cusub oo lagusoo kordhiyay ama cilad bixin), ugu dambayn waxaa lasii daayaa mid cusub (Siidayn). Siidaynta qaabkeedu waa x.xx.x . Si aad midka cusub u hesho, waxaad samayn kartaa:
  1. Inaad mid cusub (APK) adigu dhisato. Tani waa mida ugu dagdag badan eed waxyaabaha cusub ku heli karto, laakiin way adagtahay, sidaa darteed waxaan soojeedinaynaa inaad isticmaasho qababka kale.
  2. Ku dar qayb gaar ah xaganaga F-Droid oo xagaas kaga shub isla markay siidayn soobaxdo. Hagitaanka xagan ka eeg: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
@@ -101,7 +101,7 @@ Hadaad hayso fikrado; rogid, qaab badal, nadiifin koodh, ama koodhka ood si wayn
 Hadaad jeceshahay inaad qayb ka noqoto, fiiri [ogaysiisyada kusoo kordhinta](.github/CONTRIBUTING.md).
 
 <a href="https://hosted.weblate.org/engage/newpipe/">
-<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="Heerka turjimaada" />
 </a>
 
 ## Ugu Deeq

From 78a9811fe386c05bff52357d3a6dbc2c54cd1767 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 16 Oct 2020 20:01:03 +0200
Subject: [PATCH 088/131] Add a secondary control panel to video detail
 fragment

It is shown when the user expands the description
It contains share, open in browser and play in kodi
---
 .../fragments/detail/VideoDetailFragment.java |  53 +++++++--
 .../fragment_video_detail.xml                 | 102 ++++++++++++++----
 .../main/res/layout/fragment_video_detail.xml | 100 +++++++++++++----
 app/src/main/res/values/dimens.xml            |   5 +
 4 files changed, 210 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 0ac49cd7e84..7add95a6ccc 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -11,6 +11,7 @@
 import android.database.ContentObserver;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -90,6 +91,7 @@
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -193,6 +195,7 @@ public final class VideoDetailFragment
     private TabAdapter pageAdapter;
 
     private ContentObserver settingsContentObserver;
+    @Nullable
     private MainPlayer playerService;
     private Player player;
 
@@ -452,6 +455,30 @@ public void onClick(final View v) {
                     this.openDownloadDialog();
                 }
                 break;
+            case R.id.detail_controls_share:
+                if (currentInfo != null) {
+                    ShareUtils.shareText(requireContext(),
+                            currentInfo.getName(), currentInfo.getUrl());
+                }
+                break;
+            case R.id.detail_controls_open_in_browser:
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInBrowser(requireContext(), currentInfo.getUrl());
+                }
+                break;
+            case R.id.detail_controls_play_with_kodi:
+                if (currentInfo != null) {
+                    try {
+                        NavigationHelper.playWithKore(
+                                requireContext(), Uri.parse(currentInfo.getUrl()));
+                    } catch (final Exception e) {
+                        if (DEBUG) {
+                            Log.i(TAG, "Failed to start kore", e);
+                        }
+                        KoreUtil.showInstallKoreDialog(requireContext());
+                    }
+                }
+                break;
             case R.id.detail_uploader_root_layout:
                 if (isEmpty(currentInfo.getSubChannelUrl())) {
                     if (!isEmpty(currentInfo.getUploaderUrl())) {
@@ -549,6 +576,7 @@ private void toggleTitleAndDescription() {
             binding.detailDescriptionView.setFocusable(false);
             binding.detailToggleDescriptionView.setImageResource(
                     ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
+            binding.detailSecondaryControlPanel.setVisibility(View.GONE);
         } else {
             binding.detailVideoTitleView.setMaxLines(10);
             binding.detailDescriptionRootLayout.setVisibility(View.VISIBLE);
@@ -556,6 +584,7 @@ private void toggleTitleAndDescription() {
             binding.detailDescriptionView.setMovementMethod(new LargeTextMovementMethod());
             binding.detailToggleDescriptionView.setImageResource(
                     ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_less));
+            binding.detailSecondaryControlPanel.setVisibility(View.VISIBLE);
         }
     }
 
@@ -582,6 +611,9 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
             binding.detailControlsBackground.setBackgroundColor(transparent);
             binding.detailControlsPopup.setBackgroundColor(transparent);
             binding.detailControlsDownload.setBackgroundColor(transparent);
+            binding.detailControlsShare.setBackgroundColor(transparent);
+            binding.detailControlsOpenInBrowser.setBackgroundColor(transparent);
+            binding.detailControlsPlayWithKodi.setBackgroundColor(transparent);
         }
     }
 
@@ -589,21 +621,22 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
     protected void initListeners() {
         super.initListeners();
 
+        binding.detailTitleRootLayout.setOnClickListener(this);
         binding.detailTitleRootLayout.setOnLongClickListener(this);
         binding.detailUploaderRootLayout.setOnClickListener(this);
         binding.detailUploaderRootLayout.setOnLongClickListener(this);
-        binding.detailTitleRootLayout.setOnClickListener(this);
         binding.detailThumbnailRootLayout.setOnClickListener(this);
         binding.detailControlsBackground.setOnClickListener(this);
+        binding.detailControlsBackground.setOnLongClickListener(this);
         binding.detailControlsPopup.setOnClickListener(this);
+        binding.detailControlsPopup.setOnLongClickListener(this);
         binding.detailControlsPlaylistAppend.setOnClickListener(this);
         binding.detailControlsDownload.setOnClickListener(this);
         binding.detailControlsDownload.setOnLongClickListener(this);
-
-        binding.detailControlsBackground.setLongClickable(true);
-        binding.detailControlsPopup.setLongClickable(true);
-        binding.detailControlsBackground.setOnLongClickListener(this);
-        binding.detailControlsPopup.setOnLongClickListener(this);
+        binding.detailControlsShare.setOnClickListener(this);
+        binding.detailControlsOpenInBrowser.setOnClickListener(this);
+        binding.detailControlsPlayWithKodi.setOnClickListener(this);
+        showHideKodiButton();
 
         binding.overlayThumbnail.setOnClickListener(this);
         binding.overlayThumbnail.setOnLongClickListener(this);
@@ -672,6 +705,12 @@ public void onLoadingFailed(final String imageUri, final View view,
         }
     }
 
+    private void showHideKodiButton() {
+        // show kodi button if it supports the current service and it is enabled in settings
+        binding.detailControlsPlayWithKodi.setVisibility(KoreUtil.shouldShowPlayWithKodi(
+                requireContext(), serviceId) ? View.VISIBLE : View.GONE);
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // OwnStack
     //////////////////////////////////////////////////////////////////////////*/
@@ -1312,6 +1351,7 @@ public void showLoading() {
         binding.detailDescriptionRootLayout.setVisibility(View.GONE);
         binding.detailToggleDescriptionView.setVisibility(View.GONE);
         binding.detailTitleRootLayout.setClickable(false);
+        binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
         if (binding.relatedStreamsLayout != null) {
             if (showRelatedStreams) {
@@ -1431,6 +1471,7 @@ public void handleResult(@NonNull final StreamInfo info) {
                 ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
         binding.detailToggleDescriptionView.setVisibility(View.VISIBLE);
         binding.detailDescriptionRootLayout.setVisibility(View.GONE);
+        binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
         if (info.getUploadDate() != null) {
             binding.detailUploadDateView.setText(Localization
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 73af54d63e2..5a23ba34673 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -426,6 +426,7 @@
                             </RelativeLayout>
                         </RelativeLayout>
 
+                        <!-- CONTROLS -->
                         <LinearLayout
                             android:id="@+id/detail_control_panel"
                             android:layout_width="match_parent"
@@ -433,13 +434,12 @@
                             android:descendantFocusability="afterDescendants"
                             android:focusable="true"
                             android:orientation="horizontal"
-                            android:padding="6dp">
+                            android:padding="@dimen/detail_control_padding">
 
-                            <!-- CONTROLS -->
                             <TextView
                                 android:id="@+id/detail_controls_playlist_append"
-                                android:layout_width="80dp"
-                                android:layout_height="55dp"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
                                 android:layout_gravity="center_vertical"
                                 android:layout_weight="1"
                                 android:background="?attr/selectableItemBackgroundBorderless"
@@ -447,16 +447,15 @@
                                 android:contentDescription="@string/append_playlist"
                                 android:focusable="true"
                                 android:gravity="center"
-                                android:paddingTop="6dp"
-                                android:paddingBottom="6dp"
+                                android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/controls_add_to_playlist_title"
-                                android:textSize="12sp"
+                                android:textSize="@dimen/detail_control_text_size"
                                 app:drawableTopCompat="?attr/ic_playlist_add" />
 
                             <TextView
                                 android:id="@+id/detail_controls_background"
-                                android:layout_width="80dp"
-                                android:layout_height="55dp"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
                                 android:layout_gravity="center_vertical"
                                 android:layout_weight="1"
                                 android:background="?attr/selectableItemBackgroundBorderless"
@@ -464,16 +463,15 @@
                                 android:contentDescription="@string/play_audio"
                                 android:focusable="true"
                                 android:gravity="center"
-                                android:paddingTop="6dp"
-                                android:paddingBottom="6dp"
+                                android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/controls_background_title"
-                                android:textSize="12sp"
+                                android:textSize="@dimen/detail_control_text_size"
                                 app:drawableTopCompat="?attr/ic_headset" />
 
                             <TextView
                                 android:id="@+id/detail_controls_popup"
-                                android:layout_width="80dp"
-                                android:layout_height="55dp"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
                                 android:layout_gravity="center_vertical"
                                 android:layout_weight="1"
                                 android:background="?attr/selectableItemBackgroundBorderless"
@@ -481,16 +479,15 @@
                                 android:contentDescription="@string/open_in_popup_mode"
                                 android:focusable="true"
                                 android:gravity="center"
-                                android:paddingTop="6dp"
-                                android:paddingBottom="6dp"
+                                android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/controls_popup_title"
-                                android:textSize="12sp"
+                                android:textSize="@dimen/detail_control_text_size"
                                 app:drawableTopCompat="?attr/ic_popup" />
 
                             <TextView
                                 android:id="@+id/detail_controls_download"
-                                android:layout_width="80dp"
-                                android:layout_height="55dp"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
                                 android:layout_gravity="center_vertical"
                                 android:layout_weight="1"
                                 android:background="?attr/selectableItemBackgroundBorderless"
@@ -498,14 +495,75 @@
                                 android:contentDescription="@string/controls_download_desc"
                                 android:focusable="true"
                                 android:gravity="center"
-                                android:paddingTop="6dp"
-                                android:paddingBottom="6dp"
+                                android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/download"
-                                android:textSize="12sp"
+                                android:textSize="@dimen/detail_control_text_size"
                                 app:drawableTopCompat="?attr/ic_file_download" />
 
                         </LinearLayout>
 
+                        <!-- SECONDARY CONTROLS -->
+                        <LinearLayout
+                            android:id="@+id/detail_secondary_control_panel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:descendantFocusability="afterDescendants"
+                            android:focusable="true"
+                            android:orientation="horizontal"
+                            android:padding="@dimen/detail_control_padding"
+                            android:visibility="gone"
+                            tools:visibility="visible">
+
+                            <TextView
+                                android:id="@+id/detail_controls_share"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
+                                android:layout_gravity="center_vertical"
+                                android:layout_weight="1"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:clickable="true"
+                                android:contentDescription="@string/share"
+                                android:focusable="true"
+                                android:gravity="center"
+                                android:paddingVertical="@dimen/detail_control_padding"
+                                android:text="@string/share"
+                                android:textSize="@dimen/detail_control_text_size"
+                                app:drawableTopCompat="?attr/ic_share" />
+
+                            <TextView
+                                android:id="@+id/detail_controls_open_in_browser"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
+                                android:layout_gravity="center_vertical"
+                                android:layout_weight="1"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:clickable="true"
+                                android:contentDescription="@string/open_in_browser"
+                                android:focusable="true"
+                                android:gravity="center"
+                                android:paddingVertical="@dimen/detail_control_padding"
+                                android:text="@string/open_in_browser"
+                                android:textSize="@dimen/detail_control_text_size"
+                                app:drawableTopCompat="?attr/ic_language" />
+
+                            <TextView
+                                android:id="@+id/detail_controls_play_with_kodi"
+                                android:layout_width="@dimen/detail_control_width"
+                                android:layout_height="@dimen/detail_control_height"
+                                android:layout_gravity="center_vertical"
+                                android:layout_weight="1"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:clickable="true"
+                                android:contentDescription="@string/play_with_kodi_title"
+                                android:focusable="true"
+                                android:gravity="center"
+                                android:paddingVertical="@dimen/detail_control_padding"
+                                android:text="@string/play_with_kodi_title"
+                                android:textSize="@dimen/detail_control_text_size"
+                                app:drawableTopCompat="?attr/ic_cast" />
+
+                        </LinearLayout>
+
                         <View
                             android:id="@+id/detail_meta_info_separator"
                             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 305167ba1f8..612ec389acf 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -413,18 +413,18 @@
                         </RelativeLayout>
                     </RelativeLayout>
 
+                    <!-- CONTROLS -->
                     <LinearLayout
                         android:id="@+id/detail_control_panel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:padding="6dp">
+                        android:padding="@dimen/detail_control_padding">
 
-                        <!-- CONTROLS -->
                         <TextView
                             android:id="@+id/detail_controls_playlist_append"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
                             android:layout_gravity="center_vertical"
                             android:layout_weight="1"
                             android:background="?attr/selectableItemBackgroundBorderless"
@@ -432,16 +432,15 @@
                             android:contentDescription="@string/append_playlist"
                             android:focusable="true"
                             android:gravity="center"
-                            android:paddingTop="6dp"
-                            android:paddingBottom="6dp"
+                            android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/controls_add_to_playlist_title"
-                            android:textSize="12sp"
+                            android:textSize="@dimen/detail_control_text_size"
                             app:drawableTopCompat="?attr/ic_playlist_add" />
 
                         <TextView
                             android:id="@+id/detail_controls_background"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
                             android:layout_gravity="center_vertical"
                             android:layout_weight="1"
                             android:background="?attr/selectableItemBackgroundBorderless"
@@ -449,16 +448,15 @@
                             android:contentDescription="@string/play_audio"
                             android:focusable="true"
                             android:gravity="center"
-                            android:paddingTop="6dp"
-                            android:paddingBottom="6dp"
+                            android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/controls_background_title"
-                            android:textSize="12sp"
+                            android:textSize="@dimen/detail_control_text_size"
                             app:drawableTopCompat="?attr/ic_headset" />
 
                         <TextView
                             android:id="@+id/detail_controls_popup"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
                             android:layout_gravity="center_vertical"
                             android:layout_weight="1"
                             android:background="?attr/selectableItemBackgroundBorderless"
@@ -466,16 +464,15 @@
                             android:contentDescription="@string/open_in_popup_mode"
                             android:focusable="true"
                             android:gravity="center"
-                            android:paddingTop="6dp"
-                            android:paddingBottom="6dp"
+                            android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/controls_popup_title"
-                            android:textSize="12sp"
+                            android:textSize="@dimen/detail_control_text_size"
                             app:drawableTopCompat="?attr/ic_popup" />
 
                         <TextView
                             android:id="@+id/detail_controls_download"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
                             android:layout_gravity="center_vertical"
                             android:layout_weight="1"
                             android:background="?attr/selectableItemBackgroundBorderless"
@@ -483,14 +480,73 @@
                             android:contentDescription="@string/controls_download_desc"
                             android:focusable="true"
                             android:gravity="center"
-                            android:paddingTop="6dp"
-                            android:paddingBottom="6dp"
+                            android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/download"
-                            android:textSize="12sp"
+                            android:textSize="@dimen/detail_control_text_size"
                             app:drawableTopCompat="?attr/ic_file_download" />
 
                     </LinearLayout>
 
+                    <!-- SECONDARY CONTROLS -->
+                    <LinearLayout
+                        android:id="@+id/detail_secondary_control_panel"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:padding="@dimen/detail_control_padding"
+                        android:visibility="gone"
+                        tools:visibility="visible">
+
+                        <TextView
+                            android:id="@+id/detail_controls_share"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/share"
+                            android:focusable="true"
+                            android:gravity="center"
+                            android:paddingVertical="@dimen/detail_control_padding"
+                            android:text="@string/share"
+                            android:textSize="@dimen/detail_control_text_size"
+                            app:drawableTopCompat="?attr/ic_share" />
+
+                        <TextView
+                            android:id="@+id/detail_controls_open_in_browser"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/open_in_browser"
+                            android:focusable="true"
+                            android:gravity="center"
+                            android:paddingVertical="@dimen/detail_control_padding"
+                            android:text="@string/open_in_browser"
+                            android:textSize="@dimen/detail_control_text_size"
+                            app:drawableTopCompat="?attr/ic_language" />
+
+                        <TextView
+                            android:id="@+id/detail_controls_play_with_kodi"
+                            android:layout_width="@dimen/detail_control_width"
+                            android:layout_height="@dimen/detail_control_height"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/play_with_kodi_title"
+                            android:focusable="true"
+                            android:gravity="center"
+                            android:paddingVertical="@dimen/detail_control_padding"
+                            android:text="@string/play_with_kodi_title"
+                            android:textSize="@dimen/detail_control_text_size"
+                            app:drawableTopCompat="?attr/ic_cast" />
+
+                    </LinearLayout>
+
                     <View
                         android:id="@+id/detail_meta_info_separator"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ed386507445..ea26be57e15 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -84,6 +84,11 @@
     <!-- Paddings & Margins -->
     <dimen name="video_item_detail_like_margin">5dp</dimen>
     <dimen name="video_item_detail_error_panel_margin">50dp</dimen>
+    <!-- Control panel -->
+    <dimen name="detail_control_text_size">12sp</dimen>
+    <dimen name="detail_control_width">80dp</dimen>
+    <dimen name="detail_control_height">55dp</dimen>
+    <dimen name="detail_control_padding">6dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>

From a314f55a1718f0ada954412e2882b44a41026af8 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 1 Nov 2020 13:55:20 +0100
Subject: [PATCH 089/131] Move description to a tab alongside related streams
 and comments

---
 .../java/org/schabi/newpipe/BaseFragment.java |  6 +-
 .../newpipe/fragments/BaseStateFragment.java  |  3 +-
 .../fragments/detail/DescriptionFragment.java | 93 +++++++++++++++++++
 .../fragments/detail/VideoDetailFragment.java | 83 ++++-------------
 .../fragments/list/BaseListFragment.java      |  4 +-
 .../list/channel/ChannelFragment.java         |  4 +-
 .../list/comments/CommentsFragment.java       | 10 +-
 .../fragments/list/search/SearchFragment.java |  6 +-
 .../list/videos/RelatedVideosFragment.java    |  4 +-
 .../fragment_video_detail.xml                 | 50 +---------
 .../main/res/layout/fragment_description.xml  | 48 ++++++++++
 .../main/res/layout/fragment_video_detail.xml | 46 +--------
 12 files changed, 179 insertions(+), 178 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
 create mode 100644 app/src/main/res/layout/fragment_description.xml

diff --git a/app/src/main/java/org/schabi/newpipe/BaseFragment.java b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
index 54513a0afd1..0d241277837 100644
--- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -35,7 +35,7 @@ public void useAsFrontPage(final boolean value) {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAttach(final Context context) {
+    public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
         activity = (AppCompatActivity) context;
     }
@@ -61,7 +61,7 @@ public void onCreate(final Bundle savedInstanceState) {
 
 
     @Override
-    public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         if (DEBUG) {
             Log.d(TAG, "onViewCreated() called with: "
@@ -73,7 +73,7 @@ public void onViewCreated(final View rootView, final Bundle savedInstanceState)
     }
 
     @Override
-    public void onSaveInstanceState(final Bundle outState) {
+    public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
         Icepick.saveInstanceState(this, outState);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
index 88f9b78b88d..f876b767c3c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -10,6 +10,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
@@ -56,7 +57,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
     private TextView errorTextView;
 
     @Override
-    public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         doInitialLoadLogic();
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
new file mode 100644
index 00000000000..b4424928fa3
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
@@ -0,0 +1,93 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.text.HtmlCompat;
+
+import org.schabi.newpipe.BaseFragment;
+import org.schabi.newpipe.databinding.FragmentDescriptionBinding;
+import org.schabi.newpipe.extractor.stream.Description;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.TextLinkifier;
+
+import icepick.State;
+import io.reactivex.rxjava3.disposables.Disposable;
+
+import static android.text.TextUtils.isEmpty;
+
+public class DescriptionFragment extends BaseFragment {
+
+    @State
+    StreamInfo streamInfo = null;
+    @Nullable
+    Disposable descriptionDisposable = null;
+
+    public DescriptionFragment() {
+    }
+
+    public DescriptionFragment(final StreamInfo streamInfo) {
+        this.streamInfo = streamInfo;
+    }
+
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        final FragmentDescriptionBinding binding =
+                FragmentDescriptionBinding.inflate(inflater, container, false);
+        if (streamInfo != null) {
+            setupUploadDate(binding.detailUploadDateView);
+            setupDescription(binding.detailDescriptionView);
+        }
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (descriptionDisposable != null) {
+            descriptionDisposable.dispose();
+        }
+    }
+
+    private void setupUploadDate(final TextView uploadDateTextView) {
+        if (streamInfo.getUploadDate() != null) {
+            uploadDateTextView.setText(Localization
+                    .localizeUploadDate(activity, streamInfo.getUploadDate().offsetDateTime()));
+        } else {
+            uploadDateTextView.setVisibility(View.GONE);
+        }
+    }
+
+    private void setupDescription(final TextView descriptionTextView) {
+        final Description description = streamInfo.getDescription();
+        if (description == null || isEmpty(description.getContent())
+                || description == Description.emptyDescription) {
+            descriptionTextView.setText("");
+            return;
+        }
+
+        switch (description.getType()) {
+            case Description.HTML:
+                descriptionDisposable = TextLinkifier.createLinksFromHtmlBlock(requireContext(),
+                        description.getContent(), descriptionTextView,
+                        HtmlCompat.FROM_HTML_MODE_LEGACY);
+                break;
+            case Description.MARKDOWN:
+                descriptionDisposable = TextLinkifier.createLinksFromMarkdownText(requireContext(),
+                        description.getContent(), descriptionTextView);
+                break;
+            case Description.PLAIN_TEXT: default:
+                descriptionDisposable = TextLinkifier.createLinksFromPlainText(requireContext(),
+                        description.getContent(), descriptionTextView);
+                break;
+        }
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 7add95a6ccc..8148fb40cb4 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -38,7 +38,6 @@
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
 
@@ -61,14 +60,12 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
 import org.schabi.newpipe.extractor.stream.AudioStream;
-import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
-import org.schabi.newpipe.fragments.EmptyFragment;
 import org.schabi.newpipe.fragments.list.comments.CommentsFragment;
 import org.schabi.newpipe.fragments.list.videos.RelatedVideosFragment;
 import org.schabi.newpipe.ktx.AnimationType;
@@ -97,9 +94,7 @@
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ShareUtils;
-import org.schabi.newpipe.util.TextLinkifier;
 import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.views.LargeTextMovementMethod;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -150,7 +145,7 @@ public final class VideoDetailFragment
 
     private static final String COMMENTS_TAB_TAG = "COMMENTS";
     private static final String RELATED_TAB_TAG = "NEXT VIDEO";
-    private static final String EMPTY_TAB_TAG = "EMPTY TAB";
+    private static final String DESCRIPTION_TAB_TAG = "DESCRIPTION TAB";
 
     private boolean showRelatedStreams;
     private boolean showComments;
@@ -570,21 +565,16 @@ public boolean onLongClick(final View v) {
     }
 
     private void toggleTitleAndDescription() {
-        if (binding.detailDescriptionRootLayout.getVisibility() == View.VISIBLE) {
-            binding.detailVideoTitleView.setMaxLines(1);
-            binding.detailDescriptionRootLayout.setVisibility(View.GONE);
-            binding.detailDescriptionView.setFocusable(false);
-            binding.detailToggleDescriptionView.setImageResource(
-                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
-            binding.detailSecondaryControlPanel.setVisibility(View.GONE);
-        } else {
+        if (binding.detailSecondaryControlPanel.getVisibility() == View.GONE) {
             binding.detailVideoTitleView.setMaxLines(10);
-            binding.detailDescriptionRootLayout.setVisibility(View.VISIBLE);
-            binding.detailDescriptionView.setFocusable(true);
-            binding.detailDescriptionView.setMovementMethod(new LargeTextMovementMethod());
             binding.detailToggleDescriptionView.setImageResource(
                     ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_less));
             binding.detailSecondaryControlPanel.setVisibility(View.VISIBLE);
+        } else {
+            binding.detailVideoTitleView.setMaxLines(1);
+            binding.detailToggleDescriptionView.setImageResource(
+                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
+            binding.detailSecondaryControlPanel.setVisibility(View.GONE);
         }
     }
 
@@ -928,10 +918,8 @@ private void initTabs() {
             pageAdapter.addFragment(new Fragment(), RELATED_TAB_TAG);
         }
 
-        if (pageAdapter.getCount() == 0) {
-            pageAdapter.addFragment(new EmptyFragment(), EMPTY_TAB_TAG);
-        }
-
+        //temp empty fragment. will be updated in handleResult
+        pageAdapter.addFragment(new Fragment(), DESCRIPTION_TAB_TAG);
         pageAdapter.notifyDataSetUpdate();
 
         if (pageAdapter.getCount() < 2) {
@@ -1153,29 +1141,6 @@ private void makeDefaultHeightForVideoPlaceholder() {
         binding.playerPlaceholder.requestLayout();
     }
 
-    private void prepareDescription(final Description description) {
-        if (description == null || isEmpty(description.getContent())
-                || description == Description.emptyDescription) {
-            return;
-        }
-
-        switch (description.getType()) {
-            case Description.HTML:
-                disposables.add(TextLinkifier.createLinksFromHtmlBlock(requireContext(),
-                        description.getContent(), binding.detailDescriptionView,
-                        HtmlCompat.FROM_HTML_MODE_LEGACY));
-                break;
-            case Description.MARKDOWN:
-                disposables.add(TextLinkifier.createLinksFromMarkdownText(requireContext(),
-                        description.getContent(), binding.detailDescriptionView));
-                break;
-            case Description.PLAIN_TEXT: default:
-                disposables.add(TextLinkifier.createLinksFromPlainText(requireContext(),
-                        description.getContent(), binding.detailDescriptionView));
-                break;
-        }
-    }
-
     private final ViewTreeObserver.OnPreDrawListener preDrawListener =
             new ViewTreeObserver.OnPreDrawListener() {
                 @Override
@@ -1348,7 +1313,6 @@ public void showLoading() {
         binding.detailVideoTitleView.setMaxLines(1);
         animate(binding.detailVideoTitleView, true, 0);
 
-        binding.detailDescriptionRootLayout.setVisibility(View.GONE);
         binding.detailToggleDescriptionView.setVisibility(View.GONE);
         binding.detailTitleRootLayout.setClickable(false);
         binding.detailSecondaryControlPanel.setVisibility(View.GONE);
@@ -1379,7 +1343,6 @@ public void handleResult(@NonNull final StreamInfo info) {
             if (binding.relatedStreamsLayout == null) { //phone
                 pageAdapter.updateItem(RELATED_TAB_TAG,
                         RelatedVideosFragment.getInstance(info));
-                pageAdapter.notifyDataSetUpdate();
             } else { //tablet
                 getChildFragmentManager().beginTransaction()
                         .replace(R.id.relatedStreamsLayout,
@@ -1389,6 +1352,10 @@ public void handleResult(@NonNull final StreamInfo info) {
                         player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
             }
         }
+        pageAdapter.updateItem(DESCRIPTION_TAB_TAG,
+                new DescriptionFragment(info));
+        pageAdapter.notifyDataSetUpdate();
+
         animate(binding.detailThumbnailPlayButton, true, 200);
         binding.detailVideoTitleView.setText(title);
 
@@ -1397,7 +1364,7 @@ public void handleResult(@NonNull final StreamInfo info) {
         } else if (!isEmpty(info.getUploaderName())) {
             displayUploaderAsSubChannel(info);
         } else {
-            binding.detailUploadDateView.setVisibility(View.GONE);
+            binding.detailUploaderTextView.setVisibility(View.GONE);
             binding.detailUploaderThumbnailView.setVisibility(View.GONE);
         }
 
@@ -1465,23 +1432,12 @@ public void handleResult(@NonNull final StreamInfo info) {
             binding.detailDurationView.setVisibility(View.GONE);
         }
 
-        binding.detailDescriptionView.setVisibility(View.GONE);
         binding.detailTitleRootLayout.setClickable(true);
         binding.detailToggleDescriptionView.setImageResource(
                 ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
         binding.detailToggleDescriptionView.setVisibility(View.VISIBLE);
-        binding.detailDescriptionRootLayout.setVisibility(View.GONE);
         binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
-        if (info.getUploadDate() != null) {
-            binding.detailUploadDateView.setText(Localization
-                    .localizeUploadDate(activity, info.getUploadDate().offsetDateTime()));
-            binding.detailUploadDateView.setVisibility(View.VISIBLE);
-        } else {
-            binding.detailUploadDateView.setText(null);
-            binding.detailUploadDateView.setVisibility(View.GONE);
-        }
-
         sortedVideoStreams = ListHelper.getSortedStreamVideosList(
                 activity,
                 info.getVideoStreams(),
@@ -1489,7 +1445,6 @@ public void handleResult(@NonNull final StreamInfo info) {
                 false);
         selectedVideoStreamIndex = ListHelper
                 .getDefaultResolutionIndex(activity, sortedVideoStreams);
-        prepareDescription(info.getDescription());
         updateProgressInfo(info);
         initThumbnailViews(info);
         disposables.add(showMetaInfoInTextView(info.getMetaInfo(), binding.detailMetaInfoTextView,
@@ -1535,7 +1490,7 @@ private void displayUploaderAsSubChannel(final StreamInfo info) {
         binding.detailSubChannelTextView.setText(info.getUploaderName());
         binding.detailSubChannelTextView.setVisibility(View.VISIBLE);
         binding.detailSubChannelTextView.setSelected(true);
-        binding.detailUploadDateView.setVisibility(View.GONE);
+        binding.detailUploaderTextView.setVisibility(View.GONE);
     }
 
     private void displayBothUploaderAndSubChannel(final StreamInfo info) {
@@ -1546,12 +1501,12 @@ private void displayBothUploaderAndSubChannel(final StreamInfo info) {
         binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
 
         if (!isEmpty(info.getUploaderName())) {
-            binding.detailUploadDateView.setText(
+            binding.detailUploaderTextView.setText(
                     String.format(getString(R.string.video_detail_by), info.getUploaderName()));
-            binding.detailUploadDateView.setVisibility(View.VISIBLE);
-            binding.detailUploadDateView.setSelected(true);
+            binding.detailUploaderTextView.setVisibility(View.VISIBLE);
+            binding.detailUploaderTextView.setSelected(true);
         } else {
-            binding.detailUploadDateView.setVisibility(View.GONE);
+            binding.detailUploaderTextView.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index b251d4b9396..d42b0a08883 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -70,7 +70,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAttach(final Context context) {
+    public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
 
         if (infoListAdapter == null) {
@@ -186,7 +186,7 @@ private void restoreFocus(final Integer position) {
     }
 
     @Override
-    public void onSaveInstanceState(final Bundle bundle) {
+    public void onSaveInstanceState(@NonNull final Bundle bundle) {
         super.onSaveInstanceState(bundle);
         if (useDefaultStateSaving) {
             savedState = StateSaver
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index b4dd45e9334..e8a5d380b74 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -106,7 +106,7 @@ public void setUserVisibleHint(final boolean isVisibleToUser) {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAttach(final Context context) {
+    public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
         subscriptionManager = new SubscriptionManager(activity);
     }
@@ -119,7 +119,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     }
 
     @Override
-    public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         channelBinding = FragmentChannelBinding.bind(rootView);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
index c0abc469beb..3682fe13bd1 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.fragments.list.comments;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -37,11 +36,6 @@ public static CommentsFragment getInstance(final int serviceId, final  String ur
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onAttach(final Context context) {
-        super.onAttach(context);
-    }
-
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater,
                              @Nullable final ViewGroup container,
@@ -52,9 +46,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (disposables != null) {
-            disposables.clear();
-        }
+        disposables.clear();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
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 b15bb97f2d5..5273fd396df 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
@@ -196,7 +196,7 @@ private void setSearchOnResume() {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAttach(final Context context) {
+    public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
 
         suggestionListAdapter = new SuggestionListAdapter(activity);
@@ -226,7 +226,7 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou
     }
 
     @Override
-    public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         showSearchOnStart();
         initSearchListeners();
@@ -390,7 +390,7 @@ public void readFrom(@NonNull final Queue<Object> savedObjects) throws Exception
     }
 
     @Override
-    public void onSaveInstanceState(final Bundle bundle) {
+    public void onSaveInstanceState(@NonNull final Bundle bundle) {
         searchString = searchEditText != null
                 ? searchEditText.getText().toString()
                 : searchString;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
index f185c912203..7afe6971699 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
@@ -52,7 +52,7 @@ public static RelatedVideosFragment getInstance(final StreamInfo info) {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAttach(final Context context) {
+    public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
     }
 
@@ -182,7 +182,7 @@ private void setInitialData(final StreamInfo info) {
     }
 
     @Override
-    public void onSaveInstanceState(final Bundle outState) {
+    public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putSerializable(INFO_KEY, relatedStreamInfo);
     }
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 5a23ba34673..d61e8fbe571 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -510,7 +510,8 @@
                             android:descendantFocusability="afterDescendants"
                             android:focusable="true"
                             android:orientation="horizontal"
-                            android:padding="@dimen/detail_control_padding"
+                            android:paddingHorizontal="@dimen/detail_control_padding"
+                            android:paddingBottom="@dimen/detail_control_padding"
                             android:visibility="gone"
                             tools:visibility="visible">
 
@@ -588,53 +589,6 @@
                             android:layout_marginRight="8dp"
                             android:background="?attr/separator_color" />
 
-                        <!--DESCRIPTIONS-->
-                        <LinearLayout
-                            android:id="@+id/detail_description_root_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:descendantFocusability="afterDescendants"
-                            android:focusable="true"
-                            android:orientation="vertical"
-                            android:visibility="gone"
-                            tools:visibility="visible">
-
-                            <TextView
-                                android:id="@+id/detail_upload_date_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="12dp"
-                                android:layout_marginRight="12dp"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                                android:textStyle="bold"
-                                tools:text="Published on Oct 2, 2009" />
-
-                            <TextView
-                                android:id="@+id/detail_description_view"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="12dp"
-                                android:layout_marginTop="3dp"
-                                android:layout_marginRight="12dp"
-                                android:layout_marginBottom="8dp"
-                                android:focusable="false"
-                                android:nextFocusUp="@+id/detail_control_panel"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textIsSelectable="true"
-                                android:textSize="@dimen/video_item_detail_description_text_size"
-                                tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
-
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1px"
-                                android:layout_marginLeft="8dp"
-                                android:layout_marginRight="8dp"
-                                android:background="?attr/separator_color" />
-
-                        </LinearLayout>
-
                     </LinearLayout>
                 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_description.xml b/app/src/main/res/layout/fragment_description.xml
new file mode 100644
index 00000000000..e3845e89230
--- /dev/null
+++ b/app/src/main/res/layout/fragment_description.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:scrollbars="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/detail_upload_date_view"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="@dimen/video_item_detail_upload_date_text_size"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Published on Oct 2, 2009" />
+
+        <TextView
+            android:id="@+id/detail_description_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textIsSelectable="true"
+            android:textSize="@dimen/video_item_detail_description_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/detail_upload_date_view"
+            app:layout_constraintVertical_bias="0.0"
+            tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 612ec389acf..7beb41ee3cd 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -493,7 +493,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:padding="@dimen/detail_control_padding"
+                        android:paddingHorizontal="@dimen/detail_control_padding"
+                        android:paddingBottom="@dimen/detail_control_padding"
                         android:visibility="gone"
                         tools:visibility="visible">
 
@@ -571,49 +572,6 @@
                         android:layout_marginRight="8dp"
                         android:background="?attr/separator_color" />
 
-                    <!--DESCRIPTIONS-->
-                    <LinearLayout
-                        android:id="@+id/detail_description_root_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:orientation="vertical"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <TextView
-                            android:id="@+id/detail_upload_date_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                            android:textStyle="bold"
-                            tools:text="Published on Oct 2, 2009" />
-
-                        <TextView
-                            android:id="@+id/detail_description_view"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginTop="3dp"
-                            android:layout_marginRight="12dp"
-                            android:layout_marginBottom="8dp"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textIsSelectable="true"
-                            android:textSize="@dimen/video_item_detail_description_text_size"
-                            tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:background="?attr/separator_color" />
-
-                    </LinearLayout>
-
                 </LinearLayout>
             </RelativeLayout>
 

From 4c3ba0fe3d2887a545238d958a5c425e74e219a4 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 8 Dec 2020 21:47:02 +0100
Subject: [PATCH 090/131] Add icons to VideoDetailFragment tab layout for
 better accessibility

---
 .../fragments/detail/VideoDetailFragment.java | 68 +++++++++++++------
 .../event/CustomBottomSheetBehavior.java      |  2 +-
 app/src/main/res/drawable/dot_default.xml     | 12 ----
 app/src/main/res/drawable/dot_selected.xml    | 12 ----
 .../res/drawable/ic_art_track_white_24dp.xml  |  5 ++
 .../res/drawable/ic_comment_white_24dp.xml    |  5 ++
 .../drawable/ic_description_white_24dp.xml    |  5 ++
 app/src/main/res/drawable/tab_selector.xml    |  7 --
 .../fragment_video_detail.xml                 |  7 +-
 .../main/res/layout/fragment_video_detail.xml |  7 +-
 10 files changed, 71 insertions(+), 59 deletions(-)
 delete mode 100644 app/src/main/res/drawable/dot_default.xml
 delete mode 100644 app/src/main/res/drawable/dot_selected.xml
 create mode 100644 app/src/main/res/drawable/ic_art_track_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_comment_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_description_white_24dp.xml
 delete mode 100644 app/src/main/res/drawable/tab_selector.xml

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 8148fb40cb4..e9eb2231465 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -29,6 +29,7 @@
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -45,6 +46,7 @@
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.tabs.TabLayout;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
@@ -96,6 +98,7 @@
 import org.schabi.newpipe.util.ShareUtils;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -147,9 +150,11 @@ public final class VideoDetailFragment
     private static final String RELATED_TAB_TAG = "NEXT VIDEO";
     private static final String DESCRIPTION_TAB_TAG = "DESCRIPTION TAB";
 
+    // tabs
     private boolean showRelatedStreams;
     private boolean showComments;
     private String selectedTabTag;
+    @AttrRes @NonNull final List<Integer> tabIcons = new ArrayList<>();
 
     private int updateFlags = 0;
 
@@ -493,7 +498,7 @@ public void onClick(final View v) {
                 openVideoPlayer();
                 break;
             case R.id.detail_title_root_layout:
-                toggleTitleAndDescription();
+                toggleTitleAndSecondaryControls();
                 break;
             case R.id.overlay_thumbnail:
             case R.id.overlay_metadata_layout:
@@ -564,7 +569,7 @@ public boolean onLongClick(final View v) {
         return true;
     }
 
-    private void toggleTitleAndDescription() {
+    private void toggleTitleAndSecondaryControls() {
         if (binding.detailSecondaryControlPanel.getVisibility() == View.GONE) {
             binding.detailVideoTitleView.setMaxLines(10);
             binding.detailToggleDescriptionView.setImageResource(
@@ -907,19 +912,23 @@ private void initTabs() {
             selectedTabTag = pageAdapter.getItemTitle(binding.viewPager.getCurrentItem());
         }
         pageAdapter.clearAllItems();
+        tabIcons.clear();
 
         if (shouldShowComments()) {
             pageAdapter.addFragment(
                     CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
+            tabIcons.add(R.drawable.ic_comment_white_24dp);
         }
 
         if (showRelatedStreams && binding.relatedStreamsLayout == null) {
             //temp empty fragment. will be updated in handleResult
             pageAdapter.addFragment(new Fragment(), RELATED_TAB_TAG);
+            tabIcons.add(R.drawable.ic_art_track_white_24dp);
         }
 
-        //temp empty fragment. will be updated in handleResult
+        // temp empty fragment. will be updated in handleResult
         pageAdapter.addFragment(new Fragment(), DESCRIPTION_TAB_TAG);
+        tabIcons.add(R.drawable.ic_description_white_24dp);
         pageAdapter.notifyDataSetUpdate();
 
         if (pageAdapter.getCount() < 2) {
@@ -930,9 +939,45 @@ private void initTabs() {
                 binding.viewPager.setCurrentItem(position);
             }
             binding.tabLayout.setVisibility(View.VISIBLE);
+            updateTabIcons();
         }
     }
 
+    /**
+     * To be called whenever {@link #pageAdapter} is modified, since that triggers a refresh in
+     * {@link FragmentVideoDetailBinding#tabLayout} resetting all tab's icons. This reads icons from
+     * {@link #tabIcons}, which are set in {@link #initTabs()}
+     */
+    private void updateTabIcons() {
+        for (int i = 0; i < tabIcons.size(); ++i) {
+            final TabLayout.Tab tab = binding.tabLayout.getTabAt(i);
+            if (tab != null) {
+                tab.setIcon(tabIcons.get(i));
+            }
+        }
+    }
+
+    private void updateTabs(@NonNull final StreamInfo info) {
+        if (showRelatedStreams) {
+            if (binding.relatedStreamsLayout == null) { // phone
+                pageAdapter.updateItem(RELATED_TAB_TAG,
+                        RelatedVideosFragment.getInstance(info));
+            } else { // tablet
+                getChildFragmentManager().beginTransaction()
+                        .replace(R.id.relatedStreamsLayout,
+                                RelatedVideosFragment.getInstance(info))
+                        .commitAllowingStateLoss();
+                binding.relatedStreamsLayout.setVisibility(
+                        player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
+            }
+        }
+
+        pageAdapter.updateItem(DESCRIPTION_TAB_TAG,
+                new DescriptionFragment(info));
+        pageAdapter.notifyDataSetUpdate();
+        updateTabIcons();
+    }
+
     private boolean shouldShowComments() {
         try {
             return showComments && NewPipe.getService(serviceId)
@@ -1339,22 +1384,7 @@ public void handleResult(@NonNull final StreamInfo info) {
         currentInfo = info;
         setInitialData(info.getServiceId(), info.getOriginalUrl(), info.getName(), playQueue);
 
-        if (showRelatedStreams) {
-            if (binding.relatedStreamsLayout == null) { //phone
-                pageAdapter.updateItem(RELATED_TAB_TAG,
-                        RelatedVideosFragment.getInstance(info));
-            } else { //tablet
-                getChildFragmentManager().beginTransaction()
-                        .replace(R.id.relatedStreamsLayout,
-                                RelatedVideosFragment.getInstance(info))
-                        .commitAllowingStateLoss();
-                binding.relatedStreamsLayout.setVisibility(
-                        player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
-            }
-        }
-        pageAdapter.updateItem(DESCRIPTION_TAB_TAG,
-                new DescriptionFragment(info));
-        pageAdapter.notifyDataSetUpdate();
+        updateTabs(info);
 
         animate(binding.detailThumbnailPlayButton, true, 200);
         binding.detailVideoTitleView.setText(title);
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
index 830d1c55c6d..61023875cda 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
@@ -27,7 +27,7 @@ public CustomBottomSheetBehavior(final Context context, final AttributeSet attrs
     private boolean skippingInterception = false;
     private final List<Integer> skipInterceptionOfElements = Arrays.asList(
             R.id.detail_content_root_layout, R.id.relatedStreamsLayout,
-            R.id.itemsListPanel, R.id.view_pager, R.id.bottomControls,
+            R.id.itemsListPanel, R.id.view_pager, R.id.tab_layout, R.id.bottomControls,
             R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
 
     @Override
diff --git a/app/src/main/res/drawable/dot_default.xml b/app/src/main/res/drawable/dot_default.xml
deleted file mode 100644
index fac1a2e8145..00000000000
--- a/app/src/main/res/drawable/dot_default.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape
-            android:innerRadius="0dp"
-            android:shape="ring"
-            android:thickness="4dp"
-            android:useLevel="false">
-            <solid android:color="@android:color/darker_gray" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/dot_selected.xml b/app/src/main/res/drawable/dot_selected.xml
deleted file mode 100644
index 77992e4a63e..00000000000
--- a/app/src/main/res/drawable/dot_selected.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape
-            android:innerRadius="0dp"
-            android:shape="ring"
-            android:thickness="6dp"
-            android:useLevel="false">
-            <solid android:color="@android:color/darker_gray" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/ic_art_track_white_24dp.xml b/app/src/main/res/drawable/ic_art_track_white_24dp.xml
new file mode 100644
index 00000000000..abfdc203a83
--- /dev/null
+++ b/app/src/main/res/drawable/ic_art_track_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22,13h-8v-2h8v2zM22,7h-8v2h8L22,7zM14,17h8v-2h-8v2zM12,9v6c0,1.1 -0.9,2 -2,2L4,17c-1.1,0 -2,-0.9 -2,-2L2,9c0,-1.1 0.9,-2 2,-2h6c1.1,0 2,0.9 2,2zM10.5,15l-2.25,-3 -1.75,2.26 -1.25,-1.51L3.5,15h7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_comment_white_24dp.xml b/app/src/main/res/drawable/ic_comment_white_24dp.xml
new file mode 100644
index 00000000000..7361b7fa6cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_comment_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_description_white_24dp.xml b/app/src/main/res/drawable/ic_description_white_24dp.xml
new file mode 100644
index 00000000000..e7ef3d4b573
--- /dev/null
+++ b/app/src/main/res/drawable/ic_description_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/tab_selector.xml b/app/src/main/res/drawable/tab_selector.xml
deleted file mode 100644
index 35581f25d42..00000000000
--- a/app/src/main/res/drawable/tab_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/dot_selected" android:state_selected="true" />
-
-    <item android:drawable="@drawable/dot_default" />
-</selector>
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index d61e8fbe571..4d5fe2fce21 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -603,11 +603,10 @@
                 <com.google.android.material.tabs.TabLayout
                     android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="30dp"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="bottom|center"
-                    app:tabBackground="@drawable/tab_selector"
-                    app:tabGravity="center"
-                    app:tabIndicatorHeight="0dp" />
+                    app:tabIconTint="?attr/colorAccent"
+                    app:tabGravity="fill" />
 
             </androidx.viewpager.widget.ViewPager>
 
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 7beb41ee3cd..0432ed416ae 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -586,11 +586,10 @@
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="bottom|center"
-                app:tabBackground="@drawable/tab_selector"
-                app:tabGravity="center"
-                app:tabIndicatorHeight="0dp" />
+                app:tabIconTint="?attr/colorAccent"
+                app:tabGravity="fill" />
 
         </androidx.viewpager.widget.ViewPager>
 

From d043a4f410c2397a25e6bd26cccd7ddbc067fd47 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 29 Dec 2020 16:02:10 +0100
Subject: [PATCH 091/131] Always show tab layout at the bottom of the screen

---
 .../fragment_video_detail.xml                 | 22 +++++++++----------
 .../main/res/layout/fragment_video_detail.xml | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 4d5fe2fce21..63e67f1bd02 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -591,24 +591,24 @@
 
                     </LinearLayout>
                 </RelativeLayout>
-
             </com.google.android.material.appbar.AppBarLayout>
 
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/view_pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                <com.google.android.material.tabs.TabLayout
-                    android:id="@+id/tab_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center"
-                    app:tabIconTint="?attr/colorAccent"
-                    app:tabGravity="fill" />
+                app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                android:paddingBottom="48dp"/>
 
-            </androidx.viewpager.widget.ViewPager>
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center"
+                app:tabIconTint="?attr/colorAccent"
+                app:tabBackground="?attr/windowBackground"
+                app:tabGravity="fill"
+                app:elevation="16dp"/>
 
         </org.schabi.newpipe.views.FocusAwareCoordinator>
 
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 0432ed416ae..0a18874d7da 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -574,24 +574,24 @@
 
                 </LinearLayout>
             </RelativeLayout>
-
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tab_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|center"
-                app:tabIconTint="?attr/colorAccent"
-                app:tabGravity="fill" />
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            android:paddingBottom="48dp"/>
 
-        </androidx.viewpager.widget.ViewPager>
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center"
+            app:tabIconTint="?attr/colorAccent"
+            app:tabBackground="?attr/windowBackground"
+            app:tabGravity="fill"
+            app:elevation="16dp"/>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

From 750c4ffbd3ccfa9e6cf17ad6fb2f3a0e58e4a2bb Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 29 Dec 2020 22:20:33 +0100
Subject: [PATCH 092/131] Add preference to hide description tab in video
 details

---
 .../fragments/detail/VideoDetailFragment.java | 67 +++++++++----------
 app/src/main/res/values/settings_keys.xml     |  3 +-
 app/src/main/res/values/strings.xml           |  6 +-
 app/src/main/res/xml/content_settings.xml     | 13 +++-
 4 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index e9eb2231465..375fb0918c3 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -130,8 +130,6 @@ public final class VideoDetailFragment
         OnKeyDownListener {
     public static final String KEY_SWITCHING_PLAYERS = "switching_players";
 
-    private static final int RELATED_STREAMS_UPDATE_FLAG = 0x1;
-    private static final int COMMENTS_UPDATE_FLAG = 0x2;
     private static final float MAX_OVERLAY_ALPHA = 0.9f;
     private static final float MAX_PLAYER_HEIGHT = 0.7f;
 
@@ -151,12 +149,12 @@ public final class VideoDetailFragment
     private static final String DESCRIPTION_TAB_TAG = "DESCRIPTION TAB";
 
     // tabs
-    private boolean showRelatedStreams;
     private boolean showComments;
+    private boolean showRelatedStreams;
+    private boolean showDescription;
     private String selectedTabTag;
     @AttrRes @NonNull final List<Integer> tabIcons = new ArrayList<>();
-
-    private int updateFlags = 0;
+    private boolean tabSettingsChanged = false;
 
     @State
     protected int serviceId = Constants.NO_SERVICE_ID;
@@ -275,17 +273,13 @@ public static VideoDetailFragment getInstanceInCollapsedState() {
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        showRelatedStreams = PreferenceManager.getDefaultSharedPreferences(activity)
-                .getBoolean(getString(R.string.show_next_video_key), true);
-
-        showComments = PreferenceManager.getDefaultSharedPreferences(activity)
-                .getBoolean(getString(R.string.show_comments_key), true);
-
-        selectedTabTag = PreferenceManager.getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.stream_info_selected_tab_key), COMMENTS_TAB_TAG);
-
-        PreferenceManager.getDefaultSharedPreferences(activity)
-                .registerOnSharedPreferenceChangeListener(this);
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+        showComments = prefs.getBoolean(getString(R.string.show_comments_key), true);
+        showRelatedStreams = prefs.getBoolean(getString(R.string.show_next_video_key), true);
+        showDescription = prefs.getBoolean(getString(R.string.show_description_key), true);
+        selectedTabTag = prefs.getString(
+                getString(R.string.stream_info_selected_tab_key), COMMENTS_TAB_TAG);
+        prefs.registerOnSharedPreferenceChangeListener(this);
 
         setupBroadcastReceiver();
 
@@ -330,17 +324,12 @@ public void onResume() {
 
         setupBrightness();
 
-        if (updateFlags != 0) {
-            if (!isLoading.get() && currentInfo != null) {
-                if ((updateFlags & RELATED_STREAMS_UPDATE_FLAG) != 0) {
-                    startLoading(false);
-                }
-                if ((updateFlags & COMMENTS_UPDATE_FLAG) != 0) {
-                    startLoading(false);
-                }
+        if (tabSettingsChanged) {
+            tabSettingsChanged = false;
+            initTabs();
+            if (currentInfo != null) {
+                updateTabs(currentInfo);
             }
-
-            updateFlags = 0;
         }
 
         // Check if it was loading when the fragment was stopped/paused
@@ -415,12 +404,15 @@ public void onActivityResult(final int requestCode, final int resultCode, final
     @Override
     public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
                                           final String key) {
-        if (key.equals(getString(R.string.show_next_video_key))) {
+        if (key.equals(getString(R.string.show_comments_key))) {
+            showComments = sharedPreferences.getBoolean(key, true);
+            tabSettingsChanged = true;
+        } else if (key.equals(getString(R.string.show_next_video_key))) {
             showRelatedStreams = sharedPreferences.getBoolean(key, true);
-            updateFlags |= RELATED_STREAMS_UPDATE_FLAG;
-        } else if (key.equals(getString(R.string.show_comments_key))) {
+            tabSettingsChanged = true;
+        } else if (key.equals(getString(R.string.show_description_key))) {
             showComments = sharedPreferences.getBoolean(key, true);
-            updateFlags |= COMMENTS_UPDATE_FLAG;
+            tabSettingsChanged = true;
         }
     }
 
@@ -926,9 +918,11 @@ private void initTabs() {
             tabIcons.add(R.drawable.ic_art_track_white_24dp);
         }
 
-        // temp empty fragment. will be updated in handleResult
-        pageAdapter.addFragment(new Fragment(), DESCRIPTION_TAB_TAG);
-        tabIcons.add(R.drawable.ic_description_white_24dp);
+        if (showDescription) {
+            // temp empty fragment. will be updated in handleResult
+            pageAdapter.addFragment(new Fragment(), DESCRIPTION_TAB_TAG);
+            tabIcons.add(R.drawable.ic_description_white_24dp);
+        }
         pageAdapter.notifyDataSetUpdate();
 
         if (pageAdapter.getCount() < 2) {
@@ -972,8 +966,11 @@ private void updateTabs(@NonNull final StreamInfo info) {
             }
         }
 
-        pageAdapter.updateItem(DESCRIPTION_TAB_TAG,
-                new DescriptionFragment(info));
+        if (showDescription) {
+            pageAdapter.updateItem(DESCRIPTION_TAB_TAG,
+                    new DescriptionFragment(info));
+        }
+
         pageAdapter.notifyDataSetUpdate();
         updateTabIcons();
     }
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 1e74f25a6fd..1c4ad11a399 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -197,8 +197,9 @@
     <!-- Content & History -->
     <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_next_video_key" translatable="false">show_next_video</string>
     <string name="show_comments_key" translatable="false">show_comments</string>
+    <string name="show_next_video_key" translatable="false">show_next_video</string>
+    <string name="show_description_key" translatable="false">show_description</string>
     <string name="show_meta_info_key" translatable="false">show_meta_info</string>
     <string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
     <string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82a5bda6c62..207680fef96 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,9 +91,12 @@
     <string name="clear_queue_confirmation_summary">Switching from one player to another may replace your queue</string>
     <string name="clear_queue_confirmation_description">The active player queue will be replaced</string>
     <string name="download_thumbnail_title">Load thumbnails</string>
+    <string name="download_thumbnail_summary">Turn off to prevent loading thumbnails, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
     <string name="show_comments_title">Show comments</string>
     <string name="show_comments_summary">Turn off to hide comments</string>
-    <string name="download_thumbnail_summary">Turn off to prevent loading thumbnails, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
+    <string name="show_next_and_similar_title">Show \'Next\' and \'Similar\' videos</string>
+    <string name="show_description_title">Show description</string>
+    <string name="show_description_summary">Turn off to hide video description and additional information</string>
     <string name="show_meta_info_title">Show meta info</string>
     <string name="show_meta_info_summary">Turn off to hide meta info boxes with additional information about the stream creator, stream content or a search request.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Image cache wiped</string>
@@ -124,7 +127,6 @@
     <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phonecalls)</string>
     <string name="download_dialog_title">Download</string>
     <string name="autoplay_title">Autoplay</string>
-    <string name="show_next_and_similar_title">Show \'Next\' and \'Similar\' videos</string>
     <string name="show_hold_to_append_title">Show \"Hold to append\" tip</string>
     <string name="show_hold_to_append_summary">Show tip when pressing the background or the popup button in video \"Details:\"</string>
     <string name="unsupported_url">Unsupported URL</string>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index 914fb2e59d5..70fb3b97726 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -72,6 +72,13 @@
         android:title="@string/download_thumbnail_title"
         app:iconSpaceReserved="false" />
 
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:key="@string/show_comments_key"
+        android:summary="@string/show_comments_summary"
+        android:title="@string/show_comments_title"
+        app:iconSpaceReserved="false" />
+
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="@string/show_next_video_key"
@@ -80,9 +87,9 @@
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
-        android:key="@string/show_comments_key"
-        android:summary="@string/show_comments_summary"
-        android:title="@string/show_comments_title"
+        android:key="@string/show_description_key"
+        android:summary="@string/show_description_summary"
+        android:title="@string/show_description_title"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat

From e840d42fb9395abc8b5655c593d4d6b0317a3436 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 14 Jan 2021 11:06:37 +0100
Subject: [PATCH 093/131] Add content description to detail fragment tabs

---
 .../fragments/detail/VideoDetailFragment.java  | 18 +++++++++++++-----
 app/src/main/res/values/strings.xml            |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 375fb0918c3..cb34fc1895d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -33,6 +33,7 @@
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -154,6 +155,7 @@ public final class VideoDetailFragment
     private boolean showDescription;
     private String selectedTabTag;
     @AttrRes @NonNull final List<Integer> tabIcons = new ArrayList<>();
+    @StringRes @NonNull final List<Integer> tabContentDescriptions = new ArrayList<>();
     private boolean tabSettingsChanged = false;
 
     @State
@@ -905,23 +907,27 @@ private void initTabs() {
         }
         pageAdapter.clearAllItems();
         tabIcons.clear();
+        tabContentDescriptions.clear();
 
         if (shouldShowComments()) {
             pageAdapter.addFragment(
                     CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
             tabIcons.add(R.drawable.ic_comment_white_24dp);
+            tabContentDescriptions.add(R.string.comments_tab_description);
         }
 
         if (showRelatedStreams && binding.relatedStreamsLayout == null) {
             //temp empty fragment. will be updated in handleResult
             pageAdapter.addFragment(new Fragment(), RELATED_TAB_TAG);
             tabIcons.add(R.drawable.ic_art_track_white_24dp);
+            tabContentDescriptions.add(R.string.related_streams_tab_description);
         }
 
         if (showDescription) {
             // temp empty fragment. will be updated in handleResult
             pageAdapter.addFragment(new Fragment(), DESCRIPTION_TAB_TAG);
             tabIcons.add(R.drawable.ic_description_white_24dp);
+            tabContentDescriptions.add(R.string.description_tab_description);
         }
         pageAdapter.notifyDataSetUpdate();
 
@@ -933,20 +939,22 @@ private void initTabs() {
                 binding.viewPager.setCurrentItem(position);
             }
             binding.tabLayout.setVisibility(View.VISIBLE);
-            updateTabIcons();
+            updateTabIconsAndContentDescriptions();
         }
     }
 
     /**
      * To be called whenever {@link #pageAdapter} is modified, since that triggers a refresh in
-     * {@link FragmentVideoDetailBinding#tabLayout} resetting all tab's icons. This reads icons from
-     * {@link #tabIcons}, which are set in {@link #initTabs()}
+     * {@link FragmentVideoDetailBinding#tabLayout} resetting all tab's icons and content
+     * descriptions. This reads icons from {@link #tabIcons} and content descriptions from
+     * {@link #tabContentDescriptions}, which are all set in {@link #initTabs()}.
      */
-    private void updateTabIcons() {
+    private void updateTabIconsAndContentDescriptions() {
         for (int i = 0; i < tabIcons.size(); ++i) {
             final TabLayout.Tab tab = binding.tabLayout.getTabAt(i);
             if (tab != null) {
                 tab.setIcon(tabIcons.get(i));
+                tab.setContentDescription(tabContentDescriptions.get(i));
             }
         }
     }
@@ -972,7 +980,7 @@ private void updateTabs(@NonNull final StreamInfo info) {
         }
 
         pageAdapter.notifyDataSetUpdate();
-        updateTabIcons();
+        updateTabIconsAndContentDescriptions();
     }
 
     private boolean shouldShowComments() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 207680fef96..702dcafbf69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -281,6 +281,9 @@
     <string name="detail_uploader_thumbnail_view_description">Uploader\'s avatar thumbnail</string>
     <string name="detail_likes_img_view_description">Likes</string>
     <string name="detail_dislikes_img_view_description">Dislikes</string>
+    <string name="comments_tab_description">Comments</string>
+    <string name="related_streams_tab_description">Related streams</string>
+    <string name="description_tab_description">Description</string>
     <string name="use_tor_title">Use Tor</string>
     <string name="use_tor_summary">(Experimental) Force download traffic through Tor for increased privacy (streaming videos not yet supported).</string>
     <string name="report_error">Report error</string>

From 71d92c8d1b1a440b7c0b5dce5f198480fe5af15d Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 14 Jan 2021 13:18:34 +0100
Subject: [PATCH 094/131] Hide tab layout in detail fragment when there is no
 space

---
 .../fragments/detail/VideoDetailFragment.java | 55 +++++++++++++++++--
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index cb34fc1895d..befd53678bd 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -10,6 +10,8 @@
 import android.content.pm.ActivityInfo;
 import android.database.ContentObserver;
 import android.graphics.Color;
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
@@ -19,6 +21,7 @@
 import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -157,6 +160,7 @@ public final class VideoDetailFragment
     @AttrRes @NonNull final List<Integer> tabIcons = new ArrayList<>();
     @StringRes @NonNull final List<Integer> tabContentDescriptions = new ArrayList<>();
     private boolean tabSettingsChanged = false;
+    private int lastAppBarVerticalOffset = Integer.MAX_VALUE; // prevents useless updates
 
     @State
     protected int serviceId = Constants.NO_SERVICE_ID;
@@ -575,6 +579,7 @@ private void toggleTitleAndSecondaryControls() {
                     ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
             binding.detailSecondaryControlPanel.setVisibility(View.GONE);
         }
+        updateTabLayoutVisibility();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -638,6 +643,14 @@ protected void initListeners() {
         binding.detailControlsBackground.setOnTouchListener(getOnControlsTouchListener());
         binding.detailControlsPopup.setOnTouchListener(getOnControlsTouchListener());
 
+        binding.appBarLayout.addOnOffsetChangedListener((layout, verticalOffset) -> {
+            // prevent useless updates to tab layout visibility if nothing changed
+            if (verticalOffset != lastAppBarVerticalOffset) {
+                lastAppBarVerticalOffset = verticalOffset;
+                updateTabLayoutVisibility();
+            }
+        });
+
         setupBottomPlayer();
         if (!PlayerHolder.bound) {
             setHeightThumbnail();
@@ -901,6 +914,10 @@ private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
                 });
     }
 
+    /*//////////////////////////////////////////////////////////////////////////
+    // Tabs
+    //////////////////////////////////////////////////////////////////////////*/
+
     private void initTabs() {
         if (pageAdapter.getCount() != 0) {
             selectedTabTag = pageAdapter.getItemTitle(binding.viewPager.getCurrentItem());
@@ -931,16 +948,14 @@ private void initTabs() {
         }
         pageAdapter.notifyDataSetUpdate();
 
-        if (pageAdapter.getCount() < 2) {
-            binding.tabLayout.setVisibility(View.GONE);
-        } else {
+        if (pageAdapter.getCount() >= 2) {
             final int position = pageAdapter.getItemPositionByTitle(selectedTabTag);
             if (position != -1) {
                 binding.viewPager.setCurrentItem(position);
             }
-            binding.tabLayout.setVisibility(View.VISIBLE);
             updateTabIconsAndContentDescriptions();
         }
+        updateTabLayoutVisibility();
     }
 
     /**
@@ -994,8 +1009,40 @@ private boolean shouldShowComments() {
         }
     }
 
+    public void updateTabLayoutVisibility() {
+        if (pageAdapter.getCount() < 2) {
+            binding.tabLayout.setVisibility(View.GONE);
+        } else {
+            binding.tabLayout.post(() -> {
+                if (getContext() != null) {
+                    final Rect pagerHitRect = new Rect();
+                    binding.viewPager.getHitRect(pagerHitRect);
+
+                    final Point displaySize = new Point();
+                    Objects.requireNonNull(ContextCompat.getSystemService(getContext(),
+                            WindowManager.class)).getDefaultDisplay().getSize(displaySize);
+
+                    final int viewPagerVisibleHeight = displaySize.y - pagerHitRect.top;
+                    // see TabLayout.DEFAULT_HEIGHT
+                    final float tabLayoutHeight = TypedValue.applyDimension(
+                            TypedValue.COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics());
+
+                    if (viewPagerVisibleHeight > tabLayoutHeight * 2) {
+                        // no translation at all when viewPagerVisibleHeight > tabLayout.height * 3
+                        binding.tabLayout.setTranslationY(
+                                Math.max(0, tabLayoutHeight * 3 - viewPagerVisibleHeight));
+                        binding.tabLayout.setVisibility(View.VISIBLE);
+                    } else {
+                        binding.tabLayout.setVisibility(View.GONE);
+                    }
+                }
+            });
+        }
+    }
+
     public void scrollToTop() {
         binding.appBarLayout.setExpanded(true, true);
+        updateTabLayoutVisibility();
     }
 
     /*//////////////////////////////////////////////////////////////////////////

From 243f539439d21320d9d96ed6ecbfc1eab20342c0 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 14 Jan 2021 22:34:55 +0100
Subject: [PATCH 095/131] Use KoreUtil function

---
 .../fragments/detail/VideoDetailFragment.java        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index befd53678bd..f8a6e50d5dd 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -620,6 +620,7 @@ protected void initListeners() {
         binding.detailUploaderRootLayout.setOnClickListener(this);
         binding.detailUploaderRootLayout.setOnLongClickListener(this);
         binding.detailThumbnailRootLayout.setOnClickListener(this);
+
         binding.detailControlsBackground.setOnClickListener(this);
         binding.detailControlsBackground.setOnLongClickListener(this);
         binding.detailControlsPopup.setOnClickListener(this);
@@ -630,7 +631,8 @@ protected void initListeners() {
         binding.detailControlsShare.setOnClickListener(this);
         binding.detailControlsOpenInBrowser.setOnClickListener(this);
         binding.detailControlsPlayWithKodi.setOnClickListener(this);
-        showHideKodiButton();
+        binding.detailControlsPlayWithKodi.setVisibility(KoreUtil.shouldShowPlayWithKodi(
+                requireContext(), serviceId) ? View.VISIBLE : View.GONE);
 
         binding.overlayThumbnail.setOnClickListener(this);
         binding.overlayThumbnail.setOnLongClickListener(this);
@@ -707,12 +709,6 @@ public void onLoadingFailed(final String imageUri, final View view,
         }
     }
 
-    private void showHideKodiButton() {
-        // show kodi button if it supports the current service and it is enabled in settings
-        binding.detailControlsPlayWithKodi.setVisibility(KoreUtil.shouldShowPlayWithKodi(
-                requireContext(), serviceId) ? View.VISIBLE : View.GONE);
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // OwnStack
     //////////////////////////////////////////////////////////////////////////*/
@@ -979,7 +975,7 @@ private void updateTabs(@NonNull final StreamInfo info) {
             if (binding.relatedStreamsLayout == null) { // phone
                 pageAdapter.updateItem(RELATED_TAB_TAG,
                         RelatedVideosFragment.getInstance(info));
-            } else { // tablet
+            } else { // tablet + TV
                 getChildFragmentManager().beginTransaction()
                         .replace(R.id.relatedStreamsLayout,
                                 RelatedVideosFragment.getInstance(info))

From 3868243c2a79ef88820701b2568c78ac17cf3828 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 17 Jan 2021 15:59:29 +0100
Subject: [PATCH 096/131] Animate secondary controls toggle

---
 .../fragments/detail/VideoDetailFragment.java    | 16 ++++++++--------
 .../layout-large-land/fragment_video_detail.xml  |  2 +-
 .../main/res/layout/fragment_video_detail.xml    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index f8a6e50d5dd..cb4cfb8b6bd 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -119,6 +119,7 @@
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
 import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
 import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
 import static org.schabi.newpipe.player.helper.PlayerHelper.isClearingQueueConfirmationRequired;
 import static org.schabi.newpipe.player.playqueue.PlayQueueItem.RECOVERY_UNSET;
@@ -570,13 +571,13 @@ public boolean onLongClick(final View v) {
     private void toggleTitleAndSecondaryControls() {
         if (binding.detailSecondaryControlPanel.getVisibility() == View.GONE) {
             binding.detailVideoTitleView.setMaxLines(10);
-            binding.detailToggleDescriptionView.setImageResource(
-                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_less));
+            animateRotation(binding.detailToggleSecondaryControlsView,
+                    Player.DEFAULT_CONTROLS_DURATION, 180);
             binding.detailSecondaryControlPanel.setVisibility(View.VISIBLE);
         } else {
             binding.detailVideoTitleView.setMaxLines(1);
-            binding.detailToggleDescriptionView.setImageResource(
-                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
+            animateRotation(binding.detailToggleSecondaryControlsView,
+                    Player.DEFAULT_CONTROLS_DURATION, 0);
             binding.detailSecondaryControlPanel.setVisibility(View.GONE);
         }
         updateTabLayoutVisibility();
@@ -1406,7 +1407,7 @@ public void showLoading() {
         binding.detailVideoTitleView.setMaxLines(1);
         animate(binding.detailVideoTitleView, true, 0);
 
-        binding.detailToggleDescriptionView.setVisibility(View.GONE);
+        binding.detailToggleSecondaryControlsView.setVisibility(View.GONE);
         binding.detailTitleRootLayout.setClickable(false);
         binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
@@ -1511,9 +1512,8 @@ public void handleResult(@NonNull final StreamInfo info) {
         }
 
         binding.detailTitleRootLayout.setClickable(true);
-        binding.detailToggleDescriptionView.setImageResource(
-                ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
-        binding.detailToggleDescriptionView.setVisibility(View.VISIBLE);
+        binding.detailToggleSecondaryControlsView.setRotation(0);
+        binding.detailToggleSecondaryControlsView.setVisibility(View.VISIBLE);
         binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
         sortedVideoStreams = ListHelper.getSortedStreamVideosList(
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 63e67f1bd02..14459b49489 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -193,7 +193,7 @@
                             tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
                         <ImageView
-                            android:id="@+id/detail_toggle_description_view"
+                            android:id="@+id/detail_toggle_secondary_controls_view"
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="top|end"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 0a18874d7da..246e9b4d99b 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -180,7 +180,7 @@
                         tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
                     <ImageView
-                        android:id="@+id/detail_toggle_description_view"
+                        android:id="@+id/detail_toggle_secondary_controls_view"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_gravity="top|end"

From 39724de6e60d50c38fa71392eb41d80abd76d9bb Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Mon, 18 Jan 2021 08:00:22 +0300
Subject: [PATCH 097/131] Update README.so.md

---
 README.so.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.so.md b/README.so.md
index dc9ec154778..3f9746bf558 100644
--- a/README.so.md
+++ b/README.so.md
@@ -1,6 +1,6 @@
 <p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
-<h4 align="center">App bilaash ah oo fudud looguna talagalay in aaladaha nidaamka Android-ka ku shaqeeya wax loogu daawado.</h4>
+<h4 align="center">App bilaash ah oo fudud looguna talagalay in Android-ka wax loogu daawado.</h4>
 <p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
 
 <p align="center">
@@ -12,13 +12,13 @@
 <a href="https://www.bountysource.com/teams/newpipe" alt="Kuwa Bountysource "><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
-<p align="center"><a href="#screenshots">Sawir-shaashadeed</a> &bull; <a href="#description">Faahfaahin</a> &bull; <a href="#features">Waxqabadka</a> &bull; <a href="#updates">Kushubida iyo cusboonaysiinta</a> &bull; <a href="#contribution">Kusoo Kordhin</a> &bull; <a href="#donate">Ugu Deeq</a> &bull; <a href="#license">Laysinka</a></p>
+<p align="center"><a href="#sawir-shaashadeed">Sawir-shaashadeed</a> &bull; <a href="#faahfaahin">Faahfaahin</a> &bull; <a href="#waxqabadka">Waxqabadka</a> &bull; <a href="#kushubida-iyo-cusboonaysiinta">Kushubida iyo cusboonaysiinta</a> &bull; <a href="#kusoo-kordhin">Kusoo Kordhin</a> &bull; <a href="#ugu-deeq">Ugu Deeq</a> &bull; <a href="#laysinka">Laysinka</a></p>
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
 *Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
 
-<b>DIGNIIN: MIDKAN, NOOCA APP-KA EE HADDA WALI TIJAABO AYUU KU JIRAA, SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO , KA FUR ARIN SHARAXAYA QAYBTANADA GITHUB-KA.</b>
+<b>DIGNIIN: MIDKAN, NOOCA APP-KA EE HADDA WALI TIJAABO AYUU KU JIRAA, SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO, KA FUR ARIN SHARAXAYA QAYBTANADA ARRIMAHA EE GITHUB-KA.</b>
 
 <b>NEWPIPE AMA KUWA KU SALAYSAN PLAYSTORE-KA IN LA GALIYO WAXAY KA HOR IMANAYSAA SHARCIGA IYO SHURUUDAHA AY LEEYIHIIN.</b>
 

From d4a33603ab2755522198bf5f9d7737539fee13c0 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 17 Jan 2021 14:04:07 +0100
Subject: [PATCH 098/131] Prevent IllegalArgumentException when closing popup

---
 .../item/PickerSubscriptionItem.kt            |  2 +-
 .../org/schabi/newpipe/player/Player.java     | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
index 3540e6938c4..d4d4e7db196 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
@@ -46,6 +46,6 @@ data class PickerSubscriptionItem(
     fun updateSelected(containerView: View, isSelected: Boolean) {
         this.isSelected = isSelected
         PickerSubscriptionItemBinding.bind(containerView).selectedHighlight
-                .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
+            .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index b2b65477abf..13a0a7d0211 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -1349,13 +1349,23 @@ public void closePopup() {
 
     public void removePopupFromView() {
         if (windowManager != null) {
-            final boolean isCloseOverlayHasParent = closeOverlayBinding != null
-                    && closeOverlayBinding.closeButton.getParent() != null;
-            if (popupHasParent()) {
-                windowManager.removeView(binding.getRoot());
+            // wrap in try-catch since it could sometimes generate errors randomly
+            try {
+                if (popupHasParent()) {
+                    windowManager.removeView(binding.getRoot());
+                }
+            } catch (final IllegalArgumentException e) {
+                Log.w(TAG, "Failed to remove popup from window manager", e);
             }
-            if (isCloseOverlayHasParent) {
-                windowManager.removeView(closeOverlayBinding.getRoot());
+
+            try {
+                final boolean closeOverlayHasParent = closeOverlayBinding != null
+                        && closeOverlayBinding.getRoot().getParent() != null;
+                if (closeOverlayHasParent) {
+                    windowManager.removeView(closeOverlayBinding.getRoot());
+                }
+            } catch (final IllegalArgumentException e) {
+                Log.w(TAG, "Failed to remove popup overlay from window manager", e);
             }
         }
     }

From d3d05d613ddca6fc298ef68b36a02ff9c65e801e Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 16 Jan 2021 18:38:29 +0100
Subject: [PATCH 099/131] Fix reload feed button does nothing

initListeners was being called before the bindings were assigned, and therefore the click listener was never setup
---
 .../schabi/newpipe/local/feed/FeedFragment.kt    | 16 ++++++----------
 .../subscription/item/PickerSubscriptionItem.kt  |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index 6e95f009f4f..878ce18e8d6 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -32,7 +32,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -83,13 +82,13 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
     }
 
     override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(rootView, savedInstanceState)
+        // super.onViewCreated() calls initListeners() which require the binding to be initialized
         _feedBinding = FragmentFeedBinding.bind(rootView)
         _errorBinding = feedBinding.errorPanel
+        super.onViewCreated(rootView, savedInstanceState)
 
-        feedBinding.swiperefresh.setOnRefreshListener { reloadContent() }
         viewModel = ViewModelProvider(this, FeedViewModel.Factory(requireContext(), groupId)).get(FeedViewModel::class.java)
-        viewModel.stateLiveData.observe(viewLifecycleOwner, Observer { it?.let(::handleResult) })
+        viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(::handleResult) }
     }
 
     override fun onPause() {
@@ -112,10 +111,8 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
 
     override fun initListeners() {
         super.initListeners()
-        // Using the non-null property may result in a NullPointerException
-        _feedBinding?.refreshRootView?.setOnClickListener {
-            triggerUpdate()
-        }
+        feedBinding.refreshRootView.setOnClickListener { reloadContent() }
+        feedBinding.swiperefresh.setOnRefreshListener { reloadContent() }
     }
 
     // /////////////////////////////////////////////////////////////////////////
@@ -317,11 +314,10 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
     // /////////////////////////////////////////////////////////////////////////
 
     override fun doInitialLoadLogic() {}
-    override fun reloadContent() = triggerUpdate()
     override fun loadMoreItems() {}
     override fun hasMoreItems() = false
 
-    private fun triggerUpdate() {
+    override fun reloadContent() {
         getActivity()?.startService(
             Intent(requireContext(), FeedLoadService::class.java).apply {
                 putExtra(FeedLoadService.EXTRA_GROUP_ID, groupId)
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
index 3540e6938c4..d4d4e7db196 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
@@ -46,6 +46,6 @@ data class PickerSubscriptionItem(
     fun updateSelected(containerView: View, isSelected: Boolean) {
         this.isSelected = isSelected
         PickerSubscriptionItemBinding.bind(containerView).selectedHighlight
-                .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
+            .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
     }
 }

From fa7613b8d11ac7fe2d84441ecdc462801058bd64 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Mon, 18 Jan 2021 11:35:45 +0100
Subject: [PATCH 100/131] Refactor feed fragment

---
 .../schabi/newpipe/local/feed/FeedFragment.kt  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index 878ce18e8d6..5a39ce93e1c 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -34,11 +34,9 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import icepick.State
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.databinding.ErrorRetryBinding
 import org.schabi.newpipe.databinding.FragmentFeedBinding
 import org.schabi.newpipe.fragments.list.BaseListFragment
 import org.schabi.newpipe.ktx.animate
@@ -50,12 +48,9 @@ import java.util.Calendar
 class FeedFragment : BaseListFragment<FeedState, Unit>() {
     private var _feedBinding: FragmentFeedBinding? = null
     private val feedBinding get() = _feedBinding!!
-
-    private var _errorBinding: ErrorRetryBinding? = null
-    private val errorBinding get() = _errorBinding!!
+    private val errorBinding get() = _feedBinding!!.errorPanel
 
     private lateinit var viewModel: FeedViewModel
-    private lateinit var swipeRefreshLayout: SwipeRefreshLayout
     @State
     @JvmField
     var listState: Parcelable? = null
@@ -84,7 +79,6 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
     override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) {
         // super.onViewCreated() calls initListeners() which require the binding to be initialized
         _feedBinding = FragmentFeedBinding.bind(rootView)
-        _errorBinding = feedBinding.errorPanel
         super.onViewCreated(rootView, savedInstanceState)
 
         viewModel = ViewModelProvider(this, FeedViewModel.Factory(requireContext(), groupId)).get(FeedViewModel::class.java)
@@ -93,7 +87,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
 
     override fun onPause() {
         super.onPause()
-        listState = _feedBinding?.itemsList?.layoutManager?.onSaveInstanceState()
+        listState = feedBinding.itemsList.layoutManager?.onSaveInstanceState()
     }
 
     override fun onResume() {
@@ -239,12 +233,12 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
         val isIndeterminate = progressState.currentProgress == -1 &&
             progressState.maxProgress == -1
 
-        if (!isIndeterminate) {
-            feedBinding.loadingProgressText.text = "${progressState.currentProgress}/${progressState.maxProgress}"
+        feedBinding.loadingProgressText.text = if (!isIndeterminate) {
+            "${progressState.currentProgress}/${progressState.maxProgress}"
         } else if (progressState.progressMessage > 0) {
-            _feedBinding?.loadingProgressText?.setText(progressState.progressMessage)
+            progressState.progressMessage.toString()
         } else {
-            _feedBinding?.loadingProgressText?.text = "∞/∞"
+            "∞/∞"
         }
 
         feedBinding.loadingProgressBar.isIndeterminate = isIndeterminate ||

From 053b6ab8c68da6af6ccf0b37068a279ead7430ae Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Mon, 18 Jan 2021 13:10:04 +0100
Subject: [PATCH 101/131] Update extractor version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6647b413dd9..486502cd868 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:2d93b237236b8dce98943fd5dced9b8e645a2e0a'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:beb705013c4dbe2c1a893fa338140e7a5176a0d5'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From 5e7c2c11f6b515be06ded79411e655a30c836327 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Mon, 18 Jan 2021 13:16:09 +0100
Subject: [PATCH 102/131] Update translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translated using Weblate (Kabyle)
Currently translated at 2.3% (1 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/kab/

Translated using Weblate (Polish)

Currently translated at 99.5% (613 of 616 strings)

Translated using Weblate (German)

Currently translated at 99.8% (615 of 616 strings)

Translated using Weblate (Basque)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Arabic)

Currently translated at 96.9% (597 of 616 strings)

Translated using Weblate (Indonesian)

Currently translated at 99.6% (614 of 616 strings)

Translated using Weblate (Polish)

Currently translated at 99.6% (614 of 616 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Hebrew)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Sardinian)

Currently translated at 99.0% (610 of 616 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 27.9% (12 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/pt_BR/

Translated using Weblate (Basque)

Currently translated at 30.2% (13 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/eu/

Translated using Weblate (Czech)

Currently translated at 6.9% (3 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/cs/

Translated using Weblate (Hebrew)

Currently translated at 32.5% (14 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/he/

Translated using Weblate (Polish)

Currently translated at 53.4% (23 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/pl/

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (German)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (French)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 96.2% (593 of 616 strings)

Translated using Weblate (French)

Currently translated at 72.0% (31 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/fr/

Translated using Weblate (Chinese (Traditional))

Currently translated at 81.3% (35 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/zh_Hant/

Translated using Weblate (English (United Kingdom))

Currently translated at 6.6% (41 of 616 strings)

Translated using Weblate (Spanish)

Currently translated at 99.1% (611 of 616 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Arabic)

Currently translated at 97.8% (603 of 616 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Finnish)

Currently translated at 99.5% (613 of 616 strings)

Translated using Weblate (Dutch (Belgium))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Tamil)

Currently translated at 2.3% (1 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ta/

Translated using Weblate (Italian)

Currently translated at 46.5% (20 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/it/

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 79.0% (34 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/zh_Hans/

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Korean)

Currently translated at 85.3% (526 of 616 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Serbian)

Currently translated at 40.9% (252 of 616 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Romanian)

Currently translated at 74.3% (458 of 616 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (German)

Currently translated at 48.8% (21 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/de/

Translated using Weblate (Catalan)

Currently translated at 4.6% (2 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ca/

Translated using Weblate (Arabic)

Currently translated at 67.4% (29 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ar/

Translated using Weblate (Indonesian)

Currently translated at 13.9% (6 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/id/

Translated using Weblate (Chinese (Simplified))

Currently translated at 86.0% (37 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/zh_Hans/

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Slovak)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Finnish)

Currently translated at 99.6% (614 of 616 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 96.4% (594 of 616 strings)

Translated using Weblate (German)

Currently translated at 46.5% (20 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/de/

Translated using Weblate (Turkish)

Currently translated at 27.9% (12 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/tr/

Translated using Weblate (Norwegian Bokmål)

Currently translated at 18.6% (8 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/nb_NO/

Translated using Weblate (Santali)

Currently translated at 12.3% (76 of 616 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Kurdish (Central))

Currently translated at 95.9% (591 of 616 strings)

Translated using Weblate (Bengali)

Currently translated at 78.5% (484 of 616 strings)

Translated using Weblate (German)

Currently translated at 51.1% (22 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/de/

Translated using Weblate (German)

Currently translated at 51.1% (22 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/de/

Translated using Weblate (Greek)

Currently translated at 32.5% (14 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/el/

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)

Translated using Weblate (Estonian)

Currently translated at 68.9% (425 of 616 strings)

Translated using Weblate (Kabyle)

Currently translated at 30.0% (185 of 616 strings)

Translated using Weblate (Estonian)

Currently translated at 4.6% (2 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/et/

Translated using Weblate (Somali)

Currently translated at 100.0% (616 of 616 strings)
---
 app/src/main/res/values-ar/strings.xml        |  38 +-
 .../main/res/values-b+zh+HANS+CN/strings.xml  |   3 +
 app/src/main/res/values-bn/strings.xml        |   1 +
 app/src/main/res/values-ca/strings.xml        | 186 ++++-
 app/src/main/res/values-ckb/strings.xml       |   3 +-
 app/src/main/res/values-cs/strings.xml        |  20 +-
 app/src/main/res/values-de/strings.xml        |   3 +
 app/src/main/res/values-el/strings.xml        |   5 +-
 app/src/main/res/values-en-rGB/strings.xml    |  33 +-
 app/src/main/res/values-es/strings.xml        |   1 +
 app/src/main/res/values-et/strings.xml        |  54 +-
 app/src/main/res/values-eu/strings.xml        |   3 +
 app/src/main/res/values-fi/strings.xml        |   3 +
 app/src/main/res/values-fr/strings.xml        |   6 +
 app/src/main/res/values-he/strings.xml        |   3 +
 app/src/main/res/values-hr/strings.xml        |  13 +-
 app/src/main/res/values-in/strings.xml        |   5 +
 app/src/main/res/values-it/strings.xml        |  13 +-
 app/src/main/res/values-kab/strings.xml       |  10 +-
 app/src/main/res/values-ko/strings.xml        |  20 +-
 app/src/main/res/values-nb-rNO/strings.xml    |  39 +-
 app/src/main/res/values-nl-rBE/strings.xml    |  12 +-
 app/src/main/res/values-nl/strings.xml        |  10 +-
 app/src/main/res/values-pl/strings.xml        |   6 +
 app/src/main/res/values-pt-rBR/strings.xml    |  93 +--
 app/src/main/res/values-pt-rPT/strings.xml    |   8 +-
 app/src/main/res/values-pt/strings.xml        |   3 +
 app/src/main/res/values-ro/strings.xml        | 134 +--
 app/src/main/res/values-ru/strings.xml        |   5 +-
 app/src/main/res/values-sat/strings.xml       |  10 +
 app/src/main/res/values-sc/strings.xml        |   3 +
 app/src/main/res/values-sk/strings.xml        |   3 +
 app/src/main/res/values-so/strings.xml        | 764 +++++++++++-------
 app/src/main/res/values-sr/strings.xml        |   2 +-
 app/src/main/res/values-tr/strings.xml        |   3 +
 app/src/main/res/values-zh-rTW/strings.xml    |   3 +
 .../metadata/android/ar/changelogs/957.txt    |  10 +
 .../metadata/android/ar/changelogs/958.txt    |  28 +-
 .../metadata/android/ar/changelogs/959.txt    |   6 +-
 .../metadata/android/ar/changelogs/960.txt    |   4 +
 .../metadata/android/ar/changelogs/961.txt    |  12 +
 .../metadata/android/ar/changelogs/962.txt    |   2 +
 .../metadata/android/ca/full_description.txt  |   1 +
 .../metadata/android/ca/short_description.txt |   1 +
 .../metadata/android/cs/changelogs/962.txt    |   2 +
 .../metadata/android/de/changelogs/770.txt    |   4 +
 .../metadata/android/de/changelogs/920.txt    |   9 +
 .../metadata/android/de/changelogs/950.txt    |   4 +
 .../metadata/android/de/changelogs/952.txt    |   4 +-
 .../metadata/android/de/changelogs/959.txt    |   4 +-
 .../metadata/android/de/changelogs/962.txt    |   2 +
 .../metadata/android/el/short_description.txt |   2 +-
 .../metadata/android/et/full_description.txt  |   1 +
 .../metadata/android/et/short_description.txt |   1 +
 .../metadata/android/eu/changelogs/962.txt    |   2 +
 .../metadata/android/fr/changelogs/71.txt     |   2 +-
 .../metadata/android/fr/changelogs/960.txt    |   4 +
 .../metadata/android/fr/changelogs/962.txt    |   2 +
 .../metadata/android/he/changelogs/962.txt    |   2 +
 .../metadata/android/id/changelogs/959.txt    |   3 +
 .../metadata/android/id/changelogs/960.txt    |   2 +-
 .../metadata/android/id/changelogs/961.txt    |  12 +
 .../metadata/android/id/changelogs/962.txt    |   2 +
 .../metadata/android/id/full_description.txt  |   2 +-
 .../metadata/android/id/short_description.txt |   2 +-
 .../metadata/android/it/changelogs/961.txt    |  12 +
 .../metadata/android/it/changelogs/962.txt    |   2 +
 .../android/kab/short_description.txt         |   1 +
 .../metadata/android/nb-NO/changelogs/962.txt |   2 +
 .../metadata/android/pl/changelogs/952.txt    |   7 +
 .../metadata/android/pl/changelogs/960.txt    |   4 +
 .../metadata/android/pl/changelogs/961.txt    |  12 +
 .../metadata/android/pl/changelogs/962.txt    |   2 +
 .../metadata/android/pt_BR/changelogs/962.txt |   2 +
 .../metadata/android/ta/short_description.txt |   1 +
 .../metadata/android/tr/changelogs/820.txt    |   1 +
 .../metadata/android/tr/changelogs/830.txt    |   1 +
 .../metadata/android/tr/changelogs/955.txt    |   3 +
 .../metadata/android/tr/changelogs/962.txt    |   2 +
 .../android/zh_Hans/changelogs/740.txt        |  19 +
 .../android/zh_Hans/changelogs/750.txt        |  21 +
 .../android/zh_Hans/changelogs/780.txt        |  10 +
 .../android/zh_Hans/changelogs/790.txt        |  14 +
 .../android/zh_Hans/changelogs/800.txt        |  21 +
 .../android/zh_Hans/changelogs/810.txt        |  19 +
 .../android/zh_Hans/changelogs/962.txt        |   2 +
 .../android/zh_Hant/changelogs/961.txt        |  12 +
 .../android/zh_Hant/changelogs/962.txt        |   2 +
 88 files changed, 1281 insertions(+), 544 deletions(-)
 create mode 100644 fastlane/metadata/android/ar/changelogs/957.txt
 create mode 100644 fastlane/metadata/android/ar/changelogs/960.txt
 create mode 100644 fastlane/metadata/android/ar/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/ar/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/ca/full_description.txt
 create mode 100644 fastlane/metadata/android/ca/short_description.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/770.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/920.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/950.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/et/full_description.txt
 create mode 100644 fastlane/metadata/android/et/short_description.txt
 create mode 100644 fastlane/metadata/android/eu/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/960.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/he/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/id/changelogs/959.txt
 create mode 100644 fastlane/metadata/android/id/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/id/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/kab/short_description.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/pl/changelogs/952.txt
 create mode 100644 fastlane/metadata/android/pl/changelogs/960.txt
 create mode 100644 fastlane/metadata/android/pl/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/pl/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/pt_BR/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/ta/short_description.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/820.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/830.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/955.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/740.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/750.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/780.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/790.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/800.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/810.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/zh_Hant/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/zh_Hant/changelogs/962.txt

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index efd682d9ed4..8b4417a5448 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -9,7 +9,7 @@
     <string name="detail_dislikes_img_view_description">عدم الإعجاب</string>
     <string name="detail_likes_img_view_description">الإعجابات</string>
     <string name="detail_thumbnail_view_description">مدة, تشغيل الفيديو:</string>
-    <string name="detail_uploader_thumbnail_view_description">الصورة المصغرة الشخصية</string>
+    <string name="detail_uploader_thumbnail_view_description">رافع الصورة الرمزية المصغرة</string>
     <string name="did_you_mean">هل تقصد \"%1$s\"؟</string>
     <string name="download">تنزيل</string>
     <string name="download_dialog_title">تنزيل</string>
@@ -55,7 +55,7 @@
     <string name="general_error">خطأ</string>
     <string name="parsing_error">تعذر تحليل الموقع</string>
     <string name="youtube_signature_deobfuscation_error">تعذر فك تشفير توقيع رابط الفيديو</string>
-    <string name="main_bg_subtitle">اضغط على \"بحث\" للبدء
+    <string name="main_bg_subtitle">انقر \"بحث\" للبدء
 \n</string>
     <string name="subscribe_button_title">اشتراك</string>
     <string name="subscribed_button_title">مشترك</string>
@@ -126,7 +126,7 @@
     <string name="notification_channel_name">تنبيهات NewPipe</string>
     <string name="notification_channel_description">تنبيهات مشغل NewPipe للخلفية والنوافذ المنبثقة</string>
     <string name="unknown_content">[غير معروف]</string>
-    <string name="light_parsing_error">لا يمكن تحليل الموقع بشكل كلي</string>
+    <string name="light_parsing_error">تعذر تحليل الموقع بشكل كلي</string>
     <string name="could_not_setup_download_menu">تعذر إعداد قائمة التنزيل</string>
     <string name="live_streams_not_supported">البثوث المباشرة ليست مدعومةً بعد</string>
     <string name="could_not_get_stream">تعذر الحصول على أي بث</string>
@@ -135,19 +135,19 @@
     <string name="player_stream_failure">لا يمكن تشغيل هذا البث</string>
     <string name="player_unrecoverable_failure">حدث خطأ للمشغل غير قابل للاسترداد</string>
     <string name="player_recoverable_failure">استرداد المشغل من الخطأ</string>
-    <string name="sorry_string">عذرا، لا ينبغي أن يحدث ذلك.</string>
+    <string name="sorry_string">عذرًا، لم ينبغِ أن يحدث ذلك.</string>
     <string name="error_report_button_text">الإبلاغ عن هذا الخطأ عبر البريد الإلكتروني</string>
-    <string name="error_snackbar_message">عذرا، هناك خطأ ما.</string>
+    <string name="error_snackbar_message">عذرا، حدث خطأ ما.</string>
     <string name="error_snackbar_action">أبلِغ</string>
     <string name="what_device_headline">معلومات:</string>
     <string name="what_happened_headline">ماذا حدث:</string>
-    <string name="info_labels">ماذا:\\nطلب:\\nلغة المحتوى:\\nبلد المحتوى:\\nلغة التطبيق:\\nالخدمات:\\nتوقيت غرينتش:\\nالحزمة:\\nالإصدار:\\nOS الإصدار:</string>
+    <string name="info_labels">ماذا:\\nطلب:\\nلغة المحتوى:\\nبلد المحتوى:\\nلغة التطبيق:\\nالخدمات:\\nتوقيت جرينتش:\\nالحزمة:\\nالإصدار:\\nOS نسخة:</string>
     <string name="your_comment">تعليقك (باللغة الإنجليزية):</string>
     <string name="error_details_headline">التفاصيل:</string>
     <string name="report_error">الإبلاغ عن خطأ</string>
     <string name="user_report">تقرير المستخدم</string>
     <string name="search_no_results">لم يتم العثور على نتائج</string>
-    <string name="empty_subscription_feed_subtitle">لا شيء هنا غير الصراصير</string>
+    <string name="empty_subscription_feed_subtitle">لا شيء هنا سوى الصراصير</string>
     <string name="audio">الصوت</string>
     <string name="retry">إعادة المحاولة</string>
     <string name="storage_permission_denied">ترخيص الوصول إلى التخزين أوّلا</string>
@@ -157,7 +157,7 @@
     <string name="no_subscribers">ليس هناك مشترِكون</string>
     <plurals name="subscribers">
         <item quantity="zero">%s مشترك</item>
-        <item quantity="one">%s مشتركين</item>
+        <item quantity="one">%s l مشارك</item>
         <item quantity="two">%s مشتركين</item>
         <item quantity="few">%s مشتركين</item>
         <item quantity="many">%s مشتركين</item>
@@ -269,13 +269,13 @@
     <string name="import_data_title">استيراد قاعدة البيانات</string>
     <string name="export_data_title">تصدير قاعدة البيانات</string>
     <string name="import_data_summary">يلغي السجل الحالي والاشتراكات وقوائم التشغيل والإعدادات (اختياريًا)</string>
-    <string name="export_data_summary">تصدير قوائم تشغيل, الاشتراكات, والإعدادات</string>
+    <string name="export_data_summary">تصديرالسجل، وقوائم تشغيل، والإعدادات، والاشتراكات</string>
     <string name="show_info">عرض المعلومات</string>
     <string name="controls_add_to_playlist_title">إضافة إلى</string>
     <string name="settings_category_debug_title">تحليل</string>
     <string name="video_streams_empty">لم يتم العثور على أي بث مرئي</string>
     <string name="audio_streams_empty">لم يتم العثور على أي بث صوتي</string>
-    <string name="detail_drag_description">إسحب للقيام بالترتيب</string>
+    <string name="detail_drag_description">اسحب لإعادة ترتيب</string>
     <string name="create">إنشاء</string>
     <string name="delete_one">إحذف واحدة</string>
     <string name="delete_all">حذف الكل</string>
@@ -309,7 +309,7 @@
     <string name="file">الملف</string>
     <string name="invalid_directory">لا يوجد مثل هذا المجلد</string>
     <string name="file_name_empty_error">لا يمكن أن يكون اسم الملف فارغًا</string>
-    <string name="error_occurred_detail">طرأ هناك خطأ: %1$s</string>
+    <string name="error_occurred_detail">حدث خطأٌ ما: %1$s</string>
     <string name="no_valid_zip_file">ملف مضغوط ZIP غير صالح</string>
     <string name="unbookmark_playlist">إزالة الفواصل المرجعية</string>
     <string name="resize_fit">تناسب مع الشاشة</string>
@@ -422,7 +422,7 @@
     <string name="app_update_notification_channel_description">الإخطارات لإصدار NewPipe الجديد</string>
     <string name="download_to_sdcard_error_title">وحدة التخزين الخارجية غير متوفرة</string>
     <string name="download_to_sdcard_error_message">لا يمكن التنزيل على بطاقة SD الخارجية. هل تريد إعادة تعيين موقع مجلد التنزيل؟</string>
-    <string name="saved_tabs_invalid_json">تعذرت قراءة علامات التبويب المحفوظة, لذا استخدم علامات التبويب الافتراضية</string>
+    <string name="saved_tabs_invalid_json">تعذرت قراءة علامات التبويب المحفوظة، لذا استخدم علامات التبويب الافتراضية</string>
     <string name="restore_defaults">استعادة الضبط الافتراضي</string>
     <string name="restore_defaults_confirmation">هل تريد استعادة الإعدادات الافتراضية؟</string>
     <string name="subscribers_count_not_available">عدد المشتركين غير متاح</string>
@@ -545,7 +545,7 @@
     <string name="clear_download_history">تنظيف تاريخ التحميل</string>
     <string name="delete_downloaded_files">حذف الملفات المحملة</string>
     <string name="deleted_downloads">تم حذف %1$d من التحميلات</string>
-    <string name="permission_display_over_apps">إعطاء إذن لعرضه على التطبيقات الأخرى</string>
+    <string name="permission_display_over_apps">امنح الإذن بالعرض فوق التطبيقات الأخرى</string>
     <string name="app_language_title">لغة التطبيق</string>
     <string name="systems_language">النظام الافتراضي</string>
     <string name="subtitle_activity_recaptcha">اضغط على \"تم\" عند حلها</string>
@@ -650,8 +650,8 @@
     <string name="feed_group_show_only_ungrouped_subscriptions">إظهار الاشتراكات غير المجمعة فقط</string>
     <string name="no_playlist_bookmarked_yet">لا توجد إشارات مرجعية لقائمة التشغيل حتى الآن</string>
     <string name="select_a_playlist">اختر قائمة تشغيل</string>
-    <string name="error_report_open_github_notice">يرجى التحقق مما إذا كانت هناك مشكلة في مناقشة تعطلك بالفعل. عند إنشاء تذاكر مكررة ، ستأخذ وقتًا منا يمكن أن نقضيه في إصلاح الخطأ الفعلي.</string>
-    <string name="error_report_open_issue_button_text">تقرير على جيثب</string>
+    <string name="error_report_open_github_notice">يرجى مراجعة ما إذا توجد بالفعل مشكلة تناقش التحطم الموجود بالفعل.عند إنشاء تذاكر مكررة، فإنك تستغرق منا وقتًا يمكن أن نقضيه في إصلاح الخطأ الفعلي.</string>
+    <string name="error_report_open_issue_button_text">تقرير على GitHub</string>
     <string name="copy_for_github">نسخ تقرير منسق</string>
     <string name="search_showing_result_for">إظهار النتائج ل %s</string>
     <string name="never">أبدا</string>
@@ -687,6 +687,12 @@
     <string name="enqueue_stream">قائمة الانتظار</string>
     <string name="notification_colorize_summary">اجعل أندرويد يخصص لون الإشعار وفقا للّون الرئيسي في الصورة المصغرة (لاحظ أن هذا غير متوفر على جميع الأجهزة)</string>
     <string name="notification_colorize_title">تلوين الاشعارات</string>
-    <string name="show_thumbnail_summary">إظهار الصورة المصغرة على شاشة القفل كخلفية وإخطارات داخلية</string>
+    <string name="show_thumbnail_summary">استخدم الصورة المصغرة لكل من خلفية شاشة القفل والإشعارات</string>
     <string name="show_thumbnail_title">إظهار الصورة المصغرة</string>
+    <string name="show_meta_info_summary">قم بإيقاف التشغيل لإخفاء مربعات المعلومات الوصفية بمعلومات إضافية حول منشئ، البث أو محتوى البث أو طلب البحث.</string>
+    <string name="show_meta_info_title">إظهار معلومات التعريف</string>
+    <string name="recent">الأخيرة</string>
+    <string name="msg_calculating_hash">حساب التجزئة</string>
+    <string name="hash_channel_description">إشعارات لتقدم تجزئة الفيديو</string>
+    <string name="hash_channel_name">إشعار تجزئة الفيديو</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index be4aa932e50..39938e97e71 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -647,4 +647,7 @@
     <string name="hash_channel_name">视频哈希值计算通知</string>
     <string name="hash_channel_description">视频正在哈希值计算时显示的通知</string>
     <string name="msg_calculating_hash">计算哈希值中</string>
+    <string name="recent">最近</string>
+    <string name="show_meta_info_summary">隐藏关于视频创建者及内容或搜索请求的额外元信息框。</string>
+    <string name="show_meta_info_title">显示元数据信息</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index a33036846cd..5f15943dc0a 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -489,4 +489,5 @@
         <item quantity="other">%d মিনিট</item>
     </plurals>
     <string name="max_retry_msg">সর্বোচ্চ চেয্টা</string>
+    <string name="recent">সাম্প্রতিক</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 78ee40d1580..b758d4f58ec 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -36,7 +36,7 @@
     <string name="settings_category_other_title">Altres</string>
     <string name="settings_category_debug_title">Depuració</string>
     <string name="content">Contingut</string>
-    <string name="show_age_restricted_content_title">Desactiva les restriccions per edat</string>
+    <string name="show_age_restricted_content_title">Mostra el contingut restringit a menors</string>
     <string name="duration_live">Directe</string>
     <string name="downloads">Baixades</string>
     <string name="downloads_title">Baixades</string>
@@ -54,7 +54,7 @@
     <string name="unknown_content">[Desconegut]</string>
     <string name="import_data_title">Importa una base de dades</string>
     <string name="export_data_title">Exporta una base de dades</string>
-    <string name="export_data_summary">Exporta l\'historial, les subscripcions i les llistes de reproducció</string>
+    <string name="export_data_summary">Exporta l\'historial, les subscripcions, les llistes de reproducció i els paràmetres</string>
     <string name="general_error">Error</string>
     <string name="network_error">Error de xarxa</string>
     <string name="video">Vídeo</string>
@@ -114,11 +114,11 @@
     <string name="import_file_title">Importa un fitxer</string>
     <string name="view_count_text">%1$s reproduccions</string>
     <string name="upload_date_text">Publicat el %1$s</string>
-    <string name="no_player_found">No s\'ha trobat cap reproductor de fluxos. Voleu instal·lar el VLC\?</string>
+    <string name="no_player_found">No s\'ha trobat cap reproductor de fluxos. Instal·lar el VLC\?</string>
     <string name="no_player_found_toast">No s\'ha trobat cap reproductor de fluxos (podeu instal·lar el VLC per reproduir-ho).</string>
     <string name="open_in_popup_mode">Obre en mode emergent</string>
     <string name="controls_download_desc">Baixa el fitxer de vídeo</string>
-    <string name="did_you_mean">Volíeu dir: %1$s\?</string>
+    <string name="did_you_mean">Volíeu dir: \"%1$s\"\?</string>
     <string name="share_dialog_title">Comparteix-ho amb</string>
     <string name="screen_rotation">rotació</string>
     <string name="use_external_video_player_title">Reproductor de vídeo extern</string>
@@ -133,11 +133,11 @@
     <string name="download_path_summary">Els fitxers de vídeo baixats es desen aquí</string>
     <string name="download_path_dialog_title">Trieu la carpeta de baixades per als fitxers de vídeo</string>
     <string name="download_path_audio_summary">Els fitxers d\'àudio baixats es desen aquí</string>
-    <string name="download_path_audio_dialog_title">Trieu la carpeta de baixada per als fitxers d\'àudio</string>
+    <string name="download_path_audio_dialog_title">Trieu la carpeta de baixades per als fitxers d\'àudio</string>
     <string name="autoplay_by_calling_app_summary">Reprodueix un vídeo quan el NewPipe s\'executa des d\'altra aplicació</string>
     <string name="default_popup_resolution_title">Resolució per defecte del mode emergent</string>
     <string name="show_higher_resolutions_title">Mostra resolucions superiors</string>
-    <string name="show_higher_resolutions_summary">No tots els dispositius són compatibles amb la reproducció de vídeos en 2K/4K</string>
+    <string name="show_higher_resolutions_summary">Només alguns dispositius poden reproduir vídeos en 2K/4K</string>
     <string name="play_with_kodi_title">Reprodueix amb el Kodi</string>
     <string name="kore_not_found">No s\'ha trobat l\'aplicació Kore. Voleu instal·lar-la\?</string>
     <string name="show_play_with_kodi_title">Mostra «Reprodueix amb el Kodi»</string>
@@ -188,7 +188,7 @@
     <string name="invalid_file">El fitxer no existeix o bé no teniu permisos de lectura/escriptura</string>
     <string name="file_name_empty_error">El nom del fitxer no pot estar en blanc</string>
     <string name="error_occurred_detail">S\'ha produït un error: %1$s</string>
-    <string name="error_report_button_text">Informeu de l\'error per correu electrònic</string>
+    <string name="error_report_button_text">Informa d\'aquest error per correu electrònic</string>
     <string name="error_snackbar_message">S\'han produït alguns errors.</string>
     <string name="error_snackbar_action">Informe</string>
     <string name="what_device_headline">Informació:</string>
@@ -209,7 +209,7 @@
     <string name="err_dir_create">No s\'ha pogut crear el directori de baixades «%1$s»</string>
     <string name="info_dir_created">S\'ha creat el directori de baixades «%1$s»</string>
     <string name="retry">Torna a provar</string>
-    <string name="storage_permission_denied">S\'ha denegat el permís d\'accés a l\'emmagatzematge</string>
+    <string name="storage_permission_denied">Abans que res, heu de permetre l\'accés a l\'emmagatzematge</string>
     <string name="no_subscribers">Cap subscripció</string>
     <string name="no_views">Cap reproducció</string>
     <plurals name="views">
@@ -267,13 +267,14 @@
     <string name="playback_speed_control">Controls de la velocitat de reproducció</string>
     <string name="playback_tempo">Tempo</string>
     <string name="playback_pitch">To</string>
-    <string name="main_bg_subtitle">Toca \"Cercar\" per començar</string>
+    <string name="main_bg_subtitle">Toca \"Cerca\" per començar
+\n</string>
     <string name="use_external_video_player_summary">Elimina l\'àudio en algunes resolucions</string>
     <string name="use_external_audio_player_title">Reproductor d\'àudio extern</string>
     <string name="download_thumbnail_summary">Desactiveu-ho per no generar miniatures i estalviar dades i memòria. Canviant aquesta opció, s\'eliminarà la memòria cau d\'imatges tant de la memòria com de l\'emmagatzematge.</string>
     <string name="enable_search_history_summary">Emmagatzema les cerques localment</string>
     <string name="enable_watch_history_summary">Crea un historial de vídeos visualitzats</string>
-    <string name="resume_on_audio_focus_gain_title">Reprèn automàticament</string>
+    <string name="resume_on_audio_focus_gain_title">Reprèn la reproducció</string>
     <string name="unsupported_url">Aquest URL no és compatible</string>
     <string name="error_report_title">Informe d\'error</string>
     <string name="later">Més tard</string>
@@ -285,7 +286,7 @@
     <string name="switch_to_background">Canvia al mode en rerefons</string>
     <string name="switch_to_popup">Canvia al mode emergent</string>
     <string name="switch_to_main">Canvia al mode principal</string>
-    <string name="import_data_summary">Sobreescriu l\'historial i les subscripcions actuals</string>
+    <string name="import_data_summary">Sobreescriu l\'historial, les subscripcions i, opcionalment, els paràmetres</string>
     <string name="player_recoverable_failure">S\'està recuperant el reproductor després de l\'error</string>
     <string name="sorry_string">Bé, és lamentable.</string>
     <string name="detail_drag_description">Arrossegueu per reordenar la llista</string>
@@ -297,7 +298,8 @@
     <string name="msg_url_malform">L\'URL té un format no vàlid o no hi ha connexió a Internet</string>
     <string name="msg_running_detail">Feu un toc aquí per a més detalls</string>
     <string name="no_available_dir">Defineix una carpeta de baixades més endavant als paràmetres</string>
-    <string name="msg_popup_permission">Es necessita aquest permís per a obrir el mode emergent</string>
+    <string name="msg_popup_permission">Es necessita aquest permís
+\nper a obrir el mode emergent</string>
     <string name="title_activity_recaptcha">Camp reCAPTCHA</string>
     <string name="recaptcha_request_toast">S\'ha sol·licitat l\'emplenament d\'un camp reCAPTCHA</string>
     <string name="settings_file_replacement_character_summary">Se substituiran els caràcters no vàlids amb aquest valor</string>
@@ -327,23 +329,26 @@
     <string name="previous_export">Darrera exportació</string>
     <string name="subscriptions_import_unsuccessful">No s\'han pogut importar les subscripcions</string>
     <string name="subscriptions_export_unsuccessful">No s\'han pogut exportar les subscripcions</string>
-    <string name="unhook_checkbox">Desvincula (pot provocar distorsió)</string>
+    <string name="unhook_checkbox">Desvincula (pot causar deformació)</string>
     <string name="metadata_cache_wipe_summary">Elimina totes les dades de llocs web de la memòria cau</string>
-    <string name="auto_queue_summary">Afegeix a la cua un vídeo relacionat quan es reprodueix l\'últim vídeo en una cua sense repetició</string>
+    <string name="auto_queue_summary">Acaba de reproduir la cua (sense repetició) quan s\'hi afegeixi un vídeo relacionat</string>
     <string name="show_hold_to_append_title">Mostra els missatges d\'ajuda</string>
     <string name="show_hold_to_append_summary">Mostra un missatge d\'ajuda quan el botó de mode en segon pla o emergent estigui premut a la pàgina de detalls d\'un vídeo</string>
-    <string name="info_labels">Què ha passat:\\nPetició:\\nIdioma del contingut:\\nServei:\\nHora GMT:\\nPaquet:\\nVersió:\\nVersió del SO:</string>
+    <string name="info_labels">Què ha passat:\\nPetició:\\nIdioma del contingut:\\nPaís del contingut:\\nLlengua de l\'aplicació:\\nServei:\\nHora GMT:\\nPaquet:\\nVersió:\\nVersió del SO:</string>
     <string name="drawer_header_action_paceholder_text">Aviat hi haurà novetats aquí ;D</string>
     <string name="preferred_open_action_settings_title">Acció d\'obertura preferida</string>
     <string name="preferred_open_action_settings_summary">Acció per defecte en obrir continguts — %s</string>
     <string name="enable_leak_canary_summary">La supervisió de fugues de memòria pot fer que l\'aplicació deixi de respondre mentre es bolca la memòria</string>
     <string name="enable_disposed_exceptions_title">Informa d\'errors fora del cicle de vida</string>
     <string name="enable_disposed_exceptions_summary">Força l\'informe d\'excepcions Rx que no es puguin transmetre que tinguin lloc fora del cicle de vida d\'un fragment o activitat després de disposar-los</string>
-    <string name="import_youtube_instructions">Importeu les vostres subscripcions de YouTube mitjançant el fitxer d\'exportació: 
-\n 
-\n1. Aneu a : %1$s 
-\n2. Inicieu la sessió quan si us demani 
-\n3. S\'hauria d\'iniciar una baixada (el fitxer d\'exportació)</string>
+    <string name="import_youtube_instructions">Importeu les vostres subscripcions de YouTube mitjançant la còpia de contingut de Google Takeout:
+\n
+\n1. Aneu a : %1$s
+\n2. Inicieu la sessió si se us demana
+\n3. Premeu \"Totes les dades incloses\", després \"Dessel·lecciona-ho tot\", llavors sel·leccioneu només \"Subscripcions\" i finalment premeu \"D\'acord\".
+\n4. Premeu \"Pas següent\" i llavors a \"Crea una exportació\"
+\n5. Premeu el botó \"Baixa\" un cop hagi aparegut
+\n6. Del fitxer comprimit baixat, extreieu-ne el fitxer subscripcions.json (es troba a \"Takeout/YouTube i YouTube Music/subscripcions/subscripcions.json\") i importeu-lo aquí.</string>
     <string name="import_soundcloud_instructions">Importeu un perfil del SoundCloud mitjançant l\'URL o l\'identificador del vostre perfil: 
 \n 
 \n1. Activeu el «Mode d\'ordinador» en un navegador (el lloc web no està disponible per a dispositius mòbils) 
@@ -408,7 +413,7 @@
     <string name="grid">Quadrícula</string>
     <string name="auto">Automàtic</string>
     <string name="switch_view">Canvia la vista</string>
-    <string name="app_update_notification_content_title">Està disponible una actualització del NewPipe!</string>
+    <string name="app_update_notification_content_title">Una nova versió del NewPipe està disponible!</string>
     <string name="missions_header_pending">Pendent</string>
     <string name="paused">en pausa</string>
     <string name="queued">a la cua</string>
@@ -433,7 +438,7 @@
     <string name="overwrite_finished_warning">Ja existeix un fitxer baixat amb aquest nom</string>
     <string name="overwrite_unrelated_warning">Ja existeix un fitxer amb aquest nom</string>
     <string name="download_already_running">Hi ha una baixada en curs amb aquest nom</string>
-    <string name="error_ssl_exception">Ha fallat la connexió segura</string>
+    <string name="error_ssl_exception">No s\'ha pogut establir una connexió segura</string>
     <string name="error_unknown_host">No s\'ha pogut trobar el servidor</string>
     <string name="error_connect_host">No s\'ha pogut connectar amb el servidor</string>
     <string name="error_postprocessing_failed">Ha fallat el post-processament</string>
@@ -445,7 +450,7 @@
     <string name="overwrite">Sobreescriu</string>
     <string name="error_http_not_found">No s\'ha trobat</string>
     <string name="show_comments_title">Mostra els comentaris</string>
-    <string name="show_comments_summary">Desactiveu-ho per no mostrar els comentaris</string>
+    <string name="show_comments_summary">Desactiveu-ho amagar els comentaris</string>
     <string name="autoplay_title">Reproducció automàtica</string>
     <string name="no_comments">Cap comentari</string>
     <string name="error_unable_to_load_comments">No s\'han pogut carregar els comentaris</string>
@@ -461,7 +466,7 @@
     <string name="error_insufficient_storage">No hi ha espai disponible al dispositiu</string>
     <string name="error_progress_lost">S\'ha perdut el progrés perquè s\'ha eliminat el fitxer</string>
     <string name="error_timeout">S\'ha excedit el temps d\'espera de la connexió</string>
-    <string name="confirm_prompt">Segur\?</string>
+    <string name="confirm_prompt">Esteu segurs que voleu esborrar el vostre historial de baixades o esborrar-ne tots els fitxers\?</string>
     <string name="enable_queue_limit">Limita la cua de baixades</string>
     <string name="start_downloads">Inicia les baixades</string>
     <string name="pause_downloads">Pausa les baixades</string>
@@ -484,7 +489,7 @@
 \nTrieu SAF si voleu desar el contingut en una memòria externa</string>
     <string name="downloads_storage_use_saf_title">Utilitza SAF</string>
     <string name="downloads_storage_use_saf_summary">El SAF (Storage Access Framework; estructura d\'accés a l\'emmagatzematge) us permet realitzar baixades a una memòria externa com una targeta SD.
-\nNota: No és compatible en tots els dispositius</string>
+\nAlguns dispositius no en són compatibles</string>
     <string name="clear_playback_states_title">Esborra les posicions de reproducció</string>
     <string name="clear_playback_states_summary">Esborra totes les posicions de reproducció</string>
     <string name="delete_playback_states_alert">Voleu suprimir tots els punts de reproducció\?</string>
@@ -508,16 +513,16 @@
     <string name="subtitle_activity_recaptcha">Prem \"Fet\" quan estigui resolt</string>
     <string name="infinite_videos">∞ vídeos</string>
     <string name="more_than_100_videos">100+ vídeos</string>
-    <string name="permission_display_over_apps">Dona permís per mostrarse per sobre d\'altres apps.</string>
+    <string name="permission_display_over_apps">Permeteu dibuixar a sobre d\'altres aplicacions</string>
     <string name="help">Ajuda</string>
     <string name="artists">Artistes</string>
-    <string name="albums">Albums</string>
+    <string name="albums">Àlbums</string>
     <string name="songs">Cançons</string>
     <string name="videos_string">Vídeos</string>
     <string name="restricted_video">Aquest vídeo té una restricció per edat.
 \n
-\nSi desitges visualitzar-lo, activa el «Contingut restringit per edat» en la configuració.</string>
-    <string name="youtube_restricted_mode_enabled_title">Mode de restricció del YouTube</string>
+\nSi desitgeu visualitzar-lo, activeu \"%1$s\" a paràmetres.</string>
+    <string name="youtube_restricted_mode_enabled_title">Activa el \"mode restringit\" de YouTube</string>
     <string name="peertube_instance_add_exists">La instància introduïda ja existeix</string>
     <string name="peertube_instance_add_https_only">Només estàn soportades URLs HTTPS</string>
     <string name="peertube_instance_add_fail">No ha estat possible validar la instància</string>
@@ -527,4 +532,127 @@
     <string name="peertube_instance_url_summary">Selecciona les teves instàncies preferides del PeerTube</string>
     <string name="peertube_instance_url_title">Instàncies del PeerTube</string>
     <string name="seek_duration_title">Avançar/-rebobinar duració cerca</string>
+    <string name="recent">Recents</string>
+    <string name="show_thumbnail_summary">Estableix la miniatura com a fons de la pantalla de bloqueig i també de les notificacions</string>
+    <string name="show_thumbnail_title">Mostra\'n la miniatura</string>
+    <string name="playlist_page_summary">Pàgina de llistes de reproducció</string>
+    <string name="video_detail_by">Per %s</string>
+    <string name="channel_created_by">Creat per %s</string>
+    <string name="detail_sub_channel_thumbnail_view_description">Miniatura de l\'avatar del canal</string>
+    <string name="content_not_supported">El NewPipe encara no suporta aquest contingut.
+\n
+\nEsperem que en el futur ho faci.</string>
+    <string name="feed_use_dedicated_fetch_method_help_text">Creieu que la càrrega de contingut és massa lenta\? Si és el cas, proveu d\'activar la càrrega ràpida (podeu canviar-ho a paràmetres o al botó de sota).
+\n
+\nEl NewPipe ofereix dues formes de càrrega de contingut per als feeds:
+\n• Descarregant-ne el canal sencer, que és lent però complet.
+\n• Fent servir un servei dedicat, que és molt ràpid però sovint incomplet.
+\n
+\nLa diferència entre els dos és que el ràpid sovint retorna la informació incompleta. Per exemple, pot faltar la durada o el tipus (sense poder distingir entre una retransmissió en directe i un vídeo normal) i podria ser que faltessin alguns elements.
+\n
+\nYouTube és un exemple d\'un servei que ofereix aquest sistema de càrrega ràpida pels seus feed RSS.
+\n
+\nEn definitiva, l\'elecció depèn de si preferiu rapidesa a assegurar-vos que l\'informació és precisa.</string>
+    <string name="feed_use_dedicated_fetch_method_disable_button">Desactiva el mode ràpid</string>
+    <string name="feed_use_dedicated_fetch_method_enable_button">Activa el mode ràpid</string>
+    <string name="feed_use_dedicated_fetch_method_summary">Disponible en alguns serveis, normalment és més ràpid, però podria només incloure un nombre limitat de contingut i sovint informació incomplerta (per exemple, sense durada, tipus...).</string>
+    <string name="feed_use_dedicated_fetch_method_title">Recupera des d\'un feed dedicat si és possible</string>
+    <string name="feed_update_threshold_option_always_update">Actualitza sempre</string>
+    <string name="feed_update_threshold_summary">Temps que ha de passar perquè una subscripció es consideri obsoleta — %s</string>
+    <string name="feed_update_threshold_title">Llindar d\'actualització del contingut</string>
+    <string name="settings_category_feed_title">Feed</string>
+    <string name="feed_group_show_only_ungrouped_subscriptions">Mostra només les subscripcions sense grup</string>
+    <string name="feed_create_new_group_button_title">Nou</string>
+    <string name="feed_group_dialog_delete_message">Esteu segurs de voler suprimir aquest grup\?</string>
+    <string name="feed_group_dialog_empty_name">Nom de grup buit</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">%d de sel·leccionat</item>
+        <item quantity="other">%d de sel·leccionats</item>
+    </plurals>
+    <string name="feed_group_dialog_empty_selection">Cap subscripció sel·leccionada</string>
+    <string name="feed_group_dialog_select_subscriptions">Sel·leccioneu les subscripcions</string>
+    <string name="feed_processing_message">Processant el contingut…</string>
+    <string name="feed_notification_loading">Carregant el contingut…</string>
+    <string name="feed_subscription_not_loaded_count">No carregat: %d</string>
+    <string name="feed_oldest_subscription_update">Contingut refrescat per últim cop: %s</string>
+    <string name="feed_groups_header_title">Grups de canals</string>
+    <plurals name="days">
+        <item quantity="one">%d dia</item>
+        <item quantity="other">%d dies</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d hora</item>
+        <item quantity="other">%d hores</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minut</item>
+        <item quantity="other">%d minuts</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%d segon</item>
+        <item quantity="other">%d segons</item>
+    </plurals>
+    <string name="new_seek_duration_toast">A causa de les limitacions d\'ExoPlayer, la durada de cerca és de %d segons</string>
+    <string name="remove_watched_popup_yes_and_partially_watched_videos">Sí, i també els vídeos vistos parcialment</string>
+    <string name="remove_watched_popup_warning">Els vídeos que ja heu vist tant abans com després d\'haver estat afegits a la llista de reproducció seran suprimits.
+\nN\'esteu segurs\? Aquesta acció no pot desfer-se!</string>
+    <string name="remove_watched_popup_title">Esborrar els vídeos ja vistos\?</string>
+    <string name="remove_watched">Esborra els ja vistos</string>
+    <string name="systems_language">Valors per defecte</string>
+    <string name="app_language_title">Llengua de l\'aplicació</string>
+    <string name="choose_instance_prompt">Escolliu una instància</string>
+    <string name="deleted_downloads">%1$d baixades suprimides</string>
+    <string name="delete_downloaded_files">Esborrar els fitxers de baixades anteriors</string>
+    <string name="clear_download_history">Esborra l\'historial de baixades</string>
+    <string name="error_download_resource_gone">No s\'ha pogut recuperar aquesta baixada</string>
+    <string name="recovering">en recuperació</string>
+    <string name="never">Mai</string>
+    <string name="wifi_only">Només en Wi-Fi</string>
+    <string name="autoplay_summary">Comença la reproducció automàticament — %s</string>
+    <string name="show_original_time_ago_summary">Els textos originals dels serveis seran visibles en els directes</string>
+    <string name="show_memory_leaks">Mostra les fuites de memòria</string>
+    <string name="enqueued">Ja a la cua</string>
+    <string name="enqueue_stream">Afegeix a la cua</string>
+    <string name="title_activity_play_queue">Cua de reproducció</string>
+    <string name="most_liked">Més m\'agrada</string>
+    <string name="recently_added">Afegits recentment</string>
+    <string name="local">Local</string>
+    <string name="no_playlist_bookmarked_yet">Encara no hi ha llistes de reproducció favorites</string>
+    <string name="select_a_playlist">Sel·leccioneu una llista de reproducció</string>
+    <string name="recaptcha_done_button">Fet</string>
+    <string name="msg_calculating_hash">Calculant-ne la funció de verificació</string>
+    <string name="error_report_open_github_notice">Si us plau, comproveu abans si el problema que ha causat aquesta fallada ja ha estat informat. Els tiquets per duplicat fan que perdem temps que podríem aprofitar resolent-los.</string>
+    <string name="error_report_open_issue_button_text">Avisa del problema a GitHub</string>
+    <string name="copy_for_github">Copia l\'informe d\'errors</string>
+    <string name="clear_cookie_summary">Esborra les galetes que NewPipe desa quan resoleu un reCAPTCHA</string>
+    <string name="recaptcha_cookies_cleared">Les galetes del reCAPTCHA han estat esborrades</string>
+    <string name="clear_cookie_title">Esborra les galetes del reCAPTCHA</string>
+    <string name="hash_channel_description">Notificacions pel progrés de comprovació de vídeo</string>
+    <string name="hash_channel_name">Notificació de comprovació del vídeo</string>
+    <string name="youtube_restricted_mode_enabled_summary">YouTube proporciona un \"mode restringit\" que amaga contingut potencialment inadequat per a infants</string>
+    <string name="show_age_restricted_content_summary">Mostra contingut que podria ser inadequat pels infants</string>
+    <string name="settings_category_notification_title">Notificació</string>
+    <string name="unsupported_url_dialog_message">No s\'ha pogut reconèixer l\'adreça URL. Obrir-la amb una altra aplicació\?</string>
+    <string name="auto_queue_toggle">Cua automàtica</string>
+    <string name="show_meta_info_summary">Desactiveu-ho per deixar de mostrar les metadades, que contenen informació addicional sobre el creador del directe, el contingut o una sol·licitud de cerca.</string>
+    <string name="show_meta_info_title">Mostra les metadades</string>
+    <string name="clear_queue_confirmation_description">La cua de reproducció activa serà sobreescrita</string>
+    <string name="clear_queue_confirmation_summary">Canviar de reproductor podria sobreescriure la vostra cua de reproducció</string>
+    <string name="clear_queue_confirmation_title">Demana confirmació abans de buidar una cua de reproducció</string>
+    <string name="notification_colorize_summary">Deixa que el sistema acoloreixi la notificació segons el color de la miniatura (això pot no estar disponible a tots els dispositius)</string>
+    <string name="notification_colorize_title">Acoloreix la notificació</string>
+    <string name="notification_action_nothing">Res</string>
+    <string name="notification_action_buffering">Carregant</string>
+    <string name="notification_action_shuffle">Mescla</string>
+    <string name="notification_action_repeat">Repeteix</string>
+    <string name="notification_actions_at_most_three">El màxim d\'accions que poden aparèixer en una notificació compacta és de tres!</string>
+    <string name="notification_actions_summary">Editeu cada acció de notificació tocant el botó corresponent. Podeu seleccionar-ne fins a tres, que es mostraran a les notificacions en format compacte.</string>
+    <string name="notification_action_4_title">Cinquè botó d\'acció</string>
+    <string name="notification_action_3_title">Quart botó d\'acció</string>
+    <string name="notification_action_2_title">Tercer botó d\'acció</string>
+    <string name="notification_action_1_title">Segon botó d\'acció</string>
+    <string name="notification_action_0_title">Primer botó d\'acció</string>
+    <string name="notification_scale_to_square_image_summary">Escala la miniatura del vídeo mostrat a la notificació de 16:9 a raó d\'1:1 (pot causar deformacions)</string>
+    <string name="notification_scale_to_square_image_title">Escala a raó d\'1:1</string>
+    <string name="search_showing_result_for">Mostrant resultats per a: %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index 75161746afc..0d603f5ea92 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -498,7 +498,8 @@
     <string name="drawer_header_description">خزمەتگوزاری چەسپاو، ئێستا هەڵبژێردراو:</string>
     <string name="delete_search_history_alert">تەواوی گەڕانەکانت بسڕدرێنەوە؟</string>
     <string name="resume_on_audio_focus_gain_summary">بەردەوام بوونی ڤیدیۆ لەدوای هەبوونی هەر بڕینێک (وەک پەیوەندی تەلەفۆنی)</string>
-    <string name="main_bg_subtitle">گرته‌ له‌ ”گه‌ڕان” بكه‌ بۆ ده‌ستپێكردن</string>
+    <string name="main_bg_subtitle">کرته‌ له‌ \"گه‌ڕان\" بكه‌ بۆ ده‌ستپێكردن
+\n</string>
     <string name="enable_search_history_summary">کۆگای گەڕانی نێوخۆیی</string>
     <string name="settings_category_video_audio_title">ڤیدیۆ وە دەنگ</string>
     <string name="share">هاوبه‌شپێكردن</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 05e4d955cd9..8600b3c6c5e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -157,8 +157,8 @@
     <string name="popup_resizing_indicator_title">Změna velikosti</string>
     <string name="best_resolution">Nejlepší rozlišení</string>
     <string name="undo">Vrátit</string>
-    <string name="notification_channel_name">NewPipe notifikace</string>
-    <string name="notification_channel_description">Notifikace pro NewPipe přehrávače v pozadí a v okně</string>
+    <string name="notification_channel_name">Oznámení NewPipe</string>
+    <string name="notification_channel_description">Oznámení pro NewPipe přehrávače v pozadí a v okně</string>
     <string name="search_no_results">Žádné výsledky</string>
     <string name="empty_subscription_feed_subtitle">Je tu sranda jak v márnici</string>
     <string name="short_billion">mld.</string>
@@ -408,8 +408,8 @@
     <string name="brightness_gesture_control_summary">Používat gesta pro ovládání jasu přehrávače</string>
     <string name="settings_category_updates_title">Aktualizace</string>
     <string name="file_deleted">Soubor smazán</string>
-    <string name="app_update_notification_channel_name">Notifikace aktualizace aplikace</string>
-    <string name="app_update_notification_channel_description">Notifikace pro novou verzi NewPipe</string>
+    <string name="app_update_notification_channel_name">Oznámení o aktualizaci aplikace</string>
+    <string name="app_update_notification_channel_description">Oznámení o nové verzi NewPipe</string>
     <string name="download_to_sdcard_error_title">Externí úložiště není k dispozici</string>
     <string name="saved_tabs_invalid_json">Nelze načíst uložené karty, takže se použijí výchozí karty</string>
     <string name="restore_defaults">Obnovit do výchozího nastavení</string>
@@ -420,7 +420,7 @@
     <string name="updates_setting_title">Aktualizace</string>
     <string name="events">Události</string>
     <string name="conferences">Konference</string>
-    <string name="updates_setting_description">Zobrazit oznámení s výzvou k aktualizaci aplikace, když je k dispozici nová verze</string>
+    <string name="updates_setting_description">Zobrazit oznámení s výzvou k aktualizaci aplikace, je-li k dispozici nová verze</string>
     <string name="list_view_mode">Režim zobrazení seznamu</string>
     <string name="list">Seznam</string>
     <string name="grid">Mřížka</string>
@@ -639,7 +639,7 @@
     <string name="notification_action_shuffle">Promíchat</string>
     <string name="notification_action_repeat">Opakovat</string>
     <string name="notification_actions_at_most_three">Do kompaktního oznámení lze vybrat nejvíce tři akce!</string>
-    <string name="notification_actions_summary">Upravte každou akci notifikace níže poklepáním. Pomocí zaškrtávacích políček vpravo vyberte až tři z nich, které se mají zobrazit v kompaktním oznámení.</string>
+    <string name="notification_actions_summary">Upravte každou akci oznámení níže poklepáním. Pomocí zaškrtávacích políček vpravo vyberte až tři z nich, které se mají zobrazit v kompaktním oznámení.</string>
     <string name="notification_action_4_title">Páté akční tlačítko</string>
     <string name="notification_action_3_title">Čtvrté akční tlačítko</string>
     <string name="notification_action_2_title">Třetí akční tlačítko</string>
@@ -656,7 +656,13 @@
     <string name="youtube_restricted_mode_enabled_summary">YouTube poskytuje \"Omezený režim\", který skrývá potenciální obsahy pro dospělé</string>
     <string name="show_age_restricted_content_summary">Zobrazit obsah, i když je patrně nevhodný pro děti, protože odkazuje na věkové omezení (např. 18+)</string>
     <string name="notification_colorize_summary">Nechte Android přizpůsobit barvu oznámení podle hlavní barvy v miniatuře (není k dispozici na všech zařízeních)</string>
-    <string name="notification_colorize_title">Barevné notifikace</string>
+    <string name="notification_colorize_title">Přibarvit oznámení</string>
     <string name="show_thumbnail_summary">Použít miniaturu pro pozadí zamknuté obrazovky a oznámení</string>
     <string name="show_thumbnail_title">Zobrazit miniaturu</string>
+    <string name="hash_channel_name">Oznámení o hašování videa</string>
+    <string name="recent">Nedávné</string>
+    <string name="msg_calculating_hash">Počítám haš</string>
+    <string name="hash_channel_description">Oznámení o postupu hašování videa</string>
+    <string name="show_meta_info_summary">Vypnout, abyste skryli rámečky s meta informací s údaji o autorovi streamu, obsahu streamu nebo požadavků hledání.</string>
+    <string name="show_meta_info_title">Zobrazit meta informaci</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2ec4579f697..e42ea67ba5d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -652,4 +652,7 @@
     <string name="msg_calculating_hash">Hash wird berechnet</string>
     <string name="hash_channel_description">Benachrichtigungen für den Video-hashing Fortschritt</string>
     <string name="hash_channel_name">Video Hash Benachrichtigung</string>
+    <string name="recent">Letzte</string>
+    <string name="show_meta_info_title">Metadaten anzeigen</string>
+    <string name="show_meta_info_summary">Deaktivieren Sie diese Option, um Meta-Infofelder mit zusätzlichen Informationen zum Stream-Ersteller, zum Stream-Inhalt oder zu einer Suchanforderung auszublenden.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c7b189318df..0408e7baead 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -277,7 +277,7 @@
 \nΗ πολιτική ιδιωτικού απόρρητου του NewPipe εξηγεί λεπτομερώς ποια δεδομένα αποστέλλονται και αποθηκεύονται όταν επιλέγετε να στείλετε μια αναφορά σφαλμάτων.</string>
     <string name="read_privacy_policy">Ανάγνωση της πολιτικής ιδιωτικού απόρρητου</string>
     <string name="app_license_title">Η άδεια του NewPipe</string>
-    <string name="app_license">Το NewPipe είναι copylelft ελεύθερο λογισμικό: Μπορείτε να το χρησιμοποιήσετε, να το μελετήσετε, να το μοιραστείτε και να το βελτιώσετε κατά βούληση. Ειδικότερα, μπορείτε να το αναδιανείμετε ή/και να το τροποποιήσετε υπό την άδεια GNU General Public Licence όπως αυτή εκδόθηκε από το Free Software Foundation, είτε υπό την έκδοση 3 της Άδειας είτε (προεραιτικά) υπό οποιαδήποτε μεταγενέστερη άδεια.</string>
+    <string name="app_license">Το NewPipe είναι copylelft ελεύθερο λογισμικό: Μπορείτε να το χρησιμοποιήσετε, να το μελετήσετε, να το μοιραστείτε και να το βελτιώσετε κατά βούληση. Ειδικότερα, μπορείτε να το αναδιανείμετε ή/και να το τροποποιήσετε υπό την άδεια GNU General Public Licence όπως αυτή εκδόθηκε από το Free Software Foundation, είτε υπό την έκδοση 3 της άδειας, είτε (προαιρετικά) υπό οποιαδήποτε μεταγενέστερη άδεια.</string>
     <string name="read_full_license">Ανάγνωση της άδειας</string>
     <string name="title_history_search">Αναζητήθηκαν</string>
     <string name="title_history_view">Προβλήθηκαν</string>
@@ -650,4 +650,7 @@
     <string name="msg_calculating_hash">Υπολογισμός hash</string>
     <string name="hash_channel_description">Ειδοποιήσεις για πρόοδο βίντεο hashing</string>
     <string name="hash_channel_name">Ειδοποίηση βίντεο hash</string>
+    <string name="recent">Πρόσφατα</string>
+    <string name="show_meta_info_summary">Απενεργοποιήστε το για να μην εμφανίζονται μεταδεδομένα με επιπλέον πληροφορίες για το δημιουργό και το περιεχόμενο της ροής ή αίτημα αναζήτησης.</string>
+    <string name="show_meta_info_title">Εμφάνιση μεταδεδομένων</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index a6b3daec935..8f5523cb773 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -1,2 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="use_inexact_seek_summary">Inexact seek allows the player to seek to positions faster with reduced precision. Seeking for 5, 15 or 25 seconds doesn’t work with this.</string>
+    <string name="show_play_with_kodi_summary">Display an option to play a video via Kodi media centre</string>
+    <string name="notification_colorize_summary">Have Android customize the notification’s colour according to the main colour in the thumbnail (note that this is not available on all devices)</string>
+    <string name="notification_colorize_title">Colourise notification</string>
+    <string name="import_soundcloud_instructions">Import a SoundCloud profile by typing either the URL or your ID:
+\n
+\n1. Enable ‘desktop mode’ in a web browser (the site is not available for mobile devices)
+\n2. Go to this URL: %1$s
+\n3. Log in when asked
+\n4. Copy the profile URL you were redirected to.</string>
+    <string name="import_youtube_instructions">Import YouTube subscriptions from Google takeout:
+\n
+\n1. Go to this URL: %1$s
+\n2. Log in when asked
+\n3. Click on ‘All data included’, then on ‘Deselect all’, then select only ‘subscriptions’ and click ‘OK’
+\n4. Click on ‘Next step’ and then on ‘Create export’
+\n5. Click on the ‘Download’ button after it appears and
+\n6. From the downloaded takeout zip extract the .json file (usually under ‘YouTube and YouTube Music/subscriptions/subscriptions.json’) and import it here.</string>
+    <string name="subtitle_activity_recaptcha">Press ‘Done’ when solved</string>
+    <string name="restricted_video">This video is age restricted.
+\n
+\nTurn on ‘%1$s’ in the settings if you want to see it.</string>
+    <string name="youtube_restricted_mode_enabled_summary">YouTube provides a ‘Restricted Mode’ which hides potentially mature content</string>
+    <string name="youtube_restricted_mode_enabled_title">Turn on YouTube’s ‘Restricted Mode’</string>
+    <string name="show_hold_to_append_summary">Show tip when pressing the background or the pop-up button in video ‘Details:’</string>
+    <string name="show_hold_to_append_title">Show ‘Hold to append’ tip</string>
+    <string name="show_play_with_kodi_title">Show ‘Play with Kodi’ option</string>
+    <string name="did_you_mean">Did you mean ‘%1$s’\?</string>
+    <string name="main_bg_subtitle">Tap ‘Search’ to get started
+\n</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2cf9f3b01b2..9cf988acd58 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -652,4 +652,5 @@
     <string name="notification_colorize_summary">Permitir a Android personalizar el color de la notificación con el color principal de la imagen (ten en cuenta que esta opción no funciona en todos los dispositivos)</string>
     <string name="show_thumbnail_summary">Usar miniatura como fondo de pantalla de bloqueo y notificaciones</string>
     <string name="show_thumbnail_title">Mostrar vista previa</string>
+    <string name="show_meta_info_summary">Desactive para ocultar información adicional sobre el creador o contenido de la transmisión.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 9f06f3fee16..2be49ae6d37 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">Alustuseks puuduta otsingut</string>
+    <string name="main_bg_subtitle">Alustamiseks toksa \"Otsi\"
+\n</string>
     <string name="view_count_text">%1$s vaatamist</string>
     <string name="upload_date_text">Avaldatud %1$s</string>
     <string name="no_player_found">Voogesituseks puudub pleier. Kas paigaldada VLC?</string>
@@ -19,9 +20,9 @@
     <string name="choose_browser">Vali veebilehitseja</string>
     <string name="screen_rotation">pööramine</string>
     <string name="use_external_video_player_title">Kasuta välist videopleierit</string>
-    <string name="use_external_video_player_summary">Eemaldab audio SOME lahutustel</string>
+    <string name="use_external_video_player_summary">Eemaldab audio mõnedel lahutustel</string>
     <string name="use_external_audio_player_title">Kasuta välist audiopleierit</string>
-    <string name="popup_mode_share_menu_title">NewPipe hüpikaknarežiim</string>
+    <string name="popup_mode_share_menu_title">Hüpikaknarežiim</string>
     <string name="subscribe_button_title">Telli</string>
     <string name="subscribed_button_title">Tellitud</string>
     <string name="channel_unsubscribed">Kanali tellimus tühistatud</string>
@@ -33,21 +34,21 @@
     <string name="fragment_feed_title">Mis on uut</string>
     <string name="controls_background_title">Taust</string>
     <string name="controls_popup_title">Hüpikaken</string>
-    <string name="controls_add_to_playlist_title">"Lisa "</string>
+    <string name="controls_add_to_playlist_title">Lisa</string>
     <string name="download_path_title">Video allalaadimise kaust</string>
     <string name="download_path_summary">Kaust allalaetud videote hoiustamiseks</string>
-    <string name="download_path_dialog_title">Sisesta videote allalaadimise rada</string>
+    <string name="download_path_dialog_title">Vali alla laaditud videofailide kaust</string>
     <string name="download_path_audio_title">Audio allalaadimise kaust</string>
-    <string name="download_path_audio_summary">Siia salvestatakse alla laaditud audio</string>
-    <string name="download_path_audio_dialog_title">Sisesta audio allalaadimise rada</string>
+    <string name="download_path_audio_summary">Siia salvestatakse alla laaditud audiofailid</string>
+    <string name="download_path_audio_dialog_title">Vali alla laaditud audiofailide kaust</string>
     <string name="autoplay_by_calling_app_title">Automaatesitus</string>
     <string name="autoplay_by_calling_app_summary">Esita video, kui NewPipe käivitub teise rakenduse kaudu</string>
     <string name="default_resolution_title">Vaikelahutus</string>
     <string name="default_popup_resolution_title">Hüpikakna vaikelahutus</string>
     <string name="show_higher_resolutions_title">Kuva kõrgemaid lahutusi</string>
-    <string name="show_higher_resolutions_summary">Kõik seadmed ei toeta 2K/4K videoid</string>
+    <string name="show_higher_resolutions_summary">Ainult mõned seadmed suudavad esitada 2K/4K videoid</string>
     <string name="play_with_kodi_title">Esita Kodi abil</string>
-    <string name="kore_not_found">Kore rakendust ei leitud. Kas paigaldada see?</string>
+    <string name="kore_not_found">Kas paigaldada puuduv Kore rakendus\?</string>
     <string name="show_play_with_kodi_title">Kuva valik \"Esita Kodi abil\"</string>
     <string name="show_play_with_kodi_summary">Kuva valik video esitamiseks Kodi meediakeskuse kaudu</string>
     <string name="play_audio">Heli</string>
@@ -60,7 +61,7 @@
     <string name="popup_remember_size_pos_title">Pea hüpikakna suurus ja asukoht meeles</string>
     <string name="popup_remember_size_pos_summary">Pea hüpikakna viimane suurus ja asukoht meeles</string>
     <string name="use_inexact_seek_title">Kasuta ebatäpset kerimist</string>
-    <string name="use_inexact_seek_summary">Ebatäpne kerimine lubab pleieril otsida asukohta kiiremini täpsuse arvel</string>
+    <string name="use_inexact_seek_summary">Ebatäpne kerimine lubab pleieril otsida asukohta kiiremini täpsuse arvel. Sellega ei tööta 5, 15 või 25 sekundi kaupa kerimine.</string>
     <string name="download_thumbnail_title">Laadi pisipildid</string>
     <string name="download_thumbnail_summary">Lülita välja, et keelata pisipiltide laadimist, andmete salvestamist ja mälu kasutust. Muutmine puhastab vahemälu nii kettal kui ka mälus.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Pildid kustutati vahemälust</string>
@@ -68,21 +69,21 @@
     <string name="metadata_cache_wipe_summary">Kustuta veebilehtede andmed vahemälust</string>
     <string name="metadata_cache_wipe_complete_notice">Metaandmed kustutati vahemälust</string>
     <string name="auto_queue_title">Järgmine voog automaatselt järjekorda</string>
-    <string name="auto_queue_summary">Lisa seotud voog automaatselt, kui esitusel on viimane voog mittekorduvast järjekorrast.</string>
+    <string name="auto_queue_summary">Jätka lõpetamise (mitte-kordavat) esitamist lisadest järjekorra lõppu seotud voo</string>
     <string name="player_gesture_controls_title">Pleieri juhtimine viibetega</string>
-    <string name="player_gesture_controls_summary">Kasuta helitugevuse ja ereduse reguleerimiseks viipeid</string>
+    <string name="player_gesture_controls_summary">Kasuta viipeid helitugevuse ja heleduse reguleerimiseks</string>
     <string name="show_search_suggestions_title">Kuva soovitused</string>
     <string name="show_search_suggestions_summary">Kuva otsingu ajal soovitusi</string>
     <string name="enable_search_history_title">Otsinguajalugu</string>
     <string name="enable_search_history_summary">Salvesta otsinguajalugu kohalikult</string>
-    <string name="enable_watch_history_title">Ajalugu ja vahemälu</string>
+    <string name="enable_watch_history_title">Vaatamiste ajalugu</string>
     <string name="enable_watch_history_summary">Jälgi videote vaatamist</string>
-    <string name="resume_on_audio_focus_gain_title">Jätka taasesitust fookuse saamisel</string>
+    <string name="resume_on_audio_focus_gain_title">Jätka taasesitust</string>
     <string name="resume_on_audio_focus_gain_summary">Jätka taasesitust pärast katkestamist (nt. telefonikõne)</string>
     <string name="download_dialog_title">Laadi alla</string>
     <string name="show_next_and_similar_title">Kuva \'järgmine\' ja \'sarnased\' videod</string>
     <string name="show_hold_to_append_title">Kuva vihjet \"lisamiseks hoia\"</string>
-    <string name="show_hold_to_append_summary">Kuva vihje, kui videoandmete lehel vajutatakse tausta või hüpikakna nupule</string>
+    <string name="show_hold_to_append_summary">Kuva vihje, kui videoandmete lehel vajutatakse tausta või hüpikakna nupule \"Täpsemalt:\"</string>
     <string name="unsupported_url">Mitte toetatud URL</string>
     <string name="default_content_country_title">Sisu vaikimisi riik</string>
     <string name="service_title">Teenus</string>
@@ -101,7 +102,7 @@
     <string name="popup_playing_append">Lisati hüpikpleieri järjekorda</string>
     <string name="content">Sisu</string>
     <string name="show_age_restricted_content_title">Vanusepiiranguga sisu</string>
-    <string name="duration_live">OTSE</string>
+    <string name="duration_live">Otse</string>
     <string name="downloads">Allalaadimised</string>
     <string name="downloads_title">Allalaadimised</string>
     <string name="error_report_title">Vea teatamine</string>
@@ -132,7 +133,7 @@
     <string name="import_data_summary">Alistab praeguse ajaloo ja tellimused</string>
     <string name="export_data_summary">Ekspordi ajalugu, tellimused ja pleilistid</string>
     <string name="clear_views_history_title">Puhasta vaatamiste ajalugu</string>
-    <string name="clear_views_history_summary">Kustutab vaadatud voogude ajaloo</string>
+    <string name="clear_views_history_summary">Kustutab vaadatud voogude ajaloo ja taasesituse asukohad</string>
     <string name="delete_view_history_alert">Kas kustutada kogu vaatamiste ajalugu\?</string>
     <string name="watch_history_deleted">Vaatamiste ajalugu kustutati.</string>
     <string name="clear_search_history_title">Kustuta otsinguajalugu</string>
@@ -170,11 +171,11 @@
     <string name="error_snackbar_action">TEATA</string>
     <string name="what_device_headline">Info:</string>
     <string name="what_happened_headline">Mis juhtus:</string>
-    <string name="info_labels">Mis:\\nPäring:\\nSisu Keel:\\nTeenus:\\nGMT aeg:\\nPakett:\\nVersioon:\\nOS versioon:</string>
+    <string name="info_labels">Mis:\\nPäring:\\nSisu keel:\\nSisu maa:\\nRakenduse keel:\\nTeenus:\\nGMT aeg:\\nPakett:\\nVersioon:\\nOS versioon:</string>
     <string name="your_comment">Oma kommentaar (inglise keeles):</string>
     <string name="error_details_headline">Üksikasjad:</string>
     <string name="list_thumbnail_view_description">Video eelvaate pisipilt</string>
-    <string name="detail_thumbnail_view_description">Video eelvaate pisipilt</string>
+    <string name="detail_thumbnail_view_description">Esita video, kestus:</string>
     <string name="detail_uploader_thumbnail_view_description">Üleslaadiaja avatari pisipilt</string>
     <string name="detail_likes_img_view_description">Meeldib</string>
     <string name="detail_dislikes_img_view_description">Ei meeldi</string>
@@ -343,9 +344,12 @@
     <string name="subscriptions_export_unsuccessful">Tellimuste eksport nurjus</string>
     <string name="import_youtube_instructions">Impordi YouTube tellimused eksportfaili abil:
 \n
-\n1. Ava URL: %1$s
-\n2. Logi sisse
-\n3. Allalaadimine peaks algama (see on eksportfail)</string>
+\n1. Ava aadress: %1$s
+\n2. Logi sisse, kui seda küsitakse.
+\n3. Klõpsa \"Kõigi andmetega\", vali \"Tühista kõik\", vali ainult \"Tellimused\" ja klõpsa \"OK\".
+\n4. Klõpsa \"Järgmine samm\" ja seejärel \"Loo eksport\".
+\n5. Klõpsa nupul \"Laadi alla\" siis, kui ta ilmub.
+\n6. Alla laaditud väljavõtte ZIP failist paki lahti JSON fail (tavaliselt on see fail \"YouTube ja YouTube Muusika/tellimused/tellimused.json\" või \"YouTube and YouTube Music/subscriptions/subscriptions.json\") ja impordi see siia.</string>
     <string name="import_network_expensive_warning">See toiming võib põhjustada suurt võrguliiklust.
 \n
 \nKas jätkata?</string>
@@ -396,16 +400,16 @@
     <string name="tab_new">Uus vahekaart</string>
     <string name="tab_choose">Vali vahekaart</string>
     <string name="volume_gesture_control_title">Helitugevuse juhtimine viibetega</string>
-    <string name="volume_gesture_control_summary">Kasuta helitugevuse reguleerimiseks viipeid</string>
+    <string name="volume_gesture_control_summary">Kasuta viipeid helitugevuse reguleerimiseks</string>
     <string name="brightness_gesture_control_title">Ereduse reguleerimine viibetega</string>
-    <string name="brightness_gesture_control_summary">Kasuta ereduse reguleerimiseks viipeid</string>
+    <string name="brightness_gesture_control_summary">Kasuta viipeid heleduse reguleerimiseks</string>
     <string name="settings_category_updates_title">Uuendused</string>
     <string name="events">Sündmused</string>
     <string name="file_deleted">Fail kustutati</string>
     <string name="app_update_notification_channel_name">Rakenduse värskenduse teatis</string>
     <string name="app_update_notification_channel_description">NewPipe uuest versioonist teavitamine</string>
     <string name="download_to_sdcard_error_title">Väline andmekandja pole saadaval</string>
-    <string name="download_to_sdcard_error_message">Allalaadimine välisele SD-kaardile ei ole veel võimalik. Kas lähtestada allalaadimiste kataloogi asukoht\?</string>
+    <string name="download_to_sdcard_error_message">Allalaadimine välisele SD-kaardile ei ole võimalik. Kas lähtestada allalaadimiste kataloogi asukoht\?</string>
     <string name="saved_tabs_invalid_json">Tõrge salvestatud vahekaaride lugemisel. Kasutatakse vaikeväärtusi</string>
     <string name="restore_defaults">Taasta vaikeväärtused</string>
     <string name="restore_defaults_confirmation">Kas taastada vaikeväärtused\?</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 0dea4517832..8f57df3098c 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -652,4 +652,7 @@
     <string name="hash_channel_description">Jakinarazpenak bideoen hashing egoerarako</string>
     <string name="hash_channel_name">Bideo hash jakinarazpena</string>
     <string name="msg_calculating_hash">Hash-a kalkulatzen</string>
+    <string name="recent">Azkenak</string>
+    <string name="show_meta_info_summary">Desgaitu jario sortzailearen informazio gehigarria, jarioaren edukia edo bilaketa eskaera duten informazio koadroak ezkutatzeko.</string>
+    <string name="show_meta_info_title">Erakutsi meta informazioa</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index baa0e808481..0d3060ad6b7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -650,4 +650,7 @@
     <string name="show_thumbnail_summary">Käytä esikatselukuvaa lukitusruudun ja ilmoitusten taustakuvana</string>
     <string name="show_thumbnail_title">Näytä esikatselukuva</string>
     <string name="msg_calculating_hash">Lasketaan</string>
+    <string name="show_meta_info_summary">Poista käytöstä piilotakseen metatiedot suoratoiston luojasta, sen sisällöstä tai hakupyynnöstä.</string>
+    <string name="show_meta_info_title">Näytä metatieto</string>
+    <string name="recent">Viimeisimmät</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a6b64da7120..521228e7c5b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -652,4 +652,10 @@
     <string name="show_thumbnail_title">Afficher la miniature</string>
     <string name="show_thumbnail_summary">Utiliser la miniature pour l\'arrière-plan de l’écran de verrouillage et les notifications</string>
     <string name="open_with">Ouvrir avec</string>
+    <string name="recent">Récent</string>
+    <string name="msg_calculating_hash">Calcul du hachage</string>
+    <string name="hash_channel_description">Notifications pour la progression du hachage vidéo</string>
+    <string name="hash_channel_name">Notification de hachage vidéo</string>
+    <string name="show_meta_info_summary">Désactivez cette option pour masquer les zones de méta-informations contenant des informations supplémentaires sur le créateur du flux, le contenu du flux ou une demande de recherche.</string>
+    <string name="show_meta_info_title">Afficher les méta-infos</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index e366a673cc0..87d942f39b9 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -672,4 +672,7 @@
     <string name="msg_calculating_hash">הגיבוב</string>
     <string name="hash_channel_description">התראות על תהליכי גיבוב</string>
     <string name="hash_channel_name">התראת גיבוב סרטון</string>
+    <string name="recent">אחרונים</string>
+    <string name="show_meta_info_summary">לכבות את התיבות שמציגות את המידע על יוצרי התזרים, תוכן התזרים או בקשת חיפוש.</string>
+    <string name="show_meta_info_title">הצגת מידע על</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 0146b5fff80..b067c034e45 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -18,7 +18,7 @@
     <string name="choose_browser">Izaberi pretraživač</string>
     <string name="screen_rotation">rotacija</string>
     <string name="use_external_video_player_title">Koristi vanjski reproduktor videozapisa</string>
-    <string name="use_external_video_player_summary">Uklanja zvuk na nekim rezolucijama</string>
+    <string name="use_external_video_player_summary">Uklanja zvuk pri nekim rezolucijama</string>
     <string name="use_external_audio_player_title">Koristi vanjski reproduktor za zvuk</string>
     <string name="popup_mode_share_menu_title">Skočni prozor</string>
     <string name="subscribe_button_title">Pretplati se</string>
@@ -39,9 +39,9 @@
     <string name="download_path_audio_dialog_title">Odaberi mapu za preuzimanje audio datoteka</string>
     <string name="autoplay_by_calling_app_title">Automatska reprodukcija</string>
     <string name="autoplay_by_calling_app_summary">Reproducira videozapis kad je NewPipe pozvan iz druge aplikacije</string>
-    <string name="default_resolution_title">Zadana razlučivost</string>
-    <string name="default_popup_resolution_title">Zadana razlučivost skočnog prozora</string>
-    <string name="show_higher_resolutions_title">Prikaži veće razlučivosti</string>
+    <string name="default_resolution_title">Standardna rezolucija</string>
+    <string name="default_popup_resolution_title">Standardna rezolucija skočnog prozora</string>
+    <string name="show_higher_resolutions_title">Prikaži više rezolucije</string>
     <string name="show_higher_resolutions_summary">Samo neki uređaji podržavaju reprodukciju 2K/4K videozapisa</string>
     <string name="play_with_kodi_title">Reproduciraj sa Kodijem</string>
     <string name="kore_not_found">Kore aplikacija nije pronađena. Želite li ju instalirati?</string>
@@ -91,7 +91,7 @@
     <string name="refresh">Osvježi</string>
     <string name="clear">Očisti</string>
     <string name="popup_resizing_indicator_title">Mijenjanje veličine</string>
-    <string name="best_resolution">Najbolja razlučivost</string>
+    <string name="best_resolution">Najbolja rezolucija</string>
     <string name="general_error">Greška</string>
     <string name="network_error">Greška u mreži</string>
     <string name="could_not_load_thumbnails">Nije moguće učitati sve ikone</string>
@@ -662,4 +662,7 @@
     <string name="msg_calculating_hash">Izračunavanje šifriranja</string>
     <string name="hash_channel_name">Obavijest šifriranja videa</string>
     <string name="hash_channel_description">Obavijesti o napretku šifriranja videa</string>
+    <string name="recent">Nedavni</string>
+    <string name="show_meta_info_summary">Isključi za skrivanje polja metapodataka s dodatnim podacima o autoru streama, sadržaju streama ili zahtjevu za pretraživanje.</string>
+    <string name="show_meta_info_title">Prikaži metapodatke</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index b76274305c9..2b28d5ed523 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -640,4 +640,9 @@
     <string name="show_thumbnail_summary">Gunakan thumbnail untuk latar layar penguncian dan notifikasi</string>
     <string name="show_thumbnail_title">Tampilkan thumbnail</string>
     <string name="msg_calculating_hash">Mengkalkulasi hash</string>
+    <string name="recent">Baru-baru ini</string>
+    <string name="show_meta_info_summary">Nonaktifkan untuk menyembunyikan kotak info tentang informasi tambahan tentang kreator, konten stream atau pencarian.</string>
+    <string name="show_meta_info_title">Tampilkan info meta</string>
+    <string name="hash_channel_description">Notifikasi untuk laju pemrosesan hash video</string>
+    <string name="hash_channel_name">Notifikasi Hash Video</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 86d125b70b0..fca6b352a1e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -424,8 +424,8 @@
     <string name="switch_view">Cambia visualizzazione</string>
     <string name="app_update_notification_content_title">Aggiornamento di NewPipe disponibile!</string>
     <string name="app_update_notification_content_text">Premi per scaricare</string>
-    <string name="missions_header_finished">Finito</string>
-    <string name="missions_header_pending">In attesa</string>
+    <string name="missions_header_finished">Completati</string>
+    <string name="missions_header_pending">In corso</string>
     <string name="paused">in pausa</string>
     <string name="queued">accodato</string>
     <string name="post_processing">post-elaborazione</string>
@@ -473,11 +473,11 @@
     <string name="missing_file">File spostato o cancellato</string>
     <string name="overwrite_unrelated_warning">Esiste già un file con questo nome</string>
     <string name="overwrite_failed">impossibile sovrascrivere il file</string>
-    <string name="download_already_pending">C\'è un download in attesa con questo nome</string>
+    <string name="download_already_pending">C\'è un download in corso con questo nome</string>
     <string name="error_postprocessing_stopped">NewPipe è stato chiuso mentre lavorava sul file</string>
     <string name="error_insufficient_storage">Spazio insufficiente sul dispositivo</string>
     <string name="error_progress_lost">Progresso perso poiché il file è stato eliminato</string>
-    <string name="confirm_prompt">Cancellare la cronologia dei download o eliminare tutti i file scaricati\?</string>
+    <string name="confirm_prompt">Vuoi cancellare la cronologia dei download o eliminare tutti i file scaricati\?</string>
     <string name="enable_queue_limit_desc">Sarà avviato un solo dowload per volta</string>
     <string name="start_downloads">Avvia i download</string>
     <string name="pause_downloads">Sospendi i download</string>
@@ -522,7 +522,7 @@
     <string name="recovering">recupero</string>
     <string name="error_download_resource_gone">Impossibile recuperare questo download</string>
     <string name="choose_instance_prompt">Scegli un\'istanza</string>
-    <string name="clear_download_history">Elimina la cronologia dei download</string>
+    <string name="clear_download_history">Elimina cronologia dei download</string>
     <string name="delete_downloaded_files">Elimina file scaricati</string>
     <string name="deleted_downloads">%1$d download eliminati</string>
     <string name="permission_display_over_apps">Consentire la visualizzazione sopra altre applicazioni</string>
@@ -652,4 +652,7 @@
     <string name="msg_calculating_hash">Calcolo dell\'hash</string>
     <string name="hash_channel_name">Notifica Hash Video</string>
     <string name="hash_channel_description">Notifiche per lo stato di avanzamento dell\'hashing video</string>
+    <string name="recent">Recente</string>
+    <string name="show_meta_info_summary">Disattiva per nascondere i riquadri delle meta informazioni con informazioni aggiuntive sul creatore dello streaming, sul contenuto dello streaming o su una richiesta di ricerca.</string>
+    <string name="show_meta_info_title">Mostra meta info</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 398c2535c1e..ca7e03436d1 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -161,7 +161,13 @@
     <string name="rename_playlist">Snifel isem</string>
     <string name="videos_string">Tividyutin</string>
     <string name="open_in_browser">Ldi deg uminig</string>
-    <string name="view_count_text">%1$s n tmeẓriyin</string>
+    <string name="view_count_text">%1$s n tmeẓriwin</string>
     <string name="upload_date_text">Yeffeɣ-d deg %1$s</string>
-    <string name="main_bg_subtitle">Senned ɣef\"Nadi\" akken ad tebduḍ</string>
+    <string name="main_bg_subtitle">Senned ɣef «Nadi» akken ad tebduḍ
+\n</string>
+    <string name="no_views">Ula d yiwet n tmeẓriwt</string>
+    <plurals name="views">
+        <item quantity="one">%s n tmeẓriwt</item>
+        <item quantity="other">%s n tmeẓriyin</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 61dd01a922a..efdefe59e7e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -50,7 +50,8 @@
     <string name="use_tor_summary">(실험적) 향상된 프라이버시를 위해 다운로드 트래픽을 강제로 Tor를 통해 전송 (스트리밍 비디오는 아직 지원되지 않습니다).</string>
     <string name="err_dir_create">다운로드 디렉토리를 만들 수 없습니다 \'%1$s\'</string>
     <string name="info_dir_created">다운로드 디렉토리를 만들었습니다 \'%1$s\'</string>
-    <string name="main_bg_subtitle">검색 버튼을 눌러서 시작하세요</string>
+    <string name="main_bg_subtitle">\"검색\" 버튼을 눌러서 시작하세요
+\n</string>
     <string name="autoplay_by_calling_app_title">자동재생</string>
     <string name="autoplay_by_calling_app_summary">NewPipe가 다른 앱에서 호출되었을 때 동영상을 재생합니다</string>
     <string name="content">컨텐츠</string>
@@ -322,11 +323,14 @@
     <string name="previous_export">이전 내보내기</string>
     <string name="subscriptions_import_unsuccessful">구독 목록 가져오기 실패</string>
     <string name="subscriptions_export_unsuccessful">구독 목록 내보내기 실패</string>
-    <string name="import_youtube_instructions">\'YouTube 구독 파일\'을 다운로드해서 구독 목록을 가져올 수 있습니다: 
-\n 
-\n1. 이곳으로 가세요: %1$s 
-\n2. 요청에 따라 로그인을 진행합니다 
-\n3. 다운로드가 곧 시작 됩니다 (이 파일이 구독 파일입니다)</string>
+    <string name="import_youtube_instructions">Google 테이크아웃을 통해 YouTube 구독 목록을 가져올 수 있습니다:
+\n
+\n1. 이곳으로 가세요: %1$s
+\n2. 요청에 따라 로그인을 진행합니다
+\n3. \"모든 데이터 포함됨\"을 누른 뒤 \"모두 선택 해제\"를 누릅니다. 그 다음 \"구독정보\"를 선택하고 \"확인\"을 누릅니다
+\n4. \"다음 단계\"를 누르고 \"내보내기 생성\"을 선택합니다
+\n5. \"다운로드\" 버튼을 눌러 다운로드 한 후
+\n6. 테이크아웃 ZIP파일을 압축해제 하여 .json 파일 (일반적으로 \"YouTube 및 YouTube Music/구독/구독.json\")을 받고 가져옵니다.</string>
     <string name="import_soundcloud_instructions">SoundCloud 프로필을 가져오시려면 URL 및 ID를 입력해주세요. 
 \n 
 \n프로필 URL을 찾으시려면 다음 과정을 따라해 주세요. 
@@ -450,7 +454,7 @@
     <string name="pause_downloads_on_mobile_desc">모바일 데이터로 전환될 때, 일부 다운로드는 정지되지 않습니다</string>
     <string name="conferences">컨퍼런스</string>
     <string name="show_comments_title">댓글 보기</string>
-    <string name="show_comments_summary">댓글을 보지 않으려면 비활성화하세요</string>
+    <string name="show_comments_summary">댓글 숨기기</string>
     <string name="autoplay_title">자동 재생</string>
     <string name="no_comments">댓글 없음</string>
     <string name="error_unable_to_load_comments">댓글을 불러올 수 없음</string>
@@ -578,4 +582,6 @@
     <string name="notification_action_2_title">세번째 버튼</string>
     <string name="notification_action_1_title">두번째 버튼</string>
     <string name="permission_display_over_apps">다른 앱 위에 표시되는 권한 부여</string>
+    <string name="show_meta_info_title">메타 정보 표시</string>
+    <string name="notification_colorize_title">색상화된 알림</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 36ed9d6654d..aef6caf49e7 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -78,7 +78,7 @@
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Prøv igjen</string>
-    <string name="storage_permission_denied">Innvilg lagringslesetilgang først</string>
+    <string name="storage_permission_denied">Gi tilgang til lagring først</string>
     <string name="duration_live">Direkte</string>
     <string name="downloads">Nedlastinger</string>
     <string name="downloads_title">Nedlastinger</string>
@@ -367,7 +367,7 @@
 \n2. Gå til denne nettadressen: %1$s
 \n3. Logg inn når forespurt
 \n4. Kopier profil-nettadressen du ble videresendt til.</string>
-    <string name="use_inexact_seek_summary">Unøyaktig blafring tillater spilleren å blafre til posisjoner raskere med redusert nøyaktighet. Blafring i 5, 15, eller 25 sekunder fungerer ikke sammen med dette.</string>
+    <string name="use_inexact_seek_summary">Unøyaktig blafring lar spilleren søke posisjoner raskere med redusert presisjon. Å søke i 5, 15 eller 25 sekunder fungerer ikke med dette.</string>
     <string name="download_thumbnail_summary">Skru av for å stoppe innlasting av miniatyrbilder, noe som sparer data- og minnebruk. Endring av dette vil tømme både disk- og minne-hurtiglager.</string>
     <string name="auto_queue_summary">Fortsett fullendt (ikke-repeterende) avspillingskø ved å legge til en relatert strøm</string>
     <string name="enable_leak_canary_summary">Minnelekkasjeoppsyn kan forårsake programmet å opptre uresponsivt under haugdumping</string>
@@ -505,7 +505,7 @@
         <item quantity="other">%s lyttere</item>
     </plurals>
     <string name="localization_changes_requires_app_restart">Språket vil endres når programmet startes på ny.</string>
-    <string name="default_kiosk_page_summary">Forvalgt kiosk</string>
+    <string name="default_kiosk_page_summary">Standard kiosk</string>
     <string name="peertube_instance_url_title">PeerTube-instanser</string>
     <string name="local">Lokal</string>
     <string name="recently_added">Nylig lagt til</string>
@@ -525,7 +525,7 @@
     <string name="recovering">gjenoppretter</string>
     <string name="error_download_resource_gone">Kan ikke gjenopprette denne nedlastingen</string>
     <string name="seek_duration_title">Hurtigframoverspoling/-tilbakeblafringsvarighet</string>
-    <string name="permission_display_over_apps">Gi tilgang til visning over andre programmer</string>
+    <string name="permission_display_over_apps">Gi tillatelse til å vise over andre apper</string>
     <string name="app_language_title">Programspråk</string>
     <string name="systems_language">Systemforvalg</string>
     <string name="subtitle_activity_recaptcha">Trykk \"Ferdig\" når den er løst</string>
@@ -581,19 +581,19 @@
     <string name="remove_watched">Fjern sette</string>
     <string name="channel_created_by">Opprettet av %s</string>
     <string name="video_detail_by">Av %s</string>
-    <string name="youtube_restricted_mode_enabled_title">Begrenset YouTube-modus</string>
+    <string name="youtube_restricted_mode_enabled_title">Slå på YouTubes \"begrensede modus\"</string>
     <string name="never">Aldri</string>
     <string name="wifi_only">Kun på Wi-Fi</string>
     <string name="select_a_playlist">Velg en spilleliste</string>
     <string name="error_report_open_issue_button_text">Innrapporter på GitHub</string>
     <string name="auto_queue_toggle">Legg i kø automatisk</string>
-    <string name="clear_queue_confirmation_description">Kø fra aktiv avspiller vil bli avspilt</string>
-    <string name="clear_queue_confirmation_summary">Etter bytting fra en avspiller til en annen kan det hende at køen erstattes</string>
-    <string name="clear_queue_confirmation_title">Spør om bekreftelse før tømming av kø</string>
+    <string name="clear_queue_confirmation_description">Den aktive spillerkøen blir erstattet</string>
+    <string name="clear_queue_confirmation_summary">Bytte fra en spiller til en annen kan erstatte køen din</string>
+    <string name="clear_queue_confirmation_title">Be om bekreftelse før du tømmer køen</string>
     <string name="search_showing_result_for">Viser resultater for: %s</string>
     <string name="show_original_time_ago_title">Vis opprinnelig tid siden for elementer</string>
     <string name="notification_action_buffering">Bygger mellomlager</string>
-    <string name="notification_action_shuffle">Veksle</string>
+    <string name="notification_action_shuffle">Tilfeldig rekkefølge</string>
     <string name="feed_use_dedicated_fetch_method_help_text">Synes du at strøminnlastingen er for treg\? Prøv å skru på rask innlasting (du kan endre det i innstillingene, eller ved å trykke på knappen nedenfor).
 \n
 \nNewPipe tilbyr to strøminnlastingsstrategier:
@@ -606,10 +606,10 @@
 \n
 \nValget koker ned til det du foretrekker: hastighet eller presis info.</string>
     <string name="show_original_time_ago_summary">Originaltekster fra tjenester vil vises for elementer i strømmen</string>
-    <string name="error_report_open_github_notice">Sjekk hvorvidt en feilrapport som omhandler problemet ditt allerede finnes. Når du oppretter dupliserte feilrapporter stjeler du tid fra prosjektet som kunne blitt brukt til å fikse feilen.</string>
-    <string name="notification_actions_at_most_three">Du kan velge opptil tre handlinger å vise i kompaktmerknaden.</string>
-    <string name="notification_actions_summary">Rediger hver merknadshandling nedenfor ved å trykke på den. Velg opptil tre av dem for visning i den kompakte merknaden ved å bruke avkryssningsboksene til høyre.</string>
-    <string name="notification_scale_to_square_image_summary">Skaler video-miniatyrbildet vist i merknaden fra 16:9 til 1:1-aspekt (forvrengning kan oppstå)</string>
+    <string name="error_report_open_github_notice">Sjekk om det allerede eksisterer et problem som diskuterer krasj. Når du oppretter duplikatbilletter, tar du deg tid fra oss som vi kan bruke på å fikse den faktiske feilen.</string>
+    <string name="notification_actions_at_most_three">Du kan maksimalt velge tre handlinger som skal vises i kompaktvarselet!</string>
+    <string name="notification_actions_summary">Rediger hver varslingshandling nedenfor ved å trykke på den. Velg opptil tre av dem som skal vises i det kompakte varselet ved å bruke avmerkingsboksene til høyre.</string>
+    <string name="notification_scale_to_square_image_summary">Skaler videominiatyrbildet som vises i varselet fra 16:9 til 1:1 sideforhold (kan føre til forvrengninger)</string>
     <string name="feed_use_dedicated_fetch_method_summary">Tilgjengelig i noen tjenester, det er vanligvis mye raskere, men kan gi et begrenset antall elementer, og ofte ufullstendig info (f.eks. ingen varighet, elementtype, ingen sanntidsstatus).</string>
     <string name="feed_use_dedicated_fetch_method_title">Hent fra dedikert strøm når tilgjengelig</string>
     <string name="feed_update_threshold_summary">Tid etter siste oppdatering før et abonnement anslås utdatert — %s</string>
@@ -629,13 +629,13 @@
     <string name="no_playlist_bookmarked_yet">Ingen spillelistebokmerker enda</string>
     <string name="copy_for_github">Kopier formatert rapport</string>
     <string name="settings_category_notification_title">Merknad</string>
-    <string name="notification_action_repeat">Gjentagelse</string>
+    <string name="notification_action_repeat">Gjenta</string>
     <string name="notification_action_4_title">Femte handlingstast</string>
     <string name="notification_action_3_title">Fjerde handlingstast</string>
     <string name="notification_action_2_title">Tredje handlingstast</string>
     <string name="notification_action_1_title">Andre handlingstast</string>
     <string name="notification_action_0_title">Første handlingstast</string>
-    <string name="notification_scale_to_square_image_title">Skaler miniatyrbilde til 1:1-aspekt</string>
+    <string name="notification_scale_to_square_image_title">Skaler miniatyrbildet til 1: 1-sideforhold</string>
     <string name="notification_action_nothing">Ingenting</string>
     <string name="show_memory_leaks">Vis minnelekkasjer</string>
     <string name="enqueued">Satt i kø</string>
@@ -643,13 +643,16 @@
     <string name="clear_cookie_title">Tøm reCAPTCHA-kaker</string>
     <string name="recaptcha_cookies_cleared">reCAPTCHA-kaker har blitt slettet</string>
     <string name="clear_cookie_summary">Tøm kaker som NewPipe lagrer når du løser en reCAPTCHA</string>
-    <string name="youtube_restricted_mode_enabled_summary">YouTube tilbyr et «Begrenset modus» som skjuler mulig innhold kun for voksne.</string>
-    <string name="show_age_restricted_content_summary">Vis innhold som muligens er upassende for barn, siden det har aldersgrense (som 18+).</string>
-    <string name="notification_colorize_summary">Få Android til å tilpasse merknadens farge i henhold til hovedfargen på miniatyrbildet (merk at dette ikke støttes på alle enheter)</string>
+    <string name="youtube_restricted_mode_enabled_summary">YouTube tilbyr en \"Begrenset modus\" som skjuler potensielt modent innhold</string>
+    <string name="show_age_restricted_content_summary">Vis innhold som muligens er uegnet for barn fordi det har en aldersgrense (som 18+)</string>
+    <string name="notification_colorize_summary">La Android tilpasse varselets farge i henhold til hovedfargen i miniatyrbildet (merk at dette ikke er tilgjengelig på alle enheter)</string>
     <string name="notification_colorize_title">Fargelegg merknad</string>
     <string name="show_thumbnail_summary">Vis miniatyrbilde på låseskjerm som bakgrunn og i merknader</string>
     <string name="show_thumbnail_title">Vis miniatyrbilde</string>
     <string name="msg_calculating_hash">Regner ut sjekksum</string>
     <string name="hash_channel_description">Merknad for videosjekksummeringsframdrift</string>
     <string name="hash_channel_name">Videosjekksumsmerknad</string>
+    <string name="show_meta_info_summary">Slå av for å skjule metainformasjonsbokser med tilleggsinformasjon om strømskaperen, strøminnhold eller en søkeforespørsel.</string>
+    <string name="show_meta_info_title">Vis metainfo</string>
+    <string name="recent">Nylige</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 81fbb7f55b7..f2c24753039 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -132,8 +132,8 @@
     <string name="switch_to_main">Verplaatsen naar normaal</string>
     <string name="import_data_title">Databank importeren</string>
     <string name="export_data_title">Databank exporteren</string>
-    <string name="import_data_summary">Dit overschrijft uw huidige geschiedenis en abonnementen</string>
-    <string name="export_data_summary">Exporteert geschiedenis, abonnementen en speellijsten</string>
+    <string name="import_data_summary">Dit overschrijft uw huidige geschiedenis, abonnementen, speellijsten en optioneel uw instellingen</string>
+    <string name="export_data_summary">Exporteert geschiedenis, abonnementen, speellijsten en instellingen</string>
     <string name="general_error">Fout</string>
     <string name="network_error">Netwerkfout</string>
     <string name="could_not_load_thumbnails">Kon niet alle miniaturen laden</string>
@@ -647,4 +647,12 @@
     <string name="show_original_time_ago_title">Toon oorspronkelijke tijd geleden op items</string>
     <string name="notification_colorize_summary">Laat Android de kleur van de notificatie aanpassen, op basis van de meest voorkomende kleur in de thumbnail (let op: niet beschikbaar op elk apparaat)</string>
     <string name="notification_colorize_title">Notificatie kleur aanpassen</string>
+    <string name="recent">Recent</string>
+    <string name="show_thumbnail_summary">Gebruik miniatuur voor de achtergrond en meldingen op vergrendeld scherm</string>
+    <string name="show_thumbnail_title">Toon miniatuur</string>
+    <string name="msg_calculating_hash">Hash aan het berekenen</string>
+    <string name="hash_channel_description">Meldingen van vooruitgang video hashing</string>
+    <string name="hash_channel_name">Video Hash Melding</string>
+    <string name="show_meta_info_summary">Zet uit om metadata pop-ups te verbergen met extra informatie over de stream auteur, stream inhoud of een zoekaanvraag.</string>
+    <string name="show_meta_info_title">Toon metadata</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e120750fc75..c7a03017301 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -175,7 +175,7 @@
     <string name="enable_watch_history_summary">Kijkgeschiedenis bijhouden</string>
     <string name="resume_on_audio_focus_gain_title">Hervat afspelen</string>
     <string name="resume_on_audio_focus_gain_summary">Ga verder met afspelen na onderbrekingen (b.v. telefoongesprekken)</string>
-    <string name="notification_channel_name">NewPipe-melding</string>
+    <string name="notification_channel_name">NewPipe Melding</string>
     <string name="notification_channel_description">Meldingen voor NewPipe-achtergrond- en pop-upspelers</string>
     <string name="title_activity_history">Geschiedenis</string>
     <string name="title_history_search">Gezocht</string>
@@ -405,7 +405,7 @@
     <string name="brightness_gesture_control_summary">Gebruik gebaren om de helderheid van de speler aan te passen</string>
     <string name="settings_category_updates_title">Updates</string>
     <string name="file_deleted">Bestand verwijderd</string>
-    <string name="app_update_notification_channel_name">Appupdatemelding</string>
+    <string name="app_update_notification_channel_name">App Update Melding</string>
     <string name="app_update_notification_channel_description">Meldingen voor nieuwe versies van NewPipe</string>
     <string name="download_to_sdcard_error_title">Externe opslag niet beschikbaar</string>
     <string name="download_to_sdcard_error_message">Downloaden naar externe SD-kaart is niet mogelijk. Download map opnieuw instellen\?</string>
@@ -649,4 +649,10 @@
     <string name="notification_colorize_title">Notificatie kleur aanpassen</string>
     <string name="show_thumbnail_summary">Toon miniatuurafbeelding op het vergrendelscherm als achtergrond en binnen meldingen</string>
     <string name="show_thumbnail_title">Toon miniatuurafbeelding</string>
+    <string name="recent">Recent</string>
+    <string name="msg_calculating_hash">Hash berekenen</string>
+    <string name="hash_channel_description">Meldingen over de voortgang van video hashing</string>
+    <string name="hash_channel_name">Video Hash Melding</string>
+    <string name="show_meta_info_summary">Schakel dit uit om metainformatie vakken te verbergen met aanvullende informatie over de maker van de stream, streaminhoud of een zoekopdracht.</string>
+    <string name="show_meta_info_title">Toon meta informatie</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 231702c24a5..470659aa6d3 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -659,4 +659,10 @@
     <string name="notification_colorize_title">Pokolorowanie powiadomienia</string>
     <string name="show_thumbnail_summary">Używaj miniatury zarówno jako tła ekranu blokady, jak i powiadomień</string>
     <string name="show_thumbnail_title">Pokazuj miniaturę</string>
+    <string name="recent">Ostatnie</string>
+    <string name="msg_calculating_hash">Obliczanie skrótu</string>
+    <string name="hash_channel_description">Powiadomienia o postępie tworzenia skrótów wideo</string>
+    <string name="hash_channel_name">Powiadomienie o obliczaniu skrótu wideo</string>
+    <string name="show_meta_info_summary">Wyłącz, aby ukryć pola z dodatkowymi informacjami o twórcy strumienia, zawartości strumienia lub żądaniu wyszukiwania.</string>
+    <string name="show_meta_info_title">Pokaż metainformacje</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b9c352e7957..2227be70e34 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="audio">Áudio</string>
-    <string name="youtube_signature_deobfuscation_error">Não foi possível descriptografar assinatura do URL do vídeo</string>
+    <string name="youtube_signature_deobfuscation_error">Não foi possível decodificar assinatura do URL do vídeo</string>
     <string name="your_comment">Seu comentário (em inglês):</string>
     <string name="what_happened_headline">O que ocorreu:</string>
     <string name="what_device_headline">Informação:</string>
     <string name="view_count_text">%1$s visualizações</string>
     <string name="view">Reproduzir</string>
     <string name="video">Vídeo</string>
-    <string name="autoplay_by_calling_app_summary">Reproduz um vídeo se NewPipe for chamado por outro app</string>
-    <string name="autoplay_by_calling_app_title">Autoreprodução</string>
-    <string name="black_theme_title">Amoled</string>
+    <string name="autoplay_by_calling_app_summary">Reproduz um vídeo quando o NewPipe for chamado por outro app</string>
+    <string name="autoplay_by_calling_app_title">Reprodução automática</string>
+    <string name="black_theme_title">Preto</string>
     <string name="cancel">Cancelar</string>
     <string name="checksum">Checksum</string>
     <string name="choose_browser">Escolher navegador</string>
@@ -18,8 +18,8 @@
     <string name="content_not_available">Conteúdo indisponível</string>
     <string name="could_not_get_stream">Nenhum vídeo pôde ser encontrado</string>
     <string name="could_not_load_image">A imagem não pôde ser carregada</string>
-    <string name="could_not_load_thumbnails">As capas não puderam ser carregadas</string>
-    <string name="dark_theme_title">Noite</string>
+    <string name="could_not_load_thumbnails">As miniaturas não puderam ser carregadas</string>
+    <string name="dark_theme_title">Escuro</string>
     <string name="default_audio_format_title">Formato de áudio padrão</string>
     <string name="default_resolution_title">Resolução padrão</string>
     <string name="delete">Excluir</string>
@@ -37,7 +37,7 @@
     <string name="general_error">Erro</string>
     <string name="info_dir_created">Pasta de download criada \'%1$s\'</string>
     <string name="install">Instalar</string>
-    <string name="light_theme_title">Dia</string>
+    <string name="light_theme_title">Claro</string>
     <string name="msg_error">Erro</string>
     <string name="msg_copied">Copiado para a área de transferência</string>
     <string name="msg_name">Nome do arquivo</string>
@@ -53,18 +53,18 @@
     <string name="report_error">Relatar erro</string>
     <string name="retry">Tentar novamente</string>
     <string name="screen_rotation">Rotação</string>
-    <string name="content_language_title">Idioma de conteúdo padrão</string>
+    <string name="content_language_title">Idioma padrão do conteúdo</string>
     <string name="settings">Configurações</string>
-    <string name="settings_category_appearance_title">Interface</string>
+    <string name="settings_category_appearance_title">Aparência</string>
     <string name="settings_category_other_title">Outros</string>
     <string name="settings_category_video_audio_title">Vídeo e áudio</string>
     <string name="share">Compartilhar</string>
     <string name="share_dialog_title">Compartilhar com</string>
     <string name="show_age_restricted_content_title">Mostrar conteúdo com restrição de idade</string>
     <string name="show_next_and_similar_title">Mostrar \'Próximo\' e \'Similares\'</string>
-    <string name="sorry_string">Desculpe, isto não devia ter ocorrido.</string>
+    <string name="sorry_string">Desculpe, isto não devia ter acontecido.</string>
     <string name="start">Iniciar</string>
-    <string name="storage_permission_denied">Permita acesso ao armazenamento primeiramente</string>
+    <string name="storage_permission_denied">Permita acesso ao armazenamento primeiro</string>
     <string name="theme_title">Tema</string>
     <string name="upload_date_text">Publicado em  %1$s</string>
     <string name="unsupported_url">Link não suportado</string>
@@ -78,15 +78,15 @@
     <string name="could_not_setup_download_menu">O menu de download não pôde ser configurado</string>
     <string name="detail_thumbnail_view_description">Reproduzir vídeo, duração:</string>
     <string name="detail_uploader_thumbnail_view_description">Miniatura do avatar do uploader</string>
-    <string name="download_path_audio_dialog_title">Escolher pasta de download de áudios</string>
-    <string name="download_path_audio_summary">Áudios baixados serão salvos aqui</string>
-    <string name="download_path_audio_title">Pasta de áudios baixados</string>
+    <string name="download_path_audio_dialog_title">Escolher pasta de download para arquivos de áudio</string>
+    <string name="download_path_audio_summary">Áudios baixados são salvos aqui</string>
+    <string name="download_path_audio_title">Pasta de download de áudios</string>
     <string name="download_path_dialog_title">Escolher pasta de download para arquivos de vídeo</string>
     <string name="download_path_summary">Vídeos baixados são salvos aqui</string>
     <string name="download_path_title">Pasta de download de vídeo</string>
     <string name="kore_not_found">Instalar o app Kore\?</string>
     <string name="light_parsing_error">O site não pôde ser analisado totalmente</string>
-    <string name="list_thumbnail_view_description">Capa de visualização do vídeo</string>
+    <string name="list_thumbnail_view_description">Miniatura de visualização do vídeo</string>
     <string name="live_streams_not_supported">Transmissões ao vivo ainda não são suportadas</string>
     <string name="main_bg_subtitle">Toque em \"Buscar\" para iniciar
 \n</string>
@@ -99,18 +99,18 @@
     <string name="play_audio">Áudio</string>
     <string name="play_with_kodi_title">Ver com Kodi</string>
     <string name="search">Buscar</string>
-    <string name="show_play_with_kodi_summary">Exibe opção para ver um vídeo via Kodi media center</string>
+    <string name="show_play_with_kodi_summary">Exibe uma opção para ver um vídeo via Kodi media center</string>
     <string name="use_external_audio_player_title">Usar player de áudio externo</string>
     <string name="use_external_video_player_title">Usar player de vídeo externo</string>
     <string name="use_tor_summary">(Experimental) Força o download de conteúdo através do Tor para maior privacidade (transmissão de vídeos ainda não suportada).</string>
-    <string name="use_tor_title">Usar tor</string>
+    <string name="use_tor_title">Usar Tor</string>
     <string name="user_report">Relatório do usuário</string>
     <string name="show_play_with_kodi_title">Exibir opção \"Ver com Kodi\"</string>
     <string name="info_labels">Ocorrido:\\nPedido:\\nIdioma do conteúdo:\\nPaís do conteúdo:\\nIdioma do app:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO:</string>
     <string name="open_in_popup_mode">Abrir no modo popup</string>
-    <string name="default_popup_resolution_title">Resolução padrão de popup</string>
+    <string name="default_popup_resolution_title">Resolução padrão do popup</string>
     <string name="show_higher_resolutions_title">Mostrar resoluções maiores</string>
-    <string name="show_higher_resolutions_summary">Poucos aparelhos suportam ver em 2K/4K</string>
+    <string name="show_higher_resolutions_summary">Apenas alguns aparelhos suportam vídeos em 2K/4K</string>
     <string name="default_video_format_title">Formato de vídeo padrão</string>
     <string name="popup_playing_toast">Reproduzindo em modo popup</string>
     <string name="all">Tudo</string>
@@ -120,7 +120,7 @@
     <string name="disabled">Desativado</string>
     <string name="short_thousand">k</string>
     <string name="short_million">M</string>
-    <string name="short_billion">B</string>
+    <string name="short_billion">Bi</string>
     <string name="msg_popup_permission">Essa permissão é necessária
 \npara abrir em modo popup</string>
     <string name="popup_mode_share_menu_title">Modo popup</string>
@@ -130,11 +130,11 @@
     <string name="controls_popup_title">Popup</string>
     <string name="controls_background_title">Segundo plano</string>
     <string name="popup_remember_size_pos_title">Lembrar propriedades do popup</string>
-    <string name="popup_remember_size_pos_summary">Lembra do último tamanho e posição usado no popup</string>
+    <string name="popup_remember_size_pos_summary">Lembra o último tamanho e a posição do popup</string>
     <string name="settings_category_popup_title">Popup</string>
     <string name="popup_resizing_indicator_title">Redimensionando</string>
     <string name="use_external_video_player_summary">Remove o som em algumas resoluções</string>
-    <string name="player_gesture_controls_title">Controle de gesto do player</string>
+    <string name="player_gesture_controls_title">Controles de gestos do player</string>
     <string name="player_gesture_controls_summary">Use gestos para mudar volume e brilho do player</string>
     <string name="show_search_suggestions_title">Sugestões de busca</string>
     <string name="show_search_suggestions_summary">Exibe sugestões ao buscar</string>
@@ -163,7 +163,7 @@
     <string name="charset_most_special_characters">Caracteres especiais</string>
     <string name="subscribe_button_title">Inscrever-se</string>
     <string name="subscribed_button_title">Inscrito</string>
-    <string name="channel_unsubscribed">Canal não inscrito</string>
+    <string name="channel_unsubscribed">Desinscrito do canal</string>
     <string name="subscription_change_failed">Não foi possível alterar inscrição</string>
     <string name="subscription_update_failed">Não foi possível atualizar inscrição</string>
     <string name="tab_main">Principal</string>
@@ -174,7 +174,7 @@
     <string name="enable_search_history_title">Histórico de busca</string>
     <string name="enable_search_history_summary">Armazena histórico de busca localmente</string>
     <string name="enable_watch_history_title">Histórico de vídeo</string>
-    <string name="enable_watch_history_summary">Armazena histórico de vídeo</string>
+    <string name="enable_watch_history_summary">Armazena histórico de vídeos</string>
     <string name="title_activity_history">Histórico</string>
     <string name="title_history_search">Buscado</string>
     <string name="title_history_view">Visto</string>
@@ -201,8 +201,8 @@
     </plurals>
     <string name="no_videos">Nenhum vídeo</string>
     <plurals name="videos">
-        <item quantity="one">%s Vídeo</item>
-        <item quantity="other">%s Vídeos</item>
+        <item quantity="one">%s vídeo</item>
+        <item quantity="other">%s vídeos</item>
     </plurals>
     <string name="item_deleted">Item excluído</string>
     <string name="settings_category_player_title">Player</string>
@@ -242,12 +242,12 @@
     <string name="give_back">Retribuir</string>
     <string name="website_title">Site oficial</string>
     <string name="website_encouragement">Visite o site NewPipe para mais informações e novidades.</string>
-    <string name="no_player_found_toast">Não há player de vídeo (pode instalar VLC para vê-lo).</string>
-    <string name="default_content_country_title">País de conteúdo padrão</string>
+    <string name="no_player_found_toast">Não há player de vídeo (você pode instalar o VLC para vê-lo).</string>
+    <string name="default_content_country_title">País padrão do conteúdo</string>
     <string name="service_title">Serviço</string>
     <string name="always">Sempre</string>
     <string name="just_once">Uma vez</string>
-    <string name="toggle_orientation">Alterar orientação</string>
+    <string name="toggle_orientation">Alternar orientação</string>
     <string name="switch_to_background">Mudar para segundo plano</string>
     <string name="switch_to_popup">Mudar para popup</string>
     <string name="switch_to_main">Mudar para principal</string>
@@ -306,13 +306,13 @@
     <string name="enable_leak_canary_summary">A monitoração de vazamento de memória pode tornar o app instável</string>
     <string name="enable_disposed_exceptions_title">Reportar erros fora do ciclo de vida</string>
     <string name="enable_disposed_exceptions_summary">Força relatório de exceções Rx não entregues fora do ciclo de vida do fragmento ou atividade após o descarte</string>
-    <string name="use_inexact_seek_title">Usar avanço rápido</string>
+    <string name="use_inexact_seek_title">Usar avanço rápido (inexato)</string>
     <string name="use_inexact_seek_summary">Avanço inexato permite ao player achar posições mais rápido reduzindo a precisão. Avançar 5, 15 ou 25 segundos não funciona com isto.</string>
     <string name="auto_queue_title">Pôr próximo vídeo na fila automaticamente</string>
     <string name="auto_queue_summary">Continua fila (sem loop) anexando vídeos similares</string>
     <string name="file">Arquivo</string>
-    <string name="invalid_directory">Não há tal pasta</string>
-    <string name="invalid_source">Não existe tal arquivo/fonte do conteúdo</string>
+    <string name="invalid_directory">Pasta não existe</string>
+    <string name="invalid_source">Arquivo/fonte do conteúdo não existe</string>
     <string name="invalid_file">O arquivo não existe ou não há permissão para leitura ou escrita</string>
     <string name="file_name_empty_error">O nome do arquivo não pode estar vazio</string>
     <string name="error_occurred_detail">Um erro ocorreu: %1$s</string>
@@ -344,14 +344,14 @@
     <string name="import_network_expensive_warning">Tenha em mente que esta operação poderá usar bastante a conexão com a internet.
 \n
 \nVocê deseja continuar?</string>
-    <string name="download_thumbnail_title">Carregar capas</string>
+    <string name="download_thumbnail_title">Carregar miniaturas</string>
     <string name="thumbnail_cache_wipe_complete_notice">Cache de imagens limpo</string>
     <string name="metadata_cache_wipe_title">Limpar metadados em cache</string>
     <string name="metadata_cache_wipe_summary">Exclui todos os dados em cache de páginas</string>
     <string name="metadata_cache_wipe_complete_notice">Cache de metadados limpo</string>
     <string name="playback_speed_control">Controles de velocidade de reprodução</string>
     <string name="playback_tempo">Ritmo</string>
-    <string name="download_thumbnail_summary">Desative para não carregar capas e economizar em uso de dados e memória. A alteração limpa todo o cache de imagens.</string>
+    <string name="download_thumbnail_summary">Desative para não carregar miniaturas e economizar em uso de dados e memória. A alteração limpa todo o cache de imagens.</string>
     <string name="playback_pitch">Altura</string>
     <string name="unhook_checkbox">Desvincular (pode causar distorção)</string>
     <string name="preferred_open_action_settings_title">Ação de \'abrir\' preferida</string>
@@ -363,7 +363,7 @@
     <string name="caption_setting_description">Mudar tamanho da legenda e estilos de fundo. Requer reiniciar o app para ter efeito.</string>
     <string name="toast_no_player">Sem app instalado para reproduzir este arquivo</string>
     <string name="clear_views_history_title">Excluir histórico de vídeo</string>
-    <string name="clear_views_history_summary">Exclui histórico de vídeo e posições de reprodução</string>
+    <string name="clear_views_history_summary">Exclui o histórico de vídeos e as posições de reprodução</string>
     <string name="delete_view_history_alert">Excluir todo o histórico de vídeo\?</string>
     <string name="watch_history_deleted">Histórico de vídeo limpo.</string>
     <string name="clear_search_history_title">Excluir histórico de busca</string>
@@ -398,9 +398,9 @@
     <string name="unsubscribe">Desinscrever-se</string>
     <string name="tab_new">Nova aba</string>
     <string name="tab_choose">Escolher aba</string>
-    <string name="volume_gesture_control_title">Gestos para volume</string>
+    <string name="volume_gesture_control_title">Gesto para volume</string>
     <string name="volume_gesture_control_summary">Use gestos para mudar volume do player</string>
-    <string name="brightness_gesture_control_title">Gestos para brilho</string>
+    <string name="brightness_gesture_control_title">Gesto para brilho</string>
     <string name="brightness_gesture_control_summary">Use gestos para mudar brilho do player</string>
     <string name="settings_category_debug_title">Depuração</string>
     <string name="settings_category_updates_title">Atualizações</string>
@@ -493,7 +493,7 @@
     <string name="clear_playback_states_summary">Exclui toda as posições de reprodução</string>
     <string name="delete_playback_states_alert">Excluir todas as posições de reprodução\?</string>
     <string name="download_choose_new_path">Mude as pastas de download para ter efeito</string>
-    <string name="drawer_header_description">Alterar serviço, selecionados:</string>
+    <string name="drawer_header_description">Alternar serviço, selecionados:</string>
     <string name="default_kiosk_page_summary">Quiosque Padrão</string>
     <string name="no_one_watching">Ninguém está vendo</string>
     <plurals name="watching">
@@ -511,9 +511,9 @@
     <string name="peertube_instance_url_summary">Escolha suas instâncias PeerTube favoritas</string>
     <string name="peertube_instance_url_help">Procure instâncias que gosta em %s</string>
     <string name="peertube_instance_add_title">Adicionar instância</string>
-    <string name="peertube_instance_add_help">Insira o link aqui</string>
+    <string name="peertube_instance_add_help">Insira o link da instância</string>
     <string name="peertube_instance_add_fail">Erro ao validar a instância</string>
-    <string name="peertube_instance_add_https_only">Apenas HTTPS são suportados</string>
+    <string name="peertube_instance_add_https_only">Apenas links HTTPS são suportados</string>
     <string name="peertube_instance_add_exists">Instância já existe</string>
     <string name="local">Local</string>
     <string name="recently_added">Recentes</string>
@@ -607,7 +607,7 @@
     <string name="channel_created_by">Criado por %s</string>
     <string name="detail_sub_channel_thumbnail_view_description">Capa do avatar do canal</string>
     <string name="feed_group_show_only_ungrouped_subscriptions">Mostrar apenas inscrições não agrupadas</string>
-    <string name="search_showing_result_for">Mostrando resultados para\? %s</string>
+    <string name="search_showing_result_for">Mostrando resultados para: %s</string>
     <string name="no_playlist_bookmarked_yet">Ainda não há favoritos de playlists</string>
     <string name="playlist_page_summary">Página da playlist</string>
     <string name="select_a_playlist">Selecione uma playlist</string>
@@ -623,7 +623,7 @@
     <string name="clear_queue_confirmation_description">A fila do player ativo será substituída</string>
     <string name="clear_queue_confirmation_summary">Mudar de um player para outro pode substituir sua fila</string>
     <string name="clear_queue_confirmation_title">Solicitar confirmação antes de limpar uma fila</string>
-    <string name="notification_action_shuffle">Embaralhar (Shuffle)</string>
+    <string name="notification_action_shuffle">Aleatório (Shuffle)</string>
     <string name="notification_action_buffering">Buferizando</string>
     <string name="settings_category_notification_title">Notificação</string>
     <string name="notification_action_nothing">Nada</string>
@@ -635,7 +635,7 @@
     <string name="notification_action_2_title">Terceiro botão de ação</string>
     <string name="notification_action_1_title">Segundo botão de ação</string>
     <string name="notification_action_0_title">Primeiro botão de ação</string>
-    <string name="notification_scale_to_square_image_summary">Dimensione a miniatura do vídeo mostrada na notificação de proporção 16:9 para 1:1 (pode apresentar distorções)</string>
+    <string name="notification_scale_to_square_image_summary">Dimensione a miniatura do vídeo mostrada na notificação da proporção 16:9 para 1:1 (pode apresentar distorções)</string>
     <string name="notification_scale_to_square_image_title">Dimensione a miniatura para a proporção de 1:1</string>
     <string name="show_memory_leaks">Mostrar vazamentos de memória</string>
     <string name="enqueued">Na fila</string>
@@ -644,12 +644,15 @@
     <string name="clear_cookie_title">Apagar cookies de reCAPTCHA</string>
     <string name="recaptcha_cookies_cleared">Os cookies de reCAPTCHA foram apagados</string>
     <string name="youtube_restricted_mode_enabled_summary">O YouTube oferece um \"Modo Restrito\" que oculta conteúdo potencialmente adulto</string>
-    <string name="show_age_restricted_content_summary">Mostrar conteúdo possivelmente inadequado para crianças porque tem um limite de idade (como +18)</string>
-    <string name="notification_colorize_summary">Permite o Android personalizar a cor da notificação de acordo com a cor principal da miniatura (note que isso não está disponível em todos os dispositivos)</string>
+    <string name="show_age_restricted_content_summary">Mostrar conteúdo possivelmente inadequado para crianças que tem um limite de idade (como +18)</string>
+    <string name="notification_colorize_summary">Permite que o Android personalize a cor da notificação de acordo com a cor principal da miniatura (note que isso não está disponível em todos os dispositivos)</string>
     <string name="notification_colorize_title">Colorir notificação</string>
     <string name="show_thumbnail_summary">Usar miniatura para o plano de fundo da tela de bloqueio e as notificações</string>
     <string name="show_thumbnail_title">Mostrar miniatura</string>
     <string name="msg_calculating_hash">Calculando hash</string>
     <string name="hash_channel_description">Notificações para o progresso do hash do vídeo</string>
     <string name="hash_channel_name">Notificação de Hash do Vídeo</string>
+    <string name="show_meta_info_summary">Desative para ocultar as caixas de informações meta com informações adicionais sobre o criador, conteúdo do stream ou uma solicitação de pesquisa.</string>
+    <string name="show_meta_info_title">Mostrar informação meta</string>
+    <string name="recent">Recente</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 893abf31a10..1064a85e28a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -647,6 +647,12 @@
     <string name="show_age_restricted_content_summary">Mostrar conteúdo possivelmente impróprio para crianças porque tem um limite de idade (como 18+)</string>
     <string name="notification_colorize_summary">Fazer com que o Android personalize a cor da notificação de acordo com a cor principal na miniatura (esta opção não está disponível em todos os dispositivos)</string>
     <string name="notification_colorize_title">Colorir notificação</string>
-    <string name="show_thumbnail_summary">Mostrar miniaturas no ecrã de bloqueio como fundo e como notificação</string>
+    <string name="show_thumbnail_summary">Usar miniaturas no fundo do ecrã de bloqueio e em notificações</string>
     <string name="show_thumbnail_title">Mostrar miniatura</string>
+    <string name="recent">Recente</string>
+    <string name="msg_calculating_hash">A calcular \'hash\'</string>
+    <string name="hash_channel_description">Notificar sobre o progresso das \'hash\' de vídeos</string>
+    <string name="hash_channel_name">Notificação \'hash\' do vídeo</string>
+    <string name="show_meta_info_summary">Desligue para ocultar caixas de informações meta com informações adicionais sobre o criador do fluxo, conteúdo de fluxo ou uma solicitação de pesquisa.</string>
+    <string name="show_meta_info_title">Mostrar informação meta</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4799c6ea004..c5b479d8b20 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -652,4 +652,7 @@
     <string name="msg_calculating_hash">A calcular \'hash\'</string>
     <string name="hash_channel_description">Notificar sobre o progresso das \'hash\' de vídeos</string>
     <string name="hash_channel_name">Notificação \'hash\' do vídeo</string>
+    <string name="recent">Recente</string>
+    <string name="show_meta_info_summary">Desligue para ocultar caixas de informações meta com informações adicionais sobre o criador do fluxo, conteúdo de fluxo ou uma solicitação de pesquisa.</string>
+    <string name="show_meta_info_title">Mostrar informação meta</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index fe201910c94..b874b23b9b2 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -10,15 +10,15 @@
     <string name="download">Descărcare</string>
     <string name="search">Căutare</string>
     <string name="settings">Setări</string>
-    <string name="did_you_mean">V-ați referit la: %1$s\?</string>
+    <string name="did_you_mean">V-ați referit la: %1$s \?</string>
     <string name="share_dialog_title">Partajează cu</string>
     <string name="choose_browser">Alegeți browser-ul</string>
     <string name="screen_rotation">rotație</string>
     <string name="use_external_video_player_title">Folosește un player video extern</string>
     <string name="use_external_audio_player_title">Folosește un player audio extern</string>
     <string name="download_path_title">Locația videoclipurilor descărcate</string>
-    <string name="download_path_summary">Videoclipurile descărcate vor fi salvate aici</string>
-    <string name="download_path_dialog_title">Alegeți locația unde se vor descărca videoclipurile</string>
+    <string name="download_path_summary">Videoclipurile descărcate sunt stocate aici</string>
+    <string name="download_path_dialog_title">Alegeți locația unde se vor descărca clipurile video</string>
     <string name="download_path_audio_title">Directorul audio-ului descărcat</string>
     <string name="download_path_audio_summary">Locul în care se vor descărca fișierele audio</string>
     <string name="download_path_audio_dialog_title">Alegeți locația în care se vor descărca fişierele audio</string>
@@ -34,15 +34,15 @@
     <string name="dark_theme_title">Întunecat</string>
     <string name="light_theme_title">Luminos</string>
     <string name="download_dialog_title">Descărcați</string>
-    <string name="show_next_and_similar_title">Arată videoclipurile care urmează și similare</string>
+    <string name="show_next_and_similar_title">Arată videoclipurile care \'Urmează\' şi cele \'Similare\'</string>
     <string name="unsupported_url">URL nesuportat</string>
     <string name="content_language_title">Limba dorită a conținutului</string>
-    <string name="settings_category_video_audio_title">Video &amp; Audio</string>
+    <string name="settings_category_video_audio_title">Video și Audio</string>
     <string name="settings_category_appearance_title">Aspect</string>
     <string name="settings_category_other_title">Altele</string>
     <string name="background_player_playing_toast">Redare în fundal</string>
     <string name="content">Conținut</string>
-    <string name="show_age_restricted_content_title">Conținut restricționat în funcție de vârstă</string>
+    <string name="show_age_restricted_content_title">Arată conținutul restricționat în funcție de vârstă</string>
     <string name="general_error">Eroare</string>
     <string name="network_error">Eroare de rețea</string>
     <string name="could_not_load_thumbnails">Nu s-au putut încărca toate thumbnail-urile</string>
@@ -52,36 +52,37 @@
     <string name="could_not_setup_download_menu">Imposibil de inițializat meniul pentru descărcări</string>
     <string name="live_streams_not_supported">LIVE STREAM-uri încă nu sunt suportate</string>
     <string name="list_thumbnail_view_description">Thumbnail-ul videoclipului</string>
-    <string name="detail_thumbnail_view_description">Thumbnail de previzualizare al videoclipului</string>
+    <string name="detail_thumbnail_view_description">Redare videoclip, durată:</string>
     <string name="detail_uploader_thumbnail_view_description">Thumbnail-ul avatarului autorului</string>
     <string name="detail_likes_img_view_description">Au apreciat</string>
     <string name="detail_dislikes_img_view_description">Nu au apreciat</string>
     <string name="use_tor_title">Folosește Tor</string>
     <string name="use_tor_summary">(Experimental) Forțează descărcarea traficului prin Tor pentru intimitate crescută (transmiterea în flux a videoclipurilor nu este deocamdată suportată).</string>
     <string name="err_dir_create">Nu s-a putut crea directorul de descărcare \'%1$s\'</string>
-    <string name="main_bg_subtitle">Apăsați căutare pentru a începe</string>
+    <string name="main_bg_subtitle">Apăsați căutare pentru a începe
+\n</string>
     <string name="autoplay_by_calling_app_title">Redare automată</string>
     <string name="autoplay_by_calling_app_summary">Redă un videoclip atunci când NewPipe este deschis din altă aplicație</string>
-    <string name="duration_live">Direct</string>
+    <string name="duration_live">În direct</string>
     <string name="downloads">Descărcări</string>
     <string name="downloads_title">Descărcări</string>
     <string name="error_report_title">Raport de erori</string>
     <string name="light_parsing_error">Nu s-a putut analiza complet website-ul</string>
     <string name="could_not_get_stream">Nu s-a putut prelua niciun stream</string>
     <string name="sorry_string">Scuze, asta n-ar fi trebui să se întâmple.</string>
-    <string name="error_report_button_text">Raportează eroarea prin e-mail</string>
-    <string name="error_snackbar_message">Scuze, au apărut câteva erori.</string>
-    <string name="error_snackbar_action">RAPORTAȚI</string>
+    <string name="error_report_button_text">Raportează această eroare prin e-mail</string>
+    <string name="error_snackbar_message">Scuze, ceva nu a mers bine.</string>
+    <string name="error_snackbar_action">Raportați</string>
     <string name="what_device_headline">Informații:</string>
     <string name="what_happened_headline">Ce s-a întâmplat:</string>
     <string name="your_comment">Comentariul tău (în engleză):</string>
     <string name="error_details_headline">Detalii:</string>
-    <string name="report_error">Raportează o eroare</string>
+    <string name="report_error">Raportează eroare</string>
     <string name="user_report">Raportul utilizatorului</string>
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Reîncearcă</string>
-    <string name="storage_permission_denied">Permisiunea de a accesa mediul de stocare a fost refuzată</string>
+    <string name="storage_permission_denied">Permiteți acces către mediul de stocare mai întâi</string>
     <string name="start">Start</string>
     <string name="pause">Pauză</string>
     <string name="view">Redă</string>
@@ -101,8 +102,8 @@
     <string name="msg_copied">Copiat în clipboard</string>
     <string name="no_available_dir">Definiți un dosar de descărcare mai târziu în setări</string>
     <string name="open_in_popup_mode">Deschide in modul popup</string>
-    <string name="msg_popup_permission">Aceasta permisiune este necesara
-pentru a deschide în mod pop-up</string>
+    <string name="msg_popup_permission">Această permisiune este necesară pentru a 
+\ndeschide în mod pop-up</string>
     <string name="title_activity_recaptcha">Provocare reCAPTCHA</string>
     <string name="recaptcha_request_toast">reCAPTCHA nouă cerută</string>
     <string name="popup_mode_share_menu_title">Mod pop-up</string>
@@ -119,17 +120,17 @@ pentru a deschide în mod pop-up</string>
     <string name="disabled">Dezactivat</string>
     <string name="could_not_load_image">Nu s-a putut încărca imaginea</string>
     <string name="app_ui_crash">App/UI eroare</string>
-    <string name="info_labels">Ce:\\nCerere:\\nLimba Conținutului:\\nServiciu:\\nTimp GMT:\\nPachet:\\nVersiune:\\nVersiune OS:</string>
-    <string name="short_thousand">K</string>
+    <string name="info_labels">Ce:\\nRequest:\\nContent Language:\\nContent Country:\\nApp Language:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:</string>
+    <string name="short_thousand">k</string>
     <string name="short_million">mil.</string>
     <string name="short_billion">mld.</string>
-    <string name="use_external_video_player_summary">Sunetul poate lipsi la unele rezoluții</string>
+    <string name="use_external_video_player_summary">Sterge sunetul la anumite rezolutii</string>
     <string name="controls_background_title">Fundal</string>
     <string name="controls_popup_title">Pop-up</string>
     <string name="popup_remember_size_pos_title">Reține dimensiunea și poziția pop-up-ului</string>
     <string name="popup_remember_size_pos_summary">Reține ultima dimensiune și poziție a pop-up-ului</string>
     <string name="player_gesture_controls_title">Gesturi player</string>
-    <string name="player_gesture_controls_summary">Folosește gesturile pentru a controla luminozitatea și volumul player-ului</string>
+    <string name="player_gesture_controls_summary">Folosește gesturi pentru a controla luminozitatea și volumul player-ului</string>
     <string name="show_search_suggestions_title">Arată sugestii</string>
     <string name="show_search_suggestions_summary">Arată sugestii în timpul căutării</string>
     <string name="settings_category_popup_title">Pop-up</string>
@@ -148,10 +149,10 @@ pentru a deschide în mod pop-up</string>
     <string name="fragment_feed_title">Ce este nou</string>
     <string name="enable_search_history_title">Istoric de căutări</string>
     <string name="enable_search_history_summary">Stochează local căutările</string>
-    <string name="enable_watch_history_title">Istoric vizualizări.</string>
+    <string name="enable_watch_history_title">Istoric vizualizări</string>
     <string name="enable_watch_history_summary">Reține videoclipurile vizionate</string>
-    <string name="resume_on_audio_focus_gain_title">Reluați la refocalizare</string>
-    <string name="resume_on_audio_focus_gain_summary">Continuă redarea după întreruperi (ex. după apeluri)</string>
+    <string name="resume_on_audio_focus_gain_title">Reluați redarea</string>
+    <string name="resume_on_audio_focus_gain_summary">Continuă redarea după întreruperi (ex: după apeluri)</string>
     <string name="settings_category_player_title">Player</string>
     <string name="settings_category_player_behavior_title">Comportament</string>
     <string name="settings_category_history_title">Istoric și cache</string>
@@ -227,22 +228,22 @@ pentru a deschide în mod pop-up</string>
     <string name="background_player_append">Adăugat în player de fundal</string>
     <string name="popup_playing_append">Adăugat în player pop-up</string>
     <string name="no_player_found_toast">Niciun player pentru streaming găsit. (Totuși, puteți instala VLC).</string>
-    <string name="controls_download_desc">Descărcați fișierul de streaming</string>
+    <string name="controls_download_desc">Descărcați fișierul de vizionat</string>
     <string name="show_info">Arată informații</string>
     <string name="tab_bookmarks">Playlist-uri salvate</string>
     <string name="controls_add_to_playlist_title">Adaugă La</string>
     <string name="use_inexact_seek_title">Folosește parcurgerea inexactă</string>
-    <string name="use_inexact_seek_summary">Derularea inexactă permite player-ului să fie poziţionat mai rapid dar cu o precizie mai redusă</string>
+    <string name="use_inexact_seek_summary">Derularea inexactă permite player-ului să fie poziţionat mai rapid dar cu o precizie mai redusă. Căutarea pentru 5, 15 sau 25 de secunde nu funcționează cu acest lucru.</string>
     <string name="download_thumbnail_title">Încarcă miniaturi</string>
     <string name="download_thumbnail_summary">Dezactivați pentru a preveni încărcarea thumbnail-urilor şi pentru a economisi consumul de date și de memorie. Schimbarea acestei opțiuni va curăța tot cache-ul din memorie și de pe disc.</string>
-    <string name="thumbnail_cache_wipe_complete_notice">Cache-ul de imagini a fost curățat</string>
+    <string name="thumbnail_cache_wipe_complete_notice">Datele cache de imagini au fost șterse</string>
     <string name="metadata_cache_wipe_title">Șterge cache-ul pentru metadata</string>
     <string name="metadata_cache_wipe_summary">Șterge cache-ul pentru datele de pagini web</string>
     <string name="metadata_cache_wipe_complete_notice">Cache pentru metadata șters</string>
     <string name="auto_queue_title">Adaugă următorul stream în coadă automat</string>
-    <string name="auto_queue_summary">Adaugă automat un stream asociat când se redă ultimul stream într-o coadă non-repetitivă</string>
+    <string name="auto_queue_summary">Continuă oprirea (fără repetare) a colajului prin adăugarea unui stream asemănător</string>
     <string name="show_hold_to_append_title">Arată sfatul „Țineți apăsat pentru a adăuga”</string>
-    <string name="show_hold_to_append_summary">Arată sfatul când butonul de background sau de popup este apăsat în pagina de informații a videoclipului</string>
+    <string name="show_hold_to_append_summary">Arată un sfat când apeși butonul de redare în fundal sau de popup în secțiunea video \"Detalii\"</string>
     <string name="default_content_country_title">Țara implicită pentru conținut</string>
     <string name="settings_category_debug_title">Debug</string>
     <string name="play_all">Redă Tot</string>
@@ -256,8 +257,8 @@ pentru a deschide în mod pop-up</string>
     <string name="switch_to_main">Schimbă pe modul principal</string>
     <string name="import_data_title">Importează baza de date</string>
     <string name="export_data_title">Exportează baza de date</string>
-    <string name="import_data_summary">Va înlocui istoricul și abonamentele curente</string>
-    <string name="export_data_summary">Exportează istoricul, abonamentele și playlist-urile</string>
+    <string name="import_data_summary">Înlocuiește istoric, abonamente curente, playlisturi și (opțional setări)</string>
+    <string name="export_data_summary">Exportează istoricul, abonamentele, playlist-urile și setările</string>
     <string name="player_stream_failure">Nu s-a putut reda acest stream</string>
     <string name="player_unrecoverable_failure">A apărut o eroare de player irecuperabilă</string>
     <string name="player_recoverable_failure">Recuperare după eroare player</string>
@@ -266,11 +267,11 @@ pentru a deschide în mod pop-up</string>
     <string name="video_streams_empty">Niciun stream video găsit</string>
     <string name="audio_streams_empty">Niciun stream audio găsit</string>
     <string name="invalid_directory">Director Invalid</string>
-    <string name="invalid_source">Nu există o astfel de sursă de fișier/conținut</string>
+    <string name="invalid_source">Nu există acest fișier ori sursă</string>
     <string name="invalid_file">Fișierul nu există, sau nu dețineți suficiente permisiuni pentru a îl citi sau scrie</string>
     <string name="file_name_empty_error">Numele fișierului nu poate fi gol</string>
     <string name="error_occurred_detail">O eroare a apărut: %1$s</string>
-    <string name="donation_encouragement">NewPipe este creat de dezvoltatori şi voluntari care îşi petrec timpul liber să vă aducă cea mai buna experienţă. Dați ceva înapoi pentru a ajuta dezvolatorii noştri în a pot face NewPipe şi mai bun în timp ce se bucură de o cană de cafea.</string>
+    <string name="donation_encouragement">NewPipe este dezvoltat de voluntari care își petrec timpul liber aducându-vă cea mai bună experiență de utilizare. Dați înapoi pentru a ajuta dezvoltatorii să facă NewPipe mai bun în timp ce se bucură de o cafea.</string>
     <string name="give_back">A da înapoi</string>
     <string name="website_title">Site-ul</string>
     <string name="website_encouragement">Vizitaţi site-ul nostru pentru mai multe informaţi şi ultimele ştiri despre NewPipe.</string>
@@ -289,7 +290,7 @@ pentru a deschide în mod pop-up</string>
     <string name="hold_to_append">Apăsaţi pentru a adăuga în lista de redare</string>
     <string name="start_here_on_main">Începeţi să redaţi de aici</string>
     <string name="start_here_on_background">Începe redarea în fundal</string>
-    <string name="start_here_on_popup">Începe redarea în popup</string>
+    <string name="start_here_on_popup">Începeți redarea în popup</string>
     <string name="drawer_open">Deschdeţi sertarul</string>
     <string name="drawer_close">Închideţi sertarul</string>
     <string name="preferred_open_action_settings_title">Opţiunea de deschidere preferată</string>
@@ -337,13 +338,13 @@ pentru a deschide în mod pop-up</string>
     <string name="playback_tempo">Viteză</string>
     <string name="accept">Acceptă</string>
     <string name="decline">Refuză</string>
-    <string name="unsubscribe">Dezabonare</string>
+    <string name="unsubscribe">Dezaboneaza-te</string>
     <string name="tab_new">Panel nou</string>
     <string name="tab_choose">Alege panel</string>
     <string name="volume_gesture_control_title">Gesturi control volum</string>
     <string name="volume_gesture_control_summary">Utilizează gesturi pentru controlul volumului</string>
     <string name="brightness_gesture_control_title">Gesturi control strălucire</string>
-    <string name="brightness_gesture_control_summary">Utilizează gesturi pentru controlul strălucire</string>
+    <string name="brightness_gesture_control_summary">Utilizează gesturi pentru controlul luminozități</string>
     <string name="settings_category_updates_title">Actualizări</string>
     <string name="events">Evenimente</string>
     <string name="file_deleted">Fișier șters</string>
@@ -353,36 +354,36 @@ pentru a deschide în mod pop-up</string>
     <string name="clear_search_history_title">Șterge istoric căutare</string>
     <string name="clear_search_history_summary">Ștergere istoric căutare cuvinte cheie</string>
     <string name="delete_search_history_alert">Șterge întregul istoric căutare\?</string>
-    <string name="search_history_deleted">Istoric căutare șters</string>
+    <string name="search_history_deleted">Istoric căutare șters.</string>
     <string name="download_to_sdcard_error_title">Stocare externă indisponibilă</string>
     <string name="download_to_sdcard_error_message">Descărcarea pe cardul SD extern nu este posibilă. Se resetează locația directorului de descărcări\?</string>
-    <string name="preferred_player_fetcher_notification_title">Obținerea informațiilor…</string>
+    <string name="preferred_player_fetcher_notification_title">Se obțin informații…</string>
     <string name="preferred_player_fetcher_notification_message">Se încarcă conținutul solicitat</string>
-    <string name="rename_playlist">Redenumire</string>
+    <string name="rename_playlist">Redenumiți</string>
     <string name="set_as_playlist_thumbnail">Setați ca miniatură a listei de redare</string>
-    <string name="delete_playlist_prompt">Ștergeți această listă de redare\?</string>
-    <string name="playlist_thumbnail_change_success">Miniatura listei de redare a fost modificată.</string>
-    <string name="playlist_delete_failure">Nu s-a putut șterge lista de redare.</string>
+    <string name="delete_playlist_prompt">Ștergeți acest playlist\?</string>
+    <string name="playlist_thumbnail_change_success">Miniatura playlist-ului a fost schimbată.</string>
+    <string name="playlist_delete_failure">Playlist-ul nu a putut fi șters.</string>
     <string name="caption_none">Fără subtitrări</string>
     <string name="resize_fit">Potrivire</string>
     <string name="resize_fill">Umplere</string>
-    <string name="resize_zoom">Mărire</string>
+    <string name="resize_zoom">Mărește</string>
     <string name="import_export_title">Import/export</string>
     <string name="caption_setting_title">Subtitrări</string>
-    <string name="caption_setting_description">Modificați mărimea textului și stilurile de fundal. Necesită repornirea aplicației.</string>
+    <string name="caption_setting_description">Modifică mărimea textului și stilurilor de fundal ale subtitrărilor. Necesită repornirea aplicației pentru a intra în vigoare.</string>
     <string name="app_license">NewPipe este un software copyleft gratuit: îl puteți utiliza, studia, distribui și îl puteți îmbunătăți după bunul plac. În mod special, îl puteți redistribui și/sau modifica în condițiile Licenței publice generale GNU, publicată de Free Software Foundation, fie versiunea 3 a Licenței, fie (la opțiunea dvs.) orice versiune ulterioară.</string>
     <string name="privacy_policy_title">Politica de confidențialitate a NewPipe</string>
     <string name="privacy_policy_encouragement">Proiectul NewPipe ia confidențialitatea în serios. Prin urmare, aplicația nu colectează date fără consimțământul dumneavoastră.
 \nPolitica de confidențialitate a NewPipe explică în detaliu ce date sunt trimise și stocate atunci când trimiteți un raport de avarie.</string>
-    <string name="read_privacy_policy">Citiți politica de confidențialitate</string>
+    <string name="read_privacy_policy">Citește politica de confidențialitate</string>
     <string name="saved_tabs_invalid_json">Nu se pot citi filele salvate, se folosesc filele implicite</string>
-    <string name="restore_defaults">Restabilire valori implicite</string>
-    <string name="restore_defaults_confirmation">Doriți să restaurați setările implicite\?</string>
+    <string name="restore_defaults">Restaurează valorile implicite</string>
+    <string name="restore_defaults_confirmation">Doriți să restaurați valorile implicite\?</string>
     <string name="subscribers_count_not_available">Numărul abonaților nu este disponibil</string>
-    <string name="main_page_content_summary">Ce file sunt afișate pe pagina principală</string>
+    <string name="main_page_content_summary">Ce file vor fi afișate pe pagina principală</string>
     <string name="selection">Selecție</string>
     <string name="conferences">Conferințe</string>
-    <string name="show_comments_title">Afișare comentarii</string>
+    <string name="show_comments_title">Arată comentariile</string>
     <string name="show_comments_summary">Dezactivează pentru oprirea afișării comentariilor</string>
     <string name="autoplay_title">Redare automată</string>
     <string name="no_comments">Niciun comentariu</string>
@@ -411,4 +412,41 @@ pentru a deschide în mod pop-up</string>
     <string name="peertube_instance_url_summary">Selectează instanța preferată PeerTube</string>
     <string name="peertube_instance_url_title">Instanțe PeerTube</string>
     <string name="seek_duration_title">Durată redare-înainte/derulare</string>
+    <string name="recaptcha_done_button">Gata</string>
+    <string name="subtitle_activity_recaptcha">Apăsați \"Gata\" când ați terminat</string>
+    <string name="error_report_open_issue_button_text">Raportează pe Github</string>
+    <string name="help">Ajutor</string>
+    <string name="clear_cookie_summary">Ștergeți modulele cookie pe care NewPipe le stochează atunci când rezolvați o reCAPTCHA</string>
+    <string name="recaptcha_cookies_cleared">Cookie-urile reCAPTCHA au fost șterse</string>
+    <string name="clear_cookie_title">Ștergeți cookie-urile reCAPTCHA</string>
+    <string name="hash_channel_description">Notificări pentru progresul hashing-ului video</string>
+    <string name="hash_channel_name">Notificare hash video</string>
+    <string name="artists">Artiști</string>
+    <string name="albums">Albume</string>
+    <string name="songs">Melodii</string>
+    <string name="restricted_video">Acest videoclip este restricționat în funcție de vârstă.
+\n
+\nActivați „%1$s” în setări dacă doriți să îl vedeți.</string>
+    <string name="youtube_restricted_mode_enabled_summary">YouTube oferă un „Mod restricționat” care ascunde conținut potențial matur</string>
+    <string name="youtube_restricted_mode_enabled_title">Activează \"Mod restricționat\" de pe YouTube</string>
+    <string name="show_age_restricted_content_summary">Afișați conținut posibil nepotrivit pentru copii, deoarece are o limită de vârstă (cum ar fi 18+)</string>
+    <string name="settings_category_notification_title">Notificare</string>
+    <string name="unsupported_url_dialog_message">Adresa URL nu a putut fi recunoscută. Deschideți cu o altă aplicație\?</string>
+    <string name="show_meta_info_title">Afișați informațiile meta</string>
+    <string name="notification_colorize_summary">Faceți ca Android să personalizeze culoarea notificării în funcție de culoarea principală din miniatură (rețineți că aceasta nu este disponibilă pe toate dispozitivele)</string>
+    <string name="notification_colorize_title">Colorează notificarea</string>
+    <string name="notification_action_nothing">Nimic</string>
+    <string name="notification_action_buffering">Buffering</string>
+    <string name="notification_action_shuffle">Redare aleatorie</string>
+    <string name="notification_action_repeat">Repetaţi</string>
+    <string name="notification_actions_at_most_three">Puteți selecta cel mult trei acțiuni pentru afișare în notificarea compactă!</string>
+    <string name="notification_actions_summary">Editați fiecare acțiune de notificare de mai jos atingând-o. Selectați până la trei dintre ele pentru a fi afișate în notificarea compactă utilizând casetele de selectare din dreapta.</string>
+    <string name="notification_action_4_title">Al cincilea buton de acțiune</string>
+    <string name="notification_action_3_title">Al patrulea buton de acțiune</string>
+    <string name="notification_action_2_title">Al treilea buton de acțiune</string>
+    <string name="notification_action_1_title">Al doilea buton de acțiune</string>
+    <string name="notification_action_0_title">Primul buton de acțiune</string>
+    <string name="notification_scale_to_square_image_summary">Scalați miniatura video afișată în notificare de la raportul de aspect 16:9 la 1:1 (poate introduce distorsiuni)</string>
+    <string name="notification_scale_to_square_image_title">Scalare miniatură la raport aspect 1:1</string>
+    <string name="search_showing_result_for">Se arată rezultate pentru:%s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 433bd50fb99..6d00c0901ae 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -624,7 +624,7 @@
     <string name="playlist_page_summary">Страница плейлиста</string>
     <string name="select_a_playlist">Выберите плейлист</string>
     <string name="error_report_open_issue_button_text">Сообщить на GitHub</string>
-    <string name="copy_for_github">Копировать отформатированный отчет</string>
+    <string name="copy_for_github">Копировать отформатированный отчёт</string>
     <string name="never">Никогда</string>
     <string name="wifi_only">Только по Wi-Fi</string>
     <string name="autoplay_summary">Автовоспроизведение — %s</string>
@@ -663,4 +663,7 @@
     <string name="hash_channel_description">Показать уведомление при хэшировании видео</string>
     <string name="hash_channel_name">Уведомление о хэшировании</string>
     <string name="msg_calculating_hash">Вычисляется хэш</string>
+    <string name="recent">Недавнее</string>
+    <string name="show_meta_info_summary">Отключите, чтобы скрыть поля метаданных (автор потока, содержимое потока или поисковый запрос)</string>
+    <string name="show_meta_info_title">Показать метаданные</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml
index f4827ca772b..c2ac43d8946 100644
--- a/app/src/main/res/values-sat/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -41,4 +41,14 @@
     <string name="controls_background_title">ᱵᱮᱠᱜᱨᱟᱩᱸᱰ</string>
     <string name="tab_choose">ᱴᱮᱵᱽ ᱪᱚᱭᱚᱱ ᱢᱮᱸ</string>
     <string name="download_path_summary">ᱰᱟᱩᱱᱞᱳᱰ ᱠᱟᱱ ᱣᱤᱰᱤᱭᱚ ᱨᱮᱫ ᱱᱚᱰᱮ ᱫᱚᱦᱚᱜᱼᱟ</string>
+    <string name="show_higher_resolutions_title">ᱡᱟᱹᱥᱛᱤ ᱨᱤᱡᱽᱚᱞᱭᱩᱥᱚᱱ ᱫᱮᱠᱷᱟᱣᱢᱮ</string>
+    <string name="default_popup_resolution_title">ᱢᱩᱞ ᱯᱷᱮᱲᱟᱛ ᱯᱚᱯ-ᱚᱯ ᱨᱤᱡᱽᱚᱞᱭᱩᱥᱚᱱ</string>
+    <string name="default_resolution_title">ᱢᱩᱞ ᱯᱷᱮᱲᱟᱛ ᱨᱮᱡᱽᱚᱞᱭᱩᱥᱚᱱ</string>
+    <string name="autoplay_by_calling_app_summary">ᱚᱞᱜᱟ ᱮᱯ ᱠᱷᱚᱱ NewPipe ᱨᱮ ᱦᱚᱦᱚ ᱡᱷᱚᱜ ᱣᱤᱰᱤᱭᱚ ᱯᱞᱮᱜᱼᱟ</string>
+    <string name="autoplay_by_calling_app_title">ᱚᱴᱚᱯᱞᱮ</string>
+    <string name="download_choose_new_path">ᱵᱚᱫᱚᱞ ᱠᱚ ᱫᱚᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ ᱠᱚ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
+    <string name="download_path_audio_dialog_title">ᱥᱟᱫᱮ ᱨᱮᱫᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
+    <string name="download_path_audio_summary">ᱰᱟᱩᱱᱞᱳᱰ ᱟᱠᱟᱱ ᱥᱟᱲᱮ ᱮᱨᱫ ᱠᱚ ᱱᱚᱰᱮ ᱫᱚᱦᱚᱜᱼᱟ</string>
+    <string name="download_path_audio_title">ᱥᱟᱲᱮ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ</string>
+    <string name="download_path_dialog_title">ᱣᱤᱰᱤᱭᱚ ᱨᱮᱫᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 8f9198d3f3c..b5de80a32d8 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -652,4 +652,7 @@
     <string name="msg_calculating_hash">Carculende s\'hash</string>
     <string name="hash_channel_description">Notìficas pro su protzessu de hashàgiu de su vìdeu</string>
     <string name="hash_channel_name">Notìfica de hash de su vìdeu</string>
+    <string name="recent">Reghente</string>
+    <string name="show_meta_info_summary">Istuda·lu pro cuare sas iscatuleddas cun informatziones additzionales in subra de su creadore de su flussu, de su cuntenutu de su flussu o de una rechesta de chirca.</string>
+    <string name="show_meta_info_title">Ammustra informatziones meta</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9f1639644a3..ba12728ff33 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -662,4 +662,7 @@
     <string name="msg_calculating_hash">Počítanie hash</string>
     <string name="hash_channel_description">Upozornenie pri generovaní hash z názu videa</string>
     <string name="hash_channel_name">Oznámenie o hashovaní videa</string>
+    <string name="recent">Nedávne</string>
+    <string name="show_meta_info_summary">Vypnite, pokiaľ nechcete zobrazovať meta informácie ako autor streamu, obsah streamu alebo vyhľadávanie.</string>
+    <string name="show_meta_info_title">Zobrazovať meta informácie</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 0ae0fc31ac6..8b830b27baf 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -1,270 +1,270 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="use_inexact_seek_title">Isticmaal dhaa-dhaafinta dagdaga ah (100% sax ma aha)</string>
-    <string name="popup_remember_size_pos_summary">Xusuusnow meeshii iyo cabirkii u dambeeyay ee</string>
+    <string name="use_inexact_seek_title">Dhaafinta dagdaga ah</string>
+    <string name="popup_remember_size_pos_summary">Xusuusnow meeshii iyo cabirkii udambeeyay ee daaqada</string>
     <string name="popup_remember_size_pos_title">Xusuusnow fadhiga daaqada</string>
     <string name="dark_theme_title">Madow</string>
     <string name="theme_title">Nashqada</string>
-    <string name="default_video_format_title">Nooca muuqaalka joogtada loo isticmaali doono</string>
-    <string name="default_audio_format_title">Nooca codka joogtada loo isticmaali doono</string>
-    <string name="notification_colorize_summary">Android-ka haku badalo midabka ogaysiiska midabka galka waxa daaran (aaladahoo dhan looma wada heli karo nidaamkan)</string>
-    <string name="notification_colorize_title">idabbee ogaysiiska</string>
-    <string name="notification_action_buffering">Soo Kucinay</string>
-    <string name="notification_action_shuffle">Isku</string>
-    <string name="notification_action_repeat">Ku</string>
-    <string name="notification_actions_at_most_three">Ugu badnaan waxad dooran kartaa sadex wax iney ka muuqdaan ogaysiiska yar!</string>
-    <string name="notification_actions_summary">Wax ka badal ficilka ogaysiiska hoose oo walba adigoo dushiisa ku dhufanaya. Dooro ilaa sadex kamida si ay uga muuqdaan ogaysiiska yar adigoo taabanaya santuuqa dhanka midgta ku yaala.</string>
-    <string name="notification_action_4_title">batoonka ficilka koowaad</string>
-    <string name="notification_action_3_title">batoonka ficilka koowaad</string>
-    <string name="notification_action_2_title">batoonka ficilka sadexaad</string>
-    <string name="notification_action_1_title">batoonka ficilka</string>
-    <string name="notification_action_0_title">batoonka ficilka koowaad</string>
-    <string name="notification_scale_to_square_image_summary">La ekaysii galka muuqaalka xaga ogaysiisyada ka muuqda cabirka 1:1 adoo kasoo badalaya 16:9 (wuxuu keeni karaa shucaac)</string>
+    <string name="default_video_format_title">Nooca muuqaalka</string>
+    <string name="default_audio_format_title">Nooca dhagaysiga</string>
+    <string name="notification_colorize_summary">Android-ka hakuu badalo midabka ogaysiiska galka waxa daaran asagoo kusalaynaya midabka galka shayga daaran (aaladahoo dhan looma wada heli karo nidaamkan)</string>
+    <string name="notification_colorize_title">Midabbee ogaysiiska</string>
+    <string name="notification_action_buffering">Soo Kicinaya</string>
+    <string name="notification_action_shuffle">isku qas</string>
+    <string name="notification_action_repeat">Ku celi</string>
+    <string name="notification_actions_at_most_three">Ugu badnaan waxad dooran kartaa sadex shay iney ka muuqdaan ogaysiiska yar!</string>
+    <string name="notification_actions_summary">Wax ka badal hawsha ogaysiiska hoose (mid walba) adigoo dushiisa ku dhufanaya. Dooro ilaa sadex kamida si ay uga muuqdaan ogaysiiska yar adigoo taabanaya santuuqa dhanka midigta ku yaala.</string>
+    <string name="notification_action_4_title">Batoonka hawsha shanaad</string>
+    <string name="notification_action_3_title">Batoonka hawsha afraad</string>
+    <string name="notification_action_2_title">Batoonka hawsha sadexaad</string>
+    <string name="notification_action_1_title">Batoonka hawsha labaad</string>
+    <string name="notification_action_0_title">Batoonka hawsha koowaad</string>
+    <string name="notification_scale_to_square_image_summary">La ekaysii galka muuqaalka xaga ogaysiisyada ka muuqda cabirka 1:1 ayadoo laga soo badalayo 16:9 (wuxuu keeni karaa shucaac)</string>
     <string name="notification_scale_to_square_image_title">Galka la ekaysii cabirka 1:1</string>
-    <string name="show_play_with_kodi_summary">Soo bandhig istikhyaar ah in muuqaal lagu furo xarunta madadaalada</string>
-    <string name="show_play_with_kodi_title">Soo bandhig istikhyaarka \"Kufur Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Soo bandhig istikhyaar ah in muuqaalka lagu furo xarunta madadaalada Kodi</string>
+    <string name="show_play_with_kodi_title">Soo dhig istikhyaarka \"Kufur Kodi\"</string>
     <string name="kore_not_found">Kushub app-ka maqan ee Kore\?</string>
-    <string name="play_with_kodi_title">Kufur</string>
-    <string name="show_higher_resolutions_summary">Aaladaha qaar kaliya ayaa furi kara muuqaalada 2K/4K ga</string>
-    <string name="show_higher_resolutions_title">Tus cabirada muuqaalka ee sare</string>
-    <string name="default_popup_resolution_title">Cabirka muuqaalka daaqada marwalba</string>
-    <string name="default_resolution_title">Cabirka Muuqaalka ee</string>
-    <string name="autoplay_by_calling_app_summary">Wuxuu daaraa muuqaal marka NewPipe laga soo furo app</string>
-    <string name="download_choose_new_path">Badal meelaha waxa lasoo dajiyay galaan si uu u hirgalo waxaad badashay</string>
-    <string name="download_path_audio_dialog_title">Dooro meesha dhagaysiga lasoo dajiyay galaan</string>
-    <string name="download_path_dialog_title">Dooro meesha muuqaalada lasoo dajiyay galaan</string>
-    <string name="download_path_audio_summary">Dhagaysiga lasoo dajiyay halkan ayaa lagu kaydiyaa</string>
-    <string name="download_path_summary">Muuqaalada lasoo dajiyay halkan ayaa lagu kaydiyaa</string>
-    <string name="download_path_audio_title">Meesha oodajinta dhagaysiga</string>
-    <string name="download_path_title">Meesha soodajintu</string>
+    <string name="play_with_kodi_title">Kufur Kodi</string>
+    <string name="show_higher_resolutions_summary">Aaladaha qaar kaliya ayaa furi kara muuqaalada 2K/4K ga ah</string>
+    <string name="show_higher_resolutions_title">Tus tayooyinka muuqaalada ee kasii sareeya</string>
+    <string name="default_popup_resolution_title">Tayada muuqaalka daaqada</string>
+    <string name="default_resolution_title">Tayada muuqaalka</string>
+    <string name="autoplay_by_calling_app_summary">Wuxuu daaraa muuqaal marka NewPipe laga soo furo app kale</string>
+    <string name="download_choose_new_path">Badal meelaha waxa lasoo dajiyo galaan si uu u hirgalo waxaad badashay</string>
+    <string name="download_path_audio_dialog_title">Dooro meesha dhagaysiga lasoo dajiyo galaan</string>
+    <string name="download_path_dialog_title">Dooro meesha muuqaalada lasoo dajiyo galaan</string>
+    <string name="download_path_audio_summary">Dhagaysiyada lasoo dajiyay halkan ayaa lagu kaydiyaa</string>
+    <string name="download_path_summary">Muuqaalada lasoo dajiyo halkan ayaa lagu kaydiyaa</string>
+    <string name="download_path_audio_title">Meesha dhagaysiga lasoo dajiyo galaan</string>
+    <string name="download_path_title">Meesha muuqaalada lasoo dajiyo galaan</string>
     <string name="controls_add_to_playlist_title">Ku Dar</string>
-    <string name="controls_popup_title">Si</string>
+    <string name="controls_popup_title">Daaqad</string>
     <string name="controls_background_title">Xaga Dambe</string>
     <string name="tab_choose">Dooro Daaqada</string>
     <string name="tab_new">Daaqad Cusub</string>
-    <string name="tab_bookmarks">Xulalka la</string>
+    <string name="tab_bookmarks">La Calaamadsaday</string>
     <string name="tab_subscriptions">Rukunka</string>
     <string name="tab_main">Guud</string>
-    <string name="show_info">Tus xogta</string>
+    <string name="show_info">Tus faahfaahinta</string>
     <string name="subscription_update_failed">Lama cusbooneysiin karo rukunka</string>
     <string name="subscription_change_failed">Lama badali karo rukunka</string>
     <string name="channel_unsubscribed">Kanaalka waad iskajoojisay</string>
-    <string name="unsubscribe">Iskajooji Rukumashada</string>
+    <string name="unsubscribe">Iskajooji Rukunka</string>
     <string name="subscribed_button_title">Rukuntay</string>
     <string name="subscribe_button_title">Rukumo</string>
-    <string name="popup_mode_share_menu_title">Si</string>
-    <string name="use_external_audio_player_title">Isticmaal dhagaysi daare dibada</string>
-    <string name="use_external_video_player_summary">Codka ayuu ka saaraa cabirrada muuqaalkaqaar</string>
-    <string name="use_external_video_player_title">Isticmaal muuqaal daare dibada</string>
-    <string name="choose_browser">Dooro</string>
+    <string name="popup_mode_share_menu_title">Qaabka Daaqada</string>
+    <string name="use_external_audio_player_title">Isticmaal dhagaysi daare dibada ah</string>
+    <string name="use_external_video_player_summary">Codka ayuu ka saaraa tayada muuqaalada qaar</string>
+    <string name="use_external_video_player_title">Isticmaal muuqaal daare dibada ah</string>
+    <string name="choose_browser">Dooro Browser-ka</string>
     <string name="share_dialog_title">La Wadaag</string>
-    <string name="search_showing_result_for">Soobandhigaya natiijada: %s</string>
+    <string name="search_showing_result_for">Kutusaya natiijooyinka: %s</string>
     <string name="did_you_mean">Ma waxaad ka waday \"%1$s\"\?</string>
     <string name="settings">Fadhiga</string>
     <string name="controls_download_desc">Daji midka socda</string>
-    <string name="share">La</string>
-    <string name="open_in_popup_mode">Kufur daaqad yar</string>
-    <string name="open_in_browser">Kufur browser</string>
-    <string name="cancel">Ka</string>
-    <string name="install">Ku</string>
-    <string name="no_player_found_toast">Wax fura lama helin. (waxad Ku shuban kartaa VLC si aad u furto).</string>
-    <string name="view_count_text">la furay %1$s jeer</string>
-    <string name="no_player_found">Wax fura lama helin. Ku shubo VLC\?</string>
-    <string name="upload_date_text">Lasoo galiyay %1$s</string>
-    <string name="main_bg_subtitle">ku dhufo \"Raadi\" si aad u bilawdo
+    <string name="share">La Wadaag</string>
+    <string name="open_in_popup_mode">Kufur qaabka daaqada</string>
+    <string name="open_in_browser">Kufur browser-ka</string>
+    <string name="cancel">Ka noqo</string>
+    <string name="install">Ku shub</string>
+    <string name="no_player_found_toast">Wax fura lama helin shaygan. (waxaad Ku shuban kartaa VLC si aad u furto).</string>
+    <string name="view_count_text">%1$s ayaa la furay</string>
+    <string name="no_player_found">Wax fura lama helin shaygan. Ku shubo VLC\?</string>
+    <string name="upload_date_text">Lasoo galiyay: %1$s</string>
+    <string name="main_bg_subtitle">Ku dhufo \"Raadi\" si aad u bilawdo
 \n</string>
-    <string name="overwrite_unrelated_warning">Shay magacan leh ayaa horay u</string>
-    <string name="overwrite">Ku</string>
-    <string name="generate_unique_name">Usamee magac gaar</string>
-    <string name="download_finished_more">%s soodajin ayaa dhamaatay</string>
-    <string name="download_finished">Dajintii wuu dhamaatay</string>
-    <string name="download_failed">Dajintii ma guulaysto</string>
-    <string name="permission_denied">Waxaa diiday</string>
-    <string name="recovering">Kasoo</string>
-    <string name="queued">La</string>
-    <string name="paused">La</string>
-    <string name="missions_header_pending">Hawsha Kujira</string>
-    <string name="missions_header_finished">La</string>
+    <string name="overwrite_unrelated_warning">Shay magacan leh ayaa horay ujiray</string>
+    <string name="overwrite">Ku badal</string>
+    <string name="generate_unique_name">Usamee magac gaar ah</string>
+    <string name="download_finished_more">%s dajin ayaa dhamaystirantay</string>
+    <string name="download_finished">Dajintii way dhamaystirantay</string>
+    <string name="download_failed">Dajintii ma guulaysan</string>
+    <string name="permission_denied">Hawshan waxaa diiday aalada</string>
+    <string name="recovering">Kasoo kabanaya</string>
+    <string name="queued">la horay</string>
+    <string name="paused">la qabtay</string>
+    <string name="missions_header_pending">Socda</string>
+    <string name="missions_header_finished">Dhamaystirmay</string>
     <string name="app_update_notification_content_text">Ku dhufo si aad u dajiso</string>
     <string name="app_update_notification_content_title">Nooc cusub oo NewPipe ah ayaa diyaar ah!</string>
-    <string name="switch_view">Baddal</string>
-    <string name="list_view_mode">Qaabka</string>
+    <string name="switch_view">Baddal Qaabka</string>
+    <string name="list_view_mode">Qaabka soo bandhiga</string>
     <string name="never">Marna</string>
-    <string name="wifi_only">Kaliya marka WiFi la isticmaal</string>
-    <string name="minimize_on_exit_title">Yaree marka app kale loo</string>
+    <string name="wifi_only">WiFi-ga kaliya</string>
+    <string name="minimize_on_exit_title">Yaree marka app kale loo gudbo</string>
     <string name="updates_setting_title">Cusboonaysiinta</string>
-    <string name="limit_data_usage_none_description">Xad</string>
-    <string name="playback_reset">Dib</string>
-    <string name="skip_silence_checkbox">Horay u dhaafi meelaha</string>
-    <string name="playback_speed_control">Maamulista Xawaaraha Waxa</string>
-    <string name="import_soundcloud_instructions_hint">yourID, soundcloud.com/yourid</string>
-    <string name="subscriptions_export_unsuccessful">Rukunka lama gudbin</string>
-    <string name="subscriptions_import_unsuccessful">Lama soo galin karo</string>
-    <string name="previous_export">Gudbintii</string>
-    <string name="import_file_title">Soo gali</string>
+    <string name="limit_data_usage_none_description">Ha xadidin</string>
+    <string name="playback_reset">Sidii hore ku celi</string>
+    <string name="skip_silence_checkbox">Horay u dhaafi meelaha aamusan</string>
+    <string name="playback_speed_control">Maamulista Xawaaraha</string>
+    <string name="import_soundcloud_instructions_hint">ID-gaaga, soundcloud.com/yourid</string>
+    <string name="subscriptions_export_unsuccessful">Rukunka lama gudbin karo</string>
+    <string name="subscriptions_import_unsuccessful">Lama soo galin karo rukunka</string>
+    <string name="previous_export">Gudbintii Hore</string>
+    <string name="import_file_title">Soo gali fayl</string>
     <string name="export_ongoing">Gudbinaya…</string>
     <string name="import_ongoing">Soo galinaya…</string>
-    <string name="export_to">U</string>
-    <string name="import_from">Kasoo</string>
-    <string name="import_title">Soo</string>
-    <string name="import_export_title">Soo gali/</string>
-    <string name="show_original_time_ago_summary">"Qoraaladii asal ahaan adeegyada la socday way ka muuqan doonaan  waxyaabaha"</string>
-    <string name="show_original_time_ago_title">Soo bandhig wakhtigii asalka ahaa ee kasoo wareegay (shayyada)</string>
-    <string name="enable_disposed_exceptions_summary">Ku khasab warinta kareebitaanada aan la fulin karin ee Rx ka ee dibada qayb ama wakhtiga hawsha kadib marka la iska</string>
-    <string name="enable_disposed_exceptions_title">Wari khaladaadka wakhtigoo</string>
-    <string name="show_memory_leaks">Tus ciladaha</string>
-    <string name="enable_leak_canary_summary">Dabagalka cilada kaydka waxay sababi kartaa inuu app-ku istaago marka \'heap dump\'</string>
-    <string name="caption_setting_description">Waxkabadal cabirka qoraalka qoral-hooseedka iyo midabka xaga dambe. App-ka waa in dib loo furaa si ay u hirgasho.</string>
-    <string name="resize_zoom">So</string>
-    <string name="resize_fill">Ku</string>
-    <string name="caption_none">Qoral-Hoosaas majiro</string>
-    <string name="playlist_no_uploader">Isasoo-bilaabay (Soo-galiye lama helin)</string>
+    <string name="export_to">U gudbi</string>
+    <string name="import_from">Kasoo Gali</string>
+    <string name="import_title">Soogali</string>
+    <string name="import_export_title">Soo gali/Dibada ugudbi</string>
+    <string name="show_original_time_ago_summary">Qoraaladii asal ahaan adeegyada la socday way ka muuqan doonaan waxyaabaha aad furanayso</string>
+    <string name="show_original_time_ago_title">Soo bandhig wakhtigii asalka ahaa ee kasoo wareegay (shayga)</string>
+    <string name="enable_disposed_exceptions_summary">Ku khasab warinta ka reebitaanada aan la fulin karin ee \'Rx\' ka ee dibada qayb ama wakhtiga hawsha kadib marka la iska dhaafo</string>
+    <string name="enable_disposed_exceptions_title">Wari khaladaadka wakhtigoodu dhacay</string>
+    <string name="show_memory_leaks">Tus ciladaha kaydka</string>
+    <string name="enable_leak_canary_summary">Dabagalka cillada kaydka waxay sababi kartaa inuu app-ku istaago marka \'heap dump\' la samaynayo</string>
+    <string name="caption_setting_description">Wax kabadal cabirka xarfaha qoraal-hooseedka iyo midabkooda xaga dambe. App-ka waa in dib loo soo bilaabaa si ay u hirgasho.</string>
+    <string name="resize_zoom">Soo dhawee</string>
+    <string name="resize_fill">Ku buuxi</string>
+    <string name="caption_none">Ma jiro Qoraal-hooseed</string>
+    <string name="playlist_no_uploader">isa-sameeyay (soosaare lama helin)</string>
     <string name="playlist_delete_failure">Xulka lama saari karo.</string>
     <string name="playlist_thumbnail_change_success">Galkii xulka waa la badalay.</string>
-    <string name="playlist_add_stream_success">La</string>
-    <string name="playlist_creation_success">Xulka waa la</string>
+    <string name="playlist_add_stream_success">La xulay</string>
+    <string name="playlist_creation_success">Xulka waa la sameeyay</string>
     <string name="delete_playlist_prompt">Saar xulkan\?</string>
-    <string name="unbookmark_playlist">Ka saar alaamadinta</string>
-    <string name="bookmark_playlist">Calaamadi</string>
+    <string name="unbookmark_playlist">Ka saar calaamadsashada</string>
+    <string name="bookmark_playlist">Calaamadso Xulka</string>
     <string name="set_as_playlist_thumbnail">Ku Fadhiisi Galka Xulka</string>
-    <string name="unmute">adalsii</string>
-    <string name="append_playlist">Ku dar</string>
+    <string name="unmute">Ka hadalsii</string>
+    <string name="append_playlist">Ku dar xul</string>
     <string name="rename_playlist">Magaca kabadal</string>
-    <string name="delete_playlist">Tirtir</string>
-    <string name="create_playlist">Xul</string>
-    <string name="preferred_player_fetcher_notification_message">Sookicinaya shayga la</string>
-    <string name="preferred_player_fetcher_notification_title">Helaya</string>
-    <string name="always_ask_open_action">Waydii</string>
-    <string name="background_player">Gadaal ku</string>
-    <string name="video_player">Muuqaal</string>
-    <string name="preferred_open_action_settings_summary">Ficilka la doorbiday maeka shay la furayo —</string>
-    <string name="preferred_open_action_settings_title">Ficilka \'fur\' loo doorbiday</string>
-    <string name="drawer_header_action_paceholder_text">Wax baa halkan kasoo muuqan dhawaan ;</string>
-    <string name="drawer_close">Xidh</string>
-    <string name="drawer_open">Fur</string>
-    <string name="start_here_on_popup">Bilaw inaad daaqad ku</string>
-    <string name="start_here_on_main">Ka bilow daarista</string>
-    <string name="start_here_on_background">Bilaw inaad xaga dambe ka</string>
-    <string name="enqueued">La</string>
-    <string name="hold_to_append">Xaji si loo</string>
-    <string name="play_queue_audio_settings">Fadhiga</string>
+    <string name="delete_playlist">Saar</string>
+    <string name="create_playlist">Xul Cusub</string>
+    <string name="preferred_player_fetcher_notification_message">Sookicinaya shayga la codsaday</string>
+    <string name="preferred_player_fetcher_notification_title">Helaya xogta…</string>
+    <string name="always_ask_open_action">Waydii marwalba</string>
+    <string name="background_player">Gadaal ku daare</string>
+    <string name="video_player">Muuqaal daareha</string>
+    <string name="preferred_open_action_settings_summary">Hawsha la doorbiday marka shay la furayo — %s</string>
+    <string name="preferred_open_action_settings_title">Hawsha \'fur\' loo doorbiday</string>
+    <string name="drawer_header_action_paceholder_text">Wax baa halkan kasoo muuqan doona goordhow ;D</string>
+    <string name="drawer_close">Xidh Khaanada</string>
+    <string name="drawer_open">Fur Khaanada</string>
+    <string name="start_here_on_popup">Xaga daaqada ku daar</string>
+    <string name="start_here_on_main">Ka bilow daarista halkan</string>
+    <string name="start_here_on_background">Xaga dambe ku daar</string>
+    <string name="enqueued">La horay</string>
+    <string name="hold_to_append">Xaji si loo horo</string>
+    <string name="play_queue_audio_settings">Fadhiga Dhagaysiga</string>
     <string name="play_queue_stream_detail">Faahfaahin</string>
-    <string name="play_queue_remove">Ka</string>
-    <string name="title_activity_play_queue">Daar</string>
-    <string name="most_liked">Inta loogu jecelyahay</string>
-    <string name="recently_added">Dhawaan lagu soo</string>
+    <string name="play_queue_remove">Ka saar</string>
+    <string name="title_activity_play_queue">Daar hormada</string>
+    <string name="most_liked">inta loogu jecelyahay</string>
+    <string name="recently_added">Dhawaan Lasoo Galiyay</string>
     <string name="trending">Shiddan</string>
-    <string name="new_and_hot">Cusub oo</string>
-    <string name="top_50">50ka ugu</string>
+    <string name="new_and_hot">Cusub oo Shiddan</string>
+    <string name="top_50">50ka Sare</string>
     <string name="kiosk">Bandhig</string>
-    <string name="localization_changes_requires_app_restart">Luuqadu waxay isbadali doontaa marka barnaamijka dib loo soo kiciyo.</string>
-    <string name="error_unable_to_load_comments">Faalooyinka lama soo dhigi</string>
+    <string name="localization_changes_requires_app_restart">Luuqadu waxay isbadali doontaa marka app-ka dib loo soo kiciyo.</string>
+    <string name="error_unable_to_load_comments">Faalooyinka lama soo dhigi karo</string>
     <string name="import_settings">Inaad sidoo kale fadhiga soo galiso ma rabtaa\?</string>
-    <string name="override_current_data">Tani waxay badali fadhigaaga hadda.</string>
-    <string name="could_not_import_all_files">Digniin: Lama soowada galin karo shayyada oo</string>
-    <string name="no_valid_zip_file">Shay ZIP ah oo sax ah</string>
-    <string name="import_complete_toast">Lasoo</string>
-    <string name="export_complete_toast">La</string>
-    <string name="select_a_kiosk">Dooro</string>
-    <string name="no_playlist_bookmarked_yet">Wax xul ah wali lama</string>
-    <string name="select_a_playlist">Dooro</string>
-    <string name="no_channel_subscribed_yet">Wax kanaal ah wali lama</string>
-    <string name="select_a_channel">Dooro</string>
-    <string name="channel_page_summary">Boga</string>
-    <string name="feed_page_summary">Boga</string>
-    <string name="subscription_page_summary">Boga</string>
-    <string name="default_kiosk_page_summary">Bandhiga siduu</string>
-    <string name="kiosk_page_summary">Boga</string>
-    <string name="blank_page_summary">Bog</string>
-    <string name="main_page_content_summary">Daaqadaha la soobandhigo boga</string>
-    <string name="main_page_content">Boga guud waxa ka</string>
-    <string name="title_most_played">Badanaa la</string>
-    <string name="title_last_played">Kii udambeeyay ee la</string>
-    <string name="delete_all_history_prompt">Ma hubtaa inaad ka saari rabto shaygan kaydka taariikhda\?</string>
+    <string name="override_current_data">Tani waxay badali fadhiga siduu kuu yahay hadda.</string>
+    <string name="could_not_import_all_files">Digniin: Lama soowada galin karo faylashoo dhan.</string>
+    <string name="no_valid_zip_file">Shay ZIP ah oo sax ah majiro</string>
+    <string name="import_complete_toast">Lasoo Galiyay</string>
+    <string name="export_complete_toast">La Gudbiyay</string>
+    <string name="select_a_kiosk">Dooro Bandhig</string>
+    <string name="no_playlist_bookmarked_yet">Wax xul ah wali lama calaamadsanin</string>
+    <string name="select_a_playlist">Dooro xul</string>
+    <string name="no_channel_subscribed_yet">Wax kanaal ah wali lama rukuman</string>
+    <string name="select_a_channel">Dooro kanaal</string>
+    <string name="channel_page_summary">Boga Kanaalka</string>
+    <string name="feed_page_summary">Boga Bandhiga</string>
+    <string name="subscription_page_summary">Boga Rukunka</string>
+    <string name="default_kiosk_page_summary">Bandhiga siduu ahaa</string>
+    <string name="kiosk_page_summary">Boga Bandhiga</string>
+    <string name="blank_page_summary">Bog Madhan</string>
+    <string name="main_page_content_summary">Daaqadaha la soobandhigo boga guud</string>
+    <string name="main_page_content">Boga guud waxa ka muuqda</string>
+    <string name="title_most_played">Badanaa La Daawado</string>
+    <string name="title_last_played">U Dambeeyay ee La Daawaday</string>
+    <string name="delete_all_history_prompt">Ma hubtaa inaad ka saari rabto wax walba kaydka wixii hore\?</string>
     <string name="delete_stream_history_prompt">Ma rabtaa inaad ka saarto shaygan kaydka wixii la daawaday\?</string>
     <string name="delete_item_search_history">Ma rabtaa inaad ka saarto shaygan kaydka wixii la raadiyay\?</string>
-    <string name="item_deleted">Waa la</string>
-    <string name="history_cleared">Taariikhdii waa la nadiifiyay</string>
-    <string name="history_empty">Kaydka taariikhda wuu madhan</string>
-    <string name="action_history">Taariikh</string>
-    <string name="history_disabled">Kaydinta taariikhda way</string>
-    <string name="title_history_view">La</string>
-    <string name="title_history_search">La</string>
-    <string name="read_full_license">Akhri</string>
-    <string name="app_license">NewPipe waa barnaamij bilaash ah oon lahayn xuquuqda daabacaada: Waad isticmaali kartaa, wadaagi kartaa waadna hormarin kartaa hadaad rabto. Gaar ahaan waad sii daabici kartaa ama wax baad ka badali kartaa adigoo raacaya shuruudaha sharciga guud ee GNU sida ay soosaareen Ururka Barnaamijyada Bilaashka ah, soosaarista 3aad ee laysinka, ama (hadaad doonto) nooc walba oo kasii dambeeyay kii 3aad.</string>
+    <string name="item_deleted">Shayga waa la saaray</string>
+    <string name="history_cleared">Kaydka wixii hore waa la nadiifiyay</string>
+    <string name="history_empty">Kaydka wixii hore wuu madhan yahay</string>
+    <string name="action_history">Wixii Hore</string>
+    <string name="history_disabled">Kaydinta wixii hore way xidhantahay</string>
+    <string name="title_history_view">La Daawaday</string>
+    <string name="title_history_search">La Raadiyay</string>
+    <string name="read_full_license">Akhri laysinka</string>
+    <string name="app_license">NewPipe waa barnaamij bilaash ah oon lahayn xuquuqda daabacaada: Waad isticmaali kartaa, waad wadaagi kartaa waadna hormarin kartaa hadaad rabto. Gaar ahaan waad sii daabici kartaa ama wax baad ka badali kartaa ayadoo la raacayo shuruudaha sharciga guud ee GNU sida ay soosaareen Ururka Barnaamijyada Bilaashka ah, soosaarista 3aad ee laysinka, ama (hadaad doonto) nooc walba oo kasii dambeeyay laysinkii 3aad.</string>
     <string name="privacy_policy_title">Siyaasada Sir-Dhawrka NewPipe</string>
     <string name="app_license_title">Laysanka NewPipe</string>
     <string name="read_privacy_policy">Akhri siyaasada sir-dhawrka</string>
     <string name="privacy_policy_encouragement">Mashruuca NewPipe sir dhawrkaaga aad ayuu u daneeyaa. Sidaas darteed, App-ku wax xogtaada ah ma uruuriyo fasax la\'aan.
 \nSiyaasada sir-dhawrka NewPipe ayaa si faahfaahsan u sharaxda wixii xog ah ee la diro lana kaydiyo markaad cilad farsamo wariso.</string>
-    <string name="website_encouragement">Booqo website-ka NewPipe xog intaas dheer iyo warar.</string>
+    <string name="website_encouragement">Booqo website-ka NewPipe si aad xog intaas dheer iyo warar uhesho.</string>
     <string name="website_title">Website-ka</string>
     <string name="give_back">U fidi caawin</string>
-    <string name="donation_encouragement">NewPipe waxaa sameeyay dad iskood isku xilqaamay oo wakhtiga ay xorta yihiin ku kharash gareeya inay kuu keenaan wax markaad isticmaalayso aad ku qanacdo. U fidi taageero sameeyaasha appka si ay NewPipe xataa sidan oga sii fiicneeyaan.</string>
+    <string name="donation_encouragement">NewPipe waxaa sameeyay dad iskood isku xilqaamay oo wakhtiga ay xorta yihiin qayb kamid ah ku kharash gareeya inay kuu keenaan wax markaad isticmaalayso aad ku qanacdo. U fidi taageero sameeyaasha appka si ay NewPipe xataa sidan oga sii fiicneeyaan.</string>
     <string name="donation_title">Ugu Deeq</string>
     <string name="view_on_github">Xaga GitHub fur</string>
-    <string name="contribution_encouragement">Hadaad hayso fikarodo; rogid, qaab badal, nafiinta \'code\', ama \'code-ka\' ood si wayn wax oga badashaa—caawinta marwalba waa lasoo dhawayn. Waxbadan hadii la qabto waxbadan ayaa fiicnaan!</string>
-    <string name="contribution_title">Kusoo kordhin</string>
-    <string name="app_description">Waa app fudud oo bilaash wax loogu daawado Android-ka.</string>
-    <string name="tab_licenses">Laysimada</string>
-    <string name="tab_contributors">Waxaa wax kusoo kordhiyay</string>
-    <string name="tab_about">Ku saabsan</string>
+    <string name="contribution_encouragement">Hadaad hayso fikrado; rogid, qaab badal, nadiifin koodh, ama koodhka ood si wayn wax oga badashaa—caawinta marwalba waa lasoo dhawaynayaa. Waxbadan hadii la qabto waxbadan ayaa fiicnaan!</string>
+    <string name="contribution_title">Kusoo Kordhin</string>
+    <string name="app_description">App bilaash ah oo fudud looguna talagalay in aaladaha nidaamka Android-ka ku shaqeeya wax loogu daawado.</string>
+    <string name="tab_licenses">Laysinada</string>
+    <string name="tab_contributors">Dadka wax kusoo kordhiyay NewPipe</string>
+    <string name="tab_about">Ku saabsan NewPipe</string>
     <string name="action_open_website">Fur website-ka</string>
     <string name="error_unable_to_load_license">Laysanka lama soo kicin karo</string>
-    <string name="copyright">© %1$s sameeyay %2$s asagoo raacaya %3$s</string>
+    <string name="copyright">© %1$s sameeyay %2$s ayagoo raacaya %3$s</string>
     <string name="title_licenses">Laysinada gacanta sadexaad</string>
     <string name="action_about">Xog</string>
     <string name="action_settings">Fadhiga</string>
     <string name="title_activity_about">Ku saabsan NewPipe</string>
-    <string name="toast_no_player">Barnaamij shaygan fura kuma jiro</string>
+    <string name="toast_no_player">Shaygan app fura kuuguma jiro</string>
     <string name="charset_most_special_characters">Xarfaha gaarka ah kuwa ugu badan</string>
-    <string name="charset_letters_and_digits">Xarfaha iyo Godadka</string>
-    <string name="settings_file_replacement_character_title">Xarafka lagu badali</string>
+    <string name="charset_letters_and_digits">Xarfaha iyo godadka</string>
+    <string name="settings_file_replacement_character_title">Xarafka lagu badalayo</string>
     <string name="settings_file_replacement_character_summary">Xarfaha aan la taageerin waxaa lagu badali midkan</string>
     <string name="settings_file_charset_title">Xarafyada magaca shayga loo ogol yahay</string>
-    <string name="settings_category_downloads_title">Daji</string>
-    <string name="recaptcha_done_button">Waan dhameeyay</string>
+    <string name="settings_category_downloads_title">Soodajinta</string>
+    <string name="recaptcha_done_button">Dhameeyay</string>
     <string name="recaptcha_request_toast">Tijaabada reCAPTCHA ayaa la codsaday</string>
-    <string name="subtitle_activity_recaptcha">Taabo \"Waan dhameeyay\" markaad xaliso</string>
+    <string name="subtitle_activity_recaptcha">Taabo \"Dhameeyay\" markaad xaliso</string>
     <string name="title_activity_recaptcha">Tijaabada reCAPTCHA</string>
     <string name="one_item_deleted">1 shay ayaa la saaray.</string>
     <string name="msg_popup_permission">Ogolaanshahan ayaa loo baahan yahay si
 \nloogu furo qaabka daaqada</string>
-    <string name="no_available_dir">Fadlan meesha wax lagu dajin doono hadhawto xaga fadhiga ka dooro</string>
+    <string name="no_available_dir">Fadlan meesha wax lagu dajin doono hadhawto xaga fadhiga kasoo dooro</string>
     <string name="msg_copied">Dhakada ayaa lagu qabtay</string>
     <string name="msg_wait">Fadlan sug…</string>
-    <string name="msg_calculating_hash">Xisaabinaya waxa isbadalay</string>
-    <string name="msg_running_detail">Fahfahinta kusii dhufo</string>
-    <string name="msg_running">NewPipe Wuu Dajinayaa</string>
+    <string name="msg_calculating_hash">Xisaabinaya badalka</string>
+    <string name="msg_running_detail">Faahfahinta kusii dhufo</string>
+    <string name="msg_running">NewPipe wuu dajinayaa</string>
     <string name="msg_url_malform">Tixraac khaldan ama khad baan jirin</string>
     <string name="msg_exists">Shaygan horay ayuu ujiray</string>
     <string name="msg_server_unsupported">Martigaliye aan la taageerin</string>
     <string name="msg_error">Khalad</string>
-    <string name="msg_threads">Maqaallo</string>
+    <string name="msg_threads">Qaybaha</string>
     <string name="msg_name">Magaca shayga</string>
     <string name="finish">Hagaag</string>
     <string name="add">Hawl cusub</string>
     <string name="rename">Magaca kabadal</string>
     <string name="dismiss">Iska dhaaf</string>
     <string name="checksum">Xaqiijiyaha</string>
-    <string name="delete_all">Dhammaan tirtir</string>
-    <string name="delete_one">Hal Xabo Tirtir</string>
+    <string name="delete_all">Wada Saar</string>
+    <string name="delete_one">Hal Xabo Saar</string>
     <string name="delete">Tirtir</string>
     <string name="create">Samee</string>
     <string name="view">Daar</string>
     <string name="pause">Qabo</string>
-    <string name="start">Bilaw</string>
-    <string name="no_comments">Faalooyin ma jiraan</string>
+    <string name="start">Bilow</string>
+    <string name="no_comments">faalooyin ma jiraan</string>
     <plurals name="videos">
         <item quantity="one">%s muuqaal</item>
-        <item quantity="other">%s muuqaalo</item>
+        <item quantity="other">%s muuqaal</item>
     </plurals>
-    <string name="infinite_videos">∞ muuqaalo</string>
+    <string name="infinite_videos">muuqaalo ∞</string>
     <string name="more_than_100_videos">100+ muuqaal</string>
-    <string name="no_videos">Muuqaalo ma jiraan</string>
+    <string name="no_videos">muuqaalo ma jiraan</string>
     <plurals name="listening">
         <item quantity="one">%s dhagayste</item>
-        <item quantity="other"></item>
+        <item quantity="other">%s dhagaystayaal</item>
     </plurals>
     <string name="no_one_listening">Cidna ma dhagaysanayso</string>
     <plurals name="watching">
@@ -273,8 +273,8 @@
     </plurals>
     <string name="no_one_watching">Cidna ma daawanayso</string>
     <plurals name="views">
-        <item quantity="one">%s ayaa furtay</item>
-        <item quantity="other">%s ayaa furatay</item>
+        <item quantity="one">%s ayaa la furay</item>
+        <item quantity="other">%s ayaa la furay</item>
     </plurals>
     <string name="no_views">Lama furin</string>
     <string name="subscribers_count_not_available">inta rukumatay lama heli karo</string>
@@ -287,54 +287,54 @@
     <string name="short_billion">B</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
-    <string name="storage_permission_denied">App-ka u ogolow kaydka aaalada marka hore</string>
+    <string name="storage_permission_denied">U ogolow app-ka kaydka aaalada marka hore</string>
     <string name="retry">Markale isku day</string>
-    <string name="audio">Cod</string>
+    <string name="audio">Dhagaysi</string>
     <string name="video">Muuqaal</string>
     <string name="info_dir_created">Waa la sameeyay galka soodajinta ee \'%1$s\'</string>
     <string name="err_dir_create">Lama samayn karo galka soodajinta ee \'%1$s\'</string>
-    <string name="detail_drag_description">Jiid si aad ukala hormariso</string>
-    <string name="empty_subscription_feed_subtitle">Meel madhan</string>
-    <string name="search_no_results">Natiijo lama helin</string>
-    <string name="user_report">Isticmaal warka</string>
-    <string name="report_error">Wari khalad</string>
-    <string name="use_tor_summary">(Waa tijaabo) Ku khasab in soodajinta la dhexmariyo Tor si aad sirtaada u ilaashato (Muuqaalada tooska ah looma heli karo hadda).</string>
-    <string name="detail_dislikes_img_view_description">Intaan ka helin</string>
+    <string name="detail_drag_description">Farta ku jiid si aad ukala hormariso</string>
+    <string name="empty_subscription_feed_subtitle">meel madhan</string>
+    <string name="search_no_results">natiijo lama helin</string>
+    <string name="user_report">Warka isticmaaleha</string>
+    <string name="report_error">Soowari khalad</string>
+    <string name="use_tor_summary">(Tijaabo ayuu kujiraa wali) Ku khasab in soodajinta la dhexmariyo Tor si aad sirtaada u ilaashato (Nidaamkan muuqaalada tooska ah looma heli karo hadda).</string>
+    <string name="detail_dislikes_img_view_description">intaan ka helin</string>
     <string name="use_tor_title">Isticmaal Tor</string>
-    <string name="detail_likes_img_view_description">Inta ka heshay</string>
-    <string name="detail_uploader_thumbnail_view_description">Sawirka soosaarha muuqaalka</string>
+    <string name="detail_likes_img_view_description">inta ka heshay</string>
+    <string name="detail_uploader_thumbnail_view_description">Sawirka u saaran soosaareha</string>
     <string name="detail_thumbnail_view_description">Daar muuqaalka, intuu socdo:</string>
-    <string name="info_labels">Waxa:\\nCodsi:\\nShayga Luuqada:\\nWadanka Shayga:\\nApp-ka Luuqada:\\nAdeega:\\nGMT Wakhtiga:\\Xidhmada:\\nNooca:\\nNooca barnaamijka:</string>
+    <string name="info_labels">Shayga:\\nCodsiga:\\nLuuqada Shayga:\\nWadanka Shayga:\\nLuuqada App-ka:\\nAdeega:\\nWakhtiga oo GMT ah:\\nXidhmada:\\nTirsiga App-ka:\\nTirsiga Nooca Barnaamijka:</string>
     <string name="list_thumbnail_view_description">Galka muuqaal tusaha</string>
     <string name="error_details_headline">Faahfaahin:</string>
     <string name="your_comment">Faaladaada (oo Ingiriis ah):</string>
     <string name="what_happened_headline">Waxa dhacay:</string>
-    <string name="what_device_headline">Xog:</string>
+    <string name="what_device_headline">Xogta:</string>
     <string name="error_snackbar_action">Wari</string>
     <string name="error_snackbar_message">Waan ka xunahay, waxbaa khaldamay.</string>
-    <string name="error_report_open_github_notice">Fadlan hubi in arin ciladdaada ka hadlaya horay loo wariyay. Marka wax horay u jiray la wariyo markale, wakhti ayaad naga qaadaysaa kaasoo aan cilada ku sixi la hayn.</string>
-    <string name="error_report_open_issue_button_text">Ku wari GitHub-ka</string>
+    <string name="error_report_open_github_notice">Fadlan hubi in arin ciladdan ka hadlaya horay loo wariyay. Marka wax horay u jiray la wariyo markale, wakhti ayaad naga qaadaysaa wakhtigaas oo aan cilada ku sixi la hayn.</string>
+    <string name="error_report_open_issue_button_text">Ku wari xaga GitHub-ka</string>
     <string name="copy_for_github">Koobiyee warka oo diyaarsan</string>
     <string name="error_report_button_text">Khaladkan email ahaan ku warceli</string>
-    <string name="sorry_string">Wan ka xunahay, sidaa inay dhacdo ma ahayn.</string>
+    <string name="sorry_string">Waan ka xunahay, sidaa inay dhacdo ma ahayn.</string>
     <string name="permission_display_over_apps">U ogolow app-ka inuu dul fuulo applicationada kale</string>
     <string name="restore_defaults_confirmation">Ma rabtaa inaad sidii hore ku celiso\?</string>
-    <string name="restore_defaults">Dib ugu fadhiisi sidii hore</string>
+    <string name="restore_defaults">Dib ugu celi sidii hore</string>
     <string name="saved_tabs_invalid_json">Lama akhrin karo daaqadihii la kaydiyay, ...isticmaalaya kuwii app-ku kusoo baxay</string>
     <string name="no_streams_available_download">Wax la dajiyo lama heli karo</string>
-    <string name="error_occurred_detail">Khalad ayaa ka dhacay:</string>
+    <string name="error_occurred_detail">Khalad ayaa ka dhacay: %1$s</string>
     <string name="file_name_empty_error">Magaca shayga ma madhnaan karo</string>
-    <string name="invalid_file">Shaygani ma jiro ama ogolaansho looma haysto in wax laga badalo</string>
-    <string name="invalid_source">Shaygan ma jiro/tixraacan</string>
+    <string name="invalid_file">Shaygani ma jiro ama ogolaansho looma haysto in wax laga badalo ama la furo</string>
+    <string name="invalid_source">Shaygan/tixraaca shayga lama heli karo</string>
     <string name="invalid_directory">Galkan ma jiro</string>
     <string name="missing_file">Shaygan waa la guuriyay ama waa la tirtiray</string>
-    <string name="audio_streams_empty">Codad la dhagaysto lama helin</string>
+    <string name="audio_streams_empty">Wax la dhagaysto lama helin</string>
     <string name="video_streams_empty">Muuqaalo la daawado lama helin</string>
     <string name="invalid_url_toast">Tixraac khaldan</string>
-    <string name="external_player_unsupported_link_type">Muuqaal daarayaasha dibada ah linkiyda noocan ah ma furaan</string>
-    <string name="player_recoverable_failure">Kasoo kabashadii muuqaal daaraha khalad ayaa ka dhacay</string>
-    <string name="player_unrecoverable_failure">Khalad aan laga soo kaban karin ayaa dhacay</string>
-    <string name="player_stream_failure">Muuqaalkan lama daari karo</string>
+    <string name="external_player_unsupported_link_type">Daareyaasha dibada ah linkiyda noocan ah ma furaan</string>
+    <string name="player_recoverable_failure">Kasoo kabanaya khaladkii xaga daareha kadhacay</string>
+    <string name="player_unrecoverable_failure">Khalad xaga daareha ah oon la sixi karin ayaa dhacay</string>
+    <string name="player_stream_failure">Shaygan lama daari karo</string>
     <string name="app_ui_crash">App-ka/UI-ga ayaa khalkhalay</string>
     <string name="could_not_load_image">Sawirka lama soo kicin karo</string>
     <string name="could_not_get_stream">Wax la daawado lama heli karo</string>
@@ -344,153 +344,315 @@
     <string name="light_parsing_error">Website-ka si buuxda looma furi karo</string>
     <string name="parsing_error">Lama furi karo website-ka</string>
     <string name="youtube_signature_deobfuscation_error">Lama badali karo sixiixa tixraaca muuqaalka</string>
-    <string name="could_not_load_thumbnails">Lama kicin karo galalka</string>
-    <string name="network_error">Khalad xaga khadka ah</string>
-    <string name="download_to_sdcard_error_message">Ku dajinta kaydka dibadda ee SD-ga suurtogal ma aha. Dib u fadhiisi meesha wax lagu dajiyo\?</string>
+    <string name="could_not_load_thumbnails">Lama soo wada kicin karo galalkoo dhan</string>
+    <string name="network_error">khalad xaga khadka ah</string>
+    <string name="download_to_sdcard_error_message">Ku dajinta kaydka dibadda (mimoriga) suurtogal ma aha. Dib u fadhiisi meesha wax lagu dajiyo\?</string>
     <string name="download_to_sdcard_error_title">Kaydka dibadda lama heli karo</string>
-    <string name="general_error">Khalad</string>
+    <string name="general_error">Khalad!!</string>
     <string name="help">Caawin</string>
     <string name="search_history_deleted">Wixii la raadiyay waa la tirtiray.</string>
     <string name="delete_search_history_alert">Tirtir dhamaan wixii la raadiyay\?</string>
-    <string name="clear_search_history_summary">Wuxuu tirtiraa kaydka wixii la raadiyay</string>
+    <string name="clear_search_history_summary">Wuxuu tirtiraa kaydka wixii lagu qoray xaga raadinta</string>
     <string name="watch_history_states_deleted">Meelihii ay marayeen waa la tirtiray.</string>
-    <string name="clear_search_history_title">Tir</string>
-    <string name="delete_playback_states_alert">Tirtir dhamaan meelaha ay marayaan\?</string>
-    <string name="clear_playback_states_summary">Wuxuu tirtiraa meelihii ay kuu marayeen</string>
-    <string name="clear_playback_states_title">Tirtir meelaha ay marayaan waxa la daaray</string>
-    <string name="file">Shay</string>
-    <string name="popup_resizing_indicator_title">Dib-Ucabirida</string>
+    <string name="clear_search_history_title">Tirtir wixii la raadiyay</string>
+    <string name="delete_playback_states_alert">Tirtir dhamaan meelaha ay kuu marayeen\?</string>
+    <string name="clear_playback_states_summary">Wuxuu tirtiraa meelihii ay kuu marayeen waxyaabaha aad furtay oo dhan</string>
+    <string name="clear_playback_states_title">Tirtir meelaha ay kuu marayaan waxa la daaray</string>
+    <string name="file">Fayl</string>
+    <string name="popup_resizing_indicator_title">Dib-ucabiraya</string>
     <string name="clear">Nadiifi</string>
     <string name="artists">Fanaan</string>
     <string name="albums">Albumo</string>
     <string name="songs">Heeso</string>
-    <string name="tracks">Qaybo</string>
-    <string name="playlists">Xulal</string>
+    <string name="tracks">Muusik</string>
+    <string name="playlists">Xul</string>
     <string name="playlist">Xul</string>
     <string name="channels">Kanaalo</string>
     <string name="channel">Kanaal</string>
     <string name="downloads_title">Soodajinta</string>
     <string name="downloads">Soodajinta</string>
     <string name="duration_live">Toos</string>
-    <string name="undo">Ka noqo</string>
+    <string name="undo">Soo celi</string>
     <string name="refresh">Cusboonaysii</string>
     <string name="filter">Kala shaandhee</string>
     <string name="disabled">Xidhan</string>
     <string name="yes">Haa</string>
-    <string name="users">Isticmaal</string>
-    <string name="videos_string">Muuqaal</string>
-    <string name="all">Dhamaan</string>
+    <string name="users">Isticmaale</string>
+    <string name="videos_string">Muuqaalo</string>
+    <string name="all">Dhammaan</string>
     <string name="watch_history_deleted">Kaydka wixii ladaawaday waa la tirtiray.</string>
     <string name="delete_view_history_alert">Tirtir gabi ahaan kaydka wixii ladaawaday\?</string>
-    <string name="clear_views_history_summary">Wuxuu tirtiraa kaydka wixii la daawaday iyo meelihii ay kuu</string>
+    <string name="clear_views_history_summary">Wuxuu tirtiraa kaydka wixii la daaray iyo meelihii ay kuu marayeen</string>
     <string name="clear_views_history_title">Nadiifi kaydka wixii ladaawaday</string>
     <string name="clear_cookie_summary">Nadiifi kaydka uu NewPipe kaydiyo markaad xaliso reCAPTCHA</string>
-    <string name="export_data_summary">Dibadda u gudbi kaydka wixii la daawaday, rukunka, xulalka iyo</string>
-    <string name="import_data_summary">Wuxuu badalaa kaydka waxaad daawatay, rukunka, xulalka iyo (hadaad doonto)</string>
-    <string name="recaptcha_cookies_cleared">Kaydkii reCAPTCHA waa la</string>
+    <string name="export_data_summary">Dibadda u gudbi kaydka wixii la daawaday, rukunka, xulalka iyo fadhiga</string>
+    <string name="import_data_summary">Wuxuu badalaa kaydka waxaad daawatay, rukunka, xulalka iyo (hadaad doorato) fadhiga</string>
+    <string name="recaptcha_cookies_cleared">Kaydkii reCAPTCHA waa la nadiifiyay</string>
     <string name="clear_cookie_title">Nadiifi kaydka reCAPTCHA</string>
-    <string name="export_data_title">Gudbi</string>
+    <string name="export_data_title">Gudbi xog diyaarsan</string>
     <string name="import_data_title">Soo gali xog kaydsan</string>
-    <string name="switch_to_main">U badal</string>
-    <string name="switch_to_popup">U baddal</string>
-    <string name="switch_to_background">U baddal xaga dambe</string>
-    <string name="toggle_orientation">Dhinaca</string>
+    <string name="switch_to_main">U badal Sida Caadiga ah</string>
+    <string name="switch_to_popup">U baddal qaabka Daaqada</string>
+    <string name="switch_to_background">U Baddal Xaga Dambe</string>
+    <string name="toggle_orientation">Fur Qaabka (Jiif/Joog)</string>
     <string name="unknown_content">[Garanwaa]</string>
-    <string name="hash_channel_name">Ogaysiiska adalida Muuqaalka</string>
+    <string name="hash_channel_name">Ogaysiiska badalida Muuqaalka</string>
     <string name="hash_channel_description">Ogaysiisyada heerka uu marayo badalida muuqaalka</string>
-    <string name="app_update_notification_channel_description">Ogaysiisyada nooca cusub ee</string>
-    <string name="app_update_notification_channel_name">Ogaysiiska Cusbonaysiinta NewPipe</string>
-    <string name="notification_channel_description">Ogaysiisyada NewPipe markuu gadaal ka shidan yahay</string>
+    <string name="app_update_notification_channel_description">Ogaysiisyada nooca cusub ee NewPipe</string>
+    <string name="app_update_notification_channel_name">Ogaysiiska Cusbonaysiinta app-ka</string>
+    <string name="notification_channel_description">Ogaysiisyada NewPipe markuu gadaal iyo xaga daaqada wax ka daarayo</string>
     <string name="notification_channel_name">Ogaysiisyada NewPipe</string>
-    <string name="just_once">Hal</string>
-    <string name="always">Mar</string>
-    <string name="play_all">Daar</string>
-    <string name="file_deleted">Waa la saaray</string>
-    <string name="best_resolution">Tayada</string>
+    <string name="just_once">Markan uun</string>
+    <string name="always">Marwalba</string>
+    <string name="play_all">Wada Daar</string>
+    <string name="file_deleted">Shayga waa la saaray</string>
+    <string name="best_resolution">Tayada ugu fiican</string>
     <string name="later">Hadhow</string>
-    <string name="events">Dhacdooyin</string>
-    <string name="error_report_title">Faahfaahinta</string>
-    <string name="restricted_video">Muuqaalkan da\'da ayuu ku xidhan yahay
+    <string name="events">Bandhigyo</string>
+    <string name="error_report_title">Warcelin khalad</string>
+    <string name="restricted_video">Muuqaalkan da\'da qofka ayuu ku xidhanyahay.
 \n
-\nXaga fadhiga ka fur \"%1$s\" hadaad rabto inaad furto.</string>
+\nKasoo fur \"%1$s\" xaga fadhiga hadaad rabto inaad aragto.</string>
     <string name="youtube_restricted_mode_enabled_summary">YouTube-ku wuxuu leeyahay \"Qaabka Xadidan\" kaasoo qariya waxyaabo laga yaabo ineysa haboonayn</string>
-    <string name="youtube_restricted_mode_enabled_title">Fur nidaamka YouTube-ka \"Qaabka Xadidan\"</string>
-    <string name="show_age_restricted_content_summary">Soo bandhig muuqaalada laga yaabo inaysa ku haboonayn caruurta sababtoo ah waxay ku xidhan yihiin da\'da (sida 18+)</string>
-    <string name="show_age_restricted_content_title">Tus muuqaalada da\'da ubaahan</string>
-    <string name="content">shay-ga</string>
+    <string name="youtube_restricted_mode_enabled_title">Fur Nidaamka \"Qaabka Xadidan\"</string>
+    <string name="show_age_restricted_content_summary">Soo bandhig waxyaabaha laga yaabo inaysa ku haboonayn caruurta sababtoo ah waxay ku xidhan yihiin da\'da qofka (sida 18+)</string>
+    <string name="show_age_restricted_content_title">Tus waxyaabaha da\'da ku xidhan</string>
+    <string name="content">Luuqada &amp; Fadhiga Kale</string>
     <string name="popup_playing_append">Waxaa lagu horay daaqada</string>
     <string name="background_player_append">Waxaa lagu horay xaga dambe</string>
     <string name="popup_playing_toast">Ku daaraya daaqada</string>
     <string name="background_player_playing_toast">Ka daaraya xaga dambe</string>
     <string name="settings_category_notification_title">Ogaysiisyada</string>
     <string name="settings_category_updates_title">Cusboonaysiinta</string>
-    <string name="settings_category_debug_title">Cilad-bixinta</string>
-    <string name="settings_category_other_title">Waxyaabo kale</string>
-    <string name="settings_category_appearance_title">Muuqaalka</string>
+    <string name="settings_category_debug_title">Cilad bixinta</string>
+    <string name="settings_category_other_title">Waxyaabo Kale</string>
+    <string name="settings_category_appearance_title">Nashqada</string>
     <string name="settings_category_popup_title">Daaqada</string>
-    <string name="settings_category_history_title">Taariikhdka &amp; kaydka kumeelgadhka</string>
-    <string name="settings_category_video_audio_title">Muuqaalka iyo codka</string>
-    <string name="settings_category_player_title">Muuqaal daareha</string>
+    <string name="settings_category_history_title">Wixii Hore &amp; kaydka K/G ah</string>
+    <string name="settings_category_video_audio_title">Muuqaalada &amp; Dhagaysiga</string>
+    <string name="settings_category_player_title">Daareha</string>
     <string name="settings_category_player_behavior_title">Dabeecada</string>
     <string name="peertube_instance_add_exists">Qaybtan horay ayay ujirtay</string>
-    <string name="peertube_instance_add_https_only">Kaliya waxaa la furi karaa URL-lada HTTPS ka ah</string>
+    <string name="peertube_instance_add_https_only">Kaliya waxaa la taageeraa tixraacyada HTTPS-ka ah</string>
     <string name="peertube_instance_add_fail">Lama ansixin karo qaybtan</string>
-    <string name="peertube_instance_add_help">Gali URL-ka qaybta</string>
-    <string name="peertube_instance_add_title">Ku dar qaybta</string>
+    <string name="peertube_instance_add_help">Gali tixraaca qaybta</string>
+    <string name="peertube_instance_add_title">Ku dar qayb</string>
     <string name="peertube_instance_url_help">%s ka hel qaybaha aad jeceshahay</string>
     <string name="peertube_instance_url_summary">Dooro qaybaha aad jeceshahay ee PeerTube-ka</string>
     <string name="peertube_instance_url_title">Qaybaha PeerTube</string>
-    <string name="content_language_title">Luuqada muuqaalada</string>
-    <string name="service_title">Adeeg</string>
-    <string name="default_content_country_title">Wadanka muuqaalada</string>
-    <string name="unsupported_url_dialog_message">Lama garan karo URL-kan. Ku fur app kale\?</string>
-    <string name="unsupported_url">URL aan la furi karin</string>
-    <string name="show_hold_to_append_summary">Tus sharaxaada marka la riixayo batoonka gadaal ama midka daaqada ee ku yaala \"Faahfaahinta:\" muuqaalka</string>
-    <string name="show_hold_to_append_title">Tus sharaxaha \"Farta ku hay si aad iskugu darto\"</string>
-    <string name="show_next_and_similar_title">Soo dhig muuqaalada \"Ka xiga\" iyo \"Kuwa lamidka h\"</string>
-    <string name="autoplay_title">Isdaarida</string>
+    <string name="content_language_title">Luuqada Muuqaalka/Dhagaysiga</string>
+    <string name="service_title">Adeega</string>
+    <string name="default_content_country_title">Wadanka muuqaalada/dhagaysiga</string>
+    <string name="unsupported_url_dialog_message">Lama aqoonsan karo tixraacan. Ku fur app kale\?</string>
+    <string name="unsupported_url">Tixraac aan la furi karin</string>
+    <string name="show_hold_to_append_summary">Tus sharaxaada marka la riixayo batoonka xaga dambe ama midka daaqada ee ku yaala xaga \"Faahfaahinta:\" muuqaalka</string>
+    <string name="show_hold_to_append_title">Tus sharaxaada \"Farta ku hay si aad iskugu darto\"</string>
+    <string name="show_next_and_similar_title">Muuqaalada \'Ka xiga\' iyo \'Kuwa Lamidka ah\'</string>
+    <string name="autoplay_title">isdaarida</string>
     <string name="download_dialog_title">Daji</string>
-    <string name="resume_on_audio_focus_gain_summary">Sii wad wixii daarada marka la dhabqiyo kadib (tus. wicitaanada)</string>
-    <string name="resume_on_audio_focus_gain_title">Sii wad</string>
-    <string name="enable_watch_history_summary">La soco muuqaalada ladaawaday</string>
-    <string name="settings_category_clear_data_title">Tirtir xogta</string>
-    <string name="enable_playback_state_lists_summary">Kusoo bandhig meelaha laga daarayo liis-tada</string>
-    <string name="enable_playback_state_lists_title">Meelaha liis-tada ku jira</string>
+    <string name="resume_on_audio_focus_gain_summary">Sii wad wixii daaraa marka la dhabqiyo kadib (tusaale marka wicitaan kusoo galo)</string>
+    <string name="resume_on_audio_focus_gain_title">Sii wad daaridda</string>
+    <string name="enable_watch_history_summary">La soco [oo kaydi] muuqaalada ladaawaday</string>
+    <string name="settings_category_clear_data_title">Tirtir Xogta</string>
+    <string name="enable_playback_state_lists_summary">Tus meelaha waxa daaran meeshuu marayo tilmaamaya ee xaga liistada</string>
+    <string name="enable_playback_state_lists_title">Meelaha ay marayeen (xaga liistada)</string>
     <string name="enable_playback_resume_summary">Kasii wad meeshii hore</string>
-    <string name="enable_playback_resume_title">Siiwad wixii hore</string>
-    <string name="enable_watch_history_title">Wixii horay looraadiyay</string>
-    <string name="enable_search_history_summary">Kaydi wixii la raadiyay (aalada)</string>
+    <string name="enable_playback_resume_title">Sii wad wixii daarnaa</string>
+    <string name="enable_watch_history_title">Wixii la daawaday</string>
+    <string name="enable_search_history_summary">Ku kaydi wixii la raadiyay aalada</string>
     <string name="enable_search_history_title">Wixii laraadiyay</string>
     <string name="show_search_suggestions_summary">Tus soojeedino marka wax la raadinayo</string>
-    <string name="show_search_suggestions_title">Soojeedinta Raadinta</string>
+    <string name="show_search_suggestions_title">Soojeedinada raadinta</string>
     <string name="player_gesture_controls_summary">Isticmaal fartaada si aad umaamusho iftiinka iyo codka</string>
-    <string name="player_gesture_controls_title">Maamulista daaraha (farta)</string>
-    <string name="brightness_gesture_control_summary">Isticmaal fartaada si aad u maamusho iftiinka</string>
+    <string name="player_gesture_controls_title">Ku maamulista daareha fartaada</string>
+    <string name="brightness_gesture_control_summary">Isticmaal fartaada adigoo shaashada farta dhinac kaga jiidaya si aad u maamusho iftiinka</string>
     <string name="brightness_gesture_control_title">Maamulista iftiinka (farta)</string>
-    <string name="volume_gesture_control_summary">Isticmaal fartaada si aad umaamusho codka</string>
-    <string name="volume_gesture_control_title">Maamulista codka ee farta</string>
+    <string name="volume_gesture_control_summary">Isticmaal fartaada adigoo shaashada farta dhinac kaga jiidaya si aad umaamusho codka</string>
+    <string name="volume_gesture_control_title">Maamulista codka (farta)</string>
     <string name="auto_queue_toggle">Hormada-isutalisa</string>
-    <string name="auto_queue_summary">Sii wad dhamaynta (mida aan isku celcelinin) hormada shidan ayadoo lagu darayo waxyaabo la xidhiidha</string>
-    <string name="auto_queue_title">Ku xiji hormada la daari doono</string>
-    <string name="metadata_cache_wipe_complete_notice">Waa la tirtiray yaryarkii</string>
-    <string name="metadata_cache_wipe_summary">Tirtir waxyaabaha kumeelgaadhka ah</string>
-    <string name="metadata_cache_wipe_title">Tirtir waxyaabaha yaryar</string>
+    <string name="auto_queue_summary">Sii wad dhamaystirka (mida aan isku celcelinin) hormada shidan ayadoo lagu sii darayo waxyaabo la xidhiidha shayga daaran</string>
+    <string name="auto_queue_title">Ku xiji hormada shayga xiga</string>
+    <string name="metadata_cache_wipe_complete_notice">Waa la tirtiray kaydkii K/G ahaa fahfaahinada yaryar</string>
+    <string name="metadata_cache_wipe_summary">Tirtir waxyaabaha K/G ah ee boga website-ka</string>
+    <string name="metadata_cache_wipe_title">Tirtir faahfaahinada yaryar</string>
     <string name="thumbnail_cache_wipe_complete_notice">kaydkii kumeelgaadhka ahaa ee sawirka waa la tirtiray</string>
-    <string name="download_thumbnail_summary">Xidh si aad u joojiso soobandhiga galalka muuqaalada, adigoo yaraynaya isticmalka khadka iyo maskaxda. Waxkabadalkan wuxuu nafiifin waxa kaydka hore iyo ka caadiga ah kumeelgaadh ahan ugu jira.</string>
-    <string name="show_comments_summary">Xidh si aad u qariso aragtiyada</string>
-    <string name="show_comments_title">Tus aragtitada</string>
-    <string name="download_thumbnail_title">Soosaar galka muuqaalka</string>
-    <string name="clear_queue_confirmation_description">Hormada muuqaal daaraha hada wax shidaya waa la badali doonaa</string>
-    <string name="clear_queue_confirmation_summary">Kalabadalka muuqaal daaraha waxay badali kartaa hormada</string>
-    <string name="clear_queue_confirmation_title">Waydii in la xaqiijiyo intan hormada la tirtirin</string>
-    <string name="seek_duration_title">Horay-udhaafinta/-dibucelinta wakhtigeeda</string>
-    <string name="use_inexact_seek_summary">Dhaaf-dhaafinta waxa daaran ee aan boqolkiiba boqol saxda ahayn waxay u sahashaa muuqaal daaraha inuu u dhaaf dhaafiyo si dagdag ah. Nidaamkan 5, 15 ama 25 ilbiriqsi wax looma dhaafdhaafin karo.</string>
-    <string name="black_theme_title">Madow</string>
+    <string name="download_thumbnail_summary">Xidh si aad u joojiso soo bandhiga galka muuqaalada, adigoo yaraynaya isticmalka khadka iyo maskaxda aalada. Wax kabadalkan wuxuu nadiifin doonaa waxa kaydka hore iyo ka caadiga ah kumeelgaadh ahaan ugu jira.</string>
+    <string name="show_comments_summary">Xidh si aad u qariso faalooyinka</string>
+    <string name="show_comments_title">Tus faalooyinka</string>
+    <string name="download_thumbnail_title">Soo dhig galalka</string>
+    <string name="clear_queue_confirmation_description">Hormada daareha hadda wax shidaya waa la badali doonaa</string>
+    <string name="clear_queue_confirmation_summary">Kala badalka daareha waxay badali kartaa hormada</string>
+    <string name="clear_queue_confirmation_title">Waydii in la xaqiijiyo intaan hormada la tirtirin</string>
+    <string name="seek_duration_title">Wakhtiga horay udhaafinta/-dibucelinta</string>
+    <string name="use_inexact_seek_summary">Dhaaf-dhaafinta dagdaga ah ee waxa daaran, 100% sax wax uma dhaafiso waxayna u sahashaa muuqaal daareha inuu u dhaaf dhaafiyo si dagdag ah. Nidaamkan 5, 15 ama 25 ilbiriqsi wax looma dhaafin karo.</string>
+    <string name="black_theme_title">Mugdi</string>
     <string name="light_theme_title">Caddaan</string>
-    <string name="play_audio">Cod</string>
+    <string name="play_audio">Dhagaysi</string>
     <string name="notification_action_nothing">Waxba</string>
-    <string name="autoplay_by_calling_app_title">Isdaar</string>
+    <string name="autoplay_by_calling_app_title">isdaarida</string>
     <string name="screen_rotation">gaddinta</string>
     <string name="search">Raadi</string>
     <string name="download">Daji</string>
+    <string name="fragment_feed_title">Maxaa Cusub (Rukunka)</string>
+    <string name="stop">Jooji</string>
+    <string name="close">Ka bax</string>
+    <string name="grid">Shax</string>
+    <string name="minimize_on_exit_none_description">Waxba</string>
+    <string name="decline">Diid</string>
+    <string name="name">Magaca</string>
+    <string name="conferences">Shirarka</string>
+    <string name="feed_create_new_group_button_title">Mid Cusub</string>
+    <string name="auto">ismaamulaya</string>
+    <string name="playback_step">Talaabo</string>
+    <string name="mute">Aamusii</string>
+    <string name="selection">Calaamadin</string>
+    <string name="autoplay_summary">Daaridda si iskeed ah u bilow — %s</string>
+    <string name="feed_subscription_not_loaded_count">Lama soo kicinin: %d</string>
+    <string name="download_already_pending">Waxaa jirta dajin hormada ku jirta oo magacan leh</string>
+    <string name="max_retry_desc">Tirada dib iskugu dayida sixida soodajinta intaan la iska daynin dajinta</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">%d ayaa la calaamadiyay</item>
+        <item quantity="other">%d ayaa la calaamadiyay</item>
+    </plurals>
+    <string name="enqueue">Hormo</string>
+    <string name="recent">Ugu Dambeeyay</string>
+    <string name="settings_category_feed_title">Bandhiga</string>
+    <string name="error_http_no_content">Martigaliyahu wax masoo dirin</string>
+    <string name="label_code">Tirsi</string>
+    <string name="post_processing">Habaynaya</string>
+    <string name="list">Si taxan</string>
+    <string name="playback_tempo">Teembada</string>
+    <string name="enqueue_stream">Hormo gali</string>
+    <string name="local">Gudaha Aalada</string>
+    <string name="show_thumbnail_summary">U isticmaal galka xaga shaashada markay xidhantahay iyo xaga kore ee ogaysiisyada</string>
+    <string name="playlist_page_summary">Boga xulka</string>
+    <string name="show_thumbnail_title">Tus Galka</string>
+    <string name="video_detail_by">Sameeyay %s</string>
+    <string name="channel_created_by">Waxaa sameeyay %s</string>
+    <string name="detail_sub_channel_thumbnail_view_description">Waxa u saaran kanaalka</string>
+    <string name="content_not_supported">Shaygan wali NewPipe ma taageerin.
+\n
+\nMustaqbalka in la taageero ayaa la rajaynayaa.</string>
+    <string name="feed_use_dedicated_fetch_method_help_text">Sookicinta bandhigu aad miyuu u daahayaa\? Haday saas tahay, iskuday furashada qaabka dagdaga ah (waxaad ka badali kartaa xaga fadhiga ama adoo riixaya batoonka hoose).
+\n
+\nNewPipe wuxuu leeyahya laba qaab oo uu bandhiga usoo furo:
+\n• Soo kicinta dhamaan rukunka kanaalka, taasoo ah mid culus laakiin dhamaystiran.
+\n• Inuu isticmaalo adeeg hawshan loogu talagalay, taasoo ah mid dagdaga ah laakiin badanaa aan dhamaystirnayn.
+\n
+\nFarqiga labadan u dhexeeya ayaa ah in midka dagdaga ag uu la\'yahay xogta shayga qaar, sida intuu shaygu socdo ama nooca (mana kala garan karo muuqaalada tooska ah iyo kuwa caadiga ah) wuxuuna sidoo kale soodhigi karaa waxyaabo yar.
+\n
+\nYouTube waa tusaale adeegyada bixiya qaabka dagdaga ah xagooda bandhiga RSS -ka.
+\n
+\nSidaa darteed dookhu wuxuu ku xidhanyahay kolba kaad rabto: adeeg dagdag ag ama wax saxan oo dhamaystiran.</string>
+    <string name="feed_use_dedicated_fetch_method_disable_button">Xidh qaabka dagdaga</string>
+    <string name="feed_use_dedicated_fetch_method_enable_button">Fur qaabka dagdaga ah</string>
+    <string name="feed_use_dedicated_fetch_method_summary">Laga heli karo adeegyada qaar, inta badana wuu ka dagdag badanyahay laakiin wuu ka natiijooyin yar yahay badanaana xogtu ma dhamaystirna (tusaale intuu shaygu soconayo ma tusayo, nooca shayga sidoo kale, mana sheegayo inuu wuxu toos yahay).</string>
+    <string name="feed_use_dedicated_fetch_method_title">Kasoo qaado bandhig loogu talagalay marka la heli karo</string>
+    <string name="feed_update_threshold_option_always_update">Marwalba cusboonaysii</string>
+    <string name="feed_update_threshold_summary">Wakhtiga cusboonaysiinta udambaysa ee bandhiga, ka hor intaan rukunka laga sooqaadin mid duug ah — %s</string>
+    <string name="feed_update_threshold_title">Xadka cusboonaysiinta</string>
+    <string name="feed_group_show_only_ungrouped_subscriptions">Tus rukumada aan kooxaysnayn kaliya</string>
+    <string name="feed_group_dialog_delete_message">Ma rabtaa inaad kooxdan saarto\?</string>
+    <string name="feed_group_dialog_empty_name">Magac kooxeed madhan</string>
+    <string name="feed_group_dialog_empty_selection">Wax rukun ah lama dooran</string>
+    <string name="feed_group_dialog_select_subscriptions">Dooro rukumada</string>
+    <string name="feed_processing_message">Habaynaya bandhiga…</string>
+    <string name="feed_notification_loading">Sookicinaya bandhiga…</string>
+    <string name="feed_oldest_subscription_update">La cusboonaysiiyay: %s</string>
+    <string name="feed_groups_header_title">Kooxaha kanaalka</string>
+    <plurals name="days">
+        <item quantity="one">%d maalin</item>
+        <item quantity="other">%d maalmood</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d saac</item>
+        <item quantity="other">%d saac</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d daqiiqo</item>
+        <item quantity="other">%d daqiiqo</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%d ilbiriqsi</item>
+        <item quantity="other">%d ilbiriqsi</item>
+    </plurals>
+    <string name="new_seek_duration_toast">Ayadooy ugu wacantahay xayiraad xaga ExoPlayer-ka ah xadka dhaaf-dhaafinta waa %d ilbiriqsi</string>
+    <string name="remove_watched_popup_yes_and_partially_watched_videos">Haa, sidoo kale ku dar muuqaalada qayb laga daawaday</string>
+    <string name="remove_watched_popup_warning">Muuqaalada la daawaday kahor iyo kadib markii xulka lagu daray waa la saari doonaa.
+\nMa hubtaa\? Arrinkan dib looma soocelin karo!</string>
+    <string name="remove_watched_popup_title">Saar muuqaalada la daawaday\?</string>
+    <string name="remove_watched">Saar kuwa la daawaday</string>
+    <string name="systems_language">Aaladu say tahay</string>
+    <string name="app_language_title">Luuqada App-ka</string>
+    <string name="choose_instance_prompt">Dooro qayb</string>
+    <string name="downloads_storage_use_saf_summary">\'Storage Access Framework\' loosoo gaabiyo SAF wuxuu suurto galiyaa in mimoriga wax lagu dajiyo.
+\nAaladaha qaar kuma shaqeeyaan nidaamkan</string>
+    <string name="downloads_storage_use_saf_title">Isticmaal SAF</string>
+    <string name="downloads_storage_ask_summary_kitkat">Shay walba meesha lagu kaydin doono ayaa lagu waydiin.
+\nDooro SAF hadaad rabto inaad wax ku dajiso mimoriga (SD-kaarka)</string>
+    <string name="downloads_storage_ask_summary">Shay walba meesha lagu kaydin doono ayaa lagu waydiin</string>
+    <string name="downloads_storage_ask_title">Waydii meesha lagu dajinayo</string>
+    <string name="pause_downloads">Qabo soodajimaha</string>
+    <string name="start_downloads">Bilow dajinta</string>
+    <string name="enable_queue_limit_desc">Hal soodajin ayaa markiiba socon</string>
+    <string name="enable_queue_limit">Xadid hormada dajinta</string>
+    <string name="pause_downloads_on_mobile_desc">Tani waxay muhiim tahay marka khadka la isticmaalayo midka SIM-ka loo badalo, inkastoo soodajimaha qaar aan la joojin karin</string>
+    <string name="pause_downloads_on_mobile">Qabo dajinta marka khad xadidan la isticmaalayo</string>
+    <string name="max_retry_msg">Xadka dib-isugudayida</string>
+    <string name="deleted_downloads">Waxaa la saaray %1$d shay</string>
+    <string name="delete_downloaded_files">Saar wixii lasoo dajiyay</string>
+    <string name="confirm_prompt">Ma waxaad rabtaa inaad nadiifiso kaydka wixii lasoo dajiyay (tani ma tirtirto wixii lasoo dajiyay) mise inaad saarto dhammaan wixii lasoo dajiyay\?</string>
+    <string name="clear_download_history">Nadiifi kaydka wixii la dajiyay</string>
+    <string name="error_download_resource_gone">Dajintan lama hagaajin karo</string>
+    <string name="error_timeout">Ku xidhidii ayaa wakhtigii ka dhacay</string>
+    <string name="error_progress_lost">Hawshii socotay way kala kacday, sababtoo ah shayga waa lala saaray</string>
+    <string name="error_insufficient_storage">Meel banaan oo wax lagu kaydiyo aalaada kuma hadhin</string>
+    <string name="error_postprocessing_stopped">NewPipe waxaa la xidhay asagoo fayl ka shaqaynaya</string>
+    <string name="error_postprocessing_failed">Habayntii way guuldareystay</string>
+    <string name="error_http_not_found">Lama helin</string>
+    <string name="error_http_unsupported_range">Martigaliyuhu ma aqbalo dajinta qaybaha badan leh, iskula day @string/msg_threads = 1</string>
+    <string name="error_connect_host">Kuma xidhi karo martigaliyaha</string>
+    <string name="error_unknown_host">Lama heli karo martigaliyaha</string>
+    <string name="error_ssl_exception">Lama samayn karo iskuxidh amni ah</string>
+    <string name="error_permission_denied">Ogolaanshihii waxaa diiday aalada</string>
+    <string name="error_path_creation">Galkii la rabay lama samayn karo</string>
+    <string name="error_file_creation">Faylka lama samayn karo</string>
+    <string name="show_error">Tus khaladka</string>
+    <string name="download_already_running">Waxaa jirta dajin socota oo magacan leh</string>
+    <string name="overwrite_failed">Faylka laguma badali karo</string>
+    <string name="overwrite_finished_warning">Shay horay loo soo dajiyay oo magacan leh ayaa jira</string>
+    <string name="minimize_on_exit_popup_description">U gudbi xaga daaqada</string>
+    <string name="minimize_on_exit_background_description">U gudbi xaga dambe</string>
+    <string name="minimize_on_exit_summary">Waxa la samayn doono marka app kale loo gudbayo ayadoo muuqaal caadi u daaran yahay — %s</string>
+    <string name="updates_setting_description">Ogaysiis soo bandhig doonaya inaad app-ka cusboonaysiiso marka mid cusub soo baxo</string>
+    <string name="limit_mobile_data_usage_title">Xadid tayada marka khadka SIM-ka la isticmaalayo</string>
+    <string name="accept">Aqbal</string>
+    <string name="start_accept_privacy_policy">Si loogu hogaansamo Maaraynta Xog Dhawrka Guud ee heer Yurub (GDPR), waxaan halkan kugu xusuusinaynaa siyaasada sirdhawrka NewPipe. Fadlan si taxadar leh u akhriso.
+\nWaana inaad aqbashaa si [hadii aad damacdo] aad cilad app-ka ah warcelin nooga soo dirto.</string>
+    <string name="playback_pitch">Dheelitirka codka</string>
+    <string name="unhook_checkbox">Ka fur (sababi kara isbadal)</string>
+    <string name="import_network_expensive_warning">Hawlgalkan wuxuu noqon karaa mid khad badan isticmaala.
+\n
+\nMa rabtaa inaad sii wado\?</string>
+    <string name="import_soundcloud_instructions">Soogali meesha SoundCloud adoo ku qoraya tixraaca ama ID-gaaga:
+\n
+\n1. Fur nidaamka \"Desktop mode\" browser-kaaga dhexdiisa (sababtoo ah websitekan moobilada kuma shaqaynayo)
+\n2. Booqo tixraacan %1$s
+\n3. Gali akoonkaaga marka lagu waydiiyo 
+\n4. Koobiyee tixraaca boga ee lagugu xawilay.</string>
+    <string name="import_youtube_instructions">Soo gali rukumada YouTube-ka:
+\n
+\n1. Booqo tixraacan: %1$s
+\n2. Gali akoonkaaga marka lagu waydiiyo 
+\n3. Kusii dhufo \"Xogtoo dhan kudar\", kadibna \"Ha calaamdin dhamaan\" kadibna dooro kaliya \"Rukunka\" oo \"OK\" dheh 
+\n4. Ku dhufo \"Talaabada xigta\" kadibna \"Samee gudbin\"
+\n5. Ku dhufo batoonka \"Daji\" kadib markuu soo muuqdo 
+\n6. Zip-ka lasoo dajiyay kala furfur faylka .jason (badanaa wuxuu hoos tagaa \" \"YouTube and YouTube Music/subscriptions/subscriptions.json\") kadibna xagan soo gali.</string>
+    <string name="caption_setting_title">Qoraal-hooseed</string>
+    <string name="caption_auto_generated">isa-sameeyay</string>
+    <string name="resize_fit">La ekaysii</string>
+    <string name="popup_player">Daareha daaqada</string>
+    <string name="title_activity_history">Wixii Hore</string>
+    <string name="show_meta_info_summary">Halkan xidh si aad u qariso santuuqyada faahfaahinada yaryarka ah ee xogaha dheeraadka ah ee soosaaraha muuqaalka/dhagaysiga, waxa la daawanayo ama codsi raadin.</string>
+    <string name="show_meta_info_title">Faahfaahinta dheeraadka ah</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 243f77f1109..a8168617de0 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -10,7 +10,7 @@
     <string name="download">Преузми</string>
     <string name="search">Тражи</string>
     <string name="settings">Поставке</string>
-    <string name="did_you_mean">Да ли сте мислили: %1$s\?</string>
+    <string name="did_you_mean">Да ли сте мислили: \"%1$s\"\?</string>
     <string name="share_dialog_title">Подели помоћу</string>
     <string name="choose_browser">Отвори помоћу</string>
     <string name="screen_rotation">ротација</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d105be597f1..5d53cfc72e1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -652,4 +652,7 @@
     <string name="msg_calculating_hash">Dosya özeti hesaplanıyor</string>
     <string name="hash_channel_description">Video dosya özetleme süreci için bildirimler</string>
     <string name="hash_channel_name">Video Dosya Özeti Bildirimi</string>
+    <string name="recent">Son</string>
+    <string name="show_meta_info_summary">Akış yaratıcısı, akış içeriği veya arama isteğiyle ilgili ek bilgiyi gösteren üst bilgi kutularını gizlemek için kapat.</string>
+    <string name="show_meta_info_title">Üst bilgiyi göster</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e51382ac56b..ce243d6d4d5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -642,4 +642,7 @@
     <string name="msg_calculating_hash">正在計算雜湊</string>
     <string name="hash_channel_description">影片雜湊流程通知</string>
     <string name="hash_channel_name">影片雜湊通知</string>
+    <string name="recent">最近</string>
+    <string name="show_meta_info_summary">關閉以隱藏帶有關於串流建立者、串流內容或搜尋請求等額外資料的詮釋資料框。</string>
+    <string name="show_meta_info_title">顯示詮釋資訊</string>
 </resources>
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar/changelogs/957.txt b/fastlane/metadata/android/ar/changelogs/957.txt
new file mode 100644
index 00000000000..f6fc9b436ff
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/957.txt
@@ -0,0 +1,10 @@
+• توحيد إجراءات قائمة محددة في واحد
+• إيماءة بإصبعين لإغلاق اللاعب
+• السماح بمسح ملفات تعريف الارتباط reCAPTCHA
+• خيار عدم تلوين الإخطار
+• تحسين كيفية فتح تفاصيل الفيديو لإصلاح التخزين المؤقت اللانهائي وسلوك عربات التي تجرها الدواب عند المشاركة على NewPipe وغيرها من التناقضات
+• تسريع مقاطع فيديو YouTube وإصلاح القيود العمرية
+• إصلاح الانهيار عند التقديم / الترجيع السريع
+• لا تقم بإعادة ترتيب القوائم عن طريق سحب الصور المصغرة
+• تذكر دائمًا خصائص النوافذ المنبثقة
+• إضافة اللغة السانتالية
diff --git a/fastlane/metadata/android/ar/changelogs/958.txt b/fastlane/metadata/android/ar/changelogs/958.txt
index 7678e239bf3..3ccd067f974 100644
--- a/fastlane/metadata/android/ar/changelogs/958.txt
+++ b/fastlane/metadata/android/ar/changelogs/958.txt
@@ -1,15 +1,15 @@
-جديد ومطور:
-• إعادة الخيار لإخفاء الصورة المصغرة في شاشة القفل 
-• السحب لإعادة تحميل الfeed
-• زيادة السرعة عند تحميل المجموعات المحلية
+جديد ومحسن:
+• إعادة إضافة خيار لإخفاء الصورة المصغرة على شاشة القفل
+• اسحب لتحديث التغذية
+• تحسين الأداء عند جلب القوائم المحلية
 
-مشاكل أصلحت:
-• إصلاح انهيار عند التشغيل بعد حذف NewPipe من الRAM
-• إصلاح انهيار عند التشغيل في حالة عدم وجود اتصال بالإنترنت
-• اتباع إعدادات الإيماءات الخاصة بالإضاءة ومستوى الصوت
-• (يوتيوب) إصلاح قوائم التشغيل الطويلة
- 
-أخرى:
-• تنظيف الكود وبضع تطويرات داخلية
-• تحديث المعتمدات
-• تحديثات برجمية
+ثابت:
+• تم إصلاح الانهيار عند بدء تشغيل NewPipe بعد إزالته من ذاكرة الوصول العشوائي
+• عطل ثابت عند بدء التشغيل عندما لا يكون هناك اتصال بالإنترنت
+• إصلاح احترام إعدادات إيماءات السطوع ومستوى الصوت
+• [يوتيوب] قوائم التشغيل الطويلة الثابتة
+
+آخر:
+• تنظيف الكود والعديد من التحسينات الداخلية
+• تحديثات التبعية
+• تحديثات الترجمة
diff --git a/fastlane/metadata/android/ar/changelogs/959.txt b/fastlane/metadata/android/ar/changelogs/959.txt
index 42f8ba89fa8..4bce8b19bb3 100644
--- a/fastlane/metadata/android/ar/changelogs/959.txt
+++ b/fastlane/metadata/android/ar/changelogs/959.txt
@@ -1,3 +1,3 @@
-إصلاح انهيارات متكررة لا نهائية بعد فتح مقرر الأخطاء.
-تحديث مجموعة نماذج PeerTube التي يمكن فتحها أوتوماتيكيًا عن طريق NewPipe.
-تحديث التراجم.
+تم إصلاح حلقة لا نهاية لها من الأعطال بعد فتح مراسل الأخطاء.
+قائمة محدثة بمثيلات PeerTube التي يمكن فتحها تلقائيًا بواسطة NewPipe.
+تحديث الترجمات.
diff --git a/fastlane/metadata/android/ar/changelogs/960.txt b/fastlane/metadata/android/ar/changelogs/960.txt
new file mode 100644
index 00000000000..4af3da4c184
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/960.txt
@@ -0,0 +1,4 @@
+• وصف محسن لخيار تصدير قاعدة البيانات في الإعدادات.
+• ثابت تحليل تعليقات يوتيوب.
+• اسم عرض ثابت لخدمة media.ccc.de.
+• ترجمات محدثة.
diff --git a/fastlane/metadata/android/ar/changelogs/961.txt b/fastlane/metadata/android/ar/changelogs/961.txt
new file mode 100644
index 00000000000..a09a02aa0e0
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [يوتيوب] مزيج الدعم
+• [YouTube] عرض معلومات حول محطات البث العامة و Covid-19
+• [media.ccc.de] تمت إضافة مقاطع فيديو حديثة
+• تمت إضافة الترجمة الصومالية
+
+• العديد من التحسينات الداخلية
+
+• إصلاح مشاركة مقاطع الفيديو من داخل المشغل
+• إصلاح عرض الويب ReCaptcha الفارغ
+• التحطم الثابت الذي حدث عند إزالة دفق من القائمة
+• [PeerTube] تيارات ثابتة ذات صلة
+• [YouTube] بحث ثابت عن موسيقى YouTube
diff --git a/fastlane/metadata/android/ar/changelogs/962.txt b/fastlane/metadata/android/ar/changelogs/962.txt
new file mode 100644
index 00000000000..53e966c3618
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/962.txt
@@ -0,0 +1,2 @@
+اضافة مقاطع فيديو "حديثة" لخدمة media.ccc.de.
+اضافة بث مباشر لخدمة media.ccc.de وكذلك دعم البث المباشر.
diff --git a/fastlane/metadata/android/ca/full_description.txt b/fastlane/metadata/android/ca/full_description.txt
new file mode 100644
index 00000000000..5b13fe53109
--- /dev/null
+++ b/fastlane/metadata/android/ca/full_description.txt
@@ -0,0 +1 @@
+El NewPipe no fa servir cap tipus de llibreria de Google o la API de YouTube. El que fa és analitzar el lloc web amb tal d'obtenir l'informació necessària. D'aquesta manera l'aplicació pot utilitzar-se sense tenir els Serveis de Google instal·lats. Tampoc cal un compte de YouTube per fer servir NewPipe. NewPipe és programari lliure, gratuït i de codi obert.
diff --git a/fastlane/metadata/android/ca/short_description.txt b/fastlane/metadata/android/ca/short_description.txt
new file mode 100644
index 00000000000..9f6ae147f04
--- /dev/null
+++ b/fastlane/metadata/android/ca/short_description.txt
@@ -0,0 +1 @@
+Un reproductor de YouTube lliure i lleuger per a Android.
diff --git a/fastlane/metadata/android/cs/changelogs/962.txt b/fastlane/metadata/android/cs/changelogs/962.txt
new file mode 100644
index 00000000000..b99306ad8a3
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/962.txt
@@ -0,0 +1,2 @@
+Doplněna "nedávná" videa do služby media.ccc.de.
+Doplněny živé streamy do služby media.ccc.de a také podpora živých streamů.
diff --git a/fastlane/metadata/android/de/changelogs/770.txt b/fastlane/metadata/android/de/changelogs/770.txt
new file mode 100644
index 00000000000..73d2084a6b4
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/770.txt
@@ -0,0 +1,4 @@
+Veränderungen in 0.17.2
+
+Behoben
+• Behebung von kein Video verfügbar
diff --git a/fastlane/metadata/android/de/changelogs/920.txt b/fastlane/metadata/android/de/changelogs/920.txt
new file mode 100644
index 00000000000..1beae8fe894
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/920.txt
@@ -0,0 +1,9 @@
+Verbessert:
+
+• Upload-Datum und Ansichtsanzahl für Stream-Grid-Elemente hinzugefügt
+• Verbesserungen für das Layout der Schubladenüberschriften
+
+Korrekturen:
+
+• Bug, der den Stumm-Schalter in API 19 zum Crash der App geführt hat wurde behoben
+• Das Herunterladen von langen 1080p 60fps Videos wurde behoben
diff --git a/fastlane/metadata/android/de/changelogs/950.txt b/fastlane/metadata/android/de/changelogs/950.txt
new file mode 100644
index 00000000000..a5819d667d7
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/950.txt
@@ -0,0 +1,4 @@
+Diese Version enthält drei kleine Änderungen:
+• Speicherzugriff für Android 10+ behoben
+• Öffnen des Kiosks behoben
+• Laden von langen Videos verbessert
diff --git a/fastlane/metadata/android/de/changelogs/952.txt b/fastlane/metadata/android/de/changelogs/952.txt
index fab5f89f470..309b02b09a1 100644
--- a/fastlane/metadata/android/de/changelogs/952.txt
+++ b/fastlane/metadata/android/de/changelogs/952.txt
@@ -1,7 +1,7 @@
-Verbesserungen:
+Verbesserungen
 • Autoplay ist nun für alle Services verfügbar (nicht nur für YouTube)
 
-Reparaturen:
+Reparaturen
 • Verwandte Streams wurden behoben, indem die neuen Streamfortsetzungen von YouTube unterstützt werden
 • Altersbeschränkte Videos repariert
 • [Android TV] Überlagerung von Fokus-Hervorhebungen behoben
diff --git a/fastlane/metadata/android/de/changelogs/959.txt b/fastlane/metadata/android/de/changelogs/959.txt
index f37bee7f0ad..cc1481b906a 100644
--- a/fastlane/metadata/android/de/changelogs/959.txt
+++ b/fastlane/metadata/android/de/changelogs/959.txt
@@ -1,3 +1,3 @@
-Endlose Abstürze bach Öffnen eines Fehlerberichts wurden behoben.
-Die Liste der PeerTube Instanzen, die von NewPipe automatisch geöffnet werden können, wurde aktualisisert.
+Endlose Abstürze nach Öffnen eines Fehlerberichts wurden behoben.
+Die Liste der PeerTube-Instanzen, die von NewPipe automatisch geöffnet werden können, wurde aktualisisert.
 Übersetzungen wurden aktualisert.
diff --git a/fastlane/metadata/android/de/changelogs/962.txt b/fastlane/metadata/android/de/changelogs/962.txt
new file mode 100644
index 00000000000..a2243334d6d
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/962.txt
@@ -0,0 +1,2 @@
+"Neuste" Videos zu media.ccc.de hinzugefügt.
+Live Streams zu media.ccc.de hinzugefügt und die Unterstützung von Live Streams.
diff --git a/fastlane/metadata/android/el/short_description.txt b/fastlane/metadata/android/el/short_description.txt
index 1992765a44a..b5b10ec5893 100644
--- a/fastlane/metadata/android/el/short_description.txt
+++ b/fastlane/metadata/android/el/short_description.txt
@@ -1 +1 @@
-Μία δωρεάν ελαφριά διέπαφη YouTube για συσκευές Android.
+Ένα δωρεάν ελαφρύ εμπρόσθιο τμήμα του YouTube για συσκευές Android.
diff --git a/fastlane/metadata/android/et/full_description.txt b/fastlane/metadata/android/et/full_description.txt
new file mode 100644
index 00000000000..1a8cb9cac83
--- /dev/null
+++ b/fastlane/metadata/android/et/full_description.txt
@@ -0,0 +1 @@
+NewPipe ei kasuta Google-i raamistiku teeke ega YouTube APIt. See ainult sõelub veebilehelt vajamineva info. Seega saab rakendust kasutada ka seadmes, millesse ei ole paigaldatud Google teenuseid (Google Services). Lisaks ei ole NewPipe kasutamisel vaja YouTube'i kontot ja ta on FLOSS.
diff --git a/fastlane/metadata/android/et/short_description.txt b/fastlane/metadata/android/et/short_description.txt
new file mode 100644
index 00000000000..a814b02a37d
--- /dev/null
+++ b/fastlane/metadata/android/et/short_description.txt
@@ -0,0 +1 @@
+Tasuta väikesemahuline YouTube-i esiots.
diff --git a/fastlane/metadata/android/eu/changelogs/962.txt b/fastlane/metadata/android/eu/changelogs/962.txt
new file mode 100644
index 00000000000..171ec0b40e7
--- /dev/null
+++ b/fastlane/metadata/android/eu/changelogs/962.txt
@@ -0,0 +1,2 @@
+"Azken" bideoak media.ccc.de zerbitzura gehitu dira.
+Zuzeneko jarioak eta zuzeneko jarioen bateragarritasuna gehitu dira media.ccc.de zerbitzuan.
diff --git a/fastlane/metadata/android/fr/changelogs/71.txt b/fastlane/metadata/android/fr/changelogs/71.txt
index 6a886199c68..f9fb74baae6 100644
--- a/fastlane/metadata/android/fr/changelogs/71.txt
+++ b/fastlane/metadata/android/fr/changelogs/71.txt
@@ -3,7 +3,7 @@
 * Améliorations téléchargeur (#1944 par @kapodamy) :
   * icônes blanches manquantes; utilisation d'une méthode pour changer leurs couleurs
   * vérification si l'itérateur est initialisé (#2031)
-  * réessayer les téléchargements "post-processing failed" dans le nouveau muxer
+  * réessayer les téléchargements post-processing failed dans le nouveau muxer
   * nouveau muxer MPEG-4 corrigeant les flux non synchrones (#2039)
 
 ### Corrections
diff --git a/fastlane/metadata/android/fr/changelogs/960.txt b/fastlane/metadata/android/fr/changelogs/960.txt
new file mode 100644
index 00000000000..31e2a8c05e8
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/960.txt
@@ -0,0 +1,4 @@
+• Amélioration de la description de l'option export de la base de donnée dans les paramètres.
+• Analyse des commentaires YouTube corrigé.
+• Affichage du nom du service media.ccc.de corrigé.
+• Traductions mises à jour.
diff --git a/fastlane/metadata/android/fr/changelogs/962.txt b/fastlane/metadata/android/fr/changelogs/962.txt
new file mode 100644
index 00000000000..d39d7654efa
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/962.txt
@@ -0,0 +1,2 @@
+Ajout de vidéos « récentes » au service media.ccc.de.
+Ajout de flux en direct au service media.ccc.de et également à la prise en charge du flux en direct.
diff --git a/fastlane/metadata/android/he/changelogs/962.txt b/fastlane/metadata/android/he/changelogs/962.txt
new file mode 100644
index 00000000000..0773f5b789a
--- /dev/null
+++ b/fastlane/metadata/android/he/changelogs/962.txt
@@ -0,0 +1,2 @@
+נוספו סרטונים „אחרונים” לשירות media.ccc.de.
+נוספו תזרימים חיים לשירות media.ccc.de וגם תמיכה בתזרים חי.
diff --git a/fastlane/metadata/android/id/changelogs/959.txt b/fastlane/metadata/android/id/changelogs/959.txt
new file mode 100644
index 00000000000..3ea90df2fa4
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/959.txt
@@ -0,0 +1,3 @@
+Memperbaiki loop crash tanpa henti setelah membuka pelapor kesalahan
+Memperbarui daftar instances PeerTube yang  bisa dibuka secara ototmatis oleh NewPipe
+Memperbarui terjemahan.
diff --git a/fastlane/metadata/android/id/changelogs/960.txt b/fastlane/metadata/android/id/changelogs/960.txt
index 5a9f11de5b7..a2b1bb43f35 100644
--- a/fastlane/metadata/android/id/changelogs/960.txt
+++ b/fastlane/metadata/android/id/changelogs/960.txt
@@ -1,4 +1,4 @@
-• Memperjelas deskripsi dari opsi ekspor basisdata di dalam pengaturan.
+• Memperjelas deskripsi dari opsi ekspor database pada pengaturan.
 • Memperbaiki penguraian komentar YouTube.
 • Memperbaiki tampilan nama layanan media.ccc.de.
 • Memperbarui terjemahan.
diff --git a/fastlane/metadata/android/id/changelogs/961.txt b/fastlane/metadata/android/id/changelogs/961.txt
new file mode 100644
index 00000000000..38e710053fd
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/961.txt
@@ -0,0 +1,12 @@
+•[YouTube] Dukungan Mix.
+•[YouTube] Menampilkan informasi public broadcasters dan COVID-19
+•[media.cc.de]Menambahkan recent videos
+•Menambahkan translasi Somali
+
+•Peningkatan internal lainnya
+
+•Memperbaiki berbagi video dari pemutar
+•Memperbaiki ReCaptcha webview yang kosong
+•Memperbaiki crash yang terjadi saat menghapus sebuah stream dari daftar
+•[PeerTube]Memperbaiki related streams
+•[YouTube]Memperbaiki pencarian YouTube
diff --git a/fastlane/metadata/android/id/changelogs/962.txt b/fastlane/metadata/android/id/changelogs/962.txt
new file mode 100644
index 00000000000..aafda1a18f3
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/962.txt
@@ -0,0 +1,2 @@
+Menambahkan "recent" video ke layanan media.cc.de.
+Menambahkan live streams ke layanan media.cc.de dan dukungan live stream.
diff --git a/fastlane/metadata/android/id/full_description.txt b/fastlane/metadata/android/id/full_description.txt
index e15a44ff24c..992c9a97966 100644
--- a/fastlane/metadata/android/id/full_description.txt
+++ b/fastlane/metadata/android/id/full_description.txt
@@ -1 +1 @@
-NewPipe sama sekali tidak menggunakan pustaka kerangka Google, atau API YouTube. NewPipe mengurai situs YouTube untuk mendapatkan informasi yang dibutuhkan. Oleh karena itu, aplikasi ini bisa digunakan pada perangkat tanpa Layanan Google. Anda juga tidak membutuhkan akun YouTube untuk menggunakan NewPipe, dan sepenuhnya FOSS.
+NewPipe sama sekali tidak menggunakan pustaka kerangka kerja Google, atau layanan API YouTube. NewPipe hanya mengurai situs YouTube untuk mendapatkan informasi yang dibutuhkan. Oleh karena itu, NewPipe bisa digunakan pada perangkat tanpa Layanan Google. Anda juga tidak membutuhkan akun YouTube untuk menggunakan NewPipe, dan aplikasi ini sepenuhnya FLOSS.
diff --git a/fastlane/metadata/android/id/short_description.txt b/fastlane/metadata/android/id/short_description.txt
index 49bfe134483..8f2392268f2 100644
--- a/fastlane/metadata/android/id/short_description.txt
+++ b/fastlane/metadata/android/id/short_description.txt
@@ -1 +1 @@
-Aplikasi YouTube gratis yang ringan untuk Android.
+Sebuah klien YouTube gratis dan ringan untuk android.
diff --git a/fastlane/metadata/android/it/changelogs/961.txt b/fastlane/metadata/android/it/changelogs/961.txt
new file mode 100644
index 00000000000..9590056ffb7
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/961.txt
@@ -0,0 +1,12 @@
+- [YouTube] Supporto mix
+- [YouTube] Visualizza le informazioni sulle emittenti pubbliche e su Covid-19
+- [media.ccc.de] Aggiunti video recenti
+- Aggiunta traduzione in somalo
+
+- Molti miglioramenti interni
+
+- Condivisione fissa dei video dall'interno del lettore
+- Vuoto fisso ReCaptcha webview
+- Crash fisso che si è verificato durante la rimozione di un flusso da una lista
+- [PeerTube] Flussi fissi correlati
+- [YouTube] Ricerca fissa di musica su YouTube
diff --git a/fastlane/metadata/android/it/changelogs/962.txt b/fastlane/metadata/android/it/changelogs/962.txt
new file mode 100644
index 00000000000..10536ce40bb
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/962.txt
@@ -0,0 +1,2 @@
+Aggiunto video "recenti" al servizio media.ccc.de.
+Aggiunto live stream al servizio media.ccc.de e anche supporto live stream.
diff --git a/fastlane/metadata/android/kab/short_description.txt b/fastlane/metadata/android/kab/short_description.txt
new file mode 100644
index 00000000000..295db5f99ef
--- /dev/null
+++ b/fastlane/metadata/android/kab/short_description.txt
@@ -0,0 +1 @@
+Imeɣri aget midya ilelli, afessas i Android.
diff --git a/fastlane/metadata/android/nb-NO/changelogs/962.txt b/fastlane/metadata/android/nb-NO/changelogs/962.txt
new file mode 100644
index 00000000000..b9943daeaff
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/962.txt
@@ -0,0 +1,2 @@
+"Nylige" videoer lagt til for media.ccc.de-tjenesten.
+La til sanntidsstrømmer for media.ccc.de-tjenesten og også sanntidsstrømsstøtte.
diff --git a/fastlane/metadata/android/pl/changelogs/952.txt b/fastlane/metadata/android/pl/changelogs/952.txt
new file mode 100644
index 00000000000..b7373e9c8bd
--- /dev/null
+++ b/fastlane/metadata/android/pl/changelogs/952.txt
@@ -0,0 +1,7 @@
+Ulepszone
+• Autoodtwarzanie jest dostępne we wszystkich usługach (zamiast tylko w YouTube)
+
+Naprawione
+• Naprawiono powiązane strumienie, wspierając nowe kontynuacje YouTube
+• Naprawiono filmy z YouTube z ograniczeniami wiekowymi
+• [Android TV] Naprawiono utrzymującą się nakładkę podświetlenia
diff --git a/fastlane/metadata/android/pl/changelogs/960.txt b/fastlane/metadata/android/pl/changelogs/960.txt
new file mode 100644
index 00000000000..b27fe605302
--- /dev/null
+++ b/fastlane/metadata/android/pl/changelogs/960.txt
@@ -0,0 +1,4 @@
+• Poprawiony opis opcji eksportu bazy danych w ustawieniach.
+• Naprawiono parsowanie komentarzy z YouTube.
+• Naprawiono wyświetlaną nazwę usługi media.ccc.de.
+• Zaktualizowane tłumaczenia.
diff --git a/fastlane/metadata/android/pl/changelogs/961.txt b/fastlane/metadata/android/pl/changelogs/961.txt
new file mode 100644
index 00000000000..a9e80b9db0e
--- /dev/null
+++ b/fastlane/metadata/android/pl/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] Wsparcie Mix
+• [YouTube] Wyświetla informacje o nadawcach publicznych i Covid-19
+• [media.ccc.de] Dodano najnowsze filmy
+• Dodano tłumaczenie somalijskie
+
+• Wiele ulepszeń wewnętrznych
+
+• Naprawiono udostępnianie filmów z poziomu odtwarzacza
+• Naprawiono pusty widok sieciowy ReCaptcha
+• Naprawiono awarię występującą podczas usuwania strumienia z listy
+• [PeerTube] Naprawiono powiązane strumienie
+• [YouTube] Naprawiono wyszukiwanie w YouTube Music
diff --git a/fastlane/metadata/android/pl/changelogs/962.txt b/fastlane/metadata/android/pl/changelogs/962.txt
new file mode 100644
index 00000000000..35835d82269
--- /dev/null
+++ b/fastlane/metadata/android/pl/changelogs/962.txt
@@ -0,0 +1,2 @@
+Dodano "ostatnie" filmy wideo do serwisu media.ccc.de.
+Dodano strumieniowe transmisje na żywo do serwisu media.ccc.de, a także obsługę transmisji na żywo.
diff --git a/fastlane/metadata/android/pt_BR/changelogs/962.txt b/fastlane/metadata/android/pt_BR/changelogs/962.txt
new file mode 100644
index 00000000000..e32f88a7f8d
--- /dev/null
+++ b/fastlane/metadata/android/pt_BR/changelogs/962.txt
@@ -0,0 +1,2 @@
+Adicionados vídeos "recentes" ao serviço media.ccc.de.
+Adicionadas transmissões ao vivo ao serviço media.ccc.de e também suporte a transmissões ao vivo.
diff --git a/fastlane/metadata/android/ta/short_description.txt b/fastlane/metadata/android/ta/short_description.txt
new file mode 100644
index 00000000000..a4098402857
--- /dev/null
+++ b/fastlane/metadata/android/ta/short_description.txt
@@ -0,0 +1 @@
+Android க்கான இலவச இலகுரக YouTube முன்பக்கம்.
diff --git a/fastlane/metadata/android/tr/changelogs/820.txt b/fastlane/metadata/android/tr/changelogs/820.txt
new file mode 100644
index 00000000000..53929e37337
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/820.txt
@@ -0,0 +1 @@
+Şifre çözme işlevi adının düzenli ifadesinin YouTube'u kullanılamaz duruma getirmesi düzeltildi.
diff --git a/fastlane/metadata/android/tr/changelogs/830.txt b/fastlane/metadata/android/tr/changelogs/830.txt
new file mode 100644
index 00000000000..9d6fc3ed2e9
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/830.txt
@@ -0,0 +1 @@
+SoundCloud sorunlarını düzeltmek için SoundCloud client_id güncellendi.
diff --git a/fastlane/metadata/android/tr/changelogs/955.txt b/fastlane/metadata/android/tr/changelogs/955.txt
new file mode 100644
index 00000000000..13ce5122859
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/955.txt
@@ -0,0 +1,3 @@
+[YouTube] Bazı kullanıcılar için arama düzeltildi
+[YouTube] Rastgele şifre çözme istisnalarını düzeltildi
+[SoundCloud] "/" karakteriyle biten URL'ler artık doğru şekilde ayrıştırılıyor
diff --git a/fastlane/metadata/android/tr/changelogs/962.txt b/fastlane/metadata/android/tr/changelogs/962.txt
new file mode 100644
index 00000000000..6fefd23ce84
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/962.txt
@@ -0,0 +1,2 @@
+media.ccc.de hizmetine "son" videolar eklendi.
+media.ccc.de hizmetine canlı akışlar ve ayrıca canlı akış desteği eklendi.
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/740.txt b/fastlane/metadata/android/zh_Hans/changelogs/740.txt
new file mode 100644
index 00000000000..183903baa70
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/740.txt
@@ -0,0 +1,19 @@
+改进
+•使评论中的链接可以点击，增加字号
+•在点击评论中的时间戳链接时寻址视频
+•根据最近选择的状态显示首选标签
+•在播放列表窗口中长按"背景播放"时，将播放列表添加到队列中。
+•搜索非URL的共享文本
+•在主视频播放器中增加"分享当前时间"按钮。
+•当播放列表结束时，在主播放器中添加关闭按钮。
+•在视频列表项目的长按菜单中增加"直接在后台播放"。
+•改进播放/加入队列的英文翻译
+•小幅提高性能
+•删除未使用的文件
+•更新ExoPlayer至2.9.6
+•增加对Invidious链接的支持
+修复
+•修复 滚动，禁用评论和相关视频异常
+•修正 CheckForNewAppVersionTask在不该执行的时候被执行的问题#39。
+•修正 youtube订阅导入：忽略无效url的，保留空标题的。
+•修复 无效的YouTube网址：签名标签名并非总是"签名"了的，导致流媒体无法加载
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/750.txt b/fastlane/metadata/android/zh_Hans/changelogs/750.txt
new file mode 100644
index 00000000000..7f8ef5ccb17
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/750.txt
@@ -0,0 +1,21 @@
+新增
+恢复播放#2288
+• 恢复上次关闭视频
+增强下载器#2149
+• 使用存储访问框架在外部 SD 卡上存储下载
+• 新的 mp4 复用器
+• 在开始下载之前，可选择更改下载目录
+• 提示用流量时下载
+
+改进
+• 已移除gema字符串#2295
+• 在Activity生命周期内自动旋转#2444
+• 常量化长按菜单#2368
+
+修复
+• 修复未显示的选定字幕#2394
+• 检查（GitHub ）应用更新失败时，修复崩溃#2423
+• 修复下载进度停留在 99.9% #2440
+• 更新播放队列元数据#2453
+• [SoundCloud] 修复了加载播放列表时崩溃 Extractor#170
+• [YouTube] 修复持续时间无法缩短 Extractor #177
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/780.txt b/fastlane/metadata/android/zh_Hans/changelogs/780.txt
new file mode 100644
index 00000000000..420673b182e
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/780.txt
@@ -0,0 +1,10 @@
+改进
+• 添加了清除播放状态的选项#2550
+• 在文件选取器中显示隐藏文件#2591
+• 支持使用 NewPipe 应用程序打开的"invidio.us"#2488
+• 添加对"music.youtube.com URL 的支持Extractor#194 
+
+修复
+[Youtube] 修复了 'java.lang.IllegalArgumentException'#192
+[ YouTube] 修复了直播Extractor#195
+• 修复  Android P中下载性能#2592
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/790.txt b/fastlane/metadata/android/zh_Hans/changelogs/790.txt
new file mode 100644
index 00000000000..a291a4f6349
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/790.txt
@@ -0,0 +1,14 @@
+改进
+- 改善视觉障碍人士无障碍环境，增加更多标题#2655
+- 一致化下载文件夹设置的言辞，减少歧义 #2637
+
+修复
+- 检查 块中的最后一个字节是否被下载 #2646
+- 修正 视频详情碎片(fragment)的滚动异常 #2672
+- 将搜索清除框动画删减为一个#2695。
+- [SoundCloud]修复 client_ID 解析#2745。
+
+开发
+- NewPipeExtractor的缺失依赖添加到NewPipe #2535中。
+- 迁移到AndroidX #2685
+- 更新至 ExoPlayer 2.10.6 #2697, #2736
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/800.txt b/fastlane/metadata/android/zh_Hans/changelogs/800.txt
new file mode 100644
index 00000000000..d6d276349fb
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/800.txt
@@ -0,0 +1,21 @@
+新增
+•允许不支持P2P的PeerTube(＃2201)：
+观看和下载PeerTube视频
+在设置中添加实例服务器以访问所有PeerTube(在访问某些服务器时,Android4.4/7.1上的SSL握手可能有问题)
+•下载器(#2679)：
+计算下载ETA
+以ogg下载opus(webm文件)
+长时间暂停后,恢复过期链接
+改进
+使用本地化Kiosk,改善所有主页标签的性能#2742
+使用extractor#2713中的新本地化和下载器实现
+翻译“默认kiosk”字符串
+为暗黑主题适配导航栏#2569
+修复
+修复悬浮窗播放器按下另一根手指后无法移动#2772
+允许播放列表缺少上传者,并修复相关崩溃#2724,Extractor#219 
+在Android4.4上启用TLS1.1/1.2,与MediaCCC和某些PeerTube服务器连接时,修复TLS握手#2792
+[SoundCloud]修复了client_id提取Extractor#217与音频流提取
+开发
+更新ExoPlayer为2.10.8 #2791,#2816
+更新Gradle到3.5.1,添加Kotlin支持#2714
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/810.txt b/fastlane/metadata/android/zh_Hans/changelogs/810.txt
new file mode 100644
index 00000000000..e35ef10b04b
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/810.txt
@@ -0,0 +1,19 @@
+新增
+• 后台播放时，在锁屏界面上显示视频缩略图
+
+改进
+• 长按背景播放/悬浮窗播放按钮时，将本地播放列表加入到队列中
+• 允许主页选项卡(tab)滚动，并在只存在单个选项卡时隐藏选项卡(tab)条
+• 限制后台播放时缩略图通知更新的频率
+• 为空白本地播放列表添加虚拟缩略图
+•不再使用*.webm扩展名而使用 *.opus 文件扩展名，并将其从下拉列表移动到格式标签
+• 添加"下载"中清除下载历史记录的按钮
+• [YouTube] 添加对 /c/shortened_url链接的支持
+
+修复
+• 修复 将视频共享到 NewPipe 并直接下载视频时中的多个问题
+• 修复 播放器无法访问其创建线程
+• 修复 搜索结果分页
+•[Youtube] 修复了在 null 上切换导致 Npe
+•[ YouTube] 在打开一个网址invidio.us时打开用户评论
+• [soundcloud] 更新client_id
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/962.txt b/fastlane/metadata/android/zh_Hans/changelogs/962.txt
new file mode 100644
index 00000000000..9693cd8857e
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/962.txt
@@ -0,0 +1,2 @@
+添加 media.ccc.de服务的“最近上传”视频支持
+添加 media.ccc.de服务的直播支持
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/961.txt b/fastlane/metadata/android/zh_Hant/changelogs/961.txt
new file mode 100644
index 00000000000..564ec8b306e
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hant/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] Mix 支援
+• [YouTube] 顯示關於公共廣播公司與 Covid-19 的資訊
+• [media.ccc.de] 新增最近影片
+• 新增索馬利亞語翻譯
+
+• 許多內部改進
+
+• 修復從播放器內部分享影片的問題
+• 修復空白的 ReCaptcha webview
+• 修復了從列表中移除串流時所發生的當機問題
+• [PeerTube] 修復相關串流
+• [YouTube] 修復 YouTube Music 搜尋
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/962.txt b/fastlane/metadata/android/zh_Hant/changelogs/962.txt
new file mode 100644
index 00000000000..d30712245ef
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hant/changelogs/962.txt
@@ -0,0 +1,2 @@
+對 media.ccc.de 服務新增了「最近」影片。
+將直播串流新增到 media.ccc.de 服務中，同時新增直播串流支援。

From 3c9ae6831456c3314a44c8578cca365bfbe334b9 Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Mon, 18 Jan 2021 16:18:12 +0300
Subject: [PATCH 103/131] Update README.so.md

---
 README.so.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.so.md b/README.so.md
index 3f9746bf558..e01146acdf8 100644
--- a/README.so.md
+++ b/README.so.md
@@ -20,7 +20,7 @@
 
 <b>DIGNIIN: MIDKAN, NOOCA APP-KA EE HADDA WALI TIJAABO AYUU KU JIRAA, SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO, KA FUR ARIN SHARAXAYA QAYBTANADA ARRIMAHA EE GITHUB-KA.</b>
 
-<b>NEWPIPE AMA KUWA KU SALAYSAN PLAYSTORE-KA IN LA GALIYO WAXAY KA HOR IMANAYSAA SHARCIGA IYO SHURUUDAHA AY LEEYIHIIN.</b>
+<b>NEWPIPE AMA KUWA KU SALAYSAN IN PLAYSTORE-KA LA GALIYO WAXAY KA HOR IMANAYSAA SHARCIGA IYO SHURUUDAHA AY LEEYIHIIN.</b>
 
 ## Sawir-shaashadeed
 

From d1fc9c5880a27cb57345db47e8f2a6168fa80f07 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Mon, 18 Jan 2021 14:45:34 +0100
Subject: [PATCH 104/131] Add changelog for 0.20.9

---
 fastlane/metadata/android/en-US/changelogs/963.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/963.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/963.txt b/fastlane/metadata/android/en-US/changelogs/963.txt
new file mode 100644
index 00000000000..fec1fa9174d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/963.txt
@@ -0,0 +1,8 @@
+• Added support for chapters in player controls
+• [PeerTube] Added Sepia search
+• Re-added share button in video detail view and moved stream description into the tab layout
+• Disable restoring brightness if brightness gesture is disabled
+• Added list item to play video on kodi
+• Fixed crash when no default browser is set on some devices and improve share dialogs
+• Toggle play/pause with hardware space button in fullscreen player
+• [media.ccc.de] Various fixes and improvements
\ No newline at end of file

From 9a65f02d5bbab2e224083db3ab8e8fe5ab34d84e Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Mon, 18 Jan 2021 21:45:36 +0100
Subject: [PATCH 105/131] Fix crash when no browser is present and use an
 ACTION_CHOOSER intent in the app update notification (#5429)

Fix crash when no browser is present and use an ACTION_CHOOSER intent for app update notification
Show a Toast when no app is present on user's device to open a content in an app and in a browser and use an ACTION_CHOOSER intent with the ACTION_VIEW intent put as an extra intent in the update notification.
---
 .../schabi/newpipe/CheckForNewAppVersion.java |  8 +-
 .../org/schabi/newpipe/util/ShareUtils.java   | 79 ++++++++++++-------
 app/src/main/res/values-fr/strings.xml        |  3 +-
 app/src/main/res/values/strings.xml           |  3 +-
 4 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
index 0fecc3f96d3..f8497ea2737 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
@@ -132,7 +132,13 @@ private static void compareAppVersionAndShowNotification(@NonNull final Applicat
 
         if (BuildConfig.VERSION_CODE < versionCode) {
             // A pending intent to open the apk location url in the browser.
-            final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+            final Intent viewIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+
+            final Intent intent = new Intent(Intent.ACTION_CHOOSER);
+            intent.putExtra(Intent.EXTRA_INTENT, viewIntent);
+            intent.putExtra(Intent.EXTRA_TITLE, R.string.open_with);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
             final PendingIntent pendingIntent
                     = PendingIntent.getActivity(application, 0, intent, 0);
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
index ffb965ae7dd..32157e43e42 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.widget.Toast;
 
@@ -64,13 +65,18 @@ public static void openUrlInBrowser(final Context context, final String url,
             // No browser set as default (doesn't work on some devices)
             openInDefaultApp(context, intent);
         } else {
-            try {
-                intent.setPackage(defaultPackageName);
-                context.startActivity(intent);
-            } catch (final ActivityNotFoundException e) {
-                // Not a browser but an app chooser because of OEMs changes
-                intent.setPackage(null);
-                openInDefaultApp(context, intent);
+            if (defaultPackageName.isEmpty()) {
+                // No app installed to open a web url
+                Toast.makeText(context, R.string.no_app_to_open_intent, Toast.LENGTH_LONG).show();
+            } else {
+                try {
+                    intent.setPackage(defaultPackageName);
+                    context.startActivity(intent);
+                } catch (final ActivityNotFoundException e) {
+                    // Not a browser but an app chooser because of OEMs changes
+                    intent.setPackage(null);
+                    openInDefaultApp(context, intent);
+                }
             }
         }
     }
@@ -104,19 +110,24 @@ public static void openUrlInBrowser(final Context context, final String url) {
      * @param intent  the intent to open
      */
     public static void openIntentInApp(final Context context, final Intent intent) {
-        final String defaultAppPackageName = getDefaultAppPackageName(context, intent);
+        final String defaultPackageName = getDefaultAppPackageName(context, intent);
 
-        if (defaultAppPackageName.equals("android")) {
+        if (defaultPackageName.equals("android")) {
             // No app set as default (doesn't work on some devices)
             openInDefaultApp(context, intent);
         } else {
-            try {
-                intent.setPackage(defaultAppPackageName);
-                context.startActivity(intent);
-            } catch (final ActivityNotFoundException e) {
-                // Not an app to open the intent but an app chooser because of OEMs changes
-                intent.setPackage(null);
-                openInDefaultApp(context, intent);
+            if (defaultPackageName.isEmpty()) {
+                // No app installed to open the intent
+                Toast.makeText(context, R.string.no_app_to_open_intent, Toast.LENGTH_LONG).show();
+            } else {
+                try {
+                    intent.setPackage(defaultPackageName);
+                    context.startActivity(intent);
+                } catch (final ActivityNotFoundException e) {
+                    // Not an app to open the intent but an app chooser because of OEMs changes
+                    intent.setPackage(null);
+                    openInDefaultApp(context, intent);
+                }
             }
         }
     }
@@ -140,33 +151,47 @@ private static void openInDefaultApp(final Context context, final Intent viewInt
     /**
      * Get the default app package name.
      * <p>
-     * If no app is set as default, it will return "android".
+     * If no app is set as default, it will return "android" (not on some devices because some
+     * OEMs changed the app chooser).
      * <p>
-     * Note: it doesn't return "android" on some devices because some OEMs changed the app chooser.
+     * If no app is installed on user's device to handle the intent, it will return an empty string.
      *
      * @param context the context to use
      * @param intent  the intent to get default app
-     * @return the package name of the default app, or the app chooser if there's no default
+     * @return the package name of the default app to open the intent, an empty string if there's no
+     * app installed to handle it or the app chooser if there's no default
      */
     private static String getDefaultAppPackageName(final Context context, final Intent intent) {
-        return context.getPackageManager().resolveActivity(intent,
-                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
+        final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        if (resolveInfo == null) {
+            return "";
+        } else {
+            return resolveInfo.activityInfo.packageName;
+        }
     }
 
     /**
      * Get the default browser package name.
      * <p>
-     * If no browser is set as default, it will return "android"
-     * Note: it doesn't return "android" on some devices because some OEMs changed the app chooser.
-     *
+     * If no browser is set as default, it will return "android" (not on some devices because some
+     * OEMs changed the app chooser).
+     * <p>
+     * If no browser is installed on user's device, it will return an empty string.
      * @param context the context to use
-     * @return the package name of the default browser, or "android" if there's no default
+     * @return the package name of the default browser, an empty string if there's no browser
+     * installed or the app chooser if there's no default
      */
     private static String getDefaultBrowserPackageName(final Context context) {
         final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return context.getPackageManager().resolveActivity(intent,
-                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
+        final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        if (resolveInfo == null) {
+            return "";
+        } else {
+            return resolveInfo.activityInfo.packageName;
+        }
     }
 
     /**
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 521228e7c5b..d8c53ce78f4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -658,4 +658,5 @@
     <string name="hash_channel_name">Notification de hachage vidéo</string>
     <string name="show_meta_info_summary">Désactivez cette option pour masquer les zones de méta-informations contenant des informations supplémentaires sur le créateur du flux, le contenu du flux ou une demande de recherche.</string>
     <string name="show_meta_info_title">Afficher les méta-infos</string>
-</resources>
\ No newline at end of file
+    <string name="no_app_to_open_intent">Aucune application sur votre appareil ne peut ouvrir ceci</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 702dcafbf69..ba309361885 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -699,4 +699,5 @@
     <string name="show_thumbnail_summary">Use thumbnail for both lock screen background and notifications</string>
     <string name="recent">Recent</string>
     <string name="chapters">Chapters</string>
-</resources>
\ No newline at end of file
+    <string name="no_app_to_open_intent">No app on your device can open this</string>
+</resources>

From e327f7ba2c576525bd5f72519021a700f73bd81a Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 19 Jan 2021 09:33:47 +0100
Subject: [PATCH 106/131] Fix popup closing x button animation

---
 .../main/java/org/schabi/newpipe/player/Player.java |  2 +-
 .../newpipe/player/event/PlayerGestureListener.java | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 13a0a7d0211..9d239e781a6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -4003,7 +4003,7 @@ public ImageButton getPlayPauseButton() {
     }
 
     public View getClosingOverlayView() {
-        return closeOverlayBinding.getRoot();
+        return binding.closingOverlay;
     }
 
     public ProgressBar getVolumeProgressBar() {
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index ecc57ff2fbe..c639bde9f92 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -124,11 +124,11 @@ public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
             final View closingOverlayView = player.getClosingOverlayView();
             if (player.isInsideClosingRadius(movingEvent)) {
                 if (closingOverlayView.getVisibility() == View.GONE) {
-                    animate(closingOverlayView, true, 250);
+                    animate(closingOverlayView, true, 200);
                 }
             } else {
                 if (closingOverlayView.getVisibility() == View.VISIBLE) {
-                    animate(closingOverlayView, false, 0);
+                    animate(closingOverlayView, false, 200);
                 }
             }
         }
@@ -234,12 +234,9 @@ public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
 
             if (player.isInsideClosingRadius(event)) {
                 player.closePopup();
-            } else {
-                animate(player.getClosingOverlayView(), false, 0);
-
-                if (!player.isPopupClosing()) {
-                    animate(player.getCloseOverlayButton(), false, 200);
-                }
+            } else if (!player.isPopupClosing()) {
+                animate(player.getCloseOverlayButton(), false, 200);
+                animate(player.getClosingOverlayView(), false, 200);
             }
         }
     }

From 10ec67854ec33a48ef425b9b9d354c4471f31d11 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 20 Jan 2021 10:44:44 +0100
Subject: [PATCH 107/131] Fix number being shown instead of corresponding
 string resorce in feed

---
 app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index 5a39ce93e1c..04090abc67e 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -236,7 +236,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
         feedBinding.loadingProgressText.text = if (!isIndeterminate) {
             "${progressState.currentProgress}/${progressState.maxProgress}"
         } else if (progressState.progressMessage > 0) {
-            progressState.progressMessage.toString()
+            getString(progressState.progressMessage)
         } else {
             "∞/∞"
         }

From 0c5df29417ec9222f87b7085f372b9b0037cf23e Mon Sep 17 00:00:00 2001
From: * <66680085+ryota-hasegawa@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:12:09 +0900
Subject: [PATCH 108/131] Add Japanese translation of README

---
 README.ja.md | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++
 README.ko.md |   2 +-
 README.md    |   2 +-
 README.so.md |   2 +-
 4 files changed, 152 insertions(+), 3 deletions(-)
 create mode 100644 README.ja.md

diff --git a/README.ja.md b/README.ja.md
new file mode 100644
index 00000000000..7041c936e1c
--- /dev/null
+++ b/README.ja.md
@@ -0,0 +1,149 @@
+<p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
+<h2 align="center"><b>NewPipe</b></h2>
+<h4 align="center">自由で軽量な Android 向けストリーミングフロントエンド</h4>
+
+<!-- F-Droid is extremely out of date, so we hide this for now. -->
+<!-- <p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-ja.svg"></a></p> -->
+
+<p align="center">
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub リリース"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg"></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="ライセンス: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="ビルド状態"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
+<a href="https://hosted.weblate.org/engage/newpipe/" alt="翻訳状態"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC チャンネル: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource 寄付"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
+</p>
+<hr>
+<p align="center"><a href="#screenshots">スクリーンショット</a> &bull; <a href="#description">説明</a> &bull; <a href="#features">機能</a> &bull; <a href="#installation-and-updates">インストールと更新</a> &bull; <a href="#contribution">貢献</a> &bull; <a href="#donate">寄付</a> &bull; <a href="#license">ライセンス</a></p>
+<p align="center"><a href="https://newpipe.net">ウェブサイト</a> &bull; <a href="https://newpipe.net/blog/">ブログ</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">ニュース</a></p>
+<hr>
+
+*他の言語で読む: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md), [日本語](README.ja.md)。*
+
+<b>注意: これはベータ版のため、バグが発生する可能性があります。もしバグが発生した場合、GitHub のリポジトリで Issue を開いてください。</b>
+
+<b>NewPipe 及びいずれのフォークを Google Play ストアに公開すると、Google の取引条件の違反になります。</b>
+
+<span id="screenshots"></span>
+## スクリーンショット
+
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
+
+<span id="description"></span>
+## 説明
+
+自由なコピーレフトソフトウェアの NewPipe は一切の Google フレームワークライブラリ及び、YouTube API を使用しません。ウェブサイトは必要な情報のためだけに読み込まれるため、このアプリは Google のサービスがインストールされていない端末で使用ができます。また、NewPipe の使用に YouTube アカウントは必要となりません。
+
+<span id="features"></span>
+### 機能
+
+* 動画の検索
+* 動画の基本情報の表示
+* YouTube の動画の視聴
+* YouTube の動画のバックグラウンド再生
+* ポップアップモード (フローティングプレイヤー)
+* 動画を視聴するストリーミングプレイヤーの選択
+* 動画のダウンロード
+* 音声のみのダウンロード
+* Kodi での動画再生
+* 次の動画/関連動画の表示
+* 特定の言語の YouTube の検索
+* 年齢制限のあるコンテンツの視聴/ブロック
+* チャンネルの基本情報の表示
+* チャンネルの検索
+* チャンネルからの動画の視聴
+* Orbot/Tor 対応 (直接的なものは未実装)
+* 1080p/2K/4K 対応
+* 履歴の表示
+* チャンネルの登録
+* 履歴の検索
+* 再生リストの検索/視聴
+* 再生リストをキューに追加して再生
+* 動画のキューへの追加
+* 端末内の再生リスト
+* 字幕
+* ライブ配信の対応
+* コメントの表示
+
+### 対応しているサービス
+
+NewPipe は複数のサービスに対応しています。[ドキュメント](https://teamnewpipe.github.io/documentation/)は、どのようにしてアプリと NewPipe Extractor にサービスを追加できるかについて詳細な情報を提供しています。もし、新しいサービスを追加するならば、是非私たちに連絡をお願いします。現在対応しているサービスは：
+
+* YouTube
+* SoundCloud \[ベータ\]
+* media.ccc.de \[ベータ\]
+* PeerTube インスタンス \[ベータ\]
+
+<!-- Hidden span to keep old links compatible. -->
+<span id="updates"></span>
+
+<span id="installation-and-updates"></span>
+## インストールと更新
+以下の方法のいずれかに従うことによって NewPipe をインストールできます。
+1. カスタムリポジトリを F-Droid に追加してリリースが公開され次第インストールする。この方法の説明はこちら: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
+2. リリースが公開され次第[GitHub のリリース](https://github.com/TeamNewPipe/NewPipe/releases)から APK をダウンロードしてインストールする。
+3. F-Droid から更新する。これは更新を手にする上で最も遅い方法です。F-Droid が変更を検知して、APK をビルドし、署名、そしてユーザーに更新を届ける必要があるためです。
+4. 自分でデバッグ APK をビルドする。これは新しい機能を使用する上で最も早い方法ですが、他と比べてとても複雑なので、他の方法の使用を推奨します。
+
+私たちはほとんどのユーザーに方法1を推奨します。方法1と2でインストールされた APK は互換性がありますが、方法3でインストールされたものにはありません。これは方法1と2では、同じ署名鍵 (私たちが使用するもの)が使用されますが、方法3では異なった署名鍵 (F-Droidが使用するもの)が使用されるためです。方法4を使ったデバッグ APK のビルドは根本的に署名鍵の問題を除きます。署名鍵はユーザーが騙されて悪意のある更新がアプリにインストールされないことを助けるためにあります。
+
+もし、何かしらの理由によりソースを切り替えたい場合 (例: NewPipe のコア機能が壊れてしまったが F-Droid はまだ更新をしていない) は、この手順を推奨します。
+1. 履歴や登録チャンネル、再生リストを保つために 設定 > コンテンツ > データベースをエクスポート からデータをバックアップ
+2. NewPipe をアンインストール
+3. 新しいソースから APK をダウンロードしてインストール
+4. 設定 > コンテンツ > データベースをインポート からステップ1で作ったデータベースをインポート
+
+<span id="contribution"></span>
+## 貢献
+翻訳、デザインの変更、コードの整理、大規模なコードの変更などの助けはいつでも歓迎します。
+より良いものを一緒に作り上げましょう！
+
+もし貢献をしたい場合、[貢献ノート](.github/CONTRIBUTING.md)をご確認ください。
+
+<a href="https://hosted.weblate.org/engage/newpipe/">
+<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="翻訳状態" />
+</a>
+
+<span id="donate"></span>
+## 寄付
+もし、NewPipe を気に入っていただけたら、寄付をしていただけると嬉しいです。Bitcoin または Bountysource, Liberapay から寄付をすることができます。NewPipe への寄付については、[ウェブサイト](https://newpipe.net/donate)からお願いします。
+
+<table>
+  <tr>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR コード" width="100px"></td>
+    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+  </tr>
+  <tr>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="liberapay.com で NewPipe を訪れる" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Liberapay で寄付" height="35px"></a></td>
+  </tr>
+  <tr>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="bountysource.com で NewPipe を訪れる" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="あなたがどれほどの寄付を得られるのか確認しましょう。"></a></td>
+  </tr>
+</table>
+
+## プライバシーポリシー
+NewPipe プロジェクトはメディアウェブサービスを使用する上でのプライベートで匿名の体験を提供することを目的としています。
+そのため、アプリはあなたの同意なしで一切のデータを収集しません。NewPipe のプライバシーポリシーはあなたがクラッシュレポートまたは、私たちのブログでコメントを送信した場合にどのようなデータが送信され、保存されるのかを詳細に説明しています。そのドキュメントは[こちら](https://newpipe.net/legal/privacy/)から見つけることができます。
+
+<span id="license"></span>
+## ライセンス
+[![GNU GPLv3 のロゴ](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe はフリーソフトウェアなので、あなたはあなたの望むように使用、習得、共有、改善を行えます。
+具体的には、フリーソフトウェア財団により公開された [GNU General Public License](https://www.gnu.org/licenses/gpl.html) のバージョン3のライセンスもしくは、(あなたの選択で) いずれかの後継バージョンの規約の元で配布または改変を行うことができます。
diff --git a/README.ko.md b/README.ko.md
index dca3b171a4a..089d67b9627 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 
diff --git a/README.md b/README.md
index a7b1e24af0d..e7b285b2da3 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 
diff --git a/README.so.md b/README.so.md
index e01146acdf8..bb9fc1258c5 100644
--- a/README.so.md
+++ b/README.so.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
-*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
+*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
 
 <b>DIGNIIN: MIDKAN, NOOCA APP-KA EE HADDA WALI TIJAABO AYUU KU JIRAA, SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO, KA FUR ARIN SHARAXAYA QAYBTANADA ARRIMAHA EE GITHUB-KA.</b>
 

From 327fc742d3285d5552b969a7919ca9a8b4a37178 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 20 Jan 2021 11:42:24 +0100
Subject: [PATCH 109/131] Fix channel subscribe button causing crash in main
 page tab

The binding was being set to null on onDestroyView() instead of in onDestroy()
---
 .../newpipe/fragments/list/channel/ChannelFragment.java      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index e8a5d380b74..486777ff169 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -131,14 +131,9 @@ public void onDestroy() {
         if (subscribeButtonMonitor != null) {
             subscribeButtonMonitor.dispose();
         }
-    }
-
-    @Override
-    public void onDestroyView() {
         channelBinding = null;
         headerBinding = null;
         playlistControlBinding = null;
-        super.onDestroyView();
     }
 
     /*//////////////////////////////////////////////////////////////////////////

From bea4fb6ae6fc5aeb4db632ef60fb23fafa8faeca Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Fri, 22 Jan 2021 19:25:21 +0100
Subject: [PATCH 110/131] update invidious instances list

---
 app/src/main/AndroidManifest.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ac33a7f0f4d..1f92548b400 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -227,7 +227,7 @@
                 <data android:host="invidio.us" />
                 <data android:host="dev.invidio.us" />
                 <data android:host="www.invidio.us" />
-                <data android:host="vid.encryptionin.space" />
+                <data android:host="redirect.invidious.io" />
                 <data android:host="invidious.snopyta.org" />
                 <data android:host="yewtu.be" />
                 <data android:host="tube.connect.cafe" />
@@ -239,6 +239,10 @@
                 <data android:host="vid.mint.lgbt" />
                 <data android:host="invidiou.site" />
                 <data android:host="invidious.fdn.fr" />
+                <data android:host="invidious.048596.xyz" />
+                <data android:host="invidious.zee.li" />
+                <data android:host="vid.puffyan.us" />
+                <data android:host="ytprivate.com" />
                 <data android:pathPrefix="/" />
             </intent-filter>
 

From 8c15cc1c177dd0901b5a4498b2b39cb11db8cae6 Mon Sep 17 00:00:00 2001
From: * <66680085+ryota-hasegawa@users.noreply.github.com>
Date: Sat, 23 Jan 2021 12:54:06 +0900
Subject: [PATCH 111/131] Add a link to Japanese README to the Brazilian
 Portuguese one

---
 README.pt_BR.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.pt_BR.md b/README.pt_BR.md
index 2229bca217e..d1087cb04c8 100644
--- a/README.pt_BR.md
+++ b/README.pt_BR.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Site</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
 
 <b>AVISO: ESTA É UMA VERSÃO BETA, PORTANTO, VOCÊ PODE ENCONTRAR BUGS. ENCONTROU ALGUM, ABRA UM ISSUE ATRAVÉS DO NOSSO REPOSITÓRIO GITHUB.</b>
 

From 2926cb76823abf95881ee25cf331680988231acf Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 23 Jan 2021 09:02:11 +0100
Subject: [PATCH 112/131] Respect expires header when checking for new version

It was called to many times and acted similar to a DOS attack.
---
 .../schabi/newpipe/CheckForNewAppVersion.java | 63 +++++++++-------
 .../org/schabi/newpipe/NewVersionManager.kt   | 28 ++++++++
 app/src/main/res/values/settings_keys.xml     |  1 +
 .../schabi/newpipe/NewVersionManagerTest.kt   | 72 +++++++++++++++++++
 4 files changed, 139 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/NewVersionManager.kt
 create mode 100644 app/src/test/java/org/schabi/newpipe/NewVersionManagerTest.kt

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
index f8497ea2737..630fb01ff64 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
@@ -10,22 +10,19 @@
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
-
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
-
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.report.ErrorInfo;
-import org.schabi.newpipe.report.UserAction;
-
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -34,11 +31,9 @@
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Maybe;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.schedulers.Schedulers;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.ErrorInfo;
+import org.schabi.newpipe.report.UserAction;
 
 public final class CheckForNewAppVersion {
     private CheckForNewAppVersion() { }
@@ -176,6 +171,7 @@ public static boolean isGithubApk(@NonNull final App app) {
     @Nullable
     public static Disposable checkNewVersion(@NonNull final App app) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
+        final NewVersionManager manager = new NewVersionManager();
 
         // Check if user has enabled/disabled update checking
         // and if the current apk is a github one or not.
@@ -183,31 +179,48 @@ public static Disposable checkNewVersion(@NonNull final App app) {
             return null;
         }
 
+        final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0);
+        if (manager.isExpired(expiry)) {
+            return null;
+        }
+
         return Maybe
-                .fromCallable(() -> {
-                    if (!isConnected(app)) {
-                        return null;
-                    }
-
-                    // Make a network request to get latest NewPipe data.
-                    return DownloaderImpl.getInstance().get(NEWPIPE_API_URL).responseBody();
-                })
+            .fromCallable(() -> {
+                if (!isConnected(app)) {
+                    return null;
+                }
+
+                // Make a network request to get latest NewPipe data.
+                return DownloaderImpl.getInstance().get(NEWPIPE_API_URL);
+            })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         response -> {
+                            try {
+                                final long newExpiry = manager
+                                    .coerceExpiry(response.getHeader("expires"));
+                                prefs.edit()
+                                    .putLong(app.getString(R.string.update_expiry_key), newExpiry)
+                                    .apply();
+                            } catch (final Exception e) {
+                                if (DEBUG) {
+                                    Log.w(TAG, "Could not extract and save new expiry date", e);
+                                }
+                            }
+
                             // Parse the json from the response.
                             try {
                                 final JsonObject githubStableObject = JsonParser.object()
-                                        .from(response).getObject("flavors").getObject("github")
-                                        .getObject("stable");
+                                    .from(response.responseBody()).getObject("flavors")
+                                    .getObject("github").getObject("stable");
 
                                 final String versionName = githubStableObject
-                                        .getString("version");
+                                    .getString("version");
                                 final int versionCode = githubStableObject
-                                        .getInt("version_code");
+                                    .getInt("version_code");
                                 final String apkLocationUrl = githubStableObject
-                                        .getString("apk");
+                                    .getString("apk");
 
                                 compareAppVersionAndShowNotification(app, versionName,
                                         apkLocationUrl, versionCode);
diff --git a/app/src/main/java/org/schabi/newpipe/NewVersionManager.kt b/app/src/main/java/org/schabi/newpipe/NewVersionManager.kt
new file mode 100644
index 00000000000..36de1ecfcbe
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/NewVersionManager.kt
@@ -0,0 +1,28 @@
+package org.schabi.newpipe
+
+import java.time.Instant
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+
+class NewVersionManager {
+
+    fun isExpired(expiry: Long): Boolean {
+        return Instant.ofEpochSecond(expiry).isBefore(Instant.now())
+    }
+
+    /**
+     * Coerce expiry date time in between 6 hours and 72 hours from now
+     *
+     * @return Epoch second of expiry date time
+     */
+    fun coerceExpiry(expiryString: String?): Long {
+        val now = ZonedDateTime.now()
+        return expiryString?.let {
+
+            var expiry = ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(expiryString))
+            expiry = maxOf(expiry, now.plusHours(6))
+            expiry = minOf(expiry, now.plusHours(72))
+            expiry.toEpochSecond()
+        } ?: now.plusHours(6).toEpochSecond()
+    }
+}
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 1c4ad11a399..011bd850a98 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -342,6 +342,7 @@
     <!-- Updates -->
     <string name="update_app_key" translatable="false">update_app_key</string>
     <string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
+    <string name="update_expiry_key" translatable="false">update_expiry_key</string>
 
     <!-- Localizations   -->
     <string name="default_localization_key" translatable="false">system</string>
diff --git a/app/src/test/java/org/schabi/newpipe/NewVersionManagerTest.kt b/app/src/test/java/org/schabi/newpipe/NewVersionManagerTest.kt
new file mode 100644
index 00000000000..d2dacc7835d
--- /dev/null
+++ b/app/src/test/java/org/schabi/newpipe/NewVersionManagerTest.kt
@@ -0,0 +1,72 @@
+package org.schabi.newpipe
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import kotlin.math.abs
+
+class NewVersionManagerTest {
+
+    private lateinit var manager: NewVersionManager
+
+    @Before
+    fun setup() {
+        manager = NewVersionManager()
+    }
+
+    @Test
+    fun `Expiry is reached`() {
+        val oneHourEarlier = Instant.now().atZone(ZoneId.of("GMT")).minusHours(1)
+
+        val expired = manager.isExpired(oneHourEarlier.toEpochSecond())
+
+        assertTrue(expired)
+    }
+
+    @Test
+    fun `Expiry is not reached`() {
+        val oneHourLater = Instant.now().atZone(ZoneId.of("GMT")).plusHours(1)
+
+        val expired = manager.isExpired(oneHourLater.toEpochSecond())
+
+        assertFalse(expired)
+    }
+
+    /**
+     * Equal within a range of 5 seconds
+     */
+    private fun assertNearlyEqual(a: Long, b: Long) {
+        assertTrue(abs(a - b) < 5)
+    }
+
+    @Test
+    fun `Expiry must be returned as is because it is inside the acceptable range of 6-72 hours`() {
+        val sixHoursLater = Instant.now().atZone(ZoneId.of("GMT")).plusHours(6)
+
+        val coerced = manager.coerceExpiry(DateTimeFormatter.RFC_1123_DATE_TIME.format(sixHoursLater))
+
+        assertNearlyEqual(sixHoursLater.toEpochSecond(), coerced)
+    }
+
+    @Test
+    fun `Expiry must be increased to 6 hours if below`() {
+        val tooLow = Instant.now().atZone(ZoneId.of("GMT")).plusHours(5)
+
+        val coerced = manager.coerceExpiry(DateTimeFormatter.RFC_1123_DATE_TIME.format(tooLow))
+
+        assertNearlyEqual(tooLow.plusHours(1).toEpochSecond(), coerced)
+    }
+
+    @Test
+    fun `Expiry must be decreased to 72 hours if above`() {
+        val tooHigh = Instant.now().atZone(ZoneId.of("GMT")).plusHours(73)
+
+        val coerced = manager.coerceExpiry(DateTimeFormatter.RFC_1123_DATE_TIME.format(tooHigh))
+
+        assertNearlyEqual(tooHigh.minusHours(1).toEpochSecond(), coerced)
+    }
+}

From fe10c199562409e70a2875069b2ecbdc778f1a2b Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Wed, 27 Jan 2021 00:28:01 +0100
Subject: [PATCH 113/131] update extractor version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 486502cd868..2deedcd5673 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:beb705013c4dbe2c1a893fa338140e7a5176a0d5'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:c00ee75d7461b66c8570cbc2988208f3a8f59582'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From 4f828fbe005be89a9f34c3a81b239fd90756339e Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 28 Jan 2021 14:33:12 +0100
Subject: [PATCH 114/131] Fix always minimizing to popup player

---
 .../org/schabi/newpipe/player/Player.java     |  6 ++++-
 .../newpipe/player/helper/PlayerHelper.java   | 26 ++++---------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 9d239e781a6..aa82c0a72c0 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -2012,7 +2012,8 @@ private void onPaused() {
         changePopupWindowFlags(IDLE_WINDOW_FLAGS);
 
         // Remove running notification when user does not want minimization to background or popup
-        if (PlayerHelper.isMinimizeOnExitDisabled(context) && videoPlayerSelected()) {
+        if (PlayerHelper.getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_NONE
+                && videoPlayerSelected()) {
             NotificationUtil.getInstance().cancelNotificationAndStopForeground(service);
         } else {
             NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
@@ -3822,11 +3823,14 @@ private void onFragmentStopped() {
             switch (getMinimizeOnExitAction(context)) {
                 case MINIMIZE_ON_EXIT_MODE_BACKGROUND:
                     useVideoSource(false);
+                    break;
                 case MINIMIZE_ON_EXIT_MODE_POPUP:
                     setRecovery();
                     NavigationHelper.playOnPopupPlayer(getParentActivity(), playQueue, true);
+                    break;
                 case MINIMIZE_ON_EXIT_MODE_NONE: default:
                     pause();
+                    break;
             }
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index 54021b6169b..8169f99e507 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -251,33 +251,17 @@ public static boolean isClearingQueueConfirmationRequired(@NonNull final Context
 
     @MinimizeMode
     public static int getMinimizeOnExitAction(@NonNull final Context context) {
-        final String defaultAction = context.getString(R.string.minimize_on_exit_none_key);
-        final String popupAction = context.getString(R.string.minimize_on_exit_popup_key);
-        final String backgroundAction = context.getString(R.string.minimize_on_exit_background_key);
-
         final String action = getPreferences(context)
-                .getString(context.getString(R.string.minimize_on_exit_key), defaultAction);
-        if (action.equals(popupAction)) {
+                .getString(context.getString(R.string.minimize_on_exit_key), "");
+        if (action.equals(context.getString(R.string.minimize_on_exit_popup_key))) {
             return MINIMIZE_ON_EXIT_MODE_POPUP;
-        } else if (action.equals(backgroundAction)) {
-            return MINIMIZE_ON_EXIT_MODE_BACKGROUND;
-        } else {
+        } else if (action.equals(context.getString(R.string.minimize_on_exit_none_key))) {
             return MINIMIZE_ON_EXIT_MODE_NONE;
+        } else {
+            return MINIMIZE_ON_EXIT_MODE_BACKGROUND; // default
         }
     }
 
-    public static boolean isMinimizeOnExitToPopup(@NonNull final Context context) {
-        return getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_POPUP;
-    }
-
-    public static boolean isMinimizeOnExitToBackground(@NonNull final Context context) {
-        return getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_BACKGROUND;
-    }
-
-    public static boolean isMinimizeOnExitDisabled(@NonNull final Context context) {
-        return getMinimizeOnExitAction(context) == MINIMIZE_ON_EXIT_MODE_NONE;
-    }
-
     @AutoplayType
     public static int getAutoplayType(@NonNull final Context context) {
         final String type = getPreferences(context).getString(

From cade272501a1fcd261e615be4477f65d24c96ba6 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 28 Jan 2021 14:33:50 +0100
Subject: [PATCH 115/131] Use PlayerHelper.retrieveResizeModeFromPrefs in
 Player

---
 app/src/main/java/org/schabi/newpipe/player/Player.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index aa82c0a72c0..ba8e856df73 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -855,8 +855,7 @@ public void smoothStopPlayer() {
 
     private void initVideoPlayer() {
         // restore last resize mode
-        setResizeMode(prefs.getInt(context.getString(R.string.last_resize_mode),
-                AspectRatioFrameLayout.RESIZE_MODE_FIT));
+        setResizeMode(PlayerHelper.retrieveResizeModeFromPrefs(this));
         binding.getRoot().setLayoutParams(new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
     }

From 376cba696e3b33e307e65abfa73b813e70dca716 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 28 Jan 2021 14:35:00 +0100
Subject: [PATCH 116/131] Remove useless getString for default setting value

---
 .../java/org/schabi/newpipe/player/helper/PlayerHelper.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index 8169f99e507..f5690984478 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -265,14 +265,13 @@ public static int getMinimizeOnExitAction(@NonNull final Context context) {
     @AutoplayType
     public static int getAutoplayType(@NonNull final Context context) {
         final String type = getPreferences(context).getString(
-                context.getString(R.string.autoplay_key),
-                context.getString(R.string.autoplay_wifi_key));
+                context.getString(R.string.autoplay_key), "");
         if (type.equals(context.getString(R.string.autoplay_always_key))) {
             return AUTOPLAY_TYPE_ALWAYS;
         } else if (type.equals(context.getString(R.string.autoplay_never_key))) {
             return AUTOPLAY_TYPE_NEVER;
         } else {
-            return AUTOPLAY_TYPE_WIFI;
+            return AUTOPLAY_TYPE_WIFI; // default
         }
     }
 

From fdb0f01b38821003bd6e9f145adc3d5181f75386 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 28 Jan 2021 14:35:47 +0100
Subject: [PATCH 117/131] Add Objects.requireNotNull to warning which is surely
 not null

---
 .../java/org/schabi/newpipe/player/helper/PlayerHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index f5690984478..ccc73e81f97 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -426,7 +426,7 @@ private static boolean isUsingInexactSeek(@NonNull final Context context) {
     private static SinglePlayQueue getAutoQueuedSinglePlayQueue(
             final StreamInfoItem streamInfoItem) {
         final SinglePlayQueue singlePlayQueue = new SinglePlayQueue(streamInfoItem);
-        singlePlayQueue.getItem().setAutoQueued(true);
+        Objects.requireNonNull(singlePlayQueue.getItem()).setAutoQueued(true);
         return singlePlayQueue;
     }
 

From 02db971b7c85a7b4b0beed0168ed237f0bd9f368 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 28 Jan 2021 18:28:29 +0100
Subject: [PATCH 118/131] Set all default settings at the beginning

---
 .../org/schabi/newpipe/settings/NewPipeSettings.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
index aaf2077d219..01f51b0b3a3 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
@@ -55,12 +55,14 @@ public static void initSettings(final Context context) {
             isFirstRun = true;
         }
 
-        PreferenceManager.setDefaultValues(context, R.xml.appearance_settings, true);
-        PreferenceManager.setDefaultValues(context, R.xml.content_settings, true);
-        PreferenceManager.setDefaultValues(context, R.xml.download_settings, true);
-        PreferenceManager.setDefaultValues(context, R.xml.history_settings, true);
         PreferenceManager.setDefaultValues(context, R.xml.main_settings, true);
         PreferenceManager.setDefaultValues(context, R.xml.video_audio_settings, true);
+        PreferenceManager.setDefaultValues(context, R.xml.download_settings, true);
+        PreferenceManager.setDefaultValues(context, R.xml.appearance_settings, true);
+        PreferenceManager.setDefaultValues(context, R.xml.history_settings, true);
+        PreferenceManager.setDefaultValues(context, R.xml.content_settings, true);
+        PreferenceManager.setDefaultValues(context, R.xml.notification_settings, true);
+        PreferenceManager.setDefaultValues(context, R.xml.update_settings, true);
         PreferenceManager.setDefaultValues(context, R.xml.debug_settings, true);
 
         getVideoDownloadFolder(context);

From c16a8dacd0792f06c439ad9d28b74af733e1362e Mon Sep 17 00:00:00 2001
From: iamthesenate1 <77978836+iamthesenate1@users.noreply.github.com>
Date: Fri, 29 Jan 2021 09:55:33 +0200
Subject: [PATCH 119/131] Add README.ro.md (#5501)

* Add files via upload

* Add files via upload

* Update README.ro.md

* Add Romanian README link

* Add Romanian README link

* Update README.ja.md

* Add Romanian README link

* Add Romanian README link

* Add Romanian README link
---
 README.ja.md    |   2 +-
 README.ko.md    |   2 +-
 README.md       |   2 +-
 README.pt_BR.md |   2 +-
 README.ro.md    | 144 ++++++++++++++++++++++++++++++++++++++++++++++++
 README.so.md    |   2 +-
 6 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 README.ro.md

diff --git a/README.ja.md b/README.ja.md
index 7041c936e1c..c101f385109 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -18,7 +18,7 @@
 <p align="center"><a href="https://newpipe.net">ウェブサイト</a> &bull; <a href="https://newpipe.net/blog/">ブログ</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">ニュース</a></p>
 <hr>
 
-*他の言語で読む: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md), [日本語](README.ja.md)。*
+*他の言語で読む: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt.br.md), [日本語](README.ja.md), [Română](README.ro.md) 。*
 
 <b>注意: これはベータ版のため、バグが発生する可能性があります。もしバグが発生した場合、GitHub のリポジトリで Issue を開いてください。</b>
 
diff --git a/README.ko.md b/README.ko.md
index 089d67b9627..af5b209be98 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 
diff --git a/README.md b/README.md
index e7b285b2da3..80c7e2e88e4 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md),[Română](README.ro.md) .*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 
diff --git a/README.pt_BR.md b/README.pt_BR.md
index d1087cb04c8..dedb64a7cf6 100644
--- a/README.pt_BR.md
+++ b/README.pt_BR.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Site</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
+*Read this in other languages: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md).*
 
 <b>AVISO: ESTA É UMA VERSÃO BETA, PORTANTO, VOCÊ PODE ENCONTRAR BUGS. ENCONTROU ALGUM, ABRA UM ISSUE ATRAVÉS DO NOSSO REPOSITÓRIO GITHUB.</b>
 
diff --git a/README.ro.md b/README.ro.md
new file mode 100644
index 00000000000..75e3bd5b052
--- /dev/null
+++ b/README.ro.md
@@ -0,0 +1,144 @@
+<p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
+<h2 align="center"><b>NewPipe</b></h2>
+<h4 align="center">Un front-end de streaming „uşor” liber, pentru Android.</h4>
+
+<!-- F-Droid is extremely out of date, so we hide this for now. -->
+<!-- <p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> -->
+
+<p align="center">
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
+<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
+</p>
+<hr>
+<p align="center"><a href="#screenshots">Capturi de ecran</a> &bull; <a href="#description">Descriere</a> &bull; <a href="#features">Funcţii</a> &bull; <a href="#installation-and-updates">Instalare şi actualizări</a> &bull; <a href="#contribution">Contribuţie</a> &bull; <a href="#donate">Donaţi</a> &bull; <a href="#license">Licenţă</a></p>
+<p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Presă</a></p>
+<hr>
+
+*Citiţi în alte limbi: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md)*
+
+<b>Atenţionare: ACEASTA ESTE O VERSIUNE BETA, AŞA CĂ S-AR PUTE SĂ ÎNTÂLNIŢI ERORI. DACĂ SE ÎNTÂMPLĂ ACEST LUCRU, DESCHIDEŢI UN ISSUE PRIN REPSITORY-UL NOSTRU GITHUB.</b>
+
+<b>PUNERA NEWPIPE SAU ORICĂRUI FORK AL ACESTUIA ÎN MAGAZINUL GOOGLE PLAY LE ÎNCALCĂ TERMENII ŞI CONDIŢIILE.</b>
+
+## Capturi de ecran
+
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
+
+## Descriere
+
+NewPipe nu foloseşte nici-o bibliotecă Google framework sau API-ul Youtube. Website-urile sunt doar analizate pentru a prelua informaţia necesară, aşa că această aplicaţie poate fi folosită pe telefoane fără Serviciile Google instalate. De asemenea, nu aveţi nevoie de un cont Youtube pentru a folosi Newpipe, care este sofware liber şi copylefted.
+
+### Funcţii
+
+* Căutarea videoclipurilor
+* Afişarea informaţiilor generale despre videoclipuri
+* Urmărirea videoclipurilor Youtube
+* Ascultarea videoclipurilor Youtube
+* Modul popup (player plutitor)
+* Selectarea playerului de streaming pentru vizionarea videoclipului
+* Descărcarea videoclipurilor
+* Doar descărcarea sunetului
+* Deschiderea videoclipurilor cu Kodi
+* Expunerea videoclipurilor următoare/asociate
+* Căutarea YouTube într-o limbă specifică
+* Vizionarea/Blocarea materialului restricţionat în funcţie de vârstă
+* Afişarea informaţiilor generale despre canale
+* Căutarea canalelor
+* Vizionarea videoclipurilor dintr-un canal
+* Suport Orbot/Tor (încă nu direct)
+* Suport 1080p/2K/4K
+* Vizionarea istoricului
+* Abonarea la canale
+* Căutarea în istoric
+* Căutarea/vizionarea playlisturilor
+* Vizionarea ca playlisturi puse în coadă
+* Punerea în coadă a videoclipurilor
+* Playlisturi locale
+* Subtitrări
+* Suport al transmiterilor live
+* Afişarea comentariilor
+
+### Servicii întreţinute
+
+NewPipe suportă servicii multiple. [Documentele](https://teamnewpipe.github.io/documentation/) noastre furnizează mai multe informaţii în legătură cu modalităţile prin care un nou serviciu poate fi adăugat aplicaţiei şi extractorului. Vă rugăm să ne contactaţi dacă doriţi să adăugaţi unul nou. Serviciile întreţinute acum sunt:
+
+* YouTube
+* SoundCloud \[beta\]
+* media.ccc.de \[beta\]
+* Instanţe PeerTube \[beta\]
+
+<!-- Hidden span to keep old links compatible. -->
+<span id="updates"></span>
+
+## Instalare şi actualizări
+Puteţi instala NewPipe folosind una dintre următoarele metode:
+ 1. Adăugaţi depozitul nostru F-droid personalizat. Instrucţiunile sunt aici: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
+ 2. Descărcaţi APK-ul din [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) şi instalaţi-l.
+ 3. Actualizaţi via F-Droid. Aceasta este cea mai lentă metodă de a obţine actualizări, deoarece F-Droid trebuie să recunoască schimbările, să constriască APK-ul, să îl semneze, iar apoi să îl trimită utilizatorilor. (**IMPORTANT**: în momentul scrierii, o problemă împiedică versiunile mai noi de 0.20.1 să fie publicate. Aşa că, dacă doriţi să folosiţi F-droid, până această problemă este rezolvată, vă recomandăm metoda 1.)
+ 4. Construiţi un APK de depanare. Aceasta este cea mai rapidă metodă de a primi funcţii noi, dar este mult mai complicată, aşa că vă recomandăm să folosiţi una dintre celelalte metode.
+
+Recomandăm metoda 1 pentru majoritatea utilizatorilor. APK-urile din metodele 1 şi 2 suntcompatibile una cu cealaltă, dar nu cu cele din metoda 3. Acest lucru se datorează faptului că aceeași cheie de semnare (a noastră) este utilizată pentru 1 și 2, dar o altă cheie de semnare (F-Droid) este utilizată pentru 3. Construirea unui APK de depanare folosind metoda 4 exclude o cheie în întregime. Cheile de semnare vă asigură că un utilizator nu este păcălit să instaleze o actualizare rău intenționată a unei aplicații.
+
+Între timp, dacă doriți să schimbați sursa dintr-un anumit motiv (de exemplu, funcționalitatea de bază a NewPipe a fost întreruptă și F-Droid nu are încă actualizarea), vă recomandăm să folosiţi următoarea procedură:
+1. Faceți o copie de rezervă a datelor prin Setări> Conținut> Exportați baza de date, astfel încât să vă păstrați istoricul, abonamentele și playlisturile
+2. Dezinstalaţi NewPipe
+3. Descărcaţi APK-ul din noua sursă şi instalaţi-l
+4. Importați datele de la pasul 1 prin Setări> Conținut> Importare bază de date
+
+## Contribuţie
+Dacă aveţi idei, traduceri, schimbări de design, curaţarea codului, sau schimbări majore ale codului, ajutorul este întotdeauna binevenit.
+Cu cât se face mai mult cu atât mai bună devine aplicaţia!
+
+Dacă doriţi să vă implicaţi, accesaţi [notele noastre de contribuţie](.github/CONTRIBUTING.md).
+
+<a href="https://hosted.weblate.org/engage/newpipe/">
+<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="Translation status" />
+</a>
+
+## Donaţii
+Dacă vă place NewPipe, am fi bucuroşi să primim o donaţie. Puteţi să ne trimiteţi bitcoin sau să ne donaţi cu Bountysource sau Liberapay. Pentru mai multe informaţii în legătură cu donaţiile către NewPipe, vă rugăm vizitaţi [website-ul nostru](https://newpipe.net/donate).
+
+<table>
+  <tr>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
+    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+  </tr>
+  <tr>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
+  </tr>
+  <tr>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
+  </tr>
+</table>
+
+## Politica de Confidenţialitate
+
+Proiectul NewPipe îşi propune să furnizeze o experienţă privată şi anonimă pentru utilizarea serviciilor web media.
+Prin urmare, aplicaţia nu colectează niciun fel de informaţii fără acordul dumneavoastră. Politica de confidențialitate a NewPipe explică în detaliu ce date sunt trimise și stocate atunci când trimiteți un raport de blocare sau comentați pe blogul nostru. Puteți găsi documentul [aici](https://newpipe.net/legal/privacy/).
+
+## Licenţă
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe este Software Gratuit: Îl puteţi folosi şi împărtăşi cum doriţi. Mai exact, îl puteți redistribui și / sau modifica în conformitate cu termenii
+[GNU General Public License](https://www.gnu.org/licenses/gpl.html) aşa cum a fost publicat de Free Software Foundation, fie versiunea 3 a Licenței, fie
+(la alegerea dvs.) orice versiune ulterioară.
diff --git a/README.so.md b/README.so.md
index bb9fc1258c5..f8bc51e5939 100644
--- a/README.so.md
+++ b/README.so.md
@@ -16,7 +16,7 @@
 <p align="center"><a href="https://newpipe.net">Website-ka</a> &bull; <a href="https://newpipe.net/blog/">Maqaalada</a> &bull; <a href="https://newpipe.net/FAQ/">Su'aalaha Aalaa La-iswaydiiyo</a> &bull; <a href="https://newpipe.net/press/">Warbaahinta</a></p>
 <hr>
 
-*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md).*
+*Ku akhri luuqad kale: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md).*
 
 <b>DIGNIIN: MIDKAN, NOOCA APP-KA EE HADDA WALI TIJAABO AYUU KU JIRAA, SIDAA DARTEED CILLADO AYAAD LA KULMI KARTAA. HADAAD LA KULANTO, KA FUR ARIN SHARAXAYA QAYBTANADA ARRIMAHA EE GITHUB-KA.</b>
 

From e98838ad7eda4908e79b38087750ba6f11993f70 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 30 Jan 2021 09:32:17 +0100
Subject: [PATCH 120/131] Invert usage of manager.isExpired()

When it's expired it means, that the app should get the data. Meaning it should not abort prematurely by returning null.

Co-authored-by: Tobias Groza <TobiGr@users.noreply.github.com>
---
 app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
index 630fb01ff64..8bea85b190d 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
@@ -180,7 +180,7 @@ public static Disposable checkNewVersion(@NonNull final App app) {
         }
 
         final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0);
-        if (manager.isExpired(expiry)) {
+        if (!manager.isExpired(expiry)) {
             return null;
         }
 

From 522d6d8b01aa67ea95a99b2b8a7e86e9558df94d Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:18:58 +0100
Subject: [PATCH 121/131] Re-add APK testing section to PR template (#5465)

Because normal users don't know that the CI process produces an APK and where it is.
---
 .github/PULL_REQUEST_TEMPLATE.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5e5cfd08d46..2787e2238b5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,5 +20,10 @@
 <!-- Delete this if it doesn't apply to you. -->
 - 
 
+#### APK testing 
+<!-- Use a new, meaningfully named branch. The name is used as a suffix for the app ID to allow installing and testing multiple versions of NewPipe, e.g. "commentfix", if your PR implements a bugfix for comments. (No names like "patch-0" and "feature-1".)  -->
+<!-- Remove the following line if you directly link the APK created by the CI pipeline. Directly linking is preferred if you need to let users test.-->
+On the website the APK can be found by going to the "Checks" tab below the title and then on "artifacts" on the right.
+
 #### Due diligence
 - [ ] I read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md).

From bdc85b435ca3d8937eeb366e5a0b875c29a415da Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 30 Jan 2021 14:24:25 +0100
Subject: [PATCH 122/131] Add comments explaining the expiry field

Co-authored-by: Tobias Groza <TobiGr@users.noreply.github.com>
---
 .../main/java/org/schabi/newpipe/CheckForNewAppVersion.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
index 8bea85b190d..63baef54790 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
@@ -179,6 +179,8 @@ public static Disposable checkNewVersion(@NonNull final App app) {
             return null;
         }
 
+        // Check if the last request has happened a certain time ago
+        // to reduce the number of API requests.
         final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0);
         if (!manager.isExpired(expiry)) {
             return null;
@@ -198,6 +200,8 @@ public static Disposable checkNewVersion(@NonNull final App app) {
                 .subscribe(
                         response -> {
                             try {
+                                // Store a timestamp which needs to be exceeded,
+                                // before a new request to the API is made.
                                 final long newExpiry = manager
                                     .coerceExpiry(response.getHeader("expires"));
                                 prefs.edit()

From c55f87c9623a3f71f1bf60703cb9a554e64f16ac Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Sat, 16 Jan 2021 17:49:01 +0100
Subject: [PATCH 123/131] Fix some things in ShareUtils.java and do little
 improvements Fix a bug in which NewPipe doesn't fall back to Google Play
 Store web url in InstallApp Fusion getDefaultBrowserPackageName and
 getDefaultAppPackageName, rename openInDefaultApp to openAppChooser Update
 some JavaDocs

---
 .../org/schabi/newpipe/util/ShareUtils.java   | 121 +++++++++---------
 1 file changed, 57 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
index 32157e43e42..45ec1d01557 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
@@ -21,21 +21,26 @@ private ShareUtils() {
     /**
      * Open an Intent to install an app.
      * <p>
-     * This method will first try open to Google Play Store with the market scheme and falls back to
-     * Google Play Store web url if this first cannot be found.
+     * This method tries to open the default app market with the package id passed as the
+     * second param (a system chooser will be opened if there are multiple markets and no default)
+     * and falls back to Google Play Store web URL if no app to handle the market scheme was found.
+     * <p>
+     * It uses {@link ShareUtils#openIntentInApp(Context, Intent)} to open market scheme and
+     * {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} to open Google Play Store web
+     * URL with false for the boolean param.
      *
-     * @param context the context to use
-     * @param packageName the package to be installed
+     * @param context   the context to use
+     * @param packageId the package id of the app to be installed
      */
-    public static void installApp(final Context context, final String packageName) {
-        try {
-            // Try market:// scheme
-            openIntentInApp(context, new Intent(Intent.ACTION_VIEW,
-                    Uri.parse("market://details?id=" + packageName)));
-        } catch (final ActivityNotFoundException e) {
-            // Fall back to Google Play Store Web URL (don't worry, F-Droid can handle it :))
+    public static void installApp(final Context context, final String packageId) {
+        // Try market:// scheme
+        final boolean marketSchemeResult = openIntentInApp(context, new Intent(Intent.ACTION_VIEW,
+                Uri.parse("market://details?id=" + packageId))
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        if (!marketSchemeResult) {
+            // Fall back to Google Play Store Web URL (F-Droid can handle it)
             openUrlInBrowser(context,
-                    "https://play.google.com/store/apps/details?id=" + packageName, false);
+                    "https://play.google.com/store/apps/details?id=" + packageId, false);
         }
     }
 
@@ -43,31 +48,35 @@ public static void installApp(final Context context, final String packageName) {
      * Open the url with the system default browser.
      * <p>
      * If no browser is set as default, fallbacks to
-     * {@link ShareUtils#openInDefaultApp(Context, Intent)}
+     * {@link ShareUtils#openAppChooser(Context, Intent, String)}
      *
      * @param context                the context to use
      * @param url                    the url to browse
      * @param httpDefaultBrowserTest the boolean to set if the test for the default browser will be
      *                               for HTTP protocol or for the created intent
+     * @return true if the URL can be opened or false if it cannot
      */
-    public static void openUrlInBrowser(final Context context, final String url,
-                                        final boolean httpDefaultBrowserTest) {
+    public static boolean openUrlInBrowser(final Context context, final String url,
+                                           final boolean httpDefaultBrowserTest) {
         final String defaultPackageName;
         final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url))
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         if (httpDefaultBrowserTest) {
-            defaultPackageName = getDefaultBrowserPackageName(context);
+            defaultPackageName = getDefaultAppPackageName(context, new Intent(Intent.ACTION_VIEW,
+                    Uri.parse("http://")).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
         } else {
             defaultPackageName = getDefaultAppPackageName(context, intent);
         }
 
         if (defaultPackageName.equals("android")) {
             // No browser set as default (doesn't work on some devices)
-            openInDefaultApp(context, intent);
+            openAppChooser(context, intent, context.getString(R.string.open_with));
         } else {
             if (defaultPackageName.isEmpty()) {
                 // No app installed to open a web url
                 Toast.makeText(context, R.string.no_app_to_open_intent, Toast.LENGTH_LONG).show();
+                return false;
             } else {
                 try {
                     intent.setPackage(defaultPackageName);
@@ -75,26 +84,29 @@ public static void openUrlInBrowser(final Context context, final String url,
                 } catch (final ActivityNotFoundException e) {
                     // Not a browser but an app chooser because of OEMs changes
                     intent.setPackage(null);
-                    openInDefaultApp(context, intent);
+                    openAppChooser(context, intent, context.getString(R.string.open_with));
                 }
             }
         }
+
+        return true;
     }
 
     /**
      * Open the url with the system default browser.
      * <p>
      * If no browser is set as default, fallbacks to
-     * {@link ShareUtils#openInDefaultApp(Context, Intent)}
+     * {@link ShareUtils#openAppChooser(Context, Intent, String)}
      * <p>
      * This calls {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} with true
      * for the boolean parameter
      *
      * @param context the context to use
      * @param url     the url to browse
+     * @return true if the URL can be opened or false if it cannot be
      **/
-    public static void openUrlInBrowser(final Context context, final String url) {
-        openUrlInBrowser(context, url, true);
+    public static boolean openUrlInBrowser(final Context context, final String url) {
+        return openUrlInBrowser(context, url, true);
     }
 
     /**
@@ -104,21 +116,23 @@ public static void openUrlInBrowser(final Context context, final String url) {
      * {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} should be used.
      * <p>
      * If no app is set as default, fallbacks to
-     * {@link ShareUtils#openInDefaultApp(Context, Intent)}
+     * {@link ShareUtils#openAppChooser(Context, Intent, String)}
      *
      * @param context the context to use
      * @param intent  the intent to open
+     * @return true if the intent can be opened or false if it cannot be
      */
-    public static void openIntentInApp(final Context context, final Intent intent) {
+    public static boolean openIntentInApp(final Context context, final Intent intent) {
         final String defaultPackageName = getDefaultAppPackageName(context, intent);
 
         if (defaultPackageName.equals("android")) {
             // No app set as default (doesn't work on some devices)
-            openInDefaultApp(context, intent);
+            openAppChooser(context, intent, context.getString(R.string.open_with));
         } else {
             if (defaultPackageName.isEmpty()) {
                 // No app installed to open the intent
                 Toast.makeText(context, R.string.no_app_to_open_intent, Toast.LENGTH_LONG).show();
+                return false;
             } else {
                 try {
                     intent.setPackage(defaultPackageName);
@@ -126,26 +140,31 @@ public static void openIntentInApp(final Context context, final Intent intent) {
                 } catch (final ActivityNotFoundException e) {
                     // Not an app to open the intent but an app chooser because of OEMs changes
                     intent.setPackage(null);
-                    openInDefaultApp(context, intent);
+                    openAppChooser(context, intent, context.getString(R.string.open_with));
                 }
             }
         }
+
+        return true;
     }
 
     /**
-     * Open the url in the default app set to open this type of link.
+     * Open the system chooser to launch an intent.
      * <p>
-     * If no app is set as default, it will open a chooser
+     * This method opens an {@link android.content.Intent#ACTION_CHOOSER} of the intent putted
+     * as the viewIntent param. A string for the chooser's title must be passed as the last param.
      *
-     * @param context    the context to use
-     * @param viewIntent the intent to open
+     * @param context              the context to use
+     * @param intent               the intent to open
+     * @param chooserStringTitle   the string of chooser's title
      */
-    private static void openInDefaultApp(final Context context, final Intent viewIntent) {
-        final Intent intent = new Intent(Intent.ACTION_CHOOSER);
-        intent.putExtra(Intent.EXTRA_INTENT, viewIntent);
-        intent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.open_with));
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
+    private static void openAppChooser(final Context context, final Intent intent,
+                                       final String chooserStringTitle) {
+        final Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
+        chooserIntent.putExtra(Intent.EXTRA_INTENT, intent);
+        chooserIntent.putExtra(Intent.EXTRA_TITLE, chooserStringTitle);
+        chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(chooserIntent);
     }
 
     /**
@@ -158,35 +177,13 @@ private static void openInDefaultApp(final Context context, final Intent viewInt
      *
      * @param context the context to use
      * @param intent  the intent to get default app
-     * @return the package name of the default app to open the intent, an empty string if there's no
-     * app installed to handle it or the app chooser if there's no default
+     * @return the package name of the default app, an empty string if there's no app installed to
+     * handle the intent or the app chooser if there's no default
      */
     private static String getDefaultAppPackageName(final Context context, final Intent intent) {
         final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
                 PackageManager.MATCH_DEFAULT_ONLY);
-        if (resolveInfo == null) {
-            return "";
-        } else {
-            return resolveInfo.activityInfo.packageName;
-        }
-    }
 
-    /**
-     * Get the default browser package name.
-     * <p>
-     * If no browser is set as default, it will return "android" (not on some devices because some
-     * OEMs changed the app chooser).
-     * <p>
-     * If no browser is installed on user's device, it will return an empty string.
-     * @param context the context to use
-     * @return the package name of the default browser, an empty string if there's no browser
-     * installed or the app chooser if there's no default
-     */
-    private static String getDefaultBrowserPackageName(final Context context) {
-        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
-                PackageManager.MATCH_DEFAULT_ONLY);
         if (resolveInfo == null) {
             return "";
         } else {
@@ -207,11 +204,7 @@ public static void shareText(final Context context, final String subject, final
         shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
         shareIntent.putExtra(Intent.EXTRA_TEXT, url);
 
-        final Intent intent = new Intent(Intent.ACTION_CHOOSER);
-        intent.putExtra(Intent.EXTRA_INTENT, shareIntent);
-        intent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.share_dialog_title));
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
+        openAppChooser(context, shareIntent, context.getString(R.string.share_dialog_title));
     }
 
     /**

From be4beb41b69452787346debe6502e0761cd131d9 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sat, 30 Jan 2021 23:30:58 +0100
Subject: [PATCH 124/131] update extractor version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2deedcd5673..6cf9b7708e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:c00ee75d7461b66c8570cbc2988208f3a8f59582'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:bfa639950ef0540acb3c10a63f8199e06335b728'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From ebd45dfae377a2afcdb13d3ebce4170e3d628a20 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Wed, 3 Feb 2021 22:09:48 +0100
Subject: [PATCH 125/131] Update extractor version

Fixes YouTube chapter / segments extraction
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6cf9b7708e5..0abfeca748a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:bfa639950ef0540acb3c10a63f8199e06335b728'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:1414a6f178cf8f2ff1024df80fa00d8f2c85f5f4'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From b9cd55188e9e3300f94c01dff125204b24ed207f Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Wed, 3 Feb 2021 22:14:16 +0100
Subject: [PATCH 126/131] Update translation via Weblate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translated using Weblate (Japanese)
Currently translated at 97.7% (609 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 97.7% (609 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 97.7% (609 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 97.7% (609 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 97.7% (609 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 97.7% (609 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 98.0% (611 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 98.0% (611 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 98.5% (614 of 623 strings)

Translated using Weblate (Japanese)

Currently translated at 98.5% (614 of 623 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Slovak)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Hebrew)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Turkish)

Currently translated at 30.2% (13 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/tr/

Translated using Weblate (Hebrew)

Currently translated at 34.8% (15 of 43 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/he/

Translated using Weblate (Somali)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (German)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Polish)

Currently translated at 99.5% (620 of 623 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Urdu)

Currently translated at 89.2% (556 of 623 strings)

Translated using Weblate (Hebrew)

Currently translated at 36.3% (16 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/he/

Translated using Weblate (Italian)

Currently translated at 47.7% (21 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/it/

Translated using Weblate (Chinese (Simplified))

Currently translated at 86.3% (38 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/zh_Hans/

Translated using Weblate (Somali)

Currently translated at 100.0% (623 of 623 strings)

Translated using Weblate (Somali)

Currently translated at 4.5% (2 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/so/

Translated using Weblate (Turkish)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (German)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (French)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Basque)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Romanian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Czech)

Currently translated at 99.5% (621 of 624 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Ukrainian)

Currently translated at 91.3% (570 of 624 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Hebrew)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Finnish)

Currently translated at 98.7% (616 of 624 strings)

Translated using Weblate (Azerbaijani)

Currently translated at 46.6% (291 of 624 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 96.4% (602 of 624 strings)

Translated using Weblate (Sardinian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Greek)

Currently translated at 34.0% (15 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/el/

Translated using Weblate (Basque)

Currently translated at 31.8% (14 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/eu/

Translated using Weblate (Ukrainian)

Currently translated at 2.2% (1 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/uk/

Translated using Weblate (Hebrew)

Currently translated at 36.3% (16 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/he/

Translated using Weblate (Arabic)

Currently translated at 68.1% (30 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ar/

Translated using Weblate (Chinese (Traditional))

Currently translated at 81.8% (36 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/zh_Hant/

Translated using Weblate (Norwegian Bokmål)

Currently translated at 20.4% (9 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/nb_NO/

Translated using Weblate (Somali)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Hindi)

Currently translated at 82.3% (514 of 624 strings)

Translated using Weblate (Hungarian)

Currently translated at 68.1% (425 of 624 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Japanese)

Currently translated at 98.8% (617 of 624 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.5% (621 of 624 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Vietnamese)

Currently translated at 47.7% (21 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/vi/

Translated using Weblate (Somali)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Finnish)

Currently translated at 98.8% (617 of 624 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Japanese)

Currently translated at 15.9% (7 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ja/

Translated using Weblate (Japanese)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Bengali (Bangladesh))

Currently translated at 63.6% (397 of 624 strings)

Translated using Weblate (Finnish)

Currently translated at 99.6% (622 of 624 strings)

Translated using Weblate (Finnish)

Currently translated at 99.6% (622 of 624 strings)

Translated using Weblate (Bengali)

Currently translated at 80.2% (501 of 624 strings)

Translated using Weblate (Japanese)

Currently translated at 15.9% (7 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ja/

Translated using Weblate (Kurdish (Central))

Currently translated at 2.2% (1 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/ckb/

Translated using Weblate (Santali)

Currently translated at 12.6% (79 of 624 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (624 of 624 strings)

Added translation using Weblate (Latvian)

Translated using Weblate (Greek)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Hebrew)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Somali)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Latvian)

Currently translated at 4.5% (2 of 44 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/lv/
---
 app/src/main/res/values-ar/strings.xml        |   8 +
 app/src/main/res/values-az/strings.xml        |  57 +++++
 .../main/res/values-b+zh+HANS+CN/strings.xml  |   8 +
 app/src/main/res/values-bn-rBD/strings.xml    |   5 +-
 app/src/main/res/values-bn/strings.xml        |  22 +-
 app/src/main/res/values-cs/strings.xml        |   8 +
 app/src/main/res/values-de/strings.xml        |  12 +-
 app/src/main/res/values-el/strings.xml        |  12 +-
 app/src/main/res/values-eu/strings.xml        |   8 +
 app/src/main/res/values-fi/strings.xml        |   8 +
 app/src/main/res/values-fr/strings.xml        |   8 +-
 app/src/main/res/values-he/strings.xml        |  10 +-
 app/src/main/res/values-hi/strings.xml        |  42 ++++
 app/src/main/res/values-hr/strings.xml        |  10 +-
 app/src/main/res/values-hu/strings.xml        |   6 +-
 app/src/main/res/values-in/strings.xml        |  62 ++---
 app/src/main/res/values-it/strings.xml        |  12 +-
 app/src/main/res/values-ja/strings.xml        |  61 +++--
 app/src/main/res/values-lv/strings.xml        |   2 +
 app/src/main/res/values-nb-rNO/strings.xml    |   8 +
 app/src/main/res/values-nl/strings.xml        |  12 +-
 app/src/main/res/values-pl/strings.xml        |   8 +
 app/src/main/res/values-pt-rBR/strings.xml    |  78 +++---
 app/src/main/res/values-pt-rPT/strings.xml    |   8 +
 app/src/main/res/values-pt/strings.xml        |   8 +
 app/src/main/res/values-ro/strings.xml        | 224 ++++++++++++++++++
 app/src/main/res/values-ru/strings.xml        |   8 +
 app/src/main/res/values-sat/strings.xml       |   3 +
 app/src/main/res/values-sc/strings.xml        |   8 +
 app/src/main/res/values-sk/strings.xml        |   7 +
 app/src/main/res/values-so/strings.xml        | 122 +++++-----
 app/src/main/res/values-tr/strings.xml        |   8 +
 app/src/main/res/values-uk/strings.xml        |   1 +
 app/src/main/res/values-ur/strings.xml        | 100 ++++++--
 app/src/main/res/values-vi/strings.xml        |  34 ++-
 app/src/main/res/values-zh-rTW/strings.xml    |   8 +
 .../metadata/android/ar/changelogs/963.txt    |   8 +
 .../metadata/android/ckb/changelogs/960.txt   |   4 +
 .../metadata/android/el/changelogs/962.txt    |   2 +
 .../metadata/android/eu/changelogs/963.txt    |   8 +
 .../metadata/android/he/changelogs/951.txt    |  17 ++
 .../metadata/android/he/changelogs/963.txt    |   8 +
 .../metadata/android/he/short_description.txt |   2 +-
 .../metadata/android/it/changelogs/963.txt    |   8 +
 .../metadata/android/ja/changelogs/955.txt    |   2 +-
 .../metadata/android/ja/changelogs/960.txt    |   4 +
 .../metadata/android/lv/full_description.txt  |   1 +
 .../metadata/android/lv/short_description.txt |   1 +
 .../metadata/android/nb-NO/changelogs/963.txt |   7 +
 .../metadata/android/so/short_description.txt |   2 +-
 .../metadata/android/tr/changelogs/961.txt    |  12 +
 .../metadata/android/uk/short_description.txt |   1 +
 .../metadata/android/vi/changelogs/63.txt     |   8 +
 .../metadata/android/vi/changelogs/64.txt     |   8 +
 .../metadata/android/vi/changelogs/730.txt    |   2 +
 .../metadata/android/vi/changelogs/770.txt    |   4 +
 .../metadata/android/vi/changelogs/820.txt    |   1 +
 .../metadata/android/vi/changelogs/830.txt    |   1 +
 .../metadata/android/vi/changelogs/850.txt    |   1 +
 .../metadata/android/vi/changelogs/870.txt    |   2 +
 .../metadata/android/vi/changelogs/910.txt    |   1 +
 .../metadata/android/vi/changelogs/950.txt    |   4 +
 .../metadata/android/vi/changelogs/955.txt    |   3 +
 .../metadata/android/vi/changelogs/956.txt    |   1 +
 .../metadata/android/vi/changelogs/959.txt    |   3 +
 .../metadata/android/vi/changelogs/960.txt    |   4 +
 .../metadata/android/vi/changelogs/961.txt    |  12 +
 .../metadata/android/vi/changelogs/962.txt    |   2 +
 .../metadata/android/vi/changelogs/963.txt    |   8 +
 .../android/zh_Hans/changelogs/963.txt        |   8 +
 .../android/zh_Hant/changelogs/963.txt        |   8 +
 71 files changed, 983 insertions(+), 191 deletions(-)
 create mode 100644 app/src/main/res/values-lv/strings.xml
 create mode 100644 fastlane/metadata/android/ar/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/ckb/changelogs/960.txt
 create mode 100644 fastlane/metadata/android/el/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/eu/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/he/changelogs/951.txt
 create mode 100644 fastlane/metadata/android/he/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/960.txt
 create mode 100644 fastlane/metadata/android/lv/full_description.txt
 create mode 100644 fastlane/metadata/android/lv/short_description.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/uk/short_description.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/63.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/64.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/730.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/770.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/820.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/830.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/850.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/870.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/910.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/950.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/955.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/956.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/959.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/960.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/961.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/962.txt
 create mode 100644 fastlane/metadata/android/vi/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/963.txt
 create mode 100644 fastlane/metadata/android/zh_Hant/changelogs/963.txt

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8b4417a5448..03d90175e45 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -695,4 +695,12 @@
     <string name="msg_calculating_hash">حساب التجزئة</string>
     <string name="hash_channel_description">إشعارات لتقدم تجزئة الفيديو</string>
     <string name="hash_channel_name">إشعار تجزئة الفيديو</string>
+    <string name="no_app_to_open_intent">لا يوجد تطبيق على جهازك يمكنه فتح هذا</string>
+    <string name="chapters">فصول</string>
+    <string name="description_tab_description">وصف</string>
+    <string name="related_streams_tab_description">التيارات ذات الصلة</string>
+    <string name="comments_tab_description">تعليقات</string>
+    <string name="show_description_summary">قم بإيقاف التشغيل لإخفاء وصف الفيديو والمعلومات الإضافية</string>
+    <string name="show_description_title">إظهار الوصف</string>
+    <string name="open_with">فتح مع</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index e154fe02b79..8480c04860a 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -242,4 +242,61 @@
     <string name="one_item_deleted">1 element silindi.</string>
     <string name="peertube_instance_add_title">Nümunə əlavə et</string>
     <string name="peertube_instance_url_summary">Sevimli \"PeerTube\" nümunələrinizi seçin</string>
+    <string name="delete_downloaded_files">Yüklənmiş faylları sil</string>
+    <string name="confirm_prompt">Yükləmə tarixçənizi təmizləmək və ya yüklənmiş bütün faylları silmək istəyirsiniz\?</string>
+    <string name="clear_download_history">Yükləmə tarixçəsini təmizlə</string>
+    <string name="start_downloads">Yükləmələrə başla</string>
+    <string name="pause_downloads">Yükləmələrə fasilə ver</string>
+    <string name="downloads_storage_ask_title">Haraya yüklənəcəyini soruş</string>
+    <string name="downloads_storage_ask_summary">Hər yükləmədə harada saxlanılacağı soruşulacaq</string>
+    <string name="downloads_storage_use_saf_summary">\'Saxlanca Müraciət Çərçivəsi\' xarici SD karta yükləməyə imkan verir.
+\nBəzi cihazlar uyğun deyil</string>
+    <string name="systems_language">Sistem öncülü</string>
+    <string name="app_language_title">Tətbiq dili</string>
+    <plurals name="days">
+        <item quantity="one">%d gün</item>
+        <item quantity="other">%d gün</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d saat</item>
+        <item quantity="other">%d saat</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d dəqiqə</item>
+        <item quantity="other">%d dəqiqə</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%d saniyə</item>
+        <item quantity="other">%d saniyə</item>
+    </plurals>
+    <string name="feed_oldest_subscription_update">Axın sonuncu dəfə güncəlləndi: %s</string>
+    <string name="feed_update_threshold_title">Axın güncəlləmə astanası</string>
+    <string name="feed_use_dedicated_fetch_method_enable_button">Sürətli rejimi aktiv et</string>
+    <string name="feed_use_dedicated_fetch_method_disable_button">Sürətli rejimi deaktiv et</string>
+    <string name="feed_use_dedicated_fetch_method_help_text">Axının çox yavaş yükləndiyini düşünürsünüz\? Əgər elədirsə, sürətli yükləməni işə salmağı sınayın (ayarlardan dəyişə və ya aşağıdakı düyməni basa bilərsiniz).
+\n
+\nNewPipe axını yükləmək üçün 2 metod təklif edir:
+\n• Bütün abunəlik kanallarını gətirtmək, bu yavaş olsa da tamdır;
+\n• Ayrılmış xidmət uc nöqtəsi istifadə etmək, bu sürətlidir, amma tam deyil.
+\n
+\nBu ikisi arasında fərq odur ki, sürətlisində, adətən elementin müddəti və növü kimi bəzi məlumatlar çatışmır (canlı video ilə adisini ayırd edə bilmir) və daha az element gətirir.
+\n
+\nYouTube öz RSS axını ilə bu sürətli metodu təklif edən xidmətlərdən biridir. 
+\n
+\nBeləliklə, seçim sizin nəyə üstünlük verməyinizdən asılıdır: sürət yoxsa dəqiq məlumat.</string>
+    <string name="player_stream_failure">Bu axını oxutmaq olmadı</string>
+    <string name="app_ui_crash">Tətbiq/UI çökdü</string>
+    <string name="could_not_load_image">Təsvir yüklənmədi</string>
+    <string name="live_streams_not_supported">Canlı yayımlar hələ ki dəstəklənmir</string>
+    <string name="could_not_setup_download_menu">Yükləmə menyusu qurulmadı</string>
+    <string name="content_not_available">Məzmun əlçatmazdır</string>
+    <string name="could_not_load_thumbnails">Kiçik təsvirlərin hamısı yüklənmədi</string>
+    <string name="network_error">Şəbəkə xətası</string>
+    <string name="download_to_sdcard_error_message">Xarici SD karta yükləmək mümkün deyil. Yükləmə qovluğu üçün təyin edilmiş yer sıfırlansın\?</string>
+    <string name="download_to_sdcard_error_title">Xarici saxlanc əlçatmazdır</string>
+    <string name="clear_views_history_summary">Oxutma axının tarixçəsini və oxutma mövqelərini siləcək</string>
+    <string name="show_meta_info_title">Üst bilgini göstər</string>
+    <string name="show_description_summary">Video təsvirini və əlavə bilgiləri gizlətmək üçün söndürün</string>
+    <string name="show_description_title">Təsviri göstər</string>
+    <string name="notification_colorize_title">Bildirişləri rənglə</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index 39938e97e71..2e6304b222a 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -650,4 +650,12 @@
     <string name="recent">最近</string>
     <string name="show_meta_info_summary">隐藏关于视频创建者及内容或搜索请求的额外元信息框。</string>
     <string name="show_meta_info_title">显示元数据信息</string>
+    <string name="show_description_title">显示简介</string>
+    <string name="chapters">章节</string>
+    <string name="description_tab_description">简介</string>
+    <string name="related_streams_tab_description">相关视频</string>
+    <string name="comments_tab_description">评论</string>
+    <string name="show_description_summary">显示视频描述和其他信息</string>
+    <string name="open_with">用…打开</string>
+    <string name="no_app_to_open_intent">设备上没有应用可以打开</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index cbeb18bb98b..2e9432588e7 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -158,7 +158,7 @@
     <string name="rename">নাম পরিবর্তন করুন</string>
     <string name="action_settings">সেটিংস</string>
     <string name="action_open_website">ওয়েব সাইট খুলুন</string>
-    <string name="website_title">ওয়েব সাইট</string>
+    <string name="website_title">ওয়েবসাইট</string>
     <string name="no_player_found_toast">কোন স্ট্রিম প্লেয়ার পাওয়া যায়নি (প্লে করতে VLC ইন্সটল করতে পারেন)</string>
     <string name="use_external_video_player_summary">কিছু কিছু রেজোলিউশনে অডিও বন্ধ করে দেয়</string>
     <string name="subscribe_button_title">সাবস্ক্রাইব</string>
@@ -254,7 +254,7 @@
     <string name="read_full_license">লাইসেন্স পড়ুন</string>
     <string name="app_license_title">নিউপাইপ এর লাইসেন্স</string>
     <string name="read_privacy_policy">প্রাইভেসি পলিসি পড়ুন</string>
-    <string name="privacy_policy_title">নিউপাইপ এর প্রাইভেসি পলিসি</string>
+    <string name="privacy_policy_title">নিউপাইপ এর গোপনীয়তা নীতি</string>
     <string name="give_back">ফিরিয়ে দিন</string>
     <string name="view_on_github">গিটহাব এ দেখুন</string>
     <string name="error_unable_to_load_license">লাইসেন্স লোড করা যায় নি</string>
@@ -396,4 +396,5 @@
         <item quantity="one">%d মিনিট</item>
         <item quantity="other">%d মিনিট</item>
     </plurals>
+    <string name="website_encouragement">আরও তথ্য এবং খবরের জন্য নিউপাইপ ওয়েবসাইট দেখো।</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 5f15943dc0a..3f9f9df2315 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -77,7 +77,7 @@
     <string name="read_full_license">লাইসেন্স পড়ুন</string>
     <string name="app_license_title">নিউপাইপ এর লাইসেন্স</string>
     <string name="read_privacy_policy">প্রাইভেসি পলিসি পড়ুন</string>
-    <string name="privacy_policy_title">নিউপাইপ এর প্রাইভেসি পলিসি</string>
+    <string name="privacy_policy_title">নিউপাইপ এর গোপনীয়তা নীতি</string>
     <string name="website_title">ওয়েব সাইট</string>
     <string name="give_back">ফিরিয়ে দিন</string>
     <string name="donation_title">দান করো</string>
@@ -490,4 +490,24 @@
     </plurals>
     <string name="max_retry_msg">সর্বোচ্চ চেয্টা</string>
     <string name="recent">সাম্প্রতিক</string>
+    <string name="peertube_instance_add_exists">ইন্সট্যান্স ইতোমধ্যে বিদ্যমান</string>
+    <string name="default_content_country_title">ডিফল্ট কন্টেন্টের দেশ</string>
+    <string name="related_streams_tab_description">সম্পর্কিত স্ট্রিম</string>
+    <string name="show_description_title">বর্ণনা দেখাও</string>
+    <string name="msg_calculating_hash">হ্যাশ গণনা করা হচ্ছে</string>
+    <string name="show_thumbnail_title">থাম্বনেইল দেখাও</string>
+    <string name="playlist_page_summary">প্লেলিস্ট পৃষ্ঠা</string>
+    <string name="video_detail_by">%s দ্বারা</string>
+    <string name="feed_update_threshold_option_always_update">সবসময় হালনগাদ করো</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">%d নির্বাচিত</item>
+        <item quantity="other">%d সমূহ নির্বাচিত</item>
+    </plurals>
+    <string name="feed_group_dialog_select_subscriptions">সাবস্ক্রিপশন নির্বাচন করো</string>
+    <string name="feed_processing_message">ফিড প্রক্রিয়া করা হচ্ছে…</string>
+    <string name="feed_groups_header_title">চ্যানেল গ্রুপ</string>
+    <string name="chapters">অধ্যায়</string>
+    <string name="comments_tab_description">মতামত</string>
+    <string name="description_tab_description">বিস্তারিত</string>
+    <string name="open_with">দিয়ে খুলো</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8600b3c6c5e..f2492b6642f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -665,4 +665,12 @@
     <string name="hash_channel_description">Oznámení o postupu hašování videa</string>
     <string name="show_meta_info_summary">Vypnout, abyste skryli rámečky s meta informací s údaji o autorovi streamu, obsahu streamu nebo požadavků hledání.</string>
     <string name="show_meta_info_title">Zobrazit meta informaci</string>
+    <string name="chapters">Kapitoly</string>
+    <string name="description_tab_description">Popis</string>
+    <string name="comments_tab_description">Komentáře</string>
+    <string name="show_description_title">Zobrazit popis</string>
+    <string name="open_with">Otevřít s</string>
+    <string name="no_app_to_open_intent">Na Vašem zařízení není aplikace, která to umí otevřít</string>
+    <string name="related_streams_tab_description">Podobné strýmy</string>
+    <string name="show_description_summary">Vypnout pro skrytí popisu videa a doplňkové informace</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e42ea67ba5d..5e1461056d8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -333,7 +333,7 @@
     <string name="playback_tempo">Geschwindigkeit</string>
     <string name="playback_pitch">Tonhöhe</string>
     <string name="unhook_checkbox">Entkoppeln (kann zu Verzerrungen führen)</string>
-    <string name="download_thumbnail_summary">Abschalten, um das Laden von Vorschaubildern zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf dem internen Speicher.</string>
+    <string name="download_thumbnail_summary">Deaktiviere diese Option, um das Laden von Vorschaubildern zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf dem internen Speicher.</string>
     <string name="auto_queue_title">Nächsten Stream automatisch einreihen</string>
     <string name="auto_queue_summary">Wiedergabe durch Anhängen eines verwandten Streams an die Warteschlange (ohne Wiederholungsschleife) fortsetzen</string>
     <string name="drawer_header_action_paceholder_text">Hier wird bald etwas stehen ;D</string>
@@ -654,5 +654,13 @@
     <string name="hash_channel_name">Video Hash Benachrichtigung</string>
     <string name="recent">Letzte</string>
     <string name="show_meta_info_title">Metadaten anzeigen</string>
-    <string name="show_meta_info_summary">Deaktivieren Sie diese Option, um Meta-Infofelder mit zusätzlichen Informationen zum Stream-Ersteller, zum Stream-Inhalt oder zu einer Suchanforderung auszublenden.</string>
+    <string name="show_meta_info_summary">Deaktiviere diese Option, um Meta-Infofelder mit zusätzlichen Informationen zum Stream-Ersteller, zum Stream-Inhalt oder zu einer Suchanforderung auszublenden.</string>
+    <string name="chapters">Kapitel</string>
+    <string name="description_tab_description">Beschreibung</string>
+    <string name="related_streams_tab_description">Ähnliche Streams</string>
+    <string name="comments_tab_description">Kommentare</string>
+    <string name="show_description_summary">Deaktiviere diese Option, um die Videobeschreibung und zusätzliche Informationen auszublenden</string>
+    <string name="show_description_title">Beschreibung anzeigen</string>
+    <string name="open_with">Öffnen mit</string>
+    <string name="no_app_to_open_intent">Keine App auf deinem Gerät kann dies öffnen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0408e7baead..3703c35db9f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -168,8 +168,8 @@
     <string name="switch_to_main">Αλλαγή σε Κύριο</string>
     <string name="import_data_title">Εισαγωγή βάσης δεδομένων</string>
     <string name="export_data_title">Εξαγωγή βάσης δεδομένων</string>
-    <string name="import_data_summary">Παρακάμπτει το τρέχον ιστορικό, εγγραφές, λίστες αναπαραγωγής και (προαιρετικά) σας</string>
-    <string name="export_data_summary">Εξαγωγή ιστορικού, εγγραφών, λιστών αναπαραγωγής και</string>
+    <string name="import_data_summary">Παρακάμπτει το τρέχον ιστορικό, εγγραφές, λίστες αναπαραγωγής και (προαιρετικά) ρυθμίσεις σας</string>
+    <string name="export_data_summary">Εξαγωγή ιστορικού, εγγραφών, λιστών αναπαραγωγής και ρυθμίσεων</string>
     <string name="clear_views_history_title">Εκκαθάριση ιστορικού προβολής</string>
     <string name="clear_views_history_summary">Διαγράφει το ιστορικό των αναπαραχθέντων ροών και των θέσεων αναπαραγωγής</string>
     <string name="delete_view_history_alert">Διαγραφή ολόκληρου του ιστορικού προβολής;</string>
@@ -653,4 +653,12 @@
     <string name="recent">Πρόσφατα</string>
     <string name="show_meta_info_summary">Απενεργοποιήστε το για να μην εμφανίζονται μεταδεδομένα με επιπλέον πληροφορίες για το δημιουργό και το περιεχόμενο της ροής ή αίτημα αναζήτησης.</string>
     <string name="show_meta_info_title">Εμφάνιση μεταδεδομένων</string>
+    <string name="chapters">Κεφάλαια</string>
+    <string name="description_tab_description">Περιγραφή</string>
+    <string name="related_streams_tab_description">Σχετιζόμενες ροές</string>
+    <string name="comments_tab_description">Σχόλια</string>
+    <string name="show_description_summary">Απενεργοποιήστε για απόκρυψη περιγραφής και πρόσθετων πληροφοριών</string>
+    <string name="show_description_title">Εμφάνιση περιγραφής</string>
+    <string name="open_with">Άνοιγμα με</string>
+    <string name="no_app_to_open_intent">Καμία εφαρμογή στη συσκευή σας δεν μπορεί το ανοίξει</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 8f57df3098c..5fdc40c2a40 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -655,4 +655,12 @@
     <string name="recent">Azkenak</string>
     <string name="show_meta_info_summary">Desgaitu jario sortzailearen informazio gehigarria, jarioaren edukia edo bilaketa eskaera duten informazio koadroak ezkutatzeko.</string>
     <string name="show_meta_info_title">Erakutsi meta informazioa</string>
+    <string name="no_app_to_open_intent">Ez dago zure gailuan hau ireki dezakeen aplikaziorik</string>
+    <string name="chapters">Kapituluak</string>
+    <string name="description_tab_description">Deskribapena</string>
+    <string name="related_streams_tab_description">Erlazionatutako jarioak</string>
+    <string name="comments_tab_description">Iruzkinak</string>
+    <string name="show_description_summary">Desaktibatu bideoaren deskribapena eta informazio gehigarria ezkutatzeko</string>
+    <string name="show_description_title">Erakutsi deskribapena</string>
+    <string name="open_with">Ireki honekin...</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 0d3060ad6b7..4aa881cb566 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -653,4 +653,12 @@
     <string name="show_meta_info_summary">Poista käytöstä piilotakseen metatiedot suoratoiston luojasta, sen sisällöstä tai hakupyynnöstä.</string>
     <string name="show_meta_info_title">Näytä metatieto</string>
     <string name="recent">Viimeisimmät</string>
+    <string name="show_description_title">Näytä kuvaus</string>
+    <string name="open_with">Avaa sovelluksella</string>
+    <string name="show_description_summary">Poista valinta piilottaaksesi videon kuvauksen ja lisätiedot</string>
+    <string name="no_app_to_open_intent">Mikään sovellus laitteessasi ei voi avata tätä</string>
+    <string name="chapters">Jaksot</string>
+    <string name="description_tab_description">Kuvaus</string>
+    <string name="related_streams_tab_description">Samankaltaiset striimit</string>
+    <string name="comments_tab_description">Kommentit</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d8c53ce78f4..0d2ecac5afb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -659,4 +659,10 @@
     <string name="show_meta_info_summary">Désactivez cette option pour masquer les zones de méta-informations contenant des informations supplémentaires sur le créateur du flux, le contenu du flux ou une demande de recherche.</string>
     <string name="show_meta_info_title">Afficher les méta-infos</string>
     <string name="no_app_to_open_intent">Aucune application sur votre appareil ne peut ouvrir ceci</string>
-</resources>
+    <string name="chapters">Chapitres</string>
+    <string name="description_tab_description">Description</string>
+    <string name="related_streams_tab_description">Flux associés</string>
+    <string name="comments_tab_description">Commentaires</string>
+    <string name="show_description_summary">Désactiver pour masquer la description de la vidéo et les informations supplémentaires</string>
+    <string name="show_description_title">Afficher la description</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 87d942f39b9..96b18cf5230 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">יש לגעת ב־„חיפוש” כדי להתחיל
+    <string name="main_bg_subtitle">יש לגעת בכפתור „חיפוש” כדי להתחיל
 \n</string>
     <string name="view_count_text">%1$s צפיות</string>
     <string name="upload_date_text">פורסם ב־%1$s</string>
@@ -675,4 +675,12 @@
     <string name="recent">אחרונים</string>
     <string name="show_meta_info_summary">לכבות את התיבות שמציגות את המידע על יוצרי התזרים, תוכן התזרים או בקשת חיפוש.</string>
     <string name="show_meta_info_title">הצגת מידע על</string>
+    <string name="chapters">פרקים</string>
+    <string name="description_tab_description">תיאור</string>
+    <string name="related_streams_tab_description">תזרימים קשורים</string>
+    <string name="comments_tab_description">הערות</string>
+    <string name="show_description_summary">יש לכבות כדי להסתיר תיאורי סרטונים ומידע נוסף</string>
+    <string name="show_description_title">הצגת תיאור</string>
+    <string name="open_with">פתיחה באמצעות</string>
+    <string name="no_app_to_open_intent">אין יישומון על המכשיר שלך שיכול לפתוח את זה</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index e920276c4b7..40b0569f798 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -558,4 +558,46 @@
     <string name="notification_action_0_title">पहला एक्शन बटन</string>
     <string name="notification_scale_to_square_image_summary">अधिसूचना में दिखाए गए वीडियो थंबनेल को 16: 9 से 1: 1 के अनुपात में दिखाया गया है (विकृतियों का परिचय दे सकता है)</string>
     <string name="notification_scale_to_square_image_title">वीडियो छवि को 1:1 के आस्पेक्ट अनुपात मैं देखें</string>
+    <plurals name="hours">
+        <item quantity="one">%dघंटा</item>
+        <item quantity="other">%dघंटे</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%dसेकंड</item>
+        <item quantity="other">Seconds</item>
+    </plurals>
+    <string name="remove_watched_popup_title">देखे गए वीडियो हटायें\?</string>
+    <string name="remove_watched">देखे गए को हटा दें</string>
+    <string name="systems_language">सिस्टम डिफ़ॉल्ट</string>
+    <string name="app_language_title">ऐप भाषा</string>
+    <string name="deleted_downloads">%1$d डाउनलोड को हटा दिया गया</string>
+    <string name="delete_downloaded_files">डाउनलोड की गई फ़ाइलें हटाएं</string>
+    <string name="clear_download_history">डाउनलोड इतिहास हटायें</string>
+    <string name="wifi_only">केवल वाईफाई पर</string>
+    <string name="autoplay_summary">स्वचालित रूप से प्लेबैक शुरू करें —%s</string>
+    <string name="show_memory_leaks">मेमरी लीक दर्शाएँ</string>
+    <string name="unmute">अन्म्यूट</string>
+    <string name="mute">म्यूट</string>
+    <string name="most_liked">सबसे ज्यादा पसंद</string>
+    <string name="recently_added">हाल ही में जोड़ा</string>
+    <string name="local">लोकल</string>
+    <string name="no_playlist_bookmarked_yet">कोई प्लेलिस्ट का बुक्मार्क्स नहीं है</string>
+    <string name="select_a_playlist">एक प्लेलिस्ट का चयन करें</string>
+    <string name="infinite_videos">∞ विडीओ</string>
+    <string name="more_than_100_videos">१००+ विडीओ</string>
+    <string name="description_tab_description">विवरण</string>
+    <string name="related_streams_tab_description">संबंधित स्ट्रीमस</string>
+    <string name="comments_tab_description">टिप्पणियाँ</string>
+    <string name="error_report_open_github_notice">कृपया जांचें लें कि क्या आपके क्रैश पर चर्चा करने वाला मुद्दा पहले से मौजूद है। डुप्लिकेट टिकट बनाते समय, आप हमसे समय लेते हैं जो हम वास्तविक बग को ठीक करने के साथ खर्च कर सकते हैं।</string>
+    <string name="error_report_open_issue_button_text">गिटहब पर रिपोर्ट करें</string>
+    <string name="permission_display_over_apps">अन्य ऐप्स पर प्रदर्शित करने की अनुमति दें</string>
+    <string name="hash_channel_description">विडीओ हैशिंग की प्रगति की सूचना</string>
+    <string name="hash_channel_name">वीडियो हैश अधिसूचना</string>
+    <string name="show_meta_info_summary">स्ट्रीम निर्माता, स्ट्रीम विषय सूची या खोज अनुरोध के बारे में अतिरिक्त जानकारी के साथ मेटा जानकारी बक्से को छिपाने के लिए बंद करें.</string>
+    <string name="show_meta_info_title">मेटा जानकारी दिखाएँ</string>
+    <string name="show_description_summary">वीडियो विवरण और अतिरिक्त जानकारी छिपाने के लिए बंद करें</string>
+    <string name="show_description_title">विवरण दिखाएं</string>
+    <string name="clear_queue_confirmation_description">सक्रिय प्लेअर क़तार को बदल दिया जाएगा</string>
+    <string name="clear_queue_confirmation_summary">एक प्लेअर से दूसरे प्लेअर पर स्विच करने पर आपके क़तार बदल सकते है</string>
+    <string name="open_with">के साथ खोलें</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index b067c034e45..20b6ef2484d 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">Dodirnite pretragu za početak
+    <string name="main_bg_subtitle">Za početak dodirnite \"Pretraži\"
 \n</string>
     <string name="view_count_text">%1$s pregleda</string>
     <string name="upload_date_text">Objavljeno %1$s</string>
@@ -665,4 +665,12 @@
     <string name="recent">Nedavni</string>
     <string name="show_meta_info_summary">Isključi za skrivanje polja metapodataka s dodatnim podacima o autoru streama, sadržaju streama ili zahtjevu za pretraživanje.</string>
     <string name="show_meta_info_title">Prikaži metapodatke</string>
+    <string name="related_streams_tab_description">Slični videozapisi</string>
+    <string name="no_app_to_open_intent">Nijedna aplikacija na vašem uređaju ne može to otvoriti</string>
+    <string name="chapters">Poglavlja videozapisa</string>
+    <string name="description_tab_description">Opis</string>
+    <string name="comments_tab_description">Komentari</string>
+    <string name="show_description_summary">Isključite da biste sakrili opis videozapisa i dodatne informacije</string>
+    <string name="show_description_title">Prikaži opis</string>
+    <string name="open_with">Otvorite uz pomoć aplikacije</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 01f7e8d83e9..cb01a6800f8 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -75,7 +75,8 @@
     <string name="user_report">Felhasználói jelentés</string>
     <string name="video">Videó</string>
     <string name="audio">Audio</string>
-    <string name="main_bg_subtitle">A kezdéshez koppints a \"Keresés\"-re</string>
+    <string name="main_bg_subtitle">A kezdéshez koppints a \"Keresés\"-re
+\n</string>
     <string name="could_not_load_thumbnails">Nem sikerült az összes előnézeti kép betöltése</string>
     <string name="parsing_error">Nem sikerült a weblap betöltése</string>
     <string name="light_parsing_error">Nem sikerült a weblap teljes betöltése</string>
@@ -463,4 +464,7 @@
     <string name="notification_action_nothing">Semmi</string>
     <string name="notification_action_shuffle">Keverés</string>
     <string name="notification_action_repeat">Ismétlés</string>
+    <string name="show_description_title">Leírás megjelenítése</string>
+    <string name="notification_action_buffering">Bufferelés</string>
+    <string name="open_with">Megnyitás ezzel</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 2b28d5ed523..8571fdc2b0b 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -44,7 +44,7 @@
     <string name="show_age_restricted_content_title">Tampilkan konten yang dibatasi usia</string>
     <string name="network_error">Galat jaringan</string>
     <string name="could_not_load_thumbnails">Tidak bisa memuat semua thumbnail</string>
-    <string name="did_you_mean">Apakah maksud anda \"%1$s\"\?</string>
+    <string name="did_you_mean">Apakah maksud Anda \"%1$s\"\?</string>
     <string name="screen_rotation">rotasi</string>
     <string name="duration_live">Langsung</string>
     <string name="downloads">Unduhan</string>
@@ -63,7 +63,7 @@
     <string name="error_snackbar_action">Lapor</string>
     <string name="what_device_headline">Info:</string>
     <string name="what_happened_headline">Yang terjadi:</string>
-    <string name="your_comment">Komentar anda (dalam bahasa Inggris):</string>
+    <string name="your_comment">Komentar Anda (dalam bahasa Inggris):</string>
     <string name="error_details_headline">Detail:</string>
     <string name="list_thumbnail_view_description">Thumbnail pratinjau video</string>
     <string name="detail_thumbnail_view_description">Putar video, durasi:</string>
@@ -157,7 +157,7 @@
     <string name="app_description">Aplikasi streaming bebas dan ringan untuk Android.</string>
     <string name="view_on_github">Lihat di GitHub</string>
     <string name="app_license_title">Lisensi NewPipe</string>
-    <string name="contribution_encouragement">Terlepas apakah anda memiliki ide untuk; terjemahan, perubahan desain, pembersihan kode, atau perubahan kode yang signifikan, segala bantuan akan selalu diterima. Semakin banyak akan semakin baik jadinya!</string>
+    <string name="contribution_encouragement">Terlepas apakah Anda memiliki ide untuk; terjemahan, perubahan desain, pembersihan kode, atau perubahan kode yang signifikan, segala bantuan akan selalu diterima. Semakin banyak akan semakin baik jadinya!</string>
     <string name="read_full_license">Baca lisensi</string>
     <string name="contribution_title">Kontribusi</string>
     <string name="subscribe_button_title">Melanggan</string>
@@ -206,7 +206,7 @@
     <string name="switch_to_main">Alihkan ke Utama</string>
     <string name="import_data_title">Impor basis data</string>
     <string name="export_data_title">Ekspor basis data</string>
-    <string name="import_data_summary">Timpa riwayat, langganan, daftar putar dan (opsional) pengaturan anda saat ini</string>
+    <string name="import_data_summary">Timpa riwayat, langganan, daftar putar dan (opsional) pengaturan Anda saat ini</string>
     <string name="export_data_summary">Ekspor riwayat, langganan, daftar putar dan pengaturan</string>
     <string name="player_stream_failure">Tidak bisa memutar stream ini</string>
     <string name="player_unrecoverable_failure">Telah terjadi galat pemutar yang tidak bisa dipulihkan</string>
@@ -238,7 +238,7 @@
     <string name="dismiss">Abaikan</string>
     <string name="rename">Ubah nama</string>
     <string name="donation_title">Donasi</string>
-    <string name="donation_encouragement">NewPipe dikembangkan oleh relawan yang menyisihkan waktu untuk memberi anda pengalaman terbaik. Segala dukungan kepada pengembang akan membuat NewPipe menjadi lebih baik sambil menikmati secangkir kopi.</string>
+    <string name="donation_encouragement">NewPipe dikembangkan oleh relawan yang menyisihkan waktu untuk memberi Anda pengalaman terbaik. Segala dukungan kepada pengembang akan membuat NewPipe menjadi lebih baik sambil menikmati secangkir kopi.</string>
     <string name="give_back">Beri dukungan</string>
     <string name="website_title">Situs Web</string>
     <string name="website_encouragement">Kunjungi situs web NewPipe untuk info dan berita.</string>
@@ -263,7 +263,7 @@
     <string name="import_complete_toast">Diimpor</string>
     <string name="no_valid_zip_file">Berkas ZIP tidak valid</string>
     <string name="could_not_import_all_files">Perhatian: Tidak bisa mengimpor semua berkas.</string>
-    <string name="override_current_data">Ini akan menimpa pengaturan anda saat ini.</string>
+    <string name="override_current_data">Ini akan menimpa pengaturan Anda saat ini.</string>
     <string name="kiosk">Kiosk</string>
     <string name="trending">Trending</string>
     <string name="top_50">Top 50</string>
@@ -302,7 +302,7 @@
     <string name="resize_fill">Isi</string>
     <string name="resize_zoom">Perbesar</string>
     <string name="caption_auto_generated">Otomatis dibuat</string>
-    <string name="no_player_found_toast">Pemutar stream tidak ditemukan (anda bisa memasang VLC untuk memutarnya).</string>
+    <string name="no_player_found_toast">Pemutar stream tidak ditemukan (Anda bisa memasang VLC untuk memutarnya).</string>
     <string name="controls_download_desc">Unduh berkas stream</string>
     <string name="subscription_change_failed">Tidak bisa mengubah langganan</string>
     <string name="show_info">Tampilkan info</string>
@@ -326,8 +326,8 @@
     <string name="tab_subscriptions">Langganan</string>
     <string name="use_inexact_seek_title">Gunakan tinjau cepat tak pasti</string>
     <string name="use_inexact_seek_summary">Memungkinkan pengguna memilih posisi waktu video dengan cepat tetapi dengan tingkat presisi yang rendah. Mencari 5, 15 atau 25 detik tidak berhasil dengan ini.</string>
-    <string name="app_license">NewPipe adalah perangkat lunak libre copyleft: Anda bisa menggunakannya, mempelajarinya, berbagi, dan meningkatkannya. Secara khusus anda bisa mendistribusikan ulang dan/atau memodifikasinya dibawah syarat Lisensi Publik Umum GNU yang diterbitkan oleh Free Software Foundation, baik versi 3 dari Lisensi, atau (sesuai pilihan anda) versi yang lebih baru.</string>
-    <string name="import_settings">Apakah anda juga ingin mengimpor pengaturan\?</string>
+    <string name="app_license">NewPipe adalah perangkat lunak libre copyleft: Anda bisa menggunakannya, mempelajarinya, berbagi, dan meningkatkannya. Secara khusus Anda bisa mendistribusikan ulang dan/atau memodifikasinya dibawah syarat Lisensi Publik Umum GNU yang diterbitkan oleh Free Software Foundation, baik versi 3 dari Lisensi, atau (sesuai pilihan Anda) versi yang lebih baru.</string>
+    <string name="import_settings">Apakah Anda juga ingin mengimpor pengaturan\?</string>
     <string name="preferred_open_action_settings_title">Tindakan \'buka\' yang diinginkan</string>
     <string name="preferred_open_action_settings_summary">Tindakan baku ketika membuka konten — %s</string>
     <string name="caption_setting_title">Teks</string>
@@ -353,16 +353,16 @@
 \n4. Klik \"Langkah berikutnya\" dan kemudian pada \"Buat ekspor\"
 \n5. Klik tombol \"Unduh\" setelah muncul dan
 \n6. Dari download takeout zip ekstrak file .json (biasanya di bawah \"YouTube dan YouTube Music / subscriptions /subscriptions.json\") dan impor di sini.</string>
-    <string name="import_soundcloud_instructions">Impor profil SoundCloud dengan mengetik URL atau ID anda: 
-\n 
+    <string name="import_soundcloud_instructions">Impor profil SoundCloud dengan mengetik URL atau ID Anda:
+\n
 \n1. Aktifkan \"mode desktop\" di peramban web (situs tidak tersedia untuk perangkat seluler)
 \n2. Kunjungi URL ini: %1$s
 \n3. Masuk ketika ditanya
-\n4. Salin URL profil anda ketika dialihkan.</string>
+\n4. Salin URL profil Anda ketika dialihkan.</string>
     <string name="import_soundcloud_instructions_hint">idAnda, soundcloud.com/idAnda</string>
     <string name="import_network_expensive_warning">Perlu diingat operasi ini membutuhkan bandwidth yang besar.
 \n
-\nApakah anda ingin melanjutkan\?</string>
+\nApakah Anda ingin melanjutkan\?</string>
     <string name="playback_speed_control">Kontrol Kecepatan Pemutaran</string>
     <string name="playback_tempo">Tempo</string>
     <string name="playback_pitch">Nada</string>
@@ -372,13 +372,13 @@
     <string name="tracks">Trek</string>
     <string name="users">Pengguna</string>
     <string name="privacy_policy_title">Kebijakan Privasi NewPipe</string>
-    <string name="privacy_policy_encouragement">Proyek NewPipe sangat memperhatikan privasi anda. Karena itu, apl tidak mengumpulkan data apapun tanpa sepengetahuan anda.
-\nKebijakan privasi NewPipe menjelaskan secara detail data apa saja yang dikirim dan disimpan ketika anda mengirimkan laporan kerusakan.</string>
+    <string name="privacy_policy_encouragement">Proyek NewPipe sangat memperhatikan privasi Anda. Karena itu, apl tidak mengumpulkan data apapun tanpa sepengetahuan Anda.
+\nKebijakan privasi NewPipe menjelaskan secara detail data apa saja yang dikirim dan disimpan ketika Anda mengirimkan laporan kerusakan.</string>
     <string name="read_privacy_policy">Baca kebijakan privasi</string>
     <string name="skip_silence_checkbox">Percepat saat diam</string>
     <string name="playback_step">Langkah</string>
     <string name="playback_reset">Atur ulang</string>
-    <string name="start_accept_privacy_policy">Agar sesuai dengan Regulasi Perlindungan Data Umum Eropa (GDPR), dengan ini kami tarik perhatian anda ke kebijakan privasi NewPipe. Silakan baca dengan seksama.
+    <string name="start_accept_privacy_policy">Agar sesuai dengan Regulasi Perlindungan Data Umum Eropa (GDPR), dengan ini kami tarik perhatian Anda ke kebijakan privasi NewPipe. Silakan baca dengan seksama.
 \nAnda harus menerimanya untuk mengirimkan laporan bug kepada kami.</string>
     <string name="accept">Setuju</string>
     <string name="decline">Tolak</string>
@@ -406,7 +406,7 @@
     <string name="download_to_sdcard_error_message">Tidak bisa mengunduh ke kartu SD eksternal. Atur ulang lokasi folder unduhan\?</string>
     <string name="saved_tabs_invalid_json">Tidak bisa membaca tab yang disimpan, beralih menggunakan tab bawaan</string>
     <string name="restore_defaults">Kembali ke awal</string>
-    <string name="restore_defaults_confirmation">Apakah anda ingin mengembalikan ke bawaan\?</string>
+    <string name="restore_defaults_confirmation">Apakah Anda ingin mengembalikan ke bawaan\?</string>
     <string name="subscribers_count_not_available">Jumlah pelanggan tidak tersedia</string>
     <string name="main_page_content_summary">Tab apa yang ditampilkan di halaman utama</string>
     <string name="selection">Pilihan</string>
@@ -470,7 +470,7 @@
     <string name="error_postprocessing_stopped">NewPipe telah ditutup saat sedang memproses berkas</string>
     <string name="error_insufficient_storage">Tidak ada ruang kosong tersisa pada perangkat</string>
     <string name="error_progress_lost">Kehilangan laju, karena berkas telah dihapus</string>
-    <string name="confirm_prompt">Apakah anda yakin ingin menghapus semua riwayat unduhan dan berkas yang telah diunduh\?</string>
+    <string name="confirm_prompt">Apakah Anda yakin ingin menghapus semua riwayat unduhan dan berkas yang telah diunduh\?</string>
     <string name="enable_queue_limit">Batasi antrean unduhan</string>
     <string name="enable_queue_limit_desc">Satu unduhan akan berjalan pada waktu yang bersamaan</string>
     <string name="start_downloads">Mulai unduh</string>
@@ -478,7 +478,7 @@
     <string name="downloads_storage_ask_title">Tanyakan lokasi unduhan</string>
     <string name="downloads_storage_ask_summary">Anda akan ditanya lokasi penyimpanan berkas unduhan</string>
     <string name="downloads_storage_ask_summary_kitkat">Anda akan ditanya lokasi penyimpanan berkas unduhan.
-\nPilih SAF jika anda ingin mengunduh ke kartu SD eksternal</string>
+\nPilih SAF jika Anda ingin mengunduh ke kartu SD eksternal</string>
     <string name="error_timeout">Batas waktu koneksi</string>
     <string name="downloads_storage_use_saf_title">Gunakan SAF</string>
     <string name="downloads_storage_use_saf_summary">\'Storage Access Framework\' memungkinkan unduhan ke kartu SD eksternal.
@@ -501,8 +501,8 @@
     </plurals>
     <string name="localization_changes_requires_app_restart">Bahasa akan diterapkan setelah aplikasi dimulai ulang.</string>
     <string name="peertube_instance_url_title">Situs PeerTube</string>
-    <string name="peertube_instance_url_summary">Pilih situs PeerTube favorit anda</string>
-    <string name="peertube_instance_url_help">Temukan situs yang anda suka di %s</string>
+    <string name="peertube_instance_url_summary">Pilih situs PeerTube favorit Anda</string>
+    <string name="peertube_instance_url_help">Temukan situs yang Anda suka di %s</string>
     <string name="peertube_instance_add_title">Tambah situs</string>
     <string name="peertube_instance_add_help">Masukkan URL situs</string>
     <string name="peertube_instance_add_fail">Tidak bisa memvalidasi situs</string>
@@ -551,7 +551,7 @@
         <item quantity="other">%d dipilih</item>
     </plurals>
     <string name="feed_group_dialog_empty_name">Nama grup kosong</string>
-    <string name="feed_group_dialog_delete_message">Apakah anda ingin menghapus grup ini\?</string>
+    <string name="feed_group_dialog_delete_message">Apakah Anda ingin menghapus grup ini\?</string>
     <string name="feed_create_new_group_button_title">Baru</string>
     <string name="settings_category_feed_title">Feed</string>
     <string name="feed_update_threshold_title">Rentang pembaruan feed</string>
@@ -570,13 +570,13 @@
     <string name="remove_watched">Buang ditonton</string>
     <string name="restricted_video">Video ini dibatasi usia.
 \n
-\nAktifkan \"%1$s\" di dalam pengaturan jika anda ingin melihatnya.</string>
+\nAktifkan \"%1$s\" di dalam pengaturan jika Anda ingin melihatnya.</string>
     <string name="content_not_supported">Konten ini belum didukung oleh NewPipe.
 \n
 \nSemoga akan didukung pada versi berikutnya.</string>
     <string name="remove_watched_popup_yes_and_partially_watched_videos">Iya, dan video yang ditonton sebagian</string>
     <string name="remove_watched_popup_warning">Video yang sudah ditonton sebelum dan sesudah ditambahkan ke daftar putar akan dibuang.
-\nApakah anda yakin\? Ini tidak bisa diurungkan!</string>
+\nApakah Anda yakin\? Ini tidak bisa diurungkan!</string>
     <string name="unmute">Batal bisukan</string>
     <string name="mute">Bisukan</string>
     <string name="feed_use_dedicated_fetch_method_help_text">Apakah kamu berpikir umpan memuat sangat lambat\? Jika iya, coba nyalakan memuat cepat (kamu dapat mengubahnya pada pengaturan atau dengan menekan tombol di bawah)
@@ -596,7 +596,7 @@
     <string name="video_detail_by">Oleh %s</string>
     <string name="channel_created_by">Dibuat oleh %s</string>
     <string name="detail_sub_channel_thumbnail_view_description">Thumbnail avatar kanal</string>
-    <string name="error_report_open_github_notice">Harap periksa apakah masalah yang sama sudah ada atau belum. Ketika laporan anda ternyata sudah ada, anda membuat kami menghabiskan waktu yang seharusnya bisa kami gunakan untuk meningkatkan aplikasi menjadi lebih baik.</string>
+    <string name="error_report_open_github_notice">Harap periksa apakah masalah yang sama sudah ada atau belum. Ketika laporan Anda ternyata sudah ada, Anda membuat kami menghabiskan waktu yang seharusnya bisa kami gunakan untuk meningkatkan aplikasi menjadi lebih baik.</string>
     <string name="error_report_open_issue_button_text">Laporkan di GitHub</string>
     <string name="copy_for_github">Salin laporan dengan format</string>
     <string name="search_showing_result_for">Menampilkan hasil untuk: %s</string>
@@ -611,7 +611,7 @@
     <string name="unsupported_url_dialog_message">URL tidak dikenali. Buka dengan aplikasi lain\?</string>
     <string name="auto_queue_toggle">Otomatis antre</string>
     <string name="clear_queue_confirmation_description">Antrean dari pemutar yang aktif akan digantikan</string>
-    <string name="clear_queue_confirmation_summary">Beralih ke pemutar yang lain mungkin akan mengganti antrean anda</string>
+    <string name="clear_queue_confirmation_summary">Beralih ke pemutar yang lain mungkin akan mengganti antrean Anda</string>
     <string name="clear_queue_confirmation_title">Konfirmasi sebelum mengosongkan antrean</string>
     <string name="settings_category_notification_title">Notifikasi</string>
     <string name="notification_action_nothing">Tidak ada</string>
@@ -630,7 +630,7 @@
     <string name="show_memory_leaks">Tampilkan kebocoran memori</string>
     <string name="enqueued">Ditambahkan</string>
     <string name="enqueue_stream">Tambahkan</string>
-    <string name="clear_cookie_summary">Hapus kuki yang disimpan oleh NewPipe saat anda memecahkan reCAPTCHA</string>
+    <string name="clear_cookie_summary">Hapus kuki yang disimpan oleh NewPipe saat Anda memecahkan reCAPTCHA</string>
     <string name="recaptcha_cookies_cleared">Kuki reCAPTCHA telah dihapus</string>
     <string name="clear_cookie_title">Hapus kuki reCAPTCHA</string>
     <string name="youtube_restricted_mode_enabled_summary">YouTube menyediakan \"Mode Terbatas\" yang menyembunyikan video konten dewasa</string>
@@ -645,4 +645,12 @@
     <string name="show_meta_info_title">Tampilkan info meta</string>
     <string name="hash_channel_description">Notifikasi untuk laju pemrosesan hash video</string>
     <string name="hash_channel_name">Notifikasi Hash Video</string>
+    <string name="no_app_to_open_intent">Tidak ada apl di perangkat Anda yang bisa membuka ini</string>
+    <string name="chapters">Chapter</string>
+    <string name="description_tab_description">Deskripsi</string>
+    <string name="related_streams_tab_description">Stream terkait</string>
+    <string name="comments_tab_description">Komentar</string>
+    <string name="show_description_summary">Nonaktifkan untuk menyembunyikan deskripsi dan informasi tambahan</string>
+    <string name="show_description_title">Tampilkan deskripsi</string>
+    <string name="open_with">Buka dengan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fca6b352a1e..72678621586 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -653,6 +653,14 @@
     <string name="hash_channel_name">Notifica Hash Video</string>
     <string name="hash_channel_description">Notifiche per lo stato di avanzamento dell\'hashing video</string>
     <string name="recent">Recente</string>
-    <string name="show_meta_info_summary">Disattiva per nascondere i riquadri delle meta informazioni con informazioni aggiuntive sul creatore dello streaming, sul contenuto dello streaming o su una richiesta di ricerca.</string>
-    <string name="show_meta_info_title">Mostra meta info</string>
+    <string name="show_meta_info_summary">Disattiva per nascondere i riquadri con informazioni aggiuntive sul contenuto, sul suo creatore o su una richiesta di ricerca.</string>
+    <string name="show_meta_info_title">Mostra meta-informazioni</string>
+    <string name="related_streams_tab_description">Contenuti correlati</string>
+    <string name="chapters">Capitoli</string>
+    <string name="description_tab_description">Descrizione</string>
+    <string name="comments_tab_description">Commenti</string>
+    <string name="show_description_summary">Disattiva per nascondere la descrizione del video e informazioni aggiuntive</string>
+    <string name="show_description_title">Mostra descrizione</string>
+    <string name="open_with">Apri con</string>
+    <string name="no_app_to_open_intent">Sul tuo dispositivo non c\'è alcuna app che può aprirlo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 34df2592e91..1c0b3379800 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -40,7 +40,7 @@
     <string name="use_tor_title">Torを使用する</string>
     <string name="use_tor_summary">(実験的) 強制的に Tor を経由した経路で保存して､匿名性を高めます(ストリーミング再生には、まだ対応していません)。</string>
     <string name="theme_title">テーマ</string>
-    <string name="dark_theme_title">グレー</string>
+    <string name="dark_theme_title">ダーク</string>
     <string name="light_theme_title">ホワイト</string>
     <string name="settings_category_appearance_title">外観</string>
     <string name="settings_category_other_title">その他</string>
@@ -74,7 +74,7 @@
     <string name="retry">再試行</string>
     <string name="storage_permission_denied">ストレージへのアクセスを許可してください</string>
     <string name="autoplay_by_calling_app_title">自動再生</string>
-    <string name="autoplay_by_calling_app_summary">NewPipe が他のアプリから呼び出された時､動画を再生します｡</string>
+    <string name="autoplay_by_calling_app_summary">NewPipeが他のアプリから呼び出された時､動画を再生します｡</string>
     <string name="report_error">不具合を報告</string>
     <string name="user_report">利用者レポートを送る</string>
     <string name="duration_live">生放送</string>
@@ -128,14 +128,14 @@
     <string name="controls_popup_title">ポップアップ</string>
     <string name="filter">フィルター</string>
     <string name="refresh">更新</string>
-    <string name="clear">クリア</string>
+    <string name="clear">消去</string>
     <string name="popup_remember_size_pos_title">ポップアップの属性を記憶</string>
     <string name="popup_remember_size_pos_summary">ポップアップしたサイズと位置を記憶します</string>
     <string name="settings_category_popup_title">ポップアップ</string>
     <string name="popup_resizing_indicator_title">サイズを変更</string>
     <string name="use_external_video_player_summary">一部の解像度では音声がありません</string>
     <string name="player_gesture_controls_title">プレイヤーのジェスチャー制御</string>
-    <string name="player_gesture_controls_summary">ジェスチャーを使用してプレイヤーの明るさと音量をコントロールする</string>
+    <string name="player_gesture_controls_summary">ジェスチャーを使用してプレイヤーの明るさと音量を制御する</string>
     <string name="show_search_suggestions_title">検索候補の表示</string>
     <string name="show_search_suggestions_summary">検索時に候補を表示します</string>
     <string name="best_resolution">最高の解像度</string>
@@ -228,7 +228,7 @@
     <string name="just_once">一度だけ</string>
     <string name="import_data_title">データベースをインポート</string>
     <string name="export_data_title">データベースをエクスポート</string>
-    <string name="import_data_summary">既存の再生履歴、登録チャンネル一覧、プレイリストおよび（任意の）設定は上書きされます</string>
+    <string name="import_data_summary">既存の履歴、登録リスト、プレイリストおよび (任意) 設定は上書きされます</string>
     <string name="export_data_summary">再生履歴、登録チャンネル一覧、プレイリストおよび設定をエクスポートします</string>
     <string name="player_recoverable_failure">再生エラーからの回復中</string>
     <string name="external_player_unsupported_link_type">外部プレイヤーは、これらのタイプのリンクをサポートしていません</string>
@@ -247,7 +247,7 @@
     <string name="popup_player">ポップアッププレイヤー</string>
     <string name="preferred_player_fetcher_notification_title">情報を取得しています…</string>
     <string name="preferred_player_fetcher_notification_message">コンテンツを読み込んでいます</string>
-    <string name="controls_download_desc">動画ファイルをダウンロード</string>
+    <string name="controls_download_desc">動画をダウンロード</string>
     <string name="show_info">情報を表示</string>
     <string name="tab_bookmarks">ブックマークしたプレイリスト</string>
     <string name="download_thumbnail_title">サムネイルを読み込む</string>
@@ -318,8 +318,8 @@
     <string name="read_privacy_policy">プライバシーポリシーを確認</string>
     <string name="use_inexact_seek_title">おおまかなシーク</string>
     <string name="use_inexact_seek_summary">おおまかなシークを使用することで精度が下がる代わりに高速にシークができます。5 秒、15 秒または 25 秒間隔のシークはできません。</string>
-    <string name="download_thumbnail_summary">すべてのサムネイルの読み込みと保存を無効化します。このオプションを切り替えるとメモリおよびディスク上の画像キャッシュがクリアされます。</string>
-    <string name="auto_queue_summary">キューに関連動画を追加して再生を続ける</string>
+    <string name="download_thumbnail_summary">すべてのサムネイルの読み込みと保存を無効化します。このオプションを切り替えるとメモリおよびディスク上の画像キャッシュが消去されます。</string>
+    <string name="auto_queue_summary">キューに関連動画を追加して再生を続ける (繰り返ししない場合)</string>
     <string name="delete_view_history_alert">すべての再生履歴を削除しますか？</string>
     <string name="delete_search_history_alert">すべての検索履歴を削除しますか？</string>
     <string name="invalid_source">このファイル/コンテンツはありません</string>
@@ -337,7 +337,7 @@
     <string name="app_license">NewPipe はコピーレフトなソフトウェアです。あなたは自由にそれを使用し、研究し、そして改善することができます。あなたは、GNU フリーソフトウェア財団が公開する GNU General Public ライセンス バージョン3以降の下に、自由に再配布・修正を行うことができます。</string>
     <string name="title_last_played">最終再生日時</string>
     <string name="title_most_played">最も再生された動画</string>
-    <string name="resize_zoom">ズーム</string>
+    <string name="resize_zoom">拡大</string>
     <string name="controls_add_to_playlist_title">プレイリスト</string>
     <string name="show_hold_to_append_title">「長押しして追加」のヒントを表示</string>
     <string name="tracks">トラック</string>
@@ -353,11 +353,14 @@
     <string name="caption_auto_generated">自動生成</string>
     <string name="caption_setting_description">プレーヤーのキャプションテキストの縮尺と背景スタイルを変更します。有効にするには、アプリの再起動が必要です。</string>
     <string name="empty_subscription_feed_subtitle">何もありません</string>
-    <string name="import_youtube_instructions">保存したエクスポートファイルからYouTubeの登録をインポート: 
-\n 
-\n1. このURLを開きます: %1$s 
-\n2. ログインしていなければログインします 
-\n3. ダウンロードが始まります (これがエクスポートファイルです)</string>
+    <string name="import_youtube_instructions">Google takeout から YouTube の登録リストをインポート:
+\n
+\n1. この URL を開きます: %1$s
+\n2. ログインしていなければログインします
+\n3. \"All data included\" をクリックし、そして \"Deselect all\" をクリック、そして \"subscriptions\" のみを選択し、\"OK\" をクリック
+\n4. \"Next step\" をクリックし、そして \"Create export\" をクリック
+\n5. 表示されたら \"Download\" ボタンをクリック
+\n6. ダウンロードした takeout の zip から、.json ファイル (たいてい、\"YouTube and YouTube Music/subscriptions/subscriptions.json\" の下にある) を抽出し、ここにインポートします。</string>
     <string name="playback_reset">リセット</string>
     <string name="accept">同意する</string>
     <string name="decline">拒否する</string>
@@ -495,7 +498,7 @@
     </plurals>
     <string name="no_one_listening">誰も聴いていません</string>
     <plurals name="listening">
-        <item quantity="other">%s が聴取中</item>
+        <item quantity="other">%s 人が聴取中</item>
     </plurals>
     <string name="localization_changes_requires_app_restart">アプリを再起動すると、言語が変更されます。</string>
     <string name="seek_duration_title">高速早送り/巻き戻し時間</string>
@@ -608,32 +611,46 @@
     <string name="never">しない</string>
     <string name="wifi_only">Wi-Fi のみ</string>
     <string name="title_activity_play_queue">キューを再生</string>
-    <string name="clear_queue_confirmation_title">キューをクリアする前に確認する</string>
+    <string name="clear_queue_confirmation_title">キューを消去する前に確認する</string>
     <string name="unsupported_url_dialog_message">URL を認識できませんでした。他のアプリで開きますか？</string>
     <string name="notification_scale_to_square_image_summary">通知に表示される動画サムネイルを 16:9 から 1:1 のアスペクト比にスケールします (ゆがみが生じるかもしれません)</string>
     <string name="notification_scale_to_square_image_title">サムネイルを 1:1 のアスペクト比にスケールする</string>
     <string name="notification_actions_summary">以下をタップして通知のアクションを編集します。右側にあるチェックボックスを使用してコンパクトな通知に表示するものを 3 つまで選択します。</string>
-    <string name="notification_actions_at_most_three">コンパクトな通知に表示される 3 つのアクションを選ぶことができます！</string>
+    <string name="notification_actions_at_most_three">コンパクトな通知に表示されるアクションは 3 つまで選ぶことができます！</string>
     <string name="notification_action_4_title">5 番目のアクションボタン</string>
     <string name="notification_action_3_title">4 番目のアクションボタン</string>
     <string name="notification_action_2_title">3 番目のアクションボタン</string>
     <string name="notification_action_1_title">2 番目のアクションボタン</string>
     <string name="notification_action_0_title">1 番目のアクションボタン</string>
     <string name="notification_action_nothing">なし</string>
-    <string name="notification_action_repeat">リピート</string>
+    <string name="notification_action_repeat">繰り返し</string>
     <string name="notification_action_shuffle">シャッフル</string>
     <string name="notification_action_buffering">バッファリング</string>
     <string name="settings_category_notification_title">通知</string>
-    <string name="youtube_restricted_mode_enabled_summary">YouTube は、成人向けの可能性があるコンテンツを除外する「制限付きモード」を提供しています。</string>
-    <string name="show_age_restricted_content_summary">年齢制限のあるコンテンツを表示します。</string>
+    <string name="youtube_restricted_mode_enabled_summary">YouTube は、成人向けの可能性があるコンテンツを除外する「制限付きモード」を提供しています</string>
+    <string name="show_age_restricted_content_summary">年齢制限 (18+ など) の理由で、子供には不適切な可能性のあるコンテンツを表示する</string>
     <string name="enqueue_stream">キューに追加</string>
     <string name="enqueued">キューに追加しました</string>
     <string name="clear_cookie_summary">reCAPTCHA を解いたときに NewPipe が保存した Cookie を消去します</string>
     <string name="clear_cookie_title">reCAPTCHA の Cookie を消去</string>
     <string name="recaptcha_cookies_cleared">reCAPTCHA の Cookie が消去されました</string>
     <string name="show_memory_leaks">メモリリークを表示</string>
-    <string name="show_thumbnail_summary">ロックスクリーンの背景と通知にサムネイルを表示する</string>
+    <string name="show_thumbnail_summary">ロック画面の背景と通知の両方にサムネイルを使用する</string>
     <string name="show_thumbnail_title">サムネイルを表示する</string>
-    <string name="notification_colorize_title">通知をカラーにする</string>
+    <string name="notification_colorize_title">色つきの通知</string>
     <string name="notification_colorize_summary">サムネイルのメインカラーを元に、通知をカラーにします(全てのデバイスで動作するとは限りません)</string>
+    <string name="show_meta_info_title">メタ情報を表示</string>
+    <string name="msg_calculating_hash">ハッシュを計算中</string>
+    <string name="hash_channel_name">動画のハッシュ化通知</string>
+    <string name="hash_channel_description">動画のハッシュ化進行状況の通知</string>
+    <string name="comments_tab_description">コメント</string>
+    <string name="show_description_summary">無効にするとビデオの概要と追加情報を非表示にします</string>
+    <string name="show_description_title">説明を表示</string>
+    <string name="recent">最近</string>
+    <string name="open_with">開く</string>
+    <string name="description_tab_description">説明</string>
+    <string name="related_streams_tab_description">関連動画</string>
+    <string name="show_meta_info_summary">動画作成者、動画コンテンツ、検索リクエストに関する追加情報を含むメタ情報ボックスを非表示にするにはオフにします。</string>
+    <string name="no_app_to_open_intent">お使いのデバイス上のアプリでは、これを開くことはできません</string>
+    <string name="chapters">チャプター</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
new file mode 100644
index 00000000000..a6b3daec935
--- /dev/null
+++ b/app/src/main/res/values-lv/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index aef6caf49e7..10ab27c6084 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -655,4 +655,12 @@
     <string name="show_meta_info_summary">Slå av for å skjule metainformasjonsbokser med tilleggsinformasjon om strømskaperen, strøminnhold eller en søkeforespørsel.</string>
     <string name="show_meta_info_title">Vis metainfo</string>
     <string name="recent">Nylige</string>
+    <string name="no_app_to_open_intent">Ingen programmer på enheten din kan åpne dette</string>
+    <string name="chapters">Kapitler</string>
+    <string name="description_tab_description">Beskrivelse</string>
+    <string name="related_streams_tab_description">Relaterte strømmer</string>
+    <string name="comments_tab_description">Kommentarer</string>
+    <string name="show_description_summary">Skru av for å skjule videobeskrivelse og ytterligere info</string>
+    <string name="show_description_title">Vis beskrivelse</string>
+    <string name="open_with">Åpne med</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c7a03017301..ea7d286f6f8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -26,7 +26,7 @@
     <string name="default_audio_format_title">Standaardaudioformaat</string>
     <string name="download_dialog_title">Downloaden</string>
     <string name="unsupported_url">URL wordt niet ondersteund</string>
-    <string name="show_next_and_similar_title">‘volgende’ en ‘vergelijkbare’ video’s weergeven</string>
+    <string name="show_next_and_similar_title">Toon ‘volgende’ en ‘vergelijkbare’ video’s</string>
     <string name="content_language_title">Standaardtaal voor inhoud</string>
     <string name="use_external_video_player_title">Externe videospeler gebruiken</string>
     <string name="use_external_audio_player_title">Externe audiospeler gebruiken</string>
@@ -265,7 +265,7 @@
     <string name="import_data_title">Databank importeren</string>
     <string name="export_data_title">Databank exporteren</string>
     <string name="import_data_summary">Dit overschrijft je huidige geschiedenis, abonnementen, afspeellijsten en (optionele) settings</string>
-    <string name="export_data_summary">Exporteer geschiedenis, abonnementen, afspeellijsten en settings</string>
+    <string name="export_data_summary">Exporteer geschiedenis, abonnementen, afspeellijsten en instellingen</string>
     <string name="export_complete_toast">Geëxporteerd</string>
     <string name="import_complete_toast">Geïmporteerd</string>
     <string name="no_valid_zip_file">Geen geldig ZIP-bestand</string>
@@ -655,4 +655,12 @@
     <string name="hash_channel_name">Video Hash Melding</string>
     <string name="show_meta_info_summary">Schakel dit uit om metainformatie vakken te verbergen met aanvullende informatie over de maker van de stream, streaminhoud of een zoekopdracht.</string>
     <string name="show_meta_info_title">Toon meta informatie</string>
+    <string name="description_tab_description">Omschrijving</string>
+    <string name="show_description_title">Toon beschrijving</string>
+    <string name="no_app_to_open_intent">Geen app op je apparaat kan dit openen</string>
+    <string name="chapters">Hoofdstukken</string>
+    <string name="related_streams_tab_description">Gerelateerde streams</string>
+    <string name="comments_tab_description">Commentaar</string>
+    <string name="show_description_summary">Schakel dit uit om video beschrijvingen en additionele informatie te verbergen</string>
+    <string name="open_with">Openen met</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 470659aa6d3..6687a347537 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -665,4 +665,12 @@
     <string name="hash_channel_name">Powiadomienie o obliczaniu skrótu wideo</string>
     <string name="show_meta_info_summary">Wyłącz, aby ukryć pola z dodatkowymi informacjami o twórcy strumienia, zawartości strumienia lub żądaniu wyszukiwania.</string>
     <string name="show_meta_info_title">Pokaż metainformacje</string>
+    <string name="chapters">Rozdziały</string>
+    <string name="description_tab_description">Opis</string>
+    <string name="comments_tab_description">Komentarze</string>
+    <string name="show_description_summary">Wyłącz, aby ukryć opis filmu i informacje dodatkowe</string>
+    <string name="show_description_title">Pokaż opis</string>
+    <string name="open_with">Otwórz za pomocą</string>
+    <string name="no_app_to_open_intent">Żadna aplikacja na Twoim urządzeniu nie może tego otworzyć</string>
+    <string name="related_streams_tab_description">Powiązane strumienie</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2227be70e34..e784907359b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -8,9 +8,9 @@
     <string name="view_count_text">%1$s visualizações</string>
     <string name="view">Reproduzir</string>
     <string name="video">Vídeo</string>
-    <string name="autoplay_by_calling_app_summary">Reproduz um vídeo quando o NewPipe for chamado por outro app</string>
+    <string name="autoplay_by_calling_app_summary">Reproduz vídeo quando o NewPipe for chamado por outro aplicativo</string>
     <string name="autoplay_by_calling_app_title">Reprodução automática</string>
-    <string name="black_theme_title">Preto</string>
+    <string name="black_theme_title">AMOLED</string>
     <string name="cancel">Cancelar</string>
     <string name="checksum">Checksum</string>
     <string name="choose_browser">Escolher navegador</string>
@@ -19,7 +19,7 @@
     <string name="could_not_get_stream">Nenhum vídeo pôde ser encontrado</string>
     <string name="could_not_load_image">A imagem não pôde ser carregada</string>
     <string name="could_not_load_thumbnails">As miniaturas não puderam ser carregadas</string>
-    <string name="dark_theme_title">Escuro</string>
+    <string name="dark_theme_title">Noturno</string>
     <string name="default_audio_format_title">Formato de áudio padrão</string>
     <string name="default_resolution_title">Resolução padrão</string>
     <string name="delete">Excluir</string>
@@ -37,7 +37,7 @@
     <string name="general_error">Erro</string>
     <string name="info_dir_created">Pasta de download criada \'%1$s\'</string>
     <string name="install">Instalar</string>
-    <string name="light_theme_title">Claro</string>
+    <string name="light_theme_title">Diurno</string>
     <string name="msg_error">Erro</string>
     <string name="msg_copied">Copiado para a área de transferência</string>
     <string name="msg_name">Nome do arquivo</string>
@@ -78,39 +78,39 @@
     <string name="could_not_setup_download_menu">O menu de download não pôde ser configurado</string>
     <string name="detail_thumbnail_view_description">Reproduzir vídeo, duração:</string>
     <string name="detail_uploader_thumbnail_view_description">Miniatura do avatar do uploader</string>
-    <string name="download_path_audio_dialog_title">Escolher pasta de download para arquivos de áudio</string>
+    <string name="download_path_audio_dialog_title">Escolha a pasta de download para arquivos de áudio</string>
     <string name="download_path_audio_summary">Áudios baixados são salvos aqui</string>
-    <string name="download_path_audio_title">Pasta de download de áudios</string>
-    <string name="download_path_dialog_title">Escolher pasta de download para arquivos de vídeo</string>
+    <string name="download_path_audio_title">Pasta para áudios baixados</string>
+    <string name="download_path_dialog_title">Escolha a pasta de download para arquivos de vídeo</string>
     <string name="download_path_summary">Vídeos baixados são salvos aqui</string>
-    <string name="download_path_title">Pasta de download de vídeo</string>
-    <string name="kore_not_found">Instalar o app Kore\?</string>
+    <string name="download_path_title">Pasta para vídeos baixados</string>
+    <string name="kore_not_found">Instalar faltando o aplicativo Kore\?</string>
     <string name="light_parsing_error">O site não pôde ser analisado totalmente</string>
     <string name="list_thumbnail_view_description">Miniatura de visualização do vídeo</string>
     <string name="live_streams_not_supported">Transmissões ao vivo ainda não são suportadas</string>
-    <string name="main_bg_subtitle">Toque em \"Buscar\" para iniciar
+    <string name="main_bg_subtitle">Toque em \"Pesquisar\" para começar
 \n</string>
     <string name="msg_exists">Arquivo já existe</string>
     <string name="msg_threads">Threads</string>
     <string name="msg_url_malform">Link inválido ou internet indisponível</string>
     <string name="no_available_dir">Defina uma pasta de download depois nas configurações</string>
-    <string name="no_player_found">Não há player de vídeo. Instalar VLC\?</string>
+    <string name="no_player_found">Sem player de vídeo. Instalar VLC\?</string>
     <string name="parsing_error">O site não pôde ser analisado</string>
     <string name="play_audio">Áudio</string>
-    <string name="play_with_kodi_title">Ver com Kodi</string>
-    <string name="search">Buscar</string>
-    <string name="show_play_with_kodi_summary">Exibe uma opção para ver um vídeo via Kodi media center</string>
+    <string name="play_with_kodi_title">Reproduzir com Kodi</string>
+    <string name="search">Pesquisar</string>
+    <string name="show_play_with_kodi_summary">Mostra opção para ver vídeo via Kodi</string>
     <string name="use_external_audio_player_title">Usar player de áudio externo</string>
     <string name="use_external_video_player_title">Usar player de vídeo externo</string>
     <string name="use_tor_summary">(Experimental) Força o download de conteúdo através do Tor para maior privacidade (transmissão de vídeos ainda não suportada).</string>
     <string name="use_tor_title">Usar Tor</string>
     <string name="user_report">Relatório do usuário</string>
-    <string name="show_play_with_kodi_title">Exibir opção \"Ver com Kodi\"</string>
+    <string name="show_play_with_kodi_title">Mostrar \"Reproduzir com Kodi\"</string>
     <string name="info_labels">Ocorrido:\\nPedido:\\nIdioma do conteúdo:\\nPaís do conteúdo:\\nIdioma do app:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO:</string>
     <string name="open_in_popup_mode">Abrir no modo popup</string>
     <string name="default_popup_resolution_title">Resolução padrão do popup</string>
     <string name="show_higher_resolutions_title">Mostrar resoluções maiores</string>
-    <string name="show_higher_resolutions_summary">Apenas alguns aparelhos suportam vídeos em 2K/4K</string>
+    <string name="show_higher_resolutions_summary">Poucos dispositivos suportam vídeos em 2K/4K</string>
     <string name="default_video_format_title">Formato de vídeo padrão</string>
     <string name="popup_playing_toast">Reproduzindo em modo popup</string>
     <string name="all">Tudo</string>
@@ -130,14 +130,14 @@
     <string name="controls_popup_title">Popup</string>
     <string name="controls_background_title">Segundo plano</string>
     <string name="popup_remember_size_pos_title">Lembrar propriedades do popup</string>
-    <string name="popup_remember_size_pos_summary">Lembra o último tamanho e a posição do popup</string>
+    <string name="popup_remember_size_pos_summary">Lembrar último tamanho e posição do popup</string>
     <string name="settings_category_popup_title">Popup</string>
     <string name="popup_resizing_indicator_title">Redimensionando</string>
     <string name="use_external_video_player_summary">Remove o som em algumas resoluções</string>
     <string name="player_gesture_controls_title">Controles de gestos do player</string>
     <string name="player_gesture_controls_summary">Use gestos para mudar volume e brilho do player</string>
-    <string name="show_search_suggestions_title">Sugestões de busca</string>
-    <string name="show_search_suggestions_summary">Exibe sugestões ao buscar</string>
+    <string name="show_search_suggestions_title">Sugestões de pesquisa</string>
+    <string name="show_search_suggestions_summary">Mostra sugestões ao pesquisar</string>
     <string name="best_resolution">Melhor resolução</string>
     <string name="action_settings">Configurações</string>
     <string name="action_about">Sobre</string>
@@ -163,7 +163,7 @@
     <string name="charset_most_special_characters">Caracteres especiais</string>
     <string name="subscribe_button_title">Inscrever-se</string>
     <string name="subscribed_button_title">Inscrito</string>
-    <string name="channel_unsubscribed">Desinscrito do canal</string>
+    <string name="channel_unsubscribed">Inscrição cancelada</string>
     <string name="subscription_change_failed">Não foi possível alterar inscrição</string>
     <string name="subscription_update_failed">Não foi possível atualizar inscrição</string>
     <string name="tab_main">Principal</string>
@@ -171,8 +171,8 @@
     <string name="fragment_feed_title">Novidades</string>
     <string name="resume_on_audio_focus_gain_title">Retomar vídeo</string>
     <string name="resume_on_audio_focus_gain_summary">Continua vídeo após interrupções (ex: ligações)</string>
-    <string name="enable_search_history_title">Histórico de busca</string>
-    <string name="enable_search_history_summary">Armazena histórico de busca localmente</string>
+    <string name="enable_search_history_title">Histórico de pesquisa</string>
+    <string name="enable_search_history_summary">Armazena histórico de pesquisa localmente</string>
     <string name="enable_watch_history_title">Histórico de vídeo</string>
     <string name="enable_watch_history_summary">Armazena histórico de vídeos</string>
     <string name="title_activity_history">Histórico</string>
@@ -242,7 +242,7 @@
     <string name="give_back">Retribuir</string>
     <string name="website_title">Site oficial</string>
     <string name="website_encouragement">Visite o site NewPipe para mais informações e novidades.</string>
-    <string name="no_player_found_toast">Não há player de vídeo (você pode instalar o VLC para vê-lo).</string>
+    <string name="no_player_found_toast">Sem player de vídeo (você pode instalar o VLC).</string>
     <string name="default_content_country_title">País padrão do conteúdo</string>
     <string name="service_title">Serviço</string>
     <string name="always">Sempre</string>
@@ -306,8 +306,8 @@
     <string name="enable_leak_canary_summary">A monitoração de vazamento de memória pode tornar o app instável</string>
     <string name="enable_disposed_exceptions_title">Reportar erros fora do ciclo de vida</string>
     <string name="enable_disposed_exceptions_summary">Força relatório de exceções Rx não entregues fora do ciclo de vida do fragmento ou atividade após o descarte</string>
-    <string name="use_inexact_seek_title">Usar avanço rápido (inexato)</string>
-    <string name="use_inexact_seek_summary">Avanço inexato permite ao player achar posições mais rápido reduzindo a precisão. Avançar 5, 15 ou 25 segundos não funciona com isto.</string>
+    <string name="use_inexact_seek_title">Usar busca de posição rápida (inexata)</string>
+    <string name="use_inexact_seek_summary">Busca inexata permite que o reprodutor ache posições mais rápido, reduzindo a precisão. Não funciona para voltar ou avançar 5, 15 ou 25 segundos.</string>
     <string name="auto_queue_title">Pôr próximo vídeo na fila automaticamente</string>
     <string name="auto_queue_summary">Continua fila (sem loop) anexando vídeos similares</string>
     <string name="file">Arquivo</string>
@@ -366,9 +366,9 @@
     <string name="clear_views_history_summary">Exclui o histórico de vídeos e as posições de reprodução</string>
     <string name="delete_view_history_alert">Excluir todo o histórico de vídeo\?</string>
     <string name="watch_history_deleted">Histórico de vídeo limpo.</string>
-    <string name="clear_search_history_title">Excluir histórico de busca</string>
-    <string name="clear_search_history_summary">Exclui o histórico de palavras-chave da busca</string>
-    <string name="delete_search_history_alert">Excluir todo o histórico de busca\?</string>
+    <string name="clear_search_history_title">Excluir histórico de pesquisa</string>
+    <string name="clear_search_history_summary">Exclui o histórico de pesquisas feitas</string>
+    <string name="delete_search_history_alert">Excluir todo o histórico de pesquisa\?</string>
     <string name="search_history_deleted">Histórico de busca limpo.</string>
     <string name="one_item_deleted">1 item excluído.</string>
     <string name="app_license">NewPipe é um software livre copyleft: Pode usar, estudar, compartilhar e melhorar o app. Especificamente você pode redistribuir e/ou modificá-lo sob os termos da Licença Pública Geral GNU, publicada pela Fundação de Software Livre, versão 3 da Licença, ou (a seu critério) qualquer versão posterior.</string>
@@ -395,9 +395,9 @@
     <string name="playlists">Playlists</string>
     <string name="tracks">Faixas</string>
     <string name="users">Usuários</string>
-    <string name="unsubscribe">Desinscrever-se</string>
+    <string name="unsubscribe">Cancelar inscrição</string>
     <string name="tab_new">Nova aba</string>
-    <string name="tab_choose">Escolher aba</string>
+    <string name="tab_choose">Selecionar aba</string>
     <string name="volume_gesture_control_title">Gesto para volume</string>
     <string name="volume_gesture_control_summary">Use gestos para mudar volume do player</string>
     <string name="brightness_gesture_control_title">Gesto para brilho</string>
@@ -623,13 +623,13 @@
     <string name="clear_queue_confirmation_description">A fila do player ativo será substituída</string>
     <string name="clear_queue_confirmation_summary">Mudar de um player para outro pode substituir sua fila</string>
     <string name="clear_queue_confirmation_title">Solicitar confirmação antes de limpar uma fila</string>
-    <string name="notification_action_shuffle">Aleatório (Shuffle)</string>
-    <string name="notification_action_buffering">Buferizando</string>
+    <string name="notification_action_shuffle">Aleatório</string>
+    <string name="notification_action_buffering">Carregando</string>
     <string name="settings_category_notification_title">Notificação</string>
     <string name="notification_action_nothing">Nada</string>
     <string name="notification_action_repeat">Repetir</string>
-    <string name="notification_actions_at_most_three">Você pode selecionar no máximo três ações para mostrar na notificação compacta!</string>
-    <string name="notification_actions_summary">Edite cada ação de notificação abaixo tocando nela. Selecione até três deles para serem mostrados na notificação compacta usando as caixas de seleção à direita.</string>
+    <string name="notification_actions_at_most_three">Selecione no máximo três botões para a notificação compacta!</string>
+    <string name="notification_actions_summary">Edite os botões de ação da notificação compacta aqui. Selecione até três deles usando as caixas de seleção à direita e toque neles para configurá-los.</string>
     <string name="notification_action_4_title">Quinto botão de ação</string>
     <string name="notification_action_3_title">Quarto botão de ação</string>
     <string name="notification_action_2_title">Terceiro botão de ação</string>
@@ -645,7 +645,7 @@
     <string name="recaptcha_cookies_cleared">Os cookies de reCAPTCHA foram apagados</string>
     <string name="youtube_restricted_mode_enabled_summary">O YouTube oferece um \"Modo Restrito\" que oculta conteúdo potencialmente adulto</string>
     <string name="show_age_restricted_content_summary">Mostrar conteúdo possivelmente inadequado para crianças que tem um limite de idade (como +18)</string>
-    <string name="notification_colorize_summary">Permite que o Android personalize a cor da notificação de acordo com a cor principal da miniatura (note que isso não está disponível em todos os dispositivos)</string>
+    <string name="notification_colorize_summary">Permite que o Android personalize a cor da notificação de acordo com a cor principal da miniatura (nem todos os dispositivos suportam)</string>
     <string name="notification_colorize_title">Colorir notificação</string>
     <string name="show_thumbnail_summary">Usar miniatura para o plano de fundo da tela de bloqueio e as notificações</string>
     <string name="show_thumbnail_title">Mostrar miniatura</string>
@@ -655,4 +655,12 @@
     <string name="show_meta_info_summary">Desative para ocultar as caixas de informações meta com informações adicionais sobre o criador, conteúdo do stream ou uma solicitação de pesquisa.</string>
     <string name="show_meta_info_title">Mostrar informação meta</string>
     <string name="recent">Recente</string>
+    <string name="chapters">Capítulos</string>
+    <string name="description_tab_description">Descrição</string>
+    <string name="related_streams_tab_description">Transmissões relacionadas</string>
+    <string name="comments_tab_description">Comentários</string>
+    <string name="show_description_summary">Desative para ocultar a descrição do vídeo e informações adicionais</string>
+    <string name="show_description_title">Mostrar descrição</string>
+    <string name="open_with">Abrir com</string>
+    <string name="no_app_to_open_intent">Nenhum aplicativo em seu dispositivo pode abrir isso</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1064a85e28a..4451b971f59 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -655,4 +655,12 @@
     <string name="hash_channel_name">Notificação \'hash\' do vídeo</string>
     <string name="show_meta_info_summary">Desligue para ocultar caixas de informações meta com informações adicionais sobre o criador do fluxo, conteúdo de fluxo ou uma solicitação de pesquisa.</string>
     <string name="show_meta_info_title">Mostrar informação meta</string>
+    <string name="no_app_to_open_intent">Isto não pode ser aberto por nenhuma app neste aparelho</string>
+    <string name="chapters">Capítulos</string>
+    <string name="description_tab_description">" "</string>
+    <string name="related_streams_tab_description">Emissões relacionadas</string>
+    <string name="comments_tab_description">Comentários</string>
+    <string name="show_description_summary">Desative para ocultar a descrição do vídeo e informações adicionais</string>
+    <string name="show_description_title">Mostrar descrição</string>
+    <string name="open_with">Abrir com</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c5b479d8b20..a5e4f393d18 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -655,4 +655,12 @@
     <string name="recent">Recente</string>
     <string name="show_meta_info_summary">Desligue para ocultar caixas de informações meta com informações adicionais sobre o criador do fluxo, conteúdo de fluxo ou uma solicitação de pesquisa.</string>
     <string name="show_meta_info_title">Mostrar informação meta</string>
+    <string name="no_app_to_open_intent">Isto não pode ser aberto por nenhuma app neste aparelho</string>
+    <string name="chapters">Capítulos</string>
+    <string name="description_tab_description">Descrição</string>
+    <string name="related_streams_tab_description">Emissões relacionadas</string>
+    <string name="comments_tab_description">Comentários</string>
+    <string name="show_description_summary">Desative para ocultar a descrição do vídeo e informações adicionais</string>
+    <string name="show_description_title">Mostrar descrição</string>
+    <string name="open_with">Abrir com</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index b874b23b9b2..f5bc0707d11 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -449,4 +449,228 @@
     <string name="notification_scale_to_square_image_summary">Scalați miniatura video afișată în notificare de la raportul de aspect 16:9 la 1:1 (poate introduce distorsiuni)</string>
     <string name="notification_scale_to_square_image_title">Scalare miniatură la raport aspect 1:1</string>
     <string name="search_showing_result_for">Se arată rezultate pentru:%s</string>
+    <string name="no_app_to_open_intent">Nicio aplicație de pe dispozitiv nu poate deschide această</string>
+    <string name="chapters">Capitole</string>
+    <string name="recent">Recente</string>
+    <string name="show_thumbnail_summary">Utilizați miniatura atât pentru fundalul ecranului de blocare, cât și pentru notificări</string>
+    <string name="show_thumbnail_title">Arată thumbnail-urile</string>
+    <string name="playlist_page_summary">Pagina Playlist-ului</string>
+    <string name="video_detail_by">De %s</string>
+    <string name="channel_created_by">Creat de %s</string>
+    <string name="detail_sub_channel_thumbnail_view_description">Miniatura thumbnail-ului canalului</string>
+    <string name="content_not_supported">Acest conținut nu este încă acceptat de NewPipe.
+\n
+\nSperăm că va fi acceptat într-o versiune viitoare.</string>
+    <string name="feed_use_dedicated_fetch_method_help_text">Crezi că încărcarea feedului este prea lentă\? Dacă da, încercați să activați încărcarea rapidă (o puteți modifica în setări sau apăsând butonul de mai jos).
+\n
+\nNewPipe oferă două strategii de încărcare a feedului:
+\n• Preluarea întregului canal de abonament, care este lent, dar complet.
+\n• Utilizarea unui punct final de serviciu dedicat, care este rapid, dar de obicei nu este complet.
+\n
+\nDiferența dintre cele două este că cea rapidă de obicei nu are informații, cum ar fi durata sau tipul articolului (nu poate face distincția între videoclipurile live și cele normale) și poate returna mai puține articole.
+\n
+\nYouTube este un exemplu de serviciu care oferă această metodă rapidă cu fluxul său RSS.
+\n
+\nAșadar, alegerea se reduce la ceea ce preferați: viteză sau informații precise.</string>
+    <string name="feed_use_dedicated_fetch_method_disable_button">Dezactivați modul rapid</string>
+    <string name="feed_use_dedicated_fetch_method_enable_button">Activați modul rapid</string>
+    <string name="feed_use_dedicated_fetch_method_summary">Disponibil în unele servicii, este de obicei mult mai rapid, dar poate returna o cantitate limitată de elemente și informații adesea incomplete (de exemplu, fără durată, tip de articol, fără stare live).</string>
+    <string name="feed_use_dedicated_fetch_method_title">Preluare din fluxul dedicat atunci când este disponibil</string>
+    <string name="feed_update_threshold_option_always_update">Actualizați întotdeauna</string>
+    <string name="feed_update_threshold_summary">Timpul după ultima actualizare înainte ca un abonament să fie considerat învechit - %s</string>
+    <string name="feed_update_threshold_title">Prag de actualizare a fluxului</string>
+    <string name="settings_category_feed_title">Flux</string>
+    <string name="feed_group_show_only_ungrouped_subscriptions">Se afișează numai abonamentele negrupate</string>
+    <string name="feed_create_new_group_button_title">Nou</string>
+    <string name="feed_group_dialog_delete_message">Doriți să ștergeți acest grup\?</string>
+    <string name="feed_group_dialog_empty_name">Numele grupului este gol</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">%d selectat</item>
+        <item quantity="few">%d selectate</item>
+        <item quantity="other">%d selectate</item>
+    </plurals>
+    <string name="feed_group_dialog_empty_selection">Niciun abonament selectat</string>
+    <string name="feed_group_dialog_select_subscriptions">Selectați abonamente</string>
+    <string name="feed_processing_message">Se procesează feedul …</string>
+    <string name="feed_notification_loading">Se încarcă feedul …</string>
+    <string name="feed_subscription_not_loaded_count">Neîncărcat: %d</string>
+    <string name="feed_oldest_subscription_update">Ultima actualizare a fluxului: %s</string>
+    <string name="feed_groups_header_title">Grupuri de canale</string>
+    <plurals name="days">
+        <item quantity="one">%d zi</item>
+        <item quantity="few">%d zile</item>
+        <item quantity="other">%d zile</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d oră</item>
+        <item quantity="few">%d ore</item>
+        <item quantity="other">%d ore</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%d secundă</item>
+        <item quantity="few">%d secunde</item>
+        <item quantity="other">%d secunde</item>
+    </plurals>
+    <string name="new_seek_duration_toast">Datorită constrângerilor ExoPlayer, durata de căutare a fost setată la %d secunde</string>
+    <string name="remove_watched_popup_yes_and_partially_watched_videos">Da, și videoclipuri vizionate parțial</string>
+    <string name="remove_watched_popup_warning">Videoclipurile care au fost vizionate înainte și după ce au fost adăugate în lista de redare vor fi eliminate.
+\neşti sigur\? Acest lucru nu poate fi anulat!</string>
+    <string name="remove_watched_popup_title">Eliminați videoclipurile vizionate\?</string>
+    <string name="remove_watched">Eliminare cele urmărite</string>
+    <string name="systems_language">Prestabilită de sistem</string>
+    <string name="app_language_title">Limba aplicației</string>
+    <string name="choose_instance_prompt">Alegeți o instanță</string>
+    <string name="downloads_storage_use_saf_summary">\"Storage Access Framework\" permite descărcări pe un card SD extern.
+\nUnele dispozitive sunt incompatibile</string>
+    <string name="downloads_storage_use_saf_title">Folosiți SAF</string>
+    <string name="downloads_storage_ask_summary_kitkat">Veți fi întrebat unde pentru a salva fiecare descărcare.
+\nAlegeți SAF dacă doriți să descărcați pe un card SD extern</string>
+    <string name="downloads_storage_ask_summary">Veți fi întrebat unde să salvați fiecare descărcare</string>
+    <string name="downloads_storage_ask_title">Întrebați unde să descărcați</string>
+    <string name="pause_downloads">Întrerupeți descărcările</string>
+    <string name="max_retry_msg">Reîncercări maxime</string>
+    <string name="show_original_time_ago_title">Afișarea timpului inițial în urmă pentru elemente</string>
+    <string name="enable_disposed_exceptions_summary">Raportarea forțată a excepțiilor Rx nelivrabile în afara ciclului de viață al fragmentului sau al activității după eliminare</string>
+    <string name="auto_queue_toggle">Coadă automată</string>
+    <string name="clear_queue_confirmation_description">Lista de redare a playerului activ va fi înlocuită</string>
+    <string name="clear_queue_confirmation_summary">Trecerea de la un player la altul poate înlocui lista de redare</string>
+    <string name="clear_queue_confirmation_title">Solicitați confirmarea înainte de a șterge o listă de redare</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minut</item>
+        <item quantity="few">%d minute</item>
+        <item quantity="other">%d minute</item>
+    </plurals>
+    <string name="start_downloads">Începeți descărcările</string>
+    <string name="enable_queue_limit_desc">O descărcare va rula în același timp</string>
+    <string name="enable_queue_limit">Limitarea cozii de descărcare</string>
+    <string name="close">Închideți</string>
+    <string name="pause_downloads_on_mobile_desc">Util la trecerea la date mobile, deși unele descărcări nu pot fi suspendate</string>
+    <string name="pause_downloads_on_mobile">Întrerupeți pe rețelele măsurate</string>
+    <string name="max_retry_desc">Numărul maxim de încercări înainte de anularea descărcării</string>
+    <string name="stop">Oprește</string>
+    <string name="deleted_downloads">Au fost șterse %1$d descărcări</string>
+    <string name="delete_downloaded_files">Ștergeți fișierele descărcate</string>
+    <string name="confirm_prompt">Doriți să ștergeți istoricul descărcărilor sau să ștergeți toate fișierele descărcate\?</string>
+    <string name="clear_download_history">Șterge istoricul descărcărilor</string>
+    <string name="error_download_resource_gone">Nu se poate recupera această descărcare</string>
+    <string name="error_timeout">Conexiunea a expirat</string>
+    <string name="error_progress_lost">Progres pierdut, deoarece fișierul a fost șters</string>
+    <string name="error_insufficient_storage">Nu a mai rămas spațiu pe dispozitiv</string>
+    <string name="error_postprocessing_stopped">NewPipe a fost închis în timp ce lucra la fișier</string>
+    <string name="error_postprocessing_failed">Post-procesarea a eșuat</string>
+    <string name="error_http_not_found">Nu s-a găsit</string>
+    <string name="error_http_unsupported_range">Serverul nu acceptă descărcări multi-threaded, reîncercați cu @string/msg_threads = 1</string>
+    <string name="error_http_no_content">Serverul nu trimite date</string>
+    <string name="error_connect_host">Nu se poate conecta la server</string>
+    <string name="error_unknown_host">Nu s-a putut găsi server-ul</string>
+    <string name="error_ssl_exception">Nu s-a putut stabili o conexiune sigură</string>
+    <string name="error_permission_denied">Permisiune refuzată de sistem</string>
+    <string name="error_path_creation">Folderul de destinație nu poate fi creat</string>
+    <string name="error_file_creation">Fișierul nu poate fi creat</string>
+    <string name="label_code">Codul</string>
+    <string name="show_error">Afișare eroare</string>
+    <string name="download_already_pending">Există o descărcare în așteptare cu acest nume</string>
+    <string name="download_already_running">Există o descărcare în curs cu acest nume</string>
+    <string name="overwrite_failed">nu poate suprascrie fișierul</string>
+    <string name="overwrite_finished_warning">Există deja un fișier descărcat cu acest nume</string>
+    <string name="overwrite_unrelated_warning">Există deja un fișier cu acest nume</string>
+    <string name="overwrite">Suprascrieți</string>
+    <string name="generate_unique_name">Generați un nume unic</string>
+    <string name="download_finished_more">%s descărcări terminate</string>
+    <string name="download_finished">Descărcare terminată</string>
+    <string name="download_failed">Descărcare eșuată</string>
+    <string name="permission_denied">Acțiune refuzată de sistem</string>
+    <string name="enqueue">Fila de așteptare</string>
+    <string name="recovering">Se recuperează</string>
+    <string name="post_processing">post-procesare</string>
+    <string name="queued">În așteptare</string>
+    <string name="paused">Întrerupt</string>
+    <string name="missions_header_pending">În așteptare</string>
+    <string name="missions_header_finished">Finalizat</string>
+    <string name="app_update_notification_content_text">Atingeți pentru a descărca</string>
+    <string name="app_update_notification_content_title">Actualizare a Newpipe este disponibilă!</string>
+    <string name="switch_view">Schimbați vizualizarea</string>
+    <string name="auto">Automat</string>
+    <string name="grid">Grilă</string>
+    <string name="list">Listă</string>
+    <string name="list_view_mode">Mod vizualizare listă</string>
+    <string name="never">Niciodată</string>
+    <string name="wifi_only">Numai pe Wi-Fi</string>
+    <string name="autoplay_summary">Porniți redarea automat - %s</string>
+    <string name="minimize_on_exit_popup_description">Minimizare la pop-up player</string>
+    <string name="minimize_on_exit_background_description">Minimizați la playerul de fundal</string>
+    <string name="minimize_on_exit_none_description">Niciunul</string>
+    <string name="minimize_on_exit_summary">Acțiune când comutați la altă aplicație de pe playerul video principal — %s</string>
+    <string name="minimize_on_exit_title">Minimalizați la comutarea aplicației</string>
+    <string name="updates_setting_description">Afișați o notificare pentru a solicita actualizarea aplicației atunci când este disponibilă o nouă versiune</string>
+    <string name="updates_setting_title">Actualizări</string>
+    <string name="limit_data_usage_none_description">Fără limită</string>
+    <string name="start_accept_privacy_policy">Pentru a respecta Regulamentul general european privind protecția datelor (GDPR), vă atragem atenția asupra politicii de confidențialitate a NewPipe. Vă rugăm să-l citiți cu atenție.
+\nTrebuie să îl acceptați pentru a ne trimite raportul de eroare.</string>
+    <string name="playback_reset">Resetează</string>
+    <string name="playback_step">Etapă</string>
+    <string name="skip_silence_checkbox">Înaintează rapid în timpul tăcerii</string>
+    <string name="unhook_checkbox">Decuplați (poate provoca distorsiuni)</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="import_network_expensive_warning">Rețineți că această operațiune poate fi costisitoare în rețea.
+\n
+\nContinuați\?</string>
+    <string name="import_soundcloud_instructions_hint">ID-ul dvs., soundcloud.com/yourid</string>
+    <string name="import_soundcloud_instructions">Importați un profil SoundCloud tastând fie adresa URL, fie ID-ul dvs.:
+\n
+\n1. Activați „modul desktop” într-un browser web (site-ul nu este disponibil pentru dispozitivele mobile)
+\n2. Accesați această adresă URL: %1$s
+\n3. Conectați-vă când vi se solicită
+\n4. Copiați adresa URL a profilului către care ați fost redirecționat.</string>
+    <string name="import_youtube_instructions">Importați abonamente YouTube de la Google Takeout:
+\n
+\n1. Accesați această adresă URL: %1$s
+\n2. Conectați-vă când vi se solicită
+\n3. Faceți clic pe „Toate datele incluse”, apoi pe „Deselectați toate”, apoi selectați doar „abonamente” și faceți clic pe „OK”
+\n4. Faceți clic pe „Pasul următor” și apoi pe „Creați export”
+\n5. Faceți clic pe butonul „Descărcați” după ce apare și
+\n6. Din fișierul zip Takeout descărcat extrageți fișierul .json (de obicei sub „YouTube și YouTube Music / subscriptions / subscriptions.json”) și importați-l aici.</string>
+    <string name="show_original_time_ago_summary">Textele originale de la servicii vor fi vizibile în elementele de flux</string>
+    <string name="enable_disposed_exceptions_title">Raportați erori în afara ciclului de viață</string>
+    <string name="show_memory_leaks">Afișați scurgeri de memorie</string>
+    <string name="enable_leak_canary_summary">Monitorizarea scurgerilor de memorie poate face ca aplicația să nu mai răspundă la descărcarea heap-ului</string>
+    <string name="playlist_no_uploader">Generat automat (nu s-a găsit niciun uploader)</string>
+    <string name="unbookmark_playlist">Eliminați marcajul</string>
+    <string name="unmute">Activați sunetul</string>
+    <string name="mute">Dezactivați sunetul</string>
+    <string name="enqueued">Adăugat în lista de redare</string>
+    <string name="enqueue_stream">Adăugați în lista de redare</string>
+    <string name="title_activity_play_queue">Rulați lista de redare</string>
+    <string name="most_liked">Cele mai apreciate</string>
+    <string name="recently_added">Adăugate recent</string>
+    <string name="local">Local</string>
+    <string name="localization_changes_requires_app_restart">Limba se va schimba odată cu repornirea aplicației.</string>
+    <string name="no_playlist_bookmarked_yet">Nu există încă marcaje în playlist</string>
+    <string name="select_a_playlist">Selectați un playlist</string>
+    <string name="default_kiosk_page_summary">Chioșc implicit</string>
+    <string name="msg_calculating_hash">Se calculează hash-ul</string>
+    <string name="infinite_videos">∞ videoclipuri</string>
+    <string name="more_than_100_videos">Peste 100 de videoclipuri</string>
+    <plurals name="listening">
+        <item quantity="one">%s auditor</item>
+        <item quantity="few">%s auditori</item>
+        <item quantity="other">%s auditori</item>
+    </plurals>
+    <string name="no_one_listening">Nimeni nu ascultă</string>
+    <plurals name="watching">
+        <item quantity="one">%s privește</item>
+        <item quantity="few">%s privesc</item>
+        <item quantity="other">%s privesc</item>
+    </plurals>
+    <string name="no_one_watching">Nimeni nu se uită</string>
+    <string name="drawer_header_description">Comutare serviciu, selectat în prezent:</string>
+    <string name="description_tab_description">Descriere</string>
+    <string name="related_streams_tab_description">Fluxuri corelate</string>
+    <string name="comments_tab_description">Comentarii</string>
+    <string name="error_report_open_github_notice">Vă rugăm să verificați dacă există deja o problemă legată de crash-ul dvs. Când creați bilete duplicat, ne luați timp pe care l-am putea petrece cu remedierea erorii.</string>
+    <string name="copy_for_github">Copiați raportul formatat</string>
+    <string name="show_meta_info_summary">Dezactivați pentru a ascunde casetele de meta-informații cu informații suplimentare despre creatorul fluxului, conținutul fluxului sau o solicitare de căutare.</string>
+    <string name="show_description_summary">Dezactivați pentru a ascunde descrierea videoclipului și informațiile suplimentare</string>
+    <string name="show_description_title">Arătați descrierea</string>
+    <string name="open_with">Deschideți cu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6d00c0901ae..a67b0011060 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -666,4 +666,12 @@
     <string name="recent">Недавнее</string>
     <string name="show_meta_info_summary">Отключите, чтобы скрыть поля метаданных (автор потока, содержимое потока или поисковый запрос)</string>
     <string name="show_meta_info_title">Показать метаданные</string>
+    <string name="related_streams_tab_description">Похожие потоки</string>
+    <string name="chapters">Главы</string>
+    <string name="description_tab_description">Описание</string>
+    <string name="comments_tab_description">Комментарии</string>
+    <string name="show_description_summary">Отключите, чтобы скрыть описание видео и дополнительные сведения</string>
+    <string name="show_description_title">Показать описание</string>
+    <string name="open_with">Открыть в</string>
+    <string name="no_app_to_open_intent">Подходящее приложение не найдено</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml
index c2ac43d8946..620654c25d2 100644
--- a/app/src/main/res/values-sat/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -51,4 +51,7 @@
     <string name="download_path_audio_summary">ᱰᱟᱩᱱᱞᱳᱰ ᱟᱠᱟᱱ ᱥᱟᱲᱮ ᱮᱨᱫ ᱠᱚ ᱱᱚᱰᱮ ᱫᱚᱦᱚᱜᱼᱟ</string>
     <string name="download_path_audio_title">ᱥᱟᱲᱮ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ</string>
     <string name="download_path_dialog_title">ᱣᱤᱰᱤᱭᱚ ᱨᱮᱫᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
+    <string name="play_with_kodi_title">Kodi ᱥᱟᱞᱟᱜ ᱪᱟᱹᱞᱩᱭ ᱢᱮ</string>
+    <string name="show_higher_resolutions_summary">ᱠᱷᱟᱹᱞᱤ ᱛᱤᱱᱟᱹᱝ ᱜᱟᱱ ᱥᱟᱫᱷᱚᱱ ᱢᱮᱱᱟᱜᱼᱟ ᱚᱠᱟ ᱫᱚ 2K/4K ᱣᱤᱰᱤᱭᱚ ᱠᱚ ᱪᱟᱹᱞᱩ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱭ</string>
+    <string name="open_with">ᱥᱟᱞᱟᱜ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index b5de80a32d8..32f640a583b 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -655,4 +655,12 @@
     <string name="recent">Reghente</string>
     <string name="show_meta_info_summary">Istuda·lu pro cuare sas iscatuleddas cun informatziones additzionales in subra de su creadore de su flussu, de su cuntenutu de su flussu o de una rechesta de chirca.</string>
     <string name="show_meta_info_title">Ammustra informatziones meta</string>
+    <string name="no_app_to_open_intent">Peruna aplicatzione in su dispositivu tuo podet abèrrere custu</string>
+    <string name="chapters">Capìtulos</string>
+    <string name="description_tab_description">Descritzione</string>
+    <string name="related_streams_tab_description">Flussos ligados</string>
+    <string name="comments_tab_description">Cummentos</string>
+    <string name="show_description_summary">Istuda pro cuare sa descritzione de su vìdeu e sas informatziones additzionales</string>
+    <string name="show_description_title">Ammustra sa descritzione</string>
+    <string name="open_with">Aberi cun</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ba12728ff33..e75272b6359 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -665,4 +665,11 @@
     <string name="recent">Nedávne</string>
     <string name="show_meta_info_summary">Vypnite, pokiaľ nechcete zobrazovať meta informácie ako autor streamu, obsah streamu alebo vyhľadávanie.</string>
     <string name="show_meta_info_title">Zobrazovať meta informácie</string>
+    <string name="chapters">Kapitoly</string>
+    <string name="description_tab_description">Popis</string>
+    <string name="related_streams_tab_description">Súvisiace streamy</string>
+    <string name="comments_tab_description">Komentáre</string>
+    <string name="show_description_summary">Vypnutím skryjete popis videa a ďalšie informácie</string>
+    <string name="show_description_title">Zobraziť popis</string>
+    <string name="open_with">Otvoriť s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 8b830b27baf..7d97de8e374 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -13,7 +13,7 @@
     <string name="notification_action_shuffle">isku qas</string>
     <string name="notification_action_repeat">Ku celi</string>
     <string name="notification_actions_at_most_three">Ugu badnaan waxad dooran kartaa sadex shay iney ka muuqdaan ogaysiiska yar!</string>
-    <string name="notification_actions_summary">Wax ka badal hawsha ogaysiiska hoose (mid walba) adigoo dushiisa ku dhufanaya. Dooro ilaa sadex kamida si ay uga muuqdaan ogaysiiska yar adigoo taabanaya santuuqa dhanka midigta ku yaala.</string>
+    <string name="notification_actions_summary">Wax ka badal hawsha ogaysiiska adigoo dushooda ku dhufanaya. Dooro ilaa sadex kamida si ay uga muuqdaan ogaysiiska yar adigoo saxaya santuuqa dhanka midig kaga yaala.</string>
     <string name="notification_action_4_title">Batoonka hawsha shanaad</string>
     <string name="notification_action_3_title">Batoonka hawsha afraad</string>
     <string name="notification_action_2_title">Batoonka hawsha sadexaad</string>
@@ -26,7 +26,7 @@
     <string name="kore_not_found">Kushub app-ka maqan ee Kore\?</string>
     <string name="play_with_kodi_title">Kufur Kodi</string>
     <string name="show_higher_resolutions_summary">Aaladaha qaar kaliya ayaa furi kara muuqaalada 2K/4K ga ah</string>
-    <string name="show_higher_resolutions_title">Tus tayooyinka muuqaalada ee kasii sareeya</string>
+    <string name="show_higher_resolutions_title">Tus tayooyinka kasii sareeeya</string>
     <string name="default_popup_resolution_title">Tayada muuqaalka daaqada</string>
     <string name="default_resolution_title">Tayada muuqaalka</string>
     <string name="autoplay_by_calling_app_summary">Wuxuu daaraa muuqaal marka NewPipe laga soo furo app kale</string>
@@ -35,14 +35,14 @@
     <string name="download_path_dialog_title">Dooro meesha muuqaalada lasoo dajiyo galaan</string>
     <string name="download_path_audio_summary">Dhagaysiyada lasoo dajiyay halkan ayaa lagu kaydiyaa</string>
     <string name="download_path_summary">Muuqaalada lasoo dajiyo halkan ayaa lagu kaydiyaa</string>
-    <string name="download_path_audio_title">Meesha dhagaysiga lasoo dajiyo galaan</string>
-    <string name="download_path_title">Meesha muuqaalada lasoo dajiyo galaan</string>
+    <string name="download_path_audio_title">Kaydka dhagaysiga lasoo dajiyo</string>
+    <string name="download_path_title">Kaydka muuqaalada lasoo dajiyo</string>
     <string name="controls_add_to_playlist_title">Ku Dar</string>
     <string name="controls_popup_title">Daaqad</string>
     <string name="controls_background_title">Xaga Dambe</string>
     <string name="tab_choose">Dooro Daaqada</string>
     <string name="tab_new">Daaqad Cusub</string>
-    <string name="tab_bookmarks">La Calaamadsaday</string>
+    <string name="tab_bookmarks">La calaamadsaday</string>
     <string name="tab_subscriptions">Rukunka</string>
     <string name="tab_main">Guud</string>
     <string name="show_info">Tus faahfaahinta</string>
@@ -56,8 +56,8 @@
     <string name="use_external_audio_player_title">Isticmaal dhagaysi daare dibada ah</string>
     <string name="use_external_video_player_summary">Codka ayuu ka saaraa tayada muuqaalada qaar</string>
     <string name="use_external_video_player_title">Isticmaal muuqaal daare dibada ah</string>
-    <string name="choose_browser">Dooro Browser-ka</string>
-    <string name="share_dialog_title">La Wadaag</string>
+    <string name="choose_browser">Dooro browser-ka</string>
+    <string name="share_dialog_title">La wadaag</string>
     <string name="search_showing_result_for">Kutusaya natiijooyinka: %s</string>
     <string name="did_you_mean">Ma waxaad ka waday \"%1$s\"\?</string>
     <string name="settings">Fadhiga</string>
@@ -68,10 +68,10 @@
     <string name="cancel">Ka noqo</string>
     <string name="install">Ku shub</string>
     <string name="no_player_found_toast">Wax fura lama helin shaygan. (waxaad Ku shuban kartaa VLC si aad u furto).</string>
-    <string name="view_count_text">%1$s ayaa la furay</string>
+    <string name="view_count_text">%1$s ayaa lafuray</string>
     <string name="no_player_found">Wax fura lama helin shaygan. Ku shubo VLC\?</string>
     <string name="upload_date_text">Lasoo galiyay: %1$s</string>
-    <string name="main_bg_subtitle">Ku dhufo \"Raadi\" si aad u bilawdo
+    <string name="main_bg_subtitle">Ku dhufo \"Raadi\" 🔍 si aad u bilowdo
 \n</string>
     <string name="overwrite_unrelated_warning">Shay magacan leh ayaa horay ujiray</string>
     <string name="overwrite">Ku badal</string>
@@ -88,7 +88,7 @@
     <string name="app_update_notification_content_text">Ku dhufo si aad u dajiso</string>
     <string name="app_update_notification_content_title">Nooc cusub oo NewPipe ah ayaa diyaar ah!</string>
     <string name="switch_view">Baddal Qaabka</string>
-    <string name="list_view_mode">Qaabka soo bandhiga</string>
+    <string name="list_view_mode">Qaabka soobandhiga</string>
     <string name="never">Marna</string>
     <string name="wifi_only">WiFi-ga kaliya</string>
     <string name="minimize_on_exit_title">Yaree marka app kale loo gudbo</string>
@@ -100,24 +100,24 @@
     <string name="import_soundcloud_instructions_hint">ID-gaaga, soundcloud.com/yourid</string>
     <string name="subscriptions_export_unsuccessful">Rukunka lama gudbin karo</string>
     <string name="subscriptions_import_unsuccessful">Lama soo galin karo rukunka</string>
-    <string name="previous_export">Gudbintii Hore</string>
+    <string name="previous_export">Gudbin hore</string>
     <string name="import_file_title">Soo gali fayl</string>
     <string name="export_ongoing">Gudbinaya…</string>
     <string name="import_ongoing">Soo galinaya…</string>
     <string name="export_to">U gudbi</string>
-    <string name="import_from">Kasoo Gali</string>
-    <string name="import_title">Soogali</string>
+    <string name="import_from">Kasoo gali</string>
+    <string name="import_title">Soo gali</string>
     <string name="import_export_title">Soo gali/Dibada ugudbi</string>
-    <string name="show_original_time_ago_summary">Qoraaladii asal ahaan adeegyada la socday way ka muuqan doonaan waxyaabaha aad furanayso</string>
-    <string name="show_original_time_ago_title">Soo bandhig wakhtigii asalka ahaa ee kasoo wareegay (shayga)</string>
+    <string name="show_original_time_ago_summary">Qoraaladii asal ahaan adeegyada la socday (wakhtigii kasoo wareegay) way ka muuqan doonaan waxyaabaha aad furanayso</string>
+    <string name="show_original_time_ago_title">Tus wakhtigii asalka ahaa</string>
     <string name="enable_disposed_exceptions_summary">Ku khasab warinta ka reebitaanada aan la fulin karin ee \'Rx\' ka ee dibada qayb ama wakhtiga hawsha kadib marka la iska dhaafo</string>
-    <string name="enable_disposed_exceptions_title">Wari khaladaadka wakhtigoodu dhacay</string>
+    <string name="enable_disposed_exceptions_title">Warinta khaladyada hore</string>
     <string name="show_memory_leaks">Tus ciladaha kaydka</string>
     <string name="enable_leak_canary_summary">Dabagalka cillada kaydka waxay sababi kartaa inuu app-ku istaago marka \'heap dump\' la samaynayo</string>
     <string name="caption_setting_description">Wax kabadal cabirka xarfaha qoraal-hooseedka iyo midabkooda xaga dambe. App-ka waa in dib loo soo bilaabaa si ay u hirgasho.</string>
     <string name="resize_zoom">Soo dhawee</string>
     <string name="resize_fill">Ku buuxi</string>
-    <string name="caption_none">Ma jiro Qoraal-hooseed</string>
+    <string name="caption_none">Qoraal-hooseed la\'aan</string>
     <string name="playlist_no_uploader">isa-sameeyay (soosaare lama helin)</string>
     <string name="playlist_delete_failure">Xulka lama saari karo.</string>
     <string name="playlist_thumbnail_change_success">Galkii xulka waa la badalay.</string>
@@ -183,7 +183,7 @@
     <string name="delete_all_history_prompt">Ma hubtaa inaad ka saari rabto wax walba kaydka wixii hore\?</string>
     <string name="delete_stream_history_prompt">Ma rabtaa inaad ka saarto shaygan kaydka wixii la daawaday\?</string>
     <string name="delete_item_search_history">Ma rabtaa inaad ka saarto shaygan kaydka wixii la raadiyay\?</string>
-    <string name="item_deleted">Shayga waa la saaray</string>
+    <string name="item_deleted">Waa la saaray</string>
     <string name="history_cleared">Kaydka wixii hore waa la nadiifiyay</string>
     <string name="history_empty">Kaydka wixii hore wuu madhan yahay</string>
     <string name="action_history">Wixii Hore</string>
@@ -191,10 +191,10 @@
     <string name="title_history_view">La Daawaday</string>
     <string name="title_history_search">La Raadiyay</string>
     <string name="read_full_license">Akhri laysinka</string>
-    <string name="app_license">NewPipe waa barnaamij bilaash ah oon lahayn xuquuqda daabacaada: Waad isticmaali kartaa, waad wadaagi kartaa waadna hormarin kartaa hadaad rabto. Gaar ahaan waad sii daabici kartaa ama wax baad ka badali kartaa ayadoo la raacayo shuruudaha sharciga guud ee GNU sida ay soosaareen Ururka Barnaamijyada Bilaashka ah, soosaarista 3aad ee laysinka, ama (hadaad doonto) nooc walba oo kasii dambeeyay laysinkii 3aad.</string>
-    <string name="privacy_policy_title">Siyaasada Sir-Dhawrka NewPipe</string>
+    <string name="app_license">NewPipe waa barnaamij bilaash ah oo aan lahayn xuquuqda daabacaada: Waad isticmaali kartaa, waad wadaagi kartaa waadna hormarin kartaa hadaad rabto. Gaar ahaan waad sii daabici kartaa ama wax baad ka badali kartaa ayadoo la raacayo shuruudaha sharciga guud ee GNU sida ay soosaareen Ururka Barnaamijyada Bilaashka ah, soosaarista 3aad ee laysinka, ama (hadaad doonto) nooc walba oo kasii dambeeyay laysinkii 3aad.</string>
+    <string name="privacy_policy_title">Siyaasada Sirdhawrka NewPipe</string>
     <string name="app_license_title">Laysanka NewPipe</string>
-    <string name="read_privacy_policy">Akhri siyaasada sir-dhawrka</string>
+    <string name="read_privacy_policy">Akhri siyaasada sirdhawrka</string>
     <string name="privacy_policy_encouragement">Mashruuca NewPipe sir dhawrkaaga aad ayuu u daneeyaa. Sidaas darteed, App-ku wax xogtaada ah ma uruuriyo fasax la\'aan.
 \nSiyaasada sir-dhawrka NewPipe ayaa si faahfaahsan u sharaxda wixii xog ah ee la diro lana kaydiyo markaad cilad farsamo wariso.</string>
     <string name="website_encouragement">Booqo website-ka NewPipe si aad xog intaas dheer iyo warar uhesho.</string>
@@ -205,17 +205,17 @@
     <string name="view_on_github">Xaga GitHub fur</string>
     <string name="contribution_encouragement">Hadaad hayso fikrado; rogid, qaab badal, nadiifin koodh, ama koodhka ood si wayn wax oga badashaa—caawinta marwalba waa lasoo dhawaynayaa. Waxbadan hadii la qabto waxbadan ayaa fiicnaan!</string>
     <string name="contribution_title">Kusoo Kordhin</string>
-    <string name="app_description">App bilaash ah oo fudud looguna talagalay in aaladaha nidaamka Android-ka ku shaqeeya wax loogu daawado.</string>
+    <string name="app_description">App bilaash ah oo fudud looguna talagalay in Android-ka wax loogu daawado.</string>
     <string name="tab_licenses">Laysinada</string>
     <string name="tab_contributors">Dadka wax kusoo kordhiyay NewPipe</string>
-    <string name="tab_about">Ku saabsan NewPipe</string>
+    <string name="tab_about">Kusaabsan NewPipe</string>
     <string name="action_open_website">Fur website-ka</string>
     <string name="error_unable_to_load_license">Laysanka lama soo kicin karo</string>
     <string name="copyright">© %1$s sameeyay %2$s ayagoo raacaya %3$s</string>
     <string name="title_licenses">Laysinada gacanta sadexaad</string>
     <string name="action_about">Xog</string>
     <string name="action_settings">Fadhiga</string>
-    <string name="title_activity_about">Ku saabsan NewPipe</string>
+    <string name="title_activity_about">Kusaabsan NewPipe</string>
     <string name="toast_no_player">Shaygan app fura kuuguma jiro</string>
     <string name="charset_most_special_characters">Xarfaha gaarka ah kuwa ugu badan</string>
     <string name="charset_letters_and_digits">Xarfaha iyo godadka</string>
@@ -225,7 +225,7 @@
     <string name="settings_category_downloads_title">Soodajinta</string>
     <string name="recaptcha_done_button">Dhameeyay</string>
     <string name="recaptcha_request_toast">Tijaabada reCAPTCHA ayaa la codsaday</string>
-    <string name="subtitle_activity_recaptcha">Taabo \"Dhameeyay\" markaad xaliso</string>
+    <string name="subtitle_activity_recaptcha">Taabo \"Dhameeyay\" ama ✅ markaad xaliso</string>
     <string name="title_activity_recaptcha">Tijaabada reCAPTCHA</string>
     <string name="one_item_deleted">1 shay ayaa la saaray.</string>
     <string name="msg_popup_permission">Ogolaanshahan ayaa loo baahan yahay si
@@ -234,7 +234,7 @@
     <string name="msg_copied">Dhakada ayaa lagu qabtay</string>
     <string name="msg_wait">Fadlan sug…</string>
     <string name="msg_calculating_hash">Xisaabinaya badalka</string>
-    <string name="msg_running_detail">Faahfahinta kusii dhufo</string>
+    <string name="msg_running_detail">Faahfaahinta kusii dhufo</string>
     <string name="msg_running">NewPipe wuu dajinayaa</string>
     <string name="msg_url_malform">Tixraac khaldan ama khad baan jirin</string>
     <string name="msg_exists">Shaygan horay ayuu ujiray</string>
@@ -273,8 +273,8 @@
     </plurals>
     <string name="no_one_watching">Cidna ma daawanayso</string>
     <plurals name="views">
-        <item quantity="one">%s ayaa la furay</item>
-        <item quantity="other">%s ayaa la furay</item>
+        <item quantity="one">%s ayaa lafuray</item>
+        <item quantity="other">%s ayaa lafuray</item>
     </plurals>
     <string name="no_views">Lama furin</string>
     <string name="subscribers_count_not_available">inta rukumatay lama heli karo</string>
@@ -288,7 +288,7 @@
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="storage_permission_denied">U ogolow app-ka kaydka aaalada marka hore</string>
-    <string name="retry">Markale isku day</string>
+    <string name="retry">Markale iskuday</string>
     <string name="audio">Dhagaysi</string>
     <string name="video">Muuqaal</string>
     <string name="info_dir_created">Waa la sameeyay galka soodajinta ee \'%1$s\'</string>
@@ -312,7 +312,7 @@
     <string name="what_device_headline">Xogta:</string>
     <string name="error_snackbar_action">Wari</string>
     <string name="error_snackbar_message">Waan ka xunahay, waxbaa khaldamay.</string>
-    <string name="error_report_open_github_notice">Fadlan hubi in arin ciladdan ka hadlaya horay loo wariyay. Marka wax horay u jiray la wariyo markale, wakhti ayaad naga qaadaysaa wakhtigaas oo aan cilada ku sixi la hayn.</string>
+    <string name="error_report_open_github_notice">Fadlan hubi in arin cilladdan ka hadlaya horay loo wariyay. Marka wax horay u jiray la wariyo markale, wakhti ayaad naga qaadaysaa wakhtigaas oo aan cilada ku sixi la hayn.</string>
     <string name="error_report_open_issue_button_text">Ku wari xaga GitHub-ka</string>
     <string name="copy_for_github">Koobiyee warka oo diyaarsan</string>
     <string name="error_report_button_text">Khaladkan email ahaan ku warceli</string>
@@ -348,7 +348,7 @@
     <string name="network_error">khalad xaga khadka ah</string>
     <string name="download_to_sdcard_error_message">Ku dajinta kaydka dibadda (mimoriga) suurtogal ma aha. Dib u fadhiisi meesha wax lagu dajiyo\?</string>
     <string name="download_to_sdcard_error_title">Kaydka dibadda lama heli karo</string>
-    <string name="general_error">Khalad!!</string>
+    <string name="general_error">Khalad</string>
     <string name="help">Caawin</string>
     <string name="search_history_deleted">Wixii la raadiyay waa la tirtiray.</string>
     <string name="delete_search_history_alert">Tirtir dhamaan wixii la raadiyay\?</string>
@@ -357,8 +357,8 @@
     <string name="clear_search_history_title">Tirtir wixii la raadiyay</string>
     <string name="delete_playback_states_alert">Tirtir dhamaan meelaha ay kuu marayeen\?</string>
     <string name="clear_playback_states_summary">Wuxuu tirtiraa meelihii ay kuu marayeen waxyaabaha aad furtay oo dhan</string>
-    <string name="clear_playback_states_title">Tirtir meelaha ay kuu marayaan waxa la daaray</string>
-    <string name="file">Fayl</string>
+    <string name="clear_playback_states_title">Tirtir meelaha ay marayaan</string>
+    <string name="file">Kaydka</string>
     <string name="popup_resizing_indicator_title">Dib-ucabiraya</string>
     <string name="clear">Nadiifi</string>
     <string name="artists">Fanaan</string>
@@ -405,7 +405,7 @@
     <string name="just_once">Markan uun</string>
     <string name="always">Marwalba</string>
     <string name="play_all">Wada Daar</string>
-    <string name="file_deleted">Shayga waa la saaray</string>
+    <string name="file_deleted">Waa la saaray</string>
     <string name="best_resolution">Tayada ugu fiican</string>
     <string name="later">Hadhow</string>
     <string name="events">Bandhigyo</string>
@@ -413,8 +413,8 @@
     <string name="restricted_video">Muuqaalkan da\'da qofka ayuu ku xidhanyahay.
 \n
 \nKasoo fur \"%1$s\" xaga fadhiga hadaad rabto inaad aragto.</string>
-    <string name="youtube_restricted_mode_enabled_summary">YouTube-ku wuxuu leeyahay \"Qaabka Xadidan\" kaasoo qariya waxyaabo laga yaabo ineysa haboonayn</string>
-    <string name="youtube_restricted_mode_enabled_title">Fur Nidaamka \"Qaabka Xadidan\"</string>
+    <string name="youtube_restricted_mode_enabled_summary">YouTube-ku wuxuu leeyahay nidaamka \"Qaabka Xadidan\" kaasoo qariya waxyaabo laga yaabo ineysa haboonayn</string>
+    <string name="youtube_restricted_mode_enabled_title">Fur \"Qaabka Xadidan\"</string>
     <string name="show_age_restricted_content_summary">Soo bandhig waxyaabaha laga yaabo inaysa ku haboonayn caruurta sababtoo ah waxay ku xidhan yihiin da\'da qofka (sida 18+)</string>
     <string name="show_age_restricted_content_title">Tus waxyaabaha da\'da ku xidhan</string>
     <string name="content">Luuqada &amp; Fadhiga Kale</string>
@@ -437,7 +437,7 @@
     <string name="peertube_instance_add_fail">Lama ansixin karo qaybtan</string>
     <string name="peertube_instance_add_help">Gali tixraaca qaybta</string>
     <string name="peertube_instance_add_title">Ku dar qayb</string>
-    <string name="peertube_instance_url_help">%s ka hel qaybaha aad jeceshahay</string>
+    <string name="peertube_instance_url_help">Ka hel qaybaha aad jeceshahay %s</string>
     <string name="peertube_instance_url_summary">Dooro qaybaha aad jeceshahay ee PeerTube-ka</string>
     <string name="peertube_instance_url_title">Qaybaha PeerTube</string>
     <string name="content_language_title">Luuqada Muuqaalka/Dhagaysiga</string>
@@ -469,7 +469,7 @@
     <string name="brightness_gesture_control_title">Maamulista iftiinka (farta)</string>
     <string name="volume_gesture_control_summary">Isticmaal fartaada adigoo shaashada farta dhinac kaga jiidaya si aad umaamusho codka</string>
     <string name="volume_gesture_control_title">Maamulista codka (farta)</string>
-    <string name="auto_queue_toggle">Hormada-isutalisa</string>
+    <string name="auto_queue_toggle">Hormada isutalisa</string>
     <string name="auto_queue_summary">Sii wad dhamaystirka (mida aan isku celcelinin) hormada shidan ayadoo lagu sii darayo waxyaabo la xidhiidha shayga daaran</string>
     <string name="auto_queue_title">Ku xiji hormada shayga xiga</string>
     <string name="metadata_cache_wipe_complete_notice">Waa la tirtiray kaydkii K/G ahaa fahfaahinada yaryar</string>
@@ -481,9 +481,9 @@
     <string name="show_comments_title">Tus faalooyinka</string>
     <string name="download_thumbnail_title">Soo dhig galalka</string>
     <string name="clear_queue_confirmation_description">Hormada daareha hadda wax shidaya waa la badali doonaa</string>
-    <string name="clear_queue_confirmation_summary">Kala badalka daareha waxay badali kartaa hormada</string>
-    <string name="clear_queue_confirmation_title">Waydii in la xaqiijiyo intaan hormada la tirtirin</string>
-    <string name="seek_duration_title">Wakhtiga horay udhaafinta/-dibucelinta</string>
+    <string name="clear_queue_confirmation_summary">Kala badalka daareha waxay badali kartaa hormada sidaas darteed waydii in la xaqiijiyo intaan hormada la tirtirin</string>
+    <string name="clear_queue_confirmation_title">Xaqiijinta tirtirka hormada</string>
+    <string name="seek_duration_title">Wakhtiga horay udhaafinta/dibucelinta</string>
     <string name="use_inexact_seek_summary">Dhaaf-dhaafinta dagdaga ah ee waxa daaran, 100% sax wax uma dhaafiso waxayna u sahashaa muuqaal daareha inuu u dhaaf dhaafiyo si dagdag ah. Nidaamkan 5, 15 ama 25 ilbiriqsi wax looma dhaafin karo.</string>
     <string name="black_theme_title">Mugdi</string>
     <string name="light_theme_title">Caddaan</string>
@@ -500,7 +500,7 @@
     <string name="minimize_on_exit_none_description">Waxba</string>
     <string name="decline">Diid</string>
     <string name="name">Magaca</string>
-    <string name="conferences">Shirarka</string>
+    <string name="conferences">Shirar</string>
     <string name="feed_create_new_group_button_title">Mid Cusub</string>
     <string name="auto">ismaamulaya</string>
     <string name="playback_step">Talaabo</string>
@@ -514,7 +514,7 @@
         <item quantity="one">%d ayaa la calaamadiyay</item>
         <item quantity="other">%d ayaa la calaamadiyay</item>
     </plurals>
-    <string name="enqueue">Hormo</string>
+    <string name="enqueue">Hormada gali</string>
     <string name="recent">Ugu Dambeeyay</string>
     <string name="settings_category_feed_title">Bandhiga</string>
     <string name="error_http_no_content">Martigaliyahu wax masoo dirin</string>
@@ -523,10 +523,10 @@
     <string name="list">Si taxan</string>
     <string name="playback_tempo">Teembada</string>
     <string name="enqueue_stream">Hormo gali</string>
-    <string name="local">Gudaha Aalada</string>
+    <string name="local">Gudaha</string>
     <string name="show_thumbnail_summary">U isticmaal galka xaga shaashada markay xidhantahay iyo xaga kore ee ogaysiisyada</string>
     <string name="playlist_page_summary">Boga xulka</string>
-    <string name="show_thumbnail_title">Tus Galka</string>
+    <string name="show_thumbnail_title">Soo bandhig galka</string>
     <string name="video_detail_by">Sameeyay %s</string>
     <string name="channel_created_by">Waxaa sameeyay %s</string>
     <string name="detail_sub_channel_thumbnail_view_description">Waxa u saaran kanaalka</string>
@@ -535,23 +535,23 @@
 \nMustaqbalka in la taageero ayaa la rajaynayaa.</string>
     <string name="feed_use_dedicated_fetch_method_help_text">Sookicinta bandhigu aad miyuu u daahayaa\? Haday saas tahay, iskuday furashada qaabka dagdaga ah (waxaad ka badali kartaa xaga fadhiga ama adoo riixaya batoonka hoose).
 \n
-\nNewPipe wuxuu leeyahya laba qaab oo uu bandhiga usoo furo:
+\nNewPipe wuxuu leeyahay laba qaab oo uu bandhiga usoo furo:
 \n• Soo kicinta dhamaan rukunka kanaalka, taasoo ah mid culus laakiin dhamaystiran.
 \n• Inuu isticmaalo adeeg hawshan loogu talagalay, taasoo ah mid dagdaga ah laakiin badanaa aan dhamaystirnayn.
 \n
-\nFarqiga labadan u dhexeeya ayaa ah in midka dagdaga ag uu la\'yahay xogta shayga qaar, sida intuu shaygu socdo ama nooca (mana kala garan karo muuqaalada tooska ah iyo kuwa caadiga ah) wuxuuna sidoo kale soodhigi karaa waxyaabo yar.
+\nFarqiga labadan u dhexeeya ayaa ah in midka dagdaga ah uu la\'yahay xogta shayga qaar, sida intuu shaygu socdo ama nooca (mana kala garan karo muuqaalada tooska ah iyo kuwa caadiga ah) wuxuuna sidoo kale soodhigi karaa waxyaabo yar.
 \n
-\nYouTube waa tusaale adeegyada bixiya qaabka dagdaga ah xagooda bandhiga RSS -ka.
+\nYouTube waa tusaale adeegyada ku bixiya qaabka dagdaga ah xagooda bandhiga RSS -ka.
 \n
-\nSidaa darteed dookhu wuxuu ku xidhanyahay kolba kaad rabto: adeeg dagdag ag ama wax saxan oo dhamaystiran.</string>
+\nSidaa darteed dookhu wuxuu ku xidhanyahay kolba kaad rabto: adeeg dagdag ah ama wax saxan oo dhamaystiran.</string>
     <string name="feed_use_dedicated_fetch_method_disable_button">Xidh qaabka dagdaga</string>
     <string name="feed_use_dedicated_fetch_method_enable_button">Fur qaabka dagdaga ah</string>
-    <string name="feed_use_dedicated_fetch_method_summary">Laga heli karo adeegyada qaar, inta badana wuu ka dagdag badanyahay laakiin wuu ka natiijooyin yar yahay badanaana xogtu ma dhamaystirna (tusaale intuu shaygu soconayo ma tusayo, nooca shayga sidoo kale, mana sheegayo inuu wuxu toos yahay).</string>
-    <string name="feed_use_dedicated_fetch_method_title">Kasoo qaado bandhig loogu talagalay marka la heli karo</string>
+    <string name="feed_use_dedicated_fetch_method_summary">Laga heli karo adeegyada qaar, inta badana wuu ka dagdag badanyahay laakiin wuu ka natiijooyin yar yahay inta badana xogtu ma dhamaystirna (tusaale intuu shaygu soconayo ma tusayo, nooca shayga sidoo kale, mana sheegayo inuu muuqaalku toos yahay).</string>
+    <string name="feed_use_dedicated_fetch_method_title">Qaabka dagdaga ah</string>
     <string name="feed_update_threshold_option_always_update">Marwalba cusboonaysii</string>
     <string name="feed_update_threshold_summary">Wakhtiga cusboonaysiinta udambaysa ee bandhiga, ka hor intaan rukunka laga sooqaadin mid duug ah — %s</string>
     <string name="feed_update_threshold_title">Xadka cusboonaysiinta</string>
-    <string name="feed_group_show_only_ungrouped_subscriptions">Tus rukumada aan kooxaysnayn kaliya</string>
+    <string name="feed_group_show_only_ungrouped_subscriptions">Rukumada aan kooxaysnayn kaliya</string>
     <string name="feed_group_dialog_delete_message">Ma rabtaa inaad kooxdan saarto\?</string>
     <string name="feed_group_dialog_empty_name">Magac kooxeed madhan</string>
     <string name="feed_group_dialog_empty_selection">Wax rukun ah lama dooran</string>
@@ -596,13 +596,13 @@
     <string name="start_downloads">Bilow dajinta</string>
     <string name="enable_queue_limit_desc">Hal soodajin ayaa markiiba socon</string>
     <string name="enable_queue_limit">Xadid hormada dajinta</string>
-    <string name="pause_downloads_on_mobile_desc">Tani waxay muhiim tahay marka khadka la isticmaalayo midka SIM-ka loo badalo, inkastoo soodajimaha qaar aan la joojin karin</string>
-    <string name="pause_downloads_on_mobile">Qabo dajinta marka khad xadidan la isticmaalayo</string>
+    <string name="pause_downloads_on_mobile_desc">Tani waxay muhiim tahay marka khadka la isticmaalayo midka SIM-ka loo badalo ayadoo la qabanayo dajinta socota inkastooo soodajimaha qaar aan lajoojin karin</string>
+    <string name="pause_downloads_on_mobile">Dhabqinta dajinta (khadka xadidan)</string>
     <string name="max_retry_msg">Xadka dib-isugudayida</string>
     <string name="deleted_downloads">Waxaa la saaray %1$d shay</string>
-    <string name="delete_downloaded_files">Saar wixii lasoo dajiyay</string>
+    <string name="delete_downloaded_files">Saar soodajinta</string>
     <string name="confirm_prompt">Ma waxaad rabtaa inaad nadiifiso kaydka wixii lasoo dajiyay (tani ma tirtirto wixii lasoo dajiyay) mise inaad saarto dhammaan wixii lasoo dajiyay\?</string>
-    <string name="clear_download_history">Nadiifi kaydka wixii la dajiyay</string>
+    <string name="clear_download_history">Nadiifi dajinta</string>
     <string name="error_download_resource_gone">Dajintan lama hagaajin karo</string>
     <string name="error_timeout">Ku xidhidii ayaa wakhtigii ka dhacay</string>
     <string name="error_progress_lost">Hawshii socotay way kala kacday, sababtoo ah shayga waa lala saaray</string>
@@ -625,7 +625,7 @@
     <string name="minimize_on_exit_background_description">U gudbi xaga dambe</string>
     <string name="minimize_on_exit_summary">Waxa la samayn doono marka app kale loo gudbayo ayadoo muuqaal caadi u daaran yahay — %s</string>
     <string name="updates_setting_description">Ogaysiis soo bandhig doonaya inaad app-ka cusboonaysiiso marka mid cusub soo baxo</string>
-    <string name="limit_mobile_data_usage_title">Xadid tayada marka khadka SIM-ka la isticmaalayo</string>
+    <string name="limit_mobile_data_usage_title">Xadid tayada (khadka SIM-ka)</string>
     <string name="accept">Aqbal</string>
     <string name="start_accept_privacy_policy">Si loogu hogaansamo Maaraynta Xog Dhawrka Guud ee heer Yurub (GDPR), waxaan halkan kugu xusuusinaynaa siyaasada sirdhawrka NewPipe. Fadlan si taxadar leh u akhriso.
 \nWaana inaad aqbashaa si [hadii aad damacdo] aad cilad app-ka ah warcelin nooga soo dirto.</string>
@@ -655,4 +655,12 @@
     <string name="title_activity_history">Wixii Hore</string>
     <string name="show_meta_info_summary">Halkan xidh si aad u qariso santuuqyada faahfaahinada yaryarka ah ee xogaha dheeraadka ah ee soosaaraha muuqaalka/dhagaysiga, waxa la daawanayo ama codsi raadin.</string>
     <string name="show_meta_info_title">Faahfaahinta dheeraadka ah</string>
+    <string name="chapters">Cutubyada</string>
+    <string name="description_tab_description">Faahfaahin</string>
+    <string name="related_streams_tab_description">La xidhiidha</string>
+    <string name="comments_tab_description">Faallooyin</string>
+    <string name="show_description_summary">Xidh si aad u qariso faahfaahinta muuqaalka iyo xogaha dheeraadka ah</string>
+    <string name="show_description_title">Tus faahfaahinta</string>
+    <string name="open_with">Ku fur</string>
+    <string name="no_app_to_open_intent">Wax app ah oo kuugu jira mafuri karo midkan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5d53cfc72e1..df644fbf278 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -655,4 +655,12 @@
     <string name="recent">Son</string>
     <string name="show_meta_info_summary">Akış yaratıcısı, akış içeriği veya arama isteğiyle ilgili ek bilgiyi gösteren üst bilgi kutularını gizlemek için kapat.</string>
     <string name="show_meta_info_title">Üst bilgiyi göster</string>
+    <string name="chapters">Bölümler</string>
+    <string name="description_tab_description">Açıklama</string>
+    <string name="related_streams_tab_description">İlgili akışlar</string>
+    <string name="comments_tab_description">Yorumlar</string>
+    <string name="show_description_summary">Video açıklamasını ve ek bilgileri gizlemek için kapatın</string>
+    <string name="show_description_title">Açıklamayı göster</string>
+    <string name="open_with">Birlikte aç</string>
+    <string name="no_app_to_open_intent">Aygıtınızdaki hiçbir uygulama bunu açamıyor</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 996be73473f..d9267e44111 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -631,4 +631,5 @@
     <string name="notification_action_1_title">Кнопка другої дії</string>
     <string name="notification_action_0_title">Кнопка першої дії</string>
     <string name="notification_scale_to_square_image_title">Збільшити мініатюру до масштабу 1:1</string>
+    <string name="open_with">Відкрити за допомогою</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index cd6866e2edd..f5243742012 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">شروع کرنے کے لیے تلاش پر ٹیپ کریں</string>
+    <string name="main_bg_subtitle">شروع کرنے کے لیے \"تلاش\" پر ٹیپ کریں
+\n</string>
     <string name="view_count_text">%1$s ملاحظات</string>
     <string name="upload_date_text">%1$s کو شائع ہوا</string>
     <string name="install">انسٹال</string>
@@ -8,10 +9,10 @@
     <string name="share">اشتراک کریں</string>
     <string name="download">ڈاؤن لوڈ</string>
     <string name="search">تلاش کریں</string>
-    <string name="did_you_mean">کیا آپ کا مطلب یہ ہے: %1$s</string>
+    <string name="did_you_mean">کیا آپ کا مطلب یہ ہے؟: %1$s</string>
     <string name="open_in_browser">براؤزر میں کھولیں</string>
     <string name="settings">ترتیبات</string>
-    <string name="no_player_found">کوئی اسٹریم پلیئر نہیں ملا۔ کیا آپ VLC انسٹال کرنا چاہتے ہیں؟</string>
+    <string name="no_player_found">کوئی اسٹریم پلیئر نہیں ملا۔ VLC انسٹال کریں؟</string>
     <string name="no_player_found_toast">کوئی اسٹریم پلیئر نہیں ملا (آپ VLC انسٹال کر سکتے ہیں)۔</string>
     <string name="open_in_popup_mode">پاپ اپ وضع میں کھولیں</string>
     <string name="controls_download_desc">اسٹریم فائل ڈاؤن لوڈ کریں</string>
@@ -19,9 +20,9 @@
     <string name="choose_browser">براؤزر منتخب کریں</string>
     <string name="screen_rotation">گھماؤ</string>
     <string name="use_external_video_player_title">خارجی ویڈیو پلئیر استعمال کریں</string>
-    <string name="use_external_video_player_summary">کچھ ریزولوشن پر آڈیو ہٹاتا ہے</string>
+    <string name="use_external_video_player_summary">کچھ ریزولوشن پر آڈیو دستیاب نہیں ہوگی.</string>
     <string name="use_external_audio_player_title">خارجی آڈیو پلیر استعمال کریں</string>
-    <string name="popup_mode_share_menu_title">NewPipe پاپ اپ اسلوب</string>
+    <string name="popup_mode_share_menu_title">پوپ اپ اسلوب</string>
     <string name="subscribe_button_title">رکنیت اختیار کریں</string>
     <string name="subscribed_button_title">رکنیت شدہ</string>
     <string name="channel_unsubscribed">چینل کی رکنیت ختم کردی گئی</string>
@@ -46,9 +47,9 @@
     <string name="default_resolution_title">طے شدہ ریزولوشن</string>
     <string name="default_popup_resolution_title">طے شدہ پوپ اپ ریزولوشن</string>
     <string name="show_higher_resolutions_title">اعلیٰ معیارات دکھائیں</string>
-    <string name="show_higher_resolutions_summary">صرف کچھ آلات 2K / 4K ویڈیوز چلانے میں معاون ہیں</string>
+    <string name="show_higher_resolutions_summary">صرف چند آلات 2K/4K ویڈیو چلانے میں معاون ہیں</string>
     <string name="play_with_kodi_title">کوڈی کے ساتھ استعمال کریں</string>
-    <string name="kore_not_found">کور ایپ نہیں ملی۔ اسے انسٹال کریں؟</string>
+    <string name="kore_not_found">لاپتہ کوری ایپ کو انسٹال کریں؟</string>
     <string name="show_play_with_kodi_title">\"کودی کے ساتھ چلائیں\" آپشن دکھائیں</string>
     <string name="show_play_with_kodi_summary">کوڈی کے ذریعے ویڈیو چلانے کا آپشن دکھائیں</string>
     <string name="play_audio">آڈیو</string>
@@ -61,7 +62,7 @@
     <string name="popup_remember_size_pos_title">پاپ اپ جسامت اور مقام کو یاد رکھیں</string>
     <string name="popup_remember_size_pos_summary">پچھلی جسامت اور پوپ اپ کا مقام یاد رکھیں</string>
     <string name="use_inexact_seek_title">بالواسطہ رسائی استعمال کریں</string>
-    <string name="use_inexact_seek_summary">بالواسطہ تلاش مشکلات کو کم کر کے پلیئر کو تیز رفتاری سے مقامات تک رسائی کرنے دیتی ہے</string>
+    <string name="use_inexact_seek_summary">بالواسطہ تلاش مشکلات کو کم کر کے پلیئر کو تیز رفتاری سے مقامات تک رسائی کرنے دیتی ہے۔ 5 ، 15 یا 25 سیکنڈ کی تلاش اس کے ساتھ کام نہیں کرتی ہے۔</string>
     <string name="download_thumbnail_title">نظرِ انگشتی لوڈ کریں</string>
     <string name="download_thumbnail_summary">ڈیٹا کی بچت اور میموری کے استعمال کو روکنے کیلئے نظرِ انگشتی کو بند کریں۔ تبدیلیاں میموری اور آن ڈسک عکس کے کیشے کو صاف کرتی ہیں۔</string>
     <string name="thumbnail_cache_wipe_complete_notice">تصویری کیشے کی صفائی ہوئی</string>
@@ -69,21 +70,21 @@
     <string name="metadata_cache_wipe_summary">ویب پیج کے سبھی کیشے ڈیٹا کو ہٹا دیں</string>
     <string name="metadata_cache_wipe_complete_notice">میٹا ڈیٹا کیشے کی صفائی ہوئی</string>
     <string name="auto_queue_title">اگلا سلسلہ خود قطار</string>
-    <string name="auto_queue_summary">جب دوبارہ نہ چلنے والی قطار میں آخری سلسلہ جاری ہو تو متعلقہ سلسلے کو خود سے شامل کریں</string>
+    <string name="auto_queue_summary">متعلقہ سلسلے کو جوڑ کر پلے بیک کی قطار کو اختتام تک (نہ دہراتے ہوئے) جاری رکھیں</string>
     <string name="player_gesture_controls_title">پلیر اشارہ کنٹرول</string>
-    <string name="player_gesture_controls_summary">اشارے کی چمک اور آواذکو کنٹرول کرنے کے لئے اشاروں کا استعمال کریں</string>
+    <string name="player_gesture_controls_summary">پلئیر کی چمک اور آواز کو کنٹرول کرنے کے لئے اشاروں کا استعمال کریں</string>
     <string name="show_search_suggestions_title">تلاش کے اشارے</string>
     <string name="show_search_suggestions_summary">تلاش کرتے وقت اشارے دکھائیں</string>
     <string name="enable_search_history_title">سرگزشت تلاش کریں</string>
     <string name="enable_search_history_summary">تلاش کے استفسارات کو مقامی طور پر ذخیرہ کریں</string>
     <string name="enable_watch_history_title">دیکھے جانے کی سرگزشت</string>
     <string name="enable_watch_history_summary">دیکھی گئی ویڈیوز کی سرگزشت رکھیں</string>
-    <string name="resume_on_audio_focus_gain_title">فوکس حاصل پر دوبارہ شروع کریں</string>
+    <string name="resume_on_audio_focus_gain_title">دوبارہ چلائیں</string>
     <string name="resume_on_audio_focus_gain_summary">مداخلت کے بعد چلانا جاری رکھیں (مثلاً فون کالز)</string>
     <string name="download_dialog_title">ڈاؤن لوڈ</string>
     <string name="show_next_and_similar_title">\'اگلی\' اور \'ملتی جلتی\' ویڈیوز دکھائیں</string>
     <string name="show_hold_to_append_title">’’شامل کرنے کے لئے پکڑیں‘‘ اشارہ دکھائیں</string>
-    <string name="show_hold_to_append_summary">ویڈیو تفصیلات کے صفحے پر جب پس منظر یا پاپ اپ بٹن دبائے جانے پر ٹپ دکھائیں</string>
+    <string name="show_hold_to_append_summary">ویڈیو کی \"تفصیلات:\" میں پس منظر یا پاپ اپ بٹن دبانے پر اشارے دکھائیں</string>
     <string name="unsupported_url">غیر موافق URL</string>
     <string name="default_content_country_title">مشمولات کا طے شدہ ملک</string>
     <string name="service_title">خدمت</string>
@@ -100,7 +101,7 @@
     <string name="background_player_append">پس منظر پلیئر میں شامل ہوئی</string>
     <string name="popup_playing_append">پاپ اپ پلیئر میں شامل ہوئی</string>
     <string name="content">مشمول</string>
-    <string name="show_age_restricted_content_title">نازیبا مشمولات</string>
+    <string name="show_age_restricted_content_title">عمر کی پابندی والے مواد دکھائیں</string>
     <string name="duration_live">براہ راست</string>
     <string name="downloads">ڈاؤن لوڈز</string>
     <string name="downloads_title">ڈاؤن لوڈز</string>
@@ -130,7 +131,7 @@
     <string name="switch_to_main">مرکزی صفحہ پر جائیں</string>
     <string name="import_data_title">ڈیٹا بیس درآمد کریں</string>
     <string name="export_data_title">ڈیٹا بیس برآمد کریں</string>
-    <string name="import_data_summary">اپنی موجودہ سرگزشت اور رکنیت باطل کریں</string>
+    <string name="import_data_summary">اپنی موجودہ سرگزشت، رکنیت، پلے لسٹ اور ترتیبات (اختیاری) مٹائیں</string>
     <string name="export_data_summary">سرگزشت، رکنیتیں اور پلے لسٹ برآمد کریں</string>
     <string name="general_error">خرابی</string>
     <string name="network_error">نیٹ ورک کی خرابی</string>
@@ -159,11 +160,11 @@
     <string name="no_streams_available_download">کوئی سلسلسہ ڈاؤن لوڈ کرنے کے لئے دستیاب نہیں</string>
     <string name="sorry_string">معذرت، ایسا نہیں ہونا چاہئے تھا۔</string>
     <string name="error_report_button_text">ای میل کے ذریعے غلطی کی اطلاع دیں</string>
-    <string name="error_snackbar_message">معذرت، کچھ خرابی آگئی۔</string>
+    <string name="error_snackbar_message">معذرت، کچھ غلط ہوا۔</string>
     <string name="error_snackbar_action">رپورٹ کریں</string>
     <string name="what_device_headline">معلومات:</string>
     <string name="what_happened_headline">کیا ہوا:</string>
-    <string name="info_labels">کیا ہوا:\\nدرخواست:\\nمواد کی زبان:\\nخدمات:\\nGMT وقت:\\nپیکیج:\\nورژن:\\nاو ایس ورژن:</string>
+    <string name="info_labels">کیا ہوا:\\nدرخواست:\\nمواد کی زبان:\\nملک:\\nایپ کی زبان:\\nسروس:\\nجی ایم ٹٰ:\\nوقت:\\nپیکیج:\\nورژن:\\nآپریٹنگ سسٹم ورزن:</string>
     <string name="your_comment">آپ کا تبصرہ (انگریزی میں):</string>
     <string name="error_details_headline">تفصیلات:</string>
     <string name="list_thumbnail_view_description">ویڈیو پیش منظر انگشتی</string>
@@ -173,17 +174,17 @@
     <string name="detail_dislikes_img_view_description">ناپسندیدگی</string>
     <string name="use_tor_title">Tor کا استعمال</string>
     <string name="use_tor_summary">(تجرباتی) بڑھتی ہوئی رازداری کے لئے ٹور کے ذریعہ ٹریفک کو ڈاؤن لوڈ کرنے پر مجبور کریں (سلسلے کی ویڈیوز ابھی تک غیر موافق ہے)۔</string>
-    <string name="report_error">غلطی کی اطلاع دیں</string>
+    <string name="report_error">خرابی کی اطلاع دیں</string>
     <string name="user_report">صارف رپورٹ</string>
     <string name="search_no_results">کوئی نتائج نہیں</string>
     <string name="empty_subscription_feed_subtitle">یہاں کچھ نہیں سوائے میرے</string>
     <string name="detail_drag_description">دوبارہ ترتیب دینے کیلئے کھینچں</string>
-    <string name="err_dir_create">ڈاؤن لوڈ ڈائریکٹری \'%1$s\' تشکیل نہیں دے سکتے</string>
-    <string name="info_dir_created">ڈاؤن لوڈ ڈائریکٹری \'s\'%1$s بن گئی</string>
+    <string name="err_dir_create">ڈاؤن لوڈ ڈائریکٹری \'%1$s\' نہیں بنا سکتے</string>
+    <string name="info_dir_created">ڈاؤن لوڈ ڈائریکٹری \'%1$s\' بن گئی</string>
     <string name="video">ویڈیو</string>
     <string name="audio">آڈیو</string>
     <string name="retry">دوبارہ کوشش کریں</string>
-    <string name="storage_permission_denied">ذخیرہ رسائی اجازت مسترد</string>
+    <string name="storage_permission_denied">پہلے اسٹوریج تک رسائی دیں</string>
     <string name="short_thousand">ہزار</string>
     <string name="short_million">دہ لاکھ</string>
     <string name="short_billion">ارب</string>
@@ -403,7 +404,7 @@
     <string name="app_update_notification_channel_description">جدید نیو پائپ ورژن کیلئے اطلاعات</string>
     <string name="download_to_sdcard_error_title">بیرونی ذخیرہ دستیاب نہیں</string>
     <string name="download_to_sdcard_error_message">بیرونی ایسڈی کارڈ پر ڈاؤن لوڈ ممکن نہیں۔ ڈاؤن لوڈ فولڈر کے مقام کو دوبارہ ترتیب دیں؟</string>
-    <string name="saved_tabs_invalid_json">پہلے سے طے شدہ ٹیبز کا استعمال، محفوظ ٹیبز کو پڑھنے کے دوران خرابی</string>
+    <string name="saved_tabs_invalid_json">محفوظ شدہ ٹیبز نہیں پڑھ سکے لہذا پہلے سے طے شدہ کا استعمال کر رہے ہیں</string>
     <string name="restore_defaults">طے شدہ بحال کریں</string>
     <string name="restore_defaults_confirmation">کیا آپ پہلے سے طے شدہ کو بحال کرنا چاہتے ہیں؟</string>
     <string name="subscribers_count_not_available">صارفین کا شمار دستیاب نہیں</string>
@@ -451,7 +452,7 @@
     <string name="events">تقریبات</string>
     <string name="conferences">کانفرنسیں</string>
     <string name="show_comments_title">تبصرے دکھائیں</string>
-    <string name="show_comments_summary">تبصرے دکھانا بند کریں</string>
+    <string name="show_comments_summary">تبصرے چھپانے کیلئے بند کریں</string>
     <string name="autoplay_title">آٹوپلے</string>
     <string name="no_comments">کوئی تبصرہ نہیں</string>
     <string name="error_unable_to_load_comments">تبصرے لوڈ نہیں ہو سکے</string>
@@ -504,7 +505,7 @@
     <string name="seek_duration_title">آگے بھگانے /- پیچھے کرنے کی مدت</string>
     <string name="peertube_instance_url_title">پیر ٹیوب واقعات</string>
     <string name="peertube_instance_url_summary">اپنے پسندیدہ پیر ٹیوب کی مثالیں منتخب کریں</string>
-    <string name="peertube_instance_url_help">ایسی مثالوں کی تلاش کریں جو آپ کو %s پر موزوں بنائیں</string>
+    <string name="peertube_instance_url_help">ایسی مثالوں کی تلاش کریں جو آپ %s پر پسند کرتے ہیں</string>
     <string name="peertube_instance_add_title">مثال شامل کریں</string>
     <string name="peertube_instance_add_help">مثال کا URL درج کریں</string>
     <string name="peertube_instance_add_fail">مثال کی توثیق نہیں کی جا سکی</string>
@@ -520,4 +521,57 @@
     <string name="clear_download_history">ڈاؤن لوڈ کی سرگزشت صاف کریں</string>
     <string name="delete_downloaded_files">ڈاؤن لوڈ شدہ فائلیں حذف کریں</string>
     <string name="deleted_downloads">%1$d ڈاؤن لوڈز کو حذف کیا گیا</string>
+    <string name="msg_calculating_hash">ہیش کا حساب لگا رہے ہیں</string>
+    <string name="infinite_videos">∞ ویڈیوز</string>
+    <string name="more_than_100_videos">100 سے زائد ویڈیو</string>
+    <string name="description_tab_description">‪تفصیل</string>
+    <string name="related_streams_tab_description">متعلقہ سلسلے</string>
+    <string name="comments_tab_description">تبصرے</string>
+    <string name="error_report_open_github_notice">براہ کرم چیک کریں کہ آیا آپ کے کریش پر بحث کرنے والا مسئلہ پہلے سے موجود ہے۔ جعلی ٹکٹ تیار کرتے وقت، آپ ہم سے وقت نکالتے ہیں جو ہم اصل مسئلے کو ٹھیک کرنے میں گزار سکتے ہیں۔</string>
+    <string name="error_report_open_issue_button_text">گِٹ ہب میں اطلاع دیں</string>
+    <string name="copy_for_github">فارمیٹڈ رپورٹ کو کاپی کریں</string>
+    <string name="permission_display_over_apps">دوسرے ایپس پر نظر آنے کی اجازت دیں</string>
+    <string name="help">مدد</string>
+    <string name="clear_cookie_summary">ان کوکیز کو صاف کریں جنہیں نیو پائپ ری کیپچا حل کرنے کے دوران جمع کرتا ہے</string>
+    <string name="recaptcha_cookies_cleared">ری کیپچا کوکیز صاف ہوئیں</string>
+    <string name="clear_cookie_title">ری کیپچا کوکیز کو صاف کریں</string>
+    <string name="hash_channel_description">ویڈیو ہیسنگ پیشرفت کے لئے اطلاعات</string>
+    <string name="hash_channel_name">ویڈیو ہیش اطلاع</string>
+    <string name="artists">کردار</string>
+    <string name="albums">البم</string>
+    <string name="songs">گانے</string>
+    <string name="videos_string">ویڈٰو</string>
+    <string name="restricted_video">اس ویڈیو پر عمر کی پابندی ہے۔
+\n
+\nاگر آپ اسے دیکھنا چاہتے ہیں تو ترتیبات میں \"%1$s\" کو آن کریں۔</string>
+    <string name="youtube_restricted_mode_enabled_summary">یوٹیوب ایک \"پابندی والا وضع\" فراہم کرتا ہے جو امکانی طور پر نازیبا مواد کو چھپاتا ہے</string>
+    <string name="youtube_restricted_mode_enabled_title">یوٹیوب کا \"پابندی والا وضع\" چالو کریں</string>
+    <string name="show_age_restricted_content_summary">وہ مواد دکھائیں جو بچوں کے لیے ممکنہ طور پر نا مناسب ہیں کیوں کہ اس میں عمر کی حد ہے (جیسے 18+)</string>
+    <string name="settings_category_notification_title">اطلاع</string>
+    <string name="unsupported_url_dialog_message">URL کو نہیں پہچان سکے۔ کسی اور ایپ کے ساتھ کھولیں؟</string>
+    <string name="auto_queue_toggle">ازخود قطار</string>
+    <string name="show_meta_info_summary">اسٹریم کے موجد، اسٹریم مواد یا تلاش کی درخواست کے بارے میں اضافی معلومات والے میٹا انفارمیشن بکسوں کو چھپانے کیلئے بند کریں۔</string>
+    <string name="show_meta_info_title">میٹا معلومات دکھائیں</string>
+    <string name="show_description_summary">ویڈیو کی تفصیل اور اضافی معلومات کو چھپانے کیلئے بند کریں</string>
+    <string name="show_description_title">تفصیل دکھائیں</string>
+    <string name="clear_queue_confirmation_description">فعال پلیئر کی قطار تبدیل کردی جائے گی</string>
+    <string name="clear_queue_confirmation_summary">ایک پلئیر سے دوسرے میں تبدیل ہونا آپ کی قطار بدل سکتا ہے</string>
+    <string name="clear_queue_confirmation_title">قطار صاف کرنے سے پہلے تصدیق کے لئے پوچھیں</string>
+    <string name="notification_colorize_summary">تھمب نیل میں مرکزی رنگ کے مطابق اینڈروئیڈ کی اطلاع کے رنگ کو حسب منشا بنائیں (واضح ہو کہ یہ تمام آلات پر دستیاب نہیں ہے)</string>
+    <string name="notification_colorize_title">نوٹیفکیشن کو رنگین بنائیں</string>
+    <string name="notification_action_nothing">کچھ نہیں</string>
+    <string name="notification_action_buffering">بفرینگ</string>
+    <string name="notification_action_shuffle">شفل</string>
+    <string name="notification_action_repeat">دوہرائیں</string>
+    <string name="notification_actions_at_most_three">آپ کومپیکٹ نوٹیفکیشن میں زیادہ سے زیادہ تین ایکشن منتخب کرسکتے ہیں!</string>
+    <string name="notification_actions_summary">ذیل میں ہر اطلاع کی کارروائی پر ٹیپ کرکے اس میں ترمیم کریں۔ دائیں طرف کے چیک باکسز کا استعمال کرکے کمپیکٹ نوٹیفکیشن میں دکھائے جانے والے ان میں سے تین تک کا انتخاب کریں۔</string>
+    <string name="notification_action_4_title">پانچواں ایکشن بٹن</string>
+    <string name="notification_action_3_title">چوتھا ایکشن بٹن</string>
+    <string name="notification_action_2_title">تیسرا ایکشن بٹن</string>
+    <string name="notification_action_1_title">دوسرا ایکشن بٹن</string>
+    <string name="notification_action_0_title">پہلا ایکشن بٹن</string>
+    <string name="notification_scale_to_square_image_summary">نوٹیفیکیشن میں دکھائے جانے والے ویڈیو تھمب نیل کو 16: 9 سے 1:1 پہلو تناسب (شاید بگاڑ پیدا ہوسکتا ہے) میں اسکیل کریں</string>
+    <string name="notification_scale_to_square_image_title">تھمب نیل کو 1:1 کی تناسب میں رکھیں</string>
+    <string name="search_showing_result_for">%s کے لئے نتائج دکھا رہا ہے</string>
+    <string name="open_with">کے ساتھ کھولیں</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 057733232ca..66affa458f2 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">Nhấn \"Tìm kiếm\" để tìm kiếm video
+    <string name="main_bg_subtitle">Nhấn \"Tìm kiếm\" để bắt đầu
 \n</string>
     <string name="view_count_text">%1$s lượt xem</string>
     <string name="upload_date_text">Đăng vào %1$s</string>
@@ -214,8 +214,8 @@
     <string name="switch_to_main">Chuyển sang Main</string>
     <string name="import_data_title">Nhập cơ sở dữ liệu</string>
     <string name="export_data_title">Xuất cơ sở dữ liệu</string>
-    <string name="import_data_summary">Ghi đè lịch sử và danh sách đăng ký hiện tại của bạn</string>
-    <string name="export_data_summary">Xuất lịch sử, đăng ký và playlist</string>
+    <string name="import_data_summary">Ghi đè lịch sử, danh sách đăng ký, playlist (và cài đặt, nếu có chọn) hiện tại của bạn</string>
+    <string name="export_data_summary">Xuất lịch sử, danh sách đăng ký, playlist và cài đặt</string>
     <string name="clear_views_history_title">Xóa lịch sử xem</string>
     <string name="clear_views_history_summary">Xóa lịch sử các luồng đã phát và vị trí phát</string>
     <string name="delete_view_history_alert">Xóa toàn bộ lịch sử xem\?</string>
@@ -356,12 +356,14 @@
     <string name="previous_export">Xuất trước</string>
     <string name="subscriptions_import_unsuccessful">Không thể nhập đăng ký</string>
     <string name="subscriptions_export_unsuccessful">Không thể xuất đăng ký</string>
-    <string name="import_youtube_instructions">Nhập danh sách đăng ký YouTube bằng cách tải xuống tệp xuất:
+    <string name="import_youtube_instructions">Nhập danh sách đăng ký YouTube từ một bản Google Takeout:
 \n
-\n1. Truy cập URL này: %1$s
+\n1. Vào URL này: %1$s
 \n2. Đăng nhập khi được yêu cầu
-\n3. Một tệp sẽ được tải về (đó là tệp xuất)
-\n4. Làm theo yêu cầu như màn hình và tải xuống file .json và cho nó vào đây để hoàn tất</string>
+\n3. Nhấn chọn \"Bao gồm tất cả dữ liệu trên YouTube\", sau đó nhấn \"Bỏ chọn tất cả\", sau đó chỉ chọn mục \"đăng kí\" rồi nhấn OK
+\n4. Nhấn nút \"Bước tiếp theo\" rồi nhấn \"Tạo tệp xuất\"
+\n5. Nhấn nút \"Tải xuống\" khi nó hiện
+\n6. Từ file zip mới tải về, trích xuất file .json ra (thường nằm ở đường dẫn \"YouTube và YouTube Music/đăng kí/subscriptions.json\") rồi nhập vào đây.</string>
     <string name="import_soundcloud_instructions">Nhập hồ sơ SoundCloud bằng cách nhập URL hoặc ID của bạn:
 \n
 \n1. Bật \"chế độ màn hình\" trong trình duyệt web (trang web không khả dụng cho thiết bị di động)
@@ -543,7 +545,7 @@
     <string name="videos_string">Video</string>
     <string name="restricted_video">Video này bị giới hạn độ tuổi.
 \n
-\nBật \"Cho phép nội dung giới hạn độ tuổi\" trong cài đặt nếu bạn muốn xem video này.</string>
+\nBật \"%1$s\" trong cài đặt nếu bạn muốn xem video này.</string>
     <string name="youtube_restricted_mode_enabled_title">hế độ giới hạn YouTube</string>
     <string name="peertube_instance_add_https_only">Chỉ URL HTTPS được hỗ trợ</string>
     <string name="peertube_instance_url_summary">Chọn thực thể PeerTube ưa thích</string>
@@ -627,7 +629,7 @@
     <string name="search_showing_result_for">Hiện kết quả cho: %s</string>
     <string name="enqueue_stream">Hàng</string>
     <string name="show_age_restricted_content_summary">Hiển thị nội dung không an toàn cho trẻ em vì có giới hạn độ tuổi (+18)</string>
-    <string name="show_thumbnail_summary">Hiển thị hình thu nhỏ trong màn hình khoá dưới dạng nền và đặt trong thanh thông báo</string>
+    <string name="show_thumbnail_summary">Hiện ảnh thu nhỏ (thumbnail) trên nền màn hình khóa và trong thông báo</string>
     <string name="show_thumbnail_title">Xem hình thu nhỏ</string>
     <string name="show_memory_leaks">Kiểm tra bộ</string>
     <string name="enqueued">Hàng</string>
@@ -637,4 +639,18 @@
     <string name="youtube_restricted_mode_enabled_summary">YouTube cung cấp \"Chế độ hạn chế\" để ẩn nội dung người lớn</string>
     <string name="notification_colorize_summary">Yêu cầu Android tùy chỉnh màu của thông báo theo màu chính của video, có thể không khả dụng trong vài thiết bị</string>
     <string name="notification_colorize_title">àu thông báo</string>
+    <string name="no_app_to_open_intent">Không có ứng dụng nào trên thiết bị của bạn có thể mở cái này</string>
+    <string name="chapters">Chương</string>
+    <string name="recent">Gần đây</string>
+    <string name="msg_calculating_hash">Đang tính toán hash</string>
+    <string name="description_tab_description">Mô tả</string>
+    <string name="related_streams_tab_description">Stream liên quan</string>
+    <string name="comments_tab_description">Bình luận</string>
+    <string name="hash_channel_description">Thông báo cho quá trình hash video</string>
+    <string name="hash_channel_name">Thông báo hash video</string>
+    <string name="show_meta_info_summary">Tắt tùy chọn này để ẩn các hộp thông tin meta chứa thông tin về tác giả/nội dung của stream, hoặc yêu cầu tìm kiếm.</string>
+    <string name="show_meta_info_title">Hiện thông tin meta</string>
+    <string name="show_description_summary">Tắt tùy chọn này để ẩn mô tả video và các thông tin khác</string>
+    <string name="show_description_title">Hiện mô tả</string>
+    <string name="open_with">Mở bằng</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ce243d6d4d5..1c6566ba382 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -645,4 +645,12 @@
     <string name="recent">最近</string>
     <string name="show_meta_info_summary">關閉以隱藏帶有關於串流建立者、串流內容或搜尋請求等額外資料的詮釋資料框。</string>
     <string name="show_meta_info_title">顯示詮釋資訊</string>
+    <string name="chapters">章節</string>
+    <string name="description_tab_description">描述</string>
+    <string name="related_streams_tab_description">相關的串流</string>
+    <string name="comments_tab_description">留言</string>
+    <string name="show_description_summary">關閉以隱藏影片描述與其他資訊</string>
+    <string name="show_description_title">顯示描述</string>
+    <string name="open_with">開啟以</string>
+    <string name="no_app_to_open_intent">您裝置上沒有應用程式可以打開這個</string>
 </resources>
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar/changelogs/963.txt b/fastlane/metadata/android/ar/changelogs/963.txt
new file mode 100644
index 00000000000..b559079ff33
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/963.txt
@@ -0,0 +1,8 @@
+• دعم إضافي للفصول في ضوابط المشغل
+• [PeerTube] تمت إضافة بحث بني داكن
+• إعادة إضافة زر المشاركة في عرض تفاصيل الفيديو ونقل وصف الدفق إلى تخطيط علامة التبويب
+• تعطيل استعادة السطوع إذا تم تعطيل إيماءة السطوع
+• تمت إضافة عنصر قائمة لتشغيل الفيديو على kodi
+• تم إصلاح التعطل عند عدم تعيين متصفح افتراضي على بعض الأجهزة وتحسين مربعات حوار المشاركة
+• تبديل التشغيل / الإيقاف المؤقت باستخدام زر مساحة الجهاز في مشغل ملء الشاشة
+• [media.ccc.de] إصلاحات وتحسينات مختلفة
diff --git a/fastlane/metadata/android/ckb/changelogs/960.txt b/fastlane/metadata/android/ckb/changelogs/960.txt
new file mode 100644
index 00000000000..4b36edb3878
--- /dev/null
+++ b/fastlane/metadata/android/ckb/changelogs/960.txt
@@ -0,0 +1,4 @@
+• وەسفی باشترکراو بۆ هەڵبژاردەی بنکەی زانیاری هەناردەکردن لە ڕێکخستنەکان.
+• شیکردنەوەی سەرنجەکانی یووتیووب چاککراو.
+• ناوی پیشاندانی چاککراو media.ccc.de خزمەتگوزاری.
+• وەرگێڕانە نوێیەکان.
diff --git a/fastlane/metadata/android/el/changelogs/962.txt b/fastlane/metadata/android/el/changelogs/962.txt
new file mode 100644
index 00000000000..ded7619141d
--- /dev/null
+++ b/fastlane/metadata/android/el/changelogs/962.txt
@@ -0,0 +1,2 @@
+Προστέθηκε "πρόσφατα" βίντεο στην υπηρεσία media.ccc.de.
+Προστέθηκε ζωντανή ροή στην υπηρεσία media.ccc.de και επίσης υποστήριξη ζωντανής ροής.
diff --git a/fastlane/metadata/android/eu/changelogs/963.txt b/fastlane/metadata/android/eu/changelogs/963.txt
new file mode 100644
index 00000000000..a7aead6954c
--- /dev/null
+++ b/fastlane/metadata/android/eu/changelogs/963.txt
@@ -0,0 +1,8 @@
+• Kapituluen euskarria gehitu
+• [PeerTube] Sepia bilaketa gehitu
+• Bideoaren xehetasunetan partekatzeko botoia gehitu eta jarioen deskribapena fitxetara mugitu
+• Desgaitu distira berrezartzea keinua desgaituta badago
+• Kodi-n bideoa erreproduzitzeko zerrenda-elementua gehitu
+• Lehenetsitako arakatzailerik ez zeukaten gailuetan hutsegitea konpondu eta partekatzeko elkarrizketak hobetu
+• Erreproduzitu/pausatu erreproduzitzailean hardware espazio botoiarekin
+• [media.ccc.de] Hainbat hobekuntza
diff --git a/fastlane/metadata/android/he/changelogs/951.txt b/fastlane/metadata/android/he/changelogs/951.txt
new file mode 100644
index 00000000000..db440ae0e64
--- /dev/null
+++ b/fastlane/metadata/android/he/changelogs/951.txt
@@ -0,0 +1,17 @@
+חדש
+• הוספת חיפוש לבורר המינויים בדו־שיח קבוצת ההזנות
+• הוספת מסנן לדו־שיח קבוצת ההזנות כדי להציג מינויים בלתי מקובצים בלבד
+• הוספת לשונית רשימת נגינה לעמוד הראשי
+• הרצה מהירה קדימה/אחורה בתור נגן צף/רקע
+• הצגת הצעות חיפוש: למה התכוונת ומוצגות תוצאות עבור
+
+שיפורים
+• השמטת כתיבת נתוני על של יישומון בקבצים מרובבים
+• תזרימים שנכשלו לא יוסרו מהתור
+• צבע שורת המצב תואם לצבע סרגל הכלים
+
+תיקונים
+• תוקן סנכרון שמע/וידאו שנגרם עקב שגיאות נקודה צפה מצטברות
+• [PeerTube] טיפול בהערות שנמחקו
+
+ועוד
diff --git a/fastlane/metadata/android/he/changelogs/963.txt b/fastlane/metadata/android/he/changelogs/963.txt
new file mode 100644
index 00000000000..70086a768b3
--- /dev/null
+++ b/fastlane/metadata/android/he/changelogs/963.txt
@@ -0,0 +1,8 @@
+• נוספה תמיכה בפרקים בפקדי הנגינה
+• [PeerTube] נוסף חיפוש Sepia
+• כפתור השיתוף נוסף מחדש לתצוגת פרטי הווידאו ותיאור התזרים הועבר לפריסת הלשונית
+• השבתת שחזור בהירות אם מחוות הבהירות מושבתת
+• נוסף פריט ברשימה לנגן את הסרטון בקודי
+• תוקנה קריסה כאשר לא מוגדר דפדפן בררת מחדל בחלק מהמכשירים ושיפור דו־שיח השיתוף
+• החלפת נגינה/השהיה בכפתור רווח חומרתי בנגן במסך מלא
+• [media.ccc.de] מגוון תיקונים ושיפורים
diff --git a/fastlane/metadata/android/he/short_description.txt b/fastlane/metadata/android/he/short_description.txt
index 5d49b39e618..f2815eacd5a 100644
--- a/fastlane/metadata/android/he/short_description.txt
+++ b/fastlane/metadata/android/he/short_description.txt
@@ -1 +1 @@
-מנשק משתמש חופשי וקליל ל־YouTube עבור Android.
+מנשק משתמש חופשי ופשוט ל־YouTube עבור Android.
diff --git a/fastlane/metadata/android/it/changelogs/963.txt b/fastlane/metadata/android/it/changelogs/963.txt
new file mode 100644
index 00000000000..3cf4689bdf3
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/963.txt
@@ -0,0 +1,8 @@
+• I capitoli sono ora supportati nei controlli del riproduttore video
+• [PeerTube] Aggiunta la ricerca Sepia
+• Riaggiunto il bottone di condivisione e migliorate le schede nella pagina dei dettagli del video
+• Non ripristinare la luminosità se il gesto è disabilitato
+• Aggiunta un'azione rapida per riprodurre su kodi
+• Miglioramenti e sistemazione di bug per i menu di condivisione
+• Con il video è a schermo intero, metti in pausa o riproduci premendo spazio
+• [media.ccc.de] Miglioramenti vari
diff --git a/fastlane/metadata/android/ja/changelogs/955.txt b/fastlane/metadata/android/ja/changelogs/955.txt
index eab8f1d9df9..18eeb55791b 100644
--- a/fastlane/metadata/android/ja/changelogs/955.txt
+++ b/fastlane/metadata/android/ja/changelogs/955.txt
@@ -1,3 +1,3 @@
 [YouTube] いくつかのユーザー向けに検索を修正
-[YouTube] ランダムな復号化の除外を修正
+[YouTube] ランダムな復号化の例外を修正
 [SoundCloud] スラッシュで終わるURLが正しく解析されるようになりました
diff --git a/fastlane/metadata/android/ja/changelogs/960.txt b/fastlane/metadata/android/ja/changelogs/960.txt
new file mode 100644
index 00000000000..d2473698d50
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/960.txt
@@ -0,0 +1,4 @@
+• 設定でデータベースエクスポート選択の説明を改善。
+• YouTube コメントの解析を修正。
+• media.ccc.de サービスの表示名を修正。
+• 翻訳の更新。
diff --git a/fastlane/metadata/android/lv/full_description.txt b/fastlane/metadata/android/lv/full_description.txt
new file mode 100644
index 00000000000..4e9e29670ad
--- /dev/null
+++ b/fastlane/metadata/android/lv/full_description.txt
@@ -0,0 +1 @@
+NewPipe neizmanto nekādas Google bibliotēkas vai YouTube API. Tā tikai apstrāda vietni lai iegūtu nepieciešamo informāciju. Tāpēc šo lietotni var izmantot ierīces kurām nav Google pakalpojumi uzstadīti. Arī nav nepieciešams YouTube konts lai izmantotu NewPipe, un tas ir FLOSS.
diff --git a/fastlane/metadata/android/lv/short_description.txt b/fastlane/metadata/android/lv/short_description.txt
new file mode 100644
index 00000000000..1446ab9dee9
--- /dev/null
+++ b/fastlane/metadata/android/lv/short_description.txt
@@ -0,0 +1 @@
+Viegla bezmaksas YouTube aplikācija priekš Android.
diff --git a/fastlane/metadata/android/nb-NO/changelogs/963.txt b/fastlane/metadata/android/nb-NO/changelogs/963.txt
new file mode 100644
index 00000000000..2b17cb420ad
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/963.txt
@@ -0,0 +1,7 @@
+* Tillagt støtte for kapittel i avspillerkontroller
+* [PeerTube] Tillagt Sepia-søk
+* La til delingsknapp igjen i detaljvisning og flyttet strøm-beskrivelse inn i fanedesignet
+* Tillagt element for avspilling av video på Kodi
+* Fikset krasj når ingen forvalgt nettleser er satt på noen enheter og forbedring av delingsdialoger
+* Veksle spill/pause med maskinvaremellomromstast i fullskjermsspiller
+* [media.ccc.de] Forskjellige fikser og forbedringer
diff --git a/fastlane/metadata/android/so/short_description.txt b/fastlane/metadata/android/so/short_description.txt
index de3d3d12d76..d46b3dfb0d1 100644
--- a/fastlane/metadata/android/so/short_description.txt
+++ b/fastlane/metadata/android/so/short_description.txt
@@ -1 +1 @@
-Barnaamij YouTube fudud oo bilaash ah oo loogu talagalay Android.
+YouTube fudud oo bilaash ah oo loogu talagalay Android.
diff --git a/fastlane/metadata/android/tr/changelogs/961.txt b/fastlane/metadata/android/tr/changelogs/961.txt
new file mode 100644
index 00000000000..31699a22c88
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] Mix desteği
+• [YouTube] Genel yayıncılar ve Covid-19 hakkındaki bilgileri görüntüle
+• [media.ccc.de] Son videolar eklendi
+• Somalice çeviri eklendi
+
+• Birçok dahili iyileştirme
+
+• Oynatıcı içinden video paylaşımı düzeltildi
+• Boş ReCaptcha webview düzeltildi
+• Listeden bir akışı kaldırırken meydana gelen çökme düzeltildi
+• [PeerTube] İlgili akışlar düzeltildi
+• [YouTube] YouTube Music araması düzeltildi
diff --git a/fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
new file mode 100644
index 00000000000..ddc451baafc
--- /dev/null
+++ b/fastlane/metadata/android/uk/short_description.txt
@@ -0,0 +1 @@
+Безкоштовний та легкий YouTube інтерфейс для Android.
diff --git a/fastlane/metadata/android/vi/changelogs/63.txt b/fastlane/metadata/android/vi/changelogs/63.txt
new file mode 100644
index 00000000000..4816a755dd5
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/63.txt
@@ -0,0 +1,8 @@
+### Cải thiện
+- Nhập/xuất cài đặt #1333
+- Giảm thiểu overdraw (cải thiện hiệu năng) #1371
+- Một chút cải thiện code #1375
+- Thêm thông tin về GDPR #1420
+
+### Sửa lỗi
+- Trình tải: Sửa lỗi crash khi nạp các file .giga chưa tải về xong
diff --git a/fastlane/metadata/android/vi/changelogs/64.txt b/fastlane/metadata/android/vi/changelogs/64.txt
new file mode 100644
index 00000000000..f7062be1075
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/64.txt
@@ -0,0 +1,8 @@
+### Cải thiện
+- Thêm tính năng giới hạn độ phân giải video nếu đang xài dữ liệu di động #1339
+- Ghi nhớ độ sáng màn hình trong phiên #1442
+- Cải thiện hiệu năng của trình tải cho các CPU yếu #1431
+- Hỗ trợ cho media session #1433
+
+### Sửa lỗi
+- Sửa lỗi crash khi mở các file tải về (bản sửa lỗi này giờ đã có trên các build release) #1441
diff --git a/fastlane/metadata/android/vi/changelogs/730.txt b/fastlane/metadata/android/vi/changelogs/730.txt
new file mode 100644
index 00000000000..cc9f7181dad
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/730.txt
@@ -0,0 +1,2 @@
+# Sửa lỗi
+- Hotfix tiếp lỗi không thể giải mã.
diff --git a/fastlane/metadata/android/vi/changelogs/770.txt b/fastlane/metadata/android/vi/changelogs/770.txt
new file mode 100644
index 00000000000..59fdcf50222
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/770.txt
@@ -0,0 +1,4 @@
+Thay đổi trong phiên bản 0.17.2
+
+Sửa lỗi
+• Sửa lỗi không có video nào
diff --git a/fastlane/metadata/android/vi/changelogs/820.txt b/fastlane/metadata/android/vi/changelogs/820.txt
new file mode 100644
index 00000000000..f048433771f
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/820.txt
@@ -0,0 +1 @@
+Sửa regex trong hàm giải mã đang làm cho phần YouTube không xài được.
diff --git a/fastlane/metadata/android/vi/changelogs/830.txt b/fastlane/metadata/android/vi/changelogs/830.txt
new file mode 100644
index 00000000000..79fdedd55de
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/830.txt
@@ -0,0 +1 @@
+Cập nhật phần client_id của SoundCloud để sửa lỗi liên quan tới SoundCloud.
diff --git a/fastlane/metadata/android/vi/changelogs/850.txt b/fastlane/metadata/android/vi/changelogs/850.txt
new file mode 100644
index 00000000000..2353a0e7938
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/850.txt
@@ -0,0 +1 @@
+Giao diện của trang web YouTube đã được cập nhật khi phiên bản này đã được release. Giao diện trang YouTube cũ sẽ không còn vào được từ tháng 3, vì vậy bạn phải cập nhật NewPipe.
diff --git a/fastlane/metadata/android/vi/changelogs/870.txt b/fastlane/metadata/android/vi/changelogs/870.txt
new file mode 100644
index 00000000000..fc7616c0bea
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/870.txt
@@ -0,0 +1,2 @@
+Đây là bản hotfix cập nhật NewPipe để sửa lỗi dịch vụ SoundCloud.
+API v2 của SoundCloud sẽ được dùng trong phần extractor; khả năng phát hiện client ID không hợp lệ đã được cải thiện.
diff --git a/fastlane/metadata/android/vi/changelogs/910.txt b/fastlane/metadata/android/vi/changelogs/910.txt
new file mode 100644
index 00000000000..a53b411b10d
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/910.txt
@@ -0,0 +1 @@
+Sửa lỗi nhập database dẫn tới chặn NewPipe chạy trong một số trường hợp hiếm gặp.
diff --git a/fastlane/metadata/android/vi/changelogs/950.txt b/fastlane/metadata/android/vi/changelogs/950.txt
new file mode 100644
index 00000000000..5356b238ee5
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/950.txt
@@ -0,0 +1,4 @@
+Bản cập nhật này có ba phần sửa lỗi nhỏ:
+• Sửa lỗi quyền truy cập bộ nhớ trên Android 10+
+• Sửa lỗi mở các trang kiosk
+• Sửa lỗi parse độ dài video cho các video dài
diff --git a/fastlane/metadata/android/vi/changelogs/955.txt b/fastlane/metadata/android/vi/changelogs/955.txt
new file mode 100644
index 00000000000..8c5afd9ad12
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/955.txt
@@ -0,0 +1,3 @@
+[YouTube] Sửa lỗi tìm kiếm cho một số người dùng
+[YouTube] Sửa lỗi xuất hiện ngẫu nhiên cho hàm giải mã
+[SoundCloud] URL kết thúc với dấu gạch chéo (/) giờ đã parse được
diff --git a/fastlane/metadata/android/vi/changelogs/956.txt b/fastlane/metadata/android/vi/changelogs/956.txt
new file mode 100644
index 00000000000..7b06ec6f251
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/956.txt
@@ -0,0 +1 @@
+[YouTube] Sửa lỗi crash khi mở bất kì video nào
diff --git a/fastlane/metadata/android/vi/changelogs/959.txt b/fastlane/metadata/android/vi/changelogs/959.txt
new file mode 100644
index 00000000000..f3190a4d2c0
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/959.txt
@@ -0,0 +1,3 @@
+Sửa lỗi crash vô tận sau khi mở trình báo lỗi.
+Cập nhật danh sách instance PeerTube có thể tự động mở được bằng NewPipe.
+Cập nhật các bản dịch.
diff --git a/fastlane/metadata/android/vi/changelogs/960.txt b/fastlane/metadata/android/vi/changelogs/960.txt
new file mode 100644
index 00000000000..c4ca525f4aa
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/960.txt
@@ -0,0 +1,4 @@
+• Sửa phần mô tả tính năng xuất database trong cài đặt.
+• Sửa lỗi parse phần comment trên YouTube.
+• Sửa lỗi tên hiển thị trên media.ccc.de.
+• Cập nhật các bản dịch.
diff --git a/fastlane/metadata/android/vi/changelogs/961.txt b/fastlane/metadata/android/vi/changelogs/961.txt
new file mode 100644
index 00000000000..82ecff7fae6
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] Hỗ trợ playlist Mix
+• [YouTube] Hiện thông tin về các nhà đài và COVID-19
+• [media.ccc.de] Thêm mục gần đây
+• Hỗ trợ ngôn ngữ Somali
+
+• Nhiều cải thiện phía sau nền
+
+• Sửa lỗi chia sẻ video trong chính trình phát
+• Sửa lỗi trang ReCaptcha trống
+• Sửa lỗi khi loại bỏ một stream khỏi danh sách
+• [PeerTube] Sửa lỗi các stream liên quan
+• [YouTube] Sửa lỗi tìm kiếm YouTube Music
diff --git a/fastlane/metadata/android/vi/changelogs/962.txt b/fastlane/metadata/android/vi/changelogs/962.txt
new file mode 100644
index 00000000000..16a57f167a8
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/962.txt
@@ -0,0 +1,2 @@
+Thêm mục "video gần đây" cho media.ccc.de.
+Hỗ trợ live stream nói chung và cho media.ccc.de.
diff --git a/fastlane/metadata/android/vi/changelogs/963.txt b/fastlane/metadata/android/vi/changelogs/963.txt
new file mode 100644
index 00000000000..aea1c7c9956
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/963.txt
@@ -0,0 +1,8 @@
+• Hỗ trợ chapter trong bảng điều khiển trình phát
+• [PeerTube] Thêm trình search Sepia
+• Thêm lại nút share trong giao diện chi tiết video; chuyển mô tả stream vào tab layout
+• Tắt khôi phục độ sáng màn hình nếu cử chỉ chỉnh độ sáng đã tắt
+• Thêm danh sách mục phát video cho Kodi
+• Sửa lỗi crash khi không có trình duyệt mặc định được chọn trên một số thiết bị; cải thiện menu chia sẻ
+• Nhấn phát/dừng trong trình phát toàn màn hình bằng phím cách vật lý
+• [media.ccc.de] Sửa lỗi và cải thiện chung
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/963.txt b/fastlane/metadata/android/zh_Hans/changelogs/963.txt
new file mode 100644
index 00000000000..dc34da41a41
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/963.txt
@@ -0,0 +1,8 @@
+•增加 播放器控件中的章节(chapter)支持
+•[PeerTube]添加 Sepia搜索
+•恢复 视频详情中的共享按钮，并将视频描述移至选项卡布局中
+•若禁用了亮度手势，则禁用亮度恢复功能
+•添加 在kodi上播放视频的列表选项
+•修复 在某些设备上未设置默认浏览器并改善共享对话框时崩溃的问题
+•在全屏播放器中支持使用“硬件(如部分键盘/耳机)”按钮播放/暂停
+•[media.ccc.de]各种修复和改进
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/963.txt b/fastlane/metadata/android/zh_Hant/changelogs/963.txt
new file mode 100644
index 00000000000..7ceb6025061
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hant/changelogs/963.txt
@@ -0,0 +1,8 @@
+• 在播放器控制中新增對章節的支援
+• [PeerTube] 新增 Sepia 搜尋
+• 在影片詳細資訊檢視中重新加入了分享按鈕，並將串流描述移動到分頁佈局中
+• 如果停用亮度手勢，則停用亮度復原
+• 新增在 kodi 上播放影片的列表項目
+• 修復了某些裝置上未設定預設瀏覽器會當機的臭蟲，並改善了分享對話框
+• 在全螢幕播放器中使用硬體 space 按鈕切換播放／暫停
+• [media.ccc.de] 許多修復與改善

From 1e5dc018259fa6c3f8b284d05d2978528b978190 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 12 Feb 2021 10:54:16 +0100
Subject: [PATCH 127/131] Fix tab layout visibility with age restricted videos

Add comments
---
 .../fragments/detail/VideoDetailFragment.java | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index cb4cfb8b6bd..28ea336434c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -580,6 +580,7 @@ private void toggleTitleAndSecondaryControls() {
                     Player.DEFAULT_CONTROLS_DURATION, 0);
             binding.detailSecondaryControlPanel.setVisibility(View.GONE);
         }
+        // view pager height has changed, update the tab layout
         updateTabLayoutVisibility();
     }
 
@@ -650,6 +651,7 @@ protected void initListeners() {
             // prevent useless updates to tab layout visibility if nothing changed
             if (verticalOffset != lastAppBarVerticalOffset) {
                 lastAppBarVerticalOffset = verticalOffset;
+                // the view was scrolled
                 updateTabLayoutVisibility();
             }
         });
@@ -952,6 +954,7 @@ private void initTabs() {
             }
             updateTabIconsAndContentDescriptions();
         }
+        // the page adapter now contains tabs: show the tab layout
         updateTabLayoutVisibility();
     }
 
@@ -974,12 +977,10 @@ private void updateTabIconsAndContentDescriptions() {
     private void updateTabs(@NonNull final StreamInfo info) {
         if (showRelatedStreams) {
             if (binding.relatedStreamsLayout == null) { // phone
-                pageAdapter.updateItem(RELATED_TAB_TAG,
-                        RelatedVideosFragment.getInstance(info));
+                pageAdapter.updateItem(RELATED_TAB_TAG, RelatedVideosFragment.getInstance(info));
             } else { // tablet + TV
                 getChildFragmentManager().beginTransaction()
-                        .replace(R.id.relatedStreamsLayout,
-                                RelatedVideosFragment.getInstance(info))
+                        .replace(R.id.relatedStreamsLayout, RelatedVideosFragment.getInstance(info))
                         .commitAllowingStateLoss();
                 binding.relatedStreamsLayout.setVisibility(
                         player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
@@ -987,10 +988,12 @@ private void updateTabs(@NonNull final StreamInfo info) {
         }
 
         if (showDescription) {
-            pageAdapter.updateItem(DESCRIPTION_TAB_TAG,
-                    new DescriptionFragment(info));
+            pageAdapter.updateItem(DESCRIPTION_TAB_TAG, new DescriptionFragment(info));
         }
 
+        binding.viewPager.setVisibility(View.VISIBLE);
+        // make sure the tab layout is visible
+        updateTabLayoutVisibility();
         pageAdapter.notifyDataSetUpdate();
         updateTabIconsAndContentDescriptions();
     }
@@ -1007,9 +1010,12 @@ private boolean shouldShowComments() {
     }
 
     public void updateTabLayoutVisibility() {
-        if (pageAdapter.getCount() < 2) {
+        if (pageAdapter.getCount() < 2 || binding.viewPager.getVisibility() != View.VISIBLE) {
+            // hide tab layout if there is only one tab or if the view pager is also hidden
             binding.tabLayout.setVisibility(View.GONE);
         } else {
+            // call `post()` to be sure `viewPager.getHitRect()`
+            // is up to date and not being currently recomputed
             binding.tabLayout.post(() -> {
                 if (getContext() != null) {
                     final Rect pagerHitRect = new Rect();
@@ -1020,7 +1026,7 @@ public void updateTabLayoutVisibility() {
                             WindowManager.class)).getDefaultDisplay().getSize(displaySize);
 
                     final int viewPagerVisibleHeight = displaySize.y - pagerHitRect.top;
-                    // see TabLayout.DEFAULT_HEIGHT
+                    // see TabLayout.DEFAULT_HEIGHT, which is equal to 48dp
                     final float tabLayoutHeight = TypedValue.applyDimension(
                             TypedValue.COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics());
 
@@ -1030,6 +1036,7 @@ public void updateTabLayoutVisibility() {
                                 Math.max(0, tabLayoutHeight * 3 - viewPagerVisibleHeight));
                         binding.tabLayout.setVisibility(View.VISIBLE);
                     } else {
+                        // view pager is not visible enough
                         binding.tabLayout.setVisibility(View.GONE);
                     }
                 }
@@ -1039,6 +1046,7 @@ public void updateTabLayoutVisibility() {
 
     public void scrollToTop() {
         binding.appBarLayout.setExpanded(true, true);
+        // notify tab layout of scrolling
         updateTabLayoutVisibility();
     }
 

From 138513d790bc6f19cb0d516f43311e3b24383cfc Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 14 Feb 2021 13:40:17 +0100
Subject: [PATCH 128/131] Hide tab layout view pager on error

---
 .../fragments/detail/VideoDetailFragment.java | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 28ea336434c..ba45d4f5cec 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -33,7 +33,6 @@
 import android.widget.RelativeLayout;
 
 import androidx.annotation.AttrRes;
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -1329,13 +1328,21 @@ private void setErrorImage(final int imageResource) {
 
     @Override
     public void showError(final String message, final boolean showRetryButton) {
-        showError(message, showRetryButton, R.drawable.not_available_monkey);
+        super.showError(message, showRetryButton);
+        setErrorImage(R.drawable.not_available_monkey);
+
+        if (binding.relatedStreamsLayout != null) { // hide related streams for tablets
+            binding.relatedStreamsLayout.setVisibility(View.INVISIBLE);
+        }
+
+        // hide comments / related streams / description tabs
+        binding.viewPager.setVisibility(View.GONE);
+        binding.tabLayout.setVisibility(View.GONE);
     }
 
-    protected void showError(final String message, final boolean showRetryButton,
-                             @DrawableRes final int imageError) {
-        super.showError(message, showRetryButton);
-        setErrorImage(imageError);
+    private void hideAgeRestrictedContent() {
+        showError(getString(R.string.restricted_video,
+                getString(R.string.show_age_restricted_content_title)), false);
     }
 
     private void setupBroadcastReceiver() {
@@ -1560,18 +1567,6 @@ public void handleResult(@NonNull final StreamInfo info) {
                 noVideoStreams ? R.drawable.ic_headset_shadow : R.drawable.ic_play_arrow_shadow);
     }
 
-    private void hideAgeRestrictedContent() {
-        showError(getString(R.string.restricted_video,
-                getString(R.string.show_age_restricted_content_title)), false);
-
-        if (binding.relatedStreamsLayout != null) { // tablet
-            binding.relatedStreamsLayout.setVisibility(View.INVISIBLE);
-        }
-
-        binding.viewPager.setVisibility(View.GONE);
-        binding.tabLayout.setVisibility(View.GONE);
-    }
-
     private void displayUploaderAsSubChannel(final StreamInfo info) {
         binding.detailSubChannelTextView.setText(info.getUploaderName());
         binding.detailSubChannelTextView.setVisibility(View.VISIBLE);

From f1e1f6424a177a18b7db7eecdfeff6051f3255d9 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 14 Feb 2021 22:03:34 +0100
Subject: [PATCH 129/131] Update translations

Added translation using Weblate (Swahili)
Added translation using Weblate (Sicilian)

Translated using Weblate (Greek)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Santali)

Currently translated at 12.8% (80 of 624 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (624 of 624 strings)

Translated using Weblate (Bengali (Bangladesh))

Currently translated at 63.6% (397 of 624 strings)
---
 app/src/main/res/values-bn-rBD/strings.xml |  2 +-
 app/src/main/res/values-el/strings.xml     | 24 ++++++++++++----------
 app/src/main/res/values-pt/strings.xml     | 12 +++++------
 app/src/main/res/values-sat/strings.xml    | 15 +++++++-------
 app/src/main/res/values-scn/strings.xml    |  2 ++
 app/src/main/res/values-sw/strings.xml     |  2 ++
 6 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/values-scn/strings.xml
 create mode 100644 app/src/main/res/values-sw/strings.xml

diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 2e9432588e7..f4081b1f074 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -321,7 +321,7 @@
     <string name="recaptcha_done_button">হয়েছে</string>
     <string name="events">ইভেন্টগুলো</string>
     <string name="settings_category_updates_title">আপডেট</string>
-    <string name="minimize_on_exit_none_description">না</string>
+    <string name="minimize_on_exit_none_description">কোনটি না</string>
     <string name="accept">স্বীকার করো</string>
     <string name="decline">অস্বীকার করো</string>
     <string name="caption_setting_title">ক্যাপশন</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 3703c35db9f..955833246e3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -4,8 +4,8 @@
     <string name="upload_date_text">Δημοσιεύθηκε στις %1$s</string>
     <string name="no_player_found">Δε βρέθηκε πρόγραμμα αναπαραγωγής. Εγκατάσταση του VLC;</string>
     <string name="install">Εγκατάσταση</string>
-    <string name="cancel">Ακύρωση</string>
-    <string name="open_in_browser">Άνοιγμα στο πρόγραμμα περιήγησης ιστού</string>
+    <string name="cancel">Άκυρο</string>
+    <string name="open_in_browser">Άνοιγμα σε πρόγραμμα περιήγησης</string>
     <string name="share">Κοινοποίηση</string>
     <string name="download">Λήψη</string>
     <string name="search">Αναζήτηση</string>
@@ -237,7 +237,7 @@
     <string name="dismiss">Αγνόηση</string>
     <string name="rename">Μετονομασία</string>
     <string name="add">Νέα αποστολή</string>
-    <string name="finish">ΟΚ</string>
+    <string name="finish">Εντάξει</string>
     <string name="msg_name">Όνομα αρχείου</string>
     <string name="msg_threads">Νήματα</string>
     <string name="msg_server_unsupported">Ο εξυπηρετητής δεν υποστηρίζεται</string>
@@ -267,7 +267,7 @@
     <string name="contribution_title">Συνεισφέρετε</string>
     <string name="contribution_encouragement">Αν έχετε ιδέες για μετάφραση, αλλαγή σχεδιασμού, εκκαθάριση ή ριζικές αλλαγές κώδικα της εφαρμογής, η βοήθεια σας είναι πάντα ευπρόσδεκτη. Όσο περισσότερη έχουμε, τόσο καλύτεροι γινόμαστε!</string>
     <string name="view_on_github">Δείτε το στο GitHub</string>
-    <string name="donation_title">Κάντε μια δωρεά</string>
+    <string name="donation_title">Δωρεά</string>
     <string name="donation_encouragement">Το NewPipe αναπτύσσεται από εθελοντές που δαπανούν τον ελεύθερο χρόνο τους για να σας προσφέρουν τη βέλτιστη δυνατή εμπειρία χρήστη. Ανταποδώστε το, για να βοηθήσετε τους προγραμματιστές του NewPipe να το κάνουν ακόμα καλύτερο, όσο απολαμβάνουν ένα φλιτζάνι καφέ.</string>
     <string name="give_back">Προσφέρετε</string>
     <string name="website_title">Ιστότοπος</string>
@@ -575,13 +575,15 @@
     <string name="notification_scale_to_square_image_summary">Κλιμάκωση της μικρογραφίας βίντεο που εμφανίζεται στην ειδοποίηση από 16:9 σε αναλογία διαστάσεων 1:1 (μπορεί να προκαλέσει παραμορφώσεις)</string>
     <string name="notification_scale_to_square_image_title">Κλιμάκωση μικρογραφίας σε αναλογία διαστάσεων 1:1</string>
     <string name="notification_action_buffering">Φόρτωση</string>
-    <string name="feed_use_dedicated_fetch_method_help_text">Πιστεύετε ότι η ροή φορτώνει πολύ αργά; Δοκιμάστε να ενεργοποιήσετε τη γρήγορη φόρτωση (από τις ρυθμίσεις ή το παρακάτω κουμπί).
+    <string name="feed_use_dedicated_fetch_method_help_text">Πιστεύετε ότι η ροή φορτώνει πολύ αργά; Δοκιμάστε να ενεργοποιήσετε τη γρήγορη φόρτωση (από τις ρυθμίσεις ή πατώντας το παρακάτω κουμπί).
 \n
-\nΤο NewPipe προσφέρει δύο στρατηγικές φόρτωσης:
-\n- Λήψη ολόκληρου του καναλιού της συνδρομής, η οποία είναι αργή αλλά πλήρης.
-\n- Χρήση ενός αποκλειστικού τελικού σημείου υπηρεσίας, η οποία είναι γρήγορη αλλά συνήθως όχι πλήρης.
+\nΤο NewPipe προσφέρει δύο στρατηγικές φόρτωσης ροής:
+\n- Λήψη ολόκληρου του καναλιού συνδρομής, το οποίο είναι αργό αλλά πλήρες.
+\n- Χρήση ενός αποκλειστικού τελικού σημείου υπηρεσίας, το οποίο είναι γρήγορο αλλά συνήθως δεν είναι πλήρες.
 \n
-\nΤο YouTube είναι ένα παράδειγμα χρήσης της δεύτερης μεθόδου.
+\nΗ διαφορά μεταξύ των δύο είναι ότι η γρήγορη συνήθως στερείται κάποιες πληροφορίες, όπως η διάρκεια ή ο τύπος του στοιχείου (δεν μπορεί να διακρίνει μεταξύ ζωντανών βίντεο και κανονικών) και μπορεί να επιστρέψει λιγότερα στοιχεία.
+\n
+\nΤο YouTube είναι ένα παράδειγμα υπηρεσίας της γρήγορης μεθόδου με τη ροή RSS.
 \n
 \nΣυνεπώς επιλέγετε ανάλογα: ταχύτητα ή ακριβείς πληροφορίες.</string>
     <string name="feed_oldest_subscription_update">Η ροή ανανεώθηκε: %s</string>
@@ -625,7 +627,7 @@
     <string name="autoplay_summary">Αυτόματη έναρξη αναπαραγωγής — %s</string>
     <string name="show_original_time_ago_summary">Τα αυθεντικά κείμενα των υπηρεσιών θα εμφανίζονται στα αντικείμενα ροής</string>
     <string name="show_memory_leaks">Εμφάνιση διαρροών μνήμης</string>
-    <string name="unmute">Αποσίγαση</string>
+    <string name="unmute">Κατάργηση σίγασης</string>
     <string name="enqueued">Προστέθηκε στην ουρά</string>
     <string name="enqueue_stream">Προσθήκη στην ουρά</string>
     <string name="most_liked">Πιο αγαπημένα</string>
@@ -642,7 +644,7 @@
     <string name="peertube_instance_url_help">Βρείτε τα instances που σας αρέσουν στο %s</string>
     <string name="peertube_instance_url_summary">Επιλογή των αγαπημένων σας PeerTube instances</string>
     <string name="show_original_time_ago_title">Εμφάνιση αυθεντικού παρελθόντος χρόνου στα αντικείμενα</string>
-    <string name="peertube_instance_url_title">PeerTube instances</string>
+    <string name="peertube_instance_url_title">Στιγμιότυπα PeerTube</string>
     <string name="notification_colorize_title">Χρωματισμός ειδοποιήσεων</string>
     <string name="notification_colorize_summary">Επιτρέπει στο Android να τροποποιήσει το χρώμα της ειδοποίησης, σύμφωνα με το κύριο χρώμα του εικονιδίου (δεν διατίθεται σε όλες τις συσκευές)</string>
     <string name="show_thumbnail_summary">Χρήση των εικονιδίων στην οθόνη κλειδώματοςως φόντο και στις ειδοποιήσεις</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a5e4f393d18..429d4c78f55 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -333,7 +333,7 @@
 \n6. A partir do zip descarregado extraia o ficheiro .json (normalmente em \"YouTube e YouTube Music/subscriptions/subscriptions.json\") e importe-o aqui.</string>
     <string name="import_soundcloud_instructions">Importe o seu perfil SoundCloud digitando o URL ou a ID.:
 \n
-\n1. Ative o modo desktop do seu navegador web (o site não está disponível para aparelhos móveis)
+\n1. Ative o modo desktop do seu navegador web (o site não está disponível para dispositivos móveis)
 \n2. Aceda a este URL: %1$s
 \n3. Inicie a sessão
 \n4. Copie o URL do seu perfil.</string>
@@ -606,7 +606,7 @@
     <string name="video_detail_by">Por %s</string>
     <string name="channel_created_by">Criado por %s</string>
     <string name="detail_sub_channel_thumbnail_view_description">Miniatura do avatar do canal</string>
-    <string name="feed_group_show_only_ungrouped_subscriptions">Mostrar apenas assinaturas não agrupadas</string>
+    <string name="feed_group_show_only_ungrouped_subscriptions">Mostrar apenas subscrições não agrupadas</string>
     <string name="playlist_page_summary">Página da lista de reprodução</string>
     <string name="no_playlist_bookmarked_yet">Ainda não há listas de reprodução favoritas</string>
     <string name="select_a_playlist">Selecione uma lista de reprodução</string>
@@ -652,10 +652,10 @@
     <string name="msg_calculating_hash">A calcular \'hash\'</string>
     <string name="hash_channel_description">Notificar sobre o progresso das \'hash\' de vídeos</string>
     <string name="hash_channel_name">Notificação \'hash\' do vídeo</string>
-    <string name="recent">Recente</string>
-    <string name="show_meta_info_summary">Desligue para ocultar caixas de informações meta com informações adicionais sobre o criador do fluxo, conteúdo de fluxo ou uma solicitação de pesquisa.</string>
-    <string name="show_meta_info_title">Mostrar informação meta</string>
-    <string name="no_app_to_open_intent">Isto não pode ser aberto por nenhuma app neste aparelho</string>
+    <string name="recent">Recentes</string>
+    <string name="show_meta_info_summary">Desative para ocultar as caixas com informações adicionais acerca do criador, do conteúdo ou de um pedido de pesquisa.</string>
+    <string name="show_meta_info_title">Mostrar meta-informação</string>
+    <string name="no_app_to_open_intent">Não possui qualquer aplicação para abrir este ficheiro</string>
     <string name="chapters">Capítulos</string>
     <string name="description_tab_description">Descrição</string>
     <string name="related_streams_tab_description">Emissões relacionadas</string>
diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml
index 620654c25d2..6a5441869fb 100644
--- a/app/src/main/res/values-sat/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -13,11 +13,11 @@
     <string name="view_count_text">%1$s ᱧᱮᱞᱠᱚ</string>
     <string name="main_bg_subtitle">ᱮᱦᱲᱵ ᱞᱟᱹᱜᱤᱫ \"ᱥᱮᱸᱫᱽᱨᱟ\" ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ
 \n</string>
-    <string name="use_external_video_player_title">ᱵᱟᱦᱨᱮ ᱣᱤᱰᱤᱭᱚ ᱯᱞᱮᱭᱟᱹᱨ ᱵᱮᱵᱷᱟᱨ ᱢᱮᱸ</string>
+    <string name="use_external_video_player_title">ᱵᱟᱦᱨᱮ ᱣᱤᱰᱤᱭᱚ ᱯᱞᱮᱭᱟᱹᱨ ᱵᱮᱵᱷᱟᱨ ᱢᱮ</string>
     <string name="search_showing_result_for">ᱛᱮᱞᱟ ᱫᱮᱠᱷᱟᱣᱜᱽ ᱠᱟᱱᱟᱺ%s</string>
     <string name="did_you_mean">ᱟᱢᱟᱜ ᱚᱨᱛᱷᱚ \"%1$s\" ᱥᱮ\?</string>
-    <string name="controls_download_desc">ᱥᱴᱨᱤᱢ ᱨᱮᱫ ᱰᱟᱩᱱᱞᱳᱰ ᱢᱮᱸ</string>
-    <string name="open_in_popup_mode">ᱯᱚᱯᱚᱯ ᱢᱳᱰ ᱨᱮ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮᱸ</string>
+    <string name="controls_download_desc">ᱥᱴᱨᱤᱢ ᱨᱮᱫ ᱰᱟᱩᱱᱞᱳᱰ ᱢᱮ</string>
+    <string name="open_in_popup_mode">ᱯᱚᱯᱚᱯ ᱢᱳᱰ ᱨᱮ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
     <string name="no_player_found_toast">ᱚᱠᱟ ᱥᱴᱨᱤᱢ ᱯᱞᱮᱭᱟᱹᱨ ᱵᱟᱭ ᱧᱟᱢ ᱞᱮᱱᱟ (ᱟᱢ VLC ᱯᱞᱮᱭᱟᱹᱨ ᱵᱚᱦᱟᱞ ᱠᱟᱛᱮ ᱚᱱᱟ ᱨᱮ ᱯᱞᱮ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱢ)᱾</string>
     <string name="no_player_found">ᱚᱠᱟ ᱥᱴᱨᱤᱢ ᱯᱞᱮᱭᱟᱹᱨ ᱵᱟᱭ ᱧᱟᱢ ᱞᱮᱱᱟ ᱾ VLC ᱵᱚᱦᱟᱞ ᱟᱢ ᱥᱮ\?</string>
     <string name="upload_date_text">%1$s ᱨᱮ ᱩᱪᱷᱟᱹᱱ ᱮᱱᱟ</string>
@@ -27,19 +27,19 @@
     <string name="subscription_change_failed">ᱥᱟᱹᱵᱥᱠᱨᱭᱤᱯᱥᱚᱱ ᱵᱚᱫᱚᱞ ᱵᱟᱭ ᱜᱟᱱᱟᱜᱽ ᱠᱟᱱᱟ</string>
     <string name="channel_unsubscribed">ᱪᱟᱱᱱᱮᱹᱞ ᱟᱹᱱᱥᱟᱹᱵᱥᱠᱨᱟᱭᱤᱵᱽ ᱮᱱᱟ</string>
     <string name="popup_mode_share_menu_title">ᱯᱚᱯᱟᱹᱯ ᱢᱳᱰ</string>
-    <string name="use_external_audio_player_title">ᱵᱟᱦᱨᱮ ᱟᱹᱰᱤᱭᱚ ᱯᱞᱮᱭᱟᱹᱨ ᱵᱮᱵᱽᱦᱟᱨ ᱢᱮᱸ</string>
+    <string name="use_external_audio_player_title">ᱵᱟᱦᱨᱮ ᱟᱹᱰᱤᱭᱚ ᱯᱞᱮᱭᱟᱹᱨ ᱵᱮᱵᱽᱦᱟᱨ ᱢᱮ</string>
     <string name="tab_new">ᱱᱟᱶᱟ ᱴᱮᱵ</string>
     <string name="tab_bookmarks">ᱵᱩᱻᱠᱢᱟᱨᱠ ᱯᱞᱮᱞᱤᱥᱴ ᱠᱚ</string>
     <string name="tab_subscriptions">ᱥᱟᱹᱵᱥᱠᱨᱤᱯᱥᱚᱱ ᱠᱚ</string>
     <string name="tab_main">ᱢᱩᱞ</string>
-    <string name="show_info">ᱤᱱᱯᱷᱚ ᱫᱮᱠᱷᱟᱣ ᱢᱮᱸ</string>
+    <string name="show_info">ᱤᱱᱯᱷᱚ ᱫᱮᱠᱷᱟᱣ ᱢᱮ</string>
     <string name="subscription_update_failed">ᱥᱟᱹᱵᱥᱠᱨᱤᱯᱥᱚᱱ ᱵᱟᱝ ᱟᱹᱯᱰᱮᱴ ᱜᱟᱱᱚᱜᱽ ᱱᱟᱠᱟ</string>
     <string name="use_external_video_player_summary">ᱥᱟᱲᱮ ᱠᱚ ᱛᱤᱱᱟᱹᱝ ᱜᱟᱱ ᱨᱤᱡᱚᱞᱭᱩᱥᱚᱱ ᱠᱚ ᱴᱷᱮᱱ ᱚᱪᱚᱜᱽ ᱟᱭ</string>
     <string name="download_path_title">ᱣᱤᱰᱤᱭᱚ ᱰᱟᱩᱱᱞᱳᱰ ᱯᱚᱴᱚᱢ</string>
-    <string name="controls_add_to_playlist_title">ᱥᱮᱞᱮᱫᱽ ᱢᱮᱸ</string>
+    <string name="controls_add_to_playlist_title">ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
     <string name="controls_popup_title">ᱯᱳᱯᱟᱹᱯ</string>
     <string name="controls_background_title">ᱵᱮᱠᱜᱨᱟᱩᱸᱰ</string>
-    <string name="tab_choose">ᱴᱮᱵᱽ ᱪᱚᱭᱚᱱ ᱢᱮᱸ</string>
+    <string name="tab_choose">ᱴᱮᱵᱽ ᱵᱟᱪᱷᱟᱣᱢᱮ</string>
     <string name="download_path_summary">ᱰᱟᱩᱱᱞᱳᱰ ᱠᱟᱱ ᱣᱤᱰᱤᱭᱚ ᱨᱮᱫ ᱱᱚᱰᱮ ᱫᱚᱦᱚᱜᱼᱟ</string>
     <string name="show_higher_resolutions_title">ᱡᱟᱹᱥᱛᱤ ᱨᱤᱡᱽᱚᱞᱭᱩᱥᱚᱱ ᱫᱮᱠᱷᱟᱣᱢᱮ</string>
     <string name="default_popup_resolution_title">ᱢᱩᱞ ᱯᱷᱮᱲᱟᱛ ᱯᱚᱯ-ᱚᱯ ᱨᱤᱡᱽᱚᱞᱭᱩᱥᱚᱱ</string>
@@ -54,4 +54,5 @@
     <string name="play_with_kodi_title">Kodi ᱥᱟᱞᱟᱜ ᱪᱟᱹᱞᱩᱭ ᱢᱮ</string>
     <string name="show_higher_resolutions_summary">ᱠᱷᱟᱹᱞᱤ ᱛᱤᱱᱟᱹᱝ ᱜᱟᱱ ᱥᱟᱫᱷᱚᱱ ᱢᱮᱱᱟᱜᱼᱟ ᱚᱠᱟ ᱫᱚ 2K/4K ᱣᱤᱰᱤᱭᱚ ᱠᱚ ᱪᱟᱹᱞᱩ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱭ</string>
     <string name="open_with">ᱥᱟᱞᱟᱜ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
+    <string name="kore_not_found">Kore ᱮᱯ ᱵᱟᱭ ᱧᱟᱢ ᱞᱮᱱᱟ, ᱵᱚᱦᱟᱞ ᱟ ᱥᱮ\?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-scn/strings.xml b/app/src/main/res/values-scn/strings.xml
new file mode 100644
index 00000000000..a6b3daec935
--- /dev/null
+++ b/app/src/main/res/values-scn/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
new file mode 100644
index 00000000000..a6b3daec935
--- /dev/null
+++ b/app/src/main/res/values-sw/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 45b703daf662b4b95fc77ec53ecb7c8a023290ad Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 14 Feb 2021 22:12:47 +0100
Subject: [PATCH 130/131] Update extractor version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 968ce2c333f..13e33c727c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:d116680ea365e1c0768c131279b1d6ea90208742'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.20.10'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From 3e50466024861d37afade53fd02ec13f8f2a5837 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 14 Feb 2021 21:53:03 +0100
Subject: [PATCH 131/131] Release 0.20.10 (964)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 13e33c727c3..c2ca07b66b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 963
-        versionName "0.20.9"
+        versionCode 964
+        versionName "0.20.10"
 
         multiDexEnabled true