Replace Hauler with Slidr to avoid weird behaviour in SubsamplingScaleImageView.

3 files changed, 72 insertions, 115 deletions

diff --git a/app/src/main/res/layout/activity_view_image_or_gif.xml b/app/src/main/res/layout/activity_view_image_or_gif.xml
index 250c5077..21dd1f4b 100644
--- a/app/src/main/res/layout/activity_view_image_or_gif.xml
+++ b/app/src/main/res/layout/activity_view_image_or_gif.xml
@@ -1,57 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.thefuntasty.hauler.HaulerView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_or_gif_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:dragUpEnabled="true"
+    android:background="@android:color/black"
     tools:application="ml.docilealligator.infinityforreddit.Activity.ViewImageActivity">
 
-    <androidx.core.widget.NestedScrollView
+    <ProgressBar
+        android:id="@+id/progress_bar_view_image_or_gif_activity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
+
+    <com.github.piasy.biv.view.BigImageView
+        android:id="@+id/image_view_view_image_or_gif_activity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ProgressBar
-                android:id="@+id/progress_bar_view_image_or_gif_activity"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true" />
-
-            <com.github.piasy.biv.view.BigImageView
-                android:id="@+id/image_view_view_image_or_gif_activity"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:optimizeDisplay="true"
-                app:tapToRetry="false"
-                app:initScaleType="centerInside" />
-
-            <LinearLayout
-                android:id="@+id/load_image_error_linear_layout_view_image_or_gif_activity"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone">
+        app:optimizeDisplay="true"
+        app:tapToRetry="false"
+        app:initScaleType="centerInside" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:drawableTop="@drawable/ic_error_outline_white_24dp"
-                    android:fontFamily="?attr/font_family"
-                    android:gravity="center"
-                    android:text="@string/error_loading_image_tap_to_retry"
-                    android:textColor="@android:color/white"
-                    android:textSize="?attr/font_default" />
-
-            </LinearLayout>
-
-        </RelativeLayout>
-
-    </androidx.core.widget.NestedScrollView>
+    <LinearLayout
+        android:id="@+id/load_image_error_linear_layout_view_image_or_gif_activity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
 
-</com.thefuntasty.hauler.HaulerView>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:drawableTop="@drawable/ic_error_outline_white_24dp"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:text="@string/error_loading_image_tap_to_retry"
+            android:textColor="@android:color/white"
+            android:textSize="?attr/font_default" />
+
+    </LinearLayout>
+
+</RelativeLayout>
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 8e17ae8b..60122cfa 100644
--- a/app/src/main/res/layout/activity_view_imgur_media.xml
+++ b/app/src/main/res/layout/activity_view_imgur_media.xml
@@ -1,54 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.thefuntasty.hauler.HaulerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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">
 
-    <androidx.core.widget.NestedScrollView
+    <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:fillViewport="true">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            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">
+        android:id="@+id/view_pager_view_imgur_media_activity" />
 
-                <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>
+    <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">
 
-</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
+        <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>
\ 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 1d18f2ab..240f165b 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -1,40 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.thefuntasty.hauler.HaulerView
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     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"
-    app:dragUpEnabled="true"
+    android:id="@+id/coordinator_layout_view_video_activity"
     tools:application="ml.docilealligator.infinityforreddit.Activity.ViewVideoActivity">
 
-    <androidx.core.widget.NestedScrollView
+    <com.google.android.exoplayer2.ui.PlayerView
+        android:id="@+id/player_view_view_video_activity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true">
+        app:controller_layout_id="@layout/exo_playback_control_view"/>
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinator_layout_view_video_activity"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+    <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" />
 
-            <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
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file