Merge branch 'dev' into lang

README.md

@@ -1,21 +1,22 @@
-<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"/></a></p> 
+<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
 <h4 align="center">A free lightweight YouTube frontend for Android.</h4>
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"/></a></p> 
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
 
 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" /></a>
+<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPL v3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg" /></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
-<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg" /></a>
+<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
-<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg" /></a>
+<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg"></a>
-<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg" /></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
-<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"/></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
-<hr />
+<hr>
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
-<hr />
+<hr>
-WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+
+<b>WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.</b>
 
 ## Screenshots
 
@@ -29,6 +30,8 @@ WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.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)
 
 ## Description
 
@@ -61,11 +64,11 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Queuing videos
 * Local playlists
 * Subtitles
-* Multi-service support (eg. SoundCloud in NewPipe Beta)
+* Multi-service support (eg. SoundCloud \[beta\])
+* Livestream support
 
 ### Coming Features
 
-* Livestream support
 * Cast to UPnP and Cast
 * Show comments
 * ... and many more
@@ -81,22 +84,27 @@ If you like NewPipe we'd be happy about a donation. You can either donate via Bi
 
 <table>
   <tr>
-    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin" /></td>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
-    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR Code" width="100px"/></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR Code" width="100px"></td>
     <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
   </tr>
   <tr>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" /></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"/></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px" /></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
   </tr>
   <tr>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px" /></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"/></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn." /></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
   </tr>
 </table>
 
+## Privacy Policy
+
+The NewPipe project aims to provide a private, anonymous experience for using media web services.
+Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report or leave a comment at our blog. You can find the document [here](https://newpipe.schabi.org/legal/privacy/).
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
 

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -33,12 +33,14 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -64,19 +66,17 @@ import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.util.StreamItemAdapter;
-import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -87,6 +87,8 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.StreamItemAdapter;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.Serializable;
@@ -154,6 +156,7 @@ public class VideoDetailFragment
 
     private View videoTitleRoot;
     private TextView videoTitleTextView;
+    @Nullable
     private ImageView videoTitleToggleArrow;
     private TextView videoCountView;
 
@@ -415,6 +418,7 @@ public class VideoDetailFragment
     }
 
     private void toggleTitleAndDescription() {
+        if (videoTitleToggleArrow != null) {    //it is null for tablets
             if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
                 videoTitleTextView.setMaxLines(1);
                 videoDescriptionRootLayout.setVisibility(View.GONE);
@@ -425,6 +429,7 @@ public class VideoDetailFragment
                 videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
             }
         }
+    }
 
     private void toggleExpandRelatedVideos(StreamInfo info) {
         if (DEBUG) Log.d(TAG, "toggleExpandRelatedVideos() called with: info = [" + info + "]");
@@ -622,8 +627,11 @@ public class VideoDetailFragment
             relatedStreamsView.addView(
                     infoItemBuilder.buildView(relatedStreamsView, info.getNextVideo()));
             relatedStreamsView.addView(getSeparatorView());
-            relatedStreamRootLayout.setVisibility(View.VISIBLE);
+            setRelatedStreamsVisibility(View.VISIBLE);
-        } else nextStreamTitle.setVisibility(View.GONE);
+        } else {
+            nextStreamTitle.setVisibility(View.GONE);
+            setRelatedStreamsVisibility(View.GONE);
+        }
 
         if (info.getRelatedStreams() != null
                 && !info.getRelatedStreams().isEmpty() && showRelatedStreams) {
@@ -639,13 +647,13 @@ public class VideoDetailFragment
             }
             //if (DEBUG) Log.d(TAG, "Total time " + ((System.nanoTime() - first) / 1000000L) + "ms");
 
-            relatedStreamRootLayout.setVisibility(View.VISIBLE);
+            setRelatedStreamsVisibility(View.VISIBLE);
             relatedStreamExpandButton.setVisibility(View.VISIBLE);
 
             relatedStreamExpandButton.setImageDrawable(ContextCompat.getDrawable(
                     activity, ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.expand)));
         } else {
-            if (info.getNextVideo() == null) relatedStreamRootLayout.setVisibility(View.GONE);
+            if (info.getNextVideo() == null) setRelatedStreamsVisibility(View.GONE);
             relatedStreamExpandButton.setVisibility(View.GONE);
         }
     }
@@ -1114,8 +1122,16 @@ public class VideoDetailFragment
         animateView(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {    //phone
             videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
             videoTitleToggleArrow.setVisibility(View.GONE);
+        } else {    //tablet
+            final View related = (View) relatedStreamRootLayout.getParent();
+            //don`t need to hide it if related streams are disabled
+            if (related.getVisibility() == View.VISIBLE) {
+                related.setVisibility(View.INVISIBLE);
+            }
+        }
         videoTitleRoot.setClickable(false);
 
         imageLoader.cancelDisplayTask(thumbnailImageView);
@@ -1190,11 +1206,15 @@ public class VideoDetailFragment
             detailDurationView.setVisibility(View.GONE);
         }
 
+        videoDescriptionView.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {
             videoTitleRoot.setClickable(true);
             videoTitleToggleArrow.setVisibility(View.VISIBLE);
             videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        videoDescriptionView.setVisibility(View.GONE);
             videoDescriptionRootLayout.setVisibility(View.GONE);
+        } else {
+            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+        }
         if (!TextUtils.isEmpty(info.getUploadDate())) {
             videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
         }
@@ -1242,6 +1262,11 @@ public class VideoDetailFragment
             // Only auto play in the first open
             autoPlayEnabled = false;
         }
+
+        final ViewParent related = relatedStreamRootLayout.getParent();
+        if (related instanceof ScrollView) {
+            ((ScrollView) related).scrollTo(0, 0);
+        }
     }
 
 
@@ -1299,4 +1324,13 @@ public class VideoDetailFragment
 
         showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
     }
+
+    private void setRelatedStreamsVisibility(int visibility) {
+        final ViewParent parent = relatedStreamRootLayout.getParent();
+        if (parent instanceof ScrollView) {
+            ((ScrollView) parent).setVisibility(visibility);
+        } else {
+            relatedStreamRootLayout.setVisibility(visibility);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -3,10 +3,15 @@ package org.schabi.newpipe.fragments.list;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -21,9 +26,9 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -36,7 +41,7 @@ import java.util.Queue;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
-public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead {
+public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead, SharedPreferences.OnSharedPreferenceChangeListener {
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -44,6 +49,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
     protected InfoListAdapter infoListAdapter;
     protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle
@@ -59,12 +67,31 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         StateSaver.onDestroy(savedState);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -119,13 +146,25 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         return new LinearLayoutManager(activity);
     }
 
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     @Override
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
+        final boolean useGrid = isGridLayout();
         itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
+        infoListAdapter.setGridItemVariants(useGrid);
         infoListAdapter.setFooter(getListFooter());
         infoListAdapter.setHeader(getListHeader());
 
@@ -308,4 +347,22 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     public void handleNextItems(N result) {
         isLoading.set(false);
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
@@ -12,9 +13,12 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
 import org.schabi.newpipe.util.FallbackViewHolder;
@@ -52,14 +56,18 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private static final int MINI_STREAM_HOLDER_TYPE = 0x100;
     private static final int STREAM_HOLDER_TYPE = 0x101;
+    private static final int GRID_STREAM_HOLDER_TYPE = 0x102;
     private static final int MINI_CHANNEL_HOLDER_TYPE = 0x200;
     private static final int CHANNEL_HOLDER_TYPE = 0x201;
+    private static final int GRID_CHANNEL_HOLDER_TYPE = 0x202;
     private static final int MINI_PLAYLIST_HOLDER_TYPE = 0x300;
     private static final int PLAYLIST_HOLDER_TYPE = 0x301;
+    private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
 
     private final InfoItemBuilder infoItemBuilder;
     private final ArrayList<InfoItem> infoItemList;
     private boolean useMiniVariant = false;
+    private boolean useGridVariant = false;
     private boolean showFooter = false;
     private View header = null;
     private View footer = null;
@@ -94,6 +102,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         this.useMiniVariant = useMiniVariant;
     }
 
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
     public void addInfoItemList(List<InfoItem> data) {
         if (data != null) {
             if (DEBUG) {
@@ -206,11 +218,11 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         final InfoItem item = infoItemList.get(position);
         switch (item.getInfoType()) {
             case STREAM:
-                return useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
+                return useGridVariant ? GRID_STREAM_HOLDER_TYPE : useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
             case CHANNEL:
-                return useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
+                return useGridVariant ? GRID_CHANNEL_HOLDER_TYPE : useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
             case PLAYLIST:
-                return useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
+                return useGridVariant ? GRID_PLAYLIST_HOLDER_TYPE : useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
             default:
                 Log.e(TAG, "Trollolo");
                 return -1;
@@ -229,14 +241,20 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
             case STREAM_HOLDER_TYPE:
                 return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
             case MINI_CHANNEL_HOLDER_TYPE:
                 return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
             case CHANNEL_HOLDER_TYPE:
                 return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
             case MINI_PLAYLIST_HOLDER_TYPE:
                 return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
             case PLAYLIST_HOLDER_TYPE:
                 return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
             default:
                 Log.e(TAG, "Trollolo");
                 return new FallbackViewHolder(new View(parent.getContext()));
@@ -257,4 +275,14 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             ((HFHolder) holder).view = footer;
         }
     }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }

app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class ChannelGridInfoItemHolder extends ChannelMiniInfoItemHolder {
+
+	public ChannelGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_channel_grid_item, parent);
+	}
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java

@@ -47,6 +47,13 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
                 itemBuilder.getOnChannelSelectedListener().selected(item);
             }
         });
