Resolve conflicts: Some refactors on media activities.

2 files changed, 21 insertions, 73 deletions

diff --git a/app/src/main/res/layout/activity_view_gif.xml b/app/src/main/res/layout/activity_view_gif.xml
deleted file mode 100644
index a09b4a4e..00000000
--- a/app/src/main/res/layout/activity_view_gif.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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"
-    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:keepScreenOn="true"
-    app:dragUpEnabled="true"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewGIFActivity">
-
-    <androidx.core.widget.NestedScrollView
-        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_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"
-                    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_image.xml b/app/src/main/res/layout/activity_view_image_or_gif.xml
index 9a80a732..019bbc7b 100644
--- a/app/src/main/res/layout/activity_view_image.xml
+++ b/app/src/main/res/layout/activity_view_image_or_gif.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.thefuntasty.hauler.HaulerView
-    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:id="@+id/hauler_view_view_image_or_gif_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:dragUpEnabled="true"
@@ -19,21 +18,27 @@
             android:layout_height="match_parent">
 
             <ProgressBar
-                android:id="@+id/progress_bar_view_image_activity"
+                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.alexvasilkov.gestures.views.GestureImageView
-                android:id="@+id/image_view_view_image_activity"
+            <com.alexvasilkov.gestures.views.GestureFrameLayout
+                android:id="@+id/gesture_layout_view_image_or_gif_activity"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                app:gest_fillViewport="true" />
+                android:layout_height="match_parent">
+
+                <pl.droidsonroids.gif.GifImageView
+                    android:id="@+id/image_view_view_image_or_gif_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitCenter"
+                    app:gest_fillViewport="true" />
+            </com.alexvasilkov.gestures.views.GestureFrameLayout>
 
             <LinearLayout
-                android:id="@+id/load_image_error_linear_layout_view_image_activity"
+                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">
@@ -41,13 +46,13 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_error_outline_white_24dp"
                     android:layout_gravity="center"
+                    android:drawableTop="@drawable/ic_error_outline_white_24dp"
+                    android:fontFamily="?attr/font_family"
                     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" />
+                    android:textColor="@android:color/white"
+                    android:textSize="?attr/font_default" />
 
             </LinearLayout>
 
@@ -55,4 +60,4 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</com.thefuntasty.hauler.HaulerView>
\ No newline at end of file
+</com.thefuntasty.hauler.HaulerView>