From 2e771cd65ab1eff2cb090351a4083d1d129fe53a Mon Sep 17 00:00:00 2001
From: GGAutomaton <32899400+GGAutomaton@users.noreply.github.com>
Date: Mon, 4 Apr 2022 23:58:39 +0800
Subject: [PATCH 01/28] Fix crash when rotating device on unsupported channels

---
 .../fragments/list/channel/ChannelFragment.java     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 869503b5bed..6ad81132002 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
@@ -77,6 +77,8 @@ public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, Channe
     private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
 
+    private boolean channelContentNotSupported;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -130,6 +132,9 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         channelBinding = FragmentChannelBinding.bind(rootView);
+        if (channelContentNotSupported) {
+            showContentNotSupported();
+        }
     }
 
     @Override
@@ -524,9 +529,15 @@ public void handleResult(@NonNull final ChannelInfo result) {
             playlistControlBinding.getRoot().setVisibility(View.GONE);
         }
 
+        channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {
             if (throwable instanceof ContentNotSupportedException) {
-                showContentNotSupported();
+                /*
+                channelBinding might not be initialized when handleResult() is called
+                (e.g. after rotating the screen, https://github.com/TeamNewPipe/NewPipe/issues/6696)
+                showContentNotSupported() will be called later
+                 */
+                channelContentNotSupported = true;
             }
         }
 

From 8ea98b64aa81ac15f3d01e2764be38b50220644e Mon Sep 17 00:00:00 2001
From: LingYinTianMeng <2632252014@qq.com>
Date: Sun, 17 Apr 2022 22:23:03 +0800
Subject: [PATCH 02/28] fix issue #7563

---
 .../local/playlist/LocalPlaylistFragment.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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 0eb56d7169c..7cd2a3ec169 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