+
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().held(item);
+            }
+            return true;
+        });
     }
 
     protected String getDetailLine(final ChannelInfoItem item) {

app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class PlaylistGridInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+	public PlaylistGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class StreamGridInfoItemHolder extends StreamMiniInfoItemHolder {
+
+	public StreamGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -1,8 +1,13 @@
 package org.schabi.newpipe.local;
 
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -25,7 +30,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
  * called and is memory efficient when in backstack.
  * */
 public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
-        implements ListViewContract<I, N> {
+        implements ListViewContract<I, N>, SharedPreferences.OnSharedPreferenceChangeListener {
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -36,6 +41,9 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
 
     protected LocalItemListAdapter itemListAdapter;
     protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Lifecycle - Creation
@@ -45,6 +53,29 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                itemListAdapter.setGridItemVariants(useGrid);
+                itemListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -59,6 +90,16 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
         return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
     }
 
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     protected RecyclerView.LayoutManager getListLayoutManager() {
         return new LinearLayoutManager(activity);
     }
@@ -67,10 +108,13 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
-
         itemListAdapter = new LocalItemListAdapter(activity);
+
+        final boolean useGrid = isGridLayout();
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+        itemListAdapter.setGridItemVariants(useGrid);
         itemListAdapter.setHeader(headerRootView = getListHeader());
         itemListAdapter.setFooter(footerRootView = getListFooter());
 
@@ -174,4 +218,22 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
         resetFragment();
         return super.onError(exception);
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -1,18 +1,21 @@
 package org.schabi.newpipe.local;
 
 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.local.HeaderFooterHolder;
-import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.holder.LocalItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
 import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.Localization;
@@ -52,14 +55,19 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private static final int STREAM_STATISTICS_HOLDER_TYPE = 0x1000;
     private static final int STREAM_PLAYLIST_HOLDER_TYPE = 0x1001;
+    private static final int STREAM_STATISTICS_GRID_HOLDER_TYPE = 0x1002;
+    private static final int STREAM_PLAYLIST_GRID_HOLDER_TYPE = 0x1004;
     private static final int LOCAL_PLAYLIST_HOLDER_TYPE = 0x2000;
     private static final int REMOTE_PLAYLIST_HOLDER_TYPE = 0x2001;
+	private static final int LOCAL_PLAYLIST_GRID_HOLDER_TYPE = 0x2002;
+	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;
 
     private final LocalItemBuilder localItemBuilder;
     private final ArrayList<LocalItem> localItems;
     private final DateFormat dateFormat;
 
     private boolean showFooter = false;
+    private boolean useGridVariant = false;
     private View header = null;
     private View footer = null;
 
@@ -134,6 +142,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         notifyDataSetChanged();
     }
 
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
     public void setHeader(View header) {
         boolean changed = header != this.header;
         this.header = header;
@@ -195,11 +207,11 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         final LocalItem item = localItems.get(position);
 
         switch (item.getLocalItemType()) {
-            case PLAYLIST_LOCAL_ITEM: return LOCAL_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_LOCAL_ITEM: return useGridVariant ? LOCAL_PLAYLIST_GRID_HOLDER_TYPE : LOCAL_PLAYLIST_HOLDER_TYPE;
-            case PLAYLIST_REMOTE_ITEM: return REMOTE_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_REMOTE_ITEM: return useGridVariant ? REMOTE_PLAYLIST_GRID_HOLDER_TYPE : REMOTE_PLAYLIST_HOLDER_TYPE;
 
-            case PLAYLIST_STREAM_ITEM: return STREAM_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_STREAM_ITEM: return useGridVariant ? STREAM_PLAYLIST_GRID_HOLDER_TYPE : STREAM_PLAYLIST_HOLDER_TYPE;
-            case STATISTIC_STREAM_ITEM: return STREAM_STATISTICS_HOLDER_TYPE;
+            case STATISTIC_STREAM_ITEM: return useGridVariant ? STREAM_STATISTICS_GRID_HOLDER_TYPE : STREAM_STATISTICS_HOLDER_TYPE;
             default:
                 Log.e(TAG, "No holder type has been considered for item: [" +
                         item.getLocalItemType() + "]");
@@ -218,12 +230,20 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                 return new HeaderFooterHolder(footer);
             case LOCAL_PLAYLIST_HOLDER_TYPE:
                 return new LocalPlaylistItemHolder(localItemBuilder, parent);
+            case LOCAL_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistGridItemHolder(localItemBuilder, parent);
             case REMOTE_PLAYLIST_HOLDER_TYPE:
                 return new RemotePlaylistItemHolder(localItemBuilder, parent);
+            case REMOTE_PLAYLIST_GRID_HOLDER_TYPE:
+                return new RemotePlaylistGridItemHolder(localItemBuilder, parent);
             case STREAM_PLAYLIST_HOLDER_TYPE:
                 return new LocalPlaylistStreamItemHolder(localItemBuilder, parent);
+            case STREAM_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistStreamGridItemHolder(localItemBuilder, parent);
             case STREAM_STATISTICS_HOLDER_TYPE:
                 return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
+            case STREAM_STATISTICS_GRID_HOLDER_TYPE:
+                return new LocalStatisticStreamGridItemHolder(localItemBuilder, parent);
             default:
                 Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
                 return new FallbackViewHolder(new View(parent.getContext()));
@@ -247,4 +267,14 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             ((HeaderFooterHolder) holder).view = footer;
         }
     }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java

@@ -1,9 +1,11 @@
 package org.schabi.newpipe.local.dialog;
 
+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.view.Window;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.util.StateSaver;
@@ -41,6 +43,18 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
         StateSaver.onDestroy(savedState);
     }
 
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Dialog dialog = super.onCreateDialog(savedInstanceState);
+        //remove title
+        final Window window = dialog.getWindow();
+        if (window != null) {
+            window.requestFeature(Window.FEATURE_NO_TITLE);
+        }
+        return dialog;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // State Saving
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistGridItemHolder extends LocalPlaylistItemHolder {
+
+	public LocalPlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}

app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java

@@ -16,6 +16,10 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
         super(infoItemBuilder, parent);
     }
 
+    LocalPlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
     @Override
     public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistMetadataEntry)) return;

app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistStreamGridItemHolder extends LocalPlaylistStreamItemHolder {
+
+	public LocalPlaylistStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_playlist_grid_item, parent); //TODO
+	}
+}

app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalStatisticStreamGridItemHolder extends LocalStatisticStreamItemHolder {
+
+	public LocalStatisticStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}

app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java

@@ -1,5 +1,6 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,10 +43,15 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
     public final TextView itemVideoTitleView;
     public final TextView itemUploaderView;
     public final TextView itemDurationView;
+    @Nullable
     public final TextView itemAdditionalDetails;
 
-    public LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+    public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup parent) {
-        super(infoItemBuilder, R.layout.list_stream_item, parent);
+        this(itemBuilder, R.layout.list_stream_item, parent);
+    }
+
+    LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
 
         itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
         itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
@@ -80,7 +86,9 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
             itemDurationView.setVisibility(View.GONE);
         }
 
+        if (itemAdditionalDetails != null) {
             itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
         itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView,

app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class RemotePlaylistGridItemHolder extends RemotePlaylistItemHolder {
+
+	public RemotePlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}

app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java

@@ -16,6 +16,10 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
         super(infoItemBuilder, parent);
     }
 
+    RemotePlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
     @Override
     public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistRemoteEntity)) return;

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -459,7 +459,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
 
     private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
-        return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
+        int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+        if (isGridLayout()) {
+            directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+        }
+        return new ItemTouchHelper.SimpleCallback(directions,
                 ItemTouchHelper.ACTION_STATE_IDLE) {
             @Override
             public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java

@@ -1,21 +1,30 @@
 package org.schabi.newpipe.local.subscription;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
+import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -42,6 +51,8 @@ import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -70,7 +81,7 @@ import static org.schabi.newpipe.local.subscription.services.SubscriptionsImport
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
-public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> {
+public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final int REQUEST_EXPORT_CODE = 666;
     private static final int REQUEST_IMPORT_CODE = 667;
 
@@ -78,6 +89,9 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     @State
     protected Parcelable itemsListState;
     private InfoListAdapter infoListAdapter;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
     private View whatsNewItemListHeader;
     private View importExportListHeader;
@@ -97,6 +111,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
@@ -124,6 +140,15 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     public void onResume() {
         super.onResume();
         setupBroadcastReceiver();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     @Override
@@ -150,9 +175,25 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         disposables = null;
         subscriptionService = null;
 
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
         super.onDestroy();
     }
 
+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     /*/////////////////////////////////////////////////////////////////////////
     // Menu
     /////////////////////////////////////////////////////////////////////////*/
@@ -284,9 +325,10 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
+        final boolean useGrid = isGridLayout();
         infoListAdapter = new InfoListAdapter(getActivity());
         itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(new LinearLayoutManager(activity));
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
         View headerRootLayout;
         infoListAdapter.setHeader(headerRootLayout = activity.getLayoutInflater().inflate(R.layout.subscription_header, itemsList, false));
@@ -295,6 +337,7 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         importExportOptions = headerRootLayout.findViewById(R.id.import_export_options);
 
         infoListAdapter.useMiniItemVariants(true);
+        infoListAdapter.setGridItemVariants(useGrid);
         itemsList.setAdapter(infoListAdapter);
 
         setupImportFromItems(headerRootLayout.findViewById(R.id.import_from_options));
@@ -318,7 +361,7 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         super.initListeners();
 
         infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
-            @Override
+
             public void selected(ChannelInfoItem selectedItem) {
                 final FragmentManager fragmentManager = getFM();
                 NavigationHelper.openChannelFragment(fragmentManager,
@@ -326,6 +369,11 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
                         selectedItem.getUrl(),
                         selectedItem.getName());
             }
+
+            public void held(ChannelInfoItem selectedItem) {
+                showLongTapDialog(selectedItem);
+            }
+
         });
 
         //noinspection ConstantConditions
