Update extractor and refactored NewPipe

app/src/main/res/anim/custom_fade_in.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:duration="200"
-       android:fromAlpha="0.0"
-       android:interpolator="@android:interpolator/accelerate_decelerate"
-       android:toAlpha="1.0"/>

app/src/main/res/anim/custom_fade_out.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:duration="200"
-       android:fromAlpha="1.0"
-       android:interpolator="@android:interpolator/accelerate_decelerate"
-       android:toAlpha="0.0"/>

app/src/main/res/animator/custom_fade_in.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:duration="120"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="alpha"
+        android:valueFrom="0.0f"
+        android:valueTo="1.0f"/>
+</set>

app/src/main/res/animator/custom_fade_out.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:duration="120"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="alpha"
+        android:valueFrom="1.0f"
+        android:valueTo="0.0f"/>
+</set>

app/src/main/res/drawable-v21/splash_screen.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:drawable="?android:windowBackground"/>
-
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/ic_launcher"/>
-    </item>
-</layer-list>

app/src/main/res/drawable/player_controls_bg.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#8c000000"
-        android:endColor="#00000000"
         android:angle="90"
-        />
+        android:endColor="#00000000"
+        android:startColor="#8c000000"/>
 </shape>

app/src/main/res/drawable/player_top_controls_bg.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#8c000000"
-        android:endColor="#00000000"
         android:angle="-90"
-        />
+        android:endColor="#00000000"
+        android:startColor="#8c000000"/>
 </shape>

app/src/main/res/drawable/splash_screen.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/ic_launcher"/>
-    </item>
-</layer-list>

app/src/main/res/drawable/toolbar_shadow.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-
-	<gradient
-		android:startColor="#5a000000"
-		android:endColor="#00000000"
-		android:angle="270"
-		android:type="linear"/>
-
-</shape>

app/src/main/res/drawable/toolbar_shadow_dark.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="-90"
+        android:endColor="#00000000"
+        android:startColor="@color/dark_shadow_start_color"/>
+</shape>

app/src/main/res/drawable/toolbar_shadow_light.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="-90"
+        android:endColor="#00000000"
+        android:startColor="@color/light_shadow_start_color"/>
+</shape>

app/src/main/res/drawable/white_circle.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid
-        android:color="@android:color/white"/>
-
-    <size
-        android:height="@dimen/channel_avatar_halo_size"
-        android:width="@dimen/channel_avatar_halo_size"/>
-
-</shape>

app/src/main/res/layout-land/channel_header.xml

@@ -1,86 +0,0 @@
-<?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/channel_header_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp">
-
-    <ImageView
-        android:id="@+id/channel_banner_image"
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:background="@android:color/black"
-        android:fitsSystemWindows="true"
-        android:scaleType="centerCrop"
-        android:src="@drawable/channel_banner"
-        tools:ignore="ContentDescription"/>
-
-    <RelativeLayout
-        android:id="@+id/channel_avatar_layout"
-        android:layout_width="@dimen/channel_avatar_halo_size"
-        android:layout_height="@dimen/channel_avatar_halo_size"
-        android:layout_alignTop="@id/channel_banner_image"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="60dp"
-        tools:ignore="RtlHardcoded">
-
-        <ImageView
-            android:id="@+id/channel_avatar_halo"
-            android:layout_width="@dimen/channel_avatar_halo_size"
-            android:layout_height="@dimen/channel_avatar_halo_size"
-            android:layout_alignParentLeft="true"
-            android:src="@drawable/white_circle"
-            tools:ignore="ContentDescription,RtlHardcoded"/>
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/channel_avatar_view"
-            android:layout_width="@dimen/channel_avatar_size"
-            android:layout_height="@dimen/channel_avatar_size"
-            android:layout_centerInParent="true"
-            android:src="@drawable/buddy"/>
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/channel_title_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/channel_banner_image"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="6dp"
-        android:layout_toRightOf="@id/channel_avatar_layout"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="@dimen/video_item_detail_title_text_size"
-        tools:ignore="RtlHardcoded"
-        tools:text="Testing Title"/>
-
-    <TextView
-        android:id="@+id/channel_subscriber_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/channel_title_view"
-        android:layout_below="@+id/channel_title_view"
-        android:gravity="center"
-        android:visibility="gone"
-        tools:ignore="RtlHardcoded"
-        tools:text="123,141,411 subscribers"
-        tools:visibility="visible"/>
-
-    <Button
-        android:id="@+id/channel_subscribe_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/channel_banner_image"
-        android:layout_gravity="center_vertical|right"
-        android:layout_marginRight="4dp"
-        android:layout_marginTop="2dp"
-        android:text="@string/subscribe_button_title"
-        android:textSize="@dimen/channel_rss_title_size"
-        android:theme="@style/RedButton"
-        android:visibility="gone"
-        tools:ignore="RtlHardcoded"
-        tools:visibility="visible"/>
-
-</RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_content"
@@ -13,22 +14,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/appbar_padding_top"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/AppTheme.PopupOverlay">
-
-        </android.support.v7.widget.Toolbar>
+            app:layout_scrollFlags="scroll|enterAlways"/>
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
     </android.support.design.widget.AppBarLayout>
 

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_content"
@@ -13,7 +14,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/appbar_padding_top"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
@@ -22,24 +24,20 @@
             android:layout_weight="1"
             android:background="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:title="@string/app_name">
-
-        </android.support.v7.widget.Toolbar>
+            app:title="@string/app_name"/>
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"/>
 
-        </android.support.design.widget.TabLayout>
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
@@ -47,6 +45,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="?attr/clear_history" />
+        app:srcCompat="?attr/clear_history"/>
 
 </android.support.design.widget.CoordinatorLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -15,4 +15,4 @@
 
     <include layout="@layout/toolbar_layout"/>
 
-</FrameLayout>
+</merge>

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

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".player.PlayVideoActivity"
+    tools:context=".player.old.PlayVideoActivity"
     android:gravity="center">
 
     <VideoView android:id="@+id/video_view"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/channel_header_layout"
     android:layout_width="match_parent"
@@ -17,59 +18,52 @@
         android:src="@drawable/channel_banner"
         tools:ignore="ContentDescription"/>
 
-    <RelativeLayout
-        android:id="@+id/channel_avatar_layout"
-        android:layout_width="@dimen/channel_avatar_halo_size"
-        android:layout_height="@dimen/channel_avatar_halo_size"
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/channel_avatar_view"
+        android:layout_width="@dimen/channel_avatar_size"
+        android:layout_height="@dimen/channel_avatar_size"
         android:layout_alignTop="@id/channel_banner_image"
         android:layout_marginLeft="8dp"
         android:layout_marginTop="50dp"
