From 4a299920dc10d35cd1292b93b26f619d39bfa16e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 3 Jan 2017 14:05:10 +0100
Subject: add overlay to indicate that image is gif

---
 .../conversations/persistance/FileBackend.java     | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'src/main/java/eu')

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 642df769..1cc70d5a 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -9,6 +9,8 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
@@ -412,7 +414,8 @@ public class FileBackend {
 					return thumbnail;
 				}
 				DownloadableFile file = getFile(message);
-				if (file.getMimeType().startsWith("video/")) {
+				final String mime = file.getMimeType();
+				if (mime.startsWith("video/")) {
 					thumbnail = getVideoPreview(file, size);
 				} else {
 					Bitmap fullsize = getFullsizeImagePreview(file, size);
@@ -421,6 +424,12 @@ public class FileBackend {
 					}
 					thumbnail = resize(fullsize, size);
 					thumbnail = rotate(thumbnail, getRotation(file));
+					if (mime.equals("image/gif")) {
+						Bitmap withGifOverlay = thumbnail.copy(Bitmap.Config.ARGB_8888,true);
+						drawOverlay(withGifOverlay,R.drawable.play_gif,1.0f);
+						thumbnail.recycle();
+						thumbnail = withGifOverlay;
+					}
 				}
 				this.mXmppConnectionService.getBitmapCache().put(uuid, thumbnail);
 			}
@@ -439,6 +448,21 @@ public class FileBackend {
 		}
 	}
 
+	private void drawOverlay(Bitmap bitmap, int resource, float factor) {
+		Bitmap overlay = BitmapFactory.decodeResource(mXmppConnectionService.getResources(), resource);
+		Canvas canvas = new Canvas(bitmap);
+		Paint paint = new Paint();
+		paint.setAntiAlias(true);
+		paint.setFilterBitmap(true);
+		paint.setDither(true);
+		float targetSize = Math.min(canvas.getWidth(),canvas.getHeight()) * factor;
+		Log.d(Config.LOGTAG,"target size overlay: "+targetSize+" overlay bitmap size was "+overlay.getHeight());
+		float left = (canvas.getWidth() - targetSize) / 2.0f;
+		float top = (canvas.getHeight() - targetSize) / 2.0f;
+		RectF dst = new RectF(left,top,left+targetSize-1,top+targetSize-1);
+		canvas.drawBitmap(overlay,null,dst,paint);
+	}
+
 	private Bitmap getVideoPreview(File file, int size) {
 		MediaMetadataRetriever metadataRetriever = new MediaMetadataRetriever();
 		Bitmap frame;
@@ -451,11 +475,7 @@ public class FileBackend {
 			frame = Bitmap.createBitmap(size,size, Bitmap.Config.ARGB_8888);
 			frame.eraseColor(0xff000000);
 		}
-		Canvas canvas = new Canvas(frame);
-		Bitmap play = BitmapFactory.decodeResource(mXmppConnectionService.getResources(), R.drawable.play_video);
-		float x = (frame.getWidth() - play.getWidth()) / 2.0f;
-		float y = (frame.getHeight() - play.getHeight()) / 2.0f;
-		canvas.drawBitmap(play,x,y,null);
+		drawOverlay(frame,R.drawable.play_video,0.75f);
 		return frame;
 	}
 
-- 
cgit v1.2.3