From 216e2367c63c0b8063e99cdb45da06dd3e35f895 Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 22 Aug 2018 08:32:58 +0300
Subject: [PATCH 01/13] Video details tablet layout

---
 .../fragments/detail/VideoDetailFragment.java |   7 +-
 .../fragment_video_detail.xml                 | 505 ++++++++++++++++++
 2 files changed, 510 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout-large-land/fragment_video_detail.xml

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index d91502cdd..bb642cefa 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -179,7 +179,7 @@ public class VideoDetailFragment
     private TextView thumbsDisabledTextView;
 
     private TextView nextStreamTitle;
-    private LinearLayout relatedStreamRootLayout;
+    private View relatedStreamRootLayout;
     private LinearLayout relatedStreamsView;
     private ImageButton relatedStreamExpandButton;
 
@@ -623,7 +623,10 @@ public class VideoDetailFragment
                     infoItemBuilder.buildView(relatedStreamsView, info.getNextVideo()));
             relatedStreamsView.addView(getSeparatorView());
             relatedStreamRootLayout.setVisibility(View.VISIBLE);
-        } else nextStreamTitle.setVisibility(View.GONE);
+        } else {
+            nextStreamTitle.setVisibility(View.GONE);
+            relatedStreamRootLayout.setVisibility(View.GONE);
+        }
 
         if (info.getRelatedStreams() != null
                 && !info.getRelatedStreams().isEmpty() && showRelatedStreams) {
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
new file mode 100644
index 000000000..4d3914947
--- /dev/null
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -0,0 +1,505 @@
+<?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:background="?attr/selectableItemBackground"
+					android:clickable="true"
+					android:focusable="true"
+					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." />
+
+					<ImageView
+						android:id="@+id/detail_toggle_description_view"
+						android:layout_width="15dp"
+						android:layout_height="15dp"
+						android:layout_gravity="center_vertical|right"
+						android:layout_marginLeft="5dp"
+						android:src="@drawable/arrow_down"
+						tools:ignore="ContentDescription,RtlHardcoded" />
+
+				</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"
+						android:visibility="gone"
+						tools:visibility="visible">
+
+						<TextView
+							android:id="@+id/detail_upload_date_view"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="12dp"
+							android:layout_marginRight="12dp"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textSize="@dimen/video_item_detail_upload_date_text_size"
+							android:textStyle="bold"
+							tools:text="Published on Oct 2, 2009" />
+
+						<TextView
+							android:id="@+id/detail_description_view"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_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:id="@+id/detail_related_streams_root_layout"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="3">
+
+		<!--NEXT AND RELATED VIDEOS-->
+		<LinearLayout
+			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>

From 1e0f6f9e41e5d7c22fec18788615059e9f19c5af Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 22 Aug 2018 10:14:01 +0300
Subject: [PATCH 02/13] Grid view

---
 .../fragments/list/BaseListFragment.java      | 56 +++++++++++++--
 .../newpipe/info_list/InfoListAdapter.java    | 34 ++++++++-
 .../holder/ChannelGridInfoItemHolder.java     | 13 ++++
 .../holder/PlaylistGridInfoItemHolder.java    | 13 ++++
 .../holder/StreamGridInfoItemHolder.java      | 13 ++++
 .../res/layout/list_channel_grid_item.xml     | 48 +++++++++++++
 .../res/layout/list_playlist_grid_item.xml    | 72 +++++++++++++++++++
 .../main/res/layout/list_stream_grid_item.xml | 69 ++++++++++++++++++
 app/src/main/res/values/dimens.xml            |  2 +
 app/src/main/res/values/settings_keys.xml     | 11 +++
 app/src/main/res/values/strings.xml           |  3 +
 app/src/main/res/xml/appearance_settings.xml  |  8 +++
 12 files changed, 335 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
 create mode 100644 app/src/main/res/layout/list_channel_grid_item.xml
 create mode 100644 app/src/main/res/layout/list_playlist_grid_item.xml
 create mode 100644 app/src/main/res/layout/list_stream_grid_item.xml

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 1db12bba9..bfa16fb08 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -3,10 +3,14 @@ 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.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 +25,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 +40,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 +48,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 +66,32 @@ 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 String list_key = getString(R.string.list_view_mode_value);
+                final boolean useGrid = !list_key.equals(PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), list_key));
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -119,13 +146,27 @@ 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);
 
-        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
+        final String list_key = getString(R.string.list_view_mode_value);
+        final boolean useGrid = !list_key.equals(PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), list_key));
 
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+        infoListAdapter.setGridItemVariants(useGrid);
         infoListAdapter.setFooter(getListFooter());
         infoListAdapter.setHeader(getListHeader());
 
@@ -315,4 +356,11 @@ 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;
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index cf12deb6f..15fdcad05 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/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;
+            }
+        };
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
new file mode 100644
index 000000000..2cc575e41
--- /dev/null
+++ b/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);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
new file mode 100644
index 000000000..96b9c90a7
--- /dev/null
+++ b/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);
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
new file mode 100644
index 000000000..a2e585857
--- /dev/null
+++ b/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);
+	}
+}
diff --git a/app/src/main/res/layout/list_channel_grid_item.xml b/app/src/main/res/layout/list_channel_grid_item.xml
new file mode 100644
index 000000000..3fe642974
--- /dev/null
+++ b/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>
diff --git a/app/src/main/res/layout/list_playlist_grid_item.xml b/app/src/main/res/layout/list_playlist_grid_item.xml
new file mode 100644
index 000000000..949b1159b
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml
new file mode 100644
index 000000000..cf73bf9b1
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e7af3231e..229c00533 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/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 -->
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 02f065285..941f033d8 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -891,5 +891,16 @@
         <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">list</string>
+
+    <string-array name="list_view_mode_values" translatable="false">
+        <item>list</item>
+        <item>grid</item>
+    </string-array>
+    <string-array name="list_view_mode_description" translatable="false">
+        <item>@string/list</item>
+        <item>@string/grid</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 240fef3dc..f3976c6a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -514,5 +514,8 @@
     <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>
 
 </resources>
diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml
index 239f5f3b3..490310c91 100644
--- a/app/src/main/res/xml/appearance_settings.xml
+++ b/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"

From 7330b4532ef0b53147e22474821d20948adfb670 Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 22 Aug 2018 10:29:37 +0300
Subject: [PATCH 03/13] Fix crash on screen rotation

---
 .../fragments/detail/VideoDetailFragment.java | 31 +++++++++++++------
 .../fragment_video_detail.xml                 |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index bb642cefa..ad3dacf6b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -33,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;
@@ -179,7 +181,7 @@ public class VideoDetailFragment
     private TextView thumbsDisabledTextView;
 
     private TextView nextStreamTitle;
-    private View relatedStreamRootLayout;
+    private LinearLayout relatedStreamRootLayout;
     private LinearLayout relatedStreamsView;
     private ImageButton relatedStreamExpandButton;
 
@@ -622,10 +624,10 @@ 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);
-            relatedStreamRootLayout.setVisibility(View.GONE);
+            setRelatedStreamsVisibility(View.GONE);
         }
 
         if (info.getRelatedStreams() != null
@@ -642,13 +644,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);
         }
     }
@@ -1302,4 +1304,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);
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 4d3914947..bf49a01a6 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -456,13 +456,13 @@
 	</com.nirhart.parallaxscroll.views.ParallaxScrollView>
 
 	<ScrollView
-		android:id="@+id/detail_related_streams_root_layout"
 		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"

From 4208c852e1ceaab92b922c46af5be7370772effa Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 22 Aug 2018 10:33:10 +0300
Subject: [PATCH 04/13] Update translations

---
 app/src/main/res/values-ru/strings.xml | 5 +++++
 app/src/main/res/values-uk/strings.xml | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3cacc83e8..e2198f240 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -485,6 +485,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>
@@ -497,4 +498,8 @@
     <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>
+
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 78eb45590..e4d4106d4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -481,8 +481,12 @@
     <string name="minimize_on_exit_background_description">Зменшити до фонового програвачу</string>
     <string name="minimize_on_exit_popup_description">Зменшити до віконного програвачу</string>
 