-        tools:ignore="RtlHardcoded">
-
-        <ImageView
-            android:id="@+id/channel_avatar_halo"
-            android:layout_width="@dimen/channel_avatar_halo_size"
-            android:layout_height="@dimen/channel_avatar_halo_size"
-            android:layout_alignParentLeft="true"
-            android:src="@drawable/white_circle"
-            tools:ignore="ContentDescription"/>
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/channel_avatar_view"
-            android:layout_width="@dimen/channel_avatar_size"
-            android:layout_height="@dimen/channel_avatar_size"
-            android:layout_centerInParent="true"
-            android:src="@drawable/buddy"/>
-    </RelativeLayout>
+        android:src="@drawable/buddy"
+        app:civ_border_color="#ffffff"
+        app:civ_border_width="2dp"
+        tools:ignore="RtlHardcoded"/>
 
     <TextView
         android:id="@+id/channel_title_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/channel_banner_image"
         android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
         android:layout_marginTop="6dp"
         android:layout_toLeftOf="@+id/channel_subscribe_button"
-        android:layout_toRightOf="@+id/channel_avatar_layout"
+        android:layout_toRightOf="@+id/channel_avatar_view"
+        android:ellipsize="end"
+        android:lines="1"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_detail_title_text_size"
         tools:ignore="RtlHardcoded"
-        tools:text="Testing Title"/>
+        tools:text="Lorem ipsum dolor"/>
 
     <TextView
         android:id="@+id/channel_subscriber_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/channel_title_view"
+        android:layout_alignRight="@+id/channel_title_view"
         android:layout_below="@+id/channel_title_view"
-        android:gravity="center"
+        android:ellipsize="end"
+        android:gravity="left|center"
+        android:lines="1"
         android:textSize="@dimen/channel_subscribers_text_size"
         android:visibility="gone"
         tools:ignore="RtlHardcoded"
         tools:text="123,141,411 subscribers"
         tools:visibility="visible"/>
 
-    <Button
+    <android.support.v7.widget.AppCompatButton
         android:id="@+id/channel_subscribe_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -83,5 +77,4 @@
         android:visibility="gone"
         tools:ignore="RtlHardcoded"
         tools:visibility="visible"/>
-
 </RelativeLayout>

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center">
-    <TextView
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="¯\\_(ツ)_/¯"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    <TextView
-        android:text="Nothing Here But Crickets"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</LinearLayout>

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

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/channel_streams_view"
+        android:id="@+id/items_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?android:windowBackground"
         android:scrollbars="vertical"
-        tools:listitem="@layout/stream_item" />
+        tools:listitem="@layout/list_stream_item"/>
 
     <ProgressBar
         android:id="@+id/loading_progress_bar"
@@ -19,7 +20,36 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible"/>
+
+    <LinearLayout
+        android:id="@+id/empty_state_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical"
+        android:paddingTop="90dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="10dp"
+            android:fontFamily="monospace"
+            android:text="(╯°-°)╯"
+            android:textSize="35sp"
+            tools:ignore="HardcodedText,UnusedAttribute"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/empty_view_no_videos"
+            android:textSize="24sp"/>
+
+    </LinearLayout>
 
     <!--ERROR PANEL-->
     <include
@@ -30,16 +60,6 @@
         android:layout_centerInParent="true"
         android:layout_marginTop="50dp"
         android:visibility="gone"
-        tools:visibility="visible" />
-
-    <include
-        android:id="@+id/empty_panel"
-        layout="@layout/empty_view_panel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginTop="50dp"
-        android:visibility="gone"
         tools:visibility="visible"/>
 
 </RelativeLayout>

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/items_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        app:layoutManager="LinearLayoutManager"
+        tools:listitem="@layout/list_channel_item"/>
+
+    <!--ERROR PANEL-->
+    <include
+        android:id="@+id/error_panel"
+        layout="@layout/error_retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <include
+        android:id="@+id/empty_state_view"
+        layout="@layout/subscription_feed_empty_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="50dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+</RelativeLayout>

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

@@ -1,19 +1,16 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="org.schabi.newpipe.history.HistoryFragment">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/history_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:listitem="@layout/item_search_history" />
+        tools:listitem="@layout/item_search_history"/>
 
     <TextView
         android:id="@+id/history_empty"
@@ -23,11 +20,11 @@
         android:text="@string/history_empty"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible"/>
 
     <include
         android:id="@+id/history_disabled_view"
         layout="@layout/history_disabled_view"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </FrameLayout>

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

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
 
     <android.support.design.widget.TabLayout

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

@@ -0,0 +1,65 @@
+<?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">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/items_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:windowBackground"
+        android:scrollbars="vertical"
+        tools:listitem="@layout/list_stream_mini_item"/>
+
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <LinearLayout
+        android:id="@+id/empty_state_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical"
+        android:paddingTop="90dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:fontFamily="monospace"
+            android:text="(ಠ_ಠ)"
+            android:layout_marginBottom="10dp"
+            android:textSize="35sp"
+            tools:ignore="HardcodedText,UnusedAttribute"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/empty_view_no_videos"
+            android:textSize="24sp"/>
+
+    </LinearLayout>
+
+    <!--ERROR PANEL-->
+    <include
+        android:id="@+id/error_panel"
+        layout="@layout/error_retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="50dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+</RelativeLayout>

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

@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- Empty view to receive the focus when the edit text of the toolbar lose it  -->
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:focusable="true"
-        android:focusableInTouchMode="true"/>
-
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/result_list_view"
+        android:id="@+id/items_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/stream_item" />
+        tools:listitem="@layout/list_stream_item"/>
 
     <ProgressBar
         android:id="@+id/loading_progress_bar"
@@ -27,7 +21,35 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible"/>
+
+    <LinearLayout
+        android:id="@+id/empty_state_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="10dp"
+            android:fontFamily="monospace"
+            android:text="╰(°●°╰)"
+            android:textSize="35sp"
+            tools:ignore="HardcodedText,UnusedAttribute"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/search_no_results"
+            android:textSize="24sp"/>
+
+    </LinearLayout>
 
     <!--ERROR PANEL-->
     <include
@@ -38,6 +60,6 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible"/>
 
 </RelativeLayout>

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

@@ -4,26 +4,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/result_list_view"
+        android:id="@+id/items_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/channel_item"/>
-
-    <ProgressBar
-        android:id="@+id/loading_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:listitem="@layout/list_channel_item"/>
 
     <!--ERROR PANEL-->
     <include
@@ -37,8 +26,8 @@
         tools:visibility="visible"/>
 
     <include
-        android:id="@+id/empty_panel"
-        layout="@layout/empty_view_panel"
+        android:id="@+id/empty_state_view"
+        layout="@layout/subscription_feed_empty_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/video_item_detail"
@@ -38,18 +39,18 @@
                     android:scaleType="centerCrop"
                     tools:ignore="RtlHardcoded"
                     tools:layout_height="200dp"
