diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-11-21 20:44:49 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-11-21 20:51:56 +0100 |
| commit | e7b5defef433e0ed167b884d1fde9861d18738d0 (patch) | |
| tree | 8dfd9a879c2e5e864822c6df8059adc6a3f3c98a /src/main/res | |
| parent | 9a71771d880a971aae9a574ce4cdfbeaa8360cb7 (diff) | |
Show Drawable if Location/File/Voice
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 17 | ||||
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 1 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index c551f9dc2..480d84eba 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -48,8 +48,8 @@ android:layout_alignLeft="@+id/conversation_lastwrapper" android:layout_toLeftOf="@+id/conversation_failed" android:paddingRight="4dp" - android:singleLine="true" - android:text="Awesome groupchat" + android:ellipsize="end" + android:maxLines="1" android:textAppearance="@style/TextAppearance.AppCompat" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" /> @@ -81,7 +81,13 @@ android:layout_centerVertical="true" android:layout_toLeftOf="@+id/indicators" android:layout_toRightOf="@+id/sender_name" - android:orientation="vertical"> + android:orientation="horizontal"> + + <ImageView + android:id="@+id/conversation_lastmsg_img" + android:layout_width="?attr/IconSize" + android:layout_height="?attr/IconSize" + android:layout_marginRight="?attr/TextSeparation"/>/> <com.vanniktech.emoji.EmojiTextView android:id="@+id/conversation_lastmsg" @@ -90,8 +96,8 @@ android:gravity="center_vertical" android:minHeight="?attr/IconSize" android:scrollHorizontally="false" - android:singleLine="true" - android:text="This is a placeholder text to show the last messages" + android:maxLines="1" + android:ellipsize="end" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> @@ -186,7 +192,6 @@ android:layout_alignBaseline="@+id/conversation_name" android:paddingLeft="4dp" android:gravity="right" - android:text="23:42" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" /> </RelativeLayout> diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index b1a679258..86346775f 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -14,6 +14,7 @@ <item name="TextSizeBody">14sp</item> <item name="IconSize">16sp</item> <item name="TextSizeHeadline">18sp</item> + <item name="TextSeparation">5sp</item> <item name="attr/dialog_horizontal_padding">24dp</item> <item name="attr/dialog_vertical_padding">16dp</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index bce8c7c6e..a315ab796 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -4,6 +4,7 @@ <attr name="TextSizeInfo" format="dimension" /> <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> + <attr name="TextSeparation" format="dimension"/> <attr name="IconSize" format="dimension" /> <attr name="icon_add_group" format="reference" /> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 4e53b26e2..61ffc19ae 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -10,6 +10,7 @@ <item name="TextSizeBody">14sp</item> <item name="IconSize">16sp</item> <item name="TextSizeHeadline">18sp</item> + <item name="TextSeparation">5sp</item> <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item> <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item> |