-<string name="channels">Канали</string>
+    <string name="channels">Канали</string>
     <string name="playlists">Плейлисти</string>
     <string name="tracks">Стежки</string>
     <string name="users">Користувачі</string>
-    </resources>
+
+    <string name="list_view_mode">Вигляд списку</string>
+    <string name="list">Список</string>
+    <string name="grid">Сiтка</string>
+</resources>

From ce21fe208738ea6f27936df4314b78d76a80074b Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 29 Aug 2018 07:53:58 +0300
Subject: [PATCH 05/13] Always show description on tablets

---
 .../fragments/detail/VideoDetailFragment.java | 37 ++++++++++++-------
 .../fragment_video_detail.xml                 | 16 +-------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index ad3dacf6b..8f46ec7c6 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -156,6 +156,7 @@ public class VideoDetailFragment
 
     private View videoTitleRoot;
     private TextView videoTitleTextView;
+    @Nullable
     private ImageView videoTitleToggleArrow;
     private TextView videoCountView;
 
@@ -417,14 +418,16 @@ public class VideoDetailFragment
     }
 
     private void toggleTitleAndDescription() {
-        if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
-            videoTitleTextView.setMaxLines(1);
-            videoDescriptionRootLayout.setVisibility(View.GONE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        } else {
-            videoTitleTextView.setMaxLines(10);
-            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+        if (videoTitleToggleArrow != null) {    //it is null for tablets
+            if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
+                videoTitleTextView.setMaxLines(1);
+                videoDescriptionRootLayout.setVisibility(View.GONE);
+                videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            } else {
+                videoTitleTextView.setMaxLines(10);
+                videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+                videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+            }
         }
     }
 
@@ -1119,8 +1122,10 @@ public class VideoDetailFragment
         animateView(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        videoTitleToggleArrow.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoTitleToggleArrow.setVisibility(View.GONE);
+        }
         videoTitleRoot.setClickable(false);
 
         imageLoader.cancelDisplayTask(thumbnailImageView);
@@ -1195,11 +1200,15 @@ public class VideoDetailFragment
             detailDurationView.setVisibility(View.GONE);
         }
 
-        videoTitleRoot.setClickable(true);
-        videoTitleToggleArrow.setVisibility(View.VISIBLE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
         videoDescriptionView.setVisibility(View.GONE);
-        videoDescriptionRootLayout.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {
+            videoTitleRoot.setClickable(true);
+            videoTitleToggleArrow.setVisibility(View.VISIBLE);
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoDescriptionRootLayout.setVisibility(View.GONE);
+        } else {
+            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+        }
         if (!TextUtils.isEmpty(info.getUploadDate())) {
             videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
         }
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index bf49a01a6..73939d60a 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -109,9 +109,6 @@
 					android:id="@+id/detail_title_root_layout"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:background="?attr/selectableItemBackground"
-					android:clickable="true"
-					android:focusable="true"
 					android:paddingLeft="12dp"
 					android:paddingRight="12dp">
 
@@ -129,15 +126,6 @@
 						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." />
 
-					<ImageView
-						android:id="@+id/detail_toggle_description_view"
-						android:layout_width="15dp"
-						android:layout_height="15dp"
-						android:layout_gravity="center_vertical|right"
-						android:layout_marginLeft="5dp"
-						android:src="@drawable/arrow_down"
-						tools:ignore="ContentDescription,RtlHardcoded" />
-
 				</FrameLayout>
 
 				<!-- LOADING INDICATOR-->
@@ -413,9 +401,7 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_marginTop="5dp"
-						android:orientation="vertical"
-						android:visibility="gone"
-						tools:visibility="visible">
+						android:orientation="vertical">
 
 						<TextView
 							android:id="@+id/detail_upload_date_view"

From fbd983217db2c76bbbb9d55f0c5e3261041548ce Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 29 Aug 2018 08:08:19 +0300
Subject: [PATCH 06/13] Hide related streams while loading

---
 .../newpipe/fragments/detail/VideoDetailFragment.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 8f46ec7c6..77583f2e5 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1122,9 +1122,15 @@ public class VideoDetailFragment
         animateView(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
-        if (videoTitleToggleArrow != null) {
+        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);
 

From fb25f6c7ac9ff8e24241e79e94f7ac046f836ad0 Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Wed, 29 Aug 2018 08:19:15 +0300
Subject: [PATCH 07/13] Automatic list layout

---
 .../fragments/list/BaseListFragment.java      | 19 ++++++++++++++-----
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values/settings_keys.xml     |  4 +++-
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index bfa16fb08..21abf40ad 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -4,6 +4,7 @@ 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;
@@ -84,8 +85,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
         if (updateFlags != 0) {
             if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
-                final String list_key = getString(R.string.list_view_mode_value);
-                final boolean useGrid = !list_key.equals(PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), list_key));
+                final boolean useGrid = isGridLayout();
                 itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
                 infoListAdapter.setGridItemVariants(useGrid);
                 infoListAdapter.notifyDataSetChanged();
@@ -160,9 +160,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        final String list_key = getString(R.string.list_view_mode_value);
-        final boolean useGrid = !list_key.equals(PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), list_key));
-
+        final boolean useGrid = isGridLayout();
         itemsList = rootView.findViewById(R.id.items_list);
         itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