-                    tools:src="@drawable/dummy_thumbnail" />
+                    tools:src="@drawable/dummy_thumbnail"/>
 
                 <ImageView
                     android:id="@+id/detail_thumbnail_play_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    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" />
+                    tools:visibility="visible"/>
 
             </FrameLayout>
 
@@ -82,7 +83,7 @@
                         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." />
+                        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"
@@ -91,7 +92,7 @@
                         android:layout_gravity="center_vertical|right"
                         android:layout_marginLeft="5dp"
                         android:src="@drawable/arrow_down"
-                        tools:ignore="ContentDescription,RtlHardcoded" />
+                        tools:ignore="ContentDescription,RtlHardcoded"/>
 
                 </FrameLayout>
 
@@ -105,7 +106,7 @@
                     android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
                     android:indeterminate="true"
                     android:visibility="gone"
-                    tools:visibility="visible" />
+                    tools:visibility="visible"/>
 
                 <!--ERROR PANEL-->
                 <include
@@ -116,7 +117,7 @@
                     android:layout_below="@id/detail_title_root_layout"
                     android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
                     android:visibility="gone"
-                    tools:visibility="visible" />
+                    tools:visibility="visible"/>
 
                 <!--HIDING ROOT-->
                 <LinearLayout
@@ -151,7 +152,7 @@
                             android:textAppearance="?android:attr/textAppearanceLarge"
                             android:textSize="@dimen/video_item_detail_views_text_size"
                             tools:ignore="RtlHardcoded"
-                            tools:text="2,816,821,505 views" />
+                            tools:text="2,816,821,505 views"/>
 
                         <ImageView
                             android:id="@+id/detail_thumbs_up_img_view"
@@ -159,7 +160,7 @@
                             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" />
+                            android:src="?attr/thumbs_up"/>
 
                         <TextView
                             android:id="@+id/detail_thumbs_up_count_view"
@@ -168,23 +169,23 @@
                             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="left|center_vertical"
+                            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" />
+                            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="15dp"
+                            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" />
+                            tools:ignore="RtlHardcoded"/>
 
                         <TextView
                             android:id="@+id/detail_thumbs_down_count_view"
@@ -193,26 +194,28 @@
                             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="left|center_vertical"
+                            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" />
+                            tools:text="10K"/>
 
                         <TextView
                             android:id="@+id/detail_thumbs_disabled_view"
                             android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
+                            android:layout_height="@dimen/video_item_detail_like_image_height"
                             android:layout_below="@id/detail_view_count_view"
-                            android:layout_marginLeft="15dp"
-                            android:gravity="left|center_vertical"
+                            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:ignore="RtlHardcoded"
+                            tools:visibility="visible"/>
 
                         <!-- CONTROLS -->
                         <TextView
@@ -230,7 +233,7 @@
                             android:paddingBottom="6dp"
                             android:paddingTop="6dp"
                             android:text="@string/controls_popup_title"
-                            android:textSize="12sp" />
+                            android:textSize="12sp"/>
 
                         <TextView
                             android:id="@+id/detail_controls_background"
@@ -247,7 +250,7 @@
                             android:paddingBottom="6dp"
                             android:paddingTop="6dp"
                             android:text="@string/controls_background_title"
-                            android:textSize="12sp" />
+                            android:textSize="12sp"/>
                     </RelativeLayout>
 
                     <!--UPLOADER-->
@@ -270,7 +273,7 @@
                             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" />
+                            tools:ignore="RtlHardcoded"/>
 
                         <TextView
                             android:id="@+id/detail_uploader_text_view"
@@ -281,7 +284,7 @@
                             android:textSize="@dimen/video_item_detail_uploader_text_size"
                             android:textStyle="bold"
                             tools:ignore="RtlHardcoded"
-                            tools:text="Uploader" />
+                            tools:text="Uploader"/>
 
                         <!--<Button
                             android:id="@+id/detail_uploader_subscribe"
@@ -302,7 +305,7 @@
                         android:layout_height="1px"
                         android:layout_marginLeft="8dp"
                         android:layout_marginRight="8dp"
-                        android:background="?attr/separatorColor" />
+                        android:background="?attr/separator_color"/>
 
                     <!--DESCRIPTIONS-->
                     <LinearLayout
@@ -323,7 +326,7 @@
                             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" />
+                            tools:text="Published on Oct 2, 2009"/>
 
                         <TextView
                             android:id="@+id/detail_description_view"
@@ -334,15 +337,16 @@
                             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." />
+                            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/separatorColor" />
+                            android:background="?attr/separator_color"/>
 
                     </LinearLayout>
 
@@ -364,7 +368,7 @@
                             android:textAllCaps="true"
                             android:textAppearance="?android:attr/textAppearanceMedium"
                             android:textSize="@dimen/video_item_detail_next_text_size"
-                            tools:ignore="RtlHardcoded" />
+                            tools:ignore="RtlHardcoded"/>
 
                         <LinearLayout
                             android:id="@+id/detail_related_streams_view"
@@ -372,7 +376,7 @@
                             android:layout_height="match_parent"
                             android:layout_marginTop="2dp"
                             android:orientation="vertical"
-                            tools:minHeight="50dp" />
+                            tools:minHeight="50dp"/>
 
                         <ImageButton
                             android:id="@+id/detail_related_streams_expand"
@@ -384,10 +388,9 @@
                             android:src="?attr/expand"
                             android:textAlignment="center"
                             android:textAllCaps="true"
-                            tools:ignore="ContentDescription" />
+                            tools:ignore="ContentDescription"/>
                     </LinearLayout>
                 </LinearLayout>
-
             </RelativeLayout>
         </LinearLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>

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

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="vertical">
+
     <TextView
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="¯\\_(ツ)_/¯"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        tools:ignore="HardcodedText"/>
+
     <TextView
-        android:text="@string/history_disabled"
-        android:layout_gravity="center"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/history_disabled"/>
 </LinearLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -7,18 +8,20 @@
     android:clickable="true"
     android:orientation="vertical"
     android:paddingBottom="8dp"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="8dp">
 
     <TextView
         android:id="@+id/time"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="10/11/2017 11:32" />
+        tools:text="10/11/2017 11:32"/>
 
     <TextView
         android:id="@+id/search"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:text="Search query" />
+        tools:text="Search query"/>
 </LinearLayout>

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

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp">
-
-    <TextView
-        android:id="@+id/history_date"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:text="11/10/2017 at 10:12" />
-
-    <TextView
-        android:id="@+id/stream_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:text="How to Watch Youtube Videos? [5h loop]" />
-</LinearLayout>

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

@@ -18,46 +18,44 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:contentDescription="@string/list_thumbnail_view_description"
-        android:src="@drawable/buddy_channel_item"
+        android:src="@drawable/buddy"
         tools:ignore="RtlHardcoded"/>
 
     <TextView
