Merge branch 'master' into add-simple-characters

This commit is contained in:
Agnieszka C 2021-09-08 20:08:35 +02:00 committed by GitHub
commit 2cac2516f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 113 additions and 9 deletions

View file

@ -37,12 +37,26 @@
android:textSize="@dimen/big_text_size"
tools:text="John" />
<TextView
android:id="@+id/draft_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/conversation_address"
android:layout_toEndOf="@+id/conversation_image"
android:textColor="@color/color_primary"
android:textStyle="italic"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="@dimen/small_margin"
android:textSize="@dimen/normal_text_size"
android:text="@string/draft" />
<TextView
android:id="@+id/conversation_body_short"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/conversation_address"
android:layout_toEndOf="@+id/conversation_image"
android:layout_toEndOf="@+id/draft_indicator"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="@dimen/activity_margin"

View file

@ -25,6 +25,10 @@
android:id="@+id/cab_copy_number"
android:title="@string/copy_number_to_clipboard"
app:showAsAction="never" />
<item
android:id="@+id/cab_mark_as_read"
android:title="@string/mark_as_read"
app:showAsAction="never" />
<item
android:id="@+id/cab_mark_as_unread"
android:title="@string/mark_as_unread"