@@ -336,6 +384,85 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         importExportListHeader.setOnClickListener(v -> importExportOptions.switchState());
     }
 
+    private void showLongTapDialog(ChannelInfoItem selectedItem) {
+        final Context context = getContext();
+        final Activity activity = getActivity();
+        if (context == null || context.getResources() == null || getActivity() == null) return;
+
+        final String[] commands = new String[]{
+                context.getResources().getString(R.string.share),
+                context.getResources().getString(R.string.unsubscribe)
+        };
+
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    shareChannel(selectedItem);
+                    break;
+                case 1:
+                    deleteChannel(selectedItem);
+                    break;
+                default:
+                    break;
+            }
+        };
+
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+        bannerView.setSelected(true);
+
+        TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+        titleView.setText(selectedItem.getName());
+
+        TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+        detailsView.setVisibility(View.GONE);
+
+        new AlertDialog.Builder(activity)
+                .setCustomTitle(bannerView)
+                .setItems(commands, actions)
+                .create()
+                .show();
+
+    }
+
+    private void shareChannel (ChannelInfoItem selectedItem) {
+        shareUrl(selectedItem.getName(), selectedItem.getUrl());
+    }
+
+    @SuppressLint("CheckResult")
+    private void deleteChannel (ChannelInfoItem selectedItem) {
+        subscriptionService.subscriptionTable()
+                .getSubscription(selectedItem.getServiceId(), selectedItem.getUrl())
+                .toObservable()
+                .observeOn(Schedulers.io())
+                .subscribe(getDeleteObserver());
+
+        Toast.makeText(activity, getString(R.string.channel_unsubscribed), Toast.LENGTH_SHORT).show();
+    }
+
+
+
+    private Observer<List<SubscriptionEntity>> getDeleteObserver(){
+        return new Observer<List<SubscriptionEntity>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                disposables.add(d);
+            }
+
+            @Override
+            public void onNext(List<SubscriptionEntity> subscriptionEntities) {
+                subscriptionService.subscriptionTable().delete(subscriptionEntities);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                SubscriptionFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {  }
+        };
+    }
+
     private void resetFragment() {
         if (disposables != null) disposables.clear();
         if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
@@ -445,4 +572,22 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
                 R.string.general_error);
         return true;
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java

@@ -1006,12 +1006,14 @@ public final class MainVideoPlayer extends AppCompatActivity
 
         private static final int MOVEMENT_THRESHOLD = 40;
 
-        private final boolean isPlayerGestureEnabled = PlayerHelper.isPlayerGestureEnabled(getApplicationContext());
+        private final boolean isVolumeGestureEnabled = PlayerHelper.isVolumeGestureEnabled(getApplicationContext());
+        private final boolean isBrightnessGestureEnabled = PlayerHelper.isBrightnessGestureEnabled(getApplicationContext());
+
         private final int maxVolume = playerImpl.getAudioReactor().getMaxVolume();
 
         @Override
         public boolean onScroll(MotionEvent initialEvent, MotionEvent movingEvent, float distanceX, float distanceY) {
-            if (!isPlayerGestureEnabled) return false;
+            if (!isVolumeGestureEnabled && !isBrightnessGestureEnabled) return false;
 
             //noinspection PointlessBooleanExpression
             if (DEBUG && false) Log.d(TAG, "MainVideoPlayer.onScroll = " +
@@ -1027,7 +1029,11 @@ public final class MainVideoPlayer extends AppCompatActivity
 
             isMoving = true;
 
-            if (initialEvent.getX() > playerImpl.getRootView().getWidth() / 2) {
+            boolean acceptAnyArea = isVolumeGestureEnabled != isBrightnessGestureEnabled;
+            boolean acceptVolumeArea = acceptAnyArea || initialEvent.getX() > playerImpl.getRootView().getWidth() / 2;
+            boolean acceptBrightnessArea = acceptAnyArea || !acceptVolumeArea;
+
+            if (isVolumeGestureEnabled && acceptVolumeArea) {
                 playerImpl.getVolumeProgressBar().incrementProgressBy((int) distanceY);
                 float currentProgressPercent =
                         (float) playerImpl.getVolumeProgressBar().getProgress() / playerImpl.getMaxGestureLength();
@@ -1052,7 +1058,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                 if (playerImpl.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
                     playerImpl.getBrightnessRelativeLayout().setVisibility(View.GONE);
                 }
-            } else {
+            } else if (isBrightnessGestureEnabled && acceptBrightnessArea) {
                 playerImpl.getBrightnessProgressBar().incrementProgressBy((int) distanceY);
                 float currentProgressPercent =
                         (float) playerImpl.getBrightnessProgressBar().getProgress() / playerImpl.getMaxGestureLength();

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -169,8 +169,12 @@ public class PlayerHelper {
         return isResumeAfterAudioFocusGain(context, false);
     }
 
-    public static boolean isPlayerGestureEnabled(@NonNull final Context context) {
+    public static boolean isVolumeGestureEnabled(@NonNull final Context context) {
-        return isPlayerGestureEnabled(context, true);
+        return isVolumeGestureEnabled(context, true);
+    }
+
+    public static boolean isBrightnessGestureEnabled(@NonNull final Context context) {
+        return isBrightnessGestureEnabled(context, true);
     }
 
     public static boolean isUsingOldPlayer(@NonNull final Context context) {
@@ -306,8 +310,12 @@ public class PlayerHelper {
         return getPreferences(context).getBoolean(context.getString(R.string.resume_on_audio_focus_gain_key), b);
     }
 
-    private static boolean isPlayerGestureEnabled(@NonNull final Context context, final boolean b) {
+    private static boolean isVolumeGestureEnabled(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.player_gesture_controls_key), b);
+        return getPreferences(context).getBoolean(context.getString(R.string.volume_gesture_control_key), b);
+    }
+
+    private static boolean isBrightnessGestureEnabled(@NonNull final Context context, final boolean b) {
+        return getPreferences(context).getBoolean(context.getString(R.string.brightness_gesture_control_key), b);
     }
 
     private static boolean isUsingOldPlayer(@NonNull final Context context, final boolean b) {

app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java

@@ -32,6 +32,7 @@ import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;

app/src/main/res/layout-large-land/activity_main_player.xml

@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center">
+
+    <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+        android:id="@+id/aspectRatioLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center">
+
+        <SurfaceView
+            android:id="@+id/surfaceView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+
+
+        <View
+            android:id="@+id/surfaceForeground"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"/>
+
+    </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
+
+    <com.google.android.exoplayer2.ui.SubtitleView
+        android:id="@+id/subtitleView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center"/>
+
+    <ImageView
+        android:id="@+id/endScreen"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        tools:background="@android:color/white"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/playQueuePanel"
+        android:layout_width="380dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:visibility="invisible"
+        android:background="?attr/queue_background_color"
+        tools:visibility="visible">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:id="@+id/playQueueControl">
+
+            <ImageButton
+                android:id="@+id/playQueueClose"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginRight="40dp"
+                android:layout_marginEnd="40dp"
+                android:padding="10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:tint="?attr/colorAccent"
+                android:src="@drawable/ic_close_white_24dp"
+                android:background="?android:selectableItemBackground"
+                tools:ignore="ContentDescription"/>
+
+            <ImageButton
+                android:id="@+id/repeatButton"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginLeft="40dp"
+                android:layout_marginStart="40dp"
+                android:padding="10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:tint="?attr/colorAccent"
+                android:src="@drawable/exo_controls_repeat_off"
+                android:background="?android:selectableItemBackground"
+                tools:ignore="ContentDescription,RtlHardcoded"/>
+
+            <ImageButton
+                android:id="@+id/shuffleButton"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/repeatButton"
+                android:padding="10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:tint="?attr/colorAccent"
+                android:src="@drawable/ic_shuffle_white_24dp"
+                android:background="?android:selectableItemBackground"
+                tools:ignore="ContentDescription,RtlHardcoded"/>
+        </RelativeLayout>
+
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/playQueue"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/playQueueControl"
+            android:scrollbars="vertical"
+            app:layoutManager="LinearLayoutManager"
+            tools:listitem="@layout/play_queue_item"/>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/playbackControlRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/video_overlay_color"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <RelativeLayout
+            android:id="@+id/playbackWindowRoot"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true">
+
+            <RelativeLayout
+                android:id="@+id/topControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/player_top_controls_bg"
+                android:gravity="top"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                tools:ignore="RtlHardcoded">
+
+                <LinearLayout
+                    android:id="@+id/metadataView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@+id/qualityTextView"
+                    android:gravity="top"
+                    android:orientation="vertical"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    tools:ignore="RtlHardcoded">
+
+                    <TextView
+                        android:id="@+id/titleTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:fadingEdge="horizontal"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textColor="@android:color/white"
+                        android:textSize="15sp"
+                        android:textStyle="bold"
+                        android:clickable="true"
+                        android:focusable="true"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="The Video Title LONG very LONG"/>
+
+                    <TextView
+                        android:id="@+id/channelTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:fadingEdge="horizontal"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textColor="@android:color/white"
+                        android:textSize="12sp"
+                        android:clickable="true"
+                        android:focusable="true"
+                        tools:text="The Video Artist  LONG very LONG very Long"/>
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/qualityTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/playbackSpeed"
+                    android:gravity="center"
+                    android:minWidth="50dp"
+                    android:text="720p"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="HardcodedText,RtlHardcoded"/>
+
+                <TextView
+                    android:id="@+id/playbackSpeed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/queueButton"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="RtlHardcoded,RtlSymmetry"
+                    tools:text="1x" />
+
+                <ImageButton
+                    android:id="@+id/queueButton"
+                    android:layout_width="30dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/moreOptionsButton"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/list"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/moreOptionsButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginLeft="2dp"
+					android:padding="5dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_expand_more_white_24dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/secondaryControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/topControls"
+                android:gravity="top"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:visibility="invisible"
+                tools:ignore="RtlHardcoded"
+                tools:visibility="visible">
+
+                <TextView
+                    android:id="@+id/resizeTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_alignParentLeft="true"
+                    android:gravity="center"
+                    android:minWidth="50dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="HardcodedText,RtlHardcoded"
+                    tools:text="FIT"/>
+
+                <TextView
+                    android:id="@+id/captionTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_toLeftOf="@id/switchBackground"
+                    android:layout_toRightOf="@id/resizeTextView"
+                    android:gravity="center|left"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:paddingLeft="2dp"
+                    android:paddingRight="2dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="RelativeOverlap,RtlHardcoded"
+                    tools:text="English" />
+
+                <ImageButton
+                    android:id="@+id/toggleOrientation"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_screen_rotation_white"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/toggle_orientation"
+                    tools:ignore="RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/switchPopup"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_toLeftOf="@id/toggleOrientation"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_fullscreen_exit_white"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/switch_to_popup"
+                    tools:ignore="RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/switchBackground"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_toLeftOf="@id/switchPopup"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_headset_white_24dp"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/switch_to_background"
+                    tools:ignore="RtlHardcoded"/>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/bottomControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/player_controls_bg"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp">
+
+                <TextView
+                    android:id="@+id/playbackCurrentTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:text="-:--:--"
+                    android:textColor="@android:color/white"
+                    tools:ignore="HardcodedText"
+                    tools:text="1:06:29"/>
+
+
+                <android.support.v7.widget.AppCompatSeekBar
+                    android:id="@+id/playbackSeekBar"
+                    style="@style/Widget.AppCompat.SeekBar"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:paddingBottom="4dp"
+                    android:paddingTop="8dp"
+                    tools:progress="25"
+                    tools:secondaryProgress="50"/>
+
+                <TextView
+                    android:id="@+id/playbackEndTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="-:--:--"
+                    android:textColor="@android:color/white"
+                    tools:ignore="HardcodedText"
+                    tools:text="1:23:49"/>
+
+                <TextView
+                    android:id="@+id/playbackLiveSync"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:gravity="center"
+                    android:text="@string/duration_live_button"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/white"
+                    android:maxLength="4"
+                    android:visibility="gone"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <ImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_centerInParent="true"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_pause_white"
+            tools:ignore="ContentDescription"/>
+
+        <ImageButton
+            android:id="@+id/playPreviousButton"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginRight="30dp"
+            android:layout_marginEnd="30dp"
+            android:layout_centerInParent="true"
+            android:layout_toLeftOf="@id/playPauseButton"
+            android:layout_toStartOf="@id/playPauseButton"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:scaleType="fitXY"
+            android:src="@drawable/exo_controls_previous"
+            tools:ignore="ContentDescription"/>
+
+        <ImageButton
+            android:id="@+id/playNextButton"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginStart="30dp"
+            android:layout_centerInParent="true"
+            android:layout_toRightOf="@id/playPauseButton"
+            android:layout_toEndOf="@id/playPauseButton"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:scaleType="fitXY"
+            android:src="@drawable/exo_controls_next"
+            tools:ignore="ContentDescription"/>
+
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/controlAnimationView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:background="@drawable/background_oval_black_transparent"
+            android:visibility="gone"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_action_av_fast_rewind"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/loading_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        tools:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBarLoadingPanel"
+            style="?android:attr/progressBarStyleLargeInverse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:indeterminate="true"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_gravity="center"
+        android:layout_toEndOf="@+id/loading_panel"
+        android:layout_toRightOf="@+id/loading_panel"
+        tools:ignore="RtlHardcoded">
+
+        <RelativeLayout
+            android:id="@+id/volumeRelativeLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/background_oval_black_transparent"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ProgressBar
+                android:id="@+id/volumeProgressBar"
+                style="?android:progressBarStyleHorizontal"
+                android:layout_width="128dp"
+                android:layout_height="128dp"
+                android:indeterminate="false"
+                android:progressDrawable="@drawable/progress_circular_white" />
+
+            <ImageView
+                android:id="@+id/volumeImageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_volume_up_white_72dp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/brightnessRelativeLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/background_oval_black_transparent"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ProgressBar
+                android:id="@+id/brightnessProgressBar"
+                style="?android:progressBarStyleHorizontal"
+                android:layout_width="128dp"
+                android:layout_height="128dp"
+                android:indeterminate="false"
+                android:progressDrawable="@drawable/progress_circular_white" />
+
+            <ImageView
+                android:id="@+id/brightnessImageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_brightness_high_white_72dp" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/currentDisplaySeek"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="58dp"
+            android:background="#64000000"
+            android:paddingBottom="10dp"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:paddingTop="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="26sp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:text="1:06:29"
+            tools:visibility="visible" />
+    </RelativeLayout>
+
+</RelativeLayout>

app/src/main/res/layout-large-land/fragment_video_detail.xml

@@ -0,0 +1,491 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/video_item_detail"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:focusableInTouchMode="true"
+	android:orientation="horizontal">
+
+	<com.nirhart.parallaxscroll.views.ParallaxScrollView
+		android:id="@+id/detail_main_content"
+		app:parallax_factor="1.9"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="5">
+
+		<!--WRAPPER-->
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<!-- THUMBNAIL -->
+			<FrameLayout
+				android:id="@+id/detail_thumbnail_root_layout"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@android:color/black"
+				android:clickable="true"
+				android:focusable="true"
+				android:foreground="?attr/selectableItemBackground">
+
+				<ImageView
+					android:id="@+id/detail_thumbnail_image_view"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@android:color/transparent"
+					android:contentDescription="@string/detail_thumbnail_view_description"
+					android:scaleType="fitCenter"
+					tools:ignore="RtlHardcoded"
+					tools:layout_height="200dp"
+					tools:src="@drawable/dummy_thumbnail" />
+
+				<ImageView
+					android:id="@+id/detail_thumbnail_play_button"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:layout_gravity="center"
+					android:background="@android:color/transparent"
+					android:src="@drawable/new_play_arrow"
+					android:visibility="invisible"
+					tools:ignore="ContentDescription"
+					tools:visibility="visible" />
+
+				<TextView
+					android:id="@+id/touch_append_detail"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:background="#64000000"
+					android:paddingBottom="10dp"
+					android:paddingLeft="30dp"
+					android:paddingRight="30dp"
+					android:paddingTop="10dp"
+					android:text="@string/hold_to_append"
+					android:textColor="@android:color/white"
+					android:textSize="20sp"
+					android:textStyle="bold"
+					android:visibility="gone"
+					tools:ignore="RtlHardcoded"
+					tools:visibility="visible" />
+
+				<TextView
+					android:id="@+id/detail_duration_view"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom|right"
+					android:layout_marginBottom="8dp"
+					android:layout_marginLeft="12dp"
+					android:layout_marginRight="12dp"
+					android:layout_marginTop="8dp"
+					android:alpha=".6"
+					android:background="#23000000"
+					android:gravity="center"
+					android:paddingBottom="2dp"
+					android:paddingLeft="6dp"
+					android:paddingRight="6dp"
+					android:paddingTop="2dp"
+					android:textAllCaps="true"
+					android:textColor="@android:color/white"
+					android:textSize="12sp"
+					android:textStyle="bold"
+					android:visibility="gone"
+					tools:ignore="RtlHardcoded"
+					tools:text="12:38"
+					tools:visibility="visible" />
+			</FrameLayout>
+
+			<!-- CONTENT -->
+			<RelativeLayout
+				android:id="@+id/detail_content_root_layout"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:background="?android:windowBackground">
+
+				<!-- TITLE -->
+				<FrameLayout
+					android:id="@+id/detail_title_root_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingLeft="12dp"
+					android:paddingRight="12dp">
+
+					<TextView
+						android:id="@+id/detail_video_title_view"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_marginRight="20dp"
+						android:ellipsize="end"
+						android:maxLines="1"
+						android:paddingBottom="8dp"
+						android:paddingTop="12dp"
+						android:textAppearance="?android:attr/textAppearanceLarge"
+						android:textSize="@dimen/video_item_detail_title_text_size"
+						tools:ignore="RtlHardcoded"
+						tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
+
+				</FrameLayout>
+
+				<!-- LOADING INDICATOR-->
+				<ProgressBar
+					android:id="@+id/loading_progress_bar"
+					style="@style/Widget.AppCompat.ProgressBar"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/detail_title_root_layout"
+					android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+					android:indeterminate="true"
+					android:visibility="gone"
+					tools:visibility="visible" />
+
+				<!--ERROR PANEL-->
+				<include
+					android:id="@+id/error_panel"
+					layout="@layout/error_retry"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/detail_title_root_layout"
+					android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+					android:visibility="gone"
+					tools:visibility="visible" />
+
+				<!--HIDING ROOT-->
+				<LinearLayout
+					android:id="@+id/detail_content_root_hiding"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_below="@+id/detail_title_root_layout"
+					android:orientation="vertical"
+					android:visibility="gone"
+					tools:visibility="visible">
+
+					<!--DETAIL-->
+					<RelativeLayout
+						android:id="@+id/detail_root"
+						android:layout_width="match_parent"
+						android:layout_height="55dp"
+						android:layout_marginLeft="12dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginTop="6dp"
+						android:baselineAligned="false"
+						android:orientation="horizontal">
+
+						<!--UPLOADER-->
+						<LinearLayout
+							android:id="@+id/detail_uploader_root_layout"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_toLeftOf="@id/details_panel"
+							android:layout_toStartOf="@id/details_panel"
+							android:background="?attr/selectableItemBackground"
+							android:gravity="center_vertical"
+							android:orientation="horizontal"
+							android:padding="6dp">
+
+							<de.hdodenhof.circleimageview.CircleImageView
+								android:id="@+id/detail_uploader_thumbnail_view"
+								android:layout_width="@dimen/video_item_detail_uploader_image_size"
+								android:layout_height="@dimen/video_item_detail_uploader_image_size"
+								android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+								android:src="@drawable/buddy"
+								tools:ignore="RtlHardcoded" />
+
+							<TextView
+								android:id="@+id/detail_uploader_text_view"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="15dp"
+								android:ellipsize="marquee"
+								android:fadingEdge="horizontal"
+								android:marqueeRepeatLimit="marquee_forever"
+								android:scrollHorizontally="true"
+								android:singleLine="true"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_uploader_text_size"
+								android:textStyle="bold"
+								tools:ignore="RtlHardcoded"
+								tools:text="Uploader" />
+
+							<!--<Button
+								android:id="@+id/detail_uploader_subscribe"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center_vertical|right"
+								android:layout_marginRight="12dp"
+								android:text="@string/rss_button_title"
+								android:textSize="12sp"
+								android:theme="@style/RedButton"
+								android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+								tools:ignore="RtlHardcoded"
+								android:visibility="gone"/>-->
+						</LinearLayout>
+
+						<!-- VIEW & THUMBS -->
+						<RelativeLayout
+							android:id="@+id/details_panel"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_alignParentEnd="true"
+							android:layout_alignParentRight="true"
+							android:paddingLeft="6dp"
+							android:paddingRight="6dp">
+
+							<TextView
+								android:id="@+id/detail_view_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_centerHorizontal="true"
+								android:layout_marginBottom="6dp"
+								android:layout_marginTop="6dp"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_views_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="2,816,821,505 views" />
+
+							<ImageView
+								android:id="@+id/detail_thumbs_up_img_view"
+								android:layout_width="@dimen/video_item_detail_like_image_width"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:contentDescription="@string/detail_likes_img_view_description"
+								android:src="?attr/thumbs_up" />
+
+							<TextView
+								android:id="@+id/detail_thumbs_up_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+								android:layout_toRightOf="@id/detail_thumbs_up_img_view"
+								android:gravity="center_vertical"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceMedium"
+								android:textSize="@dimen/video_item_detail_likes_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="12M" />
+
+							<ImageView
+								android:id="@+id/detail_thumbs_down_img_view"
+								android:layout_width="@dimen/video_item_detail_like_image_width"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="12dp"
+								android:layout_toRightOf="@id/detail_thumbs_up_count_view"
+								android:contentDescription="@string/detail_dislikes_img_view_description"
+								android:src="?attr/thumbs_down"
+								tools:ignore="RtlHardcoded" />
+
+							<TextView
+								android:id="@+id/detail_thumbs_down_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+								android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+								android:gravity="center_vertical"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceMedium"
+								android:textSize="@dimen/video_item_detail_likes_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="10K" />
+
+							<TextView
+								android:id="@+id/detail_thumbs_disabled_view"
+								android:layout_width="wrap_content"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="12dp"
+								android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+								android:gravity="center_vertical"
+								android:text="@string/disabled"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_likes_text_size"
+								android:textStyle="bold"
+								android:visibility="gone"
+								tools:ignore="RtlHardcoded"
+								tools:visibility="visible" />
+						</RelativeLayout>
+					</RelativeLayout>
+
+					<LinearLayout
+						android:id="@+id/detail_control_panel"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="horizontal"
+						android:padding="6dp">
+
+						<!-- CONTROLS -->
+						<TextView
+							android:id="@+id/detail_controls_playlist_append"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/append_playlist"
+							android:drawableTop="?attr/ic_playlist_add"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/controls_add_to_playlist_title"
+							android:textSize="12sp" />
+
+						<TextView
+							android:id="@+id/detail_controls_background"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/play_audio"
+							android:drawableTop="?attr/audio"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/controls_background_title"
+							android:textSize="12sp" />
+
+						<TextView
+							android:id="@+id/detail_controls_popup"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/open_in_popup_mode"
+							android:drawableTop="?attr/popup"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/controls_popup_title"
+							android:textSize="12sp" />
+
+						<TextView
+							android:id="@+id/detail_controls_download"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/controls_download_desc"
+							android:drawableTop="?attr/download"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/download"
+							android:textSize="12sp" />
+
+					</LinearLayout>
+
+					<View
+						android:layout_width="match_parent"
+						android:layout_height="1px"
+						android:layout_marginLeft="8dp"
+						android:layout_marginRight="8dp"
+						android:background="?attr/separator_color" />
+
+					<!--DESCRIPTIONS-->
+					<LinearLayout
+						android:id="@+id/detail_description_root_layout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:orientation="vertical">
+
+						<TextView
+							android:id="@+id/detail_upload_date_view"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="12dp"
+							android:layout_marginRight="12dp"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textSize="@dimen/video_item_detail_upload_date_text_size"
+							android:textStyle="bold"
+							tools:text="Published on Oct 2, 2009" />
+
+						<TextView
+							android:id="@+id/detail_description_view"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="8dp"
+							android:layout_marginLeft="12dp"
+							android:layout_marginRight="12dp"
+							android:layout_marginTop="3dp"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textIsSelectable="true"
+							android:textSize="@dimen/video_item_detail_description_text_size"
+							tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
+
+						<View
+							android:layout_width="match_parent"
+							android:layout_height="1px"
+							android:layout_marginLeft="8dp"
+							android:layout_marginRight="8dp"
+							android:background="?attr/separator_color" />
+
+					</LinearLayout>
+				</LinearLayout>
+			</RelativeLayout>
+		</LinearLayout>
+
+	</com.nirhart.parallaxscroll.views.ParallaxScrollView>
+
+	<ScrollView
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="3">
+
+		<!--NEXT AND RELATED VIDEOS-->
+		<LinearLayout
+			android:id="@+id/detail_related_streams_root_layout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:paddingTop="14dp"
+			android:paddingBottom="8dp"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/detail_next_stream_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="12dp"
+				android:text="@string/next_video_title"
+				android:textAllCaps="true"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:textSize="@dimen/video_item_detail_next_text_size"
+				tools:ignore="RtlHardcoded" />
+
+			<LinearLayout
+				android:id="@+id/detail_related_streams_view"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_marginTop="2dp"
+				android:orientation="vertical"
+				tools:minHeight="50dp" />
+
+			<ImageButton
+				android:id="@+id/detail_related_streams_expand"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/selectableItemBackground"
+				android:paddingBottom="10dp"
+				android:paddingTop="4dp"
+				android:src="?attr/expand"
+				android:textAlignment="center"
+				android:textAllCaps="true"
+				tools:ignore="ContentDescription" />
+		</LinearLayout>
+	</ScrollView>
+</LinearLayout>

app/src/main/res/layout/fragment_subscription.xml

@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollbars="vertical"
-        app:layoutManager="LinearLayoutManager"
         android:visibility="gone"
         tools:listitem="@layout/list_channel_item"
         tools:visibility="visible"/>

app/src/main/res/layout/list_channel_grid_item.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<de.hdodenhof.circleimageview.CircleImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_centerHorizontal="true"
+		android:padding="2dp"
+		android:contentDescription="@string/list_thumbnail_view_description"
+		android:src="@drawable/buddy_channel_item"
+		tools:ignore="RtlHardcoded"/>
+
+	<TextView
+		android:id="@+id/itemTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/itemThumbnailView"
+		android:ellipsize="end"
+		android:lines="1"
+		android:gravity="center_horizontal"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textSize="@dimen/video_item_search_title_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="Channel Title, Lorem ipsum"/>
+
+	<TextView
+		android:id="@+id/itemAdditionalDetails"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/itemTitleView"
+		android:layout_centerHorizontal="true"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_upload_date_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="10M subscribers"/>
+
+</RelativeLayout>

app/src/main/res/layout/list_playlist_grid_item.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<ImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_centerHorizontal="true"
+		android:layout_alignParentTop="true"
+		android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+		android:contentDescription="@string/list_thumbnail_view_description"
+		android:scaleType="centerCrop"
+		android:src="@drawable/dummy_thumbnail_playlist"
+		tools:ignore="RtlHardcoded"/>
+
+	<TextView
+		android:id="@+id/itemStreamCountView"
+		android:layout_width="@dimen/playlist_item_thumbnail_stream_count_width"
+		android:layout_height="match_parent"
+		android:layout_alignBottom="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_alignTop="@id/itemThumbnailView"
+		android:background="@color/playlist_stream_count_background_color"
+		android:drawableTop="@drawable/ic_playlist_play_white_24dp"
+		android:gravity="center"
+		android:paddingBottom="14dp"
+		android:paddingTop="16dp"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="@color/duration_text_color"
+		android:textSize="@dimen/video_item_search_duration_text_size"
+		android:textStyle="bold"
+		tools:ignore="RtlHardcoded"
+		tools:text="314159"/>
+
+	<TextView
+		android:id="@+id/itemTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_marginTop="2dp"
+		android:ellipsize="end"
+		android:maxLines="2"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textSize="@dimen/video_item_search_title_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
+
+	<TextView
+		android:id="@+id/itemUploaderView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/itemTitleView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_uploader_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="Uploader"/>
+
+</RelativeLayout>

app/src/main/res/layout/list_stream_grid_item.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<ImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_centerHorizontal="true"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_alignParentTop="true"
+		android:contentDescription="@string/list_thumbnail_view_description"
+		android:scaleType="centerCrop"
+		android:src="@drawable/dummy_thumbnail"
+		tools:ignore="RtlHardcoded"/>
+
+	<TextView
+		android:id="@+id/itemDurationView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignBottom="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+		android:layout_marginRight="@dimen/video_item_search_duration_margin"
+		android:background="@color/duration_background_color"
+		android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+		android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+		android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+		android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+		android:textAllCaps="true"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="@color/duration_text_color"
+		android:textSize="@dimen/video_item_search_duration_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="1:09:10"/>
+
+	<TextView
+		android:id="@+id/itemVideoTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:ellipsize="end"
+		android:maxLines="2"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textSize="@dimen/video_item_search_title_text_size"
+		tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"
+		android:layout_alignEnd="@id/itemThumbnailView" />
+
+	<TextView
+		android:id="@+id/itemUploaderView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/itemVideoTitleView"
+		android:layout_alignLeft="@id/itemVideoTitleView"
+		android:layout_alignRight="@id/itemVideoTitleView"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_uploader_text_size"
+		tools:text="Uploader"/>
+</RelativeLayout>

app/src/main/res/layout/list_stream_playlist_grid_item.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<ImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_alignParentTop="true"
+		android:layout_centerHorizontal="true"
+		android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+		android:contentDescription="@string/list_thumbnail_view_description"
+		android:scaleType="centerCrop"
+		android:src="@drawable/dummy_thumbnail"
+		tools:ignore="RtlHardcoded" />
+
+	<TextView
+		android:id="@+id/itemDurationView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignBottom="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+		android:layout_marginRight="@dimen/video_item_search_duration_margin"
+		android:background="@color/duration_background_color"
+		android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+		android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+		android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+		android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="@color/duration_text_color"
+		android:textSize="@dimen/video_item_search_duration_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="1:09:10" />
+
+	<ImageView
+		android:id="@+id/itemHandle"
+		android:layout_width="wrap_content"
+		android:layout_height="55dp"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentBottom="true"
+		android:contentDescription="@string/detail_drag_description"
+		android:paddingLeft="@dimen/video_item_search_image_right_margin"
+		android:scaleType="center"
+		android:src="?attr/drag_handle"
+		tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+	<TextView
+		android:id="@+id/itemVideoTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignEnd="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_alignStart="@id/itemThumbnailView"
+		android:layout_below="@id/itemThumbnailView"
+		android:ellipsize="end"
+		android:maxLines="2"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textSize="@dimen/video_item_search_title_text_size"
+		tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique..." />
+
+	<TextView
+		android:id="@+id/itemAdditionalDetails"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignEnd="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_alignStart="@id/itemThumbnailView"
+		android:layout_below="@+id/itemVideoTitleView"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_uploader_text_size"
+		tools:text="Uploader" />
+
+</RelativeLayout>

app/src/main/res/values-ru/strings.xml

@@ -490,6 +490,7 @@
     <string name="limit_mobile_data_usage_title">Предел разрешения в мобильной сети</string>
     <string name="channels">Каналы</string>
     <string name="playlists">Плейлисты</string>
+    <string name="videos">Видео</string>
     <string name="tracks">Дорожки</string>
     <string name="users">Пользователи</string>
     <string name="skip_silence_checkbox">Проматывать тишину</string>
@@ -502,4 +503,9 @@
     <string name="minimize_on_exit_background_description">Фоновый плеер</string>
     <string name="minimize_on_exit_popup_description">Плеер в окне</string>
 
+    <string name="list_view_mode">Вид списка</string>
+    <string name="list">Список</string>
+    <string name="grid">Сетка</string>
+	<string name="auto">Автоматически</string>
+
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -487,4 +487,8 @@
     <string name="playlists">Плейлисти</string>
     <string name="tracks">Стежки</string>
     <string name="users">Користувачі</string>
+
+    <string name="list_view_mode">Вигляд списку</string>
+    <string name="list">Список</string>
+    <string name="grid">Сiтка</string>
 </resources>

app/src/main/res/values/dimens.xml

@@ -12,6 +12,8 @@
     <!-- 16 / 9 ratio-->
     <dimen name="video_item_search_thumbnail_image_width">124dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">70dp</dimen>
+    <dimen name="video_item_grid_thumbnail_image_width">164dp</dimen>
+    <dimen name="video_item_grid_thumbnail_image_height">92dp</dimen>
     <!-- Calculated: 2*video_item_search_padding + video_item_search_thumbnail_image_height -->
     <dimen name="video_item_search_height">94dp</dimen>
     <!-- Paddings & Margins -->

app/src/main/res/values/settings_keys.xml

@@ -19,7 +19,8 @@
     <string name="autoplay_through_intent_key" translatable="false">autoplay_through_intent</string>
     <string name="use_old_player_key" translatable="false">use_oldplayer</string>
 
-    <string name="player_gesture_controls_key" translatable="false">player_gesture_controls</string>
+    <string name="volume_gesture_control_key" translatable="false">volume_gesture_control</string>
+    <string name="brightness_gesture_control_key" translatable="false">brightness_gesture_control</string>
     <string name="resume_on_audio_focus_gain_key" translatable="false">resume_on_audio_focus_gain</string>
     <string name="popup_remember_size_pos_key" translatable="false">popup_remember_size_pos_key</string>
     <string name="use_inexact_seek_key" translatable="false">use_inexact_seek_key</string>
@@ -880,5 +881,18 @@
         <item>144p</item>
     </string-array>
 
+    <string name="list_view_mode_key" translatable="false">list_view_mode</string>
+    <string name="list_view_mode_value" translatable="false">auto</string>
+
+    <string-array name="list_view_mode_values" translatable="false">
+        <item>auto</item>
+        <item>list</item>
+        <item>grid</item>
+    </string-array>
+    <string-array name="list_view_mode_description" translatable="false">
+        <item>@string/auto</item>
+        <item>@string/list</item>
+        <item>@string/grid</item>
+    </string-array>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -5,7 +5,7 @@
     <string name="view_count_text">%1$s views</string>
     <string name="upload_date_text">Published on %1$s</string>
     <string name="no_player_found">No stream player found. Do you want to install VLC?</string>
-    <string name="no_player_found_toast">No stream player found (you can install VLC to play it)</string>
+    <string name="no_player_found_toast">No stream player found (you can install VLC to play it).</string>
     <string name="install">Install</string>
     <string name="cancel">Cancel</string>
     <string name="fdroid_vlc_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
@@ -13,7 +13,7 @@
     <string name="open_in_popup_mode">Open in popup mode</string>
     <string name="share">Share</string>
     <string name="download">Download</string>
-    <string name="controls_download_desc">Download stream file.</string>
+    <string name="controls_download_desc">Download stream file</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
     <string name="did_you_mean">Did you mean: %1$s?</string>
@@ -21,15 +21,16 @@
     <string name="choose_browser">Choose browser</string>
     <string name="screen_rotation">rotation</string>
     <string name="use_external_video_player_title">Use external video player</string>
-    <string name="use_external_video_player_summary">Some resolutions will NOT have audio when this option is enabled</string>
+    <string name="use_external_video_player_summary">Removes audio at SOME resolutions</string>
     <string name="use_external_audio_player_title">Use external audio player</string>
     <string name="popup_mode_share_menu_title">NewPipe popup mode</string>
     <string name="rss_button_title" translatable="false">RSS</string>
     <string name="subscribe_button_title">Subscribe</string>
     <string name="subscribed_button_title">Subscribed</string>
+    <string name="unsubscribe">Unsubscribe</string>
     <string name="channel_unsubscribed">Channel unsubscribed</string>
-    <string name="subscription_change_failed">Unable to change subscription</string>
+    <string name="subscription_change_failed">Could not change subscription</string>
-    <string name="subscription_update_failed">Unable to update subscription</string>
+    <string name="subscription_update_failed">Could not update subscription</string>
     <string name="show_info">Show info</string>
 
     <string name="tab_main">Main</string>
@@ -48,8 +49,8 @@
     <string name="download_path_summary">Path to store downloaded videos in</string>
     <string name="download_path_dialog_title">Enter download path for videos</string>
 
-    <string name="download_path_audio_title">Audio download path</string>
+    <string name="download_path_audio_title">Audio download folder</string>
-    <string name="download_path_audio_summary">Path to store downloaded audio in</string>
+    <string name="download_path_audio_summary">Downloaded audio is stored here</string>
     <string name="download_path_audio_dialog_title">Enter download path for audio files</string>
 
     <string name="autoplay_by_calling_app_title">Autoplay</string>
@@ -75,15 +76,17 @@
     <string name="use_inexact_seek_title">Use fast inexact seek</string>
     <string name="use_inexact_seek_summary">Inexact seek allows the player to seek to positions faster with reduced precision</string>
     <string name="download_thumbnail_title">Load thumbnails</string>
-    <string name="download_thumbnail_summary">Disable to stop all thumbnails from loading and save on data and memory usage. Changing this will clear both in-memory and on-disk image cache.</string>
+    <string name="download_thumbnail_summary">When off no thumbnails load, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Image cache wiped</string>
     <string name="metadata_cache_wipe_title">Wipe cached metadata</string>
     <string name="metadata_cache_wipe_summary">Remove all cached webpage data</string>
     <string name="metadata_cache_wipe_complete_notice">Metadata cache wiped</string>
     <string name="auto_queue_title">Auto-queue next stream</string>
     <string name="auto_queue_summary">Auto-append a related stream when playing the last stream in a non-repeating queue.</string>
-    <string name="player_gesture_controls_title">Player gesture controls</string>
+    <string name="volume_gesture_control_title">Volume gesture control</string>
-    <string name="player_gesture_controls_summary">Use gestures to control the brightness and volume of the player</string>
+    <string name="volume_gesture_control_summary">Use gestures to control the volume of the player</string>
+    <string name="brightness_gesture_control_title">Brightness gesture control</string>
+    <string name="brightness_gesture_control_summary">Use gestures to control the brightness of the player</string>
     <string name="show_search_suggestions_title">Search suggestions</string>
     <string name="show_search_suggestions_summary">Show suggestions when searching</string>
     <string name="enable_search_history_title">Search history</string>
@@ -93,18 +96,18 @@
     <string name="resume_on_audio_focus_gain_title">Resume on focus gain</string>
     <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phone calls)</string>
     <string name="download_dialog_title">Download</string>
-    <string name="next_video_title">Next video</string>
+    <string name="next_video_title">Next</string>
-    <string name="show_next_and_similar_title">Show \'next\' and \'similar\' videos</string>
+    <string name="show_next_and_similar_title">Show \'Next\' and \'Similar\' videos</string>
-    <string name="show_hold_to_append_title">Show \"hold to append\" tip</string>
+    <string name="show_hold_to_append_title">Show \"Hold to append\" tip</string>
     <string name="show_hold_to_append_summary">Show tip when background or popup button is pressed on video details page</string>
-    <string name="url_not_supported_toast">URL not supported</string>
+    <string name="url_not_supported_toast">Unsupported URL</string>
     <string name="default_content_country_title">Default content country</string>
     <string name="service_title">Service</string>
     <string name="content_language_title">Default content language</string>
     <string name="settings_category_player_title">Player</string>
     <string name="settings_category_player_behavior_title">Behavior</string>
-    <string name="settings_category_video_audio_title">Video &amp; Audio</string>
+    <string name="settings_category_video_audio_title">Video &amp; audio</string>
-    <string name="settings_category_history_title">History &amp; Cache</string>
+    <string name="settings_category_history_title">History &amp; cache</string>
     <string name="settings_category_popup_title">Popup</string>
     <string name="settings_category_appearance_title">Appearance</string>
     <string name="settings_category_other_title">Other</string>
@@ -116,8 +119,8 @@
     <string name="c3s_url" translatable="false">https://www.c3s.cc/</string>
     <string name="play_btn_text">Play</string>
     <string name="content">Content</string>
-    <string name="show_age_restricted_content_title">Show age restricted content</string>
+    <string name="show_age_restricted_content_title">Age restricted content</string>
-    <string name="video_is_age_restricted">Age Restricted Video. Allowing such material is possible from Settings.</string>
+    <string name="video_is_age_restricted">Show age Restricted Video. Allowing such material is possible from \"Settings\".</string>
     <string name="duration_live">live</string>
     <string name="duration_live_button" translatable="false">LIVE</string>
     <string name="downloads">Downloads</string>
@@ -147,7 +150,7 @@
 
     <string name="notification_channel_id" translatable="false">newpipe</string>
     <string name="notification_channel_name">NewPipe Notification</string>
-    <string name="notification_channel_description">Notifications for NewPipe Background and Popup Players</string>
+    <string name="notification_channel_description">Notifications for NewPipe background and popup players</string>
 
     <string name="unknown_content">[Unknown]</string>
 
@@ -158,29 +161,29 @@
 
     <string name="import_data_title">Import database</string>
     <string name="export_data_title">Export database</string>
-    <string name="import_data_summary">Will override your current history and subscriptions</string>
+    <string name="import_data_summary">Overrides your current history and subscriptions</string>
-    <string name="export_data_summary">Export history, subscriptions and playlists.</string>
+    <string name="export_data_summary">Export history, subscriptions and playlists</string>
     <string name="clear_views_history_title">Clear watch history</string>
-    <string name="clear_views_history_summary">Deletes the history of played streams.</string>
+    <string name="clear_views_history_summary">Deletes the history of played streams</string>
-    <string name="delete_view_history_alert">Delete whole watch history.</string>
+    <string name="delete_view_history_alert">Delete entire watch history?</string>
     <string name="view_history_deleted">Watch history deleted.</string>
     <string name="clear_search_history_title">Clear search history</string>
-    <string name="clear_search_history_summary">Deletes history of search keywords.</string>
+    <string name="clear_search_history_summary">Deletes history of search keywords</string>
-    <string name="delete_search_history_alert">Delete whole search history.</string>
+    <string name="delete_search_history_alert">Delete entire search history?</string>
     <string name="search_history_deleted">Search history deleted.</string>
     <!-- error strings -->
     <string name="general_error">Error</string>
-    <string name="download_to_sdcard_error_title">External storage not available.</string>
+    <string name="download_to_sdcard_error_title">External storage unavailable</string>
-    <string name="download_to_sdcard_error_message">Download to external SD Card is not possible yet. Should the download place be reset?</string>
+    <string name="download_to_sdcard_error_message">Download to external SD card is not possible yet. Reset download folder location?</string>
     <string name="network_error">Network error</string>
     <string name="could_not_load_thumbnails">Could not load all thumbnails</string>
     <string name="youtube_signature_decryption_error">Could not decrypt video URL signature</string>
     <string name="parsing_error">Could not parse website</string>
     <string name="light_parsing_error">Could not parse website completely</string>
-    <string name="content_not_available">Content not available</string>
+    <string name="content_not_available">Content unavailable</string>
     <string name="blocked_by_gema">Blocked by GEMA</string>
     <string name="could_not_setup_download_menu">Could not set up download menu</string>
-    <string name="live_streams_not_supported">This is a LIVE STREAM, which is not yet supported.</string>
+    <string name="live_streams_not_supported">Live streams are not supported yet</string>
     <string name="could_not_get_stream">Could not get any stream</string>
     <string name="could_not_load_image">Could not load image</string>
     <string name="app_ui_crash">App/UI crashed</string>
@@ -191,9 +194,9 @@
     <string name="invalid_url_toast">Invalid URL</string>
     <string name="video_streams_empty">No video streams found</string>
     <string name="audio_streams_empty">No audio streams found</string>
-    <string name="invalid_directory">Invalid directory</string>
+    <string name="invalid_directory">No such folder</string>
-    <string name="invalid_source">Invalid file/content source</string>
+    <string name="invalid_source">No such file/content source</string>
-    <string name="invalid_file">File doesn\'t exist or insufficient permission to read or write to it</string>
+    <string name="invalid_file">The file doesn\'t exist or permission to read or write to it is lacking</string>
     <string name="file_name_empty_error">Filename cannot be empty</string>
     <string name="error_occurred_detail">An error occurred: %1$s</string>
     <string name="no_streams_available_download">No streams available to download</string>
@@ -226,7 +229,7 @@
     <string name="user_report">User report</string>
     <string name="search_no_results">No results</string>
     <string name="empty_view_no_videos" translatable="false">@string/no_videos</string>
-    <string name="empty_subscription_feed_subtitle">Nothing Here But Crickets</string>
+    <string name="empty_subscription_feed_subtitle">Nothing here but crickets</string>
     <string name="detail_drag_description">Drag to reorder</string>
 
     <string name="err_dir_create">Cannot create download directory \'%1$s\'</string>
@@ -283,7 +286,7 @@
     <string name="msg_name">Filename</string>
     <string name="msg_threads">Threads</string>
     <string name="msg_error">Error</string>
-    <string name="msg_server_unsupported">Server unsupported</string>
+    <string name="msg_server_unsupported">Unsupported server</string>
     <string name="msg_exists">File already exists</string>
     <string name="msg_url_malform">Malformed URL or Internet not available</string>
     <string name="msg_running">NewPipe Downloading</string>
@@ -298,8 +301,8 @@
     <string name="md5" translatable="false">MD5</string>
     <string name="sha1" translatable="false">SHA-1</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA Challenge</string>
+    <string name="reCaptcha_title">reCAPTCHA challenge</string>
-    <string name="recaptcha_request_toast">reCAPTCHA Challenge requested</string>
+    <string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
 
     <!-- End of GigaGet's Strings -->
 
@@ -344,7 +347,7 @@
     <string name="privacy_policy_url" translatable="false">https://newpipe.schabi.org/legal/privacy/</string>
     <string name="read_privacy_policy">Read privacy policy</string>
     <string name="app_license_title">NewPipe\'s License</string>
-    <string name="app_license">NewPipe is copyleft libre software: You can use, study share and improve it at your will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
+    <string name="app_license">NewPipe is copyleft libre software: You can use, study share and improve it at will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
     <string name="read_full_license">Read license</string>
 
 
@@ -352,7 +355,7 @@
     <string name="title_activity_history">History</string>
     <string name="title_history_search">Searched</string>
     <string name="title_history_view">Watched</string>
-    <string name="history_disabled">History is disabled</string>
+    <string name="history_disabled">History is turned off</string>
     <string name="action_history">History</string>
     <string name="history_empty">The history is empty</string>
     <string name="history_cleared">History cleared</string>
@@ -373,10 +376,10 @@
     <string name="feed_page_summary">Feed Page</string>
     <string name="channel_page_summary">Channel Page</string>
     <string name="select_a_channel">Select a channel</string>
-    <string name="no_channel_subscribed_yet">No channel subscribed yet</string>
+    <string name="no_channel_subscribed_yet">No channel subscriptions yet</string>
     <string name="select_a_kiosk">Select a kiosk</string>
-    <string name="export_complete_toast">Export complete</string>
+    <string name="export_complete_toast">Exported</string>
-    <string name="import_complete_toast">Import complete</string>
+    <string name="import_complete_toast">Imported</string>
     <string name="no_valid_zip_file">No valid ZIP file</string>
     <string name="could_not_import_all_files">Warning: Could not import all files.</string>
     <string name="override_current_data">This will override your current setup.</string>
@@ -390,17 +393,17 @@
     <string name="service_kiosk_string" translatable="false">%1$s/%2$s</string>
 
     <!-- Play Queue -->
-    <string name="title_activity_background_player">Background Player</string>
+    <string name="title_activity_background_player">Background player</string>
-    <string name="title_activity_popup_player">Popup Player</string>
+    <string name="title_activity_popup_player">Popup player</string>
     <string name="play_queue_remove">Remove</string>
     <string name="play_queue_stream_detail">Details</string>
     <string name="play_queue_audio_settings">Audio Settings</string>
-    <string name="hold_to_append">Hold To Enqueue</string>
+    <string name="hold_to_append">Hold To enqueue</string>
-    <string name="enqueue_on_background">Enqueue on Background</string>
+    <string name="enqueue_on_background">Enqueue when backgrounded</string>
-    <string name="enqueue_on_popup">Enqueue on Popup</string>
+    <string name="enqueue_on_popup">Enqueue on new popup</string>
-    <string name="start_here_on_main">Start Playing Here</string>
+    <string name="start_here_on_main">Start playing here</string>
-    <string name="start_here_on_background">Start Here on Background</string>
+    <string name="start_here_on_background">Start here when backgrounded</string>
-    <string name="start_here_on_popup">Start Here on Popup</string>
+    <string name="start_here_on_popup">Start here on new popup</string>
 
     <!-- Drawer -->
     <string name="drawer_open">Open Drawer</string>
@@ -424,9 +427,9 @@
     <string name="preferred_player_fetcher_notification_message">"Loading requested content"</string>
 
     <!-- Local Playlist -->
-    <string name="create_playlist">Create New Playlist</string>
+    <string name="create_playlist">New Playlist</string>
-    <string name="delete_playlist">Delete Playlist</string>
+    <string name="delete_playlist">Delete</string>
-    <string name="rename_playlist">Rename Playlist</string>
+    <string name="rename_playlist">Rename</string>
     <string name="playlist_name_input">Name</string>
     <string name="append_playlist">Add To Playlist</string>
     <string name="set_as_playlist_thumbnail">Set as Playlist Thumbnail</string>
@@ -434,11 +437,11 @@
     <string name="bookmark_playlist">Bookmark Playlist</string>
     <string name="unbookmark_playlist">Remove Bookmark</string>
 
-    <string name="delete_playlist_prompt">Do you want to delete this playlist?</string>
+    <string name="delete_playlist_prompt">Delete this playlist?</string>
     <string name="playlist_creation_success">Playlist created</string>
-    <string name="playlist_add_stream_success">Added to playlist</string>
+    <string name="playlist_add_stream_success">Playlisted</string>
-    <string name="playlist_thumbnail_change_success">Playlist thumbnail changed</string>
+    <string name="playlist_thumbnail_change_success">Playlist thumbnail changed.</string>
-    <string name="playlist_delete_failure">Could not delete playlist</string>
+    <string name="playlist_delete_failure">Could not delete playlist.</string>
 
     <!-- Players -->
     <string name="caption_none">No Captions</string>
@@ -457,11 +460,11 @@
     <string name="enable_leak_canary_title">Enable LeakCanary</string>
     <string name="enable_leak_canary_summary">Memory leak monitoring may cause the app to become unresponsive when heap dumping</string>
 
-    <string name="enable_disposed_exceptions_title">Report Out-of-lifecycle Errors</string>
+    <string name="enable_disposed_exceptions_title">Report out-of-lifecycle errors</string>
     <string name="enable_disposed_exceptions_summary">Force reporting of undeliverable Rx exceptions outside of fragment or activity lifecycle after disposal</string>
 
     <!-- Subscriptions import/export -->
-    <string name="import_export_title">Import/Export</string>
+    <string name="import_export_title">Import/export</string>
     <string name="import_title">Import</string>
     <string name="import_from">Import from</string>
     <string name="export_to">Export to</string>
@@ -512,11 +515,14 @@
     </string-array>
 
     <!-- Minimize to exit action -->
-    <string name="minimize_on_exit_title">Minimize on application switch</string>
+    <string name="minimize_on_exit_title">Minimize on app switch</string>
-    <string name="minimize_on_exit_summary">Action when switching to other application from main video player — %s</string>
+    <string name="minimize_on_exit_summary">Action when switching to other app from main video player — %s</string>
     <string name="minimize_on_exit_none_description">None</string>
     <string name="minimize_on_exit_background_description">Minimize to background player</string>
     <string name="minimize_on_exit_popup_description">Minimize to popup player</string>
+	  <string name="list_view_mode">List view mode</string>
+    <string name="list">List</string>
+    <string name="grid">Grid</string>
+	  <string name="auto">Auto</string>
     <string name="switch_view">Switch View</string>
-
 </resources>

app/src/main/res/xml/appearance_settings.xml

@@ -22,6 +22,14 @@
         android:title="@string/show_hold_to_append_title"
         android:summary="@string/show_hold_to_append_summary"/>
 
+    <ListPreference
+        android:defaultValue="@string/list_view_mode_value"
+        android:entries="@array/list_view_mode_description"
+        android:entryValues="@array/list_view_mode_values"
+        android:key="@string/list_view_mode_key"
+        android:summary="%s"
+        android:title="@string/list_view_mode"/>
+
     <Preference
         android:key="@string/caption_settings_key"
         android:title="@string/caption_setting_title"

app/src/main/res/xml/video_audio_settings.xml

@@ -106,9 +106,15 @@
 
         <SwitchPreference
             android:defaultValue="true"
-            android:key="@string/player_gesture_controls_key"
+            android:key="@string/volume_gesture_control_key"
-            android:summary="@string/player_gesture_controls_summary"
+            android:summary="@string/volume_gesture_control_summary"
-            android:title="@string/player_gesture_controls_title"/>
+            android:title="@string/volume_gesture_control_title"/>
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/brightness_gesture_control_key"
+            android:summary="@string/brightness_gesture_control_summary"
+            android:title="@string/brightness_gesture_control_title"/>
 
         <SwitchPreference
             android:defaultValue="true"