From 237282db287249ed6fb04bf45034195884b600eb Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 26 Nov 2015 19:54:13 +0100
Subject: [PATCH] refactored VideoPlayer theme

---
 app/src/main/AndroidManifest.xml                | 2 +-
 app/src/main/res/layout/activity_play_video.xml | 1 -
 app/src/main/res/values-v21/styles.xml          | 9 +++++----
 app/src/main/res/values/styles.xml              | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 896c914b7..ea64136cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,7 +69,7 @@
         </activity>
         <activity android:name=".PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullscreenTheme"
+            android:theme="@style/VideoPlayerTheme"
             android:parentActivityName=".VideoItemDetailActivity"
             tools:ignore="UnusedAttribute">
         </activity>
diff --git a/app/src/main/res/layout/activity_play_video.xml b/app/src/main/res/layout/activity_play_video.xml
index 433930f71..017c39ca9 100644
--- a/app/src/main/res/layout/activity_play_video.xml
+++ b/app/src/main/res/layout/activity_play_video.xml
@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black"
     tools:context="org.schabi.newpipe.PlayVideoActivity"
     android:gravity="center">
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 7a7d2adb6..6c4c1939d 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -16,17 +16,18 @@
         <item name="background">@color/primaryColorYoutube</item>
     </style>
 
-    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="android:actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
-        <item name="actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
         <item name="colorAccent">@color/primaryColorYoutube</item>
         <item name="android:colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:windowBackground">@android:color/black</item>
     </style>
 
-    <style name="NewPipePlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+    <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
         <item name="android:background">@color/black_overlay</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3789b6867..e38ea093b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,16 +15,17 @@
         <item name="background">@color/primaryColorYoutube</item>
     </style>
 
-    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="PlayVideoTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="android:actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
-        <item name="actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
         <item name="colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:windowBackground">@android:color/black</item>
     </style>
 
-    <style name="NewPipePlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+    <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
         <item name="android:background">@color/black_overlay</item>