Merge branch 'master' into feature/compress-images
# Conflicts: # app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
This commit is contained in:
commit
b52aeda83b
4 changed files with 87 additions and 2 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue