From e76669439f013d3f21fd39e71993b4e4c5c0e432 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 4 Aug 2022 23:47:02 +0200 Subject: [PATCH] Migrate to a new, updated popup bubble based on MaterialButton Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/controllers/ChatController.kt | 3 +-- .../talk/controllers/ConversationsListController.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 852369bf7..22b27ab90 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -651,8 +651,7 @@ class ChatController(args: Bundle) : } } - binding.popupBubbleView.setTextColor(Color.WHITE) - binding.popupBubbleView.setIconTint(ColorStateList.valueOf(Color.WHITE)) + viewThemeUtils.colorMaterialButtonPrimaryFilled(binding.popupBubbleView) binding.messageInputView.setPadding(0, 0, 0, 0) 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 e24a36b36..9870f8f27 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -806,9 +806,7 @@ public class ConversationsListController extends BaseController implements Flexi recyclerView.smoothScrollToPosition(nextUnreadConversationScrollPosition); } }); - - newMentionPopupBubble.setTextColor(Color.WHITE); - newMentionPopupBubble.setIconTint(ColorStateList.valueOf(Color.WHITE)); + viewThemeUtils.colorMaterialButtonPrimaryFilled(newMentionPopupBubble); } private void checkToShowUnreadBubble() {