From f9ad0f12d005ade0b82bcc436ee81c964897fb57 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 15 Dec 2015 22:53:29 +0100
Subject: [PATCH] Fixed serveral things: * ugly workaround for the
 details_view_layout problem on older devices * removed "display button on the
 left side" option since it's not nececeay anymore.

---
 .../newpipe/VideoItemDetailFragment.java      |  47 ++--
 .../layout-v18/fragment_videoitem_detail.xml  | 219 ++++++++++++++++++
 .../res/layout/fragment_videoitem_detail.xml  |  34 +--
 app/src/main/res/layout/video_item.xml        |   8 +-
 app/src/main/res/values-de/strings.xml        |   1 -
 app/src/main/res/values-es/strings.xml        |   1 -
 app/src/main/res/values-fa/strings.xml        |   1 -
 app/src/main/res/values-fr/strings.xml        |   1 -
 app/src/main/res/values-hu/strings.xml        |   1 -
 app/src/main/res/values-it/strings.xml        |   1 -
 app/src/main/res/values-ja/strings.xml        |   1 -
 app/src/main/res/values-ko/strings.xml        |   1 -
 app/src/main/res/values-nl/strings.xml        |   1 -
 app/src/main/res/values-pl/strings.xml        |   1 -
 app/src/main/res/values-ru/strings.xml        |   1 -
 app/src/main/res/values-sr/strings.xml        |   1 -
 app/src/main/res/values/colors.xml            |   1 -
 app/src/main/res/values/settings_keys.xml     |   1 -
 app/src/main/res/values/strings.xml           |   1 -
 app/src/main/res/xml/settings_screen.xml      |   5 -
 20 files changed, 260 insertions(+), 68 deletions(-)
 create mode 100644 app/src/main/res/layout-v18/fragment_videoitem_detail.xml

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index a7c80bea6..4290e5c9c 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -8,6 +8,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Point;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -379,20 +380,6 @@ public class VideoItemDetailFragment extends Fragment {
                 e.printStackTrace();
             }
 
-            if (PreferenceManager.getDefaultSharedPreferences(getActivity())
-                    .getBoolean(getString(R.string.leftHandLayout), false) && checkIfLandscape()) {
-                RelativeLayout.LayoutParams oldLayout =
-                        (RelativeLayout.LayoutParams) playVideoButton.getLayoutParams();
-                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
-                        RelativeLayout.LayoutParams.WRAP_CONTENT,
-                        RelativeLayout.LayoutParams.WRAP_CONTENT);
-                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-                layoutParams.setMargins(oldLayout.leftMargin, oldLayout.topMargin,
-                        oldLayout.rightMargin, oldLayout.bottomMargin);
-                playVideoButton.setLayoutParams(layoutParams);
-            }
-
             playVideoButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -422,22 +409,26 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
-            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.
-                @Override
-                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                    RelativeLayout.LayoutParams newWindowLayoutParams =
-                            (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
-                    newWindowLayoutParams.height = bottom - top;
-                    thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+            // todo: Fix this workaround (probably with a better design), so that older android
+            // versions don't have problems rendering the thumbnail right.
+            if(Build.VERSION.SDK_INT >= 18) {
+                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.
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        RelativeLayout.LayoutParams newWindowLayoutParams =
+                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+                        newWindowLayoutParams.height = bottom - top;
+                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
 
-                    //noinspection SuspiciousNameCombination
-                    initialThumbnailPos.set(top, left);
+                        //noinspection SuspiciousNameCombination
+                        initialThumbnailPos.set(top, left);
 
-                }
-            });
+                    }
+                });
+            }
         }
     }
 
diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
new file mode 100644
index 000000000..91cfea986
--- /dev/null
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -0,0 +1,219 @@
+<?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">
+
+    <ImageView android:id="@+id/detailThumbnailView"
+        android:contentDescription="@string/detailThumbnailViewDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        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"
+        tools:ignore="RtlHardcoded" />
+
+    <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="@dimen/video_item_detail_thumbnail_image_height"
+                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"
+                    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="@dimen/video_item_detail_play_fab_margin"/>
+
+                <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:padding="@dimen/video_item_detail_info_text_padding"
+                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:textSize="@dimen/video_item_detail_title_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailUploaderThumbnailView"
+                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+                    android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:src="@drawable/buddy"
+                    tools:ignore="RtlHardcoded" />
+
+                <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/video_item_detail_uploader_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailViewCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <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/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailThumbsDownImgView"
+                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                    android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                    android:src="@drawable/thumbs_down"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailThumbsUpImgView"
+                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
+                    android:src="@drawable/thumbs_up"
+                    tools:ignore="RtlHardcoded" />
+
+                <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/video_item_detail_upload_date_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <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/video_item_detail_description_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/video_item_detail_info_text_padding"
+                    android:layout_below="@id/detailDescriptionView" >
+
+                    <TextView android:id="@+id/detailNextVideoTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/nextVideoTitle"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
+                        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>
+                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textSize="@dimen/video_item_detail_similar_text_size"
+                        android:text="@string/showSimilarVideosButtonText"/>
+                </RelativeLayout>
+
+            </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 f9a199edd..987c416ec 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".VideoItemDetailFragment"
@@ -10,23 +10,12 @@
     android:layout_height="match_parent"
     android:id="@+id/videoitem_detail">
 
-    <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">
+        android:visibility="visible"
+        tools:ignore="UselessParent">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -35,9 +24,21 @@
             <RelativeLayout
                 android:id="@+id/detailVideoThumbnailWindowLayout"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground">
 
+                <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"/>
+
                 <ProgressBar android:id="@+id/detailProgressBar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -123,7 +124,6 @@
                     android:layout_below="@id/detailViewCountView"
                     android:layout_toLeftOf="@id/detailThumbsDownCountView"
                     android:layout_toStartOf="@id/detailThumbsDownCountView"
-                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
                     android:src="@drawable/thumbs_down" />
 
                 <TextView android:id="@+id/detailThumbsUpCountView"
@@ -205,4 +205,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index ef11a8c08..1c7caac60 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -28,7 +28,8 @@
             <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
                 android:layout_marginRight="@dimen/video_item_search_image_right_margin"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                tools:ignore="RtlHardcoded">
 
                 <ImageView android:id="@+id/itemThumbnailView"
                     android:contentDescription="@string/itemThumbnailViewDescription"
@@ -64,12 +65,13 @@
                 android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                android:layout_toRightOf="@id/itemThumbnailViewContainer">
+                android:layout_toRightOf="@id/itemThumbnailViewContainer"
+                tools:ignore="RtlHardcoded">
 
                 <TextView android:id="@+id/itemVideoTitleView"
                     android:layout_weight="1"
                     android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_height="0dp"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:textSize="@dimen/video_item_search_title_text_size"/>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4d3a00a06..d17fae7bd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -28,7 +28,6 @@
     <string name="installeKore">Kore installieren</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>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Bevorzugtes Audio Format</string>
     <string name="webMAudioDescription">WebM - freies Format</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3c6d1c4b4..bcf25e8fa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,7 +28,6 @@
     <string name="installeKore">Instalar 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>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Formato de audio por defecto</string>
     <string name="webMAudioDescription">WebM - formato libre</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6bee55075..8951a6ee4 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -28,7 +28,6 @@
     <string name="installeKore">نصب Kore</string>
     <string name="showPlayWithKodiTitle">نمایش گزینه‌ی «پخش با Kodi»</string>
     <string name="showPlayWithKodiSummary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
-    <string name="leftPlayButtonTitle">نمایش دکمه‌ی پخش در سمت چپ.</string>
     <string name="playAudio">صدا</string>
     <string name="defaultAudioFormatTitle">قالب پیش‌فرض صدا</string>
     <string name="webMAudioDescription">WebM - قالبی آزاد</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7da59e8d1..6f93c9d13 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -28,7 +28,6 @@
     <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>
-    <string name="leftPlayButtonTitle">Afficher le bouton de lecture sur la gauche.</string>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Format audio par défaut</string>
     <string name="webMAudioDescription">WebM- format libre</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1aca0c5ad..d6dc6d25f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -28,7 +28,6 @@
     <string name="installeKore">Kore telepítése</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>
     <string name="playAudio">Hang</string>
     <string name="defaultAudioFormatTitle">Alapértelmezett hang formátum</string>
     <string name="webMAudioDescription">WebM - szabad formátum</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f33518774..931afc6c2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -27,7 +27,6 @@
     <string name="installeKore">Installa Kore</string>
     <string name="showPlayWithKodiTitle">Mostra l\'opzione \"Riproduci con Kodi\"</string>
     <string name="showPlayWithKodiSummary">Mostra un opzione per riprodurre un video attraverso Kodi media center.</string>
