Changed video control UI.

5 files changed, 69 insertions, 48 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
index 5072d96c..9d4e4366 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
@@ -29,7 +29,6 @@ import android.view.MenuItem;
 import android.view.OrientationEventListener;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -168,10 +167,12 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     BottomAppBar bottomAppBar;
     @BindView(R.id.title_text_view_exo_playback_control_view)
     TextView titleTextView;
+    @BindView(R.id.back_button_exo_playback_control_view)
+    MaterialButton backButton;
     @BindView(R.id.download_image_view_exo_playback_control_view)
-    ImageView downloadImageView;
+    MaterialButton downloadImageView;
     @BindView(R.id.playback_speed_image_view_exo_playback_control_view)
-    ImageView playbackSpeedImageView;
+    MaterialButton playbackSpeedImageView;
     @BindView(R.id.lockable_nested_scroll_view_view_video_activity)
     LockableNestedScrollView nestedScrollView;
 
@@ -311,6 +312,10 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
         if (useBottomAppBar) {
             getSupportActionBar().hide();
             bottomAppBar.setVisibility(View.VISIBLE);
+            backButton.setOnClickListener(view -> {
+                finish();
+            });
+
             downloadImageView.setOnClickListener(view -> {
                 if (isDownloading) {
                     return;
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
new file mode 100644
index 00000000..23f6fe4d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml
index 096a6f5b..bcbfb44d 100644
--- a/app/src/main/res/layout/exo_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_playback_control_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear_layout_exo_playback_control_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,23 +8,20 @@
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
     android:paddingBottom="16dp"
-    android:background="@drawable/trending_search_title_background"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/title_text_view_exo_playback_control_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:layout_gravity="center_vertical"
-        android:gravity="center_vertical"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="#FFFFFF"
-        android:textSize="?attr/font_20"
-        android:fontFamily="?attr/font_family"
-        android:maxLines="1"
-        android:ellipsize="end" />
+        android:textSize="?attr/font_default"
+        android:fontFamily="?attr/font_family" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -41,6 +37,7 @@
             app:strokeWidth="0dp"
             app:iconSize="24dp"
             app:iconTint="@null"
+            app:backgroundTint="#22FFFFFF"
             android:visibility="gone"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -55,6 +52,7 @@
             app:icon="@drawable/ic_fast_rewind_24dp"
             app:iconSize="24dp"
             app:iconTint="@null"
+            app:backgroundTint="#22FFFFFF"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/exo_play"
@@ -69,8 +67,9 @@
             android:layout_height="wrap_content"
             app:strokeWidth="0dp"
             app:icon="@drawable/ic_play_arrow_24dp"
-            app:iconSize="24dp"
+            app:iconSize="36dp"
             app:iconTint="@null"
+            app:backgroundTint="@color/colorAccent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/exo_pause"
@@ -84,8 +83,9 @@
             android:layout_height="wrap_content"
             app:strokeWidth="0dp"
             app:icon="@drawable/ic_pause_24dp"
-            app:iconSize="24dp"
+            app:iconSize="36dp"
             app:iconTint="@null"
+            app:backgroundTint="@color/colorAccent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/exo_ffwd"
@@ -101,6 +101,7 @@
             app:icon="@drawable/ic_fast_forward_24dp"
             app:iconSize="24dp"
             app:iconTint="@null"
+            app:backgroundTint="#22FFFFFF"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -117,6 +118,7 @@
             app:icon="@drawable/ic_video_quality_24dp"
             app:iconSize="24dp"
             app:iconTint="@null"
+            app:backgroundTint="#22FFFFFF"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -128,6 +130,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -136,8 +140,6 @@
             android:layout_height="wrap_content"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
             android:includeFontPadding="false"
             android:textColor="#FFFFFF"
             android:fontFamily="?attr/font_family" />
@@ -146,18 +148,18 @@
             android:id="@id/exo_progress"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_height="26dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             app:bar_height="2dp"
-            app:scrubber_color="@color/colorAccent"
-            app:played_color="@color/colorAccent" />
+            app:scrubber_color="#FFFFFF"
+            app:played_color="#FFFFFF" />
 
         <TextView android:id="@id/exo_duration"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
             android:includeFontPadding="false"
             android:textColor="#FFFFFF"
             android:fontFamily="?attr/font_family" />
@@ -169,47 +171,56 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        app:contentInsetStart="0dp"
         android:backgroundTint="#00000000"
         app:elevation="0dp"
         android:visibility="gone"
         style="@style/Widget.MaterialComponents.BottomAppBar">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <!--<TextView
-                android:id="@+id/title_text_view_exo_playback_control_view"
-                android:layout_width="0dp"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/back_button_exo_playback_control_view"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:textColor="#FFFFFF"
-                android:textSize="?attr/font_20"
-                android:fontFamily="?attr/font_family"
-                android:maxLines="1"
-                android:ellipsize="end" />-->
-
-            <ImageView
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_arrow_back_24dp"
+                app:iconSize="24dp"
+                app:iconTint="@null"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/download_image_view_exo_playback_control_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
-                android:src="@drawable/ic_file_download_toolbar_white_24dp"
-                android:background="?attr/selectableItemBackgroundBorderless" />
-
-            <ImageView
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_file_download_toolbar_white_24dp"
+                app:iconSize="24dp"
+                app:iconTint="@null"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/playback_speed_image_view_exo_playback_control_view"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/playback_speed_image_view_exo_playback_control_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
-                android:src="@drawable/ic_playback_speed_toolbar_24dp"
-                android:background="?attr/selectableItemBackgroundBorderless" />
-
-        </LinearLayout>
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_playback_speed_toolbar_24dp"
+                app:iconSize="24dp"
+                app:iconTint="@null"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.bottomappbar.BottomAppBar>
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ab122c9c..9ad857bd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,7 +3,7 @@
     <color name="colorPrimary">#242424</color>
     <color name="colorPrimaryDark">#121212</color>
     <color name="colorAccent">#FF1868</color>
-    <color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
+    <color name="transparentActionBarAndExoPlayerControllerColor">#00000000</color>
     <color name="backgroundColor">#121212</color>
     <color name="playButtonBackgroundColor">#FFFFFF</color>
     <color name="roundedBottomSheetPrimaryBackground">#242424</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 074ab268..85e66c59 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="colorPrimary">#0336FF</color>
     <color name="colorPrimaryDark">#002BF0</color>
     <color name="colorAccent">#FF1868</color>
-    <color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
+    <color name="transparentActionBarAndExoPlayerControllerColor">#00000000</color>
     <color name="backgroundColor">#FFFFFF</color>
     <color name="playButtonBackgroundColor">#000000</color>
     <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color>