@@ -414,14 +414,21 @@ public void removeWatchedStreams(final boolean removePartiallyWatched) {
                     } else {
                         final Iterator<StreamStateEntity> streamStatesIter = recordManager
                                 .loadLocalStreamStateBatch(playlist).blockingGet().iterator();
-
                         while (playlistIter.hasNext()) {
                             final PlaylistStreamEntry playlistItem = playlistIter.next();
                             final int indexInHistory = Collections.binarySearch(historyStreamIds,
                                     playlistItem.getStreamId());
-
-                            final boolean hasState = streamStatesIter.next() != null;
-                            if (indexInHistory < 0 || hasState) {
+                            final StreamStateEntity streamStateEntity = streamStatesIter.next();
+                            final long duration = playlistItem.toStreamInfoItem().getDuration();
+                            boolean isFinished = false;
+                            if (streamStateEntity != null) {
+                                isFinished = streamStateEntity.isFinished(duration);
+                            }
+                            final boolean isNotWatchedItem = (streamStateEntity != null
+                                    && !isFinished);
+                            if (indexInHistory < 0) {
+                                notWatchedItems.add(playlistItem);
+                            } else if (isNotWatchedItem) {
                                 notWatchedItems.add(playlistItem);
                             } else if (!thumbnailVideoRemoved
                                     && playlistManager.getPlaylistThumbnail(playlistId)

From 047fe21c143fd945de34aa01c5efa4df033cb977 Mon Sep 17 00:00:00 2001
From: kt programs <ktprograms@gmail.com>
Date: Sat, 30 Apr 2022 17:43:30 +0800
Subject: [PATCH 03/28] Fix hiding player controls when playing from media
 button

DefaultControlDispatcher was removed in ExoPlayer 2.16.0, so the class
extending it that handled play/pause was removed in #8020.

The new solution is to use an instance of ForwardingPlayer. Call
sessionConnector.setPlayer with an instance of ForwardingPlayer that
overrides play() and pause() and calls the callback methods.
---
 .../newpipe/player/helper/MediaSessionManager.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
index c12ba754ad4..a8735dc08bc 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
@@ -13,6 +13,7 @@
 import androidx.annotation.Nullable;
 import androidx.media.session.MediaButtonReceiver;
 
+import com.google.android.exoplayer2.ForwardingPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 
@@ -55,7 +56,17 @@ public MediaSessionManager(@NonNull final Context context,
 
         sessionConnector = new MediaSessionConnector(mediaSession);
         sessionConnector.setQueueNavigator(new PlayQueueNavigator(mediaSession, callback));
-        sessionConnector.setPlayer(player);
+        sessionConnector.setPlayer(new ForwardingPlayer(player) {
+            @Override
+            public void play() {
+                callback.play();
+            }
+
+            @Override
+            public void pause() {
+                callback.pause();
+            }
+        });
     }
 
     @Nullable

From a67927c29ce5e3f60ed628fb307bda3333e28774 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 1 May 2022 21:56:49 +0200
Subject: [PATCH 04/28] Fix dialogs having incorrect color when opened via
 RouterActivity

---
 app/src/main/res/values/styles.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7c126558079..894e70bad92 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -131,10 +131,6 @@
     </style>
 
     <style name="RouterActivityThemeLight" parent="LightTheme">
-        <item name="colorPrimary">@android:color/transparent</item>
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="colorAccent">@android:color/transparent</item>
-
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -143,10 +139,6 @@
     </style>
 
     <style name="RouterActivityThemeDark" parent="DarkTheme">
-        <item name="colorPrimary">@android:color/transparent</item>
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="colorAccent">@android:color/transparent</item>
-
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>

From 6f0942ac6e20e17f593a6fb6935ad003fd8bd3f1 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 1 May 2022 21:58:20 +0200
Subject: [PATCH 05/28] Make sure Routeractivity does the same as MainActivity

---
 app/src/main/java/org/schabi/newpipe/RouterActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index adef3c0e4ba..d1c5c851152 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -2,6 +2,7 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.annotation.SuppressLint;
 import android.app.IntentService;
@@ -127,8 +128,10 @@ protected void onCreate(final Bundle savedInstanceState) {
             }
         }
 
+        ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
+        assureCorrectAppLanguage(this);
     }
 
     @Override

From e40e86500b7058ec2ff2b214aa365b1f4db60a62 Mon Sep 17 00:00:00 2001
From: Mamadou WAGUE <mamadou.wague03@etud.univ-paris8.fr>
Date: Mon, 2 May 2022 14:52:43 +0200
Subject: [PATCH 06/28] Fixed viewed counting

---
 .../newpipe/database/history/model/StreamHistoryEntity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
index ad1941adbd0..712ee4047df 100644
--- a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
@@ -51,7 +51,7 @@ public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime a
 
     @Ignore
     public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate) {
-        this(streamUid, accessDate, 1);
+        this(streamUid, accessDate, 0);
     }
 
     public long getStreamUid() {

From 50739277c42252eb41b406f5c6e5e45155082c15 Mon Sep 17 00:00:00 2001
From: LingYinTianMeng <95514488+LingYinTianMeng@users.noreply.github.com>
Date: Tue, 3 May 2022 09:21:43 +0800
Subject: [PATCH 07/28] Update LocalPlaylistFragment.java

---
 .../newpipe/local/playlist/LocalPlaylistFragment.java  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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 7cd2a3ec169..ab9d9a9b90c 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
@@ -420,15 +420,7 @@ public void removeWatchedStreams(final boolean removePartiallyWatched) {
                                     playlistItem.getStreamId());
                             final StreamStateEntity streamStateEntity = streamStatesIter.next();
                             final long duration = playlistItem.toStreamInfoItem().getDuration();
-                            boolean isFinished = false;
-                            if (streamStateEntity != null) {
-                                isFinished = streamStateEntity.isFinished(duration);
-                            }
-                            final boolean isNotWatchedItem = (streamStateEntity != null
-                                    && !isFinished);
-                            if (indexInHistory < 0) {
-                                notWatchedItems.add(playlistItem);
-                            } else if (isNotWatchedItem) {
+                            if (indexInHistory < 0 || (streamStateEntity != null && !streamStateEntity.isFinished(duration))) {
                                 notWatchedItems.add(playlistItem);
                             } else if (!thumbnailVideoRemoved
                                     && playlistManager.getPlaylistThumbnail(playlistId)

From c2762d3b5ec72c7188e97c9449e5d93cf68488ea Mon Sep 17 00:00:00 2001
From: LingYinTianMeng <95514488+LingYinTianMeng@users.noreply.github.com>
Date: Tue, 3 May 2022 09:37:35 +0800
Subject: [PATCH 08/28] Update LocalPlaylistFragment.java

---
 .../schabi/newpipe/local/playlist/LocalPlaylistFragment.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ab9d9a9b90c..5c97d768122 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
@@ -420,7 +420,8 @@ public void removeWatchedStreams(final boolean removePartiallyWatched) {
                                     playlistItem.getStreamId());
                             final StreamStateEntity streamStateEntity = streamStatesIter.next();
                             final long duration = playlistItem.toStreamInfoItem().getDuration();
-                            if (indexInHistory < 0 || (streamStateEntity != null && !streamStateEntity.isFinished(duration))) {
+                            if (indexInHistory < 0 || (streamStateEntity != null
+                                    && !streamStateEntity.isFinished(duration))) {
                                 notWatchedItems.add(playlistItem);
                             } else if (!thumbnailVideoRemoved
                                     && playlistManager.getPlaylistThumbnail(playlistId)

From c2bf7f09ceb635cae8f42b82d8af0424a4fcce1a Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Tue, 3 May 2022 21:42:09 +0200
Subject: [PATCH 09/28] Fixed accidental reset of ``PlaybackParameterDialog``
 on initialization

---
 .../newpipe/player/helper/PlaybackParameterDialog.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 7220335d182..19a5a645bbe 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
@@ -213,7 +213,7 @@ private void initUI() {
 
         getPitchControlModeComponentMappings()
                 .forEach(this::setupPitchControlModeTextView);
-        changePitchControlMode(isCurrentPitchControlModeSemitone());
+        // Initialization is done at the end
 
         // Pitch - Percent
         setText(binding.pitchPercentMinimumText, PlayerHelper::formatPitch, MIN_PITCH_OR_SPEED);
@@ -275,6 +275,9 @@ private void initUI() {
             skipSilence = isChecked;
             updateCallback();
         });
+
+        // PitchControlMode has to be initialized at the end because it requires the unhookCheckbox
+        changePitchControlMode(isCurrentPitchControlModeSemitone());
     }
 
     // -- General formatting --

From 34468c16addb6f82b006ad0ed2a33cf4fef5d6b8 Mon Sep 17 00:00:00 2001
From: GGAutomaton <32899400+GGAutomaton@users.noreply.github.com>
Date: Wed, 4 May 2022 23:34:07 +0800
Subject: [PATCH 10/28] Show "content not supported" if needed

---
 .../list/channel/ChannelFragment.java          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 6ad81132002..0f268410b22 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
@@ -132,9 +132,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         channelBinding = FragmentChannelBinding.bind(rootView);
-        if (channelContentNotSupported) {
-            showContentNotSupported();
-        }
+        showContentNotSupportedIfNeeded();
     }
 
     @Override
@@ -532,12 +530,8 @@ public void handleResult(@NonNull final ChannelInfo result) {
         channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {
             if (throwable instanceof ContentNotSupportedException) {
-                /*
-                channelBinding might not be initialized when handleResult() is called
-                (e.g. after rotating the screen, https://github.com/TeamNewPipe/NewPipe/issues/6696)
-                showContentNotSupported() will be called later
-                 */
                 channelContentNotSupported = true;
+                showContentNotSupportedIfNeeded();
             }
         }
 
@@ -569,7 +563,13 @@ channelBinding might not be initialized when handleResult() is called
         });
     }
 
-    private void showContentNotSupported() {
+    private void showContentNotSupportedIfNeeded() {
+        // channelBinding might not be initialized when handleResult() is called
+        // (e.g. after rotating the screen, #6696)
+        if (!channelContentNotSupported || channelBinding == null) {
+            return;
+        }
+
         channelBinding.errorContentNotSupported.setVisibility(View.VISIBLE);
         channelBinding.channelKaomoji.setText("(︶︹︺)");
         channelBinding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);

From 1e2d76a686b095a65f8052f68e4bbc12625a2108 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Wed, 4 May 2022 19:09:41 +0200
Subject: [PATCH 11/28] Use non-static method

---
 app/src/main/java/org/schabi/newpipe/RouterActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index d1c5c851152..22e84e93dfb 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -2,7 +2,6 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.annotation.SuppressLint;
 import android.app.IntentService;
@@ -73,6 +72,7 @@
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 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.ThemeHelper;
@@ -131,7 +131,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
-        assureCorrectAppLanguage(this);
+        Localization.assureCorrectAppLanguage(this);
     }
 
     @Override

From c2a3c1cb8fff5c040d4095a449c7089e9d2e91ec Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Wed, 4 May 2022 19:19:45 +0200
Subject: [PATCH 12/28] Add comment that explains why 0 is used

Co-authored-by: Stypox <stypox@pm.me>
---
 .../newpipe/database/history/model/StreamHistoryEntity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
index 712ee4047df..8d703301bdb 100644
--- a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
@@ -51,7 +51,7 @@ public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime a
 
     @Ignore
     public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate) {
-        this(streamUid, accessDate, 0);
+        this(streamUid, accessDate, 0); // start with 0 views (adding views will be done elsewhere)
     }
 
     public long getStreamUid() {

From 59d8c570b7412c9fac30ca02ad4d1f1049ad14df Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 5 May 2022 18:04:33 +0200
Subject: [PATCH 13/28] Readd spaces

---
 .../schabi/newpipe/local/playlist/LocalPlaylistFragment.java    | 2 ++
 1 file changed, 2 insertions(+)

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 5c97d768122..6023d4b10af 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
@@ -414,12 +414,14 @@ public void removeWatchedStreams(final boolean removePartiallyWatched) {
                     } else {
                         final Iterator<StreamStateEntity> streamStatesIter = recordManager
                                 .loadLocalStreamStateBatch(playlist).blockingGet().iterator();
+
                         while (playlistIter.hasNext()) {
                             final PlaylistStreamEntry playlistItem = playlistIter.next();
                             final int indexInHistory = Collections.binarySearch(historyStreamIds,
                                     playlistItem.getStreamId());
                             final StreamStateEntity streamStateEntity = streamStatesIter.next();
                             final long duration = playlistItem.toStreamInfoItem().getDuration();
+
                             if (indexInHistory < 0 || (streamStateEntity != null
                                     && !streamStateEntity.isFinished(duration))) {
                                 notWatchedItems.add(playlistItem);

From 238aff7c31549717753b7f42d14f2ab0d5b650ff Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 6 May 2022 10:38:47 +0200
Subject: [PATCH 14/28] channelContentNotSupported false by default

---
 .../schabi/newpipe/fragments/list/channel/ChannelFragment.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0f268410b22..4f70df6f4f3 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
@@ -77,7 +77,7 @@ public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, Channe
     private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
 
-    private boolean channelContentNotSupported;
+    private boolean channelContentNotSupported = false;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views

From 71e46d1eca9133434730cef295453ca3e0e4e394 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 6 May 2022 10:40:08 +0200
Subject: [PATCH 15/28] Do not call showContentNotSupportedIfNeeded multiple
 times

---
 .../schabi/newpipe/fragments/list/channel/ChannelFragment.java   | 1 +
 1 file changed, 1 insertion(+)

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 4f70df6f4f3..fa8f5fdbd96 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
@@ -532,6 +532,7 @@ public void handleResult(@NonNull final ChannelInfo result) {
             if (throwable instanceof ContentNotSupportedException) {
                 channelContentNotSupported = true;
                 showContentNotSupportedIfNeeded();
+                break;
             }
         }
 

From 1d69bd48beb9df0e5761c80f0ab4e7bae38900a4 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 28 Nov 2021 16:13:14 +0100
Subject: [PATCH 16/28] Moved import/export options to menu

---
 .../subscription/SubscriptionFragment.kt      | 121 ++++++++++-------
 .../subscription/item/FeedImportExportItem.kt | 122 ------------------
 .../res/layout/feed_import_export_group.xml   | 114 ----------------
 .../subscription_import_export_item.xml       |  32 -----
 4 files changed, 73 insertions(+), 316 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
 delete mode 100644 app/src/main/res/layout/feed_import_export_group.xml
 delete mode 100644 app/src/main/res/layout/subscription_import_export_item.xml

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 008228083ad..a980e940c40 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
@@ -1,24 +1,24 @@
 package org.schabi.newpipe.local.subscription
 
 import android.app.Activity
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
-import android.content.IntentFilter
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.SubMenu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.xwray.groupie.Group
 import com.xwray.groupie.GroupAdapter
@@ -34,7 +34,9 @@ import org.schabi.newpipe.databinding.FeedItemCarouselBinding
 import org.schabi.newpipe.databinding.FragmentSubscriptionBinding
 import org.schabi.newpipe.error.ErrorInfo
 import org.schabi.newpipe.error.UserAction
+import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
+import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.fragments.BaseStateFragment
 import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.local.subscription.SubscriptionViewModel.SubscriptionState
@@ -45,13 +47,10 @@ import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem
 import org.schabi.newpipe.local.subscription.item.FeedGroupAddItem
 import org.schabi.newpipe.local.subscription.item.FeedGroupCardItem
 import org.schabi.newpipe.local.subscription.item.FeedGroupCarouselItem
-import org.schabi.newpipe.local.subscription.item.FeedImportExportItem
 import org.schabi.newpipe.local.subscription.item.HeaderWithMenuItem
 import org.schabi.newpipe.local.subscription.item.HeaderWithMenuItem.Companion.PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM
 import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService
-import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService.EXPORT_COMPLETE_ACTION
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
-import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.IMPORT_COMPLETE_ACTION
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE
@@ -65,6 +64,7 @@ import org.schabi.newpipe.util.external_communication.ShareUtils
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import java.util.function.Supplier
 
 class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     private var _binding: FragmentSubscriptionBinding? = null
@@ -74,12 +74,9 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     private lateinit var subscriptionManager: SubscriptionManager
     private val disposables: CompositeDisposable = CompositeDisposable()
 
-    private var subscriptionBroadcastReceiver: BroadcastReceiver? = null
-
     private val groupAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>()
     private val feedGroupsSection = Section()
     private var feedGroupsCarousel: FeedGroupCarouselItem? = null
-    private lateinit var importExportItem: FeedImportExportItem
     private lateinit var feedGroupsSortMenuItem: HeaderWithMenuItem
     private val subscriptionsSection = Section()
 
@@ -94,9 +91,6 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     @State
     @JvmField
     var feedGroupsListState: Parcelable? = null
-    @State
-    @JvmField
-    var importExportItemExpandedState: Boolean? = null
 
     init {
         setHasOptionsMenu(true)
@@ -120,20 +114,10 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         return inflater.inflate(R.layout.fragment_subscription, container, false)
     }
 
-    override fun onResume() {
-        super.onResume()
-        setupBroadcastReceiver()
-    }
-
     override fun onPause() {
         super.onPause()
         itemsListState = binding.itemsList.layoutManager?.onSaveInstanceState()
         feedGroupsListState = feedGroupsCarousel?.onSaveInstanceState()
-        importExportItemExpandedState = importExportItem.isExpanded
-
-        if (subscriptionBroadcastReceiver != null && activity != null) {
-            LocalBroadcastManager.getInstance(activity).unregisterReceiver(subscriptionBroadcastReceiver!!)
-        }
     }
 
     override fun onDestroy() {
@@ -150,28 +134,75 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
         activity.supportActionBar?.setDisplayShowTitleEnabled(true)
         activity.supportActionBar?.setTitle(R.string.tab_subscriptions)
+
+        buildImportExportMenu(menu)
     }
 
-    private fun setupBroadcastReceiver() {
-        if (activity == null) return
+    private fun buildImportExportMenu(menu: Menu) {
+        // -- Import --
+
+        val importSubMenu = menu.addSubMenu(R.string.import_from)
 
-        if (subscriptionBroadcastReceiver != null) {
-            LocalBroadcastManager.getInstance(activity).unregisterReceiver(subscriptionBroadcastReceiver!!)
+        addMenuItem(importSubMenu, R.string.previous_export) {
+            onImportPreviousSelected()
         }
 
-        val filters = IntentFilter()
-        filters.addAction(EXPORT_COMPLETE_ACTION)
-        filters.addAction(IMPORT_COMPLETE_ACTION)
-        subscriptionBroadcastReceiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context, intent: Intent) {
-                _binding?.itemsList?.post {
-                    importExportItem.isExpanded = false
-                    importExportItem.notifyChanged(FeedImportExportItem.REFRESH_EXPANDED_STATUS)
+        val services = requireContext().resources.getStringArray(R.array.service_list)
+        for (serviceName in services) {
+            try {
+                val service = NewPipe.getService(serviceName)
+
+                val subscriptionExtractor = service.subscriptionExtractor ?: continue
+
+                val supportedSources = subscriptionExtractor.supportedSources
+                if (supportedSources.isEmpty()) continue
+
+                addMenuItem(importSubMenu, serviceName) {
+                    onImportFromServiceSelected(service.serviceId)
                 }
+            } catch (e: ExtractionException) {
+                throw RuntimeException(
+                    "Services array contains an entry that it's not a valid service name ($serviceName)",
+                    e
+                )
             }
         }
 
-        LocalBroadcastManager.getInstance(activity).registerReceiver(subscriptionBroadcastReceiver!!, filters)
+        // -- Export --
+
+        val exportSubMenu = menu.addSubMenu(R.string.export_to)
+
+        addMenuItem(exportSubMenu, R.string.file) { onExportSelected() }
+    }
+
+    private fun addMenuItem(
+        subMenu: SubMenu,
+        @StringRes title: Int,
+        onClick: Runnable
+    ): MenuItem {
+        return addMenuItem({ subMenu.add(title) }, onClick)
+    }
+
+    private fun addMenuItem(
+        subMenu: SubMenu,
+        title: String,
+        onClick: Runnable
+    ): MenuItem {
+        return addMenuItem({ subMenu.add(title) }, onClick)
+    }
+
+    private fun addMenuItem(
+        menuItemSupplier: Supplier<MenuItem>,
+        onClick: Runnable
+    ): MenuItem {
+        val item = menuItemSupplier.get()
+
+        item.setOnMenuItemClickListener { _ ->
+            onClick.run()
+            true
+        }
+
+        return item
     }
 
     private fun onImportFromServiceSelected(serviceId: Int) {
@@ -263,13 +294,14 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         subscriptionsSection.setPlaceholder(EmptyPlaceholderItem())
         subscriptionsSection.setHideWhenEmpty(true)
 
-        importExportItem = FeedImportExportItem(
-            { onImportPreviousSelected() },
-            { onImportFromServiceSelected(it) },
-            { onExportSelected() },
-            importExportItemExpandedState ?: false
+        groupAdapter.add(
+            Section(
+                HeaderWithMenuItem(
+                    getString(R.string.tab_subscriptions)
+                ),
+                listOf(subscriptionsSection)
+            )
         )
-        groupAdapter.add(Section(importExportItem, listOf(subscriptionsSection)))
     }
 
     override fun initViews(rootView: View, savedInstanceState: Bundle?) {
@@ -371,13 +403,6 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 subscriptionsSection.update(result.subscriptions)
                 subscriptionsSection.setHideWhenEmpty(false)
 
-                if (result.subscriptions.isEmpty() && importExportItemExpandedState == null) {
-                    binding.itemsList.post {
-                        importExportItem.isExpanded = true
-                        importExportItem.notifyChanged(FeedImportExportItem.REFRESH_EXPANDED_STATUS)
-                    }
-                }
-
                 if (itemsListState != null) {
                     binding.itemsList.layoutManager?.onRestoreInstanceState(itemsListState)
                     itemsListState = null
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
deleted file mode 100644
index aacfc77adc4..00000000000
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.schabi.newpipe.local.subscription.item
-
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.annotation.DrawableRes
-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
-import org.schabi.newpipe.util.ServiceHelper
-import org.schabi.newpipe.util.ThemeHelper
-import org.schabi.newpipe.views.CollapsibleView
-
-class FeedImportExportItem(
-    val onImportPreviousSelected: () -> Unit,
-    val onImportFromServiceSelected: (Int) -> Unit,
-    val onExportSelected: () -> Unit,
-    var isExpanded: Boolean = false
-) : BindableItem<FeedImportExportGroupBinding>() {
-    companion object {
-        const val REFRESH_EXPANDED_STATUS = 123
-    }
-
-    override fun bind(viewBinding: FeedImportExportGroupBinding, position: Int, payloads: MutableList<Any>) {
-        if (payloads.contains(REFRESH_EXPANDED_STATUS)) {
-            viewBinding.importExportOptions.apply { if (isExpanded) expand() else collapse() }
-            return
-        }
-
-        super.bind(viewBinding, position, payloads)
-    }
-
-    override fun getLayout(): Int = R.layout.feed_import_export_group
-
-    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 { viewBinding.importExportOptions.removeListener(it) }
-        expandIconListener = CollapsibleView.StateListener { newState ->
-            viewBinding.importExportExpandIcon.animateRotation(
-                250, if (newState == CollapsibleView.COLLAPSED) 0 else 180
-            )
-        }
-
-        viewBinding.importExportOptions.currentState = if (isExpanded) CollapsibleView.EXPANDED else CollapsibleView.COLLAPSED
-        viewBinding.importExportExpandIcon.rotation = if (isExpanded) 180F else 0F
-        viewBinding.importExportOptions.ready()
-
-        viewBinding.importExportOptions.addListener(expandIconListener)
-        viewBinding.importExport.setOnClickListener {
-            viewBinding.importExportOptions.switchState()
-            isExpanded = viewBinding.importExportOptions.currentState == CollapsibleView.EXPANDED
-        }
-    }
-
-    override fun unbind(viewHolder: GroupieViewHolder<FeedImportExportGroupBinding>) {
-        super.unbind(viewHolder)
-        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 {
-        val itemRoot = View.inflate(container.context, R.layout.subscription_import_export_item, null)
-        val titleView = itemRoot.findViewById<TextView>(android.R.id.text1)
-        val iconView = itemRoot.findViewById<ImageView>(android.R.id.icon1)
-
-        titleView.text = title
-        iconView.setImageResource(icon)
-
-        container.addView(itemRoot)
-        return itemRoot
-    }
-
-    private fun setupImportFromItems(listHolder: ViewGroup) {
-        val previousBackupItem = addItemView(
-            listHolder.context.getString(R.string.previous_export),
-            R.drawable.ic_backup, listHolder
-        )
-        previousBackupItem.setOnClickListener { onImportPreviousSelected() }
-
-        val iconColor = if (ThemeHelper.isLightThemeSelected(listHolder.context)) Color.BLACK else Color.WHITE
-        val services = listHolder.context.resources.getStringArray(R.array.service_list)
-        for (serviceName in services) {
-            try {
-                val service = NewPipe.getService(serviceName)
-
-                val subscriptionExtractor = service.subscriptionExtractor ?: continue
-
-                val supportedSources = subscriptionExtractor.supportedSources
-                if (supportedSources.isEmpty()) continue
-
-                val itemView = addItemView(serviceName, ServiceHelper.getIcon(service.serviceId), listHolder)
-                val iconView = itemView.findViewById<ImageView>(android.R.id.icon1)
-                iconView.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
-
-                itemView.setOnClickListener { onImportFromServiceSelected(service.serviceId) }
-            } catch (e: ExtractionException) {
-                throw RuntimeException("Services array contains an entry that it's not a valid service name ($serviceName)", e)
-            }
-        }
-    }
-
-    private fun setupExportToItems(listHolder: ViewGroup) {
-        val previousBackupItem = addItemView(
-            listHolder.context.getString(R.string.file),
-            R.drawable.ic_save, listHolder
-        )
-        previousBackupItem.setOnClickListener { onExportSelected() }
-    }
-}
diff --git a/app/src/main/res/layout/feed_import_export_group.xml b/app/src/main/res/layout/feed_import_export_group.xml
deleted file mode 100644
index e8232acc40d..00000000000
--- a/app/src/main/res/layout/feed_import_export_group.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:layout_marginTop="16dp"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="14dp"
-        android:background="?attr/contrast_background_color">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="5dp"
-            android:background="?attr/toolbar_shadow" />
-    </FrameLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/separator_color" />
-
-    <LinearLayout
-        android:id="@+id/import_export"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <org.schabi.newpipe.views.NewPipeTextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingLeft="16dp"
-            android:paddingTop="8dp"
-            android:paddingRight="16dp"
-            android:paddingBottom="8dp"
-            android:text="@string/tab_subscriptions"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:id="@+id/import_export_expand_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginRight="16dp"
-            app:srcCompat="@drawable/ic_expand_more"
-            tools:ignore="ContentDescription,RtlHardcoded" />
-    </LinearLayout>
-
-
-    <org.schabi.newpipe.views.CollapsibleView
-        android:id="@+id/import_export_options"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="6dp"
-        tools:ignore="RtlSymmetry">
-
-        <org.schabi.newpipe.views.NewPipeTextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/subscription_import_export_title_height"
-            android:gravity="left|center"
-            android:maxLines="1"
-            android:paddingLeft="36dp"
-            android:text="@string/import_from"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textSize="13sp"
-            tools:ignore="RtlHardcoded" />
-
-        <LinearLayout
-            android:id="@+id/import_from_options"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginLeft="36dp"
-            android:orientation="vertical" />
-
-        <org.schabi.newpipe.views.NewPipeTextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/subscription_import_export_title_height"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="left|center"
-            android:maxLines="1"
-            android:paddingLeft="36dp"
-            android:text="@string/export_to"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textSize="13sp"
-            tools:ignore="RtlHardcoded" />
-
-        <LinearLayout
-            android:id="@+id/export_to_options"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:orientation="vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="8dp"
-            android:background="?attr/separator_color" />
-    </org.schabi.newpipe.views.CollapsibleView>
-</LinearLayout>
diff --git a/app/src/main/res/layout/subscription_import_export_item.xml b/app/src/main/res/layout/subscription_import_export_item.xml
deleted file mode 100644
index 8aadf5d8c55..00000000000
--- a/app/src/main/res/layout/subscription_import_export_item.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@android:id/icon1"
-        android:layout_width="48dp"
-        android:layout_height="@dimen/subscription_import_export_item_icon_size"
-        android:layout_marginTop="@dimen/subscription_import_export_item_icon_margin"
-        android:layout_marginBottom="@dimen/subscription_import_export_item_icon_margin"
-        android:scaleType="fitCenter"
-        tools:ignore="ContentDescription,RtlHardcoded"
-        tools:src="@drawable/place_holder_youtube" />
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@android:id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/subscription_import_export_item_height"
-        android:gravity="center_vertical"
-        android:maxLines="1"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="13sp"
-        tools:text="@string/youtube" />
-</LinearLayout>

From 5c69568c7f1c98762afb9aa19621503e21cc0baf Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 20 Mar 2022 15:13:24 +0100
Subject: [PATCH 17/28] Remove unused ``dimens``

---
 app/src/main/res/values/dimens.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 022dc517944..419b3ca4376 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -58,11 +58,6 @@
     <dimen name="popup_minimum_width">150dp</dimen>
     <dimen name="comment_item_avatar_right_margin">9dp</dimen>
 
-    <dimen name="subscription_import_export_title_height">32dp</dimen>
-    <dimen name="subscription_import_export_item_height">42dp</dimen>
-    <dimen name="subscription_import_export_item_icon_size">24dp</dimen>
-    <!-- (item_height - item_icon_size) / 2-->
-    <dimen name="subscription_import_export_item_icon_margin">9dp</dimen>
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
     <dimen name="video_item_detail_title_text_size">15sp</dimen>

From f9ccc19df56d60444644fb306357db5d6bfdc73c Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 20 Mar 2022 15:52:19 +0100
Subject: [PATCH 18/28] Fix popup-menu expand icon color

---
 app/src/main/res/values/styles_misc.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/styles_misc.xml b/app/src/main/res/values/styles_misc.xml
index f539eb5a1b3..ca285ae1553 100644
--- a/app/src/main/res/values/styles_misc.xml
+++ b/app/src/main/res/values/styles_misc.xml
@@ -69,14 +69,17 @@
     <style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+        <item name="popupTheme">@style/ToolbarPopupTheme</item>
         <item name="android:textColorPrimary">?attr/actionColor</item>
         <item name="android:textColorSecondary">?attr/actionColor</item>
         <item name="tint">?attr/actionColor</item>
         <item name="iconTint">?attr/actionColor</item>
     </style>
+    <style name="ToolbarPopupTheme" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+        <item name="tint">@color/contrastColor</item>
+    </style>
     <style name="ContrastToolbarTheme" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+        <item name="popupTheme">@style/ToolbarPopupTheme</item>
         <item name="android:textColorPrimary">@color/contrastColor</item>
         <item name="android:textColorSecondary">@color/contrastColor</item>
         <item name="tint">@color/contrastColor</item>

From 70e0085596c6ab954d1378d0040b22a101ddc92e Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 20 Mar 2022 17:21:55 +0100
Subject: [PATCH 19/28] Converted placeholders to svg

* Required for SubscriptionFragment (otherwise the PopUp-menu uses half of the screen)
* Size reduction
* Fixed/Improved some images:
  * Bandcamp: Was facing in the wrong direction and used an incorrect logo
  * Media CCC: Update logo
  * YT: Added NewPipe logo so that it's not just a rectangle
---
 .../settings/PeertubeInstanceListFragment.java   |   4 ++--
 .../org/schabi/newpipe/util/ServiceHelper.java   |  12 ++++++------
 .../res/drawable-nodpi/place_holder_bandcamp.png | Bin 2677 -> 0 bytes
 .../res/drawable-nodpi/place_holder_circle.png   | Bin 5323 -> 0 bytes
 .../res/drawable-nodpi/place_holder_cloud.png    | Bin 3660 -> 0 bytes
 .../res/drawable-nodpi/place_holder_gadse.png    | Bin 8827 -> 0 bytes
 .../res/drawable-nodpi/place_holder_peertube.png | Bin 8340 -> 0 bytes
 .../res/drawable-nodpi/place_holder_youtube.png  | Bin 1744 -> 0 bytes
 .../res/drawable/ic_placeholder_bandcamp.xml     |  10 ++++++++++
 .../main/res/drawable/ic_placeholder_circle.xml  |  10 ++++++++++
 .../main/res/drawable/ic_placeholder_cloud.xml   |  10 ++++++++++
 .../res/drawable/ic_placeholder_media_ccc.xml    |  10 ++++++++++
 .../res/drawable/ic_placeholder_peertube.xml     |   9 +++++++++
 app/src/main/res/drawable/ic_placeholder_yt.xml  |  10 ++++++++++
 app/src/main/res/layout/drawer_header.xml        |   2 +-
 app/src/main/res/layout/item_instance.xml        |   2 +-
 16 files changed, 69 insertions(+), 10 deletions(-)
 delete mode 100644 app/src/main/res/drawable-nodpi/place_holder_bandcamp.png
 delete mode 100644 app/src/main/res/drawable-nodpi/place_holder_circle.png
 delete mode 100644 app/src/main/res/drawable-nodpi/place_holder_cloud.png
 delete mode 100644 app/src/main/res/drawable-nodpi/place_holder_gadse.png
 delete mode 100644 app/src/main/res/drawable-nodpi/place_holder_peertube.png
 delete mode 100644 app/src/main/res/drawable-nodpi/place_holder_youtube.png
 create mode 100644 app/src/main/res/drawable/ic_placeholder_bandcamp.xml
 create mode 100644 app/src/main/res/drawable/ic_placeholder_circle.xml
 create mode 100644 app/src/main/res/drawable/ic_placeholder_cloud.xml
 create mode 100644 app/src/main/res/drawable/ic_placeholder_media_ccc.xml
 create mode 100644 app/src/main/res/drawable/ic_placeholder_peertube.xml
 create mode 100644 app/src/main/res/drawable/ic_placeholder_yt.xml

diff --git a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
index c7eb0be40fb..1ff7947fd74 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
@@ -207,7 +207,7 @@ private void showAddItemDialog(final Context c) {
 
         new AlertDialog.Builder(c)
                 .setTitle(R.string.peertube_instance_add_title)
-                .setIcon(R.drawable.place_holder_peertube)
+                .setIcon(R.drawable.ic_placeholder_peertube)
                 .setView(dialogBinding.getRoot())
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.ok, (dialog1, which) -> {
@@ -411,7 +411,7 @@ void bind(final int position, final TabViewHolder holder) {
                         lastChecked = instanceRB;
                     }
                 });
-                instanceIconView.setImageResource(R.drawable.place_holder_peertube);
+                instanceIconView.setImageResource(R.drawable.ic_placeholder_peertube);
             }
 
             @SuppressLint("ClickableViewAccessibility")
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 d41493a7fc2..9fa413add21 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -31,17 +31,17 @@ private ServiceHelper() { }
     public static int getIcon(final int serviceId) {
         switch (serviceId) {
             case 0:
-                return R.drawable.place_holder_youtube;
+                return R.drawable.ic_placeholder_yt;
             case 1:
-                return R.drawable.place_holder_cloud;
+                return R.drawable.ic_placeholder_cloud;
             case 2:
-                return R.drawable.place_holder_gadse;
+                return R.drawable.ic_placeholder_media_ccc;
             case 3:
-                return R.drawable.place_holder_peertube;
+                return R.drawable.ic_placeholder_peertube;
             case 4:
-                return R.drawable.place_holder_bandcamp;
+                return R.drawable.ic_placeholder_bandcamp;
             default:
-                return R.drawable.place_holder_circle;
+                return R.drawable.ic_placeholder_circle;
         }
     }
 
diff --git a/app/src/main/res/drawable-nodpi/place_holder_bandcamp.png b/app/src/main/res/drawable-nodpi/place_holder_bandcamp.png
deleted file mode 100644
index 13c44b64900320ad5b6986e89095999c97738075..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2677
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
H_dos@m6RUL

diff --git a/app/src/main/res/drawable-nodpi/place_holder_circle.png b/app/src/main/res/drawable-nodpi/place_holder_circle.png
deleted file mode 100644
index 630d0454e5341a781e4d4b6a296c9a10578ce338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5323
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

diff --git a/app/src/main/res/drawable-nodpi/place_holder_cloud.png b/app/src/main/res/drawable-nodpi/place_holder_cloud.png
deleted file mode 100644
index c4ba2a6f4c94fa8bcb7adbaf6202c41b53096192..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3660
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
O$0&$*vU_0bllng+Zlm=8

diff --git a/app/src/main/res/drawable-nodpi/place_holder_gadse.png b/app/src/main/res/drawable-nodpi/place_holder_gadse.png
deleted file mode 100644
index 9b479ed4ff52b5c9504dbce93089f9f2fccc1a56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8827
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
I)^vdV4{t6qfdBvi

diff --git a/app/src/main/res/drawable-nodpi/place_holder_peertube.png b/app/src/main/res/drawable-nodpi/place_holder_peertube.png
deleted file mode 100644
index 81dfdb8cc116df86618571e1391492ab6b6b070b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8340
zcma)ic{r8Z7ymv^C}X$DJaikBE)f|sbnBXFASAOgM97>BrxXo_Zps+WEmLOKkWLvQ
zluY3uT^WmWN~l8;`K|rx`~3d;J<qSF9<TMTz1C+9d#$zi+x4R+y1ZP%TnHgveZ9lS
z5n_W!Hnf%lez1ai7U9PlmxIO!5h{)2UUFcE-`9ETo%99%KKzgL=dRQsAaXbw>K=xl
z@aOxXC*cT5Zr4A2&@5=+(|-~F%3j#e`1)z(fJ)BKlS5)}E6@Gkzvk^meTIHTn`bXZ
zi4Ble1t9c?<^P`kA3s}7J=Y;>;)U_Q@}9IO>$0OxXJq|o(PgfNc{{(gkc331IqNF&
z!zKE>@^Z|ic+qf>7W#Q&`H9t{fq&Uqz$e2|*JYQlY&LPS?Q1qdRy>rf40Ha6ItZPE
zH&S`|h5G_^xRE{jW4Scg!GF<}jDTg@EHGIiE_w^9LzauWbLq^{{0r}dWe|l_!urV6
zr|aM6MRF*i#(MDd-N$<e5F*=u=L@p&FVY+$5wbFaJMXFfC4!$r3urCU6JoE~kRUP)
z&rP>WQz8~H-qOV^lA}1WO@9oLrt@TJDHAdzR1R#ldE$0yyAVZ*Y|pq!kIAcEC5Jz>
zHBB2EK3gG=C|lrFGktlYwPMw(@Dmb+MdRuSEdu@_i;hB*jYvBc@D?)X=?=fv7r#4Z
z(;o;S7Xlpx;_5Exa;r+d(&sFaFR~$5d6e+ex;jto?b&o?4%F!gekq|%-@D*JIP8nq
z%m|Y!|K1}&jb9Z72l(e9Gyp2S%pcjD5f>(OhHySDqz!|FUu^e-{rrC^QlMA(v<&`&
zlV@v{#z=Y)H@F^kUIwVu%+IRtkC9L#n(Wrf|7MXW-rc_id|1v@rknbXzhr~h1cX-5
z{)#=Yo*;YCMe@IzeC&qElBp-O^2JlODL~9z`*QN!#}xzE!R3XEPILE}Jk3RgUTYy{
zR&#^QBGoT1@Pfg>x{LXSv2GqXm{xNinJ-npWRehv_LG|9gNix-Nf0`U=^yib<J>&B
z2&Q=EGgY58Aa`o<uz!W<V?rHWB2U09hZ`6M=F*t$s_%cpQu2QutA0WY>X=4|2Mv*q
zwEiu{N3diun^b-5AelPzYR!rZ+f@sVMR3}gFINTI$6E6fii(*|^t-;o>V(Zhq>g-u
zCwSr`WR36m2!V2%5@;?U*4@8>z-d7r^Bupw>Y`GbgUMrM?1^t;Gfd_uC*fZTa%pxI
zghzkyE$I0--fNmCJXc$sZknb>cuqP0?fW}XtDd_!H_xnJt|0>;)+?qwech_`8d_L|
z6lSJp<Xf1#*w~#K5+oo*(L;U4OMhYGKan{7O$@B04xQ-8GZ8}NPH0kuelG72nG%2<
z;#DZCl3l8bTpLm6-aOs+FCs|591vPbGckFrjt1n>xccyWdUB4N$6AUx4`OiAtMi=L
zsGG^!PysG6|5c4SN9w#ml3cC~*73iAT$|CY8rwnXoCDjDl|0I<J>gZ<KCO->fgWb7
zao>tvTb+Z#Vlb`fMOf*rpJvtNYTfe91?N`f|DbF5v^-#=ijlQz$nWfI1_DuM9Ei^j
zKI{MQs(7ox`)cb^p&-IV#e72SqmwBrcSL%>QV%d^9y!tX;w7w%ft97f$NVGb{)hhw
z-6nq<`Iq=pHa<p9?${|W0_)=Q<2eX$cbVC$?|%}yrYU_E6YYPet{SXAH+*&t!E&8>
zR@KLa&>Eg=do)cJdnywuR{P(&Yqa-(g>lS5dZTYk;i_|J!H)i;tLV)Js|EyC(dYG<
zPu%OxiCN`Y%{#)$cJ$`FJrj4-f4L#uB25V^_}TDIgYxq3^zxP!|7QIu!3Snj!nnN0
z=e5fTL#;1Vt(+=7r~Z&@KqGMQ;!v>vZPheI19y#%iPF1Xv>)Gwy0%$f5pr<u^;1RT
zZ%MTczsaA8cn!ZRs-nzv-fou2ib|-#c{lktzYA+BC~#8zBxK(>Jov=&k^k=bFzLUj
z%Hvy;MV+1b(8G~CGj1Ngv0CCDWSJS&L|AlQmvG8B?l5{yPQe%TXgm}Me^%<IB)0MJ
zG3lL!xjd8`F0*{&^{uU>qmMGBW@w6uMPhetLy_5klx~Bor$dsGRS`3?oUP9x(Z4r!
za6`Ej8CgaaJN_WV9blN>i+AoeGP5cp9i81(B)$1|vV-#nl&jjs9VF2kXAl9kSbRxb
z_s)my4;ru%|KkE-m&n~7YWrN*a%eX?h7_3TDXjyOwCQ^M!(S8=O=1iVsUzvne_q-u
zC*RsCin>a6kNNgXOY=@3q&9Qt(}^0nZecK$vUS_ssF#XnTeed~o(hsqfA$st2VlS)
zX{_z<Zhh$TzkghY2T}R^#x_OPRbj+DNj<UC_K*AmYIfvuaB4U13rYU1#0IbFP4ZK3
zH!O48aQEy*WOm^4Up$u}ARo}J#i_qSB-^q?4rc{J{Z<aU*<j#%`xx=c{Gmu~{j<j&
zo@PhI_$fCMXa7FF^^FPvx;AM2*Den=8R`8^D7R{(!1n+ODA{hmyM|Ku;P^H^L?sV3
zi)Y>3Ss9spawEizf2Hm^#6_TI4VgOX_VlrtUN5&o*-l~9Wg29fV%QgB(58qenoDG<
zyC1eYVP8@?dM`~o#JwpiD?Dg?07)l|-pu;*Ut?@c59M<myPHy);9XI)GT4x0C%e6S
zb;-;I%_}jEbX7$0ToR7D^N}@$z%6=%3%q>BWsF=&PVL(2EBpyuFC&lXCMT1%g9W*}
ztkpE6!9mZbRBEmDZp$g;kB}r~8WKy+@f?5_7CY_u=)J&ctA^HsNDfL*RQTw4i*YU4
zzEk6>asu~DH3w&NGRWcZdKN4X=?y0EO5F)nuWQXyM45a`=wkMp5cgYT`~Ew#-@$#-
zt*w#gkzU}){k%aIB!c+!%{-Uf9GsP|fDj=GeP2e?v1L)DEf97+BB5PhCo=hsB)E^W
zwqXPU;dhHn{qXeKw?yuj9I$3BtXX4`{n$^(%m?-S`_^0bkmN>ZXLmW2d1isDGH&rD
z2^G}&gWC+h*XzsRpdQs?jd0vcaqgZy$VZ{gZMW@MZ>f$$TKs3n=#-mmn%G<h8BI3Y
zd0RieB?Q9wC|v(+)T)2?#-nKe3sR@I!NMPvJa~_KE8l<+Y=RKPd<wHRm)&j(F51mW
z*)lfPub3hQuDhBsMmg?K|HAbK4yX7MNjLkAA2z|Qn(|Fj!nwCo6|r^|nfNkV7m7s@
zjol@YJ9(W0Z1eqh-Y=*HT)R7gI=MnNst4XvF4}=*&;qxa94TX5S@;Gk*VvlMZg;;5
z`Cyiq-k|>XP5LVm)pkj!c>$7<tUdQ&qt>&U?;c@?`&0Ol%(I-53rRrUKV{q6I4<}U
z^zjQM-bj9l_0jL_SlF(_Es{c_nk;SlA(N)ya2PY6phswpOe&_vt`k`#Q72}Le75R0
zfV1*$G@qAoZkz#p#wrbu$Uth)-7{nS>5iROL_)4DAChVAD|K>fPfCze;H<m#x=lr4
z+Bp0iFVcu~H)w1v04jxp{xwLsE4NJ)F`r4CHv@NzL4Z0bej_gZT8YNGho?aNhLHQ#
zMoQd}#09?%Mj3v2<7d!g$A<<ZDt(?2dYQ!=G-G7$*Z88`jap5bS(m*ylT=Z;boByv
zY@5qhr~Bu9(4^{9@?#8Sg(@{;Rj@fGm8`8iT<)_~L9-s9zhl`&**F&`x?gYVAW_dO
zNLR+~Yy)qf@($2Ub-w={1RS$&tf*^sy$#&Kr0K>*2R<~!x1bR_Geyy92LtN&dTVQ@
zN(e!MLDAz$JsfccOj)ktF>Me<R(GEq-6f!~@j*M7ksICN_)3nGviN|k_1yLq*G8)c
z?fZZ%5Z*Wo1wsUtF=02!2*kfRCIzu&ZMTi{uNOta*EFr;Oj{aTt8!lhinGmuCGKJK
zi!y+OH{r~}zRH`zuK@E~Z}EK&e3XCgN0qKsxZi>W{QfSE7X&mM99)p$lMzsOQ16ih
z3UO@%g#cO56Ly}gKzt0m09y}Q!-nKTC*G!2b%Ki{eUR&J&A37^ByWe<g690Lithn+
z!)N%=+{m<wd`4RwFGw@jh*5T`7PN<Cg2Lc12o^FAO8mSO-_jTz5n2J^9+=hml>REa
z5Jb~cvlf1@TnFA@b&FL=W*Em~_Q69*9Tjyf94G0gSNI(ofGDi592RrPphnF81JeFW
zIV|GPmp4nf_yyf?K~nU)!v_?!mRn8(EO$Py-o95rL0{1Z_H5R|hDr=esAB9%|G5j0
zDk)n*+en6rYFqYL{R<K`dw$b9OWB<t4>v&41#x&?io23T)?TrZ_!+q|M7<7nbrxBx
zF8%wb#X^TY9VE%Svll$XKr$^*O1A#_q#d*ls9j0InDlj@=H(ctIWV&4s@*6xtFiTk
z9CYKSo=aPzvflWa@%#Zbc<<=)d&hqdLUNw%#p8f{6>KmX??l4QWFt&$+84t9_A1a0
zxv&>C$Qs^AP5>ch#u7!%55Ie;X+qG2#gB~6LAiopem?n>x2yro9_hPTJ6z?n6>1gq
z%)Uz!j>XnWZ!s+9@pT!E3E&~YeSr^db!5laLxVo$rzP9a1A=){8W#kiHFIiDLC=mQ
zCv1xU8+a|9G$5^CxOBgUUyg<biBIcbS@ii`MfI()ELU^znu5W(>lOwd&}7v61>u0T
zU^a8eCxlo1N;290uIF>cL*->yJ9dG`B5~mMNsxnPMBiPq1|xf_f@e5IU#=Gvb2dJJ
z)MlMN#dl<H16<S(C4v&o*$%x|$iw304nCOo-e;ZCo&+PVvYl`!oLT3w1<yZZD8*To
zt=Ht->qwmuTBEs&sUl!GV$@#T;<dM8#~V3!DrrWr=ve`P)hqtMaj#{)pn$Xg0hBN%
z(l1~84t5M6=XVpTxjfZSz{gqFrm}G(AdoD)u6zE>Lz!eDXE?5<H$S-*39%5)6<^|u
zN*vhtpuPYG3aPLg%UvFxhXG#ZGuA%M8!-*g73)H)1WmCB-mE8bIRKfbOq!3fLGx-G
z1W1xM5qH6a31=%OLGbq8pV3ZG#c;^;4&seov7^jMa35#g#vqwqE?}t84_%NlnV&);
zd887yq5AeRm*Te@AO=>y%QQk)PU0O!RqQSkWo|nm5h{$Jh0ANSa>yaux{J5?AsA+R
zX|p1tR%Z=$uAbE5tlKkL-*Fy_Q!EdD7iU`^B}5Ww%s-Rh?CUc2E=0B(Y81fSe_7p|
z)D-omMQwo^!LK$$A;;kbJ+8LTdmSqO-6CrpwA0hF#QxdIuM-^^>v1f8J8=2xd&k>X
z-n5KL{PdmSG9OOucYF8r0`~Axjjv_(Zvg;@wuJ3>{<tx#Rxl2*EqZI1%$}D#RYpRr
z(IYA;cHGf831#Bb8{f*Qw{pO!moOaPe*oL2!>r>k?Ymuh`Y<*+w@SeGyIb8j1h$8b
z;kn7++{;Wkk$*|ZZ&a#3aqDoGBB!>$-pyHg58;M8sxUD^Pvi!jiq^q17e$YqeHG1D
zCJhs@$a%G<C>&dZxKZg=p0YfCWUpEiDb@*2Ms9M@xk^Hl==~@+h{vMA|18jk7rnQc
z?5UuCIrS5g8K>}dyghF9KKBjc^l>nkB2yjZHDiszkDYeMrNW{^TYMF^)kAh^HxBM{
zJdV@F!k2#l5Rc2{|G<cK`$c4}AVXKWH-xaIUOgGXi%0c<(>N4!!*MEkJqZ9eQVeNJ
zc-B1>lmKY^bDF(*ov)sZ2OIEsgJYf2>=Qy(m#y`%HcZ+-0+82OIO^cd)9+cIoK<=H
zPk8>Bfpgf&50fo_CANK*ZIf=PK9I~-)MiaTS$t84Jv*8BM2>SKK%g$d31oN04xH5`
zR%$ckPpaWRmwJi)PaHrX9Z47P%m;4BwP7}9oHu$Xqkt1K;y(Y%^OvyY_$UMSrDlW+
zHpA1_(oJ^tm6%tvu<lXG*U_8txVZ5=jw)T>4f>9X!SHjj+l!Af(ibx{d^8&8N@O#4
z(B3b2QC{NAR*y{}=bs7V71I01$+%MG3Iz_cZHI@>VVZz|6D}ENkE_>24Zengg?L*x
zgm9%on5nV{VsJn5MXqymkZ`pB5{QJeVKfY#|Gfz|IW?SBg)5dTkKrskuJNdFzz3!-
znJ0dZh9FhA=}=OX+pHEq@>6L4l05{yAs=^7!Oc1lm5Pa3@$rUeAWr`kf<z+0%h9wM
zg->>{0V7X#k3-(_PHbHVrSs%}afZt#wI>z$5mjvHSrKd`FHApncSgwLH)uoJjiy25
zUQGI%HM&=&a@@EUO6um|Sqss)QrtJ6NX@7f;3;V`YM*9QA$0XT-96r70lVAU%CA7L
zH}57_iQ<tXPvFt$z2m2D;~vWc!}KMx{627VK8x*L)Eu7RA|~0N@_&p1pIxWTaEne7
znsyD|@P&<@1PIJh#p~WfcZ2T1fi*n-(z53i9z#6Ogz%lhLucObx~F{ZAVE=damGT_
zPIf08TSU=`9_UAw(ICP#_rO(U`!wk1+Pu3*6#9RMyn2SuXMI_|@x7QFL*q}hH-NTF
z_E&E|v;maml5G}*<|nM|PXjgoBjHfc#q5Mp@e9l~KaVPhU5ywCQi2*#oqB%D&MSD<
z<986x#*l<x;Ay!nL#uWN=(@2F4r3S+@2B(DH&259ycSntH_9u)B;C0tcvecZO=4Xv
z09DM$ncZ0+0_t7=G@Q}*5Qhi8sRi)>U3VCQsV@g_K28z^nswmtpWE@cjF``ll<d_3
z-NMa=3+t7*z{{?8iFyOL9(gWtL^+z_rFMSXOeW&iG=rCz9SxQg23}oQiQ8t?{D3=l
zXoc7Ank(lpOyLsU^ZT74f6kgp{Jb9js`0cnp1~usIm7Gz78I+9Cu?^M%Onv)@~xB6
zaZcU2o_xrEn6tm^zYjQm+70hLH_7jg)Z(Okt`{}p!KnKEq10S_egCg*j+4G<@=VAk
zktpz#nLnI%UNm)%qoe#`Q4O!&u~LC(y68<dfw2G%2XL-}LIN`PyW>vjWDkDkv3nK(
z22g1K=z8yPe$IsPoL6P@7#^Yhbu|{m_`XdcPHioXn~%0(XXajnvGQ3{=@*!fpU0Ib
z>);F(zVZ3Fs8RGv3yFI1=<`gR1r5hJ!zdaT)T#UHNuAGEk54-R`=roQ_K&J4#f1MS
zWt*H@iY(A_iQ+PWT)E;#&bHpj?f~6ZH}*Q50x?#x#ST&U7GN^`f*`jmjZFRLziZv#
zM&g#EoC_a<ZK}LSc5!OkT;!WREW4NtfHHAyflaEOwy<tq=Fx@jT4zj!X1D?PpykM`
zwt7&25)i`w<N=*@G#<C7KR8rDk=~IpW6M6$Q3ae#C+4%m*J5Jmg1X6bOHS<*8nN!B
z<~*k0idzYz-2DS2xlecqaeLFKZ)mm^v+_HNXRD&fMm&SSunz8KHWhoz=>Y9HaX2c4
zT$QZ8#&1vNtfMmOJ4z&U4)eM|5;2tSMLj3UNq!sKV6;vlKVB3;?TfGxkg@6+MV2x<
zLWECUNv692<L;-Vk1FVAAwC(}8zr4gn?Sc#D+(XwZZKPM<A8%RZvt6c8m?hl-~yk$
z=4#sO4bHuFU^Az;YPQmMRJC~`sC&o=`$cw%jnnaTJTFCH#<oDhI0e)2;}G0yaM#w6
z>{<ANBJ<RFzJ0uENWAV0)DTFSm4jB7K9;<Cdf}^;@M&~s_N0dpzRqHt(74p+Fr_Ar
zLKpVLe$5_&a2{WogW9*niRpn3T<>#&`T>q|&%AQP>86?>+B0+Rla;KI2fkCPqv(Gd
z*<keWHOX6~{m@S0Vus2DC#}?9<<{+efr5UMsDpa~@PA|vb|*|_o=aSu7rMPbw_DI)
zw1T`t5@%fmly`zF&yl_6dRkG<A~RvDI64y|ekuybBySxaUxY7{I-_dG)<pB-)4!Q1
zj(LoHgd$3>Pc88ztWK$1lkxlm8ScjyWQpQ|FW3C`esKJ9mX87%1(z#OA9g&%2lJ<5
za-%~$l-14#9*UIIhzk5&fYtK-^>HCI+2rNDR_7{cr;g|;kFp-M*Y4Uaps*CHbzu`e
z?tq_ojnCSZ+rOI-zn5CgS}6(SZ%N2JwMoa~jjJ8;=_z?upuK|l3Z;~C=7|X_B(|dY
z+QK^r&w|!yN<Q5P?zJ=RvN;bpc-S68Q$naqmC?wkXYWiWNs5_d98pfsb~{G0N3Kfg
z>~hB4i)?kMv-JS)%)jh#PdzVoWXL%1UbdSXaJ&#9k>pTM&N8EcA$%m1X)3S@aZm=n
z<+CVmDdwBe6ep#8NA({znaEWOWi~Jj8QI@y;m1gwVMs6B_=uj=CW1x1TE?b^U>Rfl
zV6=BD%Iu-c!^QUsLx^!;6_%caabNJ4_>8AiG@t<Jb2zh35O2;I7wZYEvg<AS&@Nb6
z6BZ41$9G*P7^Y07^(=M~@`4r}Xzo_#1OtO{k`eMh*+=^Hxw)tsaKU~qSkKCaV5nr}
z`OUJqcA#6a*~QtXOuEaf2-V@4IhpYU^FaK&yG3RMbI9T`+C?i{;#r8H%2-;JY?NWt
zH(27(P*2DSOB7dXvNR=_=2<Cz*TJ!_86Z99RGfSQcuxBVt5`8Bo*RRmGM?7AfIDsl
z=uu&}KdUxb+M;q7G}+2}>UW6^V~y&{>7E;8ky|;)+TnU}qD}=en7w>kwWduT0^psc
ztTw+>%FFQ8rtEcXccgsNZg%a99F+O2Z&~?UFpQKVT87`moeFm0g?{G22Wj>s$O7si
zMj0d0Df%iq4$sd!;u=ks76^jo>Jsck^CM~hAW@wdZyEDW(OIi3@k&{y+-QIwO&Ln)
zS>z|<&mS2%KVs$0x1e$fq^4f2VpD~v%cygN_1$lbS48O#X&i9Y1gpQihImoL`rwz$
zMwusTH+Kbgi*<Do&nw2hjB?`XM|V`$ex-8*<y3-wZ})O{3-MwiGco(-CPK}<nk3JZ
zEt~Q4qI+<N+CRS}_xe3vmE8TUE3HZJ6&HrOyjMdbEr;N^#QNK>O}^<e!BlI)Z;(%L
zoYUWXL_h}P^xGb)I_MEyx@yBv*T(Magy8`>k8)lK;Ll>}>0!4%-%i*}JZoquq&-3q
zq+#tvOWJ%SugDev=z^A%G`1JY;@I>j*xr>jN8oJl?V<Yzf0rSs3%bDuY7Y@O!Tw0F
z3(b)P{;$KibqaC|yzZ?N9H3@LP@l1``whxB)w6*ql%cGsto`iR?6+O+T|2liWFoI(
za9%;+mK2N`;{<CpV~}A$uzqDoG15I3UC4-|E}3zG!A4LatGXboIym6NoK~i8W(7f2
z@A}xaBVPjwM{KrN_S?)Iba60r#b8_7@hSLvRia$2Y?C!WhVQ|e%Zh{Qg}L+aolIp<
zwWLi6rVbxnG@?E8_>V=VkY<`$x#dL!uWs-mnqLJc=r3gz`aOA5#oz>9EjK5%3gW$8
za5(L3+Zxasmi}2?1Txtk-Al8*BWs40daH!W4(^i4!>Sg1gN>~02q+5GyKS-wrIw2(
zv_n=_m^w35u9{{}yw?hqv(b>rt%OxUdMQV0jlLb(Ls<4X$@aFawF3Sk`CcKkn;#)G
vQOVhi|HlA|SSpk%Eh8TBum694hP9;+uML?n4T10R2<iW2a=7SE`^*0afOA6u

diff --git a/app/src/main/res/drawable-nodpi/place_holder_youtube.png b/app/src/main/res/drawable-nodpi/place_holder_youtube.png
deleted file mode 100644
index d147c6643a2ac097e7bbdcf3e9eb5dce405ff13a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1744
zcmb_bdo+}37=OQS#${%WCd#@@+t^ZCmsnwRVO)~JH0!d+r9sw^(MT61H8ajuD%7?e
zlS`&FBocBjd{R+v6NOEhA<=|bM#^pW)7i_}|Jrl*Ip=qt-}5`~^PJ~--uF$Q)3y=t
z+IRo}VY`!q8vrm$VW5mbU48cIM%0<nT|Bm;Uj84g{8B#;O<Q`vjph!>R1-QUv$jos
zTg*-#V-O=I!qfp!+_c@n)*}WQ?d>~svr2>Wl$a2h0LJ7c<?rKK-%2x&Zn}xz)9NKL
zSbdhRzD)_O_J!uZaLGL=+N*edX6sb#$r$d{g|5nD?<Q-j9wf(ASEbB!Y2LNytTo=P
zv%Nr8dW`?Bg_x-QuEoRJFS+NTG&3)*VCA4B>62Kg>0qt%c^k_KX;hc*QulT9s^N{!
zRyLC-Tj^~fkHca+{Q}DUg7fumhndZUolXhn&&ZAs?@uW2E6$f@OdLrn53(Mbp8q|$
z2s*c~l8_&gl*lm7Ym(ckc@K7L4(e4u2|G;)q6odbbGr4jpJ&RWD{+3o9TnN3yVe&)
z`E|-R^b*q=M8dUJEp@8RYt!TnW@_F+mfn6R6e<?*?D^&6npWKz5%N&WkD9~85m8}w
z1E1%g+HNnaqfJSnPOI+RBU50U_)+Ly7@Q;XHSaD8$L=A?41x>yW*r8JzAwS?Mk54|
ze1~Wtj))3kC?P2!zxi@9CmoS*L^SqkdqyF)L`C*ZMTmQkJJoR~Cw4PtGxTq`aGQBm
zlw}*opciE^>T~L^aBWfg%@$l6#;Taa>`yC;Qz)9otTygtSLnSd&P2fkH~uX$40dBb
z+3Bk)2Mgq<emHL~@MI)lu6bk1Zlz*g4ehz%%3&eeu4XE&QBDJ87{R{Subq~1fVQ>j
zgNLLWtmmZ0)s3VZAuu!Dl=`|DU?mi%dW~p7*>Xr3A&c}y<U&tR0GlX<Uk1C@02Np#
zML}c&ohQIOKVnfrS3$|5LSKR3*TYnMNr6gS03VyCAijWsN}NF)n^Elru?%1)ALt)9
zyw19K*p`(CGcN%mcpk+mOAJu7pn(=O03&S=H$)yJ30OX0bSZ$TK$$Z_rT3fxsk#8m
zL63iy`s)Q{uC$-aZ{Z~hf2#l@ga0Y0um^hM^%s=?Daqu4g1W2z9n<^SOdmi%J4IWQ
zs6zR5S8qv^B%<~$TtKAeVNDd3EV5(6*$huWPzNxPv&z=!^VmcVxVI$IM}u0A_K0Qg
zWHY2SRCGoT21>%j=nVLuM^&8a@GtKT>H?QTC9deczgj%sgC%ojuLZ8DgNX=<^enw5
zR3k#o5J2hi@f&l-v=p?lcq+PJdfX02t|E6jofp4RFN+#ag_I>px|Hj>pMxP@2F?N(
z?v7r%3$K}rB?B9s*F!;zd=V<}IcNkk3a`LLkp|8hQ%1so_+&RWX60Ldfu{g{O#*X<
za~`!yMvxmnv%yWp3C3U>qbL)@bv{^c*!xfLv3!`KF-YNeK{QO<Yi*_b=Di`SnCeUv
zAH&YnGj`Y<#;YFGZZ<>I5o;unJPTsM9dd*13OsumG6Wr8b6+1JBHxSDM2Gup@Y7=6
zTqt>yZ7j7MSc1Qx1Nm}x_L4?AUkY~{JXIXy&i6Q-s>>imt2Nsr7{mlomgF5&ITY&G
zQJ+4@2px3avG}tkGX}_%7iU-=n`6rSFeA>lFT~iVTzNx^2=MQiG>k4}>22}!iYKJa
z$|Aa~nByPhxp%Q?8+Lc>9nkH*(v%wTlU6)SYyZ()p<<7zvGmP^6?1w*oZqDzbJv+R
z))6MDe$+0s^i7%6yjM@jXty{p?-B2ny52dZOgP+B*;;p}rBvqsB0t?Z*F2`8vNKm^
zHR=%X#A8@<?h$>jk<c$Xpd<24`m9@|m2!X5OrM*z?9-vg$v2xU-y}O%Yh5#+O5Pvc
zVkyPs%ypH{WxX0PyHK={HCH-dQ}tj~Bso)fY-88@M-8{{*YKa@Sc@a(;EN~vf7J$G
ZZgWfeBJIRx9;BMZob6j_4h41$-XGQJ)CvFq

diff --git a/app/src/main/res/drawable/ic_placeholder_bandcamp.xml b/app/src/main/res/drawable/ic_placeholder_bandcamp.xml
new file mode 100644
index 00000000000..411e6985497
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder_bandcamp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="97.75"
+    android:viewportWidth="97.75"
+    android:tint="@color/defaultIconTint">
+    <path
+        android:pathData="M48.875,0C21.882,0 0,21.882 0,48.875S21.882,97.75 48.875,97.75 97.75,75.868 97.75,48.875 75.868,0 48.875,0zM64.835,70.857L12.593,70.857l20.32,-43.965h52.244L64.835,70.857z"
+        android:fillColor="#FF000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_placeholder_circle.xml b/app/src/main/res/drawable/ic_placeholder_circle.xml
new file mode 100644
index 00000000000..dc0a218b8db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder_circle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="@color/defaultIconTint" >
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.49 10,-10S17.52,2 12,2L12,2z"
+        android:fillColor="#FF000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_placeholder_cloud.xml b/app/src/main/res/drawable/ic_placeholder_cloud.xml
new file mode 100644
index 00000000000..15a682b76e5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder_cloud.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/defaultIconTint">
+    <path
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"
+        android:fillColor="#FF000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_placeholder_media_ccc.xml b/app/src/main/res/drawable/ic_placeholder_media_ccc.xml
new file mode 100644
index 00000000000..cdc743cb2de
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder_media_ccc.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="26.458319"
+    android:viewportHeight="26.458332"
+    android:tint="@color/defaultIconTint">
+  <path
+      android:pathData="M13.23,0.302C6.07,0.302 0.264,6.107 0.264,13.267a12.965,12.965 0,0 0,0.847 4.595c0.19,-0.497 0.408,-0.982 0.682,-1.438 0.14,-0.232 0.294,-0.457 0.396,-0.707 0.103,-0.25 0.15,-0.533 0.072,-0.792a1.362,1.362 0,0 0,-0.22 -0.404c-0.092,-0.123 -0.192,-0.24 -0.275,-0.37a1.662,1.662 0,0 1,-0.255 -1.12,1.5 1.5,0 0,1 0.58,-0.987c0.28,-0.208 0.635,-0.3 0.985,-0.288a1.757,1.757 0,0 1,0.346 0.048c0.452,0.11 0.852,0.393 1.148,0.75 0.368,0.447 0.584,1.01 0.637,1.586a3.574,3.574 0,0 1,-0.275 1.693c-0.4,0.955 -1.15,1.725 -1.565,2.673 -0.338,0.775 -0.435,1.638 -0.39,2.483 0.007,0.077 0.018,0.155 0.025,0.234a12.965,12.965 0,0 0,3.62 3.18,17.63 17.63,0 0,1 -0.13,-2.11c0.002,-0.56 0.03,-1.12 0.085,-1.675 -0.34,-0.236 -0.65,-0.51 -0.87,-0.86 -0.392,-0.62 -0.466,-1.408 -0.305,-2.124 0.16,-0.717 0.54,-1.37 0.997,-1.945a7.833,7.833 0,0 1,2.835 -2.223,10.305 10.305,0 0,1 -0.09,-0.126 4.854,4.854 0,0 1,-0.702 -2.176c-0.06,-0.777 0.064,-1.554 0.115,-2.33 0.037,-0.543 0.04,-1.085 0.07,-1.627 0.038,-0.627 0.114,-1.255 0.29,-1.858a2.36,2.36 0,0 1,0.266 -0.63,1.4 1.4,0 0,1 0.594,-0.514c0.274,-0.108 0.51,-0.132 0.776,-0.087 0.22,0.046 0.425,0.156 0.604,0.294 0.18,0.138 0.335,0.304 0.48,0.477a7.298,7.298 0,0 1,1.04 1.617,3.57 3.57,0 0,1 1.09,0 7.287,7.287 0,0 1,1.04 -1.616,3.21 3.21,0 0,1 0.48,-0.476c0.18,-0.14 0.383,-0.248 0.604,-0.295a1.268,1.268 0,0 1,0.78 0.086,1.402 1.402,0 0,1 0.595,0.517c0.124,0.19 0.202,0.408 0.266,0.626 0.175,0.602 0.252,1.23 0.29,1.856 0.03,0.543 0.033,1.087 0.07,1.628 0.05,0.777 0.175,1.554 0.116,2.33a4.855,4.855 0,0 1,-0.705 2.178c-0.03,0.05 -0.07,0.096 -0.103,0.145 0.247,0.278 0.598,0.513 0.898,0.614a1.956,1.956 0,0 0,1.05 0.044,1.65 1.65,0 0,0 0.533,-0.226 1.253,1.253 0,0 0,0.397 -0.418c0.118,-0.21 0.166,-0.45 0.192,-0.687 0.067,-0.61 0,-1.224 -0.05,-1.835 -0.034,-0.396 -0.062,-0.8 0.027,-1.187 0.06,-0.26 0.177,-0.518 0.373,-0.7a1.106,1.106 0,0 1,0.465 -0.255,1.312 1.312,0 0,1 0.53,-0.03c0.38,0.057 0.736,0.274 0.948,0.594 0.12,0.18 0.194,0.39 0.238,0.604 0.044,0.213 0.06,0.43 0.072,0.648 0.04,0.76 0.04,1.522 0.018,2.284 -0.018,0.665 -0.055,1.348 -0.32,1.957 -0.343,0.782 -1.032,1.366 -1.775,1.786a7.052,7.052 0,0 1,-1.588 0.647c0.482,1.54 0.733,3.24 0.733,4.968a17.6,17.6 0,0 1,-0.135 2.125,12.964 12.964,0 0,0 6.384,-11.152c0,-7.16 -5.806,-12.965 -12.965,-12.965zM9.602,16.284v1.483a1.88,1.88 0,0 1,1.083 0.362,1.738 1.738,0 0,1 0.556,0.68c0.122,0.27 0.166,0.576 0.116,0.868a1.493,1.493 0,0 1,-0.332 0.708,1.647 1.647,0 0,1 -0.635,0.458 1.738,1.738 0,0 1,-0.787 0.122v3.73l7.762,-4.208 -7.762,-4.204z"
+      android:fillColor="#FF000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_placeholder_peertube.xml b/app/src/main/res/drawable/ic_placeholder_peertube.xml
new file mode 100644
index 00000000000..263d92d701d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder_peertube.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="400"
+    android:viewportHeight="400">
+    <path android:fillColor="#747474" android:fillType="evenOdd" android:pathData="m62.497,198.29 l-1.302,0.161 0.102,90.941c0.057,50.018 0.228,91.066 0.38,91.218 0.3,0.3 2.723,-0.642 2.723,-1.059 0,-0.14 0.54,-0.478 1.2,-0.751 0.66,-0.273 1.2,-0.655 1.2,-0.849 0,-0.193 0.36,-0.351 0.8,-0.351 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.193,-0.4 0.428,-0.4s1.213,-0.54 2.172,-1.2c0.959,-0.66 1.924,-1.2 2.143,-1.2 0.22,0 0.643,-0.225 0.941,-0.5 0.742,-0.686 2.767,-1.902 3.616,-2.171 0.385,-0.122 0.7,-0.381 0.7,-0.576 0,-0.194 0.27,-0.353 0.6,-0.353 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.159 0.6,-0.353 0,-0.195 0.315,-0.454 0.7,-0.576 0.687,-0.217 2.906,-1.476 3.3,-1.872 0.11,-0.11 0.692,-0.454 1.293,-0.764 0.602,-0.309 1.449,-0.894 1.884,-1.299 0.434,-0.405 0.985,-0.736 1.223,-0.736 0.238,0 0.82,-0.36 1.292,-0.8 0.472,-0.44 1.095,-0.8 1.383,-0.8 0.289,0 0.525,-0.18 0.525,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.136 0.6,-0.302 0,-0.167 0.585,-0.557 1.3,-0.868 0.715,-0.311 1.39,-0.67 1.5,-0.798 0.248,-0.287 2.057,-1.322 4.3,-2.459 0.935,-0.473 1.7,-1.021 1.7,-1.217 0,-0.196 0.255,-0.356 0.567,-0.356 0.311,0 0.626,-0.167 0.7,-0.37 0.073,-0.204 0.403,-0.429 0.733,-0.5 0.33,-0.072 0.87,-0.405 1.2,-0.741 0.33,-0.336 1.455,-1.055 2.5,-1.599s1.9,-1.124 1.9,-1.289c0,-0.166 0.36,-0.301 0.8,-0.301 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.881,-0.315 1.317,-0.7 1.005,-0.888 2.949,-2.083 3.858,-2.371 0.385,-0.122 0.7,-0.381 0.7,-0.576 0,-0.194 0.36,-0.353 0.8,-0.353 0.44,0 0.8,-0.158 0.8,-0.351 0,-0.194 0.555,-0.582 1.234,-0.863 0.679,-0.281 1.444,-0.708 1.7,-0.949 0.256,-0.24 1.276,-0.878 2.266,-1.417s2.149,-1.304 2.575,-1.7c0.427,-0.396 1.012,-0.72 1.3,-0.72 0.289,0 0.525,-0.136 0.525,-0.302 0,-0.167 0.585,-0.562 1.3,-0.878 0.715,-0.317 1.649,-0.9 2.075,-1.298 0.427,-0.397 1.012,-0.722 1.3,-0.722 0.289,0 0.525,-0.168 0.525,-0.373s0.359,-0.487 0.798,-0.626c0.438,-0.139 1.023,-0.468 1.3,-0.729 0.276,-0.262 1.357,-0.909 2.402,-1.437 1.045,-0.529 1.9,-1.112 1.9,-1.298 0,-0.185 0.294,-0.337 0.653,-0.337 0.359,0 0.944,-0.324 1.3,-0.72 0.356,-0.397 1.314,-1.031 2.13,-1.411 0.816,-0.38 1.582,-0.85 1.702,-1.045 0.121,-0.195 1.073,-0.766 2.117,-1.269 1.044,-0.502 2.124,-1.136 2.4,-1.408 0.277,-0.272 0.862,-0.609 1.3,-0.748 0.439,-0.139 0.798,-0.421 0.798,-0.626 0,-0.205 0.36,-0.373 0.8,-0.373 0.44,0 0.8,-0.151 0.8,-0.336 0,-0.184 0.405,-0.546 0.9,-0.802 0.495,-0.257 1.62,-0.92 2.5,-1.473 0.88,-0.553 1.87,-1.124 2.2,-1.268 0.33,-0.145 0.69,-0.366 0.8,-0.492 0.358,-0.41 2.57,-1.826 3.8,-2.432 0.66,-0.325 1.491,-0.908 1.847,-1.294 0.356,-0.387 0.941,-0.703 1.3,-0.703 0.359,0 0.653,-0.18 0.653,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.136,-0.8 1.475,-0.8 0.339,0 0.617,-0.168 0.617,-0.373s0.359,-0.487 0.798,-0.626c0.438,-0.139 1.032,-0.467 1.319,-0.727 0.287,-0.261 1.323,-0.9 2.302,-1.42 2.232,-1.186 6.137,-3.755 6.314,-4.154 0.074,-0.165 0.479,-0.3 0.9,-0.3 0.422,0 0.767,-0.18 0.767,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.136,-0.8 1.475,-0.8 0.339,0 0.617,-0.142 0.617,-0.315 0,-0.174 1.035,-0.937 2.3,-1.697 1.265,-0.759 2.36,-1.517 2.433,-1.684 0.074,-0.167 0.479,-0.304 0.9,-0.304 0.422,0 0.767,-0.18 0.767,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.603,-0.135 0.606,-0.3 0.004,-0.165 0.904,-0.74 2,-1.279 2.097,-1.029 2.38,-1.387 1.394,-1.766 -0.33,-0.126 -0.6,-0.495 -0.6,-0.82 0,-0.324 -0.54,-0.909 -1.2,-1.299 -0.66,-0.39 -1.2,-0.85 -1.2,-1.022 0,-0.173 -0.19,-0.314 -0.422,-0.314 -0.232,0 -1.482,-0.72 -2.778,-1.6 -1.296,-0.88 -2.463,-1.6 -2.594,-1.6 -0.247,0 -2.653,-1.624 -3.006,-2.029 -0.11,-0.126 -0.47,-0.347 -0.8,-0.492 -0.33,-0.144 -1.32,-0.706 -2.2,-1.249 -3.131,-1.933 -5.106,-3.03 -5.45,-3.03 -0.193,0 -0.35,-0.18 -0.35,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.159 -0.6,-0.353 0,-0.195 -0.315,-0.454 -0.7,-0.576 -0.843,-0.267 -2.872,-1.483 -3.606,-2.161 -0.292,-0.27 -1.198,-0.804 -2.013,-1.187 -0.814,-0.383 -1.83,-1.018 -2.256,-1.41 -0.427,-0.392 -1.012,-0.713 -1.3,-0.713 -0.289,0 -0.525,-0.158 -0.525,-0.351 0,-0.194 -0.54,-0.576 -1.2,-0.849 -0.66,-0.273 -1.2,-0.655 -1.2,-0.849 0,-0.193 -0.36,-0.351 -0.8,-0.351 -0.44,0 -0.8,-0.139 -0.8,-0.308 0,-0.17 -0.81,-0.751 -1.8,-1.292s-1.8,-1.122 -1.8,-1.292c0,-0.169 -0.194,-0.308 -0.432,-0.308s-1.363,-0.615 -2.5,-1.367 -2.563,-1.591 -3.168,-1.865c-0.605,-0.273 -1.1,-0.648 -1.1,-0.832 0,-0.185 -0.345,-0.336 -0.767,-0.336 -0.421,0 -0.826,-0.135 -0.9,-0.3 -0.167,-0.376 -2.297,-1.675 -3.233,-1.971 -0.385,-0.122 -0.7,-0.381 -0.7,-0.576 0,-0.194 -0.188,-0.353 -0.417,-0.353 -0.229,0 -0.803,-0.36 -1.275,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.136 -0.6,-0.302 0,-0.167 -0.526,-0.535 -1.168,-0.82 -0.642,-0.284 -2.268,-1.228 -3.613,-2.097 -1.345,-0.87 -2.62,-1.581 -2.832,-1.581a0.395,0.395 0,0 1,-0.387 -0.4c0,-0.22 -0.236,-0.4 -0.525,-0.4 -0.288,0 -0.877,-0.315 -1.308,-0.7 -0.431,-0.385 -1.814,-1.24 -3.074,-1.9 -1.259,-0.66 -2.291,-1.335 -2.292,-1.5 0,-0.165 -0.271,-0.3 -0.601,-0.3 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.36,-0.4 -0.8,-0.4 -0.44,0 -0.8,-0.18 -0.8,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.236,-0.4 -0.525,-0.4 -0.288,0 -0.911,-0.36 -1.383,-0.8 -0.472,-0.44 -1.054,-0.8 -1.292,-0.8s-0.82,-0.36 -1.292,-0.8c-0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.236,-0.4 -0.525,-0.4 -0.288,0 -0.911,-0.36 -1.383,-0.8 -0.472,-0.44 -0.975,-0.8 -1.117,-0.8 -0.143,0 -1.059,-0.54 -2.037,-1.2 -0.978,-0.66 -1.949,-1.2 -2.158,-1.2 -0.209,0 -0.38,-0.159 -0.38,-0.353 0,-0.195 -0.315,-0.454 -0.7,-0.576 -0.685,-0.217 -2.904,-1.475 -3.3,-1.871 -0.11,-0.11 -1.234,-0.74 -2.499,-1.4 -1.264,-0.66 -2.299,-1.335 -2.3,-1.5 0,-0.165 -0.237,-0.3 -0.526,-0.3 -0.288,0 -0.911,-0.36 -1.383,-0.8 -0.472,-0.44 -1.136,-0.8 -1.475,-0.8 -0.339,0 -0.617,-0.18 -0.617,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.152 -0.6,-0.337 0,-0.186 -0.802,-0.75 -1.782,-1.254 -0.981,-0.504 -2.143,-1.252 -2.584,-1.663 -0.44,-0.41 -1.078,-0.746 -1.417,-0.746 -0.339,0 -0.617,-0.18 -0.617,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.146 -0.6,-0.325 0,-0.179 -0.63,-0.573 -1.4,-0.875 -0.77,-0.302 -1.4,-0.667 -1.4,-0.81 0,-0.144 -0.436,-0.46 -0.969,-0.703 -0.533,-0.243 -1.345,-0.767 -1.805,-1.164 -0.841,-0.727 -3.172,-2.122 -6.326,-3.786 -0.935,-0.493 -1.7,-1.041 -1.7,-1.217 0,-0.176 -0.278,-0.32 -0.617,-0.32 -0.339,0 -1.003,-0.36 -1.475,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.897,-0.8 -1.288,-0.8 -0.392,0 -0.712,-0.18 -0.712,-0.4 0,-0.22 -0.236,-0.4 -0.525,-0.4 -0.288,0 -0.911,-0.36 -1.383,-0.8 -0.472,-0.44 -1.046,-0.8 -1.275,-0.8 -0.229,0 -0.417,-0.159 -0.417,-0.353 0,-0.195 -0.315,-0.454 -0.7,-0.576 -0.909,-0.288 -2.853,-1.483 -3.858,-2.371 -0.436,-0.385 -0.984,-0.671 -1.217,-0.636 -0.234,0.035 -1.011,0.137 -1.728,0.226"/>
+    <path android:fillColor="#241c24" android:fillType="evenOdd" android:pathData="M61.443,15.833c-0.134,0.348 -0.243,41.384 -0.243,91.192v90.56l0.9,0.183c2.602,0.53 3.145,0.527 2.936,-0.019 -0.13,-0.339 0.062,-0.549 0.501,-0.549 0.392,0 1.099,-0.36 1.571,-0.8 0.472,-0.44 1.124,-0.8 1.448,-0.8 0.325,0 0.704,-0.36 0.844,-0.8 0.162,-0.511 0.605,-0.8 1.227,-0.8 0.535,0 0.973,-0.18 0.973,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.251,-0.4 0.557,-0.4 0.307,0 0.648,-0.236 0.759,-0.524 0.11,-0.289 0.939,-0.746 1.842,-1.016 0.903,-0.271 1.642,-0.665 1.642,-0.876 0,-0.211 0.276,-0.384 0.613,-0.384 0.336,0 0.715,-0.269 0.841,-0.598 0.127,-0.328 0.391,-0.498 0.588,-0.376 0.197,0.122 0.358,0.031 0.358,-0.202s0.371,-0.424 0.824,-0.424c0.453,0 0.712,-0.18 0.576,-0.4 -0.136,-0.22 0.089,-0.4 0.501,-0.4 0.411,0 1.135,-0.36 1.607,-0.8 0.472,-0.44 1.136,-0.8 1.475,-0.8 0.339,0 0.617,-0.15 0.617,-0.332 0,-0.183 0.495,-0.588 1.1,-0.9 0.605,-0.313 1.335,-0.883 1.623,-1.268 0.287,-0.385 0.872,-0.7 1.3,-0.7 0.427,0 0.777,-0.18 0.777,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.32,-0.4 0.712,-0.4 0.391,0 0.971,-0.36 1.288,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.225,-0.4 0.5,-0.4 0.275,-0.001 1.018,-0.447 1.652,-0.992 0.634,-0.545 1.276,-0.914 1.427,-0.821 0.152,0.094 0.528,-0.18 0.836,-0.608 0.309,-0.429 0.779,-0.779 1.045,-0.779 0.715,0 5.34,-2.832 5.34,-3.27 0,-0.208 0.165,-0.275 0.368,-0.15 0.202,0.125 0.639,-0.044 0.971,-0.376 0.332,-0.332 0.897,-0.604 1.256,-0.604s0.541,-0.18 0.405,-0.4c-0.136,-0.22 0.033,-0.4 0.376,-0.4 0.343,0 0.624,-0.18 0.624,-0.4 0,-0.22 0.36,-0.4 0.8,-0.4 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.093,-0.8 1.379,-0.8 0.286,0 0.745,-0.36 1.02,-0.8 0.275,-0.44 0.869,-0.8 1.32,-0.8 0.451,0 0.709,-0.18 0.573,-0.4 -0.136,-0.22 0.078,-0.4 0.476,-0.4 0.398,-0.001 1.242,-0.447 1.876,-0.992 0.634,-0.545 1.29,-0.906 1.458,-0.802 0.169,0.104 0.414,-0.091 0.545,-0.434 0.132,-0.342 0.388,-0.531 0.569,-0.419 0.182,0.112 0.583,-0.146 0.891,-0.574 0.309,-0.429 0.842,-0.779 1.185,-0.779 0.343,0 0.883,-0.36 1.2,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.349,-0.4 0.776,-0.4 0.427,0 0.881,-0.169 1.008,-0.375 0.128,-0.206 0.723,-0.631 1.324,-0.945 2.777,-1.451 3.262,-1.776 3.019,-2.019 -0.143,-0.144 0.096,-0.261 0.531,-0.261 0.435,0 1.14,-0.315 1.567,-0.7 0.426,-0.385 1.315,-0.97 1.975,-1.3 0.66,-0.33 1.549,-0.915 1.975,-1.3 0.427,-0.385 1.012,-0.7 1.3,-0.7 0.289,0 0.525,-0.18 0.525,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.147,-0.8 1.499,-0.8 0.352,0 0.529,-0.18 0.393,-0.4 -0.136,-0.22 0.033,-0.4 0.376,-0.4 0.343,0 0.624,-0.18 0.624,-0.4 0,-0.22 0.36,-0.4 0.8,-0.4 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.32,-0.4 0.712,-0.4 0.391,0 0.971,-0.36 1.288,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.281,-0.4 0.624,-0.4 0.343,0 0.512,-0.18 0.376,-0.4 -0.136,-0.22 0.123,-0.4 0.576,-0.4 0.453,0 0.824,-0.168 0.824,-0.373s0.375,-0.492 0.834,-0.638c1.035,-0.328 4.918,-2.681 5.099,-3.089 0.074,-0.165 0.396,-0.3 0.717,-0.3 0.321,0 0.97,-0.36 1.442,-0.8 0.472,-0.44 1.095,-0.8 1.383,-0.8 0.289,0 0.525,-0.18 0.525,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.117,-0.8 1.432,-0.8 0.316,0 0.682,-0.281 0.814,-0.625 0.132,-0.344 0.394,-0.531 0.583,-0.414 0.188,0.116 0.684,-0.097 1.102,-0.475 0.419,-0.377 1.25,-0.938 1.847,-1.246 0.598,-0.308 0.975,-0.741 0.839,-0.962 -0.137,-0.221 -0.052,-0.28 0.187,-0.132 0.24,0.148 0.89,-0.184 1.444,-0.738 0.554,-0.555 1.286,-1.008 1.626,-1.008 0.34,0 0.618,-0.18 0.618,-0.4 0,-0.22 0.36,-0.4 0.8,-0.4 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.32,-0.4 0.712,-0.4 0.391,0 0.971,-0.36 1.288,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.16 0.712,-0.357 0,-0.196 0.409,-0.459 0.908,-0.584 0.499,-0.125 1.309,-0.602 1.8,-1.059 0.491,-0.457 0.892,-0.706 0.892,-0.554 0,0.153 0.315,0.017 0.7,-0.301 0.385,-0.319 1.192,-0.826 1.793,-1.126 0.602,-0.301 1.449,-0.878 1.884,-1.283 0.434,-0.405 1.078,-0.736 1.43,-0.736 0.352,0 0.529,-0.18 0.393,-0.4 -0.136,-0.22 0.033,-0.4 0.376,-0.4 0.343,0 0.624,-0.18 0.624,-0.4 0,-0.22 0.36,-0.4 0.8,-0.4 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.272,-0.4 0.604,-0.4 0.332,0 1.168,-0.54 1.859,-1.2 0.691,-0.66 1.555,-1.2 1.921,-1.2 0.366,0 1.052,-0.36 1.524,-0.8 0.472,-0.44 1.124,-0.8 1.448,-0.8 0.325,0 0.704,-0.36 0.844,-0.8 0.162,-0.511 0.605,-0.8 1.227,-0.8 0.535,0 0.973,-0.18 0.973,-0.4 0,-0.22 0.198,-0.4 0.44,-0.4 0.614,0 2.76,-2.365 2.76,-3.042 0,-0.307 0.27,-0.558 0.6,-0.558 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 -0.326,-0.4 -0.725,-0.4 -0.398,0 -1.111,-0.36 -1.583,-0.8 -0.472,-0.44 -1.147,-0.8 -1.499,-0.8 -0.352,0 -0.529,-0.18 -0.393,-0.4 0.136,-0.22 -0.018,-0.4 -0.343,-0.4s-0.653,-0.188 -0.73,-0.418c-0.076,-0.23 -0.541,-0.448 -1.033,-0.485 -0.492,-0.037 -0.996,-0.389 -1.121,-0.782s-0.492,-0.715 -0.817,-0.715c-0.324,0 -0.976,-0.36 -1.448,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.882,-0.8 -1.255,-0.8 -0.373,0 -0.738,-0.167 -0.812,-0.37 -0.073,-0.204 -0.403,-0.429 -0.733,-0.5 -0.33,-0.072 -0.891,-0.445 -1.247,-0.83 -0.356,-0.385 -0.941,-0.7 -1.3,-0.7 -0.359,0 -0.653,-0.147 -0.653,-0.326 0,-0.431 -3.196,-2.221 -3.213,-1.8 -0.008,0.179 -0.329,-0.034 -0.714,-0.474 -0.386,-0.44 -0.931,-0.849 -1.213,-0.909 -0.282,-0.059 -0.894,-0.464 -1.361,-0.9 -0.468,-0.435 -1.187,-0.791 -1.598,-0.791 -0.412,0 -0.637,-0.18 -0.501,-0.4 0.136,-0.22 -0.084,-0.4 -0.488,-0.4 -0.405,0 -0.995,-0.36 -1.312,-0.8 -0.317,-0.44 -0.771,-0.8 -1.009,-0.8 -0.666,0 -2.584,-0.963 -2.588,-1.3 -0.002,-0.165 -0.291,-0.3 -0.643,-0.3 -0.351,0 -1.121,-0.495 -1.71,-1.1 -1.262,-1.295 -2.591,-2.1 -3.468,-2.1 -0.346,0 -0.528,-0.164 -0.403,-0.365 0.124,-0.201 -0.315,-0.605 -0.977,-0.898 -0.661,-0.293 -1.202,-0.668 -1.202,-0.835 0,-0.166 -0.461,-0.302 -1.024,-0.302s-0.929,-0.153 -0.813,-0.34c0.115,-0.187 -0.279,-0.592 -0.877,-0.9 -0.597,-0.308 -1.324,-0.785 -1.614,-1.059 -0.29,-0.275 -0.965,-0.61 -1.5,-0.744s-0.972,-0.385 -0.972,-0.557c0,-0.172 -0.45,-0.426 -1,-0.564 -0.55,-0.138 -1,-0.428 -1,-0.644 0,-0.215 -0.345,-0.392 -0.767,-0.392 -0.421,0 -0.826,-0.135 -0.9,-0.3 -0.249,-0.561 -2.698,-2.1 -3.34,-2.1 -0.352,0 -0.539,-0.164 -0.414,-0.365 0.124,-0.201 -0.315,-0.605 -0.977,-0.898 -0.661,-0.293 -1.202,-0.668 -1.202,-0.835 0,-0.166 -0.32,-0.302 -0.712,-0.302 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.897,-0.8 -1.288,-0.8 -0.392,0 -0.712,-0.18 -0.712,-0.4 0,-0.22 -0.36,-0.4 -0.8,-0.4 -0.44,0 -0.8,-0.18 -0.8,-0.4 0,-0.22 -0.281,-0.4 -0.624,-0.4 -0.343,0 -0.512,-0.18 -0.376,-0.4 0.136,-0.22 -0.041,-0.4 -0.393,-0.4 -0.352,0 -1.027,-0.36 -1.499,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.146 -0.525,-0.325 0,-0.179 -0.622,-0.57 -1.382,-0.868 -0.76,-0.298 -1.302,-0.671 -1.204,-0.829 0.145,-0.235 -0.523,-0.541 -1.623,-0.743 -0.105,-0.019 -0.506,-0.316 -0.891,-0.66 -1.218,-1.087 -3.713,-2.575 -4.318,-2.575 -0.32,0 -0.582,-0.18 -0.582,-0.4 0,-0.22 -0.36,-0.4 -0.8,-0.4 -0.44,0 -0.8,-0.18 -0.8,-0.4 0,-0.22 -0.272,-0.4 -0.604,-0.4 -0.332,0 -1.168,-0.54 -1.859,-1.2 -0.691,-0.66 -1.499,-1.2 -1.796,-1.2 -0.298,0 -0.541,-0.18 -0.541,-0.4 0,-0.22 -0.236,-0.4 -0.525,-0.4 -0.288,0 -0.899,-0.349 -1.357,-0.776 -0.458,-0.427 -0.938,-0.671 -1.066,-0.543 -0.128,0.129 -0.347,-0.062 -0.485,-0.424 -0.139,-0.361 -0.511,-0.657 -0.827,-0.657 -0.315,0 -0.96,-0.36 -1.432,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.151 -0.525,-0.336 0,-0.185 -0.726,-0.576 -1.613,-0.868 -1.096,-0.362 -1.449,-0.637 -1.1,-0.858 0.352,-0.224 0.231,-0.328 -0.387,-0.332 -0.495,-0.003 -0.9,-0.143 -0.9,-0.31s-0.379,-0.54 -0.842,-0.829c-0.697,-0.436 -0.795,-0.435 -0.569,0.003 0.149,0.292 -0.086,0.125 -0.523,-0.37 -0.437,-0.495 -1.08,-0.9 -1.43,-0.9 -0.35,0 -0.636,-0.159 -0.636,-0.354 0,-0.195 -0.647,-0.69 -1.439,-1.1l-2.2,-1.141c-0.418,-0.217 -0.761,-0.532 -0.761,-0.7 0,-0.168 -0.294,-0.305 -0.653,-0.305 -0.359,0 -0.944,-0.315 -1.3,-0.7 -0.356,-0.385 -0.917,-0.758 -1.247,-0.83 -0.33,-0.071 -0.66,-0.296 -0.733,-0.5 -0.074,-0.203 -0.489,-0.37 -0.924,-0.37 -0.435,0 -0.679,-0.18 -0.543,-0.4 0.136,-0.22 -0.033,-0.4 -0.376,-0.4 -0.343,0 -0.624,-0.191 -0.624,-0.424 0,-0.233 -0.178,-0.313 -0.397,-0.178 -0.218,0.135 -0.856,-0.215 -1.418,-0.776 -0.562,-0.562 -1.283,-1.022 -1.603,-1.022 -0.32,0 -0.582,-0.18 -0.582,-0.4 0,-0.22 -0.36,-0.4 -0.8,-0.4 -0.44,0 -0.8,-0.18 -0.8,-0.4 0,-0.22 -0.281,-0.4 -0.624,-0.4 -0.343,0 -0.512,-0.18 -0.376,-0.4 0.136,-0.22 -0.046,-0.4 -0.405,-0.4 -0.359,0 -0.924,-0.272 -1.256,-0.604 -0.332,-0.332 -0.797,-0.484 -1.033,-0.338 -0.239,0.148 -0.315,0.08 -0.17,-0.154 0.23,-0.372 -0.587,-0.975 -1.451,-1.069 -0.173,-0.019 -0.443,-0.215 -0.6,-0.435 -0.157,-0.22 -0.69,-0.625 -1.185,-0.9l-1.8,-1c-0.495,-0.275 -0.992,-0.621 -1.104,-0.768 -0.112,-0.147 -0.465,-0.327 -0.784,-0.4 -0.319,-0.073 -0.945,-0.455 -1.391,-0.85 -0.942,-0.834 -2.942,-1.882 -3.594,-1.882 -0.248,0 -0.71,-0.36 -1.027,-0.8 -0.317,-0.44 -0.897,-0.8 -1.288,-0.8 -0.392,0 -0.712,-0.18 -0.712,-0.4a0.41,0.41 0,0 0,-0.417 -0.4c-0.229,0 -0.803,-0.36 -1.275,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.371,-0.4 -0.824,-0.4 -0.453,0 -0.712,-0.18 -0.576,-0.4 0.136,-0.22 -0.033,-0.4 -0.376,-0.4 -0.343,0 -0.624,-0.191 -0.624,-0.424 0,-0.233 -0.157,-0.326 -0.348,-0.208 -0.191,0.118 -0.866,-0.231 -1.5,-0.776s-1.377,-0.991 -1.652,-0.992c-0.275,0 -0.5,-0.18 -0.5,-0.4 0,-0.22 -0.349,-0.4 -0.776,-0.4 -0.427,0 -0.888,-0.18 -1.024,-0.4 -0.365,-0.59 -0.881,-0.487 -1.157,0.233"/>
+    <path android:fillColor="#f46c0c" android:fillType="evenOdd" android:pathData="m209.629,107.854 l-0.829,1.054v88.818c0,67.591 0.114,89.131 0.475,90.132 0.48,1.327 1.59,2.146 1.851,1.365 0.077,-0.233 0.325,-0.423 0.549,-0.423 0.225,0 1.209,-0.54 2.187,-1.2 0.978,-0.66 1.915,-1.2 2.083,-1.2 0.167,0 0.653,-0.315 1.08,-0.7 0.426,-0.385 1.315,-0.97 1.975,-1.3 0.66,-0.33 1.549,-0.915 1.975,-1.3 0.427,-0.385 1.012,-0.7 1.3,-0.7 0.289,0 0.525,-0.18 0.525,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.096,-0.8 1.387,-0.8 0.291,0 0.788,-0.36 1.105,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.136,-0.8 1.475,-0.8 0.339,0 0.617,-0.18 0.617,-0.4 0,-0.22 0.177,-0.4 0.392,-0.4 0.216,0 1.377,-0.63 2.581,-1.4 1.204,-0.77 2.377,-1.4 2.608,-1.4 0.23,0 0.419,-0.158 0.419,-0.351 0,-0.194 0.54,-0.576 1.2,-0.849 0.66,-0.273 1.2,-0.655 1.2,-0.849 0,-0.193 0.236,-0.351 0.525,-0.351 0.288,0 0.88,-0.315 1.315,-0.7 0.435,-0.385 1.053,-0.759 1.372,-0.832 0.319,-0.073 0.672,-0.253 0.784,-0.401 0.112,-0.147 0.699,-0.523 1.304,-0.835 0.605,-0.312 1.1,-0.717 1.1,-0.9 0,-0.182 0.36,-0.332 0.8,-0.332 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.15 0.6,-0.332 0,-0.183 0.495,-0.583 1.1,-0.888 0.605,-0.306 1.852,-1.056 2.772,-1.668 0.92,-0.611 1.825,-1.112 2.012,-1.112 0.187,0 0.599,-0.36 0.916,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.345,-0.4 0.767,-0.4 0.421,0 0.826,-0.142 0.9,-0.315 0.073,-0.173 1.573,-1.171 3.333,-2.217 4.228,-2.513 4.506,-2.684 6.465,-3.968 0.924,-0.605 1.832,-1.1 2.019,-1.1 0.187,0 0.599,-0.36 0.916,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.136,-0.8 1.475,-0.8 0.339,0 0.617,-0.18 0.617,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.096,-0.8 1.387,-0.8 0.291,0 0.788,-0.36 1.105,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.602,-0.135 0.605,-0.3 0.002,-0.165 0.722,-0.644 1.6,-1.064 0.877,-0.421 1.595,-0.946 1.595,-1.167 0,-0.221 0.105,-0.298 0.233,-0.17 0.209,0.209 2.414,-1.055 3.65,-2.093 0.266,-0.223 0.761,-0.406 1.1,-0.406 0.339,0 0.617,-0.158 0.617,-0.351 0,-0.194 0.54,-0.576 1.2,-0.849 0.66,-0.273 1.2,-0.655 1.2,-0.849 0,-0.193 0.193,-0.351 0.428,-0.351s1.213,-0.54 2.172,-1.2c0.959,-0.66 1.937,-1.2 2.172,-1.2 0.235,0 0.428,-0.18 0.428,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.27,-0.4 0.6,-0.4 0.33,0 0.6,-0.18 0.6,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.136,-0.8 1.475,-0.8 0.339,0 0.617,-0.18 0.617,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.096,-0.8 1.387,-0.8 0.291,0 0.788,-0.36 1.105,-0.8 0.317,-0.44 0.802,-0.8 1.078,-0.8 0.43,0 6.356,-3.423 6.922,-3.998 0.11,-0.112 0.695,-0.458 1.3,-0.77 0.605,-0.312 1.1,-0.717 1.1,-0.9 0,-0.182 0.36,-0.332 0.8,-0.332 0.44,0 0.8,-0.18 0.8,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.911,-0.36 1.383,-0.8 0.472,-0.44 1.096,-0.8 1.387,-0.8 0.291,0 0.788,-0.36 1.105,-0.8 0.317,-0.44 0.897,-0.8 1.288,-0.8 0.392,0 0.712,-0.18 0.712,-0.4 0,-0.22 0.236,-0.4 0.525,-0.4 0.288,0 0.873,-0.315 1.3,-0.7 0.426,-0.385 1.315,-0.969 1.975,-1.297 0.66,-0.329 1.491,-0.914 1.847,-1.3 0.356,-0.387 0.941,-0.703 1.3,-0.703 0.359,0 0.654,-0.135 0.656,-0.3 0.002,-0.165 0.407,-0.501 0.9,-0.748 1.342,-0.669 3.106,-1.675 4.897,-2.79 0.88,-0.548 1.915,-1.099 2.3,-1.226 0.385,-0.126 0.7,-0.388 0.7,-0.583 0,-0.194 0.167,-0.353 0.371,-0.353 0.203,0 1.729,-0.9 3.39,-2s3.205,-2 3.43,-2c0.225,0 0.409,-0.611 0.409,-1.358 0,-1.231 -2.797,-3.842 -4.115,-3.842 -0.135,0 -1.045,-0.54 -2.023,-1.2 -0.978,-0.66 -2.027,-1.2 -2.332,-1.2 -0.304,0 -0.813,-0.36 -1.13,-0.8 -0.317,-0.44 -0.814,-0.8 -1.105,-0.8 -0.291,0 -0.915,-0.36 -1.387,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.729,-0.8 -0.916,-0.8 -0.187,0 -1.125,-0.54 -2.084,-1.2 -0.959,-0.66 -1.937,-1.2 -2.172,-1.2 -0.235,0 -0.428,-0.159 -0.428,-0.353 0,-0.195 -0.315,-0.454 -0.7,-0.576 -0.909,-0.288 -2.853,-1.483 -3.858,-2.371 -0.436,-0.385 -1.029,-0.7 -1.317,-0.7 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.36,-0.4 -0.8,-0.4 -0.44,0 -0.8,-0.167 -0.8,-0.371s-0.72,-0.689 -1.6,-1.077c-0.88,-0.388 -1.6,-0.829 -1.6,-0.98 0,-0.151 -0.585,-0.515 -1.3,-0.809 -0.715,-0.293 -1.649,-0.855 -2.075,-1.248 -0.427,-0.393 -1.012,-0.715 -1.3,-0.715 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.371,-0.4 -0.824,-0.4 -0.453,0 -0.712,-0.18 -0.576,-0.4 0.136,-0.22 -0.033,-0.4 -0.376,-0.4 -0.343,0 -0.624,-0.18 -0.624,-0.4 0,-0.22 -0.278,-0.4 -0.617,-0.4 -0.339,0 -1.003,-0.36 -1.475,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.814,-0.8 -1.105,-0.8 -0.291,0 -0.915,-0.36 -1.387,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.193,-0.4 -0.428,-0.4s-1.213,-0.54 -2.172,-1.2c-0.959,-0.66 -1.937,-1.2 -2.172,-1.2 -0.235,0 -0.429,-0.135 -0.429,-0.3 -0.001,-0.165 -1.036,-0.84 -2.3,-1.5 -1.265,-0.66 -2.389,-1.29 -2.499,-1.401 -0.11,-0.11 -0.695,-0.455 -1.3,-0.767 -0.605,-0.312 -1.1,-0.717 -1.1,-0.9 0,-0.182 -0.36,-0.332 -0.8,-0.332 -0.44,0 -0.8,-0.18 -0.8,-0.4 0,-0.22 -0.371,-0.4 -0.824,-0.4 -0.453,0 -0.712,-0.18 -0.576,-0.4 0.136,-0.22 -0.033,-0.4 -0.376,-0.4 -0.343,0 -0.624,-0.18 -0.624,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.136 -0.6,-0.302 0,-0.167 -0.585,-0.562 -1.3,-0.878 -0.715,-0.317 -1.649,-0.9 -2.075,-1.298 -0.427,-0.397 -1.012,-0.722 -1.3,-0.722 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.278,-0.4 -0.617,-0.4 -0.339,0 -1.003,-0.36 -1.475,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.135 -0.525,-0.301 0,-0.165 -0.855,-0.747 -1.9,-1.294 -1.045,-0.546 -2.138,-1.221 -2.428,-1.499 -0.291,-0.278 -1.371,-1.001 -2.4,-1.606 -1.029,-0.605 -2.412,-1.42 -3.072,-1.811 -0.66,-0.391 -1.515,-0.817 -1.9,-0.947 -0.385,-0.129 -0.7,-0.394 -0.7,-0.589 0,-0.194 -0.32,-0.353 -0.712,-0.353 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.814,-0.8 -1.105,-0.8 -0.291,0 -0.915,-0.36 -1.387,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.278,-0.4 -0.617,-0.4 -0.339,0 -1.003,-0.36 -1.475,-0.8 -0.472,-0.44 -1.364,-1.024 -1.983,-1.297 -0.619,-0.274 -1.125,-0.634 -1.125,-0.801 0,-0.166 -0.27,-0.302 -0.6,-0.302 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.27,-0.4 -0.6,-0.4 -0.33,0 -0.6,-0.159 -0.6,-0.353 0,-0.195 -0.315,-0.454 -0.7,-0.576 -0.778,-0.246 -2.988,-1.532 -3.3,-1.92 -0.11,-0.136 -1.1,-0.738 -2.2,-1.336 -1.1,-0.599 -2.99,-1.69 -4.2,-2.425 -1.21,-0.736 -2.785,-1.639 -3.5,-2.009 -0.715,-0.37 -1.3,-0.832 -1.3,-1.027 0,-0.195 -0.27,-0.354 -0.6,-0.354 -0.33,0 -0.6,-0.18 -0.6,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.897,-0.8 -1.288,-0.8 -0.392,0 -0.712,-0.18 -0.712,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.814,-0.8 -1.105,-0.8 -0.291,0 -0.915,-0.36 -1.387,-0.8 -0.472,-0.44 -1.095,-0.8 -1.383,-0.8 -0.289,0 -0.525,-0.18 -0.525,-0.4 0,-0.22 -0.32,-0.4 -0.712,-0.4 -0.391,0 -0.971,-0.36 -1.288,-0.8 -0.317,-0.44 -0.729,-0.8 -0.916,-0.8 -0.187,0 -1.095,-0.495 -2.019,-1.1 -3.35,-2.196 -6.655,-4.1 -7.115,-4.1 -0.193,0 -0.35,-0.18 -0.35,-0.4 0,-0.22 -0.36,-0.4 -0.8,-0.4 -0.44,0 -0.8,-0.18 -0.8,-0.4 0,-0.722 -0.727,-0.419 -1.571,0.654"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_placeholder_yt.xml b/app/src/main/res/drawable/ic_placeholder_yt.xml
new file mode 100644
index 00000000000..ba8c694405d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder_yt.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="512"
+    android:viewportWidth="512"
+    android:tint="@color/defaultIconTint">
+    <path
+        android:pathData="M156.5,88.1c-56.6,1.8 -79.9,3.7 -91.4,7.5 -9.8,3.3 -15.2,6.6 -23.4,14.3 -8.6,8.1 -14.4,19.5 -18.7,36.3 -8.5,33.7 -10.7,128 -4.5,191.8 5.4,54.7 22.2,75.5 65.6,81.4 57.2,7.8 314,7 354.9,-1 11,-2.2 22.7,-8.2 31.1,-16.2 8.7,-8.1 14.4,-19.2 18.8,-36.2 10.8,-42.1 10.8,-177.1 0.1,-219.8 -4.3,-16.8 -10.1,-28.2 -18.7,-36.3C454.7,95.2 444.6,92.3 401,90c-55,-2.9 -182,-3.9 -244.5,-1.9zM242.5,168.8c24.8,14.5 56.5,33.2 70.5,41.4 76.7,45 75.2,44.2 73.3,45.5 -1.8,1.4 -32.1,19.5 -94.8,56.8 -19.2,11.5 -36.5,21.7 -38.2,22.8l-3.3,1.9v-44.7l32.1,-18.4c17.6,-10.1 32.2,-18.8 32.4,-19.2 0.3,-0.4 -19.6,-12.7 -44.3,-27.3L225.5,201l-0.6,48.8c-0.3,26.8 -0.7,60.5 -0.8,75l-0.1,26.3 -9.7,6.3c-5.4,3.5 -13.5,8.6 -18,11.5L188,374L188,136.8l4.8,2.8c2.6,1.5 25,14.6 49.7,29.2z"
+        android:fillColor="#FF000000"/>
+</vector>
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index d2e936870d0..109c123fcf5 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -86,7 +86,7 @@
                     android:scaleType="fitCenter"
                     app:tint="@color/drawer_header_font_color"
                     tools:ignore="ContentDescription"
-                    tools:srcCompat="@drawable/place_holder_youtube" />
+                    tools:srcCompat="@drawable/ic_placeholder_yt" />
 
                 <org.schabi.newpipe.views.NewPipeTextView
                     android:id="@+id/drawer_header_service_view"
diff --git a/app/src/main/res/layout/item_instance.xml b/app/src/main/res/layout/item_instance.xml
index 1a96c5bb246..dd5b4156fc5 100644
--- a/app/src/main/res/layout/item_instance.xml
+++ b/app/src/main/res/layout/item_instance.xml
@@ -26,7 +26,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="10dp"
             tools:ignore="ContentDescription,RtlHardcoded"
-            tools:src="@drawable/place_holder_peertube" />
+            tools:src="@drawable/ic_placeholder_peertube" />
 
         <TextView
             android:id="@+id/instanceName"

From 7ab11a8379858c06a3b4776f24283bc1861aae7a Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 20 Mar 2022 17:22:48 +0100
Subject: [PATCH 20/28] Used service icons for import

---
 .../newpipe/local/subscription/SubscriptionFragment.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 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 a980e940c40..c0618b2b0cd 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
@@ -58,6 +58,7 @@ import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard
 import org.schabi.newpipe.streams.io.StoredFileHelper
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.OnClickGesture
+import org.schabi.newpipe.util.ServiceHelper
 import org.schabi.newpipe.util.ThemeHelper.getGridSpanCountChannels
 import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
 import org.schabi.newpipe.util.external_communication.ShareUtils
@@ -140,7 +141,6 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     private fun buildImportExportMenu(menu: Menu) {
         // -- Import --
-
         val importSubMenu = menu.addSubMenu(R.string.import_from)
 
         addMenuItem(importSubMenu, R.string.previous_export) {
@@ -157,9 +157,10 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 val supportedSources = subscriptionExtractor.supportedSources
                 if (supportedSources.isEmpty()) continue
 
-                addMenuItem(importSubMenu, serviceName) {
+                val item = addMenuItem(importSubMenu, serviceName) {
                     onImportFromServiceSelected(service.serviceId)
                 }
+                item.setIcon(ServiceHelper.getIcon(service.serviceId))
             } catch (e: ExtractionException) {
                 throw RuntimeException(
                     "Services array contains an entry that it's not a valid service name ($serviceName)",
@@ -169,7 +170,6 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         }
 
         // -- Export --
-
         val exportSubMenu = menu.addSubMenu(R.string.export_to)
 
         addMenuItem(exportSubMenu, R.string.file) { onExportSelected() }

From 7de17ad9495dc7b827f499e7004844b70ee0fe9e Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 20 Mar 2022 17:32:41 +0100
Subject: [PATCH 21/28] Icons for import/export

---
 .../newpipe/local/subscription/SubscriptionFragment.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 c0618b2b0cd..da025a543e4 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
@@ -143,9 +143,8 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         // -- Import --
         val importSubMenu = menu.addSubMenu(R.string.import_from)
 
-        addMenuItem(importSubMenu, R.string.previous_export) {
-            onImportPreviousSelected()
-        }
+        addMenuItem(importSubMenu, R.string.previous_export) { onImportPreviousSelected() }
+            .setIcon(R.drawable.ic_backup)
 
         val services = requireContext().resources.getStringArray(R.array.service_list)
         for (serviceName in services) {
@@ -157,10 +156,10 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 val supportedSources = subscriptionExtractor.supportedSources
                 if (supportedSources.isEmpty()) continue
 
-                val item = addMenuItem(importSubMenu, serviceName) {
+                addMenuItem(importSubMenu, serviceName) {
                     onImportFromServiceSelected(service.serviceId)
                 }
-                item.setIcon(ServiceHelper.getIcon(service.serviceId))
+                    .setIcon(ServiceHelper.getIcon(service.serviceId))
             } catch (e: ExtractionException) {
                 throw RuntimeException(
                     "Services array contains an entry that it's not a valid service name ($serviceName)",
@@ -173,6 +172,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         val exportSubMenu = menu.addSubMenu(R.string.export_to)
 
         addMenuItem(exportSubMenu, R.string.file) { onExportSelected() }
+            .setIcon(R.drawable.ic_save)
     }
 
     private fun addMenuItem(

From bd6fdd625a2f26c8ecb98eb2c5c7373c8686551e Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Mon, 25 Apr 2022 20:30:50 +0200
Subject: [PATCH 22/28] Use material icon

---
 .../java/org/schabi/newpipe/util/ServiceHelper.java    |  2 +-
 app/src/main/res/drawable/ic_placeholder_yt.xml        | 10 ----------
 app/src/main/res/drawable/ic_smart_display.xml         | 10 ++++++++++
 app/src/main/res/layout/drawer_header.xml              |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_placeholder_yt.xml
 create mode 100644 app/src/main/res/drawable/ic_smart_display.xml

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 9fa413add21..22231123bba 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -31,7 +31,7 @@ private ServiceHelper() { }
     public static int getIcon(final int serviceId) {
         switch (serviceId) {
             case 0:
-                return R.drawable.ic_placeholder_yt;
+                return R.drawable.ic_smart_display;
             case 1:
                 return R.drawable.ic_placeholder_cloud;
             case 2:
diff --git a/app/src/main/res/drawable/ic_placeholder_yt.xml b/app/src/main/res/drawable/ic_placeholder_yt.xml
deleted file mode 100644
index ba8c694405d..00000000000
--- a/app/src/main/res/drawable/ic_placeholder_yt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="512"
-    android:viewportWidth="512"
-    android:tint="@color/defaultIconTint">
-    <path
-        android:pathData="M156.5,88.1c-56.6,1.8 -79.9,3.7 -91.4,7.5 -9.8,3.3 -15.2,6.6 -23.4,14.3 -8.6,8.1 -14.4,19.5 -18.7,36.3 -8.5,33.7 -10.7,128 -4.5,191.8 5.4,54.7 22.2,75.5 65.6,81.4 57.2,7.8 314,7 354.9,-1 11,-2.2 22.7,-8.2 31.1,-16.2 8.7,-8.1 14.4,-19.2 18.8,-36.2 10.8,-42.1 10.8,-177.1 0.1,-219.8 -4.3,-16.8 -10.1,-28.2 -18.7,-36.3C454.7,95.2 444.6,92.3 401,90c-55,-2.9 -182,-3.9 -244.5,-1.9zM242.5,168.8c24.8,14.5 56.5,33.2 70.5,41.4 76.7,45 75.2,44.2 73.3,45.5 -1.8,1.4 -32.1,19.5 -94.8,56.8 -19.2,11.5 -36.5,21.7 -38.2,22.8l-3.3,1.9v-44.7l32.1,-18.4c17.6,-10.1 32.2,-18.8 32.4,-19.2 0.3,-0.4 -19.6,-12.7 -44.3,-27.3L225.5,201l-0.6,48.8c-0.3,26.8 -0.7,60.5 -0.8,75l-0.1,26.3 -9.7,6.3c-5.4,3.5 -13.5,8.6 -18,11.5L188,374L188,136.8l4.8,2.8c2.6,1.5 25,14.6 49.7,29.2z"
-        android:fillColor="#FF000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_smart_display.xml b/app/src/main/res/drawable/ic_smart_display.xml
new file mode 100644
index 00000000000..d666a3b3739
--- /dev/null
+++ b/app/src/main/res/drawable/ic_smart_display.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="@color/defaultIconTint">
+    <path
+        android:pathData="M20 4H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zM9.5 16.5v-9l7 4.5-7 4.5z"
+        android:fillColor="#FF000000"/>
+</vector>
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 109c123fcf5..94e045863b8 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -86,7 +86,7 @@
                     android:scaleType="fitCenter"
                     app:tint="@color/drawer_header_font_color"
                     tools:ignore="ContentDescription"
-                    tools:srcCompat="@drawable/ic_placeholder_yt" />
+                    tools:srcCompat="@drawable/ic_smart_display" />
 
                 <org.schabi.newpipe.views.NewPipeTextView
                     android:id="@+id/drawer_header_service_view"

From 1228ce277fa8fd7b95e62e1010748d484a0c1300 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Mon, 25 Apr 2022 20:34:44 +0200
Subject: [PATCH 23/28] Removed placeholder prefix

---
 app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java  | 4 ++--
 .../res/drawable/{ic_placeholder_circle.xml => ic_circle.xml} | 0
 .../res/drawable/{ic_placeholder_cloud.xml => ic_cloud.xml}   | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/src/main/res/drawable/{ic_placeholder_circle.xml => ic_circle.xml} (100%)
 rename app/src/main/res/drawable/{ic_placeholder_cloud.xml => ic_cloud.xml} (100%)

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 22231123bba..bf173e08d2a 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -33,7 +33,7 @@ public static int getIcon(final int serviceId) {
             case 0:
                 return R.drawable.ic_smart_display;
             case 1:
-                return R.drawable.ic_placeholder_cloud;
+                return R.drawable.ic_cloud;
             case 2:
                 return R.drawable.ic_placeholder_media_ccc;
             case 3:
@@ -41,7 +41,7 @@ public static int getIcon(final int serviceId) {
             case 4:
                 return R.drawable.ic_placeholder_bandcamp;
             default:
-                return R.drawable.ic_placeholder_circle;
+                return R.drawable.ic_circle;
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_placeholder_circle.xml b/app/src/main/res/drawable/ic_circle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_placeholder_circle.xml
rename to app/src/main/res/drawable/ic_circle.xml
diff --git a/app/src/main/res/drawable/ic_placeholder_cloud.xml b/app/src/main/res/drawable/ic_cloud.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_placeholder_cloud.xml
rename to app/src/main/res/drawable/ic_cloud.xml

From de4b5a8f0fddf3ee26d42bf4d9852ea4829792d3 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sat, 7 May 2022 15:08:23 +0200
Subject: [PATCH 24/28] Remove not required use of supplier

from code review
---
 .../subscription/SubscriptionFragment.kt      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 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 da025a543e4..7dec3b30dc1 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
@@ -65,7 +65,6 @@ import org.schabi.newpipe.util.external_communication.ShareUtils
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import java.util.function.Supplier
 
 class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     private var _binding: FragmentSubscriptionBinding? = null
@@ -89,6 +88,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     @State
     @JvmField
     var itemsListState: Parcelable? = null
+
     @State
     @JvmField
     var feedGroupsListState: Parcelable? = null
@@ -143,7 +143,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         // -- Import --
         val importSubMenu = menu.addSubMenu(R.string.import_from)
 
-        addMenuItem(importSubMenu, R.string.previous_export) { onImportPreviousSelected() }
+        addMenuItemToSubmenu(importSubMenu, R.string.previous_export) { onImportPreviousSelected() }
             .setIcon(R.drawable.ic_backup)
 
         val services = requireContext().resources.getStringArray(R.array.service_list)
@@ -156,7 +156,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 val supportedSources = subscriptionExtractor.supportedSources
                 if (supportedSources.isEmpty()) continue
 
-                addMenuItem(importSubMenu, serviceName) {
+                addMenuItemToSubmenu(importSubMenu, serviceName) {
                     onImportFromServiceSelected(service.serviceId)
                 }
                     .setIcon(ServiceHelper.getIcon(service.serviceId))
@@ -171,38 +171,35 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         // -- Export --
         val exportSubMenu = menu.addSubMenu(R.string.export_to)
 
-        addMenuItem(exportSubMenu, R.string.file) { onExportSelected() }
+        addMenuItemToSubmenu(exportSubMenu, R.string.file) { onExportSelected() }
             .setIcon(R.drawable.ic_save)
     }
 
-    private fun addMenuItem(
+    private fun addMenuItemToSubmenu(
         subMenu: SubMenu,
         @StringRes title: Int,
         onClick: Runnable
     ): MenuItem {
-        return addMenuItem({ subMenu.add(title) }, onClick)
+        return setClickListenerToMenuItem(subMenu.add(title), onClick)
     }
 
-    private fun addMenuItem(
+    private fun addMenuItemToSubmenu(
         subMenu: SubMenu,
         title: String,
         onClick: Runnable
     ): MenuItem {
-        return addMenuItem({ subMenu.add(title) }, onClick)
+        return setClickListenerToMenuItem(subMenu.add(title), onClick)
     }
 
-    private fun addMenuItem(
-        menuItemSupplier: Supplier<MenuItem>,
+    private fun setClickListenerToMenuItem(
+        menuItem: MenuItem,
         onClick: Runnable
     ): MenuItem {
-        val item = menuItemSupplier.get()
-
-        item.setOnMenuItemClickListener { _ ->
+        menuItem.setOnMenuItemClickListener { _ ->
             onClick.run()
             true
         }
-
-        return item
+        return menuItem
     }
 
     private fun onImportFromServiceSelected(serviceId: Int) {

From 212a413e93d17fd78bed9d22def4a5bc3294ed00 Mon Sep 17 00:00:00 2001
From: Saurmandal <saurmandal@protonmail.com>
Date: Sun, 8 May 2022 17:09:30 +0530
Subject: [PATCH 25/28] HI translation to `README.md` (#8355)

* Add `hi` translation

* Update other Readmes

* lot of corrections (thanks @opusforlife2 !)
---
 README.md           |   2 +-
 doc/README.es.md    |   2 +-
 doc/README.hi.md    | 143 ++++++++++++++++++++++++++++++++++++++++++++
 doc/README.ja.md    |   2 +-
 doc/README.ko.md    |   2 +-
 doc/README.pl.md    |   2 +-
 doc/README.pt_BR.md |   2 +-
 doc/README.ro.md    |   2 +-
 doc/README.so.md    |   2 +-
 doc/README.tr.md    |   2 +-
 doc/README.zh_TW.md |   2 +-
 11 files changed, 153 insertions(+), 10 deletions(-)
 create mode 100644 doc/README.hi.md

diff --git a/README.md b/README.md
index 28be821929a..c47f8c2f4fb 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,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), [Español](doc/README.es.md), [한국어](doc/README.ko.md), [Soomaali](doc/README.so.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md).*
+*Read this in other languages: [English](README.md), [Español](doc/README.es.md), [हिन्दी](doc/README.hi.md), [한국어](doc/README.ko.md), [Soomaali](doc/README.so.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.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/doc/README.es.md b/doc/README.es.md
index 58e9742bf2d..644ffe1d35d 100644
--- a/doc/README.es.md
+++ b/doc/README.es.md
@@ -18,7 +18,7 @@
 <p align="center"><a href="https://newpipe.net">Sitio Web</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">Preguntas Frecuentes</a> &bull; <a href="https://newpipe.net/press/">Prensa</a></p>
 <hr>
 
-*Lea esto en otros idiomas: [English](../README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Lea esto en otros idiomas: [English](../README.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
 
 <b>AVISO: ESTA ES UNA VERSIÓN BETA, POR LO TANTO, PUEDE ENCONTRAR BUGS. SI ENCUENTRA UNO ABRA UN ISSUE A TRAVÉS DE NUESTRO REPOSITORIO DE GITHUB.</b>
 
diff --git a/doc/README.hi.md b/doc/README.hi.md
new file mode 100644
index 00000000000..42077fadf8d
--- /dev/null
+++ b/doc/README.hi.md
@@ -0,0 +1,143 @@
+<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 के लिए एक ओपन सोर्स, हल्का YouTube ऐप।</h4>
+
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="इसे F-Droid पर पाएँ" height=80/></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="https://web.libera.chat/#newpipe" 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="#ऐप-कैसी-दिखती-है">ऐप कैसी दिखती है</a> &bull; <a href="#विवरण">विवरण</a> &bull; <a href="#सुविधाएँ">सुविधाएँ</a> &bull; <a href="#स्थापित-करना-और-अपडेट-करना">स्थापित करना और अपडेट करना</a> &bull; <a href="#योगदान-करें">योगदान करें</a> &bull; <a href="#आर्थिक-योगदान-करें">आर्थिक योगदान करें</a> &bull; <a href="#लाइसेंस">लाइसेंस</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/">साधारण सवाल-जवाब</a> &bull; <a href="https://newpipe.net/press/">प्रेस</a></p>
+<hr>
+
+इसे दूसरी भाषाओं में पढ़ें: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md)।
+
+<b>चेतावनी: यह एक बीटा संस्करण है, तो अगर आपको इसमें बग्स नज़र आते हैं, कृपया हमारे GitHub रिपॉज़िटरी के ज़रिए एक समस्या खोल दें।</b>
+
+<b>NewPipe या इसके किसी फोर्क को Google Play Store पर डालने पर Store के नियमों और शर्तों का उल्लंघन होता है।</b>
+
+## ऐप कैसी दिखती है
+
+[<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)
+
+## विवरण
+
+NewPipe ना ही किसी Google फ्रेमवर्क लाइब्रेरी, और ना ही YouTube के API का इस्तेमाल करता है। इस ऐप को चलाने के लिए सिर्फ वेबसाइट्स से जानकारी प्राप्त करने की ज़रूरत है, तो इस ऐप का इस्तेमाल उन डिवाइसों पर भी किया जा सकता है जिनपर Google की सेवाएँ स्थापित नहीं हैं। और NewPipe जैसे कॉपीलेफ्ट किए गए मुक्त सॉफ़्टवेयर का इस्तेमाल करने के लिए आपको YouTube खाते की ज़रूरत नहीं।
+
+### सुविधाएँ
+
+* वीडियो खोजें
+* खाते की ज़रूरत नहीं
+* वीडियो के बारे में साधारण जानकारी पाएँ
+* YouTube के वीडियो देखें
+* YouTube के वीडियो सुनें
+* वीडियो देखते हुए दूसरे ऐप्स का इस्तेमाल करें (फ़्लोटिंग प्लेयर)
+* वीडियो देखने के लिए स्ट्रीम करने का प्लेयर चुनें
+* वीडियो डाउनलोड करें
+* सिर्फ ऑडियो डाउनलोड करें
+* Kodi में वीडियो को खोलें
+* अगले/संबंधित वीडियो देखें
+* YouTube को किसी विशिष्ट भाषा में खोजें
+* उम्र से जुड़ी पाबंदी वाले वीडियो देखें/छिपाएँ
+* चैनलों के बारे में साधारण जानकारी पाएँ
+* चैनल खोजें
+* किसी विशिष्ट चैनल से वीडियो देखें
+* Orbot/Tor के साथ चलाएँ (मुश्किलें आ सकती हैं)
+* 1080p/2K/4K में देखें
+* ऐप आपके देखे गए वीडियो याद रखेगी
+* चैनलों पर सदस्यता लें
+* देखे गए वीडियो खोजें
+* प्लेलिस्ट्स खोजें/देखें
+* प्लेलिस्ट्स को सूची में जोड़कर देखें
+* वीडियों को सूची में डालें
+* खुदकी प्लेलिस्ट्स बनाएँ
+* उपशीर्षक
+* लाइवस्ट्रीम देखें
+* वीडियो पे टिप्पणियाँ देखें
+
+### उपलब्ध सेवाएँ
+
+NewPipe पर कई सेवाएँ उपलब्ध हैं। हमारे [प्रलेख](https://teamnewpipe.github.io/documentation/) में यह बताया गया है कि ऐप और एक्सट्रैक्टर में एक नई सेवा कैसे जोड़ी जा सकती है। अगर आप कोई नई सेवा जोड़ना चाहते हैं, कृपया हमसे संपर्क करें। वर्तमान में उपलब्ध सेवाएँ हैं:
+
+* YouTube
+* SoundCloud \[बीटा\]
+* media.ccc.de \[बीटा\]
+* PeerTube instances \[बीटा\]
+* Bandcamp \[बीटा\]
+
+<!-- Hidden span to keep old links compatible. -->
+<span id="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 बनाएँ। यह अपडेट पाने का सबसे तेज़ तरीका है, मगर यह काफ़ी कठिन है, तो हम सलाह देंगे कि आप किसी दूसरे तरीके का इस्तेमाल करें।
+ 
+ज़्यादातर उपयोगकर्ताओं के लिए पहला तरीका ठीक है। पहले और दूसरे तरीके से स्थापित APK एक-दूसरे के अनुकूल हैं, मगर तीसरे तरीके से स्थापित APK से नहीं। ऐसा इसलिए है क्योंकि पहले और दूसरे तरीके में एक ही (हमारे) हस्ताक्षर कुँजी का इस्तेमाल हुआ है, मगर तीसरे तरीके में दूसरे (F-Droid के) हस्ताक्षर कुँजी का इस्तेमाल किया जाता है। चौथे तरीके से अपना डीबग APK फ़ाइल बनाने पर कुँजी की ज़रूरत ही नहीं पड़ती। कुँजियों से यह निश्चित किया जाता है कि उपयोगकर्ता कहीं ऐप पर कोई दुर्भावनापूर्ण अपडेट तो स्थापित नहीं कर रहा।
+
+इस दौरान अगर आप स्रोत बदलना चाहते हैं (मान लीजिए NewPipe की मूल सुविधा खराब हो गई और F-Droid पर कोई अपडेट नहीं आया है), हम इस अनुदेश का इस्तेमाल करने की सलाह देंगे:
+1. सेटिंग्स > सामग्री > डेटाबेस निर्यात करें — इसके ज़रिए अपने डेटा को बैकअप कर लें ताकि आपके पास अपने देखे गए वीडियो, सदस्यताएँ और प्लेलिस्ट्स हो
+2. NewPipe को डिवाइस से हटाएँ
+3. नए स्रोत से APK डाउनलोड करें और उसे स्थापित करें
+4. सेटिंग्स > सामग्री > डेटाबेस आयात करें — इसके ज़रिए पहले चरण के डेटा को आयात करें
+
+## योगदान करें
+चाहे आप अपने विचार जोड़ना चाहे, या अनुवाद, डिज़ाइन में बदलाव, कोड में सफ़ाई, या कोड में भारी बदलाव, सहायता ज़रूर करें।
+जितने योगदान हो, ऐप उतनी ही बेहतर होती जाती है!
+
+अगर आप योगदान करना चाहते हैं, हमारे [योगदान के दिशानिर्देश](.github/CONTRIBUTING.md) देखें।
+
+<a href="https://hosted.weblate.org/engage/newpipe/">
+<img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="अनुवाद की स्थिति" />
+</a>
+
+## आर्थिक योगदान करें
+अगर आपको NewPipe पसंद है, एक छोटे-से दान से हम खुश होंगे। आप या तो बिटकॉइन भेज सकते हैं या फिर 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="बिटकॉइन पर दान करने के लिए 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/) मिल जाएगा।
+
+## लाइसेंस
+[![GNU GPLv3 का चित्र](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe ओपन सोर्स सॉफ़्टवेयर है: आप इच्छानुसार इसे सुधार सकते हैं, जाँच सकते हैं, बाँट सकते हैं और इस्तेमाल कर सकते हैं। विशिष्ट रूप से, आप मुक्त सॉफ़्टवेयर संस्थान द्वारा परिभाषित [GNU साधारण सार्वजनिक लाइसेंस](https://www.gnu.org/licenses/gpl.html) के संस्करण 3 या फिर वैकल्पिक रूप से किसी नवीन संस्करण के शर्तों के अनुसार इसे दोबारा बाँट सकते हैं और/या बदल सकते हैं।
diff --git a/doc/README.ja.md b/doc/README.ja.md
index 37a7add4485..38eacf08407 100644
--- a/doc/README.ja.md
+++ b/doc/README.ja.md
@@ -17,7 +17,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), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md)。*
+*他の言語で読む: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md)。*
 
 <b>注意: これはベータ版のため、バグが発生する可能性があります。もしバグが発生した場合、GitHub のリポジトリで Issue を開いてください。</b>
 
diff --git a/doc/README.ko.md b/doc/README.ko.md
index 08e340388c8..9703e6a4897 100644
--- a/doc/README.ko.md
+++ b/doc/README.ko.md
@@ -17,7 +17,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), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Read this in other languages: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
 
 <b>경고: 이 버전은 베타 버전이므로, 버그가 발생할 수도 있습니다. 만약 버그가 발생하였다면, 우리의 GITHUB 저장소에서 ISSUE를 열람하여 주십시오.</b>
 
diff --git a/doc/README.pl.md b/doc/README.pl.md
index 91c06fbd607..246a86c8ea9 100644
--- a/doc/README.pl.md
+++ b/doc/README.pl.md
@@ -17,7 +17,7 @@
 <p align="center"><a href="https://newpipe.net">Strona</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>
 
-*Przeczytaj w innych językach: [English](../README.md), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Przeczytaj w innych językach: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
 
 <b>UWAGA: TO JEST WERSJA BETA, WIĘC MOŻESZ NAPOTKAĆ BŁĘDY. JEŚLI TAK SIĘ STANIE, OTWÓRZ NOWY "ISSUE" NA GITHUBIE.</b>
 
diff --git a/doc/README.pt_BR.md b/doc/README.pt_BR.md
index 4afe519960e..f0512c69245 100644
--- a/doc/README.pt_BR.md
+++ b/doc/README.pt_BR.md
@@ -18,7 +18,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), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Read this in other languages: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.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/doc/README.ro.md b/doc/README.ro.md
index 32ab8126e85..0ee7e44ece8 100644
--- a/doc/README.ro.md
+++ b/doc/README.ro.md
@@ -17,7 +17,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/">Presă</a></p>
 <hr>
 
-*Citiţi în alte limbi: [English](../README.md), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Citiţi în alte limbi: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.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>
 
diff --git a/doc/README.so.md b/doc/README.so.md
index 2b8ab020a40..5477401b27b 100644
--- a/doc/README.so.md
+++ b/doc/README.so.md
@@ -17,7 +17,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), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Ku akhri luuqad kale: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.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>
 
diff --git a/doc/README.tr.md b/doc/README.tr.md
index 6b3169bdb96..783d1b1e316 100644
--- a/doc/README.tr.md
+++ b/doc/README.tr.md
@@ -17,7 +17,7 @@
 <p align="center"><a href="https://newpipe.net">Web sitesi</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">SSS</a> &bull; <a href="https://newpipe.net/press/">Basın</a></p>
 <hr>
 
-*Bu sayfayı diğer dillerde okuyun: [English](../README.md), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
+*Bu sayfayı diğer dillerde okuyun: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md).*
 
 <b>UYARI: BU SÜRÜM BETA SÜRÜMÜDÜR, BU NEDENLE HATALARLA KARŞILAŞABİLİRSİNİZ. HATA BULURSANIZ BU GITHUB DEPOSUNDA BUNU BİLDİRİN.</b>
 
diff --git a/doc/README.zh_TW.md b/doc/README.zh_TW.md
index 6be8d0fc4de..83267b65bfd 100644
--- a/doc/README.zh_TW.md
+++ b/doc/README.zh_TW.md
@@ -17,7 +17,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), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md)*
+*其他語言: [English](../README.md), [Español](README.es.md), [हिन्दी](README.hi.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [Polski](README.pl.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md), [正體中文](README.zh_TW.md)*
 
 <b>警告：這是測試版本，可能會發生錯誤。如果遇到錯誤，請在我們的 GITHUB REPO 開 ISSUE 回報。</b>
 

From 69f95f41488a2ad59d2dd0ff936886e2fb93726c Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Mon, 9 May 2022 20:58:10 +0200
Subject: [PATCH 26/28] Use better way to get services

---
 .../subscription/SubscriptionFragment.kt      | 27 ++++++-------------
 app/src/main/res/values/settings_keys.xml     |  4 ---
 2 files changed, 8 insertions(+), 23 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 7dec3b30dc1..4295424e695 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
@@ -34,9 +34,8 @@ import org.schabi.newpipe.databinding.FeedItemCarouselBinding
 import org.schabi.newpipe.databinding.FragmentSubscriptionBinding
 import org.schabi.newpipe.error.ErrorInfo
 import org.schabi.newpipe.error.UserAction
-import org.schabi.newpipe.extractor.NewPipe
+import org.schabi.newpipe.extractor.ServiceList
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
-import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.fragments.BaseStateFragment
 import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.local.subscription.SubscriptionViewModel.SubscriptionState
@@ -146,26 +145,16 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         addMenuItemToSubmenu(importSubMenu, R.string.previous_export) { onImportPreviousSelected() }
             .setIcon(R.drawable.ic_backup)
 
-        val services = requireContext().resources.getStringArray(R.array.service_list)
-        for (serviceName in services) {
-            try {
-                val service = NewPipe.getService(serviceName)
+        for (service in ServiceList.all()) {
+            val subscriptionExtractor = service.subscriptionExtractor ?: continue
 
-                val subscriptionExtractor = service.subscriptionExtractor ?: continue
+            val supportedSources = subscriptionExtractor.supportedSources
+            if (supportedSources.isEmpty()) continue
 
-                val supportedSources = subscriptionExtractor.supportedSources
-                if (supportedSources.isEmpty()) continue
-
-                addMenuItemToSubmenu(importSubMenu, serviceName) {
-                    onImportFromServiceSelected(service.serviceId)
-                }
-                    .setIcon(ServiceHelper.getIcon(service.serviceId))
-            } catch (e: ExtractionException) {
-                throw RuntimeException(
-                    "Services array contains an entry that it's not a valid service name ($serviceName)",
-                    e
-                )
+            addMenuItemToSubmenu(importSubMenu, service.serviceInfo.name) {
+                onImportFromServiceSelected(service.serviceId)
             }
+                .setIcon(ServiceHelper.getIcon(service.serviceId))
         }
 
         // -- Export --
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index bf42aaf0e51..c13caf610d7 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -4,10 +4,6 @@
     <string name="last_used_preferences_version">last_used_preferences_version</string>
 
     <!-- Service -->
-    <string-array name="service_list">
-        <item>@string/youtube</item>
-        <item>@string/soundcloud</item>
-    </string-array>
     <string name="current_service_key">service</string>
     <string name="default_service_value">@string/youtube</string>
 

From 61ee1c61dfd7a784b33ff8c647faa0ba984b1a4e Mon Sep 17 00:00:00 2001
From: iTrooz_ <42669835+iTrooz@users.noreply.github.com>
Date: Mon, 9 May 2022 20:48:48 +0200
Subject: [PATCH 27/28] Make volume progress bar match system volume when we
 start sliding

---
 .../newpipe/player/event/PlayerGestureListener.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

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 794fe9b3ce5..a7fb40c47af 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
@@ -126,6 +126,14 @@ public void onScroll(@NonNull final MainPlayer.PlayerType playerType,
     }
 
     private void onScrollMainVolume(final float distanceX, final float distanceY) {
+        // If we just started sliding, change the progress bar to match the system volume
+        if (player.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
+            final float volumePercent = player
+                    .getAudioReactor().getVolume() / (float) maxVolume;
+            player.getVolumeProgressBar().setProgress(
+                    (int) (volumePercent * player.getMaxGestureLength()));
+        }
+
         player.getVolumeProgressBar().incrementProgressBy((int) distanceY);
         final float currentProgressPercent = (float) player
                 .getVolumeProgressBar().getProgress() / player.getMaxGestureLength();

From fcaa787060225ba59dd39ef7cdfb1667ae7b259d Mon Sep 17 00:00:00 2001
From: petlyh <88139840+petlyh@users.noreply.github.com>
Date: Tue, 10 May 2022 08:43:23 +0200
Subject: [PATCH 28/28] Add a "Add to playlist" item to the remote playlist
 menu

---
 .../fragments/list/playlist/PlaylistFragment.java  | 14 ++++++++++++++
 app/src/main/res/menu/menu_playlist.xml            |  6 ++++++
 2 files changed, 20 insertions(+)

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 5bf20c144f3..8e16174055d 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
@@ -28,6 +28,7 @@
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.databinding.PlaylistHeaderBinding;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -41,6 +42,7 @@
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -56,6 +58,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
@@ -237,6 +240,17 @@ public boolean onOptionsItemSelected(final MenuItem item) {
             case R.id.menu_item_bookmark:
                 onBookmarkClicked();
                 break;
+            case R.id.menu_item_append_playlist:
+                disposables.add(PlaylistDialog.createCorrespondingDialog(
+                        getContext(),
+                        getPlayQueue()
+                                .getStreams()
+                                .stream()
+                                .map(StreamEntity::new)
+                                .collect(Collectors.toList()),
+                        dialog -> dialog.show(getFM(), TAG)
+                ));
+                break;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/res/menu/menu_playlist.xml b/app/src/main/res/menu/menu_playlist.xml
index 8e3ea155963..91ec1bc9488 100644
--- a/app/src/main/res/menu/menu_playlist.xml
+++ b/app/src/main/res/menu/menu_playlist.xml
@@ -28,4 +28,10 @@
         android:orderInCategory="2"
         android:title="@string/open_in_browser"
         app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_item_append_playlist"
+        android:orderInCategory="3"
+        android:title="@string/add_to_playlist"
+        app:showAsAction="never" />
 </menu>