-        android:id="@+id/itemChannelTitleView"
+        android:id="@+id/itemTitleView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_marginBottom="@dimen/video_item_search_image_right_margin"
+        android:layout_toRightOf="@+id/itemThumbnailView"
         android:ellipsize="end"
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_search_title_text_size"
         tools:text="Channel Title, Lorem ipsum"/>
 
-  <TextView
-        android:id="@+id/itemAdditionalDetails"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:lines="1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/video_item_search_upload_date_text_size"
-        tools:text="10M subscribers • 1000 videos"/>
-
-
     <TextView
         android:id="@+id/itemChannelDescriptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/itemAdditionalDetails"
-        android:layout_marginBottom="@dimen/video_item_detail_description_to_details_margin"
-        android:layout_toRightOf="@id/itemThumbnailView"
+        android:layout_above="@+id/itemAdditionalDetails"
+        android:layout_marginBottom="@dimen/channel_item_description_to_details_margin"
+        android:layout_toRightOf="@+id/itemThumbnailView"
         android:ellipsize="end"
         android:lines="2"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_uploader_text_size"
         tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit"/>
 
+    <TextView
+        android:id="@+id/itemAdditionalDetails"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toRightOf="@+id/itemThumbnailView"
+        android:lines="1"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/video_item_search_upload_date_text_size"
+        tools:text="10M subscribers • 1000 videos"/>
 
 </RelativeLayout>

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

@@ -0,0 +1,49 @@
+<?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:padding="@dimen/video_item_search_padding">
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/itemThumbnailView"
+        android:layout_width="48dp"
+        android:layout_height="42dp"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="12dp"
+        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_alignParentTop="true"
+        android:layout_marginBottom="2dp"
+        android:layout_marginTop="3dp"
+        android:layout_toRightOf="@+id/itemThumbnailView"
+        android:ellipsize="end"
+        android:lines="1"
+        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_toRightOf="@+id/itemThumbnailView"
+        android:lines="1"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/video_item_search_upload_date_text_size"
+        tools:ignore="RtlHardcoded"
+        tools:text="10M subscribers"/>
+
+</RelativeLayout>

app/src/main/res/layout/list_playlist_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="@dimen/video_item_search_height"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:padding="@dimen/video_item_search_padding">
+
+    <ImageView
+        android:id="@+id/itemThumbnailView"
+        android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+        android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+        android:contentDescription="@string/list_thumbnail_view_description"
+        android:scaleType="fitEnd"
+        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_alignParentTop="true"
+        android:layout_toRightOf="@+id/itemThumbnailView"
+        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_toRightOf="@+id/itemThumbnailView"
+        android:lines="1"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/video_item_search_uploader_text_size"
+        tools:ignore="RtlHardcoded"
+        tools:text="Uploader"/>
+
+</RelativeLayout>

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

@@ -35,21 +35,20 @@
         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_alignParentTop="true"
-        android:layout_toRightOf="@id/itemThumbnailView"
+        android:layout_toRightOf="@+id/itemThumbnailView"
         android:ellipsize="end"
-        android:lines="2"
         android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_search_title_text_size"
@@ -59,10 +58,9 @@
         android:id="@+id/itemUploaderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/itemAdditionalDetails"
-        android:layout_toRightOf="@id/itemThumbnailView"
+        android:layout_below="@+id/itemVideoTitleView"
+        android:layout_toRightOf="@+id/itemThumbnailView"
         android:lines="1"
-        android:layout_marginBottom="@dimen/video_item_detail_description_to_details_margin"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_uploader_text_size"
         tools:text="Uploader"/>
@@ -72,7 +70,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_toRightOf="@id/itemThumbnailView"
+        android:layout_toRightOf="@+id/itemThumbnailView"
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_upload_date_text_size"

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

@@ -0,0 +1,67 @@
+<?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:padding="@dimen/video_item_search_padding">
+
+    <ImageView
+        android:id="@+id/itemThumbnailView"
+        android:layout_width="98dp"
+        android:layout_height="55dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="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"
+        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"/>
+
+
+    <TextView
+        android:id="@+id/itemVideoTitleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@+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"/>
+
+    <TextView
+        android:id="@+id/itemUploaderView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/itemVideoTitleView"
+        android:layout_toRightOf="@+id/itemThumbnailView"
+        android:lines="1"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/video_item_search_uploader_text_size"
+        tools:text="Uploader"/>
+</RelativeLayout>

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/itemRoot"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/video_item_search_height"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="false"
-    android:padding="@dimen/video_item_search_padding">
-
-    <TextView
-        android:id="@+id/load_more_text"
-        android:text="Load More"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="@dimen/header_footer_text_size"
-        android:visibility="gone"/>
-
-    <ProgressBar
-        android:id="@+id/paginate_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:visibility="gone"/>
-
-</RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
@@ -9,7 +10,8 @@
         android:id="@+id/paginate_progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingBottom="10dp"/>
+        android:layout_gravity="top|center_horizontal"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"/>
 
 </LinearLayout>

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

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/contrast_background_color"
+    android:paddingBottom="6dp">
+
+    <TextView
+        android:id="@+id/playlist_title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="@dimen/playlist_detail_title_text_size"
+        tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
+
+    <RelativeLayout
+        android:id="@+id/uploader_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/playlist_detail_uploader_layout_height"
+        android:layout_below="@+id/playlist_title_view"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="6dp"
+        android:layout_marginTop="6dp"
+        android:layout_toLeftOf="@+id/playlist_stream_count"
+        android:layout_toStartOf="@+id/playlist_stream_count"
+        android:background="?attr/selectableItemBackground"
+        android:gravity="left|center_vertical"
+        android:padding="2dp"
+        android:visibility="gone"
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/uploader_avatar_view"
+            android:layout_width="@dimen/playlist_detail_uploader_image_size"
+            android:layout_height="@dimen/playlist_detail_uploader_image_size"
+            android:layout_alignParentLeft="true"
+            android:layout_margin="1dp"
+            android:src="@drawable/buddy"
+            app:civ_border_color="#ffffff"
+            app:civ_border_width="1dp"/>
+
+        <TextView
+            android:id="@+id/uploader_name"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="4dp"
+            android:layout_toRightOf="@+id/uploader_avatar_view"
+            android:ellipsize="end"
+            android:gravity="left|center_vertical"
+            android:maxLines="1"
+            android:textSize="@dimen/playlist_detail_subtext_size"
+            tools:ignore="RtlHardcoded"
+            tools:text="Typical uploader name"/>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/playlist_stream_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/uploader_layout"
+        android:layout_alignEnd="@+id/playlist_title_view"
+        android:layout_alignRight="@+id/playlist_title_view"
+        android:layout_alignTop="@+id/uploader_layout"
+        android:ellipsize="end"
+        android:gravity="right|center_vertical"
+        android:maxLines="1"
+        android:textSize="@dimen/playlist_detail_subtext_size"
+        tools:ignore="RtlHardcoded"
+        tools:text="234 videos"/>
+
+</RelativeLayout>

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

