Merge branch 'master' into feature/compress-images

# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
This commit is contained in:
Paul Akhamiogu 2021-09-08 22:07:52 +01:00
commit b52aeda83b
4 changed files with 87 additions and 2 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"