aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-23 20:59:35 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-23 20:59:35 +0200
commitb579436846cca0015120aaaf07378c57671707b2 (patch)
tree94ea80d38d8f368ad066df55aaaeb763fbc175f2 /src/main/res/layout
parentadd025afa2cb9ced9c9b8023ce95113dff506686 (diff)
update unreadCount
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/conversation_list_row.xml28
-rw-r--r--src/main/res/layout/fragment_conversation.xml2
2 files changed, 11 insertions, 19 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index ee73fa296..c85d668a9 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -140,37 +140,29 @@
</LinearLayout>
</RelativeLayout>
- <TextView
+ <de.pixart.messenger.ui.widget.UnreadCountCustomView
android:id="@+id/conversation_unread"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/conversation_name"
+ android:layout_width="?attr/IconSize"
+ android:layout_height="?attr/IconSize"
android:layout_margin="1dp"
android:layout_toLeftOf="@+id/conversation_lastupdate"
- android:background="@drawable/rounded_rectangle_primary"
android:paddingBottom="2dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
- android:text="100"
- android:textColor="@color/grey50"
- android:textSize="?attr/TextSizeBody"
- android:visibility="gone" />
+ android:visibility="gone"
+ app:backgroundColor="?attr/colorAccent" />
- <TextView
+ <de.pixart.messenger.ui.widget.UnreadCountCustomView
android:id="@+id/conversation_failed"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/conversation_name"
+ android:layout_width="?attr/IconSize"
+ android:layout_height="?attr/IconSize"
android:layout_margin="1dp"
android:layout_toLeftOf="@+id/conversation_unread"
- android:background="@drawable/rounded_rectangle_red"
android:paddingBottom="2dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
- android:text="100"
- android:textColor="@color/grey50"
- android:textSize="?attr/TextSizeBody"
- android:visibility="gone" />
+ android:visibility="gone"
+ app:backgroundColor="?attr/color_warning" />
<TextView
android:id="@+id/conversation_lastupdate"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index bd0dd2ebd..5c77a5d29 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -44,7 +44,7 @@
android:layout_alignTop="@+id/scroll_to_bottom_button"
android:elevation="8dp"
android:visibility="gone"
- app:backgroundColor="?attr/unread_count" />
+ app:backgroundColor="?attr/colorAccent" />
<RelativeLayout
android:id="@+id/input"