diff options
48 files changed, 96 insertions, 7 deletions
diff --git a/art/play_gif.svg b/art/play_gif.svg new file mode 100644 index 00000000..47f5cc24 --- /dev/null +++ b/art/play_gif.svg @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="play_gif.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1200" + id="namedview12" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="1.5762712" + inkscape:cy="11.084746" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <path + id="a" + d="M24 24H0V0h24v24z" /> + </defs> + <clipPath + id="b"> + <use + xlink:href="#a" + overflow="visible" + id="use8" /> + </clipPath> + <path + d="M11.5 9H13v6h-1.5zM9 9H6c-.6 0-1 .5-1 1v4c0 .5.4 1 1 1h3c.6 0 1-.5 1-1v-2H8.5v1.5h-2v-3H10V10c0-.5-.4-1-1-1zm10 1.5V9h-4.5v6H16v-2h2v-1.5h-2v-1z" + clip-path="url(#b)" + id="path10" + style="fill:#ffffff;fill-opacity:0.7019608" /> +</svg> diff --git a/art/render.rb b/art/render.rb index 93c04996..01ab3903 100755 --- a/art/render.rb +++ b/art/render.rb @@ -13,7 +13,8 @@ resolutions = { images = { 'ic_launcher.svg' => ['ic_launcher', 48], 'main_logo.svg' => ['main_logo', 200], - 'play_video.svg' => ['play_video', 96], + 'play_video.svg' => ['play_video', 128], + 'play_gif.svg' => ['play_gif', 128], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12], 'ic_send_text_offline.svg' => ['ic_send_text_offline', 36], 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; } diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png Binary files differindex 9d59123e..cc150252 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png Binary files differindex 5fd16bda..30a136ae 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png Binary files differindex f1eb95ac..e6fcdc23 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png Binary files differindex 118b532a..25d22f74 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png Binary files differindex 314436c3..3c88c1fc 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png Binary files differindex 3570a9ef..db5b1b52 100644 --- a/src/main/res/drawable-hdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png Binary files differindex 9e7319d2..413ce0e4 100644 --- a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png diff --git a/src/main/res/drawable-hdpi/play_gif.png b/src/main/res/drawable-hdpi/play_gif.png Binary files differnew file mode 100644 index 00000000..e66db187 --- /dev/null +++ b/src/main/res/drawable-hdpi/play_gif.png diff --git a/src/main/res/drawable-hdpi/play_video.png b/src/main/res/drawable-hdpi/play_video.png Binary files differindex 70831fe4..d4e6d614 100644 --- a/src/main/res/drawable-hdpi/play_video.png +++ b/src/main/res/drawable-hdpi/play_video.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png Binary files differindex bff27fee..2c59d445 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png Binary files differindex a964773e..b72240c2 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png Binary files differindex a5424c5d..053ef314 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png Binary files differindex cf57722a..3fe8bfd6 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png Binary files differindex 444d9852..617f56a6 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png Binary files differindex fafa156a..4b0027ac 100644 --- a/src/main/res/drawable-mdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png Binary files differindex 1275668c..6d38c6d6 100644 --- a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png diff --git a/src/main/res/drawable-mdpi/play_gif.png b/src/main/res/drawable-mdpi/play_gif.png Binary files differnew file mode 100644 index 00000000..bf8a2239 --- /dev/null +++ b/src/main/res/drawable-mdpi/play_gif.png diff --git a/src/main/res/drawable-mdpi/play_video.png b/src/main/res/drawable-mdpi/play_video.png Binary files differindex 96ab3988..22e8d804 100644 --- a/src/main/res/drawable-mdpi/play_video.png +++ b/src/main/res/drawable-mdpi/play_video.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png Binary files differindex 3796e964..37c6981f 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png Binary files differindex 800ea806..47b758c5 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png Binary files differindex 5fce3e04..58d0936b 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png Binary files differindex 12ecb806..79eadb49 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png Binary files differindex 016e1485..e80eab1e 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png Binary files differindex f15dbf53..7783f2d8 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png Binary files differindex c233a4ae..84931428 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png diff --git a/src/main/res/drawable-xhdpi/play_gif.png b/src/main/res/drawable-xhdpi/play_gif.png Binary files differnew file mode 100644 index 00000000..e8cd99aa --- /dev/null +++ b/src/main/res/drawable-xhdpi/play_gif.png diff --git a/src/main/res/drawable-xhdpi/play_video.png b/src/main/res/drawable-xhdpi/play_video.png Binary files differindex d4e6d614..0cc5deeb 100644 --- a/src/main/res/drawable-xhdpi/play_video.png +++ b/src/main/res/drawable-xhdpi/play_video.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png Binary files differindex 7b9fbb59..5dbb8316 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png Binary files differindex 043c84c6..44bac465 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png Binary files differindex d9e42577..e91576c0 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png Binary files differindex 652b5986..1388eac9 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png Binary files differindex e6f13f90..6f931a74 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png Binary files differindex 03ef731a..1ba9680e 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png Binary files differindex 13191905..f8e1f21e 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png diff --git a/src/main/res/drawable-xxhdpi/play_gif.png b/src/main/res/drawable-xxhdpi/play_gif.png Binary files differnew file mode 100644 index 00000000..4380dd0a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/play_gif.png diff --git a/src/main/res/drawable-xxhdpi/play_video.png b/src/main/res/drawable-xxhdpi/play_video.png Binary files differindex 562a1b62..16f4d2a1 100644 --- a/src/main/res/drawable-xxhdpi/play_video.png +++ b/src/main/res/drawable-xxhdpi/play_video.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png Binary files differindex 2a62f258..7dab83ee 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png Binary files differindex 10e742ff..e09ae72e 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png Binary files differindex 467d974b..a2359bf6 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png Binary files differindex 74a12c19..b8ba8ce4 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png Binary files differindex 3d729209..4382b320 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png Binary files differindex 698580f7..597f879f 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png Binary files differindex 3e2c9fe7..7454a931 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png diff --git a/src/main/res/drawable-xxxhdpi/play_gif.png b/src/main/res/drawable-xxxhdpi/play_gif.png Binary files differnew file mode 100644 index 00000000..e60e1806 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/play_gif.png diff --git a/src/main/res/drawable-xxxhdpi/play_video.png b/src/main/res/drawable-xxxhdpi/play_video.png Binary files differindex 16f4d2a1..76b72bed 100644 --- a/src/main/res/drawable-xxxhdpi/play_video.png +++ b/src/main/res/drawable-xxxhdpi/play_video.png |
