From 49c2c7a7467a1202760b9763e5fcbb1fb1d982a3 Mon Sep 17 00:00:00 2001
From: Hermes Junior <ohermesjunior@gmail.com>
Date: Mon, 15 Jun 2020 23:47:51 +0200
Subject: Fix branch rebase.

---
 .../infinityforreddit/Activity/ViewImageOrGifActivity.java         | 2 +-
 app/src/main/res/layout/activity_view_image_or_gif.xml             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
index e10e49a3..03deb8ff 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
@@ -142,7 +142,7 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
             mImageUrl = intent.getStringExtra(IMAGE_URL_KEY);
         }
         mImageFileName = intent.getStringExtra(FILE_NAME_KEY);
-        postTitle = intent.getStringExtra(POST_TITLE_KEY);
+        String postTitle = intent.getStringExtra(POST_TITLE_KEY);
 
         if (postTitle != null) {
             setTitle(Html.fromHtml(String.format("<small>%s</small>", postTitle)));
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 50bfffca..019bbc7b 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
@@ -26,15 +26,14 @@
             <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>
 
-- 
cgit v1.2.3