~singpolyma/cheogram-android

e02aaed7d23d176d95bdcc6ed20653ab286c441d — Daniel Gultsch 2 years ago c9f1bdc
call SVGs 'vector graphic' instead of 'image'
M src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java => src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java +2 -0
@@ 92,6 92,8 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
                attr = R.attr.media_preview_document;
            } else if (mime.equals("application/gpx+xml")) {
                attr = R.attr.media_preview_tour;
            } else if (mime.startsWith("image/")) {
                attr = R.attr.media_preview_image;
            } else {
                attr = R.attr.media_preview_unknown;
            }

M src/main/java/eu/siacs/conversations/utils/UIHelper.java => src/main/java/eu/siacs/conversations/utils/UIHelper.java +3 -4
@@ 475,9 475,6 @@ public class UIHelper {
    }

    public static String getFileDescriptionString(final Context context, final Message message) {
        if (message.getType() == Message.TYPE_IMAGE) {
            return context.getString(R.string.image);
        }
        final String mime = message.getMimeType();
        if (mime == null) {
            return context.getString(R.string.file);


@@ 487,7 484,9 @@ public class UIHelper {
            return context.getString(R.string.video);
        } else if (mime.equals("image/gif")) {
            return context.getString(R.string.gif);
        } else if (mime.startsWith("image/")) {
        } else if (mime.equals("image/svg+xml")) {
            return context.getString(R.string.vector_graphic);
        } else if (mime.startsWith("image/") || message.getType() == Message.TYPE_IMAGE) {
            return context.getString(R.string.image);
        } else if (mime.contains("pdf")) {
            return context.getString(R.string.pdf_document);

A src/main/res/drawable-hdpi/ic_image_black_48dp.png => src/main/res/drawable-hdpi/ic_image_black_48dp.png +0 -0
A src/main/res/drawable-hdpi/ic_image_white_48dp.png => src/main/res/drawable-hdpi/ic_image_white_48dp.png +0 -0
A src/main/res/drawable-mdpi/ic_image_black_48dp.png => src/main/res/drawable-mdpi/ic_image_black_48dp.png +0 -0
A src/main/res/drawable-mdpi/ic_image_white_48dp.png => src/main/res/drawable-mdpi/ic_image_white_48dp.png +0 -0
A src/main/res/drawable-xhdpi/ic_image_black_48dp.png => src/main/res/drawable-xhdpi/ic_image_black_48dp.png +0 -0
A src/main/res/drawable-xhdpi/ic_image_white_48dp.png => src/main/res/drawable-xhdpi/ic_image_white_48dp.png +0 -0
A src/main/res/drawable-xxhdpi/ic_image_black_48dp.png => src/main/res/drawable-xxhdpi/ic_image_black_48dp.png +0 -0
A src/main/res/drawable-xxhdpi/ic_image_white_48dp.png => src/main/res/drawable-xxhdpi/ic_image_white_48dp.png +0 -0
A src/main/res/drawable-xxxhdpi/ic_image_black_48dp.png => src/main/res/drawable-xxxhdpi/ic_image_black_48dp.png +0 -0
A src/main/res/drawable-xxxhdpi/ic_image_white_48dp.png => src/main/res/drawable-xxxhdpi/ic_image_white_48dp.png +0 -0
M src/main/res/values/attrs.xml => src/main/res/values/attrs.xml +1 -0
@@ 62,6 62,7 @@
    <attr name="icon_alpha" format="float" />
    <attr name="delete_icon_alpha" format="float" />

    <attr name="media_preview_image" format="reference" />
    <attr name="media_preview_document" format="reference" />
    <attr name="media_preview_recording" format="reference" />
    <attr name="media_preview_audio" format="reference" />

M src/main/res/values/strings.xml => src/main/res/values/strings.xml +1 -0
@@ 412,6 412,7 @@
    <string name="audio">audio</string>
    <string name="video">video</string>
    <string name="image">image</string>
    <string name="vector_graphic">vector graphic</string>
    <string name="pdf_document">PDF document</string>
    <string name="apk">Android App</string>
    <string name="vcard">Contact</string>

M src/main/res/values/themes.xml => src/main/res/values/themes.xml +4 -4
@@ 80,8 80,8 @@
        <item name="dialog_horizontal_padding">24dp</item>
        <item name="dialog_vertical_padding">16dp</item>

        <item name="media_preview_document" type="reference">@drawable/ic_description_black_48dp
        </item>
        <item name="media_preview_image" type="reference">@drawable/ic_image_black_48dp</item>
        <item name="media_preview_document" type="reference">@drawable/ic_description_black_48dp</item>
        <item name="media_preview_recording" type="reference">@drawable/ic_mic_black_48dp</item>
        <item name="media_preview_audio" type="reference">@drawable/ic_headset_black_48dp</item>
        <item name="media_preview_location" type="reference">@drawable/ic_room_black_48dp</item>


@@ 236,8 236,8 @@
        <item name="dialog_horizontal_padding">24dp</item>
        <item name="dialog_vertical_padding">16dp</item>

        <item name="media_preview_document" type="reference">@drawable/ic_description_white_48dp
        </item>
        <item name="media_preview_image" type="reference">@drawable/ic_image_white_48dp</item>
        <item name="media_preview_document" type="reference">@drawable/ic_description_white_48dp</item>
        <item name="media_preview_recording" type="reference">@drawable/ic_mic_white_48dp</item>
        <item name="media_preview_audio" type="reference">@drawable/ic_headset_white_48dp</item>
        <item name="media_preview_location" type="reference">@drawable/ic_room_white_48dp</item>