-    <string name="leftPlayButtonTitle">Mostra pulsante di avvio sul lato sinistro.</string>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Formato audio predefinito</string>
     <string name="webMAudioDescription">WedM - formato libero</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f132e4749..dcc657eb4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -27,7 +27,6 @@
     <string name="installeKore">Kore をｲﾝｽﾄｰﾙ</string>
     <string name="showPlayWithKodiTitle">\"Kodi で再生\" 設定を表示</string>
     <string name="showPlayWithKodiSummary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
-    <string name="leftPlayButtonTitle">左側に再生ﾎﾞﾀﾝを表示.</string>
     <string name="playAudio">ｵｰﾃﾞｨｵ</string>
     <string name="defaultAudioFormatTitle">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
     <string name="webMAudioDescription">.WebM - ﾌﾘｰﾌｫｰﾏｯﾄ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index da2e64970..bdb8b1084 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -27,7 +27,6 @@
     <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>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b3bf12381..8fa79cb59 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -28,7 +28,6 @@
     <string name="installeKore">Installeer 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>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Standaard audio formaat</string>
     <string name="webMAudioDescription">Webam - open formaat</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 54a7ce0ad..46e5b3c9b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -25,7 +25,6 @@
     <string name="installeKore">Zainstaluj Kore</string>
     <string name="showPlayWithKodiTitle">Wyświetlaj opcję \"Odtwarzaj za pośrednictwem Kodi\"</string>
     <string name="showPlayWithKodiSummary">Wyświetla opcję do odtwarzania wideo przez aplikację Kodi.</string>
-    <string name="leftPlayButtonTitle">Wyświetl przycisk odtwarzania po lewej stronie.</string>
     <string name="playAudio">Dźwięk</string>
     <string name="defaultAudioFormatTitle">Domyślny format dźwięku</string>
     <string name="webMAudioDescription">WebM - otwarty format</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 798c4f09b..a2dbdd50f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -28,7 +28,6 @@
     <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>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 726ba9abe..2e72a4db5 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -28,7 +28,6 @@
     <string name="installeKore">Инсталирај Кор</string>
     <string name="showPlayWithKodiTitle">Прикажи „Пусти помоћу Кодија“</string>
     <string name="showPlayWithKodiSummary">Приказ опције за пуштање видеа у Коди медија центру.</string>
-    <string name="leftPlayButtonTitle">Прикажи дугме за пуштање на левој страни.</string>
     <string name="playAudio">Аудио</string>
     <string name="defaultAudioFormatTitle">Подразумевани формат звука</string>
     <string name="webMAudioDescription">WebM - слободни формат</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a35724980..e14ee9606 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,5 @@
     <color name="durationBackground">#a000</color>
     <color name="durationText">#efff</color>
     <color name="dark_overlay">#6000</color>
-    <color name="dark_image_background">#222</color>
     <color name="background_gray">#EEEEEE</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index f1cd7ebaf..f7c6020a6 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -17,7 +17,6 @@
     </string-array>
     <string name="defaultResolutionListItem">360p</string>
     <string name="showPlayWidthKodiPreference">show_play_with_kodi_preference</string>
-    <string name="leftHandLayout">left_hand_layout</string>
     <string name="defaultAudioFormatPreference">default_audio_format</string>
     <string-array name="audioFormatDescriptionList">
         <item>@string/webMAudioDescription</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d93baf845..c819f5ff7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,6 @@
     <string name="fdroidKoreUrl" translatable="false">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
     <string name="showPlayWithKodiTitle">Show \"Play with Kodi\" option</string>
     <string name="showPlayWithKodiSummary">Displays an option to play a video via Kodi media center.</string>
-    <string name="leftPlayButtonTitle">Show play button on the left side.</string>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Default audio format</string>
     <string name="webMAudioDescription">WebM - free format</string>
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
index 59ed1b28f..724c27e99 100644
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -37,11 +37,6 @@
             android:summary="@string/showPlayWithKodiSummary"
             android:defaultValue="false" />
 
-        <CheckBoxPreference
-            android:key="@string/leftHandLayout"
-            android:title="@string/leftPlayButtonTitle"
-            android:defaultValue="false" />
-
         <ListPreference
             android:key="@string/searchLanguage"
             android:title="@string/searchLanguageTitle"