@@ -28,7 +28,7 @@
         android:gravity="left"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="16sp"
+        android:textSize="14sp"
         tools:ignore="RtlHardcoded"
-        tools:text="MPEG-4 1080p60 very long res"/>
+        tools:text="MPEG-4 1080p60"/>
 </RelativeLayout>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="14dp"
+        android:background="?attr/contrast_background_color">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:background="?attr/toolbar_shadow_drawable"/>
+    </FrameLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/separator_color"/>
+
+    <include layout="@layout/settings_category_header_title"/>
+</LinearLayout>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|center_vertical"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="16dp"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="14sp"
+    android:textStyle="bold"
+    tools:text="Header"/>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="¯\\_(ツ)_/¯"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        tools:ignore="HardcodedText"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="6dp"
+        android:text="@string/empty_subscription_feed_subtitle"/>
+</LinearLayout>

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

@@ -2,32 +2,41 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/channel_header_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="12dp">
+    android:layout_marginBottom="12dp"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true">
+
+    <ImageView
+        android:id="@+id/whatsNewIcon"
+        android:layout_width="48dp"
+        android:layout_height="28dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:src="?attr/rss"
+        tools:ignore="ContentDescription,RtlHardcoded"/>
 
     <TextView
         android:id="@+id/whatsNew"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
-        android:drawableLeft="?attr/rss"
-        android:drawablePadding="5dp"
+        android:layout_toRightOf="@+id/whatsNewIcon"
+        android:gravity="left|center"
         android:text="@string/fragment_whats_new"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="@dimen/header_footer_text_size"
-        android:gravity="left|center"
-        android:clickable="true"
+        android:textSize="15sp"
+        android:textStyle="bold"
         tools:ignore="RtlHardcoded"/>
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_height="1dp"
+        android:layout_below="@+id/whatsNew"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
-        android:layout_below="@id/whatsNew"
-        android:background="?attr/colorAccent" />
+        android:background="?attr/separator_color"/>
 
 </RelativeLayout>

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

@@ -16,7 +16,8 @@
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
+        app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:titleTextAppearance="@style/Toolbar.Title">
 
         <Spinner
             android:id="@+id/toolbar_spinner"
@@ -38,6 +39,6 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="4dp"
-        android:background="@drawable/toolbar_shadow"/>
+        android:background="?attr/toolbar_shadow_drawable"/>
 
 </LinearLayout>

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

@@ -4,7 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="?attr/colorPrimary">
+    android:background="?attr/colorPrimary"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
 
     <View
         android:id="@+id/dropdown_anchor"
@@ -24,10 +26,11 @@
         android:drawablePadding="8dp"
         android:dropDownAnchor="@+id/dropdown_anchor"
         android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:hint="@string/search"
         android:imeOptions="actionSearch|flagNoFullscreen"
         android:inputType="textFilter|textNoSuggestions"
         android:maxLines="1"
-        tools:hint="Search..."
         tools:ignore="RtlHardcoded"/>
 
     <FrameLayout

app/src/main/res/menu/menu_channel.xml

@@ -1,19 +1,25 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.schabi.newpipe.fragments.channel.ChannelFragment">
+    tools:context=".fragments.list.impl.ChannelFragment">
 
-    <item android:id="@+id/menu_item_openInBrowser"
-        app:showAsAction="never"
-        android:title="@string/open_in_browser" />
+    <item
+        android:id="@+id/menu_item_openInBrowser"
+        android:title="@string/open_in_browser"
+        app:showAsAction="never"/>
 
-    <item android:id="@+id/menu_item_rss"
-        app:showAsAction="ifRoom"
+    <item
+        android:id="@+id/menu_item_rss"
+        android:icon="?attr/rss"
         android:title="@string/rss_button_title"
-        android:icon="?attr/rss"/>
-
-    <item android:id="@+id/menu_item_share"
-        android:title="@string/share"
+        android:visible="false"
         app:showAsAction="ifRoom"
-        android:icon="?attr/share"/>
+        tools:visible="true"/>
+
+    <item
+        android:id="@+id/menu_item_share"
+        android:icon="?attr/share"
+        android:title="@string/share"
+        app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu_playlist.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_openInBrowser"
+        android:title="@string/open_in_browser"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/menu_item_share"
+        android:icon="?attr/share"
+        android:title="@string/share"
+        app:showAsAction="ifRoom"/>
+</menu>

app/src/main/res/menu/menu_search.xml

@@ -21,6 +21,9 @@
                 <item
                     android:id="@+id/menu_filter_channel"
                     android:title="@string/channel"/>
+                <item
+                    android:id="@+id/menu_filter_playlist"
+                    android:title="@string/playlist"/>
             </group>
         </menu>
     </item>

app/src/main/res/values-b+ast/strings.xml

@@ -126,7 +126,7 @@
     <string name="open_in_popup_mode">Abrir en ventanu emerxente</string>
     <string name="popup_mode_share_menu_title">Mou de ventanu emerxente de NewPipe</string>
 
-    <string name="preferred_video_format_title">Formatu preferíu de videu</string>
+    <string name="default_video_format_title">Formatu preferíu de videu</string>
     <string name="black_theme_title">Prietu</string>
 
     <string name="popup_playing_toast">Reproduciendo en ventanu emerxente</string>
@@ -137,11 +137,8 @@
     <string name="disabled">Deshabilitóse</string>
 
     <string name="use_old_player_title">Usar reproductor vieyu</string>
-    <string name="videos">vídeos</string>
-    <string name="subscriber">soscriptor</string>
-    <string name="subscriber_plural">soscriptores</string>
-    <string name="subscribe">Soscribise</string>
-    <string name="views">visiones</string>
+
+
     <string name="short_thousand">M</string>
     <string name="short_million">Mill</string>
     <string name="short_billion">MMill</string>

app/src/main/res/values-bn-rBD/strings.xml

@@ -45,7 +45,7 @@
     <string name="show_play_with_kodi_summary">Kodi মিডিয়া সেন্টারে এর মাধ্যমে ভিডিও প্লে করার জন্য একটি বিকল্প প্রদর্শন কর।</string>
     <string name="play_audio">অডিও</string>
     <string name="default_audio_format_title">ডিফল্ট অডিও ফরম্যাট</string>
-    <string name="preferred_video_format_title">পছন্দসই ভিডিও ফরম্যাট</string>
+    <string name="default_video_format_title">পছন্দসই ভিডিও ফরম্যাট</string>
     <string name="webm_description">WebM — বিনামূল্য/স্বাধীন ফরম্যাট</string>
     <string name="m4a_description">m4a — ভালো মানের</string>
     <string name="theme_title">থিম</string>