@@ -363,4 +361,15 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             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);
+        }
+    }
 }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e2198f240..a053cafb3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -501,5 +501,6 @@
     <string name="list_view_mode">Вид списка</string>
     <string name="list">Список</string>
     <string name="grid">Сетка</string>
+	<string name="auto">Автоматически</string>
 
 </resources>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 941f033d8..0c71944c3 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -892,13 +892,15 @@
     </string-array>
 
     <string name="list_view_mode_key" translatable="false">list_view_mode</string>
-    <string name="list_view_mode_value" translatable="false">list</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3976c6a4..b63de7dbd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -517,5 +517,6 @@
 	<string name="list_view_mode">List view mode</string>
     <string name="list">List</string>
     <string name="grid">Grid</string>
+	<string name="auto">Auto</string>
 
 </resources>

From ee4942dfd70a980192c8b4e604c94a412553b2a8 Mon Sep 17 00:00:00 2001
From: Vasily <unravel22@waifu.club>
Date: Fri, 31 Aug 2018 14:34:32 +0300
Subject: [PATCH 08/13] Grid layout for local lists

---
 .../newpipe/local/BaseLocalListFragment.java  | 70 +++++++++++++++-
 .../newpipe/local/LocalItemListAdapter.java   | 42 ++++++++--
 .../holder/LocalPlaylistGridItemHolder.java   | 13 +++
 .../local/holder/LocalPlaylistItemHolder.java |  4 +
 .../LocalPlaylistStreamGridItemHolder.java    | 13 +++
 .../LocalStatisticStreamGridItemHolder.java   | 13 +++
 .../LocalStatisticStreamItemHolder.java       | 14 +++-
 .../holder/RemotePlaylistGridItemHolder.java  | 13 +++
 .../holder/RemotePlaylistItemHolder.java      |  4 +
 .../layout/list_stream_playlist_grid_item.xml | 84 +++++++++++++++++++
 10 files changed, 257 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
 create mode 100644 app/src/main/res/layout/list_stream_playlist_grid_item.xml

diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 5192aa2ab..abdf82353 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/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);
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 99937b58c..e298dedd3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/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_REMOTE_ITEM: return REMOTE_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_LOCAL_ITEM: return useGridVariant ? LOCAL_PLAYLIST_GRID_HOLDER_TYPE : LOCAL_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 STATISTIC_STREAM_ITEM: return STREAM_STATISTICS_HOLDER_TYPE;
+            case PLAYLIST_STREAM_ITEM: return useGridVariant ? STREAM_PLAYLIST_GRID_HOLDER_TYPE : STREAM_PLAYLIST_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;
+            }
+        };
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
new file mode 100644
index 000000000..4276cf721
--- /dev/null
+++ b/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);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
index 1a5ec63bf..8743684ee 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
+++ b/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;
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
new file mode 100644
index 000000000..6986713bb
--- /dev/null
+++ b/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
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
new file mode 100644
index 000000000..792ad92f0
--- /dev/null
+++ b/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);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
index b2a04ca9c..57a5794e3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -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) {
-        super(infoItemBuilder, R.layout.list_stream_item, parent);
+    public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup 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);
         }
 
