diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 830388429..fee7c1493 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -842,7 +842,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke case ATTACHMENT_CHOICE_CHOOSE_FILE: case ATTACHMENT_CHOICE_RECORD_VIDEO: case ATTACHMENT_CHOICE_RECORD_VOICE: - final List fileUris = Attachment.extractAttachments(getActivity(), data, Attachment.Type.FILE); + final Attachment.Type type = requestCode == ATTACHMENT_CHOICE_RECORD_VOICE ? Attachment.Type.RECORDING : Attachment.Type.FILE; + final List fileUris = Attachment.extractAttachments(getActivity(), data, type); mediaPreviewAdapter.addMediaPreviews(fileUris); toggleInputMethod(); break; @@ -850,7 +851,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke double latitude = data.getDoubleExtra("latitude", 0); double longitude = data.getDoubleExtra("longitude", 0); Uri geo = Uri.parse("geo:" + String.valueOf(latitude) + "," + String.valueOf(longitude)); - attachLocationToConversation(conversation, geo); + mediaPreviewAdapter.addMediaPreviews(Attachment.of(getActivity(), geo, Attachment.Type.LOCATION)); + toggleInputMethod(); break; case REQUEST_INVITE_TO_CONVERSATION: XmppActivity.ConferenceInvite invite = XmppActivity.ConferenceInvite.parse(data); @@ -869,8 +871,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke final PresenceSelector.OnPresenceSelected callback = () -> { for (Iterator i = attachments.iterator(); i.hasNext(); i.remove()) { final Attachment attachment = i.next(); - if (attachment.getType() == Attachment.Type.IMAGE) { - Log.d(Config.LOGTAG, "ConversationsActivity.commitAttachments() - attaching image to conversations. CHOOSE_IMAGE"); + if (attachment.getType() == Attachment.Type.LOCATION) { + attachLocationToConversation(conversation, attachment.getUri()); + } else if (attachment.getType() == Attachment.Type.IMAGE) { + Log.d(Config.LOGTAG, "ConversationsActivity.commitAttachments() - attaching image to conversations. CHOOSE_IMAGE"); attachImageToConversation(conversation, attachment.getUri()); } else { Log.d(Config.LOGTAG, "ConversationsActivity.commitAttachments() - attaching file to conversations. CHOOSE_FILE/RECORD_VOICE/RECORD_VIDEO"); diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index 3c89103c3..f1957c6f2 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -58,11 +58,11 @@ import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.ui.adapter.ConversationAdapter; import eu.siacs.conversations.ui.interfaces.OnConversationArchived; import eu.siacs.conversations.ui.interfaces.OnConversationSelected; -import eu.siacs.conversations.ui.util.Color; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; import eu.siacs.conversations.ui.util.PendingActionHelper; import eu.siacs.conversations.ui.util.PendingItem; import eu.siacs.conversations.ui.util.ScrollState; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.utils.ThemeHelper; import static android.support.v7.widget.helper.ItemTouchHelper.LEFT; @@ -99,7 +99,7 @@ public class ConversationsOverviewFragment extends XmppFragment { super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); if(actionState != ItemTouchHelper.ACTION_STATE_IDLE){ Paint paint = new Paint(); - paint.setColor(Color.get(activity,R.attr.conversations_overview_background)); + paint.setColor(StyledAttributes.getColor(activity,R.attr.conversations_overview_background)); paint.setStyle(Paint.Style.FILL); c.drawRect(viewHolder.itemView.getLeft(),viewHolder.itemView.getTop() ,viewHolder.itemView.getRight(),viewHolder.itemView.getBottom(), paint); diff --git a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java index 5f1cb7854..3b337e0c2 100644 --- a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java @@ -35,7 +35,6 @@ import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; -import android.util.Log; import android.view.ContextMenu; import android.view.Menu; import android.view.MenuItem; @@ -47,21 +46,18 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.databinding.ActivitySearchBinding; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Conversational; import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.StubConversation; import eu.siacs.conversations.services.MessageSearchTask; import eu.siacs.conversations.ui.adapter.MessageAdapter; import eu.siacs.conversations.ui.interfaces.OnSearchResultsAvailable; import eu.siacs.conversations.ui.util.ChangeWatcher; -import eu.siacs.conversations.ui.util.Color; import eu.siacs.conversations.ui.util.DateSeparator; -import eu.siacs.conversations.ui.util.Drawable; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.ListViewUtils; import eu.siacs.conversations.ui.util.PendingItem; import eu.siacs.conversations.ui.util.ShareUtil; @@ -217,12 +213,12 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc private void changeBackground(boolean hasSearch, boolean hasResults) { if (hasSearch) { if (hasResults) { - binding.searchResults.setBackgroundColor(Color.get(this, R.attr.color_background_secondary)); + binding.searchResults.setBackgroundColor(StyledAttributes.getColor(this, R.attr.color_background_secondary)); } else { - binding.searchResults.setBackground(Drawable.get(this, R.attr.activity_background_no_results)); + binding.searchResults.setBackground(StyledAttributes.getDrawable(this, R.attr.activity_background_no_results)); } } else { - binding.searchResults.setBackground(Drawable.get(this, R.attr.activity_background_search)); + binding.searchResults.setBackground(StyledAttributes.getDrawable(this, R.attr.activity_background_search)); } } diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index ebdff2c00..a6ebacf47 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -38,7 +38,7 @@ import eu.siacs.conversations.crypto.OmemoSetting; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.services.ExportLogsService; import eu.siacs.conversations.services.MemorizingTrustManager; -import eu.siacs.conversations.ui.util.Color; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.utils.GeoHelper; import eu.siacs.conversations.utils.TimeframeUtils; import rocks.xmpp.addr.Jid; @@ -74,7 +74,7 @@ public class SettingsActivity extends XmppActivity implements mSettingsFragment.setActivityIntent(getIntent()); this.mTheme = findTheme(); setTheme(this.mTheme); - getWindow().getDecorView().setBackgroundColor(Color.get(this, R.attr.color_background_primary)); + getWindow().getDecorView().setBackgroundColor(StyledAttributes.getColor(this, R.attr.color_background_primary)); setSupportActionBar(findViewById(R.id.toolbar)); configureActionBar(getSupportActionBar()); } diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index 77334955e..d5dca11b5 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -25,7 +25,7 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.ui.ManageAccountActivity; import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.ui.util.Color; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.utils.UIHelper; public class AccountAdapter extends ArrayAdapter { @@ -65,14 +65,14 @@ public class AccountAdapter extends ArrayAdapter { statusView.setText(getContext().getString(account.getStatus().getReadableId())); switch (account.getStatus()) { case ONLINE: - statusView.setTextColor(Color.get(activity, R.attr.TextColorOnline)); + statusView.setTextColor(StyledAttributes.getColor(activity, R.attr.TextColorOnline)); break; case DISABLED: case CONNECTING: - statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary)); + statusView.setTextColor(StyledAttributes.getColor(activity, android.R.attr.textColorSecondary)); break; default: - statusView.setTextColor(Color.get(activity, R.attr.TextColorError)); + statusView.setTextColor(StyledAttributes.getColor(activity, R.attr.TextColorError)); break; } final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index e204b09bb..8e53caea6 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -26,9 +26,8 @@ import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.Transferable; import eu.siacs.conversations.ui.ConversationFragment; -import eu.siacs.conversations.ui.ConversationsOverviewFragment; import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.ui.util.Color; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.widget.UnreadCountCustomView; import eu.siacs.conversations.utils.EmojiWrapper; import eu.siacs.conversations.utils.IrregularUnicodeDetector; @@ -93,9 +92,9 @@ public class ConversationAdapter extends RecyclerView.Adapter { @@ -48,8 +47,29 @@ public class MediaPreviewAdapter extends RecyclerView.Adapter { int pos = mediaPreviews.indexOf(attachment); mediaPreviews.remove(pos); @@ -72,6 +92,7 @@ public class MediaPreviewAdapter extends RecyclerView.Adapter of(final Context context, Uri uri, Type type) { - final String mime = MimeUtils.guessMimeTypeFromUri(context, uri); + final String mime = type == Type.LOCATION ?null :MimeUtils.guessMimeTypeFromUri(context, uri); return Collections.singletonList(new Attachment(uri, type, mime)); } @@ -100,6 +101,10 @@ public class Attachment { return uris; } + public boolean renderThumbnail() { + return type == Type.IMAGE || (type == Type.FILE && mime != null && (mime.startsWith("video/") || mime.startsWith("image/"))); + } + public Uri getUri() { return uri; } diff --git a/src/main/java/eu/siacs/conversations/ui/util/Drawable.java b/src/main/java/eu/siacs/conversations/ui/util/Drawable.java deleted file mode 100644 index 993ef49aa..000000000 --- a/src/main/java/eu/siacs/conversations/ui/util/Drawable.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2018, Daniel Gultsch All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package eu.siacs.conversations.ui.util; - -import android.content.Context; -import android.content.res.TypedArray; -import android.support.annotation.AttrRes; - -public class Drawable { - public static android.graphics.drawable.Drawable get(Context context, @AttrRes int id) { - TypedArray typedArray = context.obtainStyledAttributes(new int[]{id}); - android.graphics.drawable.Drawable drawable = typedArray.getDrawable(0); - typedArray.recycle(); - return drawable; - } -} diff --git a/src/main/java/eu/siacs/conversations/ui/util/Color.java b/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java similarity index 75% rename from src/main/java/eu/siacs/conversations/ui/util/Color.java rename to src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java index ac3dcaf6d..2b0b3f6e3 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/Color.java +++ b/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java @@ -29,19 +29,30 @@ package eu.siacs.conversations.ui.util; - import android.content.Context; import android.content.res.TypedArray; import android.support.annotation.AttrRes; import android.support.annotation.ColorInt; -public class Color { +public class StyledAttributes { + public static android.graphics.drawable.Drawable getDrawable(Context context, @AttrRes int id) { + TypedArray typedArray = context.obtainStyledAttributes(new int[]{id}); + android.graphics.drawable.Drawable drawable = typedArray.getDrawable(0); + typedArray.recycle(); + return drawable; + } - public static @ColorInt int get(Context context, @AttrRes int attr) { + public static float getFloat(Context context, @AttrRes int id) { + TypedArray typedArray = context.obtainStyledAttributes(new int[]{id}); + float value = typedArray.getFloat(0,0f); + typedArray.recycle(); + return value; + } + + public static @ColorInt int getColor(Context context, @AttrRes int attr) { TypedArray typedArray = context.obtainStyledAttributes(new int[]{attr}); int color = typedArray.getColor(0,0); typedArray.recycle(); return color; } - } diff --git a/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java b/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java index ad1a1f8a9..42329c41a 100644 --- a/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java +++ b/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java @@ -50,7 +50,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import eu.siacs.conversations.R; -import eu.siacs.conversations.ui.util.Color; +import eu.siacs.conversations.ui.util.StyledAttributes; import rocks.xmpp.addr.Jid; public class IrregularUnicodeDetector { @@ -73,7 +73,7 @@ public class IrregularUnicodeDetector { } public static Spannable style(Context context, Jid jid) { - return style(jid, Color.get(context, R.attr.color_warning)); + return style(jid, StyledAttributes.getColor(context, R.attr.color_warning)); } private static Spannable style(Jid jid, @ColorInt int color) { diff --git a/src/main/res/drawable-hdpi/ic_description_black_48dp.png b/src/main/res/drawable-hdpi/ic_description_black_48dp.png new file mode 100644 index 000000000..dd23b93ac Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_description_black_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_description_white_48dp.png b/src/main/res/drawable-hdpi/ic_description_white_48dp.png new file mode 100644 index 000000000..9b7071b71 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_description_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_headset_black_48dp.png b/src/main/res/drawable-hdpi/ic_headset_black_48dp.png new file mode 100644 index 000000000..baf3ee295 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_headset_black_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_headset_white_48dp.png b/src/main/res/drawable-hdpi/ic_headset_white_48dp.png new file mode 100644 index 000000000..82db5427b Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_headset_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_mic_black_48dp.png b/src/main/res/drawable-hdpi/ic_mic_black_48dp.png new file mode 100644 index 000000000..ad8299e77 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_mic_black_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_mic_white_48dp.png b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png new file mode 100644 index 000000000..b0389382e Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_room_black_48dp.png b/src/main/res/drawable-hdpi/ic_room_black_48dp.png new file mode 100644 index 000000000..5a21dfae6 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_room_black_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_room_white_48dp.png b/src/main/res/drawable-hdpi/ic_room_white_48dp.png new file mode 100644 index 000000000..078b10d4f Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_room_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_description_black_48dp.png b/src/main/res/drawable-mdpi/ic_description_black_48dp.png new file mode 100644 index 000000000..8470bc03f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_description_black_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_description_white_48dp.png b/src/main/res/drawable-mdpi/ic_description_white_48dp.png new file mode 100644 index 000000000..53083487f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_description_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_headset_black_48dp.png b/src/main/res/drawable-mdpi/ic_headset_black_48dp.png new file mode 100644 index 000000000..f2664dcde Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_headset_black_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_headset_white_48dp.png b/src/main/res/drawable-mdpi/ic_headset_white_48dp.png new file mode 100644 index 000000000..d7a741b61 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_headset_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_mic_black_48dp.png b/src/main/res/drawable-mdpi/ic_mic_black_48dp.png new file mode 100644 index 000000000..cac51c37a Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_mic_black_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_mic_white_48dp.png b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png new file mode 100644 index 000000000..9f44db5d2 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_room_black_48dp.png b/src/main/res/drawable-mdpi/ic_room_black_48dp.png new file mode 100644 index 000000000..b2696b6d4 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_room_black_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_room_white_48dp.png b/src/main/res/drawable-mdpi/ic_room_white_48dp.png new file mode 100644 index 000000000..814ca8ddc Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_room_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xhdpi/ic_description_black_48dp.png new file mode 100644 index 000000000..687d5f857 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_description_black_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xhdpi/ic_description_white_48dp.png new file mode 100644 index 000000000..f89ffeb30 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_description_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png new file mode 100644 index 000000000..974457ee1 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png new file mode 100644 index 000000000..0f0b2e154 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png new file mode 100644 index 000000000..cf70b63be Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png new file mode 100644 index 000000000..2f1e60c55 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xhdpi/ic_room_black_48dp.png new file mode 100644 index 000000000..7c2217e46 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_room_black_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xhdpi/ic_room_white_48dp.png new file mode 100644 index 000000000..8bcb6f620 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_room_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png new file mode 100644 index 000000000..3d52dc2da Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png new file mode 100644 index 000000000..e84154496 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png new file mode 100644 index 000000000..bfbefd0a1 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png new file mode 100644 index 000000000..89b991047 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png new file mode 100644 index 000000000..0b214ab22 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png new file mode 100644 index 000000000..ad0460c0a Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png new file mode 100644 index 000000000..a1d6c4676 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png new file mode 100644 index 000000000..42ab08cf7 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png new file mode 100644 index 000000000..c3c2720c7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png new file mode 100644 index 000000000..2942f7ee7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png new file mode 100644 index 000000000..e5f79759d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png new file mode 100644 index 000000000..25b99ec5a Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png new file mode 100644 index 000000000..e365a0f6d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png new file mode 100644 index 000000000..89f1608b1 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png new file mode 100644 index 000000000..bfcc27a40 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png new file mode 100644 index 000000000..3baf20ac5 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png differ diff --git a/src/main/res/layout/media_preview.xml b/src/main/res/layout/media_preview.xml index ad7d5d034..07da56f4e 100644 --- a/src/main/res/layout/media_preview.xml +++ b/src/main/res/layout/media_preview.xml @@ -9,6 +9,7 @@ android:layout_height="@dimen/media_preview_size" android:background="@color/black54" android:layout_centerInParent="true" + android:scaleType="center" android:layout_margin="12dp"/> + + + + + + diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 85a30f669..47d975634 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -63,6 +63,11 @@ 24dp 16dp + @drawable/ic_description_black_48dp + @drawable/ic_mic_black_48dp + @drawable/ic_headset_black_48dp + @drawable/ic_room_black_48dp + @drawable/ic_group_add_white_24dp @drawable/ic_person_add_white_24dp @drawable/ic_cancel_black_24dp @@ -164,6 +169,11 @@ 24dp 16dp + @drawable/ic_description_white_48dp + @drawable/ic_mic_white_48dp + @drawable/ic_headset_white_48dp + @drawable/ic_room_white_48dp + @drawable/ic_group_add_white_24dp @drawable/ic_person_add_white_24dp @drawable/ic_cancel_white_24dp