@@ -133,11 +133,8 @@
     <string name="storage_permission_denied">স্টোরেজ অ্যাক্সেস করার অনুমতি অস্বীকার করা হয়েছে</string>
     <string name="use_old_player_title">পুরানো প্লেয়ার ব্যবহার করো</string>
     <string name="use_old_player_summary">মিডিয়াফ্রেমওয়ার্ক প্লেয়ারের পুরানো বিল্ড।</string>
-    <string name="videos">ভিডিওগুলি</string>
-    <string name="subscriber">গ্রাহক</string>
-    <string name="subscriber_plural">গ্রাহকরা</string>
-    <string name="subscribe">সাবস্ক্রাইব</string>
-    <string name="views">প্রদর্শন</string>
+
+
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>

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

@@ -135,10 +135,7 @@
     <string name="yes">Ano</string>
     <string name="later">Později</string>
 
-    <string name="videos">videa</string>
-    <string name="subscriber">odběratel</string>
-    <string name="subscribe">Odebírat</string>
-    <string name="views">zobrazení</string>
+
     <string name="short_thousand">k</string>
 
     <string name="open_in_popup_mode">Otevřít ve vyskakovacím okně</string>
@@ -150,7 +147,7 @@ otevření ve vyskakovacím okně</string>
 <string name="use_external_video_player_summary">Některé formáty rozlišení NEBUDOU obsahovat zvukovou stopu po zapnutí této funkce</string>
     <string name="show_higher_resolutions_title">Zobrazit vyšší rozlišení</string>
     <string name="show_higher_resolutions_summary">Pouze některá zařízení podporují přehrávání videí ve 2K/4K</string>
-    <string name="preferred_video_format_title">Preferovaný video formát</string>
+    <string name="default_video_format_title">Preferovaný video formát</string>
     <string name="popup_remember_size_pos_title">Zapamatovat si velikost a pozici vyskakovacího okna</string>
     <string name="popup_remember_size_pos_summary">Zapamatovat si poslední nastavení velikosti a pozice vyskakovacího okna</string>
     </resources>

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

@@ -105,9 +105,7 @@
     <string name="checksum">Prüfsumme</string>
 
 
-    <string name="videos">Videos</string>
-    <string name="subscriber">Abonnent</string>
-    <string name="views">Aufrufe</string>
+
     <string name="short_thousand">Tsd.</string>
     <string name="short_million">Mio.</string>
     <string name="short_billion">Mrd.</string>
@@ -144,16 +142,15 @@
     <string name="all">Alle</string>
     <string name="channel">Kanal</string>
 
-    <string name="subscribe">Abonnieren</string>
     <string name="disabled">Deaktiviert</string>
 
     <string name="use_old_player_title">Benutze den alten Player</string>
     <string name="open_in_popup_mode">Im Popup-Modus öffnen</string>
-    <string name="preferred_video_format_title">Bevorzugtes Videoformat</string>
+    <string name="default_video_format_title">Bevorzugtes Videoformat</string>
     <string name="popup_playing_toast">Spiele im Popup-Modus ab</string>
     <string name="popup_mode_share_menu_title">NewPipe Popup-Modus</string>
 
-    <string name="subscriber_plural">Abonnenten</string>
+
     <string name="msg_popup_permission">Diese Berechtigung ist für das
 Öffnen im Popup-Modus erforderlich</string>
 

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

@@ -134,10 +134,6 @@
     <string name="yes">Sí</string>
     <string name="later">Después</string>
 
-    <string name="videos">videos</string>
-    <string name="subscriber">suscriptor</string>
-    <string name="subscribe">Suscribirse</string>
-    <string name="views">visualizaciones</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">MM</string>
@@ -155,10 +151,9 @@ abrir en modo popup</string>
     <string name="popup_playing_toast">Reproduciendo en modo popup</string>
     <string name="use_old_player_title">Usar reproductor antiguo</string>
     <string name="use_old_player_summary">Versión antigua en reproductor Media Framework</string>
-    <string name="preferred_video_format_title">Formato de vídeo por defecto</string>
+    <string name="default_video_format_title">Formato de vídeo por defecto</string>
     <string name="disabled">Desactivado</string>
 
-    <string name="subscriber_plural">Suscriptores</string>
     <string name="show_higher_resolutions_title">Mostrar resoluciones más altas</string>
     <string name="show_higher_resolutions_summary">Solo algunos dispositivos soportan reproducción de vídeos en 2K/4K</string>
     <string name="default_popup_resolution_title">Resolución del popup por defecto</string>
@@ -193,7 +188,6 @@ abrir en modo popup</string>
     <string name="tab_about">Acerca de</string>
     <string name="tab_contributors">Colaboradores</string>
     <string name="tab_licenses">Licencias</string>
-    <string name="github_url">https://github.com/TeamNewPipe/NewPipe</string>
     <string name="app_description">Una gratuita y ligera interfaz de YouTube para Android.</string>
     <string name="view_on_github">Ver en GitHub</string>
     <string name="app_license_title">Licencia de NewPipe</string>

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

@@ -64,7 +64,7 @@
     <string name="default_popup_resolution_title">Laster-leihoaren lehenetsitako bereizmena</string>
     <string name="show_higher_resolutions_title">Erakutsi bereizmen altuagoak</string>
     <string name="show_higher_resolutions_summary">Gailu batzuk besterik ez dute onartzen 2K/4K bideoak erreproduzitzea</string>
-    <string name="preferred_video_format_title">Hobetsitako bideo-formatua</string>
+    <string name="default_video_format_title">Hobetsitako bideo-formatua</string>
     <string name="theme_title">Gaia</string>
     <string name="black_theme_title">Beltza</string>
     <string name="popup_remember_size_pos_title">Gogoratu laster-leihoaren tamaina eta posizioa</string>
@@ -131,11 +131,8 @@
     <string name="storage_permission_denied">Biltegia atzitzeko baimena ukatu da</string>
     <string name="use_old_player_title">Erabili erreproduzigailu zaharra</string>
     <string name="use_old_player_summary">Barne Media Framework erreproduzigailu zaharra.</string>
-    <string name="videos">bideoak</string>
-    <string name="subscriber">harpideduna</string>
-    <string name="subscriber_plural">hapidedunak</string>
-    <string name="subscribe">Harpidetu</string>
-    <string name="views">ikustaldiak</string>
+
+
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">MM</string>

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

@@ -129,9 +129,7 @@
     <string name="all">Tout</string>
     <string name="channel">Chaîne</string>
 
-    <string name="videos">vidéos</string>
-    <string name="subscriber">abonné</string>
-    <string name="views">vues</string>
+
     <string name="reCaptcha_title">Test reCAPTCHA</string>
     <string name="recaptcha_request_toast">Test reCAPTCHA demandé</string>
 
@@ -146,7 +144,6 @@
     <string name="info_labels">Quoi :\\nRequête :\\nLang. du contenu:\\nService :\\nHeure GMT :\\nPaquage :\\nVersion :\\nVersion de l\'OS:\\nGamme globale d\'IPs :</string>
     <string name="use_old_player_title">Utiliser l\'ancien lecteur</string>
     <string name="use_old_player_summary">Ancienne version du lecteur Mediaframework.</string>