-        itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        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,
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
new file mode 100644
index 000000000..5ac18fccb
--- /dev/null
+++ b/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);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
index 12d3063b0..5b2a88d38 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
+++ b/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;
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
new file mode 100644
index 000000000..4b31a452e
--- /dev/null
+++ b/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>
\ No newline at end of file

From b1a5547de2357046e5d605cfd52af11b63b4b81b Mon Sep 17 00:00:00 2001
From: u1 <nvasya95@gmail.com>
Date: Fri, 31 Aug 2018 16:34:35 +0300
Subject: [PATCH 09/13] Fix reordering playlist items on grid layout

---
 .../newpipe/local/playlist/LocalPlaylistFragment.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 35a1530c9..f400061e1 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -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,

From a1be03543cf71701f17aa87761e2b74f9e595a95 Mon Sep 17 00:00:00 2001
From: u1 <nvasya95@gmail.com>
Date: Fri, 31 Aug 2018 16:49:25 +0300
Subject: [PATCH 10/13] Grid layout for subscriptions

---
 .../subscription/SubscriptionFragment.java    | 59 ++++++++++++++++++-
 .../main/res/layout/fragment_subscription.xml |  1 -
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
index d8a26f0eb..584acfaf8 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
@@ -5,11 +5,15 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 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;
@@ -17,6 +21,7 @@ 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;
@@ -72,7 +77,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;
 
@@ -80,6 +85,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 headerRootLayout;
     private View whatsNewItemListHeader;
@@ -100,6 +108,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
@@ -127,6 +137,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
@@ -153,9 +172,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
     /////////////////////////////////////////////////////////////////////////*/
@@ -287,9 +322,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());
 
         infoListAdapter.setHeader(headerRootLayout = activity.getLayoutInflater().inflate(R.layout.subscription_header, itemsList, false));
         whatsNewItemListHeader = headerRootLayout.findViewById(R.id.whats_new);
@@ -297,6 +333,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));
@@ -447,4 +484,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);
+        }
+    }
 }
diff --git a/app/src/main/res/layout/fragment_subscription.xml b/app/src/main/res/layout/fragment_subscription.xml
index a40059455..f2137074e 100644
--- a/app/src/main/res/layout/fragment_subscription.xml
+++ b/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"/>

From 1e53d6bfab9a2832e087029303c40b16ac0404f1 Mon Sep 17 00:00:00 2001
From: Vasily <nvasya95@gmail.com>
Date: Fri, 31 Aug 2018 17:08:13 +0300
Subject: [PATCH 11/13] Scroll top related streams when loading

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

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 65a423084..7e0a013ca 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1262,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);
+        }
     }
 
 

From d4c1b8d32139ca33fdefe4ad1ca0e155ca8c1a01 Mon Sep 17 00:00:00 2001
From: Vasily <nvasya95@gmail.com>
Date: Fri, 31 Aug 2018 17:12:56 +0300
Subject: [PATCH 12/13] Fix: remove title from PlaylistDialog

---
 .../newpipe/local/dialog/PlaylistDialog.java       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
index 4b8e391c7..15ba5d184 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
+++ b/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
     //////////////////////////////////////////////////////////////////////////*/

From b24baa68ba36f8d54fe111e1efe7f3881c023e39 Mon Sep 17 00:00:00 2001
From: Vasily <nvasya95@gmail.com>
Date: Fri, 31 Aug 2018 17:30:06 +0300
Subject: [PATCH 13/13] Tablet UI in player

---
 .../activity_main_player.xml                  | 581 ++++++++++++++++++
 1 file changed, 581 insertions(+)
 create mode 100644 app/src/main/res/layout-large-land/activity_main_player.xml

diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml
new file mode 100644
index 000000000..7d7e1230e
--- /dev/null
+++ b/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>