mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Revert "play gif files in fullscreen view"

Browse source 
This reverts commit 7034697cb6.
This commit is contained in:
Christian Schneppe 2017-01-18 21:14:17 +01:00
parent cb6451b4f7
commit d0ce93b684
2 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -62,7 +62,6 @@ dependencies {
compile 'pub.devrel:easypermissions:0.1.9'
compile 'com.wefika:flowlayout:0.4.1'
compile 'com.googlecode.ez-vcard:ez-vcard:0.10.0'
compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.3'
}
ext {
@ -82,7 +81,7 @@ android {
versionCode 182
//versionName "1.15.4"
versionName "1.15.5 beta (2017-01-15)"
versionName "1.15.5 beta (2017-01-09)"
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"

40
src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
View file

@ -33,7 +33,6 @@ import de.pixart.messenger.R;
import de.pixart.messenger.persistance.FileBackend;
import de.pixart.messenger.services.XmppConnectionService;
import de.pixart.messenger.utils.ExifHelper;
import pl.droidsonroids.gif.GifDrawable;
import uk.co.senab.photoview.PhotoView;
import uk.co.senab.photoview.PhotoViewAttacher;
@ -143,7 +142,6 @@ public class ShowFullscreenMessageActivity extends Activity {
width = options.outWidth;
rotation = getRotation(Uri.parse("file://" + file.getAbsolutePath()));
Log.d(Config.LOGTAG, "Image height: " + height + ", width: " + width + ", rotation: " + rotation);
mImage.setVisibility(View.VISIBLE);
if (width > height) {
if (rotation == 0 || rotation == 180) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
@ -173,29 +171,21 @@ public class ShowFullscreenMessageActivity extends Activity {
}
}
}
if (getMimeType(file.toString()) != null && getMimeType(file.toString()).endsWith("/gif")) {
try {
GifDrawable gifDrawable = new GifDrawable(file);
mImage.setImageDrawable(gifDrawable);
} catch (IOException e) {
e.printStackTrace();
}
} else {
final PhotoViewAttacher mAttacher = new PhotoViewAttacher(mImage);
try {
Glide.with(this)
.load(file)
.asBitmap()
.into(new BitmapImageViewTarget(mImage) {
@Override
public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
super.onResourceReady(resource, glideAnimation);
mAttacher.update();
}
});
} catch (Exception e) {
e.printStackTrace();
}
final PhotoViewAttacher mAttacher = new PhotoViewAttacher(mImage);
mImage.setVisibility(View.VISIBLE);
try {
Glide.with(this)
.load(file)
.asBitmap()
.into(new BitmapImageViewTarget(mImage) {
@Override
public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
super.onResourceReady(resource, glideAnimation);
mAttacher.update();
}
});
} catch (Exception e) {
e.printStackTrace();
}
}