Fix branch rebase.

This commit is contained in:
Hermes Junior 2020-06-15 23:47:51 +02:00 committed by OHermesJunior
parent 0d818c02e9
commit 49c2c7a746
2 changed files with 4 additions and 5 deletions

View File

@ -142,7 +142,7 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
mImageUrl = intent.getStringExtra(IMAGE_URL_KEY); mImageUrl = intent.getStringExtra(IMAGE_URL_KEY);
} }
mImageFileName = intent.getStringExtra(FILE_NAME_KEY); mImageFileName = intent.getStringExtra(FILE_NAME_KEY);
postTitle = intent.getStringExtra(POST_TITLE_KEY); String postTitle = intent.getStringExtra(POST_TITLE_KEY);
if (postTitle != null) { if (postTitle != null) {
setTitle(Html.fromHtml(String.format("<small>%s</small>", postTitle))); setTitle(Html.fromHtml(String.format("<small>%s</small>", postTitle)));

View File

@ -26,15 +26,14 @@
<com.alexvasilkov.gestures.views.GestureFrameLayout <com.alexvasilkov.gestures.views.GestureFrameLayout
android:id="@+id/gesture_layout_view_image_or_gif_activity" android:id="@+id/gesture_layout_view_image_or_gif_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:gest_fillViewport="true" />
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/image_view_view_image_or_gif_activity" android:id="@+id/image_view_view_image_or_gif_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:gest_fillViewport="true" /> app:gest_fillViewport="true" />
</com.alexvasilkov.gestures.views.GestureFrameLayout> </com.alexvasilkov.gestures.views.GestureFrameLayout>