-    <string name="subscribe">S\'abonner</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
 
@@ -159,7 +156,7 @@ pour ouvrir en mode popup</string>
     <string name="default_popup_resolution_title">Résolution de la lecture intégrée</string>
     <string name="show_higher_resolutions_title">Afficher des résolutions plus grandes</string>
     <string name="show_higher_resolutions_summary">Seulement certains périphériques supportent la lecture 2K/4K</string>
-    <string name="preferred_video_format_title">Format vidéo par défaut</string>
+    <string name="default_video_format_title">Format vidéo par défaut</string>
     <string name="popup_remember_size_pos_title">Mémoriser la taille et la position du lecteur intégré</string>
     <string name="popup_remember_size_pos_summary">Mémoriser les derniers emplacements et la taille du lecteur intégré</string>
 
@@ -169,7 +166,6 @@ pour ouvrir en mode popup</string>
     <string name="clear">Effacer</string>
     <string name="popup_resizing_indicator_title">Redimensionner</string>
 
-    <string name="subscriber_plural">abonnés</string>
     <string name="short_billion">Md</string>
 
     <string name="use_external_video_player_summary">Certaines résolutions n\'auront PAS de son si cette option est activée</string>

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

@@ -43,7 +43,7 @@
     <string name="show_play_with_kodi_summary">הראה אפשרות לנגן סרטון דרך \"Kodi media center\".</string>
     <string name="play_audio">שמע</string>
     <string name="default_audio_format_title">פורמט ברירת המחדל לשמע</string>
-    <string name="preferred_video_format_title">פורמט הוידאו המועדף</string>
+    <string name="default_video_format_title">פורמט הוידאו המועדף</string>
     <string name="webm_description">WebM — פורמט חינמי</string>
     <string name="m4a_description">m4a — איכות יותר גבוהה</string>
     <string name="theme_title">ערכת נושא</string>

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

@@ -53,7 +53,7 @@
     <string name="show_play_with_kodi_summary">Prikaži opciju za reproduciranje videa putem Kodija</string>
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Zadani audio format</string>
-    <string name="preferred_video_format_title">Preferirani video format</string>
+    <string name="default_video_format_title">Preferirani video format</string>
     <string name="webm_description">WebM - slobodni format</string>
     <string name="m4a_description">m4a - bolja kvaliteta</string>
     <string name="theme_title">Tema</string>
@@ -140,7 +140,7 @@
     <string name="user_report">Korisničke prijave</string>
 
     <string name="err_dir_create">Nije moguće napraviti direktorij za preuzimanje \'%1$s\'</string>
-    <string name="info_dir_created">Napravljen direktorij za preuzimanje \'1$s\'</string>
+    <string name="info_dir_created">Napravljen direktorij za preuzimanje \'%1$s\'</string>
 
     <string name="video">Video</string>
     <string name="audio">Audio</string>
@@ -148,11 +148,8 @@
     <string name="storage_permission_denied">Dozvola za pisanje po memoriji je odbijena</string>
     <string name="use_old_player_title">Koristi stari player</string>
     <string name="use_old_player_summary">Stari ugrađeni Mediaframework player.</string>
-    <string name="videos">videi</string>
-    <string name="subscriber">pretplatnik</string>
-    <string name="subscriber_plural">pretplatnici</string>
-    <string name="subscribe">Pretplati se</string>
-    <string name="views">pregledi</string>
+
+
     <string name="short_thousand">tis</string>
     <string name="short_million">mil</string>
     <string name="short_billion">mlrd</string>

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

@@ -18,9 +18,8 @@
     <string name="finish">Այո</string>
     <string name="delete">Ջնջել</string>
     <string name="start">Սկսել</string>
-    <string name="subscribe">Բաժանորդագրվել</string>
-    <string name="subscriber_plural">Բաժանորդները</string>
-    <string name="subscriber">Բաժանորդ</string>
+
+
     <string name="detail_likes_img_view_description">Հավանում եմ</string>
     <string name="detail_dislikes_img_view_description">Չեմ հավանում</string>
     <string name="clear">Մաքրել</string>

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

@@ -132,17 +132,14 @@
     <string name="all">Semua</string>
     <string name="channel">Saluran</string>
 
-    <string name="videos">video</string>
-    <string name="views">ditonton</string>
     <string name="short_thousand">R</string>
     <string name="short_million">J</string>
     <string name="short_billion">T</string>
 
-    <string name="subscriber">pelanggan</string>
+
     <string name="yes">Ya</string>
     <string name="later">Nanti</string>
 
-    <string name="subscribe">Langganan</string>
 
     <string name="open_in_popup_mode">Buka di mode popup</string>
     <string name="msg_popup_permission">Izin ini dibutuhkan untuk
@@ -155,8 +152,8 @@ membuka di mode popup</string>
     <string name="use_old_player_summary">Versi lama pemutar Mediaframework.</string>
     <string name="disabled">Dinonaktifkan</string>
 
-    <string name="preferred_video_format_title">Pilihan format video</string>
-    <string name="subscriber_plural">subscriber</string>
+    <string name="default_video_format_title">Pilihan format video</string>
+
     <string name="default_popup_resolution_title">Resolusi popup bawaan</string>
     <string name="show_higher_resolutions_title">Tampilkan resolusi yang lebih tinggi</string>
     <string name="show_higher_resolutions_summary">Hanya perangkat tertentu yang mendukung pemutaran video 2K/4K</string>

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

@@ -137,9 +137,7 @@
     <string name="all">Tutto</string>
     <string name="channel">Canale</string>
 
-    <string name="videos">video</string>
-    <string name="subscriber">iscritto</string>
-    <string name="views">visualizzazioni</string>
+
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
@@ -149,7 +147,6 @@
     <string name="yes">Si</string>
     <string name="later">Più tardi</string>
 
-    <string name="subscribe">Iscriviti</string>
 
     <string name="open_in_popup_mode">Apri in modalità popup</string>
     <string name="popup_mode_share_menu_title">Modo popup NewPipe</string>
@@ -165,7 +162,7 @@
     <string name="default_popup_resolution_title">Risoluzione predefinita per il popup</string>
     <string name="show_higher_resolutions_title">Mostra risoluzioni più alte</string>
     <string name="show_higher_resolutions_summary">Solo alcuni dispositivi supportano la riproduzione di video in 2K e 4K.</string>
-    <string name="preferred_video_format_title">Formato video preferito</string>
+    <string name="default_video_format_title">Formato video preferito</string>
     <string name="popup_remember_size_pos_title">Ricorda grandezza e posizione del popup</string>
     <string name="popup_remember_size_pos_summary">Ricorda l\'ultima grandezza e l\'ultima posizione impostate per il popup.</string>
     <string name="player_gesture_controls_title">Controlli gestuali</string>
@@ -181,7 +178,7 @@
     <string name="best_resolution">Risoluzione migliore</string>
 
     <string name="use_old_player_summary">Precedente riproduttore integrato facente uso di Mediaframework.</string>
-    <string name="subscriber_plural">iscritti</string>
+
     <string name="msg_popup_permission">Questo permesso è necessario
 \nper la modalità popup</string>
 

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

@@ -139,9 +139,7 @@
     <string name="all">全て</string>
     <string name="channel">ﾁｬﾝﾈﾙ</string>
 
-    <string name="videos">動画</string>
-    <string name="subscriber">購読者</string>
-    <string name="views">表示</string>
+
     <string name="short_thousand">K</string>
     <string name="short_million">000000</string>
     <string name="short_billion">000000000</string>
@@ -149,7 +147,6 @@
     <string name="yes">はい</string>
     <string name="later">後で</string>
 
-    <string name="subscribe">購読</string>
 
     <string name="open_in_popup_mode">ポップアップモードで開く</string>
     <string name="msg_popup_permission">ポップアップモードで開くには
@@ -162,8 +159,8 @@
     <string name="use_old_player_summary">Mediaframework プレーヤーの古いビルド。</string>
     <string name="disabled">無効</string>
 
-    <string name="preferred_video_format_title">お好みのビデオ フォーマット</string>
-    <string name="subscriber_plural">購読者</string>
+    <string name="default_video_format_title">お好みのビデオ フォーマット</string>
+
     <string name="default_popup_resolution_title">デフォルトのポップアップ解像度</string>
     <string name="show_higher_resolutions_title">高い解像度で表示</string>
     <string name="show_higher_resolutions_summary">一部のデバイスのみ 2K/4K ビデオの再生をサポートしています</string>
@@ -198,7 +195,6 @@
     <string name="tab_about">アプリについて</string>
     <string name="tab_contributors">貢献者</string>
     <string name="tab_licenses">ライセンス</string>
-    <string name="github_url">https://github.com/TeamNewPipe/NewPipe</string>
     <string name="app_description">Android 用の無料で軽量な Youtube フロントエンド。</string>
     <string name="view_on_github">Github で表示</string>
     <string name="app_license_title">NewPipe のライセンス</string>

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

@@ -19,11 +19,10 @@
     <dimen name="video_item_search_image_right_margin">10dp</dimen>
     <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
     <dimen name="video_item_search_duration_horizontal_padding">7sp</dimen>
-    <dimen name="video_item_search_duration_margin">5sp</dimen>
 
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
-    <dimen name="video_item_detail_title_text_size">20sp</dimen>
+    <dimen name="video_item_detail_title_text_size">16sp</dimen>
     <dimen name="video_item_detail_views_text_size">14sp</dimen>
     <dimen name="video_item_detail_likes_text_size">13sp</dimen>
     <dimen name="video_item_detail_uploader_text_size">16sp</dimen>
@@ -33,13 +32,18 @@
     <dimen name="channel_subscribers_text_size">14sp</dimen>
     <dimen name="channel_rss_title_size">14sp</dimen>
     <!-- Elements Size -->
-    <dimen name="video_item_detail_uploader_image_size">70dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">42dp</dimen>
     <dimen name="video_item_detail_like_image_height">20sp</dimen>
     <dimen name="video_item_detail_like_image_width">20sp</dimen>
     <dimen name="channel_avatar_size">90dp</dimen>
-    <dimen name="channel_avatar_halo_size">94dp</dimen>
     <!-- Paddings & Margins -->
     <dimen name="video_item_detail_like_margin">8dp</dimen>
     <dimen name="video_item_detail_error_panel_margin">4dp</dimen>
 
+    <!-- Playlist View Dimensions-->
+    <dimen name="playlist_item_thumbnail_width">142dp</dimen>
+    <dimen name="playlist_item_thumbnail_height">80dp</dimen>
+    <!-- Elements Size -->
+    <dimen name="playlist_item_thumbnail_stream_count_width">70dp</dimen>
+
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -133,7 +133,7 @@
     <string name="default_popup_resolution_title">Forvalgt oppsprettsoppløsning</string>
     <string name="show_higher_resolutions_title">Vis høyere oppløsninger</string>
     <string name="show_higher_resolutions_summary">Det er bare noen enheter som støtter avspilling av 2k-/4k-videoer</string>
-    <string name="preferred_video_format_title">Forvalgt videoformat</string>
+    <string name="default_video_format_title">Forvalgt videoformat</string>
     <string name="black_theme_title">Svart</string>
 
     <string name="popup_playing_toast">Spiller av i oppsprettsmodus</string>
@@ -144,11 +144,8 @@
     <string name="disabled">Avskrudd</string>
 
     <string name="use_old_player_title">Bruk gammel avspiller</string>
-    <string name="videos">videoer</string>
-    <string name="subscriber">abonnent</string>
-    <string name="subscriber_plural">abonnenter</string>
-    <string name="subscribe">Abonner</string>
-    <string name="views">visninger</string>
+
+
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">Mrd.</string>

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

@@ -137,10 +137,7 @@
     <string name="yes">Ja</string>
     <string name="later">Later</string>
 
-    <string name="videos">video\'s</string>
-    <string name="subscriber">abonneren</string>
-    <string name="subscribe">Abonneren</string>
-    <string name="views">weergaven</string>
+
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
@@ -153,10 +150,10 @@ te openen in pop-upmodus</string>
     <string name="popup_playing_toast">Speelt af in pop-upmodus</string>
     <string name="use_old_player_title">Gebruik oude speler</string>
     <string name="use_old_player_summary">Verouderde ingebouwde Mediaframework-speler</string>
-    <string name="preferred_video_format_title">Standaardvideoformaat</string>
+    <string name="default_video_format_title">Standaardvideoformaat</string>
     <string name="disabled">Uitgeschakeld</string>
 
-    <string name="subscriber_plural">abonnees</string>
+
     <string name="default_popup_resolution_title">Standaardresolutie voor pop-up</string>
     <string name="show_higher_resolutions_title">Hogere resoluties weergeven</string>
     <string name="show_higher_resolutions_summary">Video\'s afspelen in 2K/4K wordt maar op sommige apparaten ondersteund</string>
@@ -191,7 +188,6 @@ te openen in pop-upmodus</string>
     <string name="tab_about">Over</string>
     <string name="tab_contributors">Bijdragers</string>
     <string name="tab_licenses">Licenties</string>
-    <string name="github_url">https://github.com/TeamNewPipe/NewPipe</string>
     <string name="app_description">Een vrije en lichte YouTube-cliënt voor Android.</string>
     <string name="view_on_github">Bekijken op GitHub</string>
     <string name="app_license_title">Licentie van NewPipe</string>