From 689199a0b54471c4c0311b50197e247bc1d145ec Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 30 Jul 2015 21:38:13 +0200 Subject: [PATCH] wip --- .../datamodel/ThumbnailsCacheManager.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index ce60cfe88e..e3144a4edd 100644 --- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -379,10 +379,10 @@ public class ThumbnailsCacheManager { } public static Bitmap addVideoOverlay(Bitmap thumbnail){ - Bitmap bitmap2 = BitmapFactory.decodeResource(MainApp.getAppContext().getResources(), - R.drawable.view_play); + Bitmap playButton = BitmapFactory.decodeResource(MainApp.getAppContext().getResources(), + R.drawable.view_play); - Bitmap resized = Bitmap.createScaledBitmap(bitmap2, + Bitmap resizedPlayButton = Bitmap.createScaledBitmap(playButton, (int) (thumbnail.getWidth() * 0.6), (int) (thumbnail.getHeight() * 0.6), true); @@ -392,13 +392,29 @@ public class ThumbnailsCacheManager { Canvas c = new Canvas(resultBitmap); + // compute visual center of play button, according to resized image + int x1 = resizedPlayButton.getWidth(); + int y1 = resizedPlayButton.getHeight() / 2; + int x2 = 0; + int y2 = resizedPlayButton.getWidth(); + int x3 = 0; + int y3 = 0; + + double ym = ( ((Math.pow(x3,2) - Math.pow(x1,2) + Math.pow(y3,2) - Math.pow(y1,2)) * (x2 - x1)) - (Math.pow(x2,2) - Math.pow(x1,2) + Math.pow(y2,2) - Math.pow(y1,2)) * (x3 - x1) ) / (2 * ( ((y3 - y1) * (x2 - x1)) - ((y2 - y1) * (x3 - x1)) )); + double xm = ( (Math.pow(x2,2) - Math.pow(x1,2)) + (Math.pow(y2,2) - Math.pow(y1,2)) - (2*ym*(y2 - y1)) ) / (2*(x2 - x1)); + + // offset to top left + double ox = - xm; + double oy = thumbnail.getHeight() - ym; + + c.drawBitmap(thumbnail, 0, 0, null); Paint p = new Paint(); p.setAlpha(230); - c.drawBitmap(resized, (thumbnail.getWidth() - resized.getWidth()) / 2, - (thumbnail.getHeight() - resized.getHeight()) / 2, p); + c.drawBitmap(resizedPlayButton, (float) ((thumbnail.getWidth() / 2) - ox), + (float) ((thumbnail.getHeight() / 2) + ym), p); return resultBitmap; }