Change summary
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2
src/main/res/drawable-hdpi/ic_done_black_18dp.png | 0
src/main/res/drawable-hdpi/ic_done_white_18dp.png | 0
src/main/res/drawable-hdpi/ic_received_indicator.png | 0
src/main/res/drawable-mdpi/ic_done_black_18dp.png | 0
src/main/res/drawable-mdpi/ic_done_black_24dp.png | 0
src/main/res/drawable-mdpi/ic_done_white_18dp.png | 0
src/main/res/drawable-mdpi/ic_received_indicator.png | 0
src/main/res/drawable-xhdpi/ic_done_black_18dp.png | 0
src/main/res/drawable-xhdpi/ic_done_black_24dp.png | 0
src/main/res/drawable-xhdpi/ic_done_white_18dp.png | 0
src/main/res/drawable-xhdpi/ic_received_indicator.png | 0
src/main/res/drawable-xxhdpi/ic_done_black_18dp.png | 0
src/main/res/drawable-xxhdpi/ic_done_white_18dp.png | 0
src/main/res/drawable-xxhdpi/ic_received_indicator.png | 0
src/main/res/drawable-xxxhdpi/ic_done_black_18dp.png | 0
src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png | 0
src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png | 0
src/main/res/drawable-xxxhdpi/ic_received_indicator.png | 0
src/main/res/layout/message_sent.xml | 48
src/main/res/values/themes.xml | 2
21 files changed, 25 insertions(+), 27 deletions(-)
Detailed changes
@@ -208,6 +208,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
break;
case Message.STATUS_SEND_RECEIVED:
case Message.STATUS_SEND_DISPLAYED:
+ viewHolder.indicatorReceived.setImageResource(darkBackground ? R.drawable.ic_done_white_18dp : R.drawable.ic_done_black_18dp);
+ viewHolder.indicatorReceived.setAlpha(darkBackground ? 0.7f : 0.57f);
viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
break;
case Message.STATUS_SEND_FAILED:
@@ -1,49 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="3dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="3dp">
-
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingLeft="8dp"
+ android:paddingTop="3dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="3dp">
<LinearLayout
android:id="@+id/message_photo_box"
- android:orientation="vertical"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true">
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:orientation="vertical">
+
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitXY"
app:riv_corner_radius="2dp" />
+
<View
android:id="@+id/placeholder"
- android:layout_height="3dp"
android:layout_width="48dp"
- />
+ android:layout_height="3dp" />
</LinearLayout>
-
<LinearLayout
android:id="@+id/message_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
+ android:layout_marginLeft="-4dp"
android:layout_toLeftOf="@+id/message_photo_box"
android:background="?attr/message_bubble_sent"
- android:minHeight="53dp"
- android:layout_marginLeft="-4dp"
- android:longClickable="true">
+ android:longClickable="true"
+ android:minHeight="53dp">
<LinearLayout
android:layout_width="wrap_content"
@@ -52,7 +51,7 @@
android:orientation="vertical"
android:padding="2dp">
- <include layout="@layout/message_content"/>
+ <include layout="@layout/message_content" />
<LinearLayout
android:layout_width="wrap_content"
@@ -66,16 +65,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
+ android:layout_marginEnd="4sp"
+ android:layout_marginRight="4sp"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
+ android:textAppearance="@style/TextAppearance.Conversations.Caption" />
<ImageView
android:id="@+id/security_indicator"
android:layout_width="?attr/TextSizeCaption"
android:layout_height="?attr/TextSizeCaption"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="4sp"
android:alpha="0.54"
android:gravity="center_vertical"
android:src="@drawable/ic_lock_black_18dp" />
@@ -85,7 +85,6 @@
android:layout_width="?attr/TextSizeCaption"
android:layout_height="?attr/TextSizeCaption"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="4sp"
android:alpha="0.54"
android:gravity="center_vertical"
android:src="@drawable/ic_mode_edit_black_18dp" />
@@ -95,10 +94,9 @@
android:layout_width="?attr/TextSizeCaption"
android:layout_height="?attr/TextSizeCaption"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="4sp"
android:alpha="0.54"
android:gravity="center_vertical"
- android:src="@drawable/ic_received_indicator" />
+ android:src="@drawable/ic_done_black_18dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -87,7 +87,6 @@
<item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
<item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
<item type="reference" name="icon_save">@drawable/ic_save_black_24dp</item>
- <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
<item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
<item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
<item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
@@ -202,7 +201,6 @@
<item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
<item type="reference" name="icon_edit_body">@drawable/ic_edit_white_24dp</item>
<item type="reference" name="icon_save">@drawable/ic_save_white_24dp</item>
- <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
<item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
<item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
<item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>