Merge branch 'master' of git://github.com/ksyko/NewPipe into kyko

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

@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/light_background_color"/>
+        android:drawable="?android:attr/windowBackground"/>
 
     <item>
         <bitmap

app/src/main/res/layout-v18/fragment_videoitem_detail.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".detail.VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/video_item_detail">
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                tools:context=".detail.VideoItemDetailFragment"
+                android:textIsSelectable="true"
+                style="?android:attr/textAppearanceLarge"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/video_item_detail">
 
     <ProgressBar android:id="@+id/detail_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"/>
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_centerInParent="true"
+                 android:indeterminate="true"/>
 
     <com.nirhart.parallaxscroll.views.ParallaxScrollView
         android:id="@+id/detail_main_content"
@@ -35,24 +35,24 @@
                 android:background="?attr/selectableItemBackground">
 
                 <ImageView android:id="@+id/detail_thumbnail_view"
-                    android:contentDescription="@string/detail_thumbnail_view_description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitCenter"
-                    android:adjustViewBounds="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@android:color/black"
-                    android:src="@drawable/dummy_thumbnail_dark"/>
+                           android:contentDescription="@string/detail_thumbnail_view_description"
+                           android:layout_width="match_parent"
+                           android:layout_height="wrap_content"
+                           android:scaleType="fitCenter"
+                           android:adjustViewBounds="true"
+                           android:layout_alignParentLeft="true"
+                           android:layout_alignParentStart="true"
+                           android:layout_alignParentTop="true"
+                           android:background="@android:color/black"
+                           android:src="@drawable/dummy_thumbnail_dark"/>
 
                 <ImageView android:id="@+id/play_arrow_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:layout_centerInParent="true"
-                    android:src="@drawable/new_play_arrow"
-                    android:visibility="invisible"/>
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:background="@android:color/transparent"
+                           android:layout_centerInParent="true"
+                           android:src="@drawable/new_play_arrow"
+                           android:visibility="invisible"/>
 
                 <Button
                     android:id="@+id/detail_stream_thumbnail_window_background_button"
@@ -63,11 +63,11 @@
             </RelativeLayout>
 
             <RelativeLayout android:id="@+id/detail_text_content_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/light_background_color"
-                android:visibility="gone">
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_below="@id/detail_stream_thumbnail_window_layout"
+                            android:background="?android:windowBackground"
+                            android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -75,15 +75,15 @@
                     android:id="@+id/detailTopView">
 
                     <TextView android:id="@+id/detail_video_title_view"
-                        android:layout_width="0dp"
-                        android:layout_weight=".7"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:text="Title"/>
+                              android:layout_width="0dp"
+                              android:layout_weight=".7"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_title_text_size"
+                              android:textAppearance="?android:attr/textAppearanceLarge"
+                              android:layout_marginTop="12dp"
+                              android:layout_marginLeft="12dp"
+                              android:layout_marginStart="12dp"
+                              android:text="Title"/>
 
                     <ImageView
                         android:layout_width="15dp"
@@ -99,17 +99,17 @@
                 </LinearLayout>
 
                 <TextView android:id="@+id/detail_view_count_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/video_item_detail_views_text_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:text="10,069,948 views"
-                    android:layout_below="@id/detailTopView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="5dp" />
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textSize="@dimen/video_item_detail_views_text_size"
+                          android:textAppearance="?android:attr/textAppearanceLarge"
+                          android:layout_marginLeft="12dp"
+                          android:layout_marginStart="12dp"
+                          android:text="10,069,948 views"
+                          android:layout_below="@id/detailTopView"
+                          android:layout_alignParentLeft="true"
+                          android:layout_alignParentStart="true"
+                          android:layout_marginTop="5dp" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -122,21 +122,21 @@
                     android:layout_marginEnd="12dp"
                     android:visibility="gone">
                     <TextView android:id="@+id/detail_upload_date_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Upload date"
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="Upload date"
+                              android:layout_marginTop="3dp" />
 
                     <TextView android:id="@+id/detail_description_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_below="@id/detail_upload_date_view"
-                        android:text="Description............."
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_description_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:layout_below="@id/detail_upload_date_view"
+                              android:text="Description............."
+                              android:layout_marginTop="3dp" />
                 </RelativeLayout>
 
                 <LinearLayout
@@ -150,32 +150,32 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="5dp">
                     <ImageView android:id="@+id/detail_thumbs_up_img_view"
-                        android:contentDescription="@string/detail_likes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_up" />
+                               android:contentDescription="@string/detail_likes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_up"/>
 
                     <TextView android:id="@+id/detail_thumbs_up_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="200" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="200" />
 
                     <ImageView android:id="@+id/detail_thumbs_down_img_view"
-                        android:contentDescription="@string/detail_dislikes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_down"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginStart="10dp"/>
+                               android:contentDescription="@string/detail_dislikes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_down"
+                               android:layout_marginLeft="10dp"
+                               android:layout_marginStart="10dp"/>
 
                     <TextView android:id="@+id/detail_thumbs_down_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="100" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="100" />
                 </LinearLayout>
 
                 <FrameLayout
@@ -208,17 +208,17 @@
                             android:layout_marginBottom="5dp"/>
 
                         <TextView android:id="@+id/detail_uploader_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/video_item_detail_uploader_text_size"
-                            android:textAppearance="?android:attr/textAppearanceLarge"
-                            android:text="Uploader"
-                            android:layout_centerVertical="true"
-                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_marginLeft="15dp"
-                            android:layout_marginStart="28dp" />
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:textStyle="bold"
+                                  android:textSize="@dimen/video_item_detail_uploader_text_size"
+                                  android:textAppearance="?android:attr/textAppearanceLarge"
+                                  android:text="Uploader"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_marginLeft="15dp"
+                                  android:layout_marginStart="28dp" />
 
                         <View
                             android:background="#000"
@@ -235,12 +235,12 @@
                 </FrameLayout>
 
                 <RelativeLayout android:id="@+id/detail_next_stream_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:layout_below="@+id/detail_uploader_frame"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp">
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_horizontal|bottom"
+                                android:layout_below="@+id/detail_uploader_frame"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="10dp">
 
                     <TextView
                         android:id="@+id/detail_next_stream_title"
@@ -257,14 +257,14 @@
                         android:layout_height="wrap_content"
                         android:id="@+id/detail_next_stream_content"/>
                     <TextView android:id="@+id/detail_similar_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="@string/similar_videos_btn_text"
-                        android:layout_below="@id/detail_next_stream_content"
-                        android:textAllCaps="true" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_centerHorizontal="true"
+                              android:textSize="@dimen/video_item_detail_next_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="@string/similar_videos_btn_text"
+                              android:layout_below="@id/detail_next_stream_content"
+                              android:textAllCaps="true" />
                     <LinearLayout
                         android:id="@+id/similar_streams_view"
                         android:orientation="vertical"

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

@@ -73,7 +73,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_rss_feed_white_24dp"
+        android:src="?attr/rss"
         app:layout_anchor="@id/channel_app_bar"
         app:layout_anchorGravity="bottom|end" />
 
@@ -91,6 +91,7 @@
         android:id="@+id/channel_streams_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?android:windowBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:scrollbars="vertical"/>
 </android.support.design.widget.CoordinatorLayout>

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

@@ -42,7 +42,7 @@
                 android:id="@+id/errorMessageView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/black"
+                android:textColor="?android:attr/colorAccent"
                 android:text="@string/info_labels"/>
 
             <TextView
@@ -63,7 +63,7 @@
                     android:id="@+id/errorInfoLabelsView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
+                    android:textColor="?android:attr/colorAccent"
                     android:text="@string/info_labels"/>
 
                 <HorizontalScrollView

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".detail.VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/video_item_detail">
+             xmlns:tools="http://schemas.android.com/tools"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             tools:context=".detail.VideoItemDetailFragment"
+             android:textIsSelectable="true"
+             style="?android:attr/textAppearanceLarge"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:id="@+id/video_item_detail">
 
     <com.nirhart.parallaxscroll.views.ParallaxScrollView
         android:id="@+id/detail_main_content"
@@ -29,22 +29,22 @@
                 android:background="?attr/selectableItemBackground">
 
                 <ImageView android:id="@+id/detail_thumbnail_view"
-                    android:contentDescription="@string/detail_thumbnail_view_description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitCenter"
-                    android:adjustViewBounds="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@android:color/black"
-                    android:src="@drawable/dummy_thumbnail_dark"/>
+                           android:contentDescription="@string/detail_thumbnail_view_description"
+                           android:layout_width="match_parent"
+                           android:layout_height="wrap_content"
+                           android:scaleType="fitCenter"
+                           android:adjustViewBounds="true"
+                           android:layout_alignParentLeft="true"
+                           android:layout_alignParentStart="true"
+                           android:layout_alignParentTop="true"
+                           android:background="@android:color/black"
+                           android:src="@drawable/dummy_thumbnail_dark"/>
 
                 <ProgressBar android:id="@+id/detail_progress_bar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:indeterminate="true"/>
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:layout_centerInParent="true"
+                             android:indeterminate="true"/>
 
                 <android.support.design.widget.FloatingActionButton
                     android:id="@+id/play_video_button"
@@ -65,11 +65,11 @@
             </RelativeLayout>
 
             <RelativeLayout android:id="@+id/detail_text_content_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/light_background_color"
-                android:visibility="gone">
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_below="@id/detail_stream_thumbnail_window_layout"
+                            android:background="?android:windowBackground"
+                            android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -77,15 +77,15 @@
                     android:id="@+id/detailTopView">
 
                     <TextView android:id="@+id/detail_video_title_view"
-                        android:layout_width="0dp"
-                        android:layout_weight=".7"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:text="Title"/>
+                              android:layout_width="0dp"
+                              android:layout_weight=".7"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_title_text_size"
+                              android:textAppearance="?android:attr/textAppearanceLarge"
+                              android:layout_marginTop="12dp"
+                              android:layout_marginLeft="12dp"
+                              android:layout_marginStart="12dp"
+                              android:text="Title"/>
 
                     <ImageView
                         android:layout_width="15dp"
@@ -101,17 +101,17 @@
                 </LinearLayout>
 
                 <TextView android:id="@+id/detail_view_count_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/video_item_detail_views_text_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:text="10,069,948 views"
-                    android:layout_below="@id/detailTopView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="5dp" />
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textSize="@dimen/video_item_detail_views_text_size"
+                          android:textAppearance="?android:attr/textAppearanceLarge"
+                          android:layout_marginLeft="12dp"
+                          android:layout_marginStart="12dp"
+                          android:text="10,069,948 views"
+                          android:layout_below="@id/detailTopView"
+                          android:layout_alignParentLeft="true"
+                          android:layout_alignParentStart="true"
+                          android:layout_marginTop="5dp" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -124,21 +124,21 @@
                     android:layout_marginEnd="12dp"
                     android:visibility="gone">
                     <TextView android:id="@+id/detail_upload_date_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Upload date"
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="Upload date"
+                              android:layout_marginTop="3dp" />
 
                     <TextView android:id="@+id/detail_description_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_below="@id/detail_upload_date_view"
-                        android:text="Description............."
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_description_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:layout_below="@id/detail_upload_date_view"
+                              android:text="Description............."
+                              android:layout_marginTop="3dp" />
                 </RelativeLayout>
 
                 <LinearLayout
@@ -152,32 +152,32 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="5dp">
                     <ImageView android:id="@+id/detail_thumbs_up_img_view"
-                        android:contentDescription="@string/detail_likes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_up" />
+                               android:contentDescription="@string/detail_likes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_up" />
 
                     <TextView android:id="@+id/detail_thumbs_up_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="200" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="200" />
 
                     <ImageView android:id="@+id/detail_thumbs_down_img_view"
-                        android:contentDescription="@string/detail_dislikes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_down"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginStart="10dp"/>
+                               android:contentDescription="@string/detail_dislikes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_down"
+                               android:layout_marginLeft="10dp"
+                               android:layout_marginStart="10dp"/>
 
                     <TextView android:id="@+id/detail_thumbs_down_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="100" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="100" />
                 </LinearLayout>
 
                 <FrameLayout
@@ -210,17 +210,17 @@
                             android:layout_marginBottom="5dp"/>
 
                         <TextView android:id="@+id/detail_uploader_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/video_item_detail_uploader_text_size"
-                            android:textAppearance="?android:attr/textAppearanceLarge"
-                            android:text="Uploader"
-                            android:layout_centerVertical="true"
-                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_marginLeft="15dp"
-                            android:layout_marginStart="28dp" />
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:textStyle="bold"
+                                  android:textSize="@dimen/video_item_detail_uploader_text_size"
+                                  android:textAppearance="?android:attr/textAppearanceLarge"
+                                  android:text="Uploader"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_marginLeft="15dp"
+                                  android:layout_marginStart="28dp" />
 
                         <View
                             android:background="#000"
@@ -237,12 +237,12 @@
                 </FrameLayout>
 
                 <RelativeLayout android:id="@+id/detail_next_stream_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:layout_below="@+id/detail_uploader_frame"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp">
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_horizontal|bottom"
+                                android:layout_below="@+id/detail_uploader_frame"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="10dp">
 
                     <TextView
                         android:id="@+id/detail_next_stream_title"
@@ -259,14 +259,14 @@
                         android:layout_height="wrap_content"
                         android:id="@+id/detail_next_stream_content"/>
                     <TextView android:id="@+id/detail_similar_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="@string/similar_videos_btn_text"
-                        android:layout_below="@id/detail_next_stream_content"
-                        android:textAllCaps="true" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_centerHorizontal="true"
+                              android:textSize="@dimen/video_item_detail_next_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="@string/similar_videos_btn_text"
+                              android:layout_below="@id/detail_next_stream_content"
+                              android:textAllCaps="true" />
                     <LinearLayout
                         android:id="@+id/similar_streams_view"
                         android:orientation="vertical"

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

@@ -5,5 +5,5 @@
     <item android:id="@+id/menu_item_share_error"
         android:title="@string/share"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_share_black"/>
+        android:icon="?attr/share"/>
 </menu>

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

@@ -5,12 +5,12 @@
     <item android:id="@+id/menu_item_play_audio"
         android:title="@string/play_audio"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_headset_black" />
+        android:icon="?attr/audio" />
 
     <item android:id="@+id/menu_item_download"
         app:showAsAction="ifRoom"
         android:title="@string/download"
-        android:icon="@drawable/ic_file_download_black"/>
+        android:icon="?attr/download"/>
 
     <item android:id="@+id/menu_item_share"
         android:title="@string/share"

app/src/main/res/values-v21/styles.xml

@@ -1,15 +1,39 @@
 <resources>
-    <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
         <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="android:colorPrimary">@color/light_youtube_primary_color</item>
-        <item name="android:colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorPrimary">@color/light_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
         <item name="colorAccent">@color/light_youtube_accent_color</item>
-        <item name="android:colorAccent">@color/light_youtube_accent_color</item>
         <item name="android:windowBackground">@color/light_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_black_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_black_24dp</item>
+        <item name="audio">@drawable/ic_headset_black_24dp</item>
+        <item name="download">@drawable/ic_file_download_black_24dp</item>
+        <item name="share">@drawable/ic_share_black</item>
+        <item name="cast">@drawable/ic_cast_black_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_white_24dp</item>
     </style>
 
+
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_white_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_white_24dp</item>
+        <item name="audio">@drawable/ic_headset_white_24dp</item>
+        <item name="download">@drawable/ic_file_download_white_24dp</item>
+        <item name="share">@drawable/ic_share_white_24dp</item>
+        <item name="cast">@drawable/ic_cast_white_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
+    </style>
+
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="thumbs_up" format="reference"/>
+    <attr name="thumbs_down" format="reference"/>
+    <attr name="audio" format="reference"/>
+    <attr name="download" format="reference"/>
+    <attr name="share" format="reference"/>
+    <attr name="cast" format="reference"/>
+    <attr name="rss" format="reference"/>
+</resources>

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

@@ -33,5 +33,6 @@
     <color name="middle_gray">#E0E0E0</color>
     <color name="gray">#616161</color>
 
+    <color name="black">#000</color>
 
 </resources>

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

@@ -25,14 +25,14 @@
     <string name="show_play_with_kodi_key">show_play_with_kodi</string>
 
     <string name="theme_key">theme</string>
-    <string name="default_theme_value">0</string>
+    <string name="default_theme_value">@string/light_theme_title</string>
     <string-array name="theme_description_list">
-        <item>@string/dark_theme_title</item>
         <item>@string/light_theme_title</item>
+        <item>@string/dark_theme_title</item>
     </string-array>
     <string-array name="theme_list">
-        <item>0</item>
-        <item>1</item>
+        <item>@string/light_theme_title</item>
+        <item>@string/dark_theme_title</item>
     </string-array>
 
     <string name="default_audio_format_key">default_audio_format</string>

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

@@ -46,8 +46,9 @@
     <string name="webm_description">WebM — free format</string>
     <string name="m4a_description">m4a — better quality</string>
     <string name="theme_title">Theme</string>
-    <string name="dark_theme_title">Dark</string>
     <string name="light_theme_title">Light</string>
+    <string name="dark_theme_title">Dark</string>
+    <string name="black_theme_title">Black</string>
 
     <string name="download_dialog_title">Download</string>
     <string-array name="download_options">

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

@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="RootTheme" parent="android:Theme.Holo"></style>
+    <style name="RootTheme" parent="android:Theme.Holo"/>
 
     <style name="PlayerTheme" parent="@style/RootTheme">
         <item name="android:windowNoTitle">true</item>
@@ -13,6 +13,7 @@
         <item name="android:minWidth">40dp</item>
     </style>
 
+
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
@@ -21,6 +22,31 @@
         <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
         <item name="colorAccent">@color/light_youtube_accent_color</item>
         <item name="android:windowBackground">@color/light_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_black_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_black_24dp</item>
+        <item name="audio">@drawable/ic_headset_black_24dp</item>
+        <item name="download">@drawable/ic_file_download_black_24dp</item>
+        <item name="share">@drawable/ic_share_black</item>
+        <item name="cast">@drawable/ic_cast_black_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_white_24dp</item>
+    </style>
+
+
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_white_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_white_24dp</item>
+        <item name="audio">@drawable/ic_headset_white_24dp</item>
+        <item name="download">@drawable/ic_file_download_white_24dp</item>
+        <item name="share">@drawable/ic_share_white_24dp</item>
+        <item name="cast">@drawable/ic_cast_white_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -76,6 +102,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="DarkTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

app/src/main/res/xml/settings.xml

@@ -43,8 +43,7 @@
         android:key="@string/settings_category_appearance"
         android:title="@string/settings_category_appearance_title"
         android:textAllCaps="true">
-
-        <!-- Not yet working.
+.
         <ListPreference
             android:key="@string/theme_key"
             android:title="@string/theme_title"
@@ -52,7 +51,6 @@
             android:entries="@array/theme_description_list"
             android:entryValues="@array/theme_list"
             android:defaultValue="@string/default_theme_value"/>
-            -->
 
         <CheckBoxPreference
             android:key="@string/show_play_with_kodi_key"