From 26a8bd147bf02f4e84da9e561fcf9bd1216c012e Mon Sep 17 00:00:00 2001
From: Avently <7953703+avently@users.noreply.github.com>
Date: Thu, 1 Oct 2020 03:10:51 +0300
Subject: [PATCH] Now player's overlays are aware of insets

---
 .../newpipe/player/VideoPlayerImpl.java       |  14 ++
 app/src/main/res/layout-large-land/player.xml | 202 +++++++++---------
 app/src/main/res/layout/player.xml            | 202 +++++++++---------
 3 files changed, 222 insertions(+), 196 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index f93df4d08..31c401089 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -172,6 +172,8 @@ public class VideoPlayerImpl extends VideoPlayer
     private RecyclerView itemsList;
     private ItemTouchHelper itemTouchHelper;
 
+    private RelativeLayout playerOverlays;
+
     private boolean queueVisible;
     private MainPlayer.PlayerType playerType = MainPlayer.PlayerType.VIDEO;
 
@@ -305,6 +307,8 @@ public class VideoPlayerImpl extends VideoPlayer
         this.itemsListCloseButton = view.findViewById(R.id.playQueueClose);
         this.itemsList = view.findViewById(R.id.playQueue);
 
+        this.playerOverlays = view.findViewById(R.id.player_overlays);
+
         closingOverlayView = view.findViewById(R.id.closingOverlay);
 
         titleTextView.setSelected(true);
@@ -481,6 +485,16 @@ public class VideoPlayerImpl extends VideoPlayer
                 return windowInsets;
             });
         }
+
+        // PlaybackControlRoot already consumed window insets but we should pass them to
+        // player_overlays too. Without it they will be off-centered
+        getControlsRoot().addOnLayoutChangeListener((v, left, top, right, bottom,
+                                                     oldLeft, oldTop, oldRight, oldBottom) ->
+                playerOverlays.setPadding(
+                        v.getPaddingLeft(),
+                        v.getPaddingTop(),
+                        v.getPaddingRight(),
+                        v.getPaddingBottom()));
     }
 
     public boolean onKeyDown(final int keyCode) {
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 7e27765a0..c3f2e640c 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -530,117 +530,123 @@
 
     </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/controlAnimationView"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:background="@drawable/background_oval_black_transparent"
-            android:padding="15dp"
-            android:visibility="gone"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_fast_rewind_white_24dp"
-            tools:visibility="visible" />
-    </LinearLayout>
-
-
     <RelativeLayout
-        android:id="@+id/loading_panel"
+        android:id="@+id/player_overlays"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black"
-        tools:visibility="gone">
+        android:layout_height="match_parent">
 
-        <ProgressBar
-            android:id="@+id/progressBarLoadingPanel"
-            style="?android:attr/progressBarStyleLargeInverse"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:indeterminate="true"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        tools:ignore="RtlHardcoded">
-
-        <RelativeLayout
-            android:id="@+id/volumeRelativeLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/background_oval_black_transparent"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <ProgressBar
-                android:id="@+id/volumeProgressBar"
-                style="?android:progressBarStyleHorizontal"
-                android:layout_width="128dp"
-                android:layout_height="128dp"
-                android:indeterminate="false"
-                android:progressDrawable="@drawable/progress_circular_white" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/volumeImageView"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:layout_centerInParent="true"
+                android:id="@+id/controlAnimationView"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:background="@drawable/background_oval_black_transparent"
+                android:padding="15dp"
+                android:visibility="gone"
                 tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_volume_up_white_24dp" />
+                tools:src="@drawable/ic_fast_rewind_white_24dp"
+                tools:visibility="visible" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/loading_panel"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            tools:visibility="gone">
+
+            <ProgressBar
+                android:id="@+id/progressBarLoadingPanel"
+                style="?android:attr/progressBarStyleLargeInverse"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:indeterminate="true" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/brightnessRelativeLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/background_oval_black_transparent"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            tools:ignore="RtlHardcoded">
 
-            <ProgressBar
-                android:id="@+id/brightnessProgressBar"
-                style="?android:progressBarStyleHorizontal"
-                android:layout_width="128dp"
-                android:layout_height="128dp"
-                android:indeterminate="false"
-                android:progressDrawable="@drawable/progress_circular_white" />
-
-            <ImageView
-                android:id="@+id/brightnessImageView"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
+            <RelativeLayout
+                android:id="@+id/volumeRelativeLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_brightness_high_white_24dp" />
+                android:background="@drawable/background_oval_black_transparent"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ProgressBar
+                    android:id="@+id/volumeProgressBar"
+                    style="?android:progressBarStyleHorizontal"
+                    android:layout_width="128dp"
+                    android:layout_height="128dp"
+                    android:indeterminate="false"
+                    android:progressDrawable="@drawable/progress_circular_white" />
+
+                <ImageView
+                    android:id="@+id/volumeImageView"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_centerInParent="true"
+                    tools:ignore="ContentDescription"
+                    tools:src="@drawable/ic_volume_up_white_24dp" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/brightnessRelativeLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:background="@drawable/background_oval_black_transparent"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ProgressBar
+                    android:id="@+id/brightnessProgressBar"
+                    style="?android:progressBarStyleHorizontal"
+                    android:layout_width="128dp"
+                    android:layout_height="128dp"
+                    android:indeterminate="false"
+                    android:progressDrawable="@drawable/progress_circular_white" />
+
+                <ImageView
+                    android:id="@+id/brightnessImageView"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_centerInParent="true"
+                    tools:ignore="ContentDescription"
+                    tools:src="@drawable/ic_brightness_high_white_24dp" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/currentDisplaySeek"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginBottom="58dp"
+                android:background="#64000000"
+                android:paddingBottom="10dp"
+                android:paddingLeft="30dp"
+                android:paddingRight="30dp"
+                android:paddingTop="10dp"
+                android:textColor="@android:color/white"
+                android:textSize="26sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:ignore="RtlHardcoded"
+                tools:text="1:06:29"
+                tools:visibility="visible" />
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/currentDisplaySeek"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="58dp"
-            android:background="#64000000"
-            android:paddingBottom="10dp"
-            android:paddingLeft="30dp"
-            android:paddingRight="30dp"
-            android:paddingTop="10dp"
-            android:textColor="@android:color/white"
-            android:textSize="26sp"
-            android:textStyle="bold"
-            android:visibility="gone"
-            tools:ignore="RtlHardcoded"
-            tools:text="1:06:29"
-            tools:visibility="visible" />
     </RelativeLayout>
 
     <TextView
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 1a819d655..a2886ef35 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -526,117 +526,123 @@
 
     </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/controlAnimationView"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:padding="15dp"
-            android:background="@drawable/background_oval_black_transparent"
-            android:visibility="gone"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_fast_rewind_white_24dp"
-            tools:visibility="visible" />
-    </LinearLayout>
-
-
     <RelativeLayout
-        android:id="@+id/loading_panel"
+        android:id="@+id/player_overlays"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black"
-        tools:visibility="gone">
+        android:layout_height="match_parent">
 
-        <ProgressBar
-            android:id="@+id/progressBarLoadingPanel"
-            style="?android:attr/progressBarStyleLargeInverse"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:indeterminate="true"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        tools:ignore="RtlHardcoded">
-
-        <RelativeLayout
-            android:id="@+id/volumeRelativeLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/background_oval_black_transparent"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <ProgressBar
-                android:id="@+id/volumeProgressBar"
-                style="?android:progressBarStyleHorizontal"
-                android:layout_width="128dp"
-                android:layout_height="128dp"
-                android:indeterminate="false"
-                android:progressDrawable="@drawable/progress_circular_white" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/volumeImageView"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:layout_centerInParent="true"
+                android:id="@+id/controlAnimationView"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:padding="15dp"
+                android:background="@drawable/background_oval_black_transparent"
+                android:visibility="gone"
                 tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_volume_up_white_24dp" />
+                tools:src="@drawable/ic_fast_rewind_white_24dp"
+                tools:visibility="visible" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/loading_panel"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            tools:visibility="gone">
+
+            <ProgressBar
+                android:id="@+id/progressBarLoadingPanel"
+                style="?android:attr/progressBarStyleLargeInverse"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:indeterminate="true" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/brightnessRelativeLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/background_oval_black_transparent"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            tools:ignore="RtlHardcoded">
 
-            <ProgressBar
-                android:id="@+id/brightnessProgressBar"
-                style="?android:progressBarStyleHorizontal"
-                android:layout_width="128dp"
-                android:layout_height="128dp"
-                android:indeterminate="false"
-                android:progressDrawable="@drawable/progress_circular_white" />
-
-            <ImageView
-                android:id="@+id/brightnessImageView"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
+            <RelativeLayout
+                android:id="@+id/volumeRelativeLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_brightness_high_white_24dp" />
+                android:background="@drawable/background_oval_black_transparent"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ProgressBar
+                    android:id="@+id/volumeProgressBar"
+                    style="?android:progressBarStyleHorizontal"
+                    android:layout_width="128dp"
+                    android:layout_height="128dp"
+                    android:indeterminate="false"
+                    android:progressDrawable="@drawable/progress_circular_white" />
+
+                <ImageView
+                    android:id="@+id/volumeImageView"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_centerInParent="true"
+                    tools:ignore="ContentDescription"
+                    tools:src="@drawable/ic_volume_up_white_24dp" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/brightnessRelativeLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:background="@drawable/background_oval_black_transparent"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ProgressBar
+                    android:id="@+id/brightnessProgressBar"
+                    style="?android:progressBarStyleHorizontal"
+                    android:layout_width="128dp"
+                    android:layout_height="128dp"
+                    android:indeterminate="false"
+                    android:progressDrawable="@drawable/progress_circular_white" />
+
+                <ImageView
+                    android:id="@+id/brightnessImageView"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_centerInParent="true"
+                    tools:ignore="ContentDescription"
+                    tools:src="@drawable/ic_brightness_high_white_24dp" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/currentDisplaySeek"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginBottom="58dp"
+                android:background="#64000000"
+                android:paddingBottom="10dp"
+                android:paddingLeft="30dp"
+                android:paddingRight="30dp"
+                android:paddingTop="10dp"
+                android:textColor="@android:color/white"
+                android:textSize="26sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:ignore="RtlHardcoded"
+                tools:text="1:06:29"
+                tools:visibility="visible" />
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/currentDisplaySeek"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="58dp"
-            android:background="#64000000"
-            android:paddingBottom="10dp"
-            android:paddingLeft="30dp"
-            android:paddingRight="30dp"
-            android:paddingTop="10dp"
-            android:textColor="@android:color/white"
-            android:textSize="26sp"
-            android:textStyle="bold"
-            android:visibility="gone"
-            tools:ignore="RtlHardcoded"
-            tools:text="1:06:29"
-            tools:visibility="visible" />
     </RelativeLayout>
 
     <TextView