From 88a21195860bb99ab3cbc4b992b1d57bc016fcb4 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 16 Jun 2020 15:17:00 +0800
Subject: Resolve conflicts: Some refactors on media activities.

---
 app/src/main/res/layout/activity_view_gif.xml      | 57 --------------------
 app/src/main/res/layout/activity_view_image.xml    | 58 --------------------
 .../main/res/layout/activity_view_image_or_gif.xml | 63 ++++++++++++++++++++++
 app/src/main/res/menu/view_gif_activity.xml        | 17 ------
 app/src/main/res/menu/view_image_activity.xml      | 23 --------
 .../main/res/menu/view_image_or_gif_activity.xml   | 24 +++++++++
 6 files changed, 87 insertions(+), 155 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_view_gif.xml
 delete mode 100644 app/src/main/res/layout/activity_view_image.xml
 create mode 100644 app/src/main/res/layout/activity_view_image_or_gif.xml
 delete mode 100644 app/src/main/res/menu/view_gif_activity.xml
 delete mode 100644 app/src/main/res/menu/view_image_activity.xml
 create mode 100644 app/src/main/res/menu/view_image_or_gif_activity.xml

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

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.xml
deleted file mode 100644
index 9a80a732..00000000
--- a/app/src/main/res/layout/activity_view_image.xml
+++ /dev/null
@@ -1,58 +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_image_activity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:dragUpEnabled="true"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewImageActivity">
-
-    <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_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"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                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"
-                    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_or_gif.xml b/app/src/main/res/layout/activity_view_image_or_gif.xml
new file mode 100644
index 00000000..019bbc7b
--- /dev/null
+++ b/app/src/main/res/layout/activity_view_image_or_gif.xml
@@ -0,0 +1,63 @@
+<?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_image_or_gif_activity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:dragUpEnabled="true"
+    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewImageActivity">
+
+    <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_image_or_gif_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true" />
+
+            <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">
+
+                <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_or_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: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>
+
+</com.thefuntasty.hauler.HaulerView>
diff --git a/app/src/main/res/menu/view_gif_activity.xml b/app/src/main/res/menu/view_gif_activity.xml
deleted file mode 100644
index 0dc5aba5..00000000
--- a/app/src/main/res/menu/view_gif_activity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_download_view_gif_activity"
-        android:orderInCategory="1"
-        android:title="@string/action_download"
-        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_share_view_gif_activity"
-        android:orderInCategory="2"
-        android:title="@string/action_share"
-        android:icon="@drawable/ic_share_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_image_activity.xml b/app/src/main/res/menu/view_image_activity.xml
deleted file mode 100644
index 0c080ae9..00000000
--- a/app/src/main/res/menu/view_image_activity.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_download_view_image_activity"
-        android:orderInCategory="1"
-        android:title="@string/action_download"
-        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_share_view_image_activity"
-        android:orderInCategory="2"
-        android:title="@string/action_share"
-        android:icon="@drawable/ic_share_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_set_wallpaper_view_image_activity"
-        android:orderInCategory="3"
-        android:title="@string/action_set_wallpaper"
-        app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_image_or_gif_activity.xml b/app/src/main/res/menu/view_image_or_gif_activity.xml
new file mode 100644
index 00000000..682516a4
--- /dev/null
+++ b/app/src/main/res/menu/view_image_or_gif_activity.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_download_view_image_or_gif_activity"
+        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
+        android:orderInCategory="1"
+        android:title="@string/action_download"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_share_view_image_or_gif_activity"
+        android:icon="@drawable/ic_share_toolbar_white_24dp"
+        android:orderInCategory="2"
+        android:title="@string/action_share"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_set_wallpaper_view_image_or_gif_activity"
+        android:orderInCategory="3"
+        android:title="@string/action_set_wallpaper"
+        android:visible="false"
+        app:showAsAction="never" />
+</menu>
-- 
cgit v1.2.3