From 2d69170f4f6bd54efc472462d47f10988942bcba Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 15 Jul 2020 11:51:29 +0800
Subject: Add an option to ignore nav bar in ViewVideoActivity and
 ViewImgurVideoFragment. Use Hauler to do drag up or down to finish Activity
 in ViewVideoActivity and ViewImgurMediaActivity.

---
 .../main/res/layout/activity_view_imgur_media.xml  | 71 +++++++++++++---------
 app/src/main/res/layout/activity_view_video.xml    | 39 ++++++++----
 2 files changed, 70 insertions(+), 40 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_view_imgur_media.xml b/app/src/main/res/layout/activity_view_imgur_media.xml
index 60122cfa..8e17ae8b 100644
--- a/app/src/main/res/layout/activity_view_imgur_media.xml
+++ b/app/src/main/res/layout/activity_view_imgur_media.xml
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.thefuntasty.hauler.HaulerView 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/hauler_view_view_imgur_media_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:dragUpEnabled="true"
     tools:context=".Activity.ViewImgurMediaActivity">
 
-    <ProgressBar
-        android:id="@+id/progress_bar_view_imgur_media_activity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-    <androidx.viewpager.widget.ViewPager
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/view_pager_view_imgur_media_activity" />
-
-    <LinearLayout
-        android:id="@+id/load_image_error_linear_layout_view_imgur_media_activity"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone">
+        android:fillViewport="true">
 
-        <TextView
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_error_outline_white_24dp"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textColor="@android:color/white"
-            android:text="@string/error_loading_image_tap_to_retry"
-            android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+            android:layout_height="match_parent">
+
+            <ProgressBar
+                android:id="@+id/progress_bar_view_imgur_media_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view_pager_view_imgur_media_activity" />
+
+            <LinearLayout
+                android:id="@+id/load_image_error_linear_layout_view_imgur_media_activity"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_error_outline_white_24dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textColor="@android:color/white"
+                    android:text="@string/error_loading_image_tap_to_retry"
+                    android:textSize="?attr/font_default"
+                    android:fontFamily="?attr/font_family" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index 240f165b..1d18f2ab 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -1,25 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<com.thefuntasty.hauler.HaulerView
     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/hauler_view_view_video_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    android:id="@+id/coordinator_layout_view_video_activity"
+    app:dragUpEnabled="true"
     tools:application="ml.docilealligator.infinityforreddit.Activity.ViewVideoActivity">
 
-    <com.google.android.exoplayer2.ui.PlayerView
-        android:id="@+id/player_view_view_video_activity"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:controller_layout_id="@layout/exo_playback_control_view"/>
+        android:fillViewport="true">
 
-    <ProgressBar
-        android:id="@+id/progress_bar_view_video_activity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/coordinator_layout_view_video_activity"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+            <com.google.android.exoplayer2.ui.PlayerView
+                android:id="@+id/player_view_view_video_activity"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:controller_layout_id="@layout/exo_playback_control_view"/>
+
+            <ProgressBar
+                android:id="@+id/progress_bar_view_video_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone" />
+
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
-- 
cgit v1.2.3