From a6397b0392e9dd92a3397bafcac554925de39af4 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 22 Sep 2021 09:58:08 +0200
Subject: [PATCH] differentiate unread counters

differentiate unread counters for group mentions and direct mentions

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/adapters/items/ConversationItem.java | 38 ++++++++++++++++---
 .../ConversationsListController.java          |  2 +-
 .../json/conversations/Conversation.java      | 11 ++++++
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
index 30fbe3d2d..c9a5ed76e 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
@@ -42,6 +42,7 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.chip.Chip;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
+import com.nextcloud.talk.models.database.CapabilitiesUtil;
 import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.chat.ChatMessage;
 import com.nextcloud.talk.models.json.conversations.Conversation;
@@ -136,20 +137,45 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
                 holder.dialogUnreadBubble.setText(R.string.tooManyUnreadMessages);
             }
 
-            if (conversation.isUnreadMention() || conversation.type == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
+            ColorStateList lightBubbleFillColor = ColorStateList.valueOf(
+                ContextCompat.getColor(context,
+                R.color.conversation_unread_bubble));
+            int lightBubbleTextColor = ContextCompat.getColor(
+                context,
+                R.color.conversation_unread_bubble_text);
+            ColorStateList lightBubbleStrokeColor = ColorStateList.valueOf(
+                ContextCompat.getColor(context,
+                R.color.colorPrimary));
+
+            if (conversation.type == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
                 holder.dialogUnreadBubble.setChipBackgroundColorResource(R.color.colorPrimary);
                 holder.dialogUnreadBubble.setTextColor(Color.WHITE);
+            } else if (conversation.isUnreadMention()) {
+                if (CapabilitiesUtil.hasSpreedFeatureCapability(userEntity, "direct-mention-flag")){
+                    if (conversation.getUnreadMentionDirect()) {
+                        holder.dialogUnreadBubble.setChipBackgroundColorResource(R.color.colorPrimary);
+                        holder.dialogUnreadBubble.setTextColor(Color.WHITE);
+                    } else {
+                        holder.dialogUnreadBubble.setChipBackgroundColor(ColorStateList.valueOf(
+                            ContextCompat.getColor(context, R.color.white)));
+                        holder.dialogUnreadBubble.setTextColor(ContextCompat.getColor(
+                            context,
+                            R.color.colorPrimary));
+                        holder.dialogUnreadBubble.setChipStrokeWidth(6.0f);
+                        holder.dialogUnreadBubble.setChipStrokeColor(lightBubbleStrokeColor);
+                    }
+                } else {
+                    holder.dialogUnreadBubble.setChipBackgroundColorResource(R.color.colorPrimary);
+                    holder.dialogUnreadBubble.setTextColor(Color.WHITE);
+                }
             } else {
-                holder.dialogUnreadBubble.setChipBackgroundColor(
-                        ColorStateList.valueOf(ContextCompat.getColor(context, R.color.conversation_unread_bubble)));
-                holder.dialogUnreadBubble.setTextColor(
-                        ContextCompat.getColor(context, R.color.conversation_unread_bubble_text));
+                holder.dialogUnreadBubble.setChipBackgroundColor(lightBubbleFillColor);
+                holder.dialogUnreadBubble.setTextColor(lightBubbleTextColor);
             }
         } else {
             holder.dialogName.setTypeface(null, Typeface.NORMAL);
             holder.dialogDate.setTypeface(null, Typeface.NORMAL);
             holder.dialogLastMessage.setTypeface(null, Typeface.NORMAL);
-
             holder.dialogUnreadBubble.setVisibility(View.GONE);
         }
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
index 5519f193f..ff3868695 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -631,7 +631,7 @@ public class ConversationsListController extends BaseController implements Searc
             Conversation conversationItem = ((ConversationItem) flexItem).getModel();
             int position = adapter.getGlobalPositionOf(flexItem);
             if (conversationItem.unreadMention && position > lastVisibleItem) {
-                if(!newMentionPopupBubble.isShown()){
+                if (!newMentionPopupBubble.isShown()){
                     newMentionPopupBubble.show();
                 }
                 return;
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
index bf4f63c2f..dd893b5f7 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
@@ -98,6 +98,9 @@ public class Conversation {
     @JsonField(name = "canDeleteConversation")
     public Boolean canDeleteConversation;
 
+    @JsonField(name = "unreadMentionDirect")
+    public Boolean unreadMentionDirect;
+
     public boolean isPublic() {
         return (ConversationType.ROOM_PUBLIC_CALL.equals(type));
     }
@@ -254,6 +257,10 @@ public class Conversation {
         return this.callFlag;
     }
 
+    public Boolean getUnreadMentionDirect() {
+        return unreadMentionDirect;
+    }
+
     public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
@@ -359,6 +366,10 @@ public class Conversation {
         this.callFlag = callFlag;
     }
 
+    public void setUnreadMentionDirect(Boolean unreadMentionDirect) {
+        this.unreadMentionDirect = unreadMentionDirect;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {