From 78b95f67eb38eff9a60ab53ca0b0b222f74784d4 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 2 Dec 2015 21:20:52 +0100
Subject: [PATCH 1/8] made content scroll over thumbnail

---
 .../newpipe/VideoItemDetailFragment.java      |  23 +++-
 .../res/layout/fragment_videoitem_detail.xml  | 128 ++++++++++--------
 app/src/main/res/values/colors.xml            |   1 +
 3 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 84009069a..7a9dc5a05 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -84,6 +84,9 @@ public class VideoItemDetailFragment extends Fragment {
     private VideoInfo currentVideoInfo = null;
     private boolean showNextVideoItem = false;
 
+
+    private View thumbnailWindow;
+
     public interface OnInvokeCreateOptionsMenuListener {
         void createOptionsMenu();
     }
@@ -202,7 +205,7 @@ public class VideoItemDetailFragment extends Fragment {
             VideoInfoItemViewCreator videoItemViewCreator =
                     new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));
 
-            ScrollView contentMainView = (ScrollView) activity.findViewById(R.id.detailMainContent);
+            RelativeLayout textContentLayout = (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
             ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar);
             TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
             TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
@@ -221,7 +224,7 @@ public class VideoItemDetailFragment extends Fragment {
             Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
             Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
 
-            contentMainView.setVisibility(View.VISIBLE);
+            textContentLayout.setVisibility(View.VISIBLE);
             progressBar.setVisibility(View.GONE);
             if(!showNextVideoItem) {
                 nextVideoRootFrame.setVisibility(View.GONE);
@@ -239,8 +242,6 @@ public class VideoItemDetailFragment extends Fragment {
                     viewCountView.setText(
                             String.format(
                                     res.getString(R.string.viewCountText), localisedViewCount));
-                    /*viewCountView.setText(localisedViewCount
-                            + " " + activity.getString(R.string.viewSufix)); */
 
 
                     thumbsUpView.setText(nf.format(info.like_count));
@@ -336,6 +337,7 @@ public class VideoItemDetailFragment extends Fragment {
         activity = (AppCompatActivity) getActivity();
         showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
                 .getBoolean(activity.getString(R.string.showNextVideo), true);
+
     }
 
     @Override
@@ -408,6 +410,19 @@ public class VideoItemDetailFragment extends Fragment {
                     activity.startActivity(intent);
                 }
             });
+
+            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+            thumbnailWindow = activity.findViewById(R.id.detailVideoThumbnailWindow);
+            thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                // This is used to synchronize the thumbnailWindow inside the ScrollView with
+                // the actual size of the thumbnail.
+                @Override
+                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                    Log.d(TAG, Integer.toString(right - left) + " : " + Integer.toString(bottom - top));
+                    RelativeLayout.LayoutParams newLayoutParams = new RelativeLayout.LayoutParams(right - left, bottom - top);
+                    thumbnailWindow.setLayoutParams(newLayoutParams);
+                }
+            });
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 02f7a0eb9..cd668ae1c 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -8,7 +8,8 @@
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail">
+    android:id="@+id/videoitem_detail"
+    android:background="@color/background_gray">
 
     <ProgressBar android:id="@+id/detailProgressBar"
         android:layout_width="wrap_content"
@@ -16,11 +17,23 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"/>
 
+    <ImageView android:id="@+id/detailThumbnailView"
+        android:contentDescription="@string/detailThumbnailViewDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerInside"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:adjustViewBounds="true"
+        android:background="@android:color/black"
+        android:src="@drawable/dummy_thumbnail"/>
+
     <ScrollView
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="invisible">
+        android:visibility="visible">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -30,25 +43,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <ImageView android:id="@+id/detailThumbnailView"
-                    android:contentDescription="@string/detailThumbnailViewDescription"
+                <View android:id="@+id/detailVideoThumbnailWindow"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="centerInside"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/dummy_thumbnail"/>
+                    android:layout_height="250dp"
+                    android:background="@android:color/transparent" />
 
-                <RelativeLayout
+                <RelativeLayout android:id="@+id/detailTextContentLayout"
+                    android:visibility="invisible"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailThumbnailView"
+                    android:layout_below="@id/detailVideoThumbnailWindow"
                     android:paddingTop="5dp"
                     android:paddingBottom="5dp"
                     android:paddingRight="5dp"
-                    android:paddingLeft="5dp">
+                    android:paddingLeft="5dp"
+                    android:background="@color/background_gray">
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -151,59 +160,57 @@
                         android:textSize="@dimen/text_video_description_size"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
+
+                    <RelativeLayout
+                        android:id="@+id/detailNextVideoRootLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:layout_below="@id/detailDescriptionView" >
+
+                        <TextView android:id="@+id/detailNextVideoTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true"
+                            android:textSize="@dimen/text_video_upload_date_size"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textColor="@android:color/black"
+                            android:text="@string/nextVideoTitle"
+                            />
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/detailNextVideoTitle"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+
+                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginRight="6dp"
+                        android:layout_below="@id/detailNextVideoRootLayout"
+                        android:text="@string/showSimilarVideosButtonText"/>
+
                 </RelativeLayout>
             </RelativeLayout>
-
-            <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="10dp"
-                android:paddingBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:layout_below="@id/detailVideoInfo" >
-
-                <TextView android:id="@+id/detailNextVideoTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_upload_date_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="@android:color/black"
-                    android:text="@string/nextVideoTitle"
-                    />
-
-                <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoTitle">
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <Button android:id="@+id/detailShowSimilarButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
-                android:layout_below="@id/detailNextVideoRootLayout"
-                android:text="@string/showSimilarVideosButtonText"/>
         </RelativeLayout>
     </ScrollView>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/playVideoButton"
+        android:visibility="visible"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
@@ -211,4 +218,5 @@
         app:backgroundTint="@color/primaryColorYoutube"
         android:src="@drawable/ic_play_arrow_black"
         android:layout_margin="20dp"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 610d00f89..da6355615 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,4 +6,5 @@
     <color name="durationBackground">#aa000000</color>
     <color name="durationText">#eeffffff</color>
     <color name="black_overlay">#66000000</color>
+    <color name="background_gray">#EEEEEE</color>
 </resources>
\ No newline at end of file

From 37d9be90958a9e37f51a6c304c2951d0cd8e3eba Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 8 Dec 2015 21:29:29 +0100
Subject: [PATCH 2/8] put fab button on top of video thumbnail

---
 app/src/main/AndroidManifest.xml              |   3 +-
 .../newpipe/VideoItemDetailFragment.java      |  56 ++-
 .../newpipe/views/DetailScrollView.java       |  56 +++
 .../drawable-nodpi/dummy_thumbnail_dark.png   | Bin 0 -> 188 bytes
 .../layout-land/fragment_videoitem_detail.xml | 214 -----------
 .../fragment_videoitem_detail.xml             | 213 -----------
 .../res/layout/fragment_videoitem_detail.xml  | 335 +++++++++---------
 app/src/main/res/values-v21/styles.xml        |   5 +
 app/src/main/res/values/styles.xml            |   4 +
 9 files changed, 279 insertions(+), 607 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java
 create mode 100644 app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png
 delete mode 100644 app/src/main/res/layout-land/fragment_videoitem_detail.xml
 delete mode 100644 app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea64136cb..d3c17455e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
         </activity>
         <activity
             android:name=".VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail" >
+            android:label="@string/title_videoitem_detail"
+            android:theme="@style/DetailViewTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 7a9dc5a05..e7e108c98 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -27,7 +28,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import android.view.MenuItem;
 
@@ -44,6 +44,7 @@ import java.util.Vector;
 import org.schabi.newpipe.services.VideoExtractor;
 import org.schabi.newpipe.services.ServiceList;
 import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.views.DetailScrollView;
 
 
 /**
@@ -84,8 +85,10 @@ public class VideoItemDetailFragment extends Fragment {
     private VideoInfo currentVideoInfo = null;
     private boolean showNextVideoItem = false;
 
-
-    private View thumbnailWindow;
+    private ImageView thumbnailView;
+    private View thumbnailWindowLayout;
+    private FloatingActionButton playVideoButton;
+    private Point initialThumbnailPos = new Point(0, 0);
 
     public interface OnInvokeCreateOptionsMenuListener {
         void createOptionsMenu();
@@ -225,6 +228,7 @@ public class VideoItemDetailFragment extends Fragment {
             Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
 
             textContentLayout.setVisibility(View.VISIBLE);
+            playVideoButton.setVisibility(View.VISIBLE);
             progressBar.setVisibility(View.GONE);
             if(!showNextVideoItem) {
                 nextVideoRootFrame.setVisibility(View.GONE);
@@ -356,8 +360,12 @@ public class VideoItemDetailFragment extends Fragment {
     @Override
     public void onActivityCreated(Bundle savedInstanceBundle) {
         super.onActivityCreated(savedInstanceBundle);
-        FloatingActionButton playVideoButton =
-                (FloatingActionButton) getActivity().findViewById(R.id.playVideoButton);
+        Activity a = getActivity();
+        playVideoButton =
+                (FloatingActionButton) a.findViewById(R.id.playVideoButton);
+        thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
+        Button backgroundButton = (Button)
+                a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
 
         // Sometimes when this fragment is not visible it still gets initiated
         // then we must not try to access objects of this fragment.
@@ -396,6 +404,13 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
+            backgroundButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    actionBarHandler.playVideo();
+                }
+            });
+
             Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
             similarVideosButton.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -411,16 +426,30 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            thumbnailWindow = activity.findViewById(R.id.detailVideoThumbnailWindow);
+            thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
             thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                // This is used to synchronize the thumbnailWindow inside the ScrollView with
-                // the actual size of the thumbnail.
+                // This is used to synchronize the thumbnailWindowButton and the playVideoButton
+                // inside the ScrollView with the actual size of the thumbnail.
                 @Override
                 public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                    Log.d(TAG, Integer.toString(right - left) + " : " + Integer.toString(bottom - top));
-                    RelativeLayout.LayoutParams newLayoutParams = new RelativeLayout.LayoutParams(right - left, bottom - top);
-                    thumbnailWindow.setLayoutParams(newLayoutParams);
+                    RelativeLayout.LayoutParams newWindowLayoutParams =
+                            (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+                    newWindowLayoutParams.height = bottom - top;
+                    thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+
+
+                    initialThumbnailPos.set(top, left);
+
+                }
+            });
+
+            DetailScrollView scrollView = (DetailScrollView) activity.findViewById(R.id.detailMainContent);
+            scrollView.setOnScrollViewListener(new DetailScrollView.OnScrollViewListener() {
+                // This is used to make the thumbnailView move half the speed than the content does
+                // while scrolling.
+                @Override
+                public void onScrollChanged(DetailScrollView v, int l, int t, int oldl, int oldt) {
+                    //Log.d(TAG, Integer.toString(l) + " : " + Integer.toString(t));
                 }
             });
         }
@@ -433,7 +462,8 @@ public class VideoItemDetailFragment extends Fragment {
         String languageKey = getContext().getString(R.string.searchLanguage);
         //i know the following line defaults languageCode to "en", but java is picky about uninitialised values
         // Schabi: well lint tels me the value is redundant. I'll suppress it for now.
-        @SuppressWarnings("UnusedAssignment") String languageCode = "en";
+        @SuppressWarnings("UnusedAssignment")
+        String languageCode = "en";
         languageCode = sp.getString(languageKey, "en");
 
         if(languageCode.length() == 2) {
diff --git a/app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java b/app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java
new file mode 100644
index 000000000..95fb42ad6
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java
@@ -0,0 +1,56 @@
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * Created by the-scrabi on 02.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DetailScrollView.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class DetailScrollView extends ScrollView {
+
+    OnScrollViewListener mOnScrollViewListener = null;
+
+    public DetailScrollView(Context context) {
+        super(context);
+    }
+
+    public DetailScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public DetailScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public interface OnScrollViewListener {
+        void onScrollChanged( DetailScrollView v, int l, int t, int oldl, int oldt );
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        mOnScrollViewListener.onScrollChanged(this, l, t, oldl, oldt);
+        super.onScrollChanged(l, t, oldl, oldt);
+    }
+
+    public void setOnScrollViewListener(OnScrollViewListener listener) {
+        mOnScrollViewListener = listener;
+    }
+}
diff --git a/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png b/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7123a6f01be7a605dc01509570eb6017caddbb32
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^?m(=;!3HGP2tA(wq}Y<Y-CY>|gW!U_%O?XxI14-?
zi-9_>gD|6$#_S59AbW|YuPgg~9u8r7h2v{Jodybddb&7<WZZjufsv7cfrClm_5bHq
z4_Ia#P}v!<mdUc{$%%=|?tL<rPzuCvmVpbyWP!p9D{CAX{rT0lqyi0P@O1TaS?83{
F1OS8VJoo?r

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout-land/fragment_videoitem_detail.xml b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
deleted file mode 100644
index 02201f9f4..000000000
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ /dev/null
@@ -1,214 +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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail">
-
-    <ProgressBar android:id="@+id/detailProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"/>
-
-    <ScrollView
-        android:id="@+id/detailMainContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout android:id="@+id/detailVideoInfo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <ImageView android:id="@+id/detailThumbnailView"
-                    android:contentDescription="@string/detailThumbnailViewDescription"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="centerInside"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/dummy_thumbnail"/>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp">
-
-                    <TextView android:id="@+id/detailVideoTitleView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:paddingBottom="5dp"
-                        android:textSize="@dimen/text_video_title_land_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <ImageView android:id="@+id/detailUploaderThumbnailView"
-                        android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:src="@drawable/buddy" />
-
-                    <TextView android:id="@+id/detailUploaderView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderThumbnailView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:textSize="@dimen/text_video_uploader_land_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailViewCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingBottom="5dp"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_views_land_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <TextView android:id="@+id/detailThumbsDownCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_like_land_size"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <ImageView android:id="@+id/detailThumbsDownImgView"
-                        android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                        android:layout_toStartOf="@id/detailThumbsDownCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:src="@drawable/thumbs_down" />
-
-                    <TextView android:id="@+id/detailThumbsUpCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                        android:layout_toStartOf="@id/detailThumbsDownImgView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:textSize="@dimen/text_video_like_land_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <ImageView android:id="@+id/detailThumbsUpImgView"
-                        android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
-                        android:layout_below="@id/detailViewCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                        android:layout_toStartOf="@id/detailThumbsUpImgView"
-                        android:src="@drawable/thumbs_up" />
-
-                    <TextView android:id="@+id/detailUploadDateView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_land_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailDescriptionView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploadDateView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_description_land_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                </RelativeLayout>
-            </RelativeLayout>
-            <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailVideoInfo" >
-
-                <TextView android:id="@+id/detailNextVideoTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="6dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="@android:color/black"
-                    android:text="@string/nextVideoTitle"
-                    />
-
-                <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoTitle">
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <Button android:id="@+id/detailShowSimilarButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
-                android:layout_below="@id/detailNextVideoRootLayout"
-                android:text="@string/showSimilarVideosButtonText"/>
-        </RelativeLayout>
-    </ScrollView>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/playVideoButton"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:backgroundTint="@color/primaryColorYoutube"
-        android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="16dip"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
deleted file mode 100644
index 9bf507fef..000000000
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ /dev/null
@@ -1,213 +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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail">
-
-    <ProgressBar android:id="@+id/detailProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"/>
-
-    <ScrollView
-        android:id="@+id/detailMainContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout android:id="@+id/detailVideoInfo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <ImageView android:id="@+id/detailThumbnailView"
-                    android:contentDescription="@string/detailThumbnailViewDescription"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="centerInside"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/dummy_thumbnail"/>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp">
-
-                    <TextView android:id="@+id/detailVideoTitleView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:paddingBottom="5dp"
-                        android:textSize="@dimen/text_video_title_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <ImageView android:id="@+id/detailUploaderThumbnailView"
-                        android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:src="@drawable/buddy" />
-
-                    <TextView android:id="@+id/detailUploaderView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderThumbnailView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:textSize="@dimen/text_video_uploader_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <TextView android:id="@+id/detailViewCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingBottom="5dp"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_views_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <TextView android:id="@+id/detailThumbsDownCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_like_sw600dp_size"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                    <ImageView android:id="@+id/detailThumbsDownImgView"
-                        android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                        android:layout_toStartOf="@id/detailThumbsDownCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:src="@drawable/thumbs_down" />
-
-                    <TextView android:id="@+id/detailThumbsUpCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                        android:layout_toStartOf="@id/detailThumbsDownImgView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:textSize="@dimen/text_video_like_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <ImageView android:id="@+id/detailThumbsUpImgView"
-                        android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
-                        android:layout_below="@id/detailViewCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                        android:layout_toStartOf="@id/detailThumbsUpImgView"
-                        android:src="@drawable/thumbs_up" />
-
-                    <TextView android:id="@+id/detailUploadDateView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailDescriptionView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploadDateView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_description_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                </RelativeLayout>
-            </RelativeLayout>
-            <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailVideoInfo" >
-
-                <TextView android:id="@+id/detailNextVideoTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="6dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="@android:color/black"
-                    android:text="@string/nextVideoTitle"
-                    />
-
-                <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoTitle">
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
-                </RelativeLayout>
-
-            </RelativeLayout>
-            <Button android:id="@+id/detailShowSimilarButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
-                android:layout_below="@id/detailNextVideoRootLayout"
-                android:text="@string/showSimilarVideosButtonText"/>
-        </RelativeLayout>
-    </ScrollView>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/playVideoButton"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:backgroundTint="@color/primaryColorYoutube"
-        android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="16dip"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index cd668ae1c..f78369e6a 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -21,15 +21,16 @@
         android:contentDescription="@string/detailThumbnailViewDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:scaleType="centerInside"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:adjustViewBounds="true"
         android:background="@android:color/black"
-        android:src="@drawable/dummy_thumbnail"/>
+        android:src="@drawable/dummy_thumbnail_dark"/>
 
-    <ScrollView
+
+    <org.schabi.newpipe.views.DetailScrollView
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -39,184 +40,186 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <RelativeLayout android:id="@+id/detailVideoInfo"
+            <RelativeLayout
+                android:id="@+id/detailVideoThumbnailWindowLayout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="250dp"
+                android:background="?attr/selectableItemBackground">
 
-                <View android:id="@+id/detailVideoThumbnailWindow"
-                    android:layout_width="match_parent"
-                    android:layout_height="250dp"
-                    android:background="@android:color/transparent" />
-
-                <RelativeLayout android:id="@+id/detailTextContentLayout"
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/playVideoButton"
                     android:visibility="invisible"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
+
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailVideoThumbnailWindow"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
+                    android:layout_centerInParent="true"
+                    app:backgroundTint="@color/primaryColorYoutube"
+                    android:src="@drawable/ic_play_arrow_black"
+                    android:layout_margin="20dp"/>
+
+                <Button
+                    android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout android:id="@+id/detailTextContentLayout"
+                android:visibility="invisible"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:paddingRight="5dp"
+                android:paddingLeft="5dp"
+                android:layout_below="@id/detailVideoThumbnailWindowLayout"
+                android:background="@color/background_gray">
+
+                <TextView android:id="@+id/detailVideoTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:paddingBottom="3dp"
+                    android:textSize="@dimen/text_video_title_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+                <ImageView android:id="@+id/detailUploaderThumbnailView"
+                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:src="@drawable/buddy" />
+
+                <TextView android:id="@+id/detailUploaderView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderThumbnailView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/text_video_uploader_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailViewCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="3dp"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/text_video_views_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailThumbsDownCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/text_video_like_size"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
-                    android:background="@color/background_gray">
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                    <TextView android:id="@+id/detailVideoTitleView"
+                <ImageView android:id="@+id/detailThumbsDownImgView"
+                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
+                    android:layout_width="30dp"
+                    android:layout_height="15dp"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                    android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:src="@drawable/thumbs_down" />
+
+                <TextView android:id="@+id/detailThumbsUpCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                    android:layout_toStartOf="@id/detailThumbsDownImgView"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:textSize="@dimen/text_video_like_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <ImageView android:id="@+id/detailThumbsUpImgView"
+                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
+                    android:layout_width="30dp"
+                    android:layout_height="15dp"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpImgView"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:src="@drawable/thumbs_up" />
+
+                <TextView android:id="@+id/detailUploadDateView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/text_video_upload_date_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailDescriptionView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploadDateView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/text_video_description_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+                <RelativeLayout
+                    android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:layout_below="@id/detailDescriptionView" >
+
+                    <TextView android:id="@+id/detailNextVideoTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:paddingBottom="3dp"
-                        android:textSize="@dimen/text_video_title_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <ImageView android:id="@+id/detailUploaderThumbnailView"
-                        android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:src="@drawable/buddy" />
-
-                    <TextView android:id="@+id/detailUploaderView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderThumbnailView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:textSize="@dimen/text_video_uploader_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailViewCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingBottom="3dp"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_views_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailThumbsDownCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_like_size"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <ImageView android:id="@+id/detailThumbsDownImgView"
-                        android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                        android:layout_width="30dp"
-                        android:layout_height="15dp"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                        android:layout_toStartOf="@id/detailThumbsDownCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:src="@drawable/thumbs_down" />
-
-                    <TextView android:id="@+id/detailThumbsUpCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                        android:layout_toStartOf="@id/detailThumbsDownImgView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:textSize="@dimen/text_video_like_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                    <ImageView android:id="@+id/detailThumbsUpImgView"
-                        android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                        android:layout_width="30dp"
-                        android:layout_height="15dp"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                        android:layout_toStartOf="@id/detailThumbsUpImgView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
-                        android:src="@drawable/thumbs_up" />
-
-                    <TextView android:id="@+id/detailUploadDateView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
                         android:textSize="@dimen/text_video_upload_date_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailDescriptionView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploadDateView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_description_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-
-                    <RelativeLayout
-                        android:id="@+id/detailNextVideoRootLayout"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="@android:color/black"
+                        android:text="@string/nextVideoTitle"
+                        />
+                    <FrameLayout
+                        android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:layout_below="@id/detailDescriptionView" >
-
-                        <TextView android:id="@+id/detailNextVideoTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true"
-                            android:textSize="@dimen/text_video_upload_date_size"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textColor="@android:color/black"
-                            android:text="@string/nextVideoTitle"
-                            />
-                        <FrameLayout
-                            android:id="@+id/detailNextVideoFrame"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/detailNextVideoTitle"/>
-                        <Button
-                            android:id="@+id/detailNextVideoButton"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_alignTop="@id/detailNextVideoFrame"
-                            android:layout_alignBottom="@id/detailNextVideoFrame"
-                            android:background="?attr/selectableItemBackground"/>
-                    </RelativeLayout>
-
-                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_below="@id/detailNextVideoTitle"/>
+                    <Button
+                        android:id="@+id/detailNextVideoButton"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="6dp"
-                        android:layout_marginRight="6dp"
-                        android:layout_below="@id/detailNextVideoRootLayout"
-                        android:text="@string/showSimilarVideosButtonText"/>
-
+                        android:layout_height="match_parent"
+                        android:layout_alignTop="@id/detailNextVideoFrame"
+                        android:layout_alignBottom="@id/detailNextVideoFrame"
+                        android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
+
+                <Button android:id="@+id/detailShowSimilarButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginRight="6dp"
+                    android:layout_below="@id/detailNextVideoRootLayout"
+                    android:text="@string/showSimilarVideosButtonText"/>
             </RelativeLayout>
         </RelativeLayout>
-    </ScrollView>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/playVideoButton"
-        android:visibility="visible"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:backgroundTint="@color/primaryColorYoutube"
-        android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="20dp"/>
-
+    </org.schabi.newpipe.views.DetailScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6c4c1939d..c12040a49 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -9,6 +9,11 @@
         <item name="android:colorAccent">@color/accentColorYoutube</item>
     </style>
 
+    <style name="DetailViewTheme" parent="AppTheme" >
+        <item name="colorAccent">@color/primaryColorDarkYoutube</item>
+        <item name="android:colorAccent">@color/primaryColorDarkYoutube</item>
+    </style>
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6ca5f74d..198276f53 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,10 @@
         <item name="colorAccent">@color/accentColorYoutube</item>
     </style>
 
+    <style name="DetailViewTheme" parent="AppTheme" >
+        <item name="colorAccent">@color/primaryColorDarkYoutube</item>
+    </style>
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>

From 074963aee0e4d43f392822bbdd3237def2702cc2 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 9 Dec 2015 22:14:22 +0100
Subject: [PATCH 3/8] put progressbar on top of thumbnail and made it red

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../newpipe/VideoItemDetailFragment.java      |  11 -
 .../newpipe/views/DetailScrollView.java       |  56 -----
 .../layout-v21/fragment_videoitem_detail.xml  | 226 ++++++++++++++++++
 .../res/layout/fragment_videoitem_detail.xml  |  17 +-
 app/src/main/res/values-v21/styles.xml        |   5 -
 app/src/main/res/values/styles.xml            |   4 -
 7 files changed, 235 insertions(+), 86 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java
 create mode 100644 app/src/main/res/layout-v21/fragment_videoitem_detail.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3c17455e..6f4fd2e19 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         <activity
             android:name=".VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
-            android:theme="@style/DetailViewTheme">
+            android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index e7e108c98..354292108 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -44,7 +44,6 @@ import java.util.Vector;
 import org.schabi.newpipe.services.VideoExtractor;
 import org.schabi.newpipe.services.ServiceList;
 import org.schabi.newpipe.services.StreamingService;
-import org.schabi.newpipe.views.DetailScrollView;
 
 
 /**
@@ -442,16 +441,6 @@ public class VideoItemDetailFragment extends Fragment {
 
                 }
             });
-
-            DetailScrollView scrollView = (DetailScrollView) activity.findViewById(R.id.detailMainContent);
-            scrollView.setOnScrollViewListener(new DetailScrollView.OnScrollViewListener() {
-                // This is used to make the thumbnailView move half the speed than the content does
-                // while scrolling.
-                @Override
-                public void onScrollChanged(DetailScrollView v, int l, int t, int oldl, int oldt) {
-                    //Log.d(TAG, Integer.toString(l) + " : " + Integer.toString(t));
-                }
-            });
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java b/app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java
deleted file mode 100644
index 95fb42ad6..000000000
--- a/app/src/main/java/org/schabi/newpipe/views/DetailScrollView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.schabi.newpipe.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.ScrollView;
-
-/**
- * Created by the-scrabi on 02.12.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DetailScrollView.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class DetailScrollView extends ScrollView {
-
-    OnScrollViewListener mOnScrollViewListener = null;
-
-    public DetailScrollView(Context context) {
-        super(context);
-    }
-
-    public DetailScrollView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public DetailScrollView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public interface OnScrollViewListener {
-        void onScrollChanged( DetailScrollView v, int l, int t, int oldl, int oldt );
-    }
-
-    @Override
-    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
-        mOnScrollViewListener.onScrollChanged(this, l, t, oldl, oldt);
-        super.onScrollChanged(l, t, oldl, oldt);
-    }
-
-    public void setOnScrollViewListener(OnScrollViewListener listener) {
-        mOnScrollViewListener = listener;
-    }
-}
diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
new file mode 100644
index 000000000..04cb40c8c
--- /dev/null
+++ b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
@@ -0,0 +1,226 @@
+<?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=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
+    style="?android:attr/textAppearanceLarge"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/videoitem_detail"
+    android:background="@color/background_gray">
+
+    <ImageView android:id="@+id/detailThumbnailView"
+        android:contentDescription="@string/detailThumbnailViewDescription"
+        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"/>
+
+    <ScrollView
+        android:id="@+id/detailMainContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:id="@+id/detailVideoThumbnailWindowLayout"
+                android:layout_width="match_parent"
+                android:layout_height="250dp"
+                android:background="?attr/selectableItemBackground">
+
+                <ProgressBar android:id="@+id/detailProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:indeterminate="true"
+                    android:indeterminateTint="@color/primaryColorDarkYoutube"
+                    android:indeterminateTintMode="src_in"/>
+
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/playVideoButton"
+                    android:visibility="invisible"
+                    android:layout_width="wrap_content"
+
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    app:backgroundTint="@color/primaryColorYoutube"
+                    android:src="@drawable/ic_play_arrow_black"
+                    android:layout_margin="20dp"/>
+
+                <Button
+                    android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout android:id="@+id/detailTextContentLayout"
+                android:visibility="invisible"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:paddingRight="5dp"
+                android:paddingLeft="5dp"
+                android:layout_below="@id/detailVideoThumbnailWindowLayout"
+                android:background="@color/background_gray">
+
+                <TextView android:id="@+id/detailVideoTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:paddingBottom="3dp"
+                    android:textSize="@dimen/text_video_title_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+                <ImageView android:id="@+id/detailUploaderThumbnailView"
+                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:src="@drawable/buddy" />
+
+                <TextView android:id="@+id/detailUploaderView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderThumbnailView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/text_video_uploader_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailViewCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="3dp"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/text_video_views_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailThumbsDownCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/text_video_like_size"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <ImageView android:id="@+id/detailThumbsDownImgView"
+                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
+                    android:layout_width="30dp"
+                    android:layout_height="15dp"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                    android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:src="@drawable/thumbs_down" />
+
+                <TextView android:id="@+id/detailThumbsUpCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                    android:layout_toStartOf="@id/detailThumbsDownImgView"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:textSize="@dimen/text_video_like_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <ImageView android:id="@+id/detailThumbsUpImgView"
+                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
+                    android:layout_width="30dp"
+                    android:layout_height="15dp"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpImgView"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:src="@drawable/thumbs_up" />
+
+                <TextView android:id="@+id/detailUploadDateView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/text_video_upload_date_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailDescriptionView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploadDateView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/text_video_description_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+                <RelativeLayout
+                    android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:layout_below="@id/detailDescriptionView" >
+
+                    <TextView android:id="@+id/detailNextVideoTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:textSize="@dimen/text_video_upload_date_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="@android:color/black"
+                        android:text="@string/nextVideoTitle"
+                        />
+                    <FrameLayout
+                        android:id="@+id/detailNextVideoFrame"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVideoTitle"/>
+                    <Button
+                        android:id="@+id/detailNextVideoButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_alignTop="@id/detailNextVideoFrame"
+                        android:layout_alignBottom="@id/detailNextVideoFrame"
+                        android:background="?attr/selectableItemBackground"/>
+                </RelativeLayout>
+
+                <Button android:id="@+id/detailShowSimilarButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginRight="6dp"
+                    android:layout_below="@id/detailNextVideoRootLayout"
+                    android:text="@string/showSimilarVideosButtonText"/>
+            </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index f78369e6a..9d56b5340 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -11,12 +11,6 @@
     android:id="@+id/videoitem_detail"
     android:background="@color/background_gray">
 
-    <ProgressBar android:id="@+id/detailProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"/>
-
     <ImageView android:id="@+id/detailThumbnailView"
         android:contentDescription="@string/detailThumbnailViewDescription"
         android:layout_width="match_parent"
@@ -29,8 +23,7 @@
         android:background="@android:color/black"
         android:src="@drawable/dummy_thumbnail_dark"/>
 
-
-    <org.schabi.newpipe.views.DetailScrollView
+    <ScrollView
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -46,6 +39,12 @@
                 android:layout_height="250dp"
                 android:background="?attr/selectableItemBackground">
 
+                <ProgressBar android:id="@+id/detailProgressBar"
+                    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/playVideoButton"
                     android:visibility="invisible"
@@ -221,5 +220,5 @@
                     android:text="@string/showSimilarVideosButtonText"/>
             </RelativeLayout>
         </RelativeLayout>
-    </org.schabi.newpipe.views.DetailScrollView>
+    </ScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c12040a49..6c4c1939d 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -9,11 +9,6 @@
         <item name="android:colorAccent">@color/accentColorYoutube</item>
     </style>
 
-    <style name="DetailViewTheme" parent="AppTheme" >
-        <item name="colorAccent">@color/primaryColorDarkYoutube</item>
-        <item name="android:colorAccent">@color/primaryColorDarkYoutube</item>
-    </style>
-
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 198276f53..a6ca5f74d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,10 +8,6 @@
         <item name="colorAccent">@color/accentColorYoutube</item>
     </style>
 
-    <style name="DetailViewTheme" parent="AppTheme" >
-        <item name="colorAccent">@color/primaryColorDarkYoutube</item>
-    </style>
-
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>

From 0e892ff60e83f330ad1d9f5bce9894c1fb73a4da Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 9 Dec 2015 22:31:24 +0100
Subject: [PATCH 4/8] code_lint

---
 .../schabi/newpipe/VideoItemDetailFragment.java   |  6 +++---
 .../res/layout-v21/fragment_videoitem_detail.xml  | 15 +--------------
 .../main/res/layout/fragment_videoitem_detail.xml |  3 +--
 app/src/main/res/values-v21/styles.xml            |  1 +
 app/src/main/res/values/styles.xml                |  1 +
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 354292108..0e3867035 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -84,10 +84,9 @@ public class VideoItemDetailFragment extends Fragment {
     private VideoInfo currentVideoInfo = null;
     private boolean showNextVideoItem = false;
 
-    private ImageView thumbnailView;
     private View thumbnailWindowLayout;
     private FloatingActionButton playVideoButton;
-    private Point initialThumbnailPos = new Point(0, 0);
+    private final Point initialThumbnailPos = new Point(0, 0);
 
     public interface OnInvokeCreateOptionsMenuListener {
         void createOptionsMenu();
@@ -425,7 +424,7 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
-            thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
             thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
                 // This is used to synchronize the thumbnailWindowButton and the playVideoButton
                 // inside the ScrollView with the actual size of the thumbnail.
@@ -437,6 +436,7 @@ public class VideoItemDetailFragment extends Fragment {
                     thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
 
 
+                    //noinspection SuspiciousNameCombination
                     initialThumbnailPos.set(top, left);
 
                 }
diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
index 04cb40c8c..82c67ad4b 100644
--- a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
@@ -8,8 +8,7 @@
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail"
-    android:background="@color/background_gray">
+    android:id="@+id/videoitem_detail">
 
     <ImageView android:id="@+id/detailThumbnailView"
         android:contentDescription="@string/detailThumbnailViewDescription"
@@ -17,7 +16,6 @@
         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"
@@ -80,7 +78,6 @@
                 <TextView android:id="@+id/detailVideoTitleView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
                     android:paddingBottom="3dp"
@@ -92,7 +89,6 @@
                     android:layout_width="80dp"
                     android:layout_height="80dp"
                     android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:src="@drawable/buddy" />
 
@@ -100,7 +96,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailUploaderThumbnailView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
                     android:textSize="@dimen/text_video_uploader_size"
@@ -111,7 +106,6 @@
                     android:layout_height="wrap_content"
                     android:paddingBottom="3dp"
                     android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:textSize="@dimen/text_video_views_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -120,7 +114,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:textSize="@dimen/text_video_like_size"
                     android:paddingRight="5dp"
@@ -132,7 +125,6 @@
                     android:layout_width="30dp"
                     android:layout_height="15dp"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
                     android:layout_toStartOf="@id/detailThumbsDownCountView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
@@ -142,7 +134,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
                     android:layout_toStartOf="@id/detailThumbsDownImgView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
@@ -154,7 +145,6 @@
                     android:layout_width="30dp"
                     android:layout_height="15dp"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
                     android:layout_toStartOf="@id/detailThumbsUpImgView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
@@ -164,7 +154,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailUploaderView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textSize="@dimen/text_video_upload_date_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -173,7 +162,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailUploadDateView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textSize="@dimen/text_video_description_size"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -192,7 +180,6 @@
                     <TextView android:id="@+id/detailNextVideoTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textSize="@dimen/text_video_upload_date_size"
                         android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 9d56b5340..31f2ae0a3 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -8,8 +8,7 @@
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail"
-    android:background="@color/background_gray">
+    android:id="@+id/videoitem_detail">
 
     <ImageView android:id="@+id/detailThumbnailView"
         android:contentDescription="@string/detailThumbnailViewDescription"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6c4c1939d..aeea78616 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -7,6 +7,7 @@
         <item name="android:colorPrimaryDark">@color/primaryColorDarkYoutube</item>
         <item name="colorAccent">@color/accentColorYoutube</item>
         <item name="android:colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6ca5f74d..3acc47140 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/primaryColorYoutube</item>
         <item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
         <item name="colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >

From af1b21db23db24953ec5c75c2592ebaca2c7e351 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 9 Dec 2015 23:17:29 +0100
Subject: [PATCH 5/8] code_lint and moved on to v0.6.1

---
 app/build.gradle                                  |  4 ++--
 .../org/schabi/newpipe/PlayVideoActivity.java     |  1 -
 .../main/java/org/schabi/newpipe/VideoInfo.java   |  6 ++----
 .../schabi/newpipe/VideoInfoItemViewCreator.java  |  2 --
 .../java/org/schabi/newpipe/VideoListAdapter.java |  1 -
 .../org/schabi/newpipe/services/SearchEngine.java |  1 +
 .../org/schabi/newpipe/services/ServiceList.java  |  1 +
 .../schabi/newpipe/services/VideoExtractor.java   |  1 +
 app/src/main/res/values-de/strings.xml            |  4 ----
 app/src/main/res/values-es/strings.xml            |  4 ----
 app/src/main/res/values-fa/strings.xml            |  4 ----
 app/src/main/res/values-fr/strings.xml            |  4 ----
 app/src/main/res/values-hu/strings.xml            |  4 ----
 app/src/main/res/values-ja/strings.xml            |  9 +--------
 app/src/main/res/values-nl/strings.xml            |  4 ----
 app/src/main/res/values-pl/strings.xml            |  8 +-------
 app/src/main/res/values-ru/strings.xml            |  4 ----
 app/src/main/res/values-sr/strings.xml            |  4 ----
 app/src/main/res/values/dimentxt.xml              | 15 ---------------
 19 files changed, 9 insertions(+), 72 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 324224856..7134edd1f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 6
-        versionName "0.6.0"
+        versionCode 7
+        versionName "0.6.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
index 825f69949..d5fea8c3e 100644
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -56,7 +56,6 @@ public class PlayVideoActivity extends AppCompatActivity {
     public static final String START_POSITION = "start_position";
 
     private static final long HIDING_DELAY = 3000;
-    private static final long TAB_HIDING_DELAY = 100;
 
     private String videoUrl = "";
 
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
index c7c051945..89e576aae 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -1,7 +1,5 @@
 package org.schabi.newpipe;
 
-import android.graphics.Bitmap;
-
 import org.schabi.newpipe.services.AbstractVideoInfo;
 
 import java.util.List;
@@ -27,11 +25,10 @@ import java.util.List;
  */
 
 /**Info object for opened videos, ie the video ready to play.*/
