From e5d9f93e96a0876676a75e31ebea29e4071c580a Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 4 Jun 2020 20:06:01 +0800
Subject: Swipe up or down to finish ViewImgurMediaActivity. Using Hauler to do
 swipe up or down to finish ViewImageActivity, ViewGIFActivity and
 ViewVideoActivity. Fixed gifs downloaded as jpg.

---
 app/src/main/res/layout/activity_view_gif.xml      | 70 +++++++++++++---------
 app/src/main/res/layout/activity_view_image.xml    | 70 +++++++++++++---------
 .../main/res/layout/activity_view_imgur_media.xml  | 70 +++++++++++++---------
 app/src/main/res/layout/activity_view_video.xml    | 40 +++++++++----
 4 files changed, 154 insertions(+), 96 deletions(-)

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

diff --git a/app/src/main/res/layout/activity_view_gif.xml b/app/src/main/res/layout/activity_view_gif.xml
index cce51370..695ebc95 100644
--- a/app/src/main/res/layout/activity_view_gif.xml
+++ b/app/src/main/res/layout/activity_view_gif.xml
@@ -1,42 +1,56 @@
 <?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_gif_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/parent_relative_layout_view_gif_activity"
-    android:background="#000000"
     android:keepScreenOn="true"
+    app:dragUpEnabled="true"
     tools:application="ml.docilealligator.infinityforreddit.Activity.ViewGIFActivity">
 
-    <ProgressBar
-        android:id="@+id/progress_bar_view_gif_activity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-    <pl.droidsonroids.gif.GifImageView
-        android:id="@+id/image_view_view_gif_activity"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:gest_fillViewport="true" />
+        android:fillViewport="true">
 
-    <LinearLayout
-        android:id="@+id/load_image_error_linear_layout_view_gif_activity"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-        <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_gif_tap_to_retry"
-            android:textSize="?attr/font_default" />
+            android:layout_height="match_parent">
+
+            <ProgressBar
+                android:id="@+id/progress_bar_view_gif_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true" />
+
+            <pl.droidsonroids.gif.GifImageView
+                android:id="@+id/image_view_view_gif_activity"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:gest_fillViewport="true" />
+
+            <LinearLayout
+                android:id="@+id/load_image_error_linear_layout_view_gif_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_gif_tap_to_retry"
+                    android:textSize="?attr/font_default" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
 
-    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
-</RelativeLayout>
+</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_image.xml b/app/src/main/res/layout/activity_view_image.xml
index 8486d543..3b1b2e8c 100644
--- a/app/src/main/res/layout/activity_view_image.xml
+++ b/app/src/main/res/layout/activity_view_image.xml
@@ -1,41 +1,55 @@
 <?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_image_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/parent_relative_layout_view_image_activity"
-    android:background="@android:color/black"
+    app:dragUpEnabled="true"
     tools:application="ml.docilealligator.infinityforreddit.Activity.ViewImageActivity">
 
-    <ProgressBar
-        android:id="@+id/progress_bar_view_image_activity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-    <com.alexvasilkov.gestures.views.GestureImageView
-        android:id="@+id/image_view_view_image_activity"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:gest_fillViewport="true" />
+        android:fillViewport="true">
 
-    <LinearLayout
-        android:id="@+id/load_image_error_linear_layout_view_image_activity"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-        <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:layout_height="match_parent">
+
+            <ProgressBar
+                android:id="@+id/progress_bar_view_image_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true" />
+
+            <com.alexvasilkov.gestures.views.GestureImageView
+                android:id="@+id/image_view_view_image_activity"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:gest_fillViewport="true" />
+
+            <LinearLayout
+                android:id="@+id/load_image_error_linear_layout_view_image_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" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
 
-    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
-</RelativeLayout>
+</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
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 96936001..e6d6e67c 100644
--- a/app/src/main/res/layout/activity_view_imgur_media.xml
+++ b/app/src/main/res/layout/activity_view_imgur_media.xml
@@ -1,37 +1,53 @@
 <?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">
+    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
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/view_pager_view_imgur_media_activity"
-        tools:context=".Activity.ViewImgurMediaActivity" />
+        android:fillViewport="true">
 
-    <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
+        <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: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" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
 
-    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
-</RelativeLayout>
\ No newline at end of file
+</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 7d94d800..2907fd4d 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -1,25 +1,39 @@
 <?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_video_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
-    android:id="@+id/relative_layout_view_video_activity"
     android:keepScreenOn="true"
+    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_centerInParent="true"
-        android:visibility="gone" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-</RelativeLayout>
+            <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_centerInParent="true"
+                android:visibility="gone" />
+
+        </RelativeLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
-- 
cgit v1.2.3