aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorHermes Junior <ohermesjunior@gmail.com>2020-06-15 21:47:51 +0000
committerOHermesJunior <ohermesjunior@gmail.com>2020-06-15 21:47:51 +0000
commit49c2c7a7467a1202760b9763e5fcbb1fb1d982a3 (patch)
treed209b07495dff4558b62c8d3cdee914d113c2bbf /app
parent0d818c02e90782cc3228c88290699041efd425b4 (diff)
downloadinfinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.tar
infinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.tar.gz
infinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.tar.bz2
infinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.tar.lz
infinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.tar.xz
infinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.tar.zst
infinity-for-reddit-49c2c7a7467a1202760b9763e5fcbb1fb1d982a3.zip
Fix branch rebase.
Diffstat (limited to '')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java2
-rw-r--r--app/src/main/res/layout/activity_view_image_or_gif.xml7
2 files changed, 4 insertions, 5 deletions
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>