+@SuppressWarnings("ALL")
 public class VideoInfo extends AbstractVideoInfo {
-    private static final String TAG = VideoInfo.class.toString();
 
     public String uploader_thumbnail_url = "";
-    public Bitmap uploader_thumbnail = null;
     public String description = "";
     public VideoStream[] videoStreams = null;
     public AudioStream[] audioStreams = null;
@@ -89,6 +86,7 @@ public class VideoInfo extends AbstractVideoInfo {
         }
     }
 
+    @SuppressWarnings("unused")
     public static class AudioStream {
         public String url = "";
         public int format = -1;
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
index efd752788..c925a40d3 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -27,8 +27,6 @@ import android.widget.TextView;
  */
 
 class VideoInfoItemViewCreator {
-    private static final String TAG = VideoInfoItemViewCreator.class.toString();
-
     private final LayoutInflater inflater;
 
     public VideoInfoItemViewCreator(LayoutInflater inflater) {
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index 6f06430d3..b841fbf7c 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -33,7 +33,6 @@ import java.util.Vector;
  */
 
 class VideoListAdapter extends BaseAdapter {
-    private static final String TAG = VideoListAdapter.class.toString();
 
     private final Context context;
     private final VideoInfoItemViewCreator viewCreator;
diff --git a/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
index 42b0fed6c..98aa42ae5 100644
--- a/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
@@ -25,6 +25,7 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+@SuppressWarnings("ALL")
 public interface SearchEngine {
 
 
diff --git a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
index 53bba3ffb..21168badd 100644
--- a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
+++ b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
@@ -26,6 +26,7 @@ import org.schabi.newpipe.services.youtube.YoutubeService;
 
 /**Provides access to the video streaming services supported by NewPipe.
  * Currently only Youtube until the API becomes more stable.*/
+@SuppressWarnings("ALL")
 public class ServiceList {
     private static final String TAG = ServiceList.class.toString();
     private static final StreamingService[] services = {
diff --git a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
index 01ff361ef..80f06c05d 100644
--- a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
@@ -23,6 +23,7 @@ package org.schabi.newpipe.services;
 import org.schabi.newpipe.VideoInfo;
 
 /**Scrapes information from a video streaming service (eg, YouTube).*/
+@SuppressWarnings("ALL")
 public abstract class VideoExtractor {
     protected final String pageUrl;
     protected VideoInfo videoInfo;
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5d197db07..4d3a00a06 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="viewCountText">%1$s Aufrufe</string>
     <string name="uploadDateText">Hochgeladen am %1$s</string>
     <string name="noPlayerFound">Keinen Streamplayer gefunden. Vielleicht möchtest du einen installieren.</string>
     <string name="installStreamPlayer">Jetzt installieren</string>
     <string name="cancel">Abbrechen</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">In Browser öffnen</string>
     <string name="share">Teilen</string>
     <string name="download">Download</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">Mit Kodi abspielen</string>
     <string name="koreNotFound">Kore app wurde nicht gefunden. Kore wird benötigt, um Videos mit Kodi wieder zu geben.</string>
     <string name="installeKore">Kore installieren</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">Zeige \"Mit Kodi abspielen\" Option</string>
     <string name="showPlayWithKodiSummary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
     <string name="leftPlayButtonTitle">Play-Button auf der linken Seite.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 02b2e49aa..3c6d1c4b4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="viewCountText">%1$s visitas</string>
     <string name="uploadDateText">Subido el %1$s</string>
     <string name="noPlayerFound">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
     <string name="installStreamPlayer">Instalarlo</string>
     <string name="cancel">Cancelar</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Abrir en el navegador</string>
     <string name="share">Compartir</string>
     <string name="download">Descargar</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">Reproducir con Kodi</string>
     <string name="koreNotFound">Aplicación Kore no encontrada. Kore es necesario para reproducir vídeos con Kodi media center.</string>
     <string name="installeKore">Instalar Kore</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">Mostrar la opción \"Reproducir con Kodi\"</string>
     <string name="showPlayWithKodiSummary">Muestra una opción para reproducir el vídeo con Kodi media center.</string>
 <string name="leftPlayButtonTitle">Mostrar el botón de reproducir en el lado izquierdo.</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 171c95453..6bee55075 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="viewCountText">%1$s نماها</string>
     <string name="uploadDateText">بارگذاری‌شده در: %1$s</string>
     <string name="noPlayerFound">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
     <string name="installStreamPlayer">نصب کنید</string>
     <string name="cancel">انصراف</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">بازکردن در مرورگر</string>
     <string name="share">هم‌رسانی</string>
     <string name="download">بارگیری</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">پخش با Kodi</string>
     <string name="koreNotFound">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
     <string name="installeKore">نصب Kore</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">نمایش گزینه‌ی «پخش با Kodi»</string>
     <string name="showPlayWithKodiSummary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
     <string name="leftPlayButtonTitle">نمایش دکمه‌ی پخش در سمت چپ.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 682b6653f..b567a8999 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
     <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appellée à partir d\'une autre application.</string>
     <string name="cancel">Annuler</string>
     <string name="chooseBrowser">Choisir un navigateur:</string>
@@ -10,8 +9,6 @@
     <string name="downloadLocation">Emplacement des téléchargements</string>
     <string name="downloadLocationDialogTitle">Entrez l\'emplacement du téléchargement</string>
     <string name="downloadLocationSummary">Emplacement des vidéos téléchargées.</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="installStreamPlayer">Installer</string>
     <string name="installeKore">Installer Kore</string>
     <string name="koreNotFound">L\'application Kore est introuvable. Kore est nécessaire afin de lire des vidéos dans Kodi media center.</string>
@@ -28,7 +25,6 @@
     <string name="showPlayWithKodiSummary">Afficher une option pour lire la vidéo avec Kodi media center.</string>
     <string name="showPlayWithKodiTitle">Afficher l\'option \"Lire avec Kodi\"</string>
     <string name="title_activity_settings">Paramètres</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="uploadDateText">Mise en ligne le %1$s</string>
     <string name="useExternalPlayerTitle">Utiliser un lecteur externe</string>
     <string name="viewCountText">%1$s vues</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 440743000..1aca0c5ad 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="viewCountText">%1$s megtekintés</string>
     <string name="uploadDateText">Feltöltve: %1$s</string>
     <string name="noPlayerFound">Nem található lejátszó. Telepítsen egyet!</string>
     <string name="installStreamPlayer">Telepítsen egyet</string>
     <string name="cancel">Mégse</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Megnyitás böngészőben</string>
     <string name="share">Megosztás</string>
     <string name="download">Letöltés</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">Lejátszás Kodi-val</string>
     <string name="koreNotFound">A Kore alkalmazás nem található. A Kore szükséges a videók Kodi médiaközponttal való lejátszásához.</string>
     <string name="installeKore">Kore telepítése</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">\"Lejátszás Kodi-val\" opció mutatása</string>
     <string name="showPlayWithKodiSummary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
     <string name="leftPlayButtonTitle">Lejátszás gomb bal oldalon mutatása</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 56159b96f..f132e4749 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,20 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
-    <string name="nothingFound">何も見つかりません</string>
-    <string name="viewSufix">表示</string>
+<resources>
     <string name="uploadDateText">"アップロード: "%1$s</string>
     <string name="noPlayerFound">StreamPlayer が見つかりませんでした｡ｲﾝｽﾄｰﾙが必要になるかもしれません｡</string>
     <string name="installStreamPlayer">ｲﾝｽﾄｰﾙ</string>
     <string name="cancel">取り消し</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">ﾌﾞﾗｳｻﾞｰで開く</string>
     <string name="share">共有</string>
-    <string name="play">再生</string>
     <string name="download">ﾀﾞｳﾝﾛｰﾄﾞ</string>
     <string name="search">検索</string>
     <string name="settings">設定</string>
-    <string name="sendWith">送信</string>
     <string name="didYouMean">"この意味ですか: "</string>
     <string name="searchPage">"検索ﾍﾟｰｼﾞ: "</string>
     <string name="shareDialogTitle">…共有:</string>
@@ -31,7 +25,6 @@
     <string name="playWithKodiTitle">Kodi で再生</string>
     <string name="koreNotFound">Kore ｱﾌﾟﾘが見つかりません｡ Kodi ﾒﾃﾞｨｱｾﾝﾀｰで動画を再生するには､ Kore が必要です｡</string>
     <string name="installeKore">Kore をｲﾝｽﾄｰﾙ</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">\"Kodi で再生\" 設定を表示</string>
     <string name="showPlayWithKodiSummary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
     <string name="leftPlayButtonTitle">左側に再生ﾎﾞﾀﾝを表示.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 834101e85..b3bf12381 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="viewCountText">%1$s keer bekeken</string>
     <string name="uploadDateText">Geüpload op %1$s</string>
     <string name="noPlayerFound">Geen speler met streaming ondersteuning gevonden. Misschien wil je er een installeren.</string>
     <string name="installStreamPlayer">Installeer speler</string>
     <string name="cancel">Annuleer</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Open in browser</string>
     <string name="share">Deel</string>
     <string name="download">Download</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">Speel af met Kodi</string>
     <string name="koreNotFound">Kore app niet gevonden. Kore is nodig om videos op Kodi af te spelen.</string>
     <string name="installeKore">Installeer Kore</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">Toon \"Speel af met Kodi\" optie</string>
     <string name="showPlayWithKodiSummary">Toont een optie om een video op een Kodi media center af te spelen.</string>
     <string name="leftPlayButtonTitle">Afspeel knop aan de linker kant weergeven.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 08634ea9e..54a7ce0ad 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,19 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
-    <string name="nothingFound">Brak wyników</string>
-    <string name="viewSufix">wyświetleń</string>
-    <string name="uploadDatePrefix">"Opublikowany "</string>
+<resources>
     <string name="noPlayerFound">Nie znaleziono odtwarzacza strumieniowego.</string>
     <string name="installStreamPlayer">Zainstaluj</string>
     <string name="cancel">Anuluj</string>
     <string name="open_in_browser">Otwórz w przeglądarce</string>
     <string name="share">Udostępnij</string>
-    <string name="play">Odtwórz</string>
     <string name="download">Pobierz</string>
     <string name="search">Szukaj</string>
     <string name="settings">Ustawienia</string>
-    <string name="sendWith">Wyślij za pośrednictwem</string>
     <string name="didYouMean">"Czy chodziło Ci o: "</string>
     <string name="shareDialogTitle">Udostępnij za pośrednictwem:</string>
     <string name="chooseBrowser">Wybierz przeglądarkę:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 350b72c16..6b347c431 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
     <string name="viewCountText">%1$s просмотров</string>
     <string name="uploadDateText">Опубликовано: %1$s</string>
     <string name="noPlayerFound">Ни одного потокового проигрывателя не было найдено. Установить?</string>
     <string name="installStreamPlayer">Установить</string>
     <string name="cancel">Отмена</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Открыть в браузере</string>
     <string name="share">Поделиться</string>
     <string name="download">Скачать</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">Воспроизвести с помощью Kodi</string>
     <string name="koreNotFound">Приложение Kore не наидено. Чтобы проигрывать видео через Kodi media center, нужен Kore.</string>
     <string name="installeKore">Установить Kore</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">Показывать опцию \"Воспроизвести с помощью Kodi\"</string>
     <string name="showPlayWithKodiSummary">Показать опцию воспроизведения видео через Kodi media center.</string>
     <string name="leftPlayButtonTitle">Показать кнопку воспроизведения слева.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5cede012b..726ba9abe 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">Јутјуб цев</string>
-    <string name="title_videoitem_detail">Јутјуб цев</string>
     <string name="viewCountText">%1$s приказа</string>
     <string name="uploadDateText">"Отпремљен "%1$s</string>
     <string name="noPlayerFound">Нема плејера токова. Можда желите да га инсталирате.</string>
     <string name="installStreamPlayer">Инсталирај</string>
     <string name="cancel">Одустани</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Отвори у прегледачу</string>
     <string name="share">Дели</string>
     <string name="download">Преузми</string>
@@ -29,7 +26,6 @@
     <string name="playWithKodiTitle">Пусти помоћу Кодија</string>
     <string name="koreNotFound">Апликација Кор није нађена. Кор (Kore) је потребан да бисте пуштали видее у Коди медија центру.</string>
     <string name="installeKore">Инсталирај Кор</string>
-    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">Прикажи „Пусти помоћу Кодија“</string>
     <string name="showPlayWithKodiSummary">Приказ опције за пуштање видеа у Коди медија центру.</string>
     <string name="leftPlayButtonTitle">Прикажи дугме за пуштање на левој страни.</string>
diff --git a/app/src/main/res/values/dimentxt.xml b/app/src/main/res/values/dimentxt.xml
index 7d9242073..9e74b58ea 100644
--- a/app/src/main/res/values/dimentxt.xml
+++ b/app/src/main/res/values/dimentxt.xml
@@ -11,19 +11,4 @@
     <dimen name="text_video_uploader_size">14sp</dimen>
     <dimen name="text_video_upload_date_size">14sp</dimen>
     <dimen name="text_video_description_size">14sp</dimen>
-
-
-    <dimen name="text_video_title_sw600dp_size">20sp</dimen>
-    <dimen name="text_video_views_sw600dp_size">16sp</dimen>
-    <dimen name="text_video_like_sw600dp_size">14sp</dimen>
-    <dimen name="text_video_uploader_sw600dp_size">16sp</dimen>
-    <dimen name="text_video_upload_date_sw600dp_size">16sp</dimen>
-    <dimen name="text_video_description_sw600dp_size">16sp</dimen>
-
-    <dimen name="text_video_title_land_size">24sp</dimen>
-    <dimen name="text_video_views_land_size">18sp</dimen>
-    <dimen name="text_video_like_land_size">16sp</dimen>
-    <dimen name="text_video_uploader_land_size">18sp</dimen>
-    <dimen name="text_video_upload_date_land_size">18sp</dimen>
-    <dimen name="text_video_description_land_size">18sp</dimen>
 </resources>
\ No newline at end of file

From b932dbf514b5802e3b1df20afddedb267f1fcc14 Mon Sep 17 00:00:00 2001
From: halcyonest <official.halcyonest@gmail.com>
Date: Sun, 13 Dec 2015 13:40:17 +0100
Subject: [PATCH 6/8] Translated using Weblate (Korean)

Currently translated at 100% (0 of 0 strings)

Created new translation.
---
 app/src/main/res/values-ko/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/src/main/res/values-ko/strings.xml

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 30eef4db121ad151bf0d71ff54ce8a46fe318e12 Mon Sep 17 00:00:00 2001
From: halcyonest <official.halcyonest@gmail.com>
Date: Sun, 13 Dec 2015 13:51:50 +0100
Subject: [PATCH 7/8] Translated using Weblate (Korean)

Currently translated at 100.0% (47 of 47 strings)
---
 app/src/main/res/values-ko/strings.xml | 52 +++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a6b3daec9..da2e64970 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,2 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="viewCountText">시청 횟수 %1$s</string>
+    <string name="uploadDateText">%1$s에 업로드됨</string>
+    <string name="noPlayerFound">스트리밍 플레이어가 발견되지 않았습니다. 플레이어를 설치하시기 바랍니다.</string>
+    <string name="installStreamPlayer">설치</string>
+    <string name="cancel">취소</string>
+    <string name="open_in_browser">브라우저에서 열기</string>
+    <string name="share">공유</string>
+    <string name="download">다운로드</string>
+    <string name="search">검색</string>
+    <string name="settings">설정</string>
+    <string name="didYouMean">"혹시 이것을 검색하셨습니까? "</string>
+    <string name="searchPage">"검색 페이지: "</string>
+    <string name="shareDialogTitle">다음으로 공유:</string>
+    <string name="chooseBrowser">브라우저 선택:</string>
+    <string name="screenRotation">회전</string>
+    <string name="title_activity_settings">설정</string>
+    <string name="useExternalPlayerTitle">외부 플레이어 사용</string>
+    <string name="downloadLocation">다운로드 위치</string>
+    <string name="downloadLocationSummary">다운로드된 비디오가 저장될 경로를 선택하세요.</string>
+    <string name="downloadLocationDialogTitle">다운로드 경로 입력</string>
+    <string name="autoPlayThroughIntentTitle">인텐트로 경유할 경우 자동 재생</string>
+    <string name="autoPlayThroughIntentSummary">다른 앱으로부터 호출되었을 경우에 비디오를 자동으로 재생합니다.</string>
+    <string name="defaultResolutionPreferenceTitle">기본 해상도</string>
+    <string name="playWithKodiTitle">Kodi로 재생</string>
+    <string name="koreNotFound">Kore 앱이 발견되지 않았습니다. Kodi media center로 비디오를 재생하려면 Kore가 필요합니다.</string>
+    <string name="installeKore">Kore 설치</string>
+    <string name="showPlayWithKodiTitle">\"Kodi로 재생\" 옵션 표시</string>
+    <string name="showPlayWithKodiSummary">비디오를 Kodi media center를 사용해 재생하는 옵션을 표시합니다.</string>
+    <string name="leftPlayButtonTitle">재생 버튼을 왼쪽에 표시합니다.</string>
+    <string name="playAudio">오디오</string>
+    <string name="defaultAudioFormatTitle">기본 오디오 포맷</string>
+    <string name="webMAudioDescription">WebM - 무료 자유 포맷입니다</string>
+    <string name="m4aAudioDescription">m4a - 보다 나은 품질</string>
+    <string name="downloadDialogTitle">다운로드</string>
+    <string name="nextVideoTitle">다음 비디오</string>
+    <string name="showNextAndSimilarTitle">다음 및 유사한 비디오 표시</string>
+    <string name="urlNotSupportedText">지원하지 않는 URL 입니다.</string>
+    <string name="showSimilarVideosButtonText">유사한 비디오</string>
+    <string name="searchLanguageTitle">선호하는 컨텐츠 언어</string>
+    <string name="settingsCategoryVideoAudioTitle">비디오 &amp; 오디오</string>
+    <string name="settingsCategoryVideoInfoTittle">정보</string>
+    <string name="settingsCategoryEtcTitle">기타</string>
+
+    <string name="itemThumbnailViewDescription">비디오 미리보기 썸네일</string>
+    <string name="detailThumbnailViewDescription">비디오 미리보기 썸네일</string>
+    <string name="detailUploaderThumbnailViewDescription">업로더 썸네일</string>
+    <string name="detailThumbsDownImgViewDescription">싫어요</string>
+    <string name="detailThumbsUpImgViewDescription">좋아요</string>
+</resources>

From c9be1398b0892e8464796f0ee17a4a79cc57146f Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sun, 13 Dec 2015 21:13:48 +0100
Subject: [PATCH 8/8] fixed green arrow layout error

---
 app/src/main/res/layout-v21/fragment_videoitem_detail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
index 82c67ad4b..302086667 100644
--- a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
@@ -145,7 +145,7 @@
                     android:layout_width="30dp"
                     android:layout_height="15dp"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toStartOf="@id/detailThumbsUpImgView"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
                     android:src="@drawable/thumbs_up" />