diff options
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java | 9 | ||||
-rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 28 | ||||
-rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 2 |
4 files changed, 16 insertions, 25 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java index 76d13f7ed..802ee0187 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -31,6 +31,7 @@ import de.pixart.messenger.entities.Transferable; import de.pixart.messenger.ui.ConversationFragment; import de.pixart.messenger.ui.XmppActivity; import de.pixart.messenger.ui.util.Color; +import de.pixart.messenger.ui.widget.UnreadCountCustomView; import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.IrregularUnicodeDetector; import de.pixart.messenger.utils.UIHelper; @@ -113,13 +114,13 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { if (unreadCount > 0) { viewHolder.unreadCount.setVisibility(View.VISIBLE); - viewHolder.unreadCount.setText(unreadCount > 99 ? "\u221E" : String.valueOf(unreadCount)); + viewHolder.unreadCount.setUnreadCount(unreadCount); } else { viewHolder.unreadCount.setVisibility(View.GONE); } if (failedCount > 0) { viewHolder.failedCount.setVisibility(View.VISIBLE); - viewHolder.failedCount.setText(failedCount > 99 ? "\u221E" : String.valueOf(failedCount)); + viewHolder.failedCount.setUnreadCount(failedCount); } else { viewHolder.failedCount.setVisibility(View.GONE); } @@ -336,8 +337,8 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { private TextView timestamp; private TextView sender; private ImageView notificationIcon; - private TextView unreadCount; - private TextView failedCount; + private UnreadCountCustomView unreadCount; + private UnreadCountCustomView failedCount; private ImageView receivedStatus; private ImageView readStatus; private ImageView avatar; 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" diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index cbfa86c23..ee89502f2 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -28,8 +28,6 @@ <attr name="ic_send_videocam_offline" format="reference" /> <attr name="ic_send_voice_offline" format="reference" /> - <attr name="unread_count" format="reference|color" /> - <attr name="conversations_overview_background" format="reference|color" /> <attr name="icon_add_group" format="reference" /> |