diff options
Diffstat (limited to 'src/main')
62 files changed, 58 insertions, 9 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index a1e2a344b..7864c9e12 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -18,6 +18,7 @@ import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.media.ExifInterface; import android.net.Uri; import android.os.Build; @@ -28,6 +29,8 @@ import android.provider.MediaStore; import android.provider.Settings; import android.support.v4.widget.SlidingPaneLayout; import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener; +import android.text.SpannableStringBuilder; +import android.text.style.ImageSpan; import android.util.Log; import android.util.Pair; import android.view.Gravity; @@ -911,6 +914,24 @@ public class ConversationActivity extends XmppActivity builder.create().show(); } + /** + * Moves icons from the PopupMenu's MenuItems' icon fields into the menu title as a Spannable with the icon and title text. + */ + public static void insertMenuItemIcons(Context context, PopupMenu popupMenu) { + Menu menu = popupMenu.getMenu(); + for (int i = 0; i < menu.size(); i++) { + MenuItem menuItem = menu.getItem(i); + Drawable icon = menuItem.getIcon(); + int iconSize = context.getResources().getDimensionPixelSize(R.dimen.menu_item_icon_size); + icon.setBounds(0, 0, iconSize, iconSize); + ImageSpan imageSpan = new ImageSpan(icon); + SpannableStringBuilder ssb = new SpannableStringBuilder(" " + menuItem.getTitle()); + ssb.setSpan(imageSpan, 0, 1, 0); + menuItem.setTitle(ssb); + menuItem.setIcon(null); + } + } + protected void attachFileDialog() { View menuAttachFile = findViewById(R.id.action_attach_file); if (menuAttachFile == null) { @@ -951,6 +972,7 @@ public class ConversationActivity extends XmppActivity return false; } }); + insertMenuItemIcons(getApplicationContext(), attachFilePopup); attachFilePopup.show(); } diff --git a/src/main/res/drawable-hdpi/ic_attach_camera.png b/src/main/res/drawable-hdpi/ic_attach_camera.png Binary files differnew file mode 100644 index 000000000..e47b10b17 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_camera.png diff --git a/src/main/res/drawable-hdpi/ic_attach_camera_white.png b/src/main/res/drawable-hdpi/ic_attach_camera_white.png Binary files differnew file mode 100644 index 000000000..e92055f6c --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_camera_white.png diff --git a/src/main/res/drawable-hdpi/ic_attach_document.png b/src/main/res/drawable-hdpi/ic_attach_document.png Binary files differnew file mode 100644 index 000000000..08bd6296b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_document.png diff --git a/src/main/res/drawable-hdpi/ic_attach_document_white.png b/src/main/res/drawable-hdpi/ic_attach_document_white.png Binary files differnew file mode 100644 index 000000000..749d0dab6 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_document_white.png diff --git a/src/main/res/drawable-hdpi/ic_attach_location.png b/src/main/res/drawable-hdpi/ic_attach_location.png Binary files differnew file mode 100644 index 000000000..b085607ca --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_location.png diff --git a/src/main/res/drawable-hdpi/ic_attach_location_white.png b/src/main/res/drawable-hdpi/ic_attach_location_white.png Binary files differnew file mode 100644 index 000000000..e354ed9c0 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_location_white.png diff --git a/src/main/res/drawable-hdpi/ic_attach_photo.png b/src/main/res/drawable-hdpi/ic_attach_photo.png Binary files differnew file mode 100644 index 000000000..c4d1cd872 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_photo.png diff --git a/src/main/res/drawable-hdpi/ic_attach_photo_white.png b/src/main/res/drawable-hdpi/ic_attach_photo_white.png Binary files differnew file mode 100644 index 000000000..c969b06b3 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_photo_white.png diff --git a/src/main/res/drawable-hdpi/ic_attach_record.png b/src/main/res/drawable-hdpi/ic_attach_record.png Binary files differnew file mode 100644 index 000000000..0cb48e90d --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_record.png diff --git a/src/main/res/drawable-hdpi/ic_attach_record_white.png b/src/main/res/drawable-hdpi/ic_attach_record_white.png Binary files differnew file mode 100644 index 000000000..b7f8f882a --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_record_white.png diff --git a/src/main/res/drawable-hdpi/ic_attach_video.png b/src/main/res/drawable-hdpi/ic_attach_video.png Binary files differnew file mode 100644 index 000000000..820d208aa --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_video.png diff --git a/src/main/res/drawable-mdpi/ic_attach_camera.png b/src/main/res/drawable-mdpi/ic_attach_camera.png Binary files differnew file mode 100644 index 000000000..6e351cbfb --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_camera.png diff --git a/src/main/res/drawable-mdpi/ic_attach_camera_white.png b/src/main/res/drawable-mdpi/ic_attach_camera_white.png Binary files differnew file mode 100644 index 000000000..588835534 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_camera_white.png diff --git a/src/main/res/drawable-mdpi/ic_attach_document.png b/src/main/res/drawable-mdpi/ic_attach_document.png Binary files differnew file mode 100644 index 000000000..623de5969 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_document.png diff --git a/src/main/res/drawable-mdpi/ic_attach_document_white.png b/src/main/res/drawable-mdpi/ic_attach_document_white.png Binary files differnew file mode 100644 index 000000000..5b607e7a9 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_document_white.png diff --git a/src/main/res/drawable-mdpi/ic_attach_location.png b/src/main/res/drawable-mdpi/ic_attach_location.png Binary files differnew file mode 100644 index 000000000..e6570e527 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_location.png diff --git a/src/main/res/drawable-mdpi/ic_attach_location_white.png b/src/main/res/drawable-mdpi/ic_attach_location_white.png Binary files differnew file mode 100644 index 000000000..df35e92a7 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_location_white.png diff --git a/src/main/res/drawable-mdpi/ic_attach_photo.png b/src/main/res/drawable-mdpi/ic_attach_photo.png Binary files differnew file mode 100644 index 000000000..fe4d3b254 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_photo.png diff --git a/src/main/res/drawable-mdpi/ic_attach_photo_white.png b/src/main/res/drawable-mdpi/ic_attach_photo_white.png Binary files differnew file mode 100644 index 000000000..a408691a4 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_photo_white.png diff --git a/src/main/res/drawable-mdpi/ic_attach_record.png b/src/main/res/drawable-mdpi/ic_attach_record.png Binary files differnew file mode 100644 index 000000000..3aab59bd0 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_record.png diff --git a/src/main/res/drawable-mdpi/ic_attach_record_white.png b/src/main/res/drawable-mdpi/ic_attach_record_white.png Binary files differnew file mode 100644 index 000000000..b814b040e --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_record_white.png diff --git a/src/main/res/drawable-mdpi/ic_attach_video.png b/src/main/res/drawable-mdpi/ic_attach_video.png Binary files differnew file mode 100644 index 000000000..36581178c --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_video.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_camera.png b/src/main/res/drawable-xhdpi/ic_attach_camera.png Binary files differnew file mode 100644 index 000000000..b548130e9 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_camera.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_camera_white.png b/src/main/res/drawable-xhdpi/ic_attach_camera_white.png Binary files differnew file mode 100644 index 000000000..6f01563b8 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_camera_white.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_document.png b/src/main/res/drawable-xhdpi/ic_attach_document.png Binary files differnew file mode 100644 index 000000000..ed9fa7b06 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_document.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_document_white.png b/src/main/res/drawable-xhdpi/ic_attach_document_white.png Binary files differnew file mode 100644 index 000000000..684005c68 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_document_white.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_location.png b/src/main/res/drawable-xhdpi/ic_attach_location.png Binary files differnew file mode 100644 index 000000000..649fefde5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_location.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_location_white.png b/src/main/res/drawable-xhdpi/ic_attach_location_white.png Binary files differnew file mode 100644 index 000000000..3a6b2f3c5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_location_white.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_photo.png b/src/main/res/drawable-xhdpi/ic_attach_photo.png Binary files differnew file mode 100644 index 000000000..d954b3e7c --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_photo.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_photo_white.png b/src/main/res/drawable-xhdpi/ic_attach_photo_white.png Binary files differnew file mode 100644 index 000000000..62a7ebb4d --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_photo_white.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_record.png b/src/main/res/drawable-xhdpi/ic_attach_record.png Binary files differnew file mode 100644 index 000000000..b7993397d --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_record.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_record_white.png b/src/main/res/drawable-xhdpi/ic_attach_record_white.png Binary files differnew file mode 100644 index 000000000..147a4affa --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_record_white.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_video.png b/src/main/res/drawable-xhdpi/ic_attach_video.png Binary files differnew file mode 100644 index 000000000..88ac09b3f --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_video.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_camera.png b/src/main/res/drawable-xxhdpi/ic_attach_camera.png Binary files differnew file mode 100644 index 000000000..ee4320639 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_camera.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_camera_white.png b/src/main/res/drawable-xxhdpi/ic_attach_camera_white.png Binary files differnew file mode 100644 index 000000000..de872220b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_camera_white.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_document.png b/src/main/res/drawable-xxhdpi/ic_attach_document.png Binary files differnew file mode 100644 index 000000000..c617b49ce --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_document.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_document_white.png b/src/main/res/drawable-xxhdpi/ic_attach_document_white.png Binary files differnew file mode 100644 index 000000000..3df35ba59 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_document_white.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_location.png b/src/main/res/drawable-xxhdpi/ic_attach_location.png Binary files differnew file mode 100644 index 000000000..d587d0c18 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_location.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_location_white.png b/src/main/res/drawable-xxhdpi/ic_attach_location_white.png Binary files differnew file mode 100644 index 000000000..8d0d988d0 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_location_white.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_photo.png b/src/main/res/drawable-xxhdpi/ic_attach_photo.png Binary files differnew file mode 100644 index 000000000..aa2c5ac08 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_photo.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_photo_white.png b/src/main/res/drawable-xxhdpi/ic_attach_photo_white.png Binary files differnew file mode 100644 index 000000000..5ab46aac7 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_photo_white.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_record.png b/src/main/res/drawable-xxhdpi/ic_attach_record.png Binary files differnew file mode 100644 index 000000000..374e27264 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_record.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_record_white.png b/src/main/res/drawable-xxhdpi/ic_attach_record_white.png Binary files differnew file mode 100644 index 000000000..33d869325 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_record_white.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_video.png b/src/main/res/drawable-xxhdpi/ic_attach_video.png Binary files differnew file mode 100644 index 000000000..7c23db0f0 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_video.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_camera.png b/src/main/res/drawable-xxxhdpi/ic_attach_camera.png Binary files differnew file mode 100644 index 000000000..566cba549 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_camera.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png Binary files differnew file mode 100644 index 000000000..777658e95 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_document.png b/src/main/res/drawable-xxxhdpi/ic_attach_document.png Binary files differnew file mode 100644 index 000000000..0831e0e96 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_document.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_document_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_document_white.png Binary files differnew file mode 100644 index 000000000..f89ffeb30 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_document_white.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_location.png b/src/main/res/drawable-xxxhdpi/ic_attach_location.png Binary files differnew file mode 100644 index 000000000..9c21f9d19 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_location.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_location_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_location_white.png Binary files differnew file mode 100644 index 000000000..8bcb6f620 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_location_white.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_photo.png b/src/main/res/drawable-xxxhdpi/ic_attach_photo.png Binary files differnew file mode 100644 index 000000000..a0129784b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_photo.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png Binary files differnew file mode 100644 index 000000000..2ffdb55f2 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_record.png b/src/main/res/drawable-xxxhdpi/ic_attach_record.png Binary files differnew file mode 100644 index 000000000..966d4e005 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_record.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png Binary files differnew file mode 100644 index 000000000..2f1e60c55 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_video.png b/src/main/res/drawable-xxxhdpi/ic_attach_video.png Binary files differnew file mode 100644 index 000000000..88b0ab5f1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_video.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_video_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_video_white.png Binary files differnew file mode 100644 index 000000000..103cd61a3 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_video_white.png diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index e56a9fa07..652d27647 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -3,26 +3,32 @@ <item android:id="@+id/attach_location" - android:title="@string/send_location" /> + android:title="@string/send_location" + android:icon="?attr/ic_attach_location"/> <item android:id="@+id/attach_record_voice" - android:title="@string/attach_record_voice" /> + android:title="@string/attach_record_voice" + android:icon="?attr/ic_attach_record"/> <item android:id="@+id/attach_take_picture" - android:title="@string/attach_take_picture" /> + android:title="@string/attach_take_picture" + android:icon="?attr/ic_attach_camera"/> <item android:id="@+id/attach_choose_picture" - android:title="@string/attach_choose_picture" /> + android:title="@string/attach_choose_picture" + android:icon="?attr/ic_attach_photo"/> <item android:id="@+id/attach_choose_video" - android:title="@string/attach_choose_video" /> + android:title="@string/attach_choose_video" + android:icon="?attr/ic_attach_video"/> <item android:id="@+id/attach_choose_file" - android:title="@string/choose_file" /> + android:title="@string/choose_file" + android:icon="?attr/ic_attach_document"/> </menu>
\ No newline at end of file diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 785820217..d85c4582a 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -40,6 +40,13 @@ <item name="attr/icon_share">@drawable/ic_share_white_24dp</item> <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item> + <item name="attr/ic_attach_camera">@drawable/ic_attach_camera</item> + <item name="attr/ic_attach_document">@drawable/ic_attach_document</item> + <item name="attr/ic_attach_location">@drawable/ic_attach_location</item> + <item name="attr/ic_attach_photo">@drawable/ic_attach_photo</item> + <item name="attr/ic_attach_video">@drawable/ic_attach_video</item> + <item name="attr/ic_attach_record">@drawable/ic_attach_record</item> + </style> </resources>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 93aa76544..3babeff54 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -18,8 +18,8 @@ <attr name="icon_group" format="reference" /> <attr name="icon_new" format="reference" /> <attr name="icon_new_attachment" format="reference" /> - <attr name="icon_not_secure" format="reference"/> - <attr name="icon_quote" format="reference"/> + <attr name="icon_not_secure" format="reference" /> + <attr name="icon_quote" format="reference" /> <attr name="icon_refresh" format="reference" /> <attr name="icon_remove" format="reference" /> <attr name="icon_search" format="reference" /> @@ -27,7 +27,7 @@ <attr name="icon_settings" format="reference" /> <attr name="icon_share" format="reference" /> <attr name="icon_import_export" format="reference" /> - <attr name="icon_scan_qr_code" format="reference"/> + <attr name="icon_scan_qr_code" format="reference" /> <attr name="icon_notifications" format="reference" /> <attr name="icon_notifications_off" format="reference" /> @@ -37,4 +37,10 @@ <attr name="dialog_horizontal_padding" format="dimension" /> <attr name="dialog_vertical_padding" format="dimension" /> + <attr name="ic_attach_camera" format="reference" /> + <attr name="ic_attach_document" format="reference" /> + <attr name="ic_attach_location" format="reference" /> + <attr name="ic_attach_photo" format="reference" /> + <attr name="ic_attach_record" format="reference" /> + </resources>
\ No newline at end of file diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 9ef329aa8..5a03787ba 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -5,4 +5,5 @@ <dimen name="infocard_padding">16dp</dimen> <dimen name="image_button_padding">8dp</dimen> <dimen name="elv_touch_slop">64dp</dimen> + <dimen name="menu_item_icon_size">24dp</dimen> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 38698e061..c028df7a7 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -35,6 +35,13 @@ <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item> <item name="attr/dialog_horizontal_padding">16dp</item> <item name="attr/dialog_vertical_padding">16dp</item> + + <item name="attr/ic_attach_camera">@drawable/ic_attach_camera</item> + <item name="attr/ic_attach_document">@drawable/ic_attach_document</item> + <item name="attr/ic_attach_location">@drawable/ic_attach_location</item> + <item name="attr/ic_attach_photo">@drawable/ic_attach_photo</item> + <item name="attr/ic_attach_video">@drawable/ic_attach_video</item> + <item name="attr/ic_attach_record">@drawable/ic_attach_record</item> </style> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> |
