From 2e2dbaf77f6f5a207034de0fc4ca768985f82967 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Tue, 8 Jun 2021 21:33:44 +0200
Subject: [PATCH] Added seekbar-preview to the player layout

---
 app/src/main/res/layout-large-land/player.xml | 79 ++++++++++++-------
 app/src/main/res/layout/player.xml            | 79 ++++++++++++-------
 2 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index e3377f831..ba7b4a033 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -103,8 +103,8 @@
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_close"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                     <LinearLayout
@@ -189,8 +189,8 @@
                         android:paddingBottom="3dp"
                         android:scaleType="fitCenter"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_list"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded"
                         tools:visibility="visible" />
 
@@ -208,8 +208,8 @@
                         android:paddingBottom="3dp"
                         android:scaleType="fitCenter"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_format_list_numbered"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded"
                         tools:visibility="visible" />
 
@@ -222,8 +222,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_expand_more"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                 </LinearLayout>
@@ -287,8 +287,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_cast"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -302,8 +302,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_language"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -317,8 +317,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_share"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -331,8 +331,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_volume_off"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -345,8 +345,8 @@
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitCenter"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_fullscreen"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded"
                         tools:visibility="visible" />
 
@@ -354,6 +354,49 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/bottomSeekbarPreviewLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/bottomControls"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/seekbarPreviewContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/currentSeekbarPreviewThumbnail"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="3dp"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/dummy_thumbnail"
+                        tools:visibility="visible" />
+
+                    <TextView
+                        android:id="@+id/currentDisplaySeek"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="#60000000"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:paddingBottom="2dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="1:06:29"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/bottomControls"
                 android:layout_width="match_parent"
@@ -685,24 +728,6 @@
                     tools:src="@drawable/ic_brightness_high" />
             </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:paddingLeft="30dp"
-                android:paddingTop="10dp"
-                android:paddingRight="30dp"
-                android:paddingBottom="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>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 3614d1fbb..9e859fcd5 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -101,8 +101,8 @@
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_close"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                     <LinearLayout
@@ -191,8 +191,8 @@
                         android:paddingBottom="3dp"
                         android:scaleType="fitCenter"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_list"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -209,8 +209,8 @@
                         android:paddingBottom="3dp"
                         android:scaleType="fitCenter"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_format_list_numbered"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -222,8 +222,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_expand_more"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
                 </LinearLayout>
@@ -286,8 +286,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_cast"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -301,8 +301,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_language"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -316,8 +316,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_share"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -330,8 +330,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_volume_off"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -344,8 +344,8 @@
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitCenter"
                         android:visibility="gone"
-                        app:tint="@color/white"
                         app:srcCompat="@drawable/ic_fullscreen"
+                        app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded"
                         tools:visibility="visible" />
 
@@ -353,6 +353,49 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/bottomSeekbarPreviewLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/bottomControls"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/seekbarPreviewContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/currentSeekbarPreviewThumbnail"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="3dp"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/dummy_thumbnail"
+                        tools:visibility="visible" />
+
+                    <TextView
+                        android:id="@+id/currentDisplaySeek"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="#60000000"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:paddingBottom="2dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="1:06:29"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/bottomControls"
                 android:layout_width="match_parent"
@@ -681,24 +724,6 @@
                     tools:src="@drawable/ic_brightness" />
             </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:paddingLeft="30dp"
-                android:paddingTop="10dp"
-                android:paddingRight="30dp"
-                android:paddingBottom="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>
 
     </RelativeLayout>