From 67d055637b1691e0b6bdee4975d4de41a57a7a0d Mon Sep 17 00:00:00 2001
From: Simon <simon@carrot.co>
Date: Wed, 10 Aug 2022 11:40:56 +0200
Subject: [PATCH 01/25] [PIVOT] Group messages within 15 minutes

---
 README.md                                                 | 3 +++
 build.gradle                                              | 2 +-
 .../src/main/java/com/sendbird/uikit/utils/DateUtils.java | 8 ++++++++
 .../main/java/com/sendbird/uikit/utils/MessageUtils.java  | 5 ++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c1f930b1..714342c0 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+# !! [PIVOT] Use `pivot-group-ui` branch
+
+
 # Sendbird UIKit for Android
 ![Platform](https://img.shields.io/badge/platform-ANDROID-orange.svg)
 ![Languages](https://img.shields.io/badge/language-JAVA-orange.svg)
diff --git a/build.gradle b/build.gradle
index f0348b4e..99b24464 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.6.10'
     ext.paparazzi_version = '1.3.1'
 
     dependencies {
diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/DateUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/DateUtils.java
index 9fb108a0..b38bea37 100644
--- a/uikit/src/main/java/com/sendbird/uikit/utils/DateUtils.java
+++ b/uikit/src/main/java/com/sendbird/uikit/utils/DateUtils.java
@@ -158,6 +158,14 @@ public static boolean hasSameTimeInMinute(long millisFirst, long millisSecond) {
         return dateFormat.format(millisFirst).equals(dateFormat.format(millisSecond));
     }
 
+    /**
+     * Get time difference in minutes
+     * @since Added by Pivot
+     */
+    public static int getTimeDifferenceInMinutes(long millisFirst, long millisSecond) {
+        return (int) Math.abs((millisSecond - millisFirst) / 60000);
+    }
+
     /**
      * Get time the difference.
      * Date shows 'date month' format (e.g. '19 Dec').
diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/MessageUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/MessageUtils.java
index 68cd3e3c..6cfc6406 100644
--- a/uikit/src/main/java/com/sendbird/uikit/utils/MessageUtils.java
+++ b/uikit/src/main/java/com/sendbird/uikit/utils/MessageUtils.java
@@ -28,6 +28,9 @@
 import java.util.List;
 
 public class MessageUtils {
+
+    private static int NEW_GROUP_UI_DIFFERENCE_IN_MINUTES = 15;
+
     public static boolean isMine(@NonNull BaseMessage message) {
         if (message.getSender() == null) {
             return false;
@@ -79,7 +82,7 @@ public static boolean isGroupChanged(@Nullable BaseMessage frontMessage, @Nullab
             !backMessage.getSendingStatus().equals(SendingStatus.SUCCEEDED) ||
             !frontMessage.getSendingStatus().equals(SendingStatus.SUCCEEDED) ||
             !frontMessage.getSender().equals(backMessage.getSender()) ||
-            !DateUtils.hasSameTimeInMinute(frontMessage.getCreatedAt(), backMessage.getCreatedAt()) ||
+            DateUtils.getTimeDifferenceInMinutes(frontMessage.getCreatedAt(), backMessage.getCreatedAt()) > NEW_GROUP_UI_DIFFERENCE_IN_MINUTES ||
             (messageListUIParams.getChannelConfig().getReplyType() == ReplyType.THREAD && (
                 (!(frontMessage instanceof CustomizableMessage) && frontMessage.getThreadInfo().getReplyCount() > 0) ||
                     (!(backMessage instanceof CustomizableMessage) && backMessage.getThreadInfo().getReplyCount() > 0)

From fdf3818ae28aa7402ad99e78974bccb77e6ea0b8 Mon Sep 17 00:00:00 2001
From: Simon <simon@carrot.co>
Date: Thu, 6 Jul 2023 21:10:57 +0200
Subject: [PATCH 02/25] [PIVOT] Mark messages as READ only if chat is visible

---
 .../sendbird/uikit/fragments/ChannelFragment.java   | 13 +++++++++++++
 .../com/sendbird/uikit/vm/ChannelViewModel.java     | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
index 9cd2221e..89ac928f 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
@@ -209,6 +209,19 @@ protected void onReady(@NonNull ReadyStatus status, @NonNull ChannelModule modul
         loadInitial(startingPoint);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        getViewModel().setIsChatScreenVisible(true);
+        getViewModel().markAsRead();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getViewModel().setIsChatScreenVisible(false);
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
index 49d3bb22..ebea4e44 100644
--- a/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
+++ b/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
@@ -106,6 +106,7 @@ public class ChannelViewModel extends BaseMessageListViewModel {
     @Nullable
     private MessageCollectionHandler handler;
     private boolean needToLoadMessageCache = true;
+    private boolean isChatScreenVisible = false;
     @NonNull
     private final SendbirdChatContract sendbirdChatContract;
     @NonNull
@@ -712,11 +713,18 @@ private TypingIndicatorMessage createTypingIndicatorMessage() {
         return null;
     }
 
-    private void markAsRead() {
+    public void markAsRead() {
+        if (!isChatScreenVisible) return;
+
         Logger.dev("markAsRead");
         if (channel != null) channel.markAsRead(null);
     }
 
+    public void setIsChatScreenVisible(boolean visible) {
+        Logger.dev("setIsChatScreenVisible: " + visible);
+        isChatScreenVisible = visible;
+    }
+
     @UiThread
     private synchronized void notifyChannelDeleted(@NonNull String channelUrl) {
         channelDeleted.setValue(channelUrl);

From 43680153d465f80241e6864322e30ff8c6c93a48 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Wed, 19 Jul 2023 11:12:15 +0200
Subject: [PATCH 03/25] [BRICK-970] Hide "text" part of Sendbird messages
 containing only `aerobie-api.pivot.co` URL (#2)

---
 .../src/main/java/com/sendbird/uikit/utils/ViewUtils.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java
index d6b2d4c4..023491ff 100644
--- a/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java
+++ b/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java
@@ -84,6 +84,7 @@ public class ViewUtils {
     private final static int MINIMUM_THUMBNAIL_WIDTH = 100;
     private final static int MINIMUM_THUMBNAIL_HEIGHT = 100;
     public static final Pattern MENTION = Pattern.compile("[" + SendbirdUIKit.getUserMentionConfig().getTrigger() + "][{](.*?)([}])");
+    public static final Pattern AEROBIE_URL_ONLY = Pattern.compile("^(http|https):\\/\\/aerobie-api([a-zA-Z0-9-]+)?\\.pivot\\.co\\/og(\\S)+$");
 
     public static void drawUnknownMessage(@NonNull TextView view, boolean isMine) {
         int unknownHintAppearance;
@@ -129,6 +130,12 @@ public static void drawTextMessage(
             return;
         }
 
+        if (AEROBIE_URL_ONLY.matcher(message.getMessage().trim()).matches()) {
+            textView.setVisibility(View.GONE);
+        } else {
+            textView.setVisibility(View.VISIBLE);
+        }
+
         if (MessageUtils.isUnknownType(message)) {
             drawUnknownMessage(textView, MessageUtils.isMine(message));
             return;

From 8da707979803e14890133275bbb86739ba5dd406 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Tue, 1 Aug 2023 18:35:27 +0200
Subject: [PATCH 04/25] [PIVOT] [BRICK-1006] disable the user's ability to
 delete a coach message (#3)

---
 .../java/com/sendbird/uikit/fragments/ChannelFragment.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
index 89ac928f..71f53b5a 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
@@ -728,9 +728,9 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
             case VIEW_TYPE_USER_MESSAGE_ME:
                 if (status == SendingStatus.SUCCEEDED) {
                     if (replyType == ReplyType.NONE) {
-                        actions = new DialogListItem[]{copy, edit, delete};
+                        actions = new DialogListItem[]{copy, edit};
                     } else {
-                        actions = new DialogListItem[]{copy, edit, delete, reply};
+                        actions = new DialogListItem[]{copy, edit, reply};
                     }
                 } else if (MessageUtils.isFailed(message)) {
                     actions = new DialogListItem[]{retry, deleteFailed};

From cacd15000efdc25f70e37f2e02288f8d403430ec Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Tue, 1 Aug 2023 20:47:49 +0200
Subject: [PATCH 05/25] [PIVOT] [BRICK-836] users can tap on deep links on
 coaching tab to launch various parts of the app (#4)

---
 uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java
index 23c148bf..6bdcf52d 100644
--- a/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java
+++ b/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java
@@ -113,7 +113,7 @@ private static void grantWritePermission(@NonNull Context context, @NonNull Inte
 
     @NonNull
     public static Intent getWebViewerIntent(@NonNull String url) {
-        if (!url.startsWith("http://") && !url.startsWith("https://")) {
+        if (!url.startsWith("pivotapp://") && !url.startsWith("http://") && !url.startsWith("https://")) {
             url = "https://" + url;
         }
         Uri uri = Uri.parse(url);

From fcd470fe2b41111e60f8fc03c55a610afdaebf60 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:32:25 +0200
Subject: [PATCH 06/25] [PIVOT] [BRICK-1048] Hide the user ID that is displayed
 if replying (#5)

---
 .../main/java/com/sendbird/uikit/widgets/MessageInputView.kt    | 2 +-
 uikit/src/main/res/values/strings.xml                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt b/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt
index 6003f1ce..a22cdf2c 100644
--- a/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt
@@ -188,7 +188,7 @@ class MessageInputView @JvmOverloads constructor(
 
         message.sender?.let {
             binding.tvQuoteReplyTitle.text =
-                String.format(context.getString(R.string.sb_text_reply_to), it.nickname)
+                String.format(context.getString(R.string.sb_text_reply_to))
         }
         binding.tvQuoteReplyMessage.text = displayMessage
     }
diff --git a/uikit/src/main/res/values/strings.xml b/uikit/src/main/res/values/strings.xml
index 220f83c1..9804d2ed 100644
--- a/uikit/src/main/res/values/strings.xml
+++ b/uikit/src/main/res/values/strings.xml
@@ -203,7 +203,7 @@
 
     <!-- Message Reply -->
     <string name="sb_text_you">You</string>
-    <string name="sb_text_reply_to">Reply to %s</string>
+    <string name="sb_text_reply_to">Reply</string>
     <string name="sb_text_replied_to">%s replied to %s</string>
     <string name="sb_text_error_original_message_not_found">Couldn\'t find the original message for this reply.</string>
     <string name="sb_text_exceed_mention_limit_count">You can have up to %d mentions per message.</string>

From c0be2461891c4b1514a6e92ceab599d1514be7c3 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:07:59 +0200
Subject: [PATCH 07/25] Gradle update to 8.0.2 (#6)

* Migrated from Gradle 7.2.2 to 8.1.0

* Downgraded Gradle plugin to 8.0.2
---
 uikit/src/main/AndroidManifest.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/uikit/src/main/AndroidManifest.xml b/uikit/src/main/AndroidManifest.xml
index 5dab1bd5..74b57fca 100644
--- a/uikit/src/main/AndroidManifest.xml
+++ b/uikit/src/main/AndroidManifest.xml
@@ -3,8 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Required to maintain app compatibility. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

From 3ed067fcf85b468a107a8703a092aa46837e7a3d Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Thu, 31 Aug 2023 13:02:24 +0200
Subject: [PATCH 08/25] [BRICK-1196] add mixpanel event property to
 coaching-send-message event (#8)

---
 uikit-samples/build.gradle                                 | 2 ++
 .../sendbird/uikit/fragments/BaseMessageListFragment.java  | 6 ++++++
 .../com/sendbird/uikit/interfaces/CustomParamsHandler.java | 2 ++
 .../com/sendbird/uikit/vm/BaseMessageListViewModel.java    | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/uikit-samples/build.gradle b/uikit-samples/build.gradle
index 5b989d53..a570e2d1 100644
--- a/uikit-samples/build.gradle
+++ b/uikit-samples/build.gradle
@@ -31,6 +31,8 @@ android {
         viewBinding true
         buildConfig = true
     }
+
+    namespace 'com.sendbird.uikit'
 }
 
 dependencies {
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java
index 17c73db8..913c8947 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java
@@ -876,6 +876,12 @@ private MultipleFilesMessageCreateParams getMultipleFilesMessageCreateParams(Lis
     @NonNull
     private FileMessageCreateParams getFileMessageCreateParams(@NonNull FileInfo fileInfo) {
         final FileMessageCreateParams imageParams = fileInfo.toFileParams();
+
+        if (targetMessage != null && channelConfig.getReplyType() != ReplyType.NONE) {
+            imageParams.setParentMessageId(targetMessage.getMessageId());
+            imageParams.setReplyToChannel(true);
+        }
+
         final CustomParamsHandler customHandler = SendbirdUIKit.getCustomParamsHandler();
         if (customHandler != null) {
             customHandler.onBeforeSendFileMessage(imageParams);
diff --git a/uikit/src/main/java/com/sendbird/uikit/interfaces/CustomParamsHandler.java b/uikit/src/main/java/com/sendbird/uikit/interfaces/CustomParamsHandler.java
index 2c602c3c..eda673b7 100644
--- a/uikit/src/main/java/com/sendbird/uikit/interfaces/CustomParamsHandler.java
+++ b/uikit/src/main/java/com/sendbird/uikit/interfaces/CustomParamsHandler.java
@@ -54,6 +54,8 @@ default void onBeforeSendUserMessage(@NonNull UserMessageCreateParams params) {}
      */
     default void onBeforeSendFileMessage(@NonNull FileMessageCreateParams params) {}
 
+    default void onBeforeToggleReaction(@NonNull Boolean isAdded) {}
+
     /**
      * It will be called before sending multiple files message.
      * If you want add more data, you can override this and set the data.
diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
index 495b74f7..6e926919 100644
--- a/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
+++ b/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
@@ -26,6 +26,7 @@
 import com.sendbird.uikit.SendbirdUIKit;
 import com.sendbird.uikit.consts.StringSet;
 import com.sendbird.uikit.interfaces.AuthenticateHandler;
+import com.sendbird.uikit.interfaces.CustomParamsHandler;
 import com.sendbird.uikit.interfaces.OnCompleteHandler;
 import com.sendbird.uikit.interfaces.OnPagedDataLoader;
 import com.sendbird.uikit.internal.contracts.SendbirdUIKitImpl;
@@ -275,6 +276,12 @@ public void deleteMessage(@NonNull BaseMessage message, @Nullable OnCompleteHand
      */
     public void toggleReaction(@NonNull View view, @NonNull BaseMessage message, @NonNull String key, @Nullable OnCompleteHandler handler) {
         if (channel == null) return;
+
+        final CustomParamsHandler customHandler = SendbirdUIKit.getCustomParamsHandler();
+        if (customHandler != null) {
+            customHandler.onBeforeToggleReaction(!view.isSelected());
+        }
+
         if (!view.isSelected()) {
             Logger.i("__ add reaction : %s", key);
             channel.addReaction(message, key, (reactionEvent, e) -> {

From 354c1bf9e97fe943c6f5727f626b860fcebe7ce6 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Wed, 13 Sep 2023 19:45:28 +0200
Subject: [PATCH 09/25] [BRICK-1256] Block Sendbird from closing our
 MainActivity (#9)

* [BRICK-1256] Block Sendbird from closing our MainActivity

* [BRICK-1256] Added failure logs
---
 .../java/com/sendbird/uikit/fragments/BaseFragment.java    | 7 ++++---
 .../java/com/sendbird/uikit/fragments/ChannelFragment.java | 1 +
 .../com/sendbird/uikit/vm/BaseMessageListViewModel.java    | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseFragment.java
index 2abf930c..ed7da2a2 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseFragment.java
@@ -105,8 +105,9 @@ protected boolean isFragmentAlive() {
      * Finishes the activity that has the current fragment.
      */
     protected void shouldActivityFinish() {
-        if (getActivity() != null) {
-            getActivity().finish();
-        }
+        // We don't want Sendbird chat to close our MainActivity
+//        if (getActivity() != null) {
+//            getActivity().finish();
+//        }
     }
 }
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
index 71f53b5a..19b085da 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
@@ -192,6 +192,7 @@ protected void onReady(@NonNull ReadyStatus status, @NonNull ChannelModule modul
         shouldDismissLoadingDialog();
         final GroupChannel channel = viewModel.getChannel();
         if (status == ReadyStatus.ERROR || channel == null || channel.isChatNotification()) {
+            Logger.e("status: " + status + ", channel is null: " + (channel == null) + ", isChatNotification: " + (channel != null ? channel.isChatNotification() : "channel null"));
             if (isFragmentAlive()) {
                 toastError(R.string.sb_text_error_get_channel);
                 shouldActivityFinish();
diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
index 6e926919..a92ecb2b 100644
--- a/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
+++ b/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
@@ -314,6 +314,7 @@ public void authenticate(@NonNull AuthenticateHandler handler) {
                 getChannel(channelUrl, (channel, e1) -> {
                     this.channel = channel;
                     if (e1 != null || channel == null) {
+                        Logger.e("Channel authenticate failed: " + (e1 != null ? e1.getMessage() : "channel null"));
                         handler.onAuthenticationFailed();
                     } else {
                         this.memberFinder = new MemberFinder(channel, SendbirdUIKit.getUserMentionConfig());
@@ -321,6 +322,7 @@ public void authenticate(@NonNull AuthenticateHandler handler) {
                     }
                 });
             } else {
+                Logger.e("Channel authenticate failed - null user: " + (e != null ? e.getMessage() : "no exception"));
                 handler.onAuthenticationFailed();
             }
         });

From c345f182dd96cc0256e9abe113ff17b2fa4fc302 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:40:02 +0100
Subject: [PATCH 10/25] [BRICK-1709] add mixpanel event when a user taps on a
 deeplink within coaching (#11)

---
 .../uikit/internal/ui/messages/MyUserMessageView.kt       | 8 ++++++++
 .../uikit/internal/ui/messages/OtherUserMessageView.kt    | 8 ++++++++
 .../main/java/com/sendbird/uikit/utils/IntentUtils.java   | 6 ++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt
index 57b2227c..23f82813 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt
@@ -14,11 +14,13 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyUserMessageComponentBinding
 import com.sendbird.uikit.interfaces.OnItemClickListener
+import com.sendbird.uikit.internal.ui.widgets.OnLinkClickListener
 import com.sendbird.uikit.internal.ui.widgets.OnLinkLongClickListener
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.TextUIConfig
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
+import com.sendbird.uikit.utils.IntentUtils
 import com.sendbird.uikit.utils.ViewUtils
 
 internal class MyUserMessageView @JvmOverloads internal constructor(
@@ -96,6 +98,12 @@ internal class MyUserMessageView @JvmOverloads internal constructor(
                 DrawableUtils.setTintList(context, ogtagBackground, ogtagBackgroundTint)
             binding.tvMessage.setOnClickListener { binding.contentPanel.performClick() }
             binding.tvMessage.setOnLongClickListener { binding.contentPanel.performLongClick() }
+            binding.tvMessage.onLinkClickListener = object : OnLinkClickListener {
+                override fun onClick(textView: TextView, link: String): Boolean {
+                    context.startActivity(IntentUtils.getWebViewerIntent(link))
+                    return true
+                }
+            }
             binding.tvMessage.onLinkLongClickListener = object : OnLinkLongClickListener {
                 override fun onLongClick(textView: TextView, link: String): Boolean {
                     return binding.contentPanel.performLongClick()
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt
index 2e130917..ec56da80 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt
@@ -22,11 +22,13 @@ import com.sendbird.uikit.internal.extensions.isStreamMessage
 import com.sendbird.uikit.internal.extensions.isSuggestedRepliesVisible
 import com.sendbird.uikit.internal.extensions.shouldShowSuggestedReplies
 import com.sendbird.uikit.internal.interfaces.OnFeedbackRatingClickListener
+import com.sendbird.uikit.internal.ui.widgets.OnLinkClickListener
 import com.sendbird.uikit.internal.ui.widgets.OnLinkLongClickListener
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.TextUIConfig
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
+import com.sendbird.uikit.utils.IntentUtils
 import com.sendbird.uikit.utils.MessageUtils
 import com.sendbird.uikit.utils.ViewUtils
 
@@ -118,6 +120,12 @@ internal class OtherUserMessageView @JvmOverloads internal constructor(
                 DrawableUtils.setTintList(context, ogtagBackground, ogtagBackgroundTint)
             binding.tvMessage.setOnClickListener { binding.contentPanel.performClick() }
             binding.tvMessage.setOnLongClickListener { binding.contentPanel.performLongClick() }
+            binding.tvMessage.onLinkClickListener = object : OnLinkClickListener {
+                override fun onClick(textView: TextView, link: String): Boolean {
+                    context.startActivity(IntentUtils.getWebViewerIntent(link))
+                    return true
+                }
+            }
             binding.tvMessage.onLinkLongClickListener = object : OnLinkLongClickListener {
                 override fun onLongClick(textView: TextView, link: String): Boolean {
                     return binding.contentPanel.performLongClick()
diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java
index 6bdcf52d..ce900365 100644
--- a/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java
+++ b/uikit/src/main/java/com/sendbird/uikit/utils/IntentUtils.java
@@ -116,8 +116,10 @@ public static Intent getWebViewerIntent(@NonNull String url) {
         if (!url.startsWith("pivotapp://") && !url.startsWith("http://") && !url.startsWith("https://")) {
             url = "https://" + url;
         }
-        Uri uri = Uri.parse(url);
-        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+
+        Intent intent = new Intent();
+        intent.setClassName("com.carrot.pivot","com.carrot.pivot.coaching.chat.deeplinks.CoachingDeeplinksReceiverActivity");
+        intent.putExtra("URL_KEY", url);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return intent;
     }

From 4cc9cdb912c471c303ed61ae56793f71059046ac Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:04:00 +0100
Subject: [PATCH 11/25] [BRICK-1849] Update Sendbird UIKit to v3.10.1 (#13)

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 714342c0..3b62917f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,16 @@
-# !! [PIVOT] Use `pivot-group-ui` branch
+# PIVOT
+
+## Sendbird UIKit version: 3.10.1
+
+## Updating Sendbird library
+Pulling from the Sendbird repository (`sendbird/sendbird-uikit-android`) causes a lot of hard-to-fix conflicts, so it's much easier to rebase our changes on top of the Sendbird latest `main` branch.
+```
+git remote add sendbird git@github.com:sendbird/sendbird-uikit-android.git
+git fetch sendbird
+git checkout main
+git rebase sendbird/main
+```
+Resolve all conflicts by checking the original commits (https://github.com/carrotsense/sendbird-uikit-android/commits/main) and preserving the implemented functionality.
 
 
 # Sendbird UIKit for Android

From d5e2b9e38eea265e3b6516438a438a4df46fabbd Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:33:46 +0100
Subject: [PATCH 12/25] Update UIKIT to v3.13.0 (Feb 1, 2024) (#14)

---
 README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3b62917f..4d700365 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,23 @@
 # PIVOT
 
-## Sendbird UIKit version: 3.10.1
+## Sendbird UIKit version: v3.13.0 (Feb 1, 2024)
 
 ## Updating Sendbird library
 Pulling from the Sendbird repository (`sendbird/sendbird-uikit-android`) causes a lot of hard-to-fix conflicts, so it's much easier to rebase our changes on top of the Sendbird latest `main` branch.
 ```
 git remote add sendbird git@github.com:sendbird/sendbird-uikit-android.git
 git fetch sendbird
-git checkout main
-git rebase sendbird/main
+git checkout origin/main
+git rebase -i sendbird/main
+git checkout -B main
+git push origin -f
 ```
 Resolve all conflicts by checking the original commits (https://github.com/carrotsense/sendbird-uikit-android/commits/main) and preserving the implemented functionality.
 
+Next, to store a history of updates:
+1. update `Sendbird UIKit version: $UIKIT_VERSION` in this README
+2. create PR like: `Update UIKit to v3.10.1 (Nov 9, 2023)`
+
 
 # Sendbird UIKit for Android
 ![Platform](https://img.shields.io/badge/platform-ANDROID-orange.svg)

From 8cc05d033708084df64eab65affb587877ed129b Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:32:15 +0100
Subject: [PATCH 13/25] [BRICK-2492] Spanish translations (#15)

* Spanish translations

* Translation fixes
---
 uikit/src/main/res/values-es/strings.xml | 225 +++++++++++++++++++++++
 1 file changed, 225 insertions(+)
 create mode 100644 uikit/src/main/res/values-es/strings.xml

diff --git a/uikit/src/main/res/values-es/strings.xml b/uikit/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..365e906b
--- /dev/null
+++ b/uikit/src/main/res/values-es/strings.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <!-- Header Title -->
+    <string name="sb_text_header_channel_list">Canales</string>
+    <string name="sb_text_header_channel_settings">Información del canal</string>
+    <string name="sb_text_header_member_list">Miembros</string>
+    <string name="sb_text_header_invite_member">Invitar usuarios</string>
+    <string name="sb_text_header_create_channel">Nuevo canal</string>
+    <string name="sb_text_header_set_operators">Establecer como operadores</string>
+    <string name="sb_text_header_participants">Participantes</string>
+    <string name="sb_text_header_participants_count">%s participantes</string>
+    <string name="sb_text_header_message_thread">Hilo</string>
+
+    <!-- Channel List -->
+    <string name="sb_text_channel_list_title_no_members">(Sin miembros)</string>
+    <string name="sb_text_channel_list_title_unknown">(Sin nombre)</string>
+    <string name="sb_text_channel_list_unread_count_max">Más de 99</string>
+    <string name="sb_text_channel_list_last_message_file">%1$s envió un archivo.</string>
+    <string name="sb_text_channel_list_last_message_file_unknown">Desconocido</string>
+    <string name="sb_text_channel_list_push_on">Activar las notificaciones</string>
+    <string name="sb_text_channel_list_push_off">Desactivar las notificaciones</string>
+    <string name="sb_text_channel_list_leave">Salir del canal</string>
+    <string name="sb_text_channel_list_empty">Sin canales</string>
+
+    <!-- Channel -->
+    <string name="sb_text_channel_message_badge_edited">&#160;(editado)</string>
+    <string name="sb_text_channel_tooltip">%d mensaje nuevo</string>
+    <string name="sb_text_channel_tooltip_with_count">%d mensajes nuevos</string>
+    <string name="sb_text_channel_anchor_copy">Copiar</string>
+    <string name="sb_text_channel_anchor_save">Guardar</string>
+    <string name="sb_text_channel_anchor_edit">Editar</string>
+    <string name="sb_text_channel_anchor_delete">Borrar</string>
+    <string name="sb_text_channel_anchor_reply">Responder</string>
+    <string name="sb_text_channel_anchor_reply_in_thread">Responder en el hilo</string>
+    <string name="sb_text_channel_anchor_retry">Reintentar</string>
+    <string name="sb_text_channel_input_text_hint">Introducir mensaje</string>
+    <string name="sb_text_channel_input_reply_text_hint">Responder al mensaje</string>
+    <string name="sb_text_channel_input_reply_in_thread_hint">Responder en el hilo</string>
+    <string name="sb_text_channel_input_reply_to_thread_hint">Responder al hilo</string>
+    <string name="sb_text_channel_input_camera">Tomar foto</string>
+    <string name="sb_text_channel_input_take_video">Hacer video</string>
+    <string name="sb_text_channel_input_gallery">Galería</string>
+    <string name="sb_text_channel_input_document">Documento</string>
+    <string name="sb_text_channel_typing_indicator_single">%s está escribiendo&#8230;</string>
+    <string name="sb_text_channel_typing_indicator_double">%s y %s están escribiendo&#8230;</string>
+    <string name="sb_text_channel_typing_indicator_multiple">Varias personas están escribiendo&#8230;</string>
+    <string name="sb_text_channel_unknown_type_text">(Tipo de mensaje desconocido)\nNo se puede leer este mensaje.</string>
+    <string name="sb_text_channel_reaction_count_max">99</string>
+    <string name="sb_text_channel_message_empty">Ningún mensaje</string>
+    <string name="sb_text_channel_message_unavailable">Mensaje no disponible</string>
+    <string name="sb_text_notification_fallback_title">(Error de plantilla)</string>
+    <string name="sb_text_notification_fallback_description">No se puede leer esta notificación.</string>
+    <string name="sb_text_notification_channel_message_empty">Notificaciones</string>
+    <string name="sb_text_notification_channel_list_error">Algo salió mal.</string>
+
+    <!-- Channel Settings -->
+    <string name="sb_text_channel_settings_moderations">Moderaciones</string>
+    <string name="sb_text_channel_settings_notification">Notificaciones</string>
+    <string name="sb_text_channel_settings_members">Miembros</string>
+    <string name="sb_text_channel_settings_leave_channel">Salir del canal</string>
+    <string name="sb_text_channel_settings_delete_channel">Eliminar canal</string>
+    <string name="sb_text_channel_settings_change_channel_name">Cambiar nombre</string>
+    <string name="sb_text_channel_settings_change_channel_name_hint">Ingresar nombre</string>
+    <string name="sb_text_channel_settings_change_channel_image">Cambiar imagen del canal</string>
+    <string name="sb_text_channel_settings_change_channel_image_camera">Tomar foto</string>
+    <string name="sb_text_channel_settings_change_channel_image_gallery">Elegir foto</string>
+    <string name="sb_text_channel_settings_message_search">Buscar en el canal</string>
+
+    <!-- User List -->
+    <string name="sb_text_user_list_badge_me">&#160;(Tú)</string>
+    <string name="sb_text_user_list_empty">Sin usuarios</string>
+    <string name="sb_text_participants_list_empty">Sin participantes</string>
+
+    <!-- Views -->
+    <string name="sb_text_yesterday">Ayer</string>
+    <string name="sb_text_dialog_delete_file_message">¿Deseas eliminar este archivo?</string>
+    <string name="sb_text_dialog_delete_message">¿Deseas eliminar este mensaje?</string>
+    <string name="sb_text_dialog_delete_multiple_files_message">¿Quieres eliminar las %d fotos?</string>
+    <string name="sb_text_dialog_delete_channel">¿Deseas eliminar el canal?</string>
+    <string name="sb_text_dialog_delete_channel_message">Una vez eliminado, este canal no se puede restaurar.</string>
+    <string name="sb_text_toast_success_copy">Copiado</string>
+    <string name="sb_text_toast_success_start_upload_file">Subiendo&#8230;</string>
+    <string name="sb_text_toast_success_start_download_file">Descargando&#8230;</string>
+    <string name="sb_text_toast_success_download_file">Archivo guardado</string>
+    <string name="sb_text_button_edit">Editar</string>
+    <string name="sb_text_button_invite">Invitar</string>
+    <string name="sb_text_button_cancel">Cancelar</string>
+    <string name="sb_text_button_create">Crear</string>
+    <string name="sb_text_button_save">Guardar</string>
+    <string name="sb_text_button_delete">Borrar</string>
+    <string name="sb_text_button_retry">Reintentar</string>
+    <string name="sb_text_button_selected">Seleccionado</string>
+    <string name="sb_text_button_add">Agregar</string>
+    <string name="sb_text_button_ok">Aceptar</string>
+    <string name="sb_text_ellipsis">&#8230;</string>
+
+    <!--  Message Thread  -->
+    <string name="sb_text_original_message_deleted">El hilo no existe porque el mensaje principal fue eliminado.</string>
+
+    <!-- Error Messages -->
+    <!-- Connection Error -->
+    <string name="sb_text_error_retry_request">Comprueba tu conexión y vuelve a intentarlo.</string>
+
+    <!-- Channel Error -->
+    <string name="sb_text_error_get_channel_list">No se pudo recuperar la lista de canales.</string>
+    <string name="sb_text_error_get_channel">No se pudo recuperar el canal.</string>
+    <string name="sb_text_error_create_channel">No se pudo crear el canal.</string>
+    <string name="sb_text_error_update_channel">No se pudo actualizar el canal.</string>
+    <string name="sb_text_error_leave_channel">No se pudo abandonar el canal.</string>
+    <string name="sb_text_error_delete_channel">No se pudo eliminar el canal.</string>
+    <string name="sb_text_error_push_notification_on">No se pudieron activar las notificaciones.</string>
+    <string name="sb_text_error_push_notification_off">No se pudieron desactivar las notificaciones.</string>
+    <string name="sb_text_error_push_notification_setting">No se pudo establecer la configuración de notificaciones.</string>
+    <string name="sb_text_error_invite_member">No se pudo invitar a los usuarios.</string>
+    <string name="sb_text_error_get_user_list">No se pudo recuperar la lista de usuarios.</string>
+    <string name="sb_text_error_add_reaction">No se pudo agregar la reacción.</string>
+    <string name="sb_text_error_register_operator">No se pudo registrar como operador.</string>
+    <string name="sb_text_error_unregister_operator">No se pudo cancelar el registro del operador.</string>
+    <string name="sb_text_error_delete_reaction">No se pudo eliminar la reacción.</string>
+    <string name="sb_text_error_get_thread_list">No se pudo recuperar la lista de temas.</string>
+
+    <!-- Message Error -->
+    <string name="sb_text_error_resend_message">No se pudo enviar el mensaje. Intentar de nuevo.</string>
+    <string name="sb_text_error_update_user_message">No se pudo editar el mensaje.</string>
+    <string name="sb_text_error_delete_message">No se pudo eliminar el mensaje.</string>
+    <string name="sb_text_error_copy_message">No se pudo copiar el mensaje.</string>
+    <string name="sb_text_error_send_message">No se pudo enviar el mensaje. Intentar de nuevo.</string>
+    <string name="sb_text_error_message_filtered">Mensaje filtrado.</string>
+    <string name="sb_text_error_mute_member">No se pudo silenciar al miembro. Intentar de nuevo.</string>
+    <string name="sb_text_error_mute_participant">No se pudo silenciar al participante. Intentar de nuevo.</string>
+    <string name="sb_text_error_ban_member">No se pudo bloquear al miembro. Intentar de nuevo.</string>
+    <string name="sb_text_error_ban_participant">No se pudo bloquear al participante. Intentar de nuevo.</string>
+    <string name="sb_text_error_unmute_member">No se pudo activar el sonido del miembro. Intentar de nuevo.</string>
+    <string name="sb_text_error_unmute_participant">No se pudo activar el sonido del participante. Intentar de nuevo.</string>
+    <string name="sb_text_error_unban_member">No se pudo desbloquear al miembro. Intentar de nuevo.</string>
+    <string name="sb_text_error_unban_participant">No se pudo desbloquear al participante. Intentar de nuevo.</string>
+    <string name="sb_text_error_user_muted">Estás silenciado por el operador.</string>
+    <string name="sb_text_error_channel_frozen">El canal está caído</string>
+
+    <!-- File Error -->
+    <string name="sb_text_error_open_camera">No se pudo abrir la cámara.</string>
+    <string name="sb_text_error_open_gallery">No se pudo abrir la biblioteca de fotos.</string>
+    <string name="sb_text_error_open_file">No se pudo abrir el archivo.</string>
+    <string name="sb_text_error_download_file">No se pudo descargar el archivo.</string>
+    <string name="sb_text_error_multiple_files_count_limit">Se pueden adjuntar hasta %d archivos.</string>
+    <string name="sb_text_error_file_upload_size_limit">El tamaño máximo por archivo es %s.</string>
+
+    <string name="sb_text_dialog_permission_title">Otorgar permiso</string>
+    <string name="sb_text_go_to_settings">Configuración</string>
+    <string name="sb_text_need_to_allow_permission_camera">%s\nnecesita permiso para acceder a tu cámara. Ve a Configuración para permitir el acceso</string>
+    <string name="sb_text_need_to_allow_permission_storage">%s\nnecesita permiso para acceder al almacenamiento de tu dispositivo. Ve a Configuración para permitir el acceso.</string>
+    <string name="sb_text_need_to_allow_permission_record_audio">%s\nnecesita permiso para acceder a grabación de audio. Ve a Configuración para permitir el acceso.</string>
+
+    <string name="sb_text_channel_input_text_hint_frozen">El chat no está disponible en este canal.</string>
+    <string name="sb_text_channel_input_text_hint_muted">Estás silenciado</string>
+    <string name="sb_text_select_channel_type">Tipo de canal</string>
+    <string name="sb_text_group">Grupo</string>
+    <string name="sb_text_super_group">Supergrupo</string>
+    <string name="sb_text_broadcast">Transmisión</string>
+    <string name="sb_text_information_channel_frozen">Canal caído</string>
+    <string name="sb_text_operator">Operador</string>
+    <string name="sb_text_menu_operators">Operadores</string>
+    <string name="sb_text_menu_muted_members">Miembros silenciados</string>
+    <string name="sb_text_menu_banned_users">Usuarios bloqueados</string>
+    <string name="sb_text_menu_freeze_channel">Congelar canal</string>
+    <string name="sb_text_empty_no_operator_member">Ningún miembro operador</string>
+    <string name="sb_text_empty_no_muted_member">No hay miembros silenciados</string>
+    <string name="sb_text_empty_no_banned_users">No hay usuarios bloqueados</string>
+    <string name="sb_text_menu_muted_participants">Participantes silenciados</string>
+    <string name="sb_text_empty_no_operator_participant">Ningún operador participante</string>
+    <string name="sb_text_empty_no_muted_participant">No hay participantes silenciados</string>
+
+    <!-- Moderation -->
+    <string name="sb_text_register_operator">Registrarse como operador</string>
+    <string name="sb_text_mute_member">Silenciar</string>
+    <string name="sb_text_mute_participant">Silenciar</string>
+    <string name="sb_text_ban_member">Bloquear</string>
+    <string name="sb_text_ban_participant">Bloquear</string>
+    <string name="sb_text_unregister_operator">Operador no registrado</string>
+    <string name="sb_text_unmute_member">Dejar de silenciar</string>
+    <string name="sb_text_unban_member">Desbloquear</string>
+    <string name="sb_text_unban_participant">Desbloquear</string>
+    <string name="sb_text_unmute_participant">Dejar de silenciar</string>
+
+    <string name="sb_text_message">Mensaje</string>
+    <string name="sb_text_user_id">Id. de usuario</string>
+
+    <string name="sb_text_url">URL</string>
+    <string name="sb_text_error_not_possible_resend_message">No se puede enviar el mensaje.</string>
+
+    <!-- Message Search -->
+    <string name="sb_text_button_search">Buscar</string>
+    <string name="sb_text_search_result_empty">No se han encontrado resultados.</string>
+    <string name="sb_text_error_search_failure">Algo salió mal. Intentar de nuevo.</string>
+
+    <!-- Message Reply -->
+    <string name="sb_text_you">Tú</string>
+    <string name="sb_text_reply_to">Responder</string>
+    <string name="sb_text_replied_to">%s respondió a %s</string>
+    <string name="sb_text_error_original_message_not_found">No se pudo encontrar el mensaje original de esta respuesta.</string>
+    <string name="sb_text_exceed_mention_limit_count">Puedes tener hasta %d menciones por mensaje.</string>
+    <string name="sb_text_number_of_reply">%d respuesta</string>
+    <string name="sb_text_number_of_replies">%d respuestas</string>
+    <string name="sb_text_max_number_of_replies">Más de 99 respuestas</string>
+
+    <!-- Channel Push Setting -->
+    <string name="sb_text_push_setting_on">Encendido</string>
+    <string name="sb_text_push_setting_off">Apagado</string>
+    <string name="sb_text_push_setting_mentions_only">Solo menciones</string>
+    <string name="sb_text_push_setting_option_all">Todos los mensajes nuevos</string>
+    <string name="sb_text_push_setting_description">Actívalo para recibir notificaciones cuando se entreguen mensajes a este canal.</string>
+
+    <!-- Create OpenChannel -->
+    <string name="text_input_channel_name_hint">Ingresar nombre del canal</string>
+    <string name="text_remove_photo">Eliminar foto</string>
+
+    <!-- Voice message -->
+    <string name="sb_text_voice_message">Mensaje de voz</string>
+
+    <!-- AI Chatbot -->
+    <string name="sb_forms_submit">Entregar</string>
+    <string name="sb_forms_invalid_form_field">Verifica el valor</string>
+    <string name="sb_forms_submit_failed">Erro en la entrega</string>
+    <string name="sb_forms_optional">(opcional)</string>
+</resources>

From 37297b85670faf0f4e1a2eb681dcee07ba780741 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Thu, 14 Mar 2024 16:13:30 +0100
Subject: [PATCH 14/25] [BRICK-2571] Upgrade compileSdkVersion and
 targetSdkVersion to latest Android 34 (#16)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 99b24464..d12449e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.22'
     ext.paparazzi_version = '1.3.1'
 
     dependencies {

From d34f8bc9f931f46895df320d8483769d8faf6f51 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Thu, 26 Sep 2024 06:22:13 +0200
Subject: [PATCH 15/25] Updated UIKit to v3.21.0 (Sep 12, 2024) with Chat SDK
 `v4.19.0` (#17)

---
 README.md          | 14 +++-----------
 uikit/build.gradle |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4d700365..633493da 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,10 @@
 # PIVOT
 
-## Sendbird UIKit version: v3.13.0 (Feb 1, 2024)
+## Sendbird UIKit version: v3.21.0 (Sep 12, 2024) with Chat SDK `v4.19.0`
 
 ## Updating Sendbird library
-Pulling from the Sendbird repository (`sendbird/sendbird-uikit-android`) causes a lot of hard-to-fix conflicts, so it's much easier to rebase our changes on top of the Sendbird latest `main` branch.
-```
-git remote add sendbird git@github.com:sendbird/sendbird-uikit-android.git
-git fetch sendbird
-git checkout origin/main
-git rebase -i sendbird/main
-git checkout -B main
-git push origin -f
-```
-Resolve all conflicts by checking the original commits (https://github.com/carrotsense/sendbird-uikit-android/commits/main) and preserving the implemented functionality.
+Pull the origin repository.
+Don't use rebase because it messes up git history by overriding original PRs/commit.
 
 Next, to store a history of updates:
 1. update `Sendbird UIKit version: $UIKIT_VERSION` in this README
diff --git a/uikit/build.gradle b/uikit/build.gradle
index d648af07..95d44e57 100644
--- a/uikit/build.gradle
+++ b/uikit/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlinx-serialization'
     id 'kotlin-parcelize'
-    id 'org.jetbrains.dokka' version "$kotlin_version"
+    id 'org.jetbrains.dokka' version "1.9.20"
 }
 
 

From 5512a3742b6abdf76eb8e18a85bc7d3a159c2e86 Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Thu, 26 Sep 2024 09:37:51 +0200
Subject: [PATCH 16/25] Fixed: java.lang.IllegalStateException: Default
 FirebaseApp is not initialized in this process com.carrot.pivot. Make sure to
 call FirebaseApp.initializeApp(Context) first. (#18)

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d12449e7..91161f40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '8.4.1' apply false
-    id 'com.android.library' version '8.4.1' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
     id 'com.google.gms.google-services' version '4.3.15' apply false
 }

From 188d12d32dca6601317479ed19baf47679c790b4 Mon Sep 17 00:00:00 2001
From: Simon <simon@carrot.co>
Date: Wed, 29 Jan 2025 14:17:18 +0100
Subject: [PATCH 17/25] Update README

---
 README.md | 122 ++++--------------------------------------------------
 1 file changed, 7 insertions(+), 115 deletions(-)

diff --git a/README.md b/README.md
index 633493da..24dfb0fc 100644
--- a/README.md
+++ b/README.md
@@ -1,129 +1,21 @@
 # PIVOT
 
-## Sendbird UIKit version: v3.21.0 (Sep 12, 2024) with Chat SDK `v4.19.0`
+## Sendbird UIKit version: v3.22.0 (Dec 16, 2024) with Chat SDK v4.21.1
 
 ## Updating Sendbird library
 Pull the origin repository.
 Don't use rebase because it messes up git history by overriding original PRs/commit.
 
+`git fetch sendbird`
+`git pull sendbird main`
+
 Next, to store a history of updates:
 1. update `Sendbird UIKit version: $UIKIT_VERSION` in this README
 2. create PR like: `Update UIKit to v3.10.1 (Nov 9, 2023)`
 
 
 # Sendbird UIKit for Android
-![Platform](https://img.shields.io/badge/platform-ANDROID-orange.svg)
-![Languages](https://img.shields.io/badge/language-JAVA-orange.svg)
-
-## Introduction
-
-We are introducing a new version of the Sendbird UIKit. Version 3 features a new modular architecture with more granular components that give you enhanced flexibility to customize your web and mobile apps. Check out our [migration guides](/changelogs/MIGRATIONGUIDE_V3.md) and download [our samples](https://github.com/sendbird/sendbird-uikit-android/tree/main/uikit-samples)
-
-Sendbird UIKit for Android is a development kit with an user interface that enables an easy and fast integration of standard chat features into new or existing client apps. This repository houses the UIKit source code in addition to two samples as explained below.
-
-- **uikit** is where you can find the open source code. Check out [UIKit Open Source Guidelines](https://github.com/sendbird/sendbird-uikit-android-sources/blob/main/OPENSOURCE_GUIDELINES.md) for more information regarding our stance on open source.
-- **uikit-samples** consists of four use cases of UIKit.
-You can navigate to each use case through the four menus that appear when you run it.
-  * Basic Usage - A sample that contains the basic usage of UIKit. Please check the [README](uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/README.md) for details.
-  * Customizations - Examples that have applied customization to UIKit. Please check the [README](uikit-samples/src/main/java/com/sendbird/uikit/samples/customization/README.md) for details.
-  * AI Chatbot: You can chat with the AI Chatbot running on the Sendbird platform.
-It is disabled by default, To enable it, please check the [README](uikit-samples/src/main/java/com/sendbird/uikit/samples/aichatbot/README.md) for details.
-  * Sendbird Notification: You can try out Sendbird's Notification product in this sample.
-    It is disabled by default. To enable it, please check the [README](uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/README.md) for details.
-    Caution: This sample is not related to push notifications. It is a demonstration of Sendbird's Notification product.
-
-### More about Sendbird UIKIT for Android
-
-Find out more about Sendbird UIKit for Android at [UIKit for Android doc](https://sendbird.com/docs/uikit/v3/android/overview). If you need any help in resolving any issues or have questions, visit [our community](https://community.sendbird.com).
-
-<br />
-
-## Before getting started
-
-This section shows you the prerequisites you need for testing Sendbird UIKit for Android sample apps.
-
-### Requirements
-
-The minimum requirements for UIKit for Android are:
-
-- Android 5.0 (API level 21) or higher
-- Java 8 or higher
-- Support androidx only
-- Android Gradle plugin 4.0.1 or higher
-- Sendbird Chat SDK for Android 4.0.3 and later
-
-### Try the sample app using your data
-
-If you would like to try the sample app specifically fit to your usage, you can do so by replacing the default sample app ID with yours, which you can obtain by [creating your Sendbird application from the dashboard](https://sendbird.com/docs/chat/v4/android/quickstart/send-first-message#3-install-and-configure-the-chat-sdk-4-step-1-create-a-sendbird-application-from-your-dashboard). Furthermore, you could also add data of your choice on the dashboard to test. This will allow you to experience the sample app with data from your Sendbird application.
-
-<br />
-
-## Getting started
-
-This section explains the steps you need to take before testing the sample apps.
-
-### Create a project
-
-Go to your `Android Studio` and create a project for UIKit for Android in the **Project window** as follows:
-
-1. In the **Welcome to Android Studio** window, click **Start a new Android Studio project**.
-2. In the **Select a Project Template** window, select **Empty Activity**, and click **Next**.
-3. Enter your project name in the **Name** field in the **Configure your project** window.
-4. Select your language as either **Java** or **Kotlin** from the **Language** drop-down menu.
-5. Enable `Use androidx.*artifacts`.
-6. Select minimum API level as 21 or higher.
-
-### Install UIKit for Android
-
-UIKit for Android is installed via `Gradle`. Begin by opening the project's top-level `build.gradle` file and adding code blocks as below:
-
-> Note: Add the code blocks in your root `build.gradle` file, not your module `build.gradle` file.
-
-```gradle
-allprojects {
-    repositories {
-        maven { url "https://jitpack.io" }
-        maven { url "https://repo.sendbird.com/public/maven" }
-    }
-}
-```
-
-If using Gradle 6.8 or higher, add the following to your `settings.gradle` file:
-
-```gradle
-dependencyResolutionManagement {
-    repositories {
-        maven { url "https://jitpack.io" }
-        maven { url "https://repo.sendbird.com/public/maven" }
-    }
-}
-```
-
-
-
-Then, open the `build.gradle` file at the application level. For `Java` and `Kotlin`, add code blocks and dependencies as below:
-
-> Note: View binding should be enabled in your `build.gradle` file.
-
-```gradle
-apply plugin: 'com.android.application'
-
-android {
-    buildFeatures {
-        viewBinding true
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation 'com.sendbird.sdk:uikit:LATEST_VERSION'
-}
-```
-
-After saving your `build.gradle` file, click the **Sync** button to apply all the changes.
+https://github.com/sendbird/sendbird-uikit-android/blob/main/CHANGELOG.md
 
-<br />
+# Sendbird SDK for Android
+https://github.com/sendbird/sendbird-chat-sdk-android/blob/main/CHANGELOG.md

From efcffb5b3e39c6c63e936e2c494ab8d93d5c6c46 Mon Sep 17 00:00:00 2001
From: Simon <simon@carrot.co>
Date: Sat, 9 Aug 2025 16:33:52 +0200
Subject: [PATCH 18/25] Update UIKit to v3.24.0 (Jul 31, 2025)

---
 CHANGELOG.md                                  |  26 ++
 README.md                                     |   3 +-
 build.gradle                                  |   4 +-
 gradle.properties                             |   2 +-
 .../samples/basic/GroupChannelMainActivity.kt |   2 +
 .../openchannel/OpenChannelMainActivity.kt    |   2 +
 .../livestream/LiveStreamActivity.kt          |   4 +-
 .../uikit/samples/common/ThemeHomeActivity.kt |   2 +
 .../common/extensions/ViewExtentions.kt       |  21 ++
 uikit-samples/src/main/res/values/styles.xml  |   2 +-
 .../src/main/res/values/styles_dark.xml       |   2 +-
 uikit/build.gradle                            |   2 +-
 .../com/sendbird/uikit/SendbirdUIKit.java     |  25 ++
 .../activities/BannedUserListActivity.java    |   7 +
 .../uikit/activities/ChannelActivity.java     |   7 +
 .../uikit/activities/ChannelListActivity.java |   8 +-
 .../ChannelPushSettingActivity.java           |   7 +
 .../activities/ChannelSettingsActivity.java   |   7 +
 .../ChatNotificationChannelActivity.java      |   7 +
 .../activities/CreateChannelActivity.java     |   7 +
 .../activities/CreateOpenChannelActivity.java |   7 +
 .../FeedNotificationChannelActivity.java      |   7 +
 .../uikit/activities/InviteUserActivity.java  |   7 +
 .../uikit/activities/MemberListActivity.java  |   7 +
 .../activities/MessageSearchActivity.java     |   7 +
 .../activities/MessageThreadActivity.java     |   7 +
 .../uikit/activities/ModerationActivity.java  |   7 +
 .../activities/MutedMemberListActivity.java   |   7 +
 .../uikit/activities/OpenChannelActivity.java |   7 +
 .../OpenChannelBannedUserListActivity.java    |   7 +
 .../activities/OpenChannelListActivity.java   |  97 +++++--
 .../OpenChannelModerationActivity.java        |   7 +
 ...enChannelMutedParticipantListActivity.java |   7 +
 .../OpenChannelOperatorListActivity.java      |   7 +
 .../OpenChannelRegisterOperatorActivity.java  |   7 +
 .../OpenChannelSettingsActivity.java          |   7 +
 .../activities/OperatorListActivity.java      |   7 +
 .../activities/ParticipantListActivity.java   |   7 +
 .../uikit/activities/PhotoViewActivity.java   |   7 +
 .../activities/RegisterOperatorActivity.java  |   7 +
 .../adapter/MessageDiffCallback.java          |   4 +-
 .../com/sendbird/uikit/consts/StringSet.kt    |   1 +
 .../fragments/BaseMessageListFragment.java    |   4 +-
 .../uikit/fragments/ChannelFragment.java      | 131 ++++++++--
 .../uikit/fragments/OpenChannelFragment.java  |   4 +-
 .../uikit/fragments/PhotoViewFragment.java    |  12 +-
 .../internal/extensions/MessageExtensions.kt  |  13 +-
 .../internal/extensions/ViewExtensions.kt     |  62 +++++
 .../uikit/internal/model/ChannelUnreadInfo.kt |  53 ++++
 .../model/template_messages/KeySet.kt         |   1 +
 .../internal/ui/messages/AdminMessageView.kt  |   2 +
 .../internal/ui/messages/MyFileMessageView.kt |   2 +
 .../ui/messages/MyImageFileMessageView.kt     |   2 +
 .../internal/ui/messages/MyMessageView.kt     |   2 +
 .../ui/messages/MyMultipleFilesMessageView.kt |   2 +
 .../internal/ui/messages/MyUserMessageView.kt |   3 +-
 .../ui/messages/MyVideoFileMessageView.kt     |   2 +
 .../ui/messages/MyVoiceMessageView.kt         |   2 +
 .../uikit/internal/ui/messages/NewLineView.kt |  30 +++
 .../ui/messages/OtherFileMessageView.kt       |   2 +
 .../ui/messages/OtherImageFileMessageView.kt  |   2 +
 .../internal/ui/messages/OtherMessageView.kt  |   2 +
 .../messages/OtherMultipleFilesMessageView.kt |   2 +
 .../ui/messages/OtherTemplateMessageView.kt   |   2 -
 .../ui/messages/OtherUserMessageView.kt       |   4 +-
 .../ui/messages/OtherVideoFileMessageView.kt  |   2 +
 .../ui/messages/OtherVoiceMessageView.kt      |   2 +
 .../internal/ui/widgets/MentionWatcher.kt     |   4 +-
 .../ui/widgets/MessageRecyclerView.kt         |  20 ++
 .../sendbird/uikit/model/EdgeToEdgeConfig.kt  |  33 +++
 .../com/sendbird/uikit/model/MessageList.kt   |  25 +-
 .../com/sendbird/uikit/model/NewLineData.kt   |  13 +
 .../com/sendbird/uikit/model/TextUIConfig.kt  |   2 +-
 .../model/configurations/ChannelConfig.kt     |  28 +-
 .../components/BaseMessageListComponent.java  | 108 +++++++-
 .../com/sendbird/uikit/utils/FileUtils.java   |   5 +
 .../sendbird/uikit/vm/ChannelViewModel.java   | 244 +++++++++++++++++-
 .../com/sendbird/uikit/vm/FileDownloader.java |   6 +-
 .../res/drawable-hdpi/icon_mark_as_unread.png | Bin 0 -> 836 bytes
 .../res/drawable-mdpi/icon_mark_as_unread.png | Bin 0 -> 522 bytes
 .../drawable-xhdpi/icon_mark_as_unread.png    | Bin 0 -> 937 bytes
 .../drawable-xxhdpi/icon_mark_as_unread.png   | Bin 0 -> 1442 bytes
 .../drawable-xxxhdpi/icon_mark_as_unread.png  | Bin 0 -> 1979 bytes
 uikit/src/main/res/layout/sb_activity.xml     |   1 +
 .../sb_view_admin_message_component.xml       |  20 +-
 .../layout/sb_view_message_recycler_view.xml  |  49 ++++
 ...b_view_my_file_image_message_component.xml |  11 +-
 .../sb_view_my_file_message_component.xml     |  15 +-
 ...b_view_my_file_video_message_component.xml |  11 +-
 .../layout/sb_view_my_message_component.xml   |  11 +-
 ...ew_my_multiple_files_message_component.xml |  11 +-
 .../sb_view_my_user_message_component.xml     |  11 +-
 .../sb_view_my_voice_message_component.xml    |  15 +-
 .../src/main/res/layout/sb_view_new_line.xml  |  40 +++
 ...iew_other_file_image_message_component.xml |  17 +-
 .../sb_view_other_file_message_component.xml  |  21 +-
 ...iew_other_file_video_message_component.xml |  17 +-
 .../sb_view_other_message_component.xml       |  21 +-
 ...other_multiple_files_message_component.xml |  17 +-
 .../sb_view_other_user_message_component.xml  |  15 +-
 .../sb_view_other_voice_message_component.xml |  21 +-
 uikit/src/main/res/values/attrs.xml           |   7 +
 uikit/src/main/res/values/strings.xml         |   6 +-
 uikit/src/main/res/values/styles.xml          |   9 +
 uikit/src/main/res/values/styles_dark.xml     |   9 +
 105 files changed, 1424 insertions(+), 146 deletions(-)
 create mode 100644 uikit/src/main/java/com/sendbird/uikit/internal/model/ChannelUnreadInfo.kt
 create mode 100644 uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/NewLineView.kt
 create mode 100644 uikit/src/main/java/com/sendbird/uikit/model/EdgeToEdgeConfig.kt
 create mode 100644 uikit/src/main/java/com/sendbird/uikit/model/NewLineData.kt
 create mode 100644 uikit/src/main/res/drawable-hdpi/icon_mark_as_unread.png
 create mode 100644 uikit/src/main/res/drawable-mdpi/icon_mark_as_unread.png
 create mode 100644 uikit/src/main/res/drawable-xhdpi/icon_mark_as_unread.png
 create mode 100644 uikit/src/main/res/drawable-xxhdpi/icon_mark_as_unread.png
 create mode 100644 uikit/src/main/res/drawable-xxxhdpi/icon_mark_as_unread.png
 create mode 100644 uikit/src/main/res/layout/sb_view_new_line.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ec0742a..a8a50ee3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,30 @@
 # Changelog
+### v3.24.0 (Jul 31, 2025) with Chat SDK `v4.28.2`
+- Support MarkAsUnread in UIKit Android View
+  - Added new configuration option `enableMarkAsUnread` to enable/disable the feature
+  - Added new interfaces for using markAsUnread feature to `ChannelFragment` and `ChannelViewModel`
+  - Added `NewLineView` to indicate the start of unread messages.
+  - New `markAsUnread` menu item in `ChannelFragment`
+- Fixed an issue where messages with same `createdAt` timestamps disappeared from `ChannelFragment`
+### v3.23.3 (Jul 17, 2025) with Chat SDK `v4.27.3`
+- Added support for setting `isAppearanceLightStatusBars` in edge-to-edge mode.
+    - Added `useAppearanceLightStatusBars` to `EdgeToEdgeConfig`.
+### v3.23.2 (Jun 27, 2025) with Chat SDK `v4.27.3`
+- Release with [the latest chat SDK](https://github.com/sendbird/sendbird-chat-sdk-android/releases/tag/4.27.3) to avoid potential issues
+### v3.23.1 (Jun 24, 2025) with Chat SDK `v4.27.2`
+- Release with [the latest chat SDK](https://github.com/sendbird/sendbird-chat-sdk-android/releases/tag/4.27.2) to avoid potential issues
+### v3.23.0 (Apr 1, 2025) with Chat SDK `v4.24.1`
+- Added a new interface to set the status bar color in edge-to-edge mode.
+    - Added `void setEdgeToEdgeConfig(EdgeToEdgeConfig)`
+    - Added `EdgeToEdgeConfig getEdgeToEdgeConfig()`
+    - Added `EdgeToEdgeConfig` which defines a configuration for UI styling in edge-to-edge mode
+- Fixed an issue where some UIKit components were unresponsive when both the status bar and navigation bar were hidden in edge-to-edge mode.
+- Fixed an issue where images, GIFs, and videos could not be downloaded while the network was offline.
+### v3.22.2 (Feb 28, 2025) with Chat SDK `v4.24.0`
+* Replaced `newIntent` methods, which had a channelUrl parameter, with one that does not include it. in `OpenChannelListActivity`
+### v3.22.1 (Feb 20, 2025) with Chat SDK `v4.23.1`
+* Fixed suggested replies not disappearing after sending a message.
+* Fixed the mention list not showing up when typing a nickname.
 ### v3.22.0 (Dec 16, 2024) with Chat SDK `v4.21.1`
 * Templated-related code has been moved to a separate module.
 ### v3.21.1 (Nov 12, 2024) with Chat SDK `v4.20.0`
diff --git a/README.md b/README.md
index 24dfb0fc..45afb365 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
 # PIVOT
 
-## Sendbird UIKit version: v3.22.0 (Dec 16, 2024) with Chat SDK v4.21.1
+## Sendbird UIKit version: v3.24.0 (Jul 31, 2025) with Chat SDK v4.28.2
 
 ## Updating Sendbird library
 Pull the origin repository.
 Don't use rebase because it messes up git history by overriding original PRs/commit.
 
 `git fetch sendbird`
+
 `git pull sendbird main`
 
 Next, to store a history of updates:
diff --git a/build.gradle b/build.gradle
index 91161f40..66c44243 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '8.3.0' apply false
-    id 'com.android.library' version '8.3.0' apply false
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
     id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
     id 'com.google.gms.google-services' version '4.3.15' apply false
 }
diff --git a/gradle.properties b/gradle.properties
index 3eb54b42..38c822aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,5 +22,5 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.enableR8.fullMode=false
 
-UIKIT_VERSION = 3.22.0
+UIKIT_VERSION = 3.24.0
 UIKIT_VERSION_CODE = 1
diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/GroupChannelMainActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/GroupChannelMainActivity.kt
index 05e9267c..9c4b4cbe 100644
--- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/GroupChannelMainActivity.kt
+++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/GroupChannelMainActivity.kt
@@ -23,6 +23,7 @@ import com.sendbird.uikit.samples.R
 import com.sendbird.uikit.samples.common.SampleSettingsFragment
 import com.sendbird.uikit.samples.common.consts.StringSet
 import com.sendbird.uikit.samples.common.extensions.isUsingDarkTheme
+import com.sendbird.uikit.samples.common.extensions.setInsetMargin
 import com.sendbird.uikit.samples.common.preferences.PreferenceUtils
 import com.sendbird.uikit.samples.common.widgets.CustomTabView
 import com.sendbird.uikit.samples.databinding.ActivityGroupChannelMainBinding
@@ -35,6 +36,7 @@ class GroupChannelMainActivity : AppCompatActivity() {
         setTheme(SendbirdUIKit.getDefaultThemeMode().resId)
         binding = ActivityGroupChannelMainBinding.inflate(layoutInflater).apply {
             setContentView(root)
+            root.setInsetMargin(window)
             viewPager.adapter = MainAdapter(this@GroupChannelMainActivity)
             val isDarkMode = PreferenceUtils.themeMode.isUsingDarkTheme()
             val backgroundRedId = if (isDarkMode) R.color.background_600 else R.color.background_50
diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt
index 64db2fe3..0f6634eb 100644
--- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt
+++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt
@@ -20,6 +20,7 @@ import com.sendbird.uikit.samples.basic.openchannel.livestream.LiveStreamListFra
 import com.sendbird.uikit.samples.common.SampleSettingsFragment
 import com.sendbird.uikit.samples.common.consts.StringSet
 import com.sendbird.uikit.samples.common.extensions.isUsingDarkTheme
+import com.sendbird.uikit.samples.common.extensions.setInsetMargin
 import com.sendbird.uikit.samples.common.preferences.PreferenceUtils
 import com.sendbird.uikit.samples.common.widgets.CustomTabView
 import com.sendbird.uikit.samples.databinding.ActivityOpenChannelMainBinding
@@ -46,6 +47,7 @@ class OpenChannelMainActivity : AppCompatActivity() {
                 )
             )
             setSupportActionBar(titleBar)
+            root.setInsetMargin(window)
             viewPager.adapter = MainAdapter(this@OpenChannelMainActivity)
             val backgroundRedId = if (isDarkMode) R.color.background_600 else R.color.background_50
             tabLayout.setBackgroundResource(backgroundRedId)
diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamActivity.kt
index d8a187ce..c6ef98dd 100644
--- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamActivity.kt
+++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamActivity.kt
@@ -26,14 +26,15 @@ import com.sendbird.uikit.fragments.OpenChannelFragment
 import com.sendbird.uikit.samples.R
 import com.sendbird.uikit.samples.common.consts.StringSet
 import com.sendbird.uikit.samples.common.extensions.isUsingDarkTheme
+import com.sendbird.uikit.samples.common.extensions.setInsetMargin
 import com.sendbird.uikit.samples.common.extensions.toggleVisibility
 import com.sendbird.uikit.samples.common.preferences.PreferenceUtils
 import com.sendbird.uikit.samples.databinding.ActivityLiveStreamBinding
 import com.sendbird.uikit.utils.ContextUtils
 import org.json.JSONException
 import org.json.JSONObject
-import java.util.Locale
 import java.lang.ref.WeakReference
+import java.util.Locale
 
 /**
  * Displays an open channel screen used for live stream.
@@ -71,6 +72,7 @@ class LiveStreamActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityLiveStreamBinding.inflate(layoutInflater).apply {
             setContentView(root)
+            root.setInsetMargin(window)
             if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
                 sbFragmentContainer.setBackgroundResource(android.R.color.transparent)
             } else {
diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/ThemeHomeActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/ThemeHomeActivity.kt
index 50a9466e..8099ea52 100644
--- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/ThemeHomeActivity.kt
+++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/ThemeHomeActivity.kt
@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
 import com.sendbird.uikit.samples.R
 import com.sendbird.uikit.samples.common.extensions.isUsingDarkTheme
+import com.sendbird.uikit.samples.common.extensions.setInsetMargin
 import com.sendbird.uikit.samples.common.preferences.PreferenceUtils
 
 abstract class ThemeHomeActivity : AppCompatActivity() {
@@ -18,6 +19,7 @@ abstract class ThemeHomeActivity : AppCompatActivity() {
         setTheme(if (PreferenceUtils.themeMode.isUsingDarkTheme()) R.style.AppTheme_Dark else R.style.AppTheme)
         setContentView(binding.root)
         applyTheme()
+        binding.root.setInsetMargin(window)
     }
 
     override fun onResume() {
diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/extensions/ViewExtentions.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/extensions/ViewExtentions.kt
index 2d16835a..97c09d81 100644
--- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/extensions/ViewExtentions.kt
+++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/extensions/ViewExtentions.kt
@@ -3,8 +3,12 @@ package com.sendbird.uikit.samples.common.extensions
 import android.content.Context
 import android.os.Build
 import android.view.View
+import android.view.Window
 import android.widget.TextView
 import androidx.annotation.ColorRes
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 
 @Suppress("DEPRECATION")
 internal fun TextView.setAppearance(context: Context, res: Int) {
@@ -22,3 +26,20 @@ internal fun TextView.setTextColorResource(@ColorRes id: Int) {
 internal fun View.toggleVisibility() {
     visibility = if (visibility == View.VISIBLE) View.GONE else View.VISIBLE
 }
+
+internal fun View.setInsetMargin(window: Window) {
+    // For custom edge-to-edge system bar color
+//    val edgeToEdgeConfig = EdgeToEdgeConfig(
+//        statusBarColorLight = context.getColorResource(R.color.primary_300),
+//        statusBarColorDark = context.getColorResource(R.color.primary_100)
+//    )
+//    SendbirdUIKit.setEdgeToEdgeConfig(edgeToEdgeConfig)
+
+    ViewCompat.setOnApplyWindowInsetsListener(this) { v, windowInsets ->
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime())
+        v.setPadding(insets.left, insets.top, insets.right, insets.bottom)
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = true
+        WindowInsetsCompat.CONSUMED
+    }
+}
+
diff --git a/uikit-samples/src/main/res/values/styles.xml b/uikit-samples/src/main/res/values/styles.xml
index 1b399821..9178c0fc 100644
--- a/uikit-samples/src/main/res/values/styles.xml
+++ b/uikit-samples/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/primary_main</item>
         <item name="colorPrimaryDark">@color/primary_extra_dark</item>
diff --git a/uikit-samples/src/main/res/values/styles_dark.xml b/uikit-samples/src/main/res/values/styles_dark.xml
index af7d0b11..800f9f45 100644
--- a/uikit-samples/src/main/res/values/styles_dark.xml
+++ b/uikit-samples/src/main/res/values/styles_dark.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme.Dark">
+    <style name="AppTheme.Dark" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/primary_light</item>
         <item name="colorPrimaryDark">@color/background_500</item>
diff --git a/uikit/build.gradle b/uikit/build.gradle
index 9bc8692a..54dfa118 100644
--- a/uikit/build.gradle
+++ b/uikit/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Sendbird
-    api 'com.sendbird.sdk:sendbird-chat:4.21.1'
+    api 'com.sendbird.sdk:sendbird-chat:4.28.2'
     implementation "com.sendbird.sdk:message-template:1.0.0"
 
     implementation 'com.github.bumptech.glide:glide:4.16.0'
diff --git a/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java b/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java
index 607e2dfa..e83ea826 100644
--- a/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java
+++ b/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java
@@ -55,6 +55,7 @@
 import com.sendbird.uikit.internal.singleton.UIKitConfigRepository;
 import com.sendbird.uikit.internal.tasks.JobResultTask;
 import com.sendbird.uikit.log.Logger;
+import com.sendbird.uikit.model.EdgeToEdgeConfig;
 import com.sendbird.uikit.model.EmojiManager;
 import com.sendbird.uikit.model.UserMentionConfig;
 import com.sendbird.uikit.model.VoiceRecorderConfig;
@@ -245,6 +246,8 @@ public ColorStateList getErrorTintColorStateList(@NonNull Context context) {
     private static UserMentionConfig userMentionConfig = new UserMentionConfig.Builder().build();
     @NonNull
     private static VoiceRecorderConfig voiceRecorderConfig = new VoiceRecorderConfig();
+    @NonNull
+    private static EdgeToEdgeConfig edgeToEdgeConfig = new EdgeToEdgeConfig();
 
     static void clearAll() {
         SendbirdUIKit.customUserListQueryHandler = null;
@@ -820,6 +823,17 @@ public static void setCustomParamsHandler(@Nullable CustomParamsHandler handler)
         SendbirdUIKit.customParamsHandler = handler;
     }
 
+    /**
+     * Sets the edge-to-edge config for customizing the status bar color.
+     *
+     * @param config The configuration to be applied for custom status bar color on edge-to-edge
+     * since 3.23.0
+     */
+    public static void setEdgeToEdgeConfig(@NonNull EdgeToEdgeConfig config) {
+        edgeToEdgeConfig = config;
+    }
+
+
     /**
      * Sets the factory that creates fragments generated by UIKit's basic activities.
      * <p>
@@ -1042,6 +1056,17 @@ public static CustomParamsHandler getCustomParamsHandler() {
         return customParamsHandler;
     }
 
+    /**
+     * Returns the edge-to-edge config for customizing the status bar color.
+     *
+     * @return The configuration applied for custom status bar color on edge-to-edge
+     * since 3.23.0
+     */
+    @NonNull
+    public static EdgeToEdgeConfig getEdgeToEdgeConfig() {
+        return edgeToEdgeConfig;
+    }
+
     /**
      * Initiates a group channel with the provided bot ID.
      *
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/BannedUserListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/BannedUserListActivity.java
index 3f2719e2..94005e8a 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/BannedUserListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/BannedUserListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -89,6 +92,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelActivity.java
index 9d3a0a24..2043c9b4 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -70,6 +73,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelListActivity.java
index b860b137..f20ec6bc 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -114,8 +117,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
-        Fragment fragment = createFragment();
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
 
+        Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
         manager.beginTransaction()
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelPushSettingActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelPushSettingActivity.java
index 7c965176..f40a4311 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelPushSettingActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelPushSettingActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -88,6 +91,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelSettingsActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelSettingsActivity.java
index f5810777..16d48c19 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ChannelSettingsActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ChannelSettingsActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -87,6 +90,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ChatNotificationChannelActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ChatNotificationChannelActivity.java
index e4f9d8ae..f4f8b1ac 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ChatNotificationChannelActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ChatNotificationChannelActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -88,6 +91,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/CreateChannelActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/CreateChannelActivity.java
index ec233f72..ea04c2d6 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/CreateChannelActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/CreateChannelActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -115,6 +118,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/CreateOpenChannelActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/CreateOpenChannelActivity.java
index 6a27e9d6..5f93f19b 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/CreateOpenChannelActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/CreateOpenChannelActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -55,6 +58,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/FeedNotificationChannelActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/FeedNotificationChannelActivity.java
index 6bbf64a3..1b3b03bb 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/FeedNotificationChannelActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/FeedNotificationChannelActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -88,6 +91,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/InviteUserActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/InviteUserActivity.java
index 56ebc143..79080372 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/InviteUserActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/InviteUserActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -86,6 +89,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/MemberListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/MemberListActivity.java
index e7d854c2..d28afc0a 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/MemberListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/MemberListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -88,6 +91,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         final Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/MessageSearchActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/MessageSearchActivity.java
index 9b79e587..4919b67d 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/MessageSearchActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/MessageSearchActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -85,6 +88,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         final Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/MessageThreadActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/MessageThreadActivity.java
index e170ed35..0d07155c 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/MessageThreadActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/MessageThreadActivity.java
@@ -1,10 +1,13 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.transition.Slide;
 import android.view.Gravity;
+import android.view.View;
 import android.view.Window;
 
 import androidx.annotation.NonNull;
@@ -38,6 +41,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ModerationActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ModerationActivity.java
index 5b7a9fbf..4ac96340 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ModerationActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ModerationActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -89,6 +92,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/MutedMemberListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/MutedMemberListActivity.java
index 5c9f67ff..cfa6b830 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/MutedMemberListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/MutedMemberListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -88,6 +91,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelActivity.java
index 43898646..08dbcde6 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -58,6 +61,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelBannedUserListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelBannedUserListActivity.java
index eaf09834..41802b1e 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelBannedUserListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelBannedUserListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,6 +94,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelListActivity.java
index 8731e6ef..977330f2 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,8 +17,6 @@
 import com.sendbird.uikit.R;
 import com.sendbird.uikit.SendbirdUIKit;
 import com.sendbird.uikit.consts.StringSet;
-import com.sendbird.uikit.utils.ContextUtils;
-import com.sendbird.uikit.utils.TextUtils;
 
 /**
  * Activity displays settings of a channel.
@@ -30,10 +31,13 @@ public class OpenChannelListActivity extends AppCompatActivity {
      * @param channelUrl the url of the channel will be implemented.
      * @return OpenChannelListActivity Intent.
      * since 3.2.0
+     * @deprecated 3.22.2
+     * <p> Use {@link OpenChannelListActivity#newIntent(Context)} instead.</p>
      */
+    @Deprecated
     @NonNull
     public static Intent newIntent(@NonNull Context context, @NonNull String channelUrl) {
-        return newIntentFromCustomActivity(context, OpenChannelListActivity.class, channelUrl);
+        return newIntentFromCustomActivity(context, OpenChannelListActivity.class);
     }
 
     /**
@@ -44,10 +48,13 @@ public static Intent newIntent(@NonNull Context context, @NonNull String channel
      * @param themeResId the resource identifier for custom theme.
      * @return OpenChannelListActivity Intent.
      * since 3.5.6
+     * @deprecated 3.22.2
+     * <p> Use {@link OpenChannelListActivity#newIntent(Context, int)} instead.</p>
      */
+    @Deprecated
     @NonNull
     public static Intent newIntent(@NonNull Context context, @NonNull String channelUrl, @StyleRes int themeResId) {
-        return newIntentFromCustomActivity(context, OpenChannelListActivity.class, channelUrl, themeResId);
+        return newIntentFromCustomActivity(context, OpenChannelListActivity.class, themeResId);
     }
 
     /**
@@ -58,10 +65,13 @@ public static Intent newIntent(@NonNull Context context, @NonNull String channel
      * @param channelUrl the url of the channel will be implemented.
      * @return Returns a newly created Intent that can be used to launch the activity.
      * since 3.2.0
+     * @deprecated 3.22.2
+     * <p> Use {@link OpenChannelListActivity#newIntentFromCustomActivity(Context, Class)} instead.</p>
      */
+    @Deprecated
     @NonNull
     public static Intent newIntentFromCustomActivity(@NonNull Context context, @NonNull Class<? extends OpenChannelListActivity> cls, @NonNull String channelUrl) {
-        return newIntentFromCustomActivity(context, cls, channelUrl, SendbirdUIKit.getDefaultThemeMode().getResId());
+        return newIntentFromCustomActivity(context, cls, SendbirdUIKit.getDefaultThemeMode().getResId());
     }
 
     /**
@@ -73,11 +83,65 @@ public static Intent newIntentFromCustomActivity(@NonNull Context context, @NonN
      * @param themeResId the resource identifier for custom theme.
      * @return Returns a newly created Intent that can be used to launch the activity.
      * since 3.5.6
+     * @deprecated 3.22.2
+     * <p> Use {@link OpenChannelListActivity#newIntentFromCustomActivity(Context, Class, int)} instead.</p>
      */
+    @Deprecated
     @NonNull
     public static Intent newIntentFromCustomActivity(@NonNull Context context, @NonNull Class<? extends OpenChannelListActivity> cls, @NonNull String channelUrl, @StyleRes int themeResId) {
+        return newIntentFromCustomActivity(context, cls, themeResId);
+    }
+
+    /**
+     * Create an intent for a {@link OpenChannelListActivity}.
+     *
+     * @param context    A Context of the application package implementing this class.
+     * @return OpenChannelListActivity Intent.
+     * since 3.22.2
+     */
+    @NonNull
+    public static Intent newIntent(@NonNull Context context) {
+        return newIntentFromCustomActivity(context, OpenChannelListActivity.class);
+    }
+
+    /**
+     * Create an intent for a {@link OpenChannelListActivity}.
+     *
+     * @param context    A Context of the application package implementing this class.
+     * @param themeResId the resource identifier for custom theme.
+     * @return OpenChannelListActivity Intent.
+     * since 3.22.2
+     */
+    @NonNull
+    public static Intent newIntent(@NonNull Context context, @StyleRes int themeResId) {
+        return newIntentFromCustomActivity(context, OpenChannelListActivity.class, themeResId);
+    }
+
+    /**
+     * Create an intent for a custom activity. The custom activity must inherit {@link OpenChannelListActivity}.
+     *
+     * @param context    A Context of the application package implementing this class.
+     * @param cls        The activity class that is to be used for the intent.
+     * @return Returns a newly created Intent that can be used to launch the activity.
+     * since 3.22.2
+     */
+    @NonNull
+    public static Intent newIntentFromCustomActivity(@NonNull Context context, @NonNull Class<? extends OpenChannelListActivity> cls) {
+        return newIntentFromCustomActivity(context, cls, SendbirdUIKit.getDefaultThemeMode().getResId());
+    }
+
+    /**
+     * Create an intent for a custom activity. The custom activity must inherit {@link OpenChannelListActivity}.
+     *
+     * @param context    A Context of the application package implementing this class.
+     * @param cls        The activity class that is to be used for the intent.
+     * @param themeResId the resource identifier for custom theme.
+     * @return Returns a newly created Intent that can be used to launch the activity.
+     * since 3.22.2
+     */
+    @NonNull
+    public static Intent newIntentFromCustomActivity(@NonNull Context context, @NonNull Class<? extends OpenChannelListActivity> cls,  @StyleRes int themeResId) {
         Intent intent = new Intent(context, cls);
-        intent.putExtra(StringSet.KEY_CHANNEL_URL, channelUrl);
         intent.putExtra(StringSet.KEY_THEME_RES_ID, themeResId);
         return intent;
     }
@@ -89,17 +153,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
-        String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
-        if (TextUtils.isEmpty(url)) {
-            ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
-        } else {
-            Fragment fragment = createFragment();
-            FragmentManager manager = getSupportFragmentManager();
-            manager.popBackStack();
-            manager.beginTransaction()
-                .replace(R.id.sb_fragment_container, fragment)
-                .commit();
-        }
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
+        Fragment fragment = createFragment();
+        FragmentManager manager = getSupportFragmentManager();
+        manager.popBackStack();
+        manager.beginTransaction()
+            .replace(R.id.sb_fragment_container, fragment)
+            .commit();
     }
 
     /**
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelModerationActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelModerationActivity.java
index 5d1fbec8..bd85cb74 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelModerationActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelModerationActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,6 +94,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelMutedParticipantListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelMutedParticipantListActivity.java
index 9024dc3f..efc3c727 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelMutedParticipantListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelMutedParticipantListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,6 +94,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelOperatorListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelOperatorListActivity.java
index 740aaada..99db7cb6 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelOperatorListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelOperatorListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,6 +94,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelRegisterOperatorActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelRegisterOperatorActivity.java
index 565e7e41..e93fe0af 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelRegisterOperatorActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelRegisterOperatorActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,6 +94,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelSettingsActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelSettingsActivity.java
index 108b643c..668e4158 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelSettingsActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OpenChannelSettingsActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -89,6 +92,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         String url = getIntent().getStringExtra(StringSet.KEY_CHANNEL_URL);
         if (TextUtils.isEmpty(url)) {
             ContextUtils.toastError(this, R.string.sb_text_error_get_channel);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/OperatorListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/OperatorListActivity.java
index ec45842a..3555c81a 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/OperatorListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/OperatorListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -89,6 +92,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/ParticipantListActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/ParticipantListActivity.java
index 8b24fb9d..91140944 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/ParticipantListActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/ParticipantListActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -87,6 +90,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/PhotoViewActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/PhotoViewActivity.java
index 1b78e9c5..18392311 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/PhotoViewActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/PhotoViewActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -123,6 +126,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         final Intent intent = getIntent();
         final long messageId = intent.getLongExtra(StringSet.KEY_MESSAGE_ID, 0L);
         final String senderId = intent.getStringExtra(StringSet.KEY_SENDER_ID);
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/RegisterOperatorActivity.java b/uikit/src/main/java/com/sendbird/uikit/activities/RegisterOperatorActivity.java
index 04a246e9..6490c250 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/RegisterOperatorActivity.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/RegisterOperatorActivity.java
@@ -1,8 +1,11 @@
 package com.sendbird.uikit.activities;
 
+import static com.sendbird.uikit.internal.extensions.ViewExtensionsKt.setInsetMarginAndStatusBarColor;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -90,6 +93,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTheme(themeResId);
         setContentView(R.layout.sb_activity);
 
+        View activityContainer = findViewById(R.id.sb_activity_container);
+        View fragmentContainer = findViewById(R.id.sb_fragment_container);
+        setInsetMarginAndStatusBarColor(activityContainer, fragmentContainer, getWindow());
+
         Fragment fragment = createFragment();
         FragmentManager manager = getSupportFragmentManager();
         manager.popBackStack();
diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/adapter/MessageDiffCallback.java b/uikit/src/main/java/com/sendbird/uikit/activities/adapter/MessageDiffCallback.java
index d4af47a1..acf91295 100644
--- a/uikit/src/main/java/com/sendbird/uikit/activities/adapter/MessageDiffCallback.java
+++ b/uikit/src/main/java/com/sendbird/uikit/activities/adapter/MessageDiffCallback.java
@@ -14,9 +14,9 @@
 import com.sendbird.android.user.User;
 import com.sendbird.uikit.consts.MessageGroupType;
 import com.sendbird.uikit.consts.ReplyType;
+import com.sendbird.uikit.internal.extensions.MessageExtensionsKt;
 import com.sendbird.uikit.internal.extensions.MessageTemplateExtensionsKt;
 import com.sendbird.uikit.internal.model.templates.MessageTemplateStatus;
-import com.sendbird.uikit.internal.extensions.MessageExtensionsKt;
 import com.sendbird.uikit.model.MessageListUIParams;
 import com.sendbird.uikit.model.TypingIndicatorMessage;
 import com.sendbird.uikit.utils.MessageUtils;
@@ -93,7 +93,7 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
             }
         }
 
-        if (MessageExtensionsKt.isSuggestedRepliesVisible(oldMessage) != MessageExtensionsKt.getShouldShowSuggestedReplies(newMessage)) {
+        if (MessageExtensionsKt.getShouldShowSuggestedReplies(oldMessage) != MessageExtensionsKt.getShouldShowSuggestedReplies(newMessage)) {
             return false;
         }
 
diff --git a/uikit/src/main/java/com/sendbird/uikit/consts/StringSet.kt b/uikit/src/main/java/com/sendbird/uikit/consts/StringSet.kt
index 575fe0d7..d033e1cf 100644
--- a/uikit/src/main/java/com/sendbird/uikit/consts/StringSet.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/consts/StringSet.kt
@@ -132,6 +132,7 @@ object StringSet {
     const val EVENT_MESSAGE_UPDATED = "EVENT_MESSAGE_UPDATED"
     const val EVENT_TYPING_STATUS_UPDATED = "EVENT_TYPING_STATUS_UPDATED"
     const val EVENT_MESSAGE_TEMPLATE_UPDATED = "EVENT_MESSAGE_TEMPLATE_UPDATED"
+    const val EVENT_USER_MARKED_UNREAD = "EVENT_USER_MARKED_UNREAD"
     const val INVALID_URL = "INVALID_URL"
     const val photo = "photo"
     const val photos = "photos"
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java
index 913c8947..0c0ddb9d 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java
@@ -1,6 +1,7 @@
 package com.sendbird.uikit.fragments;
 
 import static android.app.Activity.RESULT_OK;
+import static com.sendbird.uikit.utils.FileUtils.generateCacheKey;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -377,8 +378,9 @@ private void download(@NonNull FileMessage fileMessage) {
             @NonNull
             public Boolean call() throws Exception {
                 if (getContext() == null) return false;
+                String cacheKey = generateCacheKey(fileMessage.getUrl(), fileMessage.getRequestId());
                 FileDownloader.getInstance().saveFile(getContext(), fileMessage.getUrl(),
-                    fileMessage.getType(), fileMessage.getName());
+                    fileMessage.getType(), fileMessage.getName(), cacheKey);
                 return true;
             }
 
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
index 19b085da..4aec2719 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java
@@ -67,6 +67,7 @@
 import com.sendbird.uikit.model.ReadyStatus;
 import com.sendbird.uikit.model.TextUIConfig;
 import com.sendbird.uikit.model.configurations.ChannelConfig;
+import com.sendbird.uikit.model.configurations.UIKitConfig;
 import com.sendbird.uikit.modules.ChannelModule;
 import com.sendbird.uikit.modules.components.ChannelHeaderComponent;
 import com.sendbird.uikit.modules.components.MessageInputComponent;
@@ -86,7 +87,6 @@
 import com.sendbird.uikit.widgets.StatusFrameView;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -135,6 +135,8 @@ public class ChannelFragment extends BaseMessageListFragment<MessageListAdapter,
     @Nullable
     private View.OnClickListener tooltipClickListener;
     @Nullable
+    private View.OnClickListener unreadCountTooltipClickListener;
+    @Nullable
     private View.OnClickListener onVoiceRecorderButtonClickListener;
     @Nullable
     private MessageListParams params;
@@ -235,6 +237,8 @@ public void onDestroy() {
         if (channelMessageData != null) {
             MessageExtensionsKt.clearLastValidations(channelMessageData.getMessages());
         }
+
+        MessageExtensionsKt.setNewLineMessageId(null);
     }
 
     /**
@@ -294,6 +298,7 @@ protected void onBindMessageListComponent(@NonNull MessageListComponent messageL
         messageListComponent.setFormSubmitButtonClickListener(this::onFormSubmitButtonClicked);
         messageListComponent.setOnFeedbackRatingClickListener(this::onFeedbackRatingClicked);
         messageListComponent.setOnTooltipClickListener(tooltipClickListener != null ? tooltipClickListener : this::onMessageTooltipClicked);
+        messageListComponent.setOnUnreadTooltipClickListener(unreadCountTooltipClickListener != null ? unreadCountTooltipClickListener : this::onUnreadCountTooltipClicked);
 
         messageListComponent.setOnQuoteReplyMessageLongClickListener(this::onQuoteReplyMessageLongClicked);
         messageListComponent.setOnQuoteReplyMessageClickListener(this::onQuoteReplyMessageClicked);
@@ -308,6 +313,26 @@ protected void onBindMessageListComponent(@NonNull MessageListComponent messageL
         });
         messageListComponent.setMessageTemplateActionHandler(this.messageTemplateActionHandler != null ? this.messageTemplateActionHandler : this::handleTemplateMessageAction);
 
+        if (messageListComponent.getRecyclerView() != null) {
+            messageListComponent.getRecyclerView().addOnScrollListener(new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                    super.onScrolled(recyclerView, dx, dy);
+
+                    final LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                    if (layoutManager != null) {
+                        boolean isScrollAtBottom = layoutManager.findFirstVisibleItemPosition() == 0;
+                        viewModel.onScrollChanged(isScrollAtBottom);
+                    }
+
+                    if (UIKitConfig.getGroupChannelConfig().getEnableMarkAsUnread()) {
+                        boolean isNewLineVisible = messageListComponent.updateTooltipByNewLine(channel);
+                        if (isNewLineVisible) viewModel.onNewLineSeen();
+                    }
+                }
+            });
+        }
+
         final ChannelModule module = getModule();
         viewModel.getMessageList().observeAlways(getViewLifecycleOwner(), receivedMessageData -> {
             boolean isInitialCallFinished = isInitCallFinished.getAndSet(true);
@@ -352,7 +377,6 @@ protected void onBindMessageListComponent(@NonNull MessageListComponent messageL
                                 }
                             }
                             break;
-                        case StringSet.ACTION_INIT_FROM_REMOTE:
                         case StringSet.MESSAGE_CHANGELOG:
                         case StringSet.MESSAGE_FILL:
                             messageListComponent.notifyMessagesFilled(!anchorDialogShowing.get());
@@ -360,6 +384,13 @@ protected void onBindMessageListComponent(@NonNull MessageListComponent messageL
                         case StringSet.EVENT_TYPING_STATUS_UPDATED:
                             messageListComponent.notifyTypingIndicatorUpdated(!anchorDialogShowing.get());
                             break;
+                        case StringSet.ACTION_INIT_FROM_REMOTE:
+                            refreshNewLineVisibility();
+                            messageListComponent.notifyMessagesFilled(!anchorDialogShowing.get());
+                            break;
+                        case StringSet.EVENT_USER_MARKED_UNREAD:
+                            refreshNewLineVisibility();
+                            break;
                     }
                 }
                 if (!isInitialCallFinished) {
@@ -398,7 +429,13 @@ protected void onBindMessageListComponent(@NonNull MessageListComponent messageL
                 }
             }
         });
-        viewModel.onChannelUpdated().observe(getViewLifecycleOwner(), messageListComponent::notifyChannelChanged);
+        viewModel.onChannelUpdated().observe(getViewLifecycleOwner(), groupChannel -> {
+            if (UIKitConfig.getGroupChannelConfig().getEnableMarkAsUnread()) {
+                messageListComponent.updateTooltipByNewLine(groupChannel);
+            }
+
+            messageListComponent.notifyChannelChanged(groupChannel);
+        });
         viewModel.onMessagesDeleted().observe(getViewLifecycleOwner(), deletedMessages -> {
             for (final BaseMessage deletedMessage : deletedMessages) {
                 if (deletedMessage instanceof FileMessage && MessageUtils.isVoiceMessage((FileMessage) deletedMessage)) {
@@ -441,6 +478,21 @@ protected void onBindMessageListComponent(@NonNull MessageListComponent messageL
                 toastError(R.string.sb_text_toast_failure_feedback_delete);
             }
         });
+
+        viewModel.onNewLineUpdated().observe(getViewLifecycleOwner(), newLineData -> {
+            MessageListAdapter adapter = messageListComponent.getAdapter();
+            if (adapter == null) return;
+
+            Integer prevPosition = newLineData.getPrevPosition();
+            if (prevPosition != null) {
+                adapter.notifyItemChanged(prevPosition);
+            }
+
+            Integer currentPosition = newLineData.getCurrentPosition();
+            if (currentPosition != null) {
+                adapter.notifyItemChanged(currentPosition);
+            }
+        });
     }
 
     /**
@@ -654,10 +706,28 @@ public boolean moveToMessage(long messageId, boolean withAnimation) {
         return false;
     }
 
+    private void refreshNewLineVisibility() {
+        if (!UIKitConfig.getGroupChannelConfig().getEnableMarkAsUnread()) return;
+
+        final MessageListComponent messageListComponent = getModule().getMessageListComponent();
+        final GroupChannel channel = getViewModel().getChannel();
+
+        getViewModel().updateNewLine();
+
+        boolean isNewLineVisible = messageListComponent.updateTooltipByNewLine(channel);
+        if (isNewLineVisible) {
+            getViewModel().onNewLineSeen();
+        }
+    }
+
     private void onMessageTooltipClicked(@NonNull View view) {
         scrollToFirst();
     }
 
+    private void onUnreadCountTooltipClicked(@NonNull View view) {
+        getViewModel().markAsRead();
+    }
+
     private void onInputRightButtonClicked(@NonNull View view) {
         final MessageInputComponent inputComponent = getModule().getMessageInputComponent();
         final EditText inputText = inputComponent.getEditTextView();
@@ -722,6 +792,9 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
         DialogListItem reply = new DialogListItem(replyStringRes, replyDrawableRes, false, MessageUtils.hasParentMessage(message));
         DialogListItem retry = new DialogListItem(R.string.sb_text_channel_anchor_retry, 0);
         DialogListItem deleteFailed = new DialogListItem(R.string.sb_text_channel_anchor_delete, 0);
+        DialogListItem markAsUnread = UIKitConfig.getGroupChannelConfig().getEnableMarkAsUnread()
+            ? new DialogListItem(R.string.sb_text_channel_anchor_mark_as_unread, R.drawable.icon_mark_as_unread)
+            : null;
 
         DialogListItem[] actions = null;
         final ReplyType replyType = channelConfig.getReplyType();
@@ -729,9 +802,9 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
             case VIEW_TYPE_USER_MESSAGE_ME:
                 if (status == SendingStatus.SUCCEEDED) {
                     if (replyType == ReplyType.NONE) {
-                        actions = new DialogListItem[]{copy, edit};
+                        actions = new DialogListItem[]{copy, edit, markAsUnread};
                     } else {
-                        actions = new DialogListItem[]{copy, edit, reply};
+                        actions = new DialogListItem[]{copy, edit, markAsUnread, reply};
                     }
                 } else if (MessageUtils.isFailed(message)) {
                     actions = new DialogListItem[]{retry, deleteFailed};
@@ -739,9 +812,9 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
                 break;
             case VIEW_TYPE_USER_MESSAGE_OTHER:
                 if (replyType == ReplyType.NONE) {
-                    actions = new DialogListItem[]{copy};
+                    actions = new DialogListItem[]{copy, markAsUnread};
                 } else {
-                    actions = new DialogListItem[]{copy, reply};
+                    actions = new DialogListItem[]{copy, markAsUnread, reply};
                 }
                 break;
             case VIEW_TYPE_FILE_MESSAGE_VIDEO_ME:
@@ -751,9 +824,9 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
                     actions = new DialogListItem[]{retry, deleteFailed};
                 } else {
                     if (replyType == ReplyType.NONE) {
-                        actions = new DialogListItem[]{delete, save};
+                        actions = new DialogListItem[]{save, markAsUnread, delete};
                     } else {
-                        actions = new DialogListItem[]{delete, save, reply};
+                        actions = new DialogListItem[]{save, markAsUnread, delete, reply};
                     }
                 }
                 break;
@@ -761,9 +834,9 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
             case VIEW_TYPE_FILE_MESSAGE_IMAGE_OTHER:
             case VIEW_TYPE_FILE_MESSAGE_OTHER:
                 if (replyType == ReplyType.NONE) {
-                    actions = new DialogListItem[]{save};
+                    actions = new DialogListItem[]{save, markAsUnread};
                 } else {
-                    actions = new DialogListItem[]{save, reply};
+                    actions = new DialogListItem[]{save, markAsUnread, reply};
                 }
                 break;
             case VIEW_TYPE_MULTIPLE_FILES_MESSAGE_ME:
@@ -772,27 +845,34 @@ protected List<DialogListItem> makeMessageContextMenu(@NonNull BaseMessage messa
                     actions = new DialogListItem[]{retry, deleteFailed};
                 } else {
                     if (replyType == ReplyType.NONE) {
-                        actions = new DialogListItem[]{delete};
+                        actions = new DialogListItem[]{markAsUnread, delete};
                     } else {
-                        actions = new DialogListItem[]{delete, reply};
+                        actions = new DialogListItem[]{markAsUnread, delete, reply};
                     }
                 }
                 break;
             case VIEW_TYPE_MULTIPLE_FILES_MESSAGE_OTHER:
             case VIEW_TYPE_VOICE_MESSAGE_OTHER:
                 if (replyType != ReplyType.NONE) {
-                    actions = new DialogListItem[]{reply};
+                    actions = new DialogListItem[]{markAsUnread, reply};
+                } else {
+                    actions = new DialogListItem[]{markAsUnread};
                 }
                 break;
             case VIEW_TYPE_UNKNOWN_MESSAGE_ME:
-                actions = new DialogListItem[]{delete};
+                actions = new DialogListItem[]{markAsUnread, delete};
             default:
                 break;
         }
 
         if (actions != null) {
-            items.addAll(Arrays.asList(actions));
+            for (DialogListItem action : actions) {
+                if (action != null) {
+                    items.add(action);
+                }
+            }
         }
+
         return items;
     }
 
@@ -830,6 +910,9 @@ protected boolean onMessageContextMenuItemClicked(@NonNull BaseMessage message,
         } else if (key == R.string.sb_text_channel_anchor_retry) {
             resendMessage(message);
             return true;
+        } else if (key == R.string.sb_text_channel_anchor_mark_as_unread) {
+            getViewModel().markAsUnread(message, true);
+            return true;
         }
         return false;
     }
@@ -1071,6 +1154,8 @@ public static class Builder {
         @Nullable
         private View.OnClickListener tooltipClickListener;
         @Nullable
+        private View.OnClickListener unreadCountTooltipClickListener;
+        @Nullable
         @Deprecated
         private View.OnClickListener scrollBottomButtonClickListener;
         @Nullable
@@ -2020,6 +2105,19 @@ public Builder setOnTooltipClickListener(@Nullable View.OnClickListener tooltipC
             return this;
         }
 
+        /**
+         * Register a callback to be invoked when the unread count tooltip is clicked.
+         *
+         * @param unreadCountTooltipClickListener The callback that will run
+         * @return This Builder object to allow for chaining of calls to set methods.
+         * since 3.24.0
+         */
+        @NonNull
+        public Builder setOnUnreadCountTooltipClickListener(@Nullable View.OnClickListener unreadCountTooltipClickListener) {
+            this.unreadCountTooltipClickListener = unreadCountTooltipClickListener;
+            return this;
+        }
+
         /**
          * Register a callback to be invoked when the button to scroll to the bottom is clicked.
          *
@@ -2152,6 +2250,7 @@ public ChannelFragment build() {
             fragment.replyModeCloseButtonClickListener = replyModeCloseButtonClickListener;
             fragment.inputModeChangedListener = inputModeChangedListener;
             fragment.tooltipClickListener = tooltipClickListener;
+            fragment.unreadCountTooltipClickListener = unreadCountTooltipClickListener;
             fragment.scrollBottomButtonClickListener = scrollBottomButtonClickListener;
             fragment.scrollFirstButtonClickListener = scrollFirstButtonClickListener;
             fragment.setAdapter(adapter);
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java
index f7195bb2..90b986f4 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java
@@ -1,6 +1,7 @@
 package com.sendbird.uikit.fragments;
 
 import static android.app.Activity.RESULT_OK;
+import static com.sendbird.uikit.utils.FileUtils.generateCacheKey;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -946,8 +947,9 @@ private void download(@NonNull FileMessage fileMessage) {
             @NonNull
             public Boolean call() throws Exception {
                 if (getContext() == null) return false;
+                String cacheKey = generateCacheKey(fileMessage.getUrl(), fileMessage.getRequestId());
                 FileDownloader.getInstance().saveFile(getContext(), fileMessage.getUrl(),
-                    fileMessage.getType(), fileMessage.getName());
+                    fileMessage.getType(), fileMessage.getName(), cacheKey);
                 return true;
             }
 
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java
index 87ef220f..9513843e 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java
@@ -1,5 +1,7 @@
 package com.sendbird.uikit.fragments;
 
+import static com.sendbird.uikit.utils.FileUtils.generateCacheKey;
+
 import android.Manifest;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -229,11 +231,6 @@ protected void onDrawPage() {
         attacher.setOnPhotoTapListener((view, x, y) -> togglePhotoActionBar());
     }
 
-    @NonNull
-    private String generateCacheKey(@NonNull String plainUrl, @NonNull String requestId) {
-        return (TextUtils.isNotEmpty(requestId)) ? requestId : String.valueOf(plainUrl.hashCode());
-    }
-
     private void togglePhotoActionBar() {
         View vgHeader = binding.vgHeader;
         View vgBottom = binding.vgBottom;
@@ -302,7 +299,10 @@ private void download() {
             public Boolean call() throws Exception {
                 if (!isFragmentAlive()) return null;
                 if (url == null || mimeType == null || fileName == null) return null;
-                FileDownloader.getInstance().saveFile(requireContext(), url, mimeType, fileName);
+
+                String requestIdForCacheKey = requestId == null ? "" : requestId;
+                String plainUrlForCacheKey = plainUrl == null ? "" : plainUrl;
+                FileDownloader.getInstance().saveFile(requireContext(), url, mimeType, fileName, generateCacheKey(plainUrlForCacheKey, requestIdForCacheKey));
                 Logger.dev("++ file name : %s", fileName);
                 return true;
             }
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/extensions/MessageExtensions.kt b/uikit/src/main/java/com/sendbird/uikit/internal/extensions/MessageExtensions.kt
index c03c8769..813b55a7 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/extensions/MessageExtensions.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/extensions/MessageExtensions.kt
@@ -151,13 +151,6 @@ internal var BaseMessage.shouldShowSuggestedReplies: Boolean
         this.extras[StringSet.should_show_suggested_replies] = value
     }
 
-@OptIn(AIChatBotExperimental::class)
-internal var BaseMessage.isSuggestedRepliesVisible: Boolean
-    get() = this.extras[StringSet.is_suggested_replies_visible] as? Boolean ?: false
-    set(value) {
-        this.extras[StringSet.is_suggested_replies_visible] = value
-    }
-
 internal val BaseMessage.isStreamMessage: Boolean
     get() {
         val data = this.data
@@ -178,3 +171,9 @@ internal fun MessageList.activeDisableInputMessageList(order: MessageList.Order)
     val copied = if (order == MessageList.Order.DESC) this.toList() else this.toList().asReversed()
     return copied.takeWhile { it.disableChatInput }
 }
+
+internal var newLineMessageId: Long? = null
+internal val BaseMessage.isNewLineMessage: Boolean
+    get() {
+        return messageId == newLineMessageId
+    }
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/extensions/ViewExtensions.kt b/uikit/src/main/java/com/sendbird/uikit/internal/extensions/ViewExtensions.kt
index 528e52c0..2a28de2a 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/extensions/ViewExtensions.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/extensions/ViewExtensions.kt
@@ -9,11 +9,19 @@ import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.RippleDrawable
 import android.os.Build
 import android.util.TypedValue
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
+import android.view.Window
 import android.widget.EditText
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
@@ -23,6 +31,7 @@ import com.bumptech.glide.request.transition.Transition
 import com.sendbird.android.message.BaseMessage
 import com.sendbird.android.message.FeedbackRating
 import com.sendbird.uikit.R
+import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.StringSet
 import com.sendbird.uikit.internal.interfaces.OnFeedbackRatingClickListener
 import com.sendbird.uikit.widgets.FeedbackView
@@ -145,3 +154,56 @@ internal fun FeedbackView.drawFeedback(message: BaseMessage, listener: OnFeedbac
         listener?.onFeedbackClicked(message, feedbackRating)
     }
 }
+
+internal fun View.setInsetMarginAndStatusBarColor(insetTargetView: View, window: Window) {
+    ViewCompat.setOnApplyWindowInsetsListener(this) { _, windowInsets ->
+        val insets = windowInsets.getInsets(
+            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+        )
+
+        val insetTargetLayoutParams = (insetTargetView.layoutParams as? ViewGroup.MarginLayoutParams)
+        insetTargetLayoutParams?.let { params ->
+            params.setMargins(insets.left, insets.top, insets.right, insets.bottom)
+            insetTargetView.layoutParams = params
+        }
+
+        SendbirdUIKit.getEdgeToEdgeConfig().let { config ->
+            val statusBarColor = if (SendbirdUIKit.isDarkMode()) {
+                config.statusBarColorDark
+            } else {
+                config.statusBarColorLight
+            }
+
+            statusBarColor?.let {
+                addStatusBarColorView(this as ViewGroup, insets, it)
+            }
+
+            val isAppearanceLightStatusBars = config.useAppearanceLightStatusBars ?: !SendbirdUIKit.isDarkMode()
+            WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = isAppearanceLightStatusBars
+        }
+
+        WindowInsetsCompat.CONSUMED
+    }
+}
+
+/**
+ * To set a custom status bar color in Edge-To-Edge mode, add a view with the custom color
+ */
+private fun addStatusBarColorView(
+    container: ViewGroup,
+    systemInsets: Insets,
+    statusBarColor: Int
+) {
+    val statusBarView = View(container.context).apply {
+        layoutParams = FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            systemInsets.top
+        ).apply {
+            gravity = Gravity.TOP
+        }
+
+        setBackgroundColor(statusBarColor)
+    }
+
+    container.addView(statusBarView, 0)
+}
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/model/ChannelUnreadInfo.kt b/uikit/src/main/java/com/sendbird/uikit/internal/model/ChannelUnreadInfo.kt
new file mode 100644
index 00000000..fc300137
--- /dev/null
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/model/ChannelUnreadInfo.kt
@@ -0,0 +1,53 @@
+package com.sendbird.uikit.internal.model
+
+import com.sendbird.android.message.BaseMessage
+import java.util.TreeSet
+
+/**
+ * A data class that holds properties used for mark as unread feature.
+ *
+ * @property unseenMessageList List of unseen messages. If this list is empty when the newLine is seen, the channel is marked as read. Otherwise, it's marked as unread.
+ * @property hasSeenNewLine Indicates whether the newLine has been seen at least once.
+ * @property hasUserMarkedUnread Indicates whether the user has explicitly invoked the mark as unread since entering the channel.
+ * @property isNewLineExistInChannel Indicates whether the newLine exists in the channel. If this is false, the channel is marked as read.
+ */
+internal class ChannelUnreadInfo {
+    // Ascending order by createdAt.
+    private val unseenMessageList: TreeSet<BaseMessage> = TreeSet { o1: BaseMessage, o2: BaseMessage ->
+        when {
+            o1.createdAt > o2.createdAt -> 1
+            o1.createdAt < o2.createdAt -> -1
+            else -> 0
+        }
+    }
+
+    val firstUnseenMessage: BaseMessage?
+        get() = synchronized(this) {
+            if (unseenMessageList.isEmpty()) null else unseenMessageList.first()
+        }
+
+    var hasSeenNewLine: Boolean = false
+    var hasUserMarkedUnread: Boolean = false
+    var isNewLineExistInChannel: Boolean = false
+
+    fun shouldClearNewLine(): Boolean {
+        if (hasUserMarkedUnread) return false
+        return !isNewLineExistInChannel || hasSeenNewLine
+    }
+
+    @Synchronized
+    fun addUnseenMessages(messages: List<BaseMessage>) {
+        unseenMessageList.addAll(messages)
+    }
+
+    @Synchronized
+    fun removeUnseenMessages(messages: List<BaseMessage>) {
+        val deletedIds = messages.map { it.messageId }.toSet()
+        unseenMessageList.removeAll { deletedIds.contains(it.messageId) }
+    }
+
+    @Synchronized
+    fun clearUnseenMessages() {
+        unseenMessageList.clear()
+    }
+}
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/model/template_messages/KeySet.kt b/uikit/src/main/java/com/sendbird/uikit/internal/model/template_messages/KeySet.kt
index 17d0f39a..d825bf85 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/model/template_messages/KeySet.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/model/template_messages/KeySet.kt
@@ -52,6 +52,7 @@ internal object KeySet {
     const val show_suggested_replies_for = "show_suggested_replies_for"
     const val enable_markdown_for_user_message = "enable_markdown_for_user_message"
     const val suggested_replies_direction = "suggested_replies_direction"
+    const val enable_mark_as_unread = "enable_mark_as_unread"
 
     // analytics
     const val noti_stats = "noti:stats"
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/AdminMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/AdminMessageView.kt
index 9f2e096f..dad253b9 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/AdminMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/AdminMessageView.kt
@@ -7,6 +7,7 @@ import android.view.View
 import com.sendbird.android.message.BaseMessage
 import com.sendbird.uikit.R
 import com.sendbird.uikit.databinding.SbViewAdminMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.setAppearance
 
 internal class AdminMessageView @JvmOverloads internal constructor(
@@ -44,5 +45,6 @@ internal class AdminMessageView @JvmOverloads internal constructor(
 
     fun drawMessage(message: BaseMessage) {
         binding.tvMessage.text = message.message
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
     }
 }
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyFileMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyFileMessageView.kt
index f261b7dd..02c1ccfd 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyFileMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyFileMessageView.kt
@@ -12,6 +12,7 @@ import com.sendbird.android.message.SendingStatus
 import com.sendbird.uikit.R
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyFileMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.setAppearance
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
@@ -67,6 +68,7 @@ internal class MyFileMessageView @JvmOverloads internal constructor(
             message.reactions.isNotEmpty() && ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val messageGroupType = params.messageGroupType
 
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyImageFileMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyImageFileMessageView.kt
index e7b752a9..a27a6bb9 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyImageFileMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyImageFileMessageView.kt
@@ -12,6 +12,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyFileImageMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
@@ -57,6 +58,7 @@ internal class MyImageFileMessageView @JvmOverloads internal constructor(
         val isSent = message.sendingStatus == SendingStatus.SUCCEEDED
         val enableReactions = message.reactions.isNotEmpty() && ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val messageGroupType = params.messageGroupType
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMessageView.kt
index baa3b701..d169d0e7 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMessageView.kt
@@ -11,6 +11,7 @@ import com.sendbird.android.message.SendingStatus
 import com.sendbird.uikit.R
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.toContextThemeWrapper
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
@@ -63,6 +64,7 @@ internal class MyMessageView @JvmOverloads internal constructor(
         val enableReactions = message.reactions.isNotEmpty() &&
             ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val messageGroupType = params.messageGroupType
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMultipleFilesMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMultipleFilesMessageView.kt
index 40993596..817657eb 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMultipleFilesMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyMultipleFilesMessageView.kt
@@ -14,6 +14,7 @@ import com.sendbird.uikit.activities.PhotoViewActivity
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyMultipleFilesMessageComponentBinding
 import com.sendbird.uikit.interfaces.OnItemClickListener
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.toContextThemeWrapper
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
@@ -72,6 +73,7 @@ internal class MyMultipleFilesMessageView @JvmOverloads internal constructor(
         val enableReactions =
             message.reactions.isNotEmpty() && ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val messageGroupType = params.messageGroupType
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt
index 23f82813..88be47a2 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt
@@ -14,6 +14,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyUserMessageComponentBinding
 import com.sendbird.uikit.interfaces.OnItemClickListener
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.ui.widgets.OnLinkClickListener
 import com.sendbird.uikit.internal.ui.widgets.OnLinkLongClickListener
 import com.sendbird.uikit.model.MessageListUIParams
@@ -124,7 +125,7 @@ internal class MyUserMessageView @JvmOverloads internal constructor(
         val enableReactions =
             message.reactions.isNotEmpty() && ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val enableMarkdown = params.channelConfig.enableMarkdownForUserMessage
-
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.ogtagBackground.visibility = if (enableOgTag) VISIBLE else GONE
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVideoFileMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVideoFileMessageView.kt
index 2fcf1aa7..b52e8957 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVideoFileMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVideoFileMessageView.kt
@@ -12,6 +12,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyFileVideoMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DateUtils
@@ -60,6 +61,7 @@ internal class MyVideoFileMessageView @JvmOverloads constructor(
         val enableReactions = message.reactions.isNotEmpty() && ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val messageGroupType = params.messageGroupType
 
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt
index 4ae966cf..421514da 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt
@@ -13,6 +13,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewMyVoiceMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.setAppearance
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
@@ -106,6 +107,7 @@ internal class MyVoiceMessageView @JvmOverloads internal constructor(
             message.reactions.isNotEmpty() && ChannelConfig.getEnableReactions(params.channelConfig, channel)
         val messageGroupType = params.messageGroupType
 
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/NewLineView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/NewLineView.kt
new file mode 100644
index 00000000..2dc7145e
--- /dev/null
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/NewLineView.kt
@@ -0,0 +1,30 @@
+package com.sendbird.uikit.internal.ui.messages
+
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.sendbird.uikit.R
+import com.sendbird.uikit.databinding.SbViewNewLineBinding
+import com.sendbird.uikit.internal.extensions.setAppearance
+
+internal class NewLineView @JvmOverloads constructor(
+    context: android.content.Context,
+    attrs: android.util.AttributeSet? = null,
+    defStyle: Int = 0
+) : FrameLayout(context, attrs, defStyle) {
+    init {
+        val binding = SbViewNewLineBinding.inflate(
+            LayoutInflater.from(context),
+            this,
+            true
+        )
+        val a = context.theme.obtainStyledAttributes(attrs, R.styleable.MessageView_NewLineView, defStyle, 0)
+        val newLineBackground = a.getResourceId(R.styleable.MessageView_NewLineView_sb_new_line_background, R.color.primary_main)
+        val newLineTextAppearance = a.getResourceId(
+            R.styleable.MessageView_NewLineView_sb_new_line_text_appearance,
+            R.style.SendbirdCaption3Primary300
+        )
+        binding.vLineLeft.setBackgroundResource(newLineBackground)
+        binding.vLineRight.setBackgroundResource(newLineBackground)
+        binding.tvNewMessage.setAppearance(context, newLineTextAppearance)
+    }
+}
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherFileMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherFileMessageView.kt
index 7d45b77e..a4babe0d 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherFileMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherFileMessageView.kt
@@ -11,6 +11,7 @@ import com.sendbird.android.message.SendingStatus
 import com.sendbird.uikit.R
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewOtherFileMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
@@ -43,6 +44,7 @@ internal class OtherFileMessageView @JvmOverloads constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherImageFileMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherImageFileMessageView.kt
index d097e5b7..fe20ab52 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherImageFileMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherImageFileMessageView.kt
@@ -12,6 +12,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewOtherFileImageMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
@@ -42,6 +43,7 @@ internal class OtherImageFileMessageView @JvmOverloads constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility =
             if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMessageView.kt
index 17f0fea3..71415dd9 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMessageView.kt
@@ -11,6 +11,7 @@ import com.sendbird.android.message.SendingStatus
 import com.sendbird.uikit.R
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewOtherMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.toContextThemeWrapper
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
@@ -76,6 +77,7 @@ internal class OtherMessageView @JvmOverloads internal constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility =
             if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMultipleFilesMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMultipleFilesMessageView.kt
index c2939ddf..aea4910d 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMultipleFilesMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherMultipleFilesMessageView.kt
@@ -14,6 +14,7 @@ import com.sendbird.uikit.activities.PhotoViewActivity
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewOtherMultipleFilesMessageComponentBinding
 import com.sendbird.uikit.interfaces.OnItemClickListener
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.toContextThemeWrapper
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
@@ -85,6 +86,7 @@ internal class OtherMultipleFilesMessageView @JvmOverloads constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility =
             if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherTemplateMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherTemplateMessageView.kt
index b815cb04..e0b32135 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherTemplateMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherTemplateMessageView.kt
@@ -17,7 +17,6 @@ import com.sendbird.uikit.interfaces.OnMessageTemplateActionHandler
 import com.sendbird.uikit.internal.extensions.ERR_MESSAGE_TEMPLATE_NOT_APPLICABLE
 import com.sendbird.uikit.internal.extensions.drawFeedback
 import com.sendbird.uikit.internal.extensions.hasParentMessage
-import com.sendbird.uikit.internal.extensions.isSuggestedRepliesVisible
 import com.sendbird.uikit.internal.extensions.messageTemplateParams
 import com.sendbird.uikit.internal.extensions.messageTemplateStatus
 import com.sendbird.uikit.internal.extensions.saveParamsFromTemplate
@@ -102,7 +101,6 @@ internal class OtherTemplateMessageView @JvmOverloads internal constructor(
         }
 
         val shouldShowSuggestedReplies = message.shouldShowSuggestedReplies
-        message.isSuggestedRepliesVisible = shouldShowSuggestedReplies
         if (shouldShowSuggestedReplies) {
             suggestedRepliesViewStub?.let {
                 it.visibility = View.VISIBLE
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt
index ec56da80..38df4f5b 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt
@@ -18,8 +18,8 @@ import com.sendbird.uikit.databinding.SbViewOtherUserMessageComponentBinding
 import com.sendbird.uikit.interfaces.OnItemClickListener
 import com.sendbird.uikit.internal.extensions.drawFeedback
 import com.sendbird.uikit.internal.extensions.hasParentMessage
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.internal.extensions.isStreamMessage
-import com.sendbird.uikit.internal.extensions.isSuggestedRepliesVisible
 import com.sendbird.uikit.internal.extensions.shouldShowSuggestedReplies
 import com.sendbird.uikit.internal.interfaces.OnFeedbackRatingClickListener
 import com.sendbird.uikit.internal.ui.widgets.OnLinkClickListener
@@ -154,6 +154,7 @@ internal class OtherUserMessageView @JvmOverloads internal constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.ogtagBackground.visibility = if (enableOgTag) VISIBLE else GONE
@@ -232,7 +233,6 @@ internal class OtherUserMessageView @JvmOverloads internal constructor(
         }
 
         val shouldShowSuggestedReplies = message.shouldShowSuggestedReplies
-        message.isSuggestedRepliesVisible = shouldShowSuggestedReplies
         if (shouldShowSuggestedReplies) {
             suggestedRepliesViewStub?.let {
                 it.visibility = View.VISIBLE
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVideoFileMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVideoFileMessageView.kt
index 3a5c1d70..b4e83014 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVideoFileMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVideoFileMessageView.kt
@@ -12,6 +12,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewOtherFileVideoMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
@@ -42,6 +43,7 @@ internal class OtherVideoFileMessageView @JvmOverloads constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt
index e9c519f4..94735acd 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt
@@ -12,6 +12,7 @@ import com.sendbird.uikit.R
 import com.sendbird.uikit.SendbirdUIKit
 import com.sendbird.uikit.consts.MessageGroupType
 import com.sendbird.uikit.databinding.SbViewOtherVoiceMessageComponentBinding
+import com.sendbird.uikit.internal.extensions.isNewLineMessage
 import com.sendbird.uikit.model.MessageListUIParams
 import com.sendbird.uikit.model.configurations.ChannelConfig
 import com.sendbird.uikit.utils.DrawableUtils
@@ -43,6 +44,7 @@ internal class OtherVoiceMessageView @JvmOverloads constructor(
 
         binding.ivProfileView.visibility = if (showProfile) VISIBLE else INVISIBLE
         binding.tvNickname.visibility = if (showNickname) VISIBLE else GONE
+        binding.newLineView.visibility = if (message.isNewLineMessage) VISIBLE else GONE
         binding.emojiReactionListBackground.visibility = if (enableReactions) VISIBLE else GONE
         binding.rvEmojiReactionList.visibility = if (enableReactions) VISIBLE else GONE
         binding.tvSentAt.visibility =
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MentionWatcher.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MentionWatcher.kt
index c824e8af..ee633ad5 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MentionWatcher.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MentionWatcher.kt
@@ -66,9 +66,9 @@ internal class MentionWatcher(
             while (i-- > 0) {
                 val targetWord = words[i]
                 // 3. finds the first token in a string.
-                val contains = trigger == targetWord
+                val startsWithTrigger = targetWord.startsWith(trigger)
                 val triggerIndex = targetWord.indexOf(trigger)
-                if (contains && triggerIndex != -1) {
+                if (startsWithTrigger && triggerIndex != -1) {
                     val wordIndex = src.lastIndexOf(targetWord)
                     result = from + wordIndex + triggerIndex
                     break
diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MessageRecyclerView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MessageRecyclerView.kt
index 5187fe99..0a8fab68 100755
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MessageRecyclerView.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/MessageRecyclerView.kt
@@ -38,6 +38,11 @@ internal class MessageRecyclerView @JvmOverloads constructor(
         binding.ivScrollFirstIcon.visibility = VISIBLE
     }
 
+    fun showUnreadCountTooltip(unreadCount: String) {
+        binding.vgUnreadCountTooltip.visibility = VISIBLE
+        binding.tvUnreadCountTooltipText.text = unreadCount
+    }
+
     fun hideScrollFirstButton() {
         binding.ivScrollFirstIcon.visibility = GONE
     }
@@ -46,6 +51,10 @@ internal class MessageRecyclerView @JvmOverloads constructor(
         binding.vgTooltipBox.visibility = GONE
     }
 
+    fun hideUnreadCountTooltip() {
+        binding.vgUnreadCountTooltip.visibility = GONE
+    }
+
     fun rotateScrollFirstButton(rotation: Float) {
         scrollFirstView.rotation = rotation
     }
@@ -56,6 +65,8 @@ internal class MessageRecyclerView @JvmOverloads constructor(
         get() = binding.rvMessageList
     val tooltipView: View
         get() = binding.tvTooltipText
+    val unreadCountTooltipIcon: View
+        get() = binding.vgUnreadCountTooltipClose
     val scrollFirstView: View
         get() = binding.ivScrollFirstIcon
     val typingIndicator: View
@@ -88,6 +99,12 @@ internal class MessageRecyclerView @JvmOverloads constructor(
                 R.styleable.MessageListView_sb_message_recyclerview_tooltip_textappearance,
                 R.style.SendbirdCaption1Primary300
             )
+            val unreadCountTooltipTextAppearance = a.getResourceId(
+                R.styleable.MessageListView_sb_message_recyclerview_unread_count_tooltip_textappearance,
+                R.style.SendbirdBody2OnLight02
+            )
+            val unreadCountTooltipIconTintColor =
+                a.getColorStateList(R.styleable.MessageListView_sb_message_recyclerview_unread_count_tooltip_icon_tint)
             val typingIndicatorTextAppearance = a.getResourceId(
                 R.styleable.MessageListView_sb_message_typing_indicator_textappearance,
                 R.style.SendbirdCaption1OnLight02
@@ -120,6 +137,9 @@ internal class MessageRecyclerView @JvmOverloads constructor(
             binding.rvMessageList.setDividerHeight(dividerHeight)
             binding.tvTooltipText.setBackgroundResource(tooltipBackground)
             binding.tvTooltipText.setAppearance(context, tooltipTextAppearance)
+            binding.vgUnreadCountTooltip.setBackgroundResource(tooltipBackground)
+            binding.tvUnreadCountTooltipText.setAppearance(context, unreadCountTooltipTextAppearance)
+            binding.ivUnreadCountTooltipClose.imageTintList = unreadCountTooltipIconTintColor
             binding.tvTypingIndicator.setAppearance(context, typingIndicatorTextAppearance)
             binding.ivScrollFirstIcon.setBackgroundResource(scrollBottomBackground)
             binding.ivScrollFirstIcon.setImageResource(scrollBottomIcon)
diff --git a/uikit/src/main/java/com/sendbird/uikit/model/EdgeToEdgeConfig.kt b/uikit/src/main/java/com/sendbird/uikit/model/EdgeToEdgeConfig.kt
new file mode 100644
index 00000000..47358e52
--- /dev/null
+++ b/uikit/src/main/java/com/sendbird/uikit/model/EdgeToEdgeConfig.kt
@@ -0,0 +1,33 @@
+package com.sendbird.uikit.model
+
+import androidx.annotation.ColorInt
+
+/**
+ * Describes a configuration for edge-to-edge UI.
+ *
+ * @since 3.23.0
+ */
+data class EdgeToEdgeConfig(
+    /**
+     * Returns the color of the status bar when UIKit theme is light.
+     *
+     * @since 3.23.0
+     */
+    @ColorInt
+    val statusBarColorLight: Int? = null,
+
+    /**
+     * Returns the color of the status bar when UIKit theme is dark.
+     *
+     * @since 3.23.0
+     */
+    @ColorInt
+    val statusBarColorDark: Int? = null,
+
+    /**
+     * Returns the flag indicating whether to use the light status bar appearance.
+     *
+     * @since 3.23.3
+     */
+    val useAppearanceLightStatusBars: Boolean? = null
+)
diff --git a/uikit/src/main/java/com/sendbird/uikit/model/MessageList.kt b/uikit/src/main/java/com/sendbird/uikit/model/MessageList.kt
index cabcf350..f0535ad1 100644
--- a/uikit/src/main/java/com/sendbird/uikit/model/MessageList.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/model/MessageList.kt
@@ -13,12 +13,19 @@ internal class MessageList @JvmOverloads constructor(private val order: Order =
     }
 
     private val messages: TreeSet<BaseMessage> = TreeSet { o1: BaseMessage, o2: BaseMessage ->
-        if (o1.createdAt > o2.createdAt) {
-            return@TreeSet if (order == Order.DESC) -1 else 1
+        return@TreeSet if (o1.createdAt > o2.createdAt) {
+            if (order == Order.DESC) -1 else 1
         } else if (o1.createdAt < o2.createdAt) {
-            return@TreeSet if (order == Order.DESC) 1 else -1
+            if (order == Order.DESC) 1 else -1
+        } else {
+            if (o1.messageId > o2.messageId) {
+                if (order == Order.DESC) -1 else 1
+            } else if (o1.messageId < o2.messageId) {
+                if (order == Order.DESC) 1 else -1
+            } else {
+                if (o1 == o2) 0 else -1 // never happen
+            }
         }
-        0
     }
 
     private val timelineMap: MutableMap<String, BaseMessage> = ConcurrentHashMap()
@@ -133,11 +140,13 @@ internal class MessageList @JvmOverloads constructor(private val order: Order =
     }
 
     @Synchronized
-    fun update(message: BaseMessage) {
+    fun update(message: BaseMessage): BaseMessage? {
         Logger.d(">> MessageList::updateMessage()")
-        if (message is CustomizableMessage) return
-        if (messages.remove(message)) {
-            BaseMessage.clone(message)?.let { messages.add(it) }
+        if (message is CustomizableMessage) return null
+        return if (messages.remove(message)) {
+            BaseMessage.clone(message)?.also { messages.add(it) }
+        } else {
+            null
         }
     }
 
diff --git a/uikit/src/main/java/com/sendbird/uikit/model/NewLineData.kt b/uikit/src/main/java/com/sendbird/uikit/model/NewLineData.kt
new file mode 100644
index 00000000..b159d22e
--- /dev/null
+++ b/uikit/src/main/java/com/sendbird/uikit/model/NewLineData.kt
@@ -0,0 +1,13 @@
+package com.sendbird.uikit.model
+
+/**
+ * Data class representing the new line data for new line display.
+ *
+ * @property prevPosition The position of the previous new line in the list, or null if there is no previous new line.
+ * @property currentPosition The position of the current new line in the list, or null if there is no current new line.
+ * since 3.24.0
+ */
+data class NewLineData(
+    val prevPosition: Int?,
+    val currentPosition: Int?,
+)
diff --git a/uikit/src/main/java/com/sendbird/uikit/model/TextUIConfig.kt b/uikit/src/main/java/com/sendbird/uikit/model/TextUIConfig.kt
index 9080ad7a..c08d2e67 100644
--- a/uikit/src/main/java/com/sendbird/uikit/model/TextUIConfig.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/model/TextUIConfig.kt
@@ -344,6 +344,6 @@ open class TextUIConfig private constructor(
     }
 
     companion object {
-        const val UNDEFINED_RESOURCE_ID = -1
+        const val UNDEFINED_RESOURCE_ID = Int.MIN_VALUE
     }
 }
diff --git a/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt b/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt
index 8e675a9a..525d512b 100644
--- a/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt
@@ -65,6 +65,8 @@ data class ChannelConfig internal constructor(
     @SerialName(KeySet.suggested_replies_direction)
     @Serializable(with = SuggestedRepliesDirectionAsStringSerializer::class)
     private var _suggestedRepliesDirection: SuggestedRepliesDirection = SuggestedRepliesDirection.VERTICAL,
+    @SerialName(KeySet.enable_mark_as_unread)
+    private var _enableMarkAsUnread: Boolean = false,
 
     /**
      * Returns <code>Input</code>, which is the configuration of the input area.
@@ -105,7 +107,9 @@ data class ChannelConfig internal constructor(
     @Transient
     private var enableMarkdownForUserMessageMutable: Boolean? = null,
     @Transient
-    private var suggestedRepliesDirectionMutable: SuggestedRepliesDirection? = null
+    private var suggestedRepliesDirectionMutable: SuggestedRepliesDirection? = null,
+    @Transient
+    private var enableMarkAsUnreadMutable: Boolean? = null
 ) : Parcelable {
     companion object {
         /**
@@ -492,6 +496,26 @@ data class ChannelConfig internal constructor(
             enableMarkdownForUserMessageMutable = value
         }
 
+    var enableMarkAsUnread: Boolean
+        /**
+         * Returns a value that determines whether to use mark as unread or not.
+         * true, if channel displays new line when the message is marked as unread.
+         * false, otherwise.
+         *
+         * @return true if the mark as unread is enabled, false otherwise
+         * @since 3.24.0
+         */
+        get() = enableMarkAsUnreadMutable ?: _enableMarkAsUnread
+        /**
+         * Sets whether to use mark as unread or not.
+         *
+         * @param value true if the mark as unread is enabled, false otherwise
+         * @since 3.24.0
+         */
+        set(value) {
+            enableMarkAsUnreadMutable = value
+        }
+
     @JvmSynthetic
     internal fun merge(config: ChannelConfig): ChannelConfig {
         this._enableOgTag = config._enableOgTag
@@ -510,6 +534,7 @@ data class ChannelConfig internal constructor(
         this._suggestedRepliesFor = config._suggestedRepliesFor
         this._enableMarkdownForUserMessage = config._enableMarkdownForUserMessage
         this._suggestedRepliesDirection = config._suggestedRepliesDirection
+        this._enableMarkAsUnread = config._enableMarkAsUnread
         this.input.merge(config.input)
         return this
     }
@@ -531,6 +556,7 @@ data class ChannelConfig internal constructor(
         this.suggestedRepliesForMutable = null
         this.enableMarkdownForUserMessageMutable = null
         this.suggestedRepliesDirectionMutable = null
+        this.enableMarkAsUnreadMutable = null
         this.input.clear()
     }
 
diff --git a/uikit/src/main/java/com/sendbird/uikit/modules/components/BaseMessageListComponent.java b/uikit/src/main/java/com/sendbird/uikit/modules/components/BaseMessageListComponent.java
index c02363cb..9a2540df 100644
--- a/uikit/src/main/java/com/sendbird/uikit/modules/components/BaseMessageListComponent.java
+++ b/uikit/src/main/java/com/sendbird/uikit/modules/components/BaseMessageListComponent.java
@@ -34,6 +34,7 @@
 import com.sendbird.uikit.interfaces.OnMessageListUpdateHandler;
 import com.sendbird.uikit.interfaces.OnPagedDataLoader;
 import com.sendbird.uikit.internal.extensions.ChannelExtensionsKt;
+import com.sendbird.uikit.internal.extensions.MessageExtensionsKt;
 import com.sendbird.uikit.internal.interfaces.OnFeedbackRatingClickListener;
 import com.sendbird.uikit.internal.ui.widgets.InnerLinearLayoutManager;
 import com.sendbird.uikit.internal.ui.widgets.MessageRecyclerView;
@@ -95,6 +96,8 @@ abstract public class BaseMessageListComponent<LA extends BaseMessageListAdapter
     private View.OnClickListener scrollBottomButtonClickListener;
     @Nullable
     private OnConsumableClickListener scrollFirstButtonClickListener;
+    @Nullable
+    private View.OnClickListener unreadCountTooltipClickListener;
 
     BaseMessageListComponent(@NonNull Params params, boolean useMessageTooltip, boolean useScrollFirstButton) {
         this.params = params;
@@ -221,7 +224,8 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat
             }
         });
 
-        this.messageRecyclerView.getTooltipView().setOnClickListener(this::onMessageTooltipClicked);
+        messageRecyclerView.getTooltipView().setOnClickListener(this::onMessageTooltipClicked);
+        messageRecyclerView.getUnreadCountTooltipIcon().setOnClickListener(this::onUnreadCountTooltipClicked);
 
         final LinearLayoutManager layoutManager = createInnerLayoutManager(recyclerView);
         layoutManager.setReverseLayout(true);
@@ -299,6 +303,16 @@ public void setOnTooltipClickListener(@Nullable View.OnClickListener tooltipClic
         this.tooltipClickListener = tooltipClickListener;
     }
 
+    /**
+     * Register a callback to be invoked when the unread count tooltip is clicked.
+     *
+     * @param unreadCountTooltipClickListener The callback that will run
+     * since 3.24.0
+     */
+    public void setOnUnreadTooltipClickListener(@Nullable View.OnClickListener unreadCountTooltipClickListener) {
+        this.unreadCountTooltipClickListener = unreadCountTooltipClickListener;
+    }
+
     /**
      * Sets the paged data loader for message list.
      *
@@ -512,6 +526,32 @@ public void notifyTypingIndicatorUpdated(boolean scrollToFirstIfPossible) {
         scrollToFirstIfLastMessageVisible(scrollToFirstIfPossible);
     }
 
+    /**
+     * Checks if the new line is visible on screen and shows or hides the unread message count tooltip.
+     *
+     * @param channel the GroupChannel containing the messages and unread count
+     * @return <code>true</code> if the new line is visible, <code>false</code> otherwise
+     * since 3.24.0
+     */
+    public boolean updateTooltipByNewLine(GroupChannel channel) {
+        if (messageRecyclerView == null) return false;
+
+        if (isNewLineVisible(channel)) {
+            messageRecyclerView.hideUnreadCountTooltip();
+            return true;
+        } else {
+            int count = channel.getUnreadMessageCount();
+            if (count == 0) {
+                messageRecyclerView.hideUnreadCountTooltip();
+                hideNewMessageTooltip();
+            } else {
+                messageRecyclerView.showUnreadCountTooltip(getUnreadCountTooltipMessage(messageRecyclerView.getContext(), count));
+            }
+
+            return false;
+        }
+    }
+
     /**
      * Returns the text on the tooltip.
      *
@@ -532,6 +572,30 @@ protected String getTooltipMessage(@NonNull Context context, int count) {
         return result;
     }
 
+    /**
+     * Returns the text on the unread count tooltip.
+     *
+     * @param context The {@code Context} this view is currently associated with
+     * @param count   Number of unread message counts
+     * @return Text to be shown on the unread count tooltip
+     * since 3.24.0
+     */
+    @NonNull
+    protected String getUnreadCountTooltipMessage(@NonNull Context context, int count) {
+        if (messageRecyclerView == null) return "";
+        String result = "";
+
+        String countText = count > 99 ? context.getString(R.string.sb_text_channel_message_unread_count_max) : String.valueOf(count);
+
+        if (count > 1) {
+            result = String.format(Locale.US, context.getString(R.string.sb_text_channel_unread_count_tooltip_with_count), countText);
+        } else if (count == 1) {
+            result = String.format(Locale.US, context.getString(R.string.sb_text_channel_unread_count_tooltip), countText);
+        }
+
+        return result;
+    }
+
     /**
      * Called when the item of the message list is clicked.
      *
@@ -687,6 +751,43 @@ protected boolean onScrollFirstButtonClicked(@NonNull View view) {
     /********************************************************************************************
      *                                      PRIVATE AREA
      *********************************************************************************************/
+    private void onUnreadCountTooltipClicked(@NonNull View view) {
+        if (unreadCountTooltipClickListener != null) unreadCountTooltipClickListener.onClick(view);
+    }
+
+    private boolean isNewLineVisible(GroupChannel channel) {
+        if (MessageExtensionsKt.getNewLineMessageId() == null) return false;
+
+        if (getRecyclerView() == null || adapter == null) return false;
+
+        final List<BaseMessage> messages = adapter.getItems();
+        if (messages.isEmpty()) return false;
+
+        final LinearLayoutManager layoutManager = (LinearLayoutManager) getRecyclerView().getLayoutManager();
+        if (layoutManager == null) return false;
+
+        final int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
+        final int lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition();
+
+        if (firstVisibleItemPosition == RecyclerView.NO_POSITION
+            || lastVisibleItemPosition == RecyclerView.NO_POSITION) return false;
+
+        final long lastRead = channel.getMyLastRead();
+        BaseMessage firstVisibleMessage = messages.get(firstVisibleItemPosition);
+        BaseMessage lastVisibleMessage = messages.get(lastVisibleItemPosition);
+
+        return firstVisibleMessage.getCreatedAt() >= lastRead && lastVisibleMessage.getCreatedAt() <= lastRead;
+    }
+
+    private void hideNewMessageTooltip() {
+        if (messageRecyclerView == null) return;
+
+        if (useMessageTooltip) {
+            tooltipMessageCount.set(0);
+            messageRecyclerView.hideNewMessageTooltip();
+        }
+    }
+
     boolean hasNextMessages() {
         return pagedDataLoader != null && pagedDataLoader.hasNext();
     }
@@ -799,10 +900,7 @@ private boolean isScrollOnTheFirst(@NonNull RecyclerView recyclerView) {
     private void onScrollEndReaches(@NonNull PagerRecyclerView.ScrollDirection direction, @NonNull MessageRecyclerView messageListView) {
         final PagerRecyclerView.ScrollDirection endDirection = PagerRecyclerView.ScrollDirection.Bottom;
         if (!hasNextMessages() && direction == endDirection) {
-            if (useMessageTooltip) {
-                tooltipMessageCount.set(0);
-                messageListView.hideNewMessageTooltip();
-            }
+            hideNewMessageTooltip();
             if (useScrollFirstButton) {
                 messageListView.hideScrollFirstButton();
             }
diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/FileUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/FileUtils.java
index 20e790e7..08f77055 100644
--- a/uikit/src/main/java/com/sendbird/uikit/utils/FileUtils.java
+++ b/uikit/src/main/java/com/sendbird/uikit/utils/FileUtils.java
@@ -317,4 +317,9 @@ public static String getReadableFileSize(long length) {
         int digitGroups = (int) (Math.log10(length) / Math.log10(1024));
         return new DecimalFormat("#,##0.#").format(length / Math.pow(1024, digitGroups)) + " " + units[digitGroups];
     }
+
+    @NonNull
+    public static String generateCacheKey(@NonNull String plainUrl, @NonNull String requestId) {
+        return (TextUtils.isNotEmpty(requestId)) ? requestId : String.valueOf(plainUrl.hashCode());
+    }
 }
diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
index 394bc207..55ff447a 100644
--- a/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
+++ b/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
@@ -25,6 +25,7 @@
 import com.sendbird.android.handler.MessageCollectionHandler;
 import com.sendbird.android.handler.MessageCollectionInitHandler;
 import com.sendbird.android.message.BaseMessage;
+import com.sendbird.android.message.CustomizableMessage;
 import com.sendbird.android.message.Feedback;
 import com.sendbird.android.message.FeedbackRating;
 import com.sendbird.android.message.FileMessage;
@@ -48,10 +49,12 @@
 import com.sendbird.uikit.internal.contracts.SendbirdUIKitImpl;
 import com.sendbird.uikit.internal.extensions.ChannelExtensionsKt;
 import com.sendbird.uikit.internal.extensions.MessageExtensionsKt;
+import com.sendbird.uikit.internal.model.ChannelUnreadInfo;
 import com.sendbird.uikit.internal.singleton.MessageTemplateManager;
 import com.sendbird.uikit.internal.singleton.MessageTemplateMapper;
 import com.sendbird.uikit.log.Logger;
 import com.sendbird.uikit.model.MessageList;
+import com.sendbird.uikit.model.NewLineData;
 import com.sendbird.uikit.model.TypingIndicatorMessage;
 import com.sendbird.uikit.model.configurations.ChannelConfig;
 import com.sendbird.uikit.model.configurations.UIKitConfig;
@@ -100,6 +103,8 @@ public class ChannelViewModel extends BaseMessageListViewModel {
     private final MutableLiveData<Pair<BaseMessage, SendbirdException>> feedbackUpdated = new MutableLiveData<>();
     @NonNull
     private final MutableLiveData<Pair<BaseMessage, SendbirdException>> feedbackDeleted = new MutableLiveData<>();
+    @NonNull
+    private final MutableLiveData<NewLineData> newLineUpdated = new MutableLiveData<>();
     @Nullable
     private MessageListParams messageListParams;
     @Nullable
@@ -117,6 +122,10 @@ public class ChannelViewModel extends BaseMessageListViewModel {
     @VisibleForTesting
     MessageTemplateMapper messageTemplateMapper = new MessageTemplateMapper(MessageTemplateManager.getMapper());
 
+    @NonNull
+    private final ChannelUnreadInfo channelUnreadInfo = new ChannelUnreadInfo();
+    private boolean isScrollEnd = true;
+
     /**
      * Class that holds message data in a channel.
      *
@@ -180,7 +189,7 @@ public ChannelViewModel(@NonNull String channelUrl, @Nullable MessageListParams
             @Override
             public void onMessageReceived(@NonNull BaseChannel channel, @NonNull BaseMessage message) {
                 if (ChannelViewModel.this.getChannel() != null && channel.getUrl().equals(channelUrl) && hasNext()) {
-                    markAsRead();
+                    tryMarkAsRead();
                     notifyDataSetChanged(new MessageContext(CollectionEventSource.EVENT_MESSAGE_RECEIVED, SendingStatus.SUCCEEDED));
                 }
             }
@@ -290,6 +299,10 @@ public void onMessagesDeleted(@NonNull MessageContext context, @NonNull GroupCha
                 if (ChannelViewModel.this.handler != null) {
                     ChannelViewModel.this.handler.onMessagesDeleted(context, channel, messages);
                 }
+
+                if (channelConfig.getEnableMarkAsUnread()) {
+                    channelUnreadInfo.removeUnseenMessages(messages);
+                }
             }
 
             @UiThread
@@ -328,6 +341,7 @@ public void onChannelUpdated(@NonNull GroupChannelContext context, @NonNull Grou
                             notifyDataSetChanged(context);
                         }
                         break;
+                    case EVENT_USER_MARKED_UNREAD:
                     case EVENT_DELIVERY_STATUS_UPDATED:
                     case EVENT_READ_STATUS_UPDATED:
                         notifyDataSetChanged(context);
@@ -353,11 +367,38 @@ void onMessagesAdded(@NonNull MessageContext context, @NonNull GroupChannel chan
             case EVENT_MESSAGE_RECEIVED:
             case EVENT_MESSAGE_SENT:
             case MESSAGE_FILL:
-                markAsRead();
+                if (!channelConfig.getEnableMarkAsUnread()) {
+                    markAsRead();
+                } else {
+                    if (isScrollEnd) {
+                        if (channelUnreadInfo.shouldClearNewLine()) markAsRead();
+                    } else {
+                        channelUnreadInfo.addUnseenMessages(messages);
+                    }
+                }
+
                 break;
         }
     }
 
+    @Override
+    void onMessagesUpdated(@NonNull MessageContext context, @NonNull GroupChannel channel, @NonNull List<BaseMessage> messages) {
+        super.onMessagesUpdated(context, channel, messages);
+        if (context.getMessagesSendingStatus() == SendingStatus.SUCCEEDED) {
+            if (context.getCollectionEventSource() == CollectionEventSource.EVENT_MESSAGE_SENT) {
+                if (!channelConfig.getEnableMarkAsUnread()) {
+                    markAsRead();
+                } else {
+                    if (isScrollEnd) {
+                        if (channelUnreadInfo.shouldClearNewLine()) markAsRead();
+                    } else {
+                        channelUnreadInfo.addUnseenMessages(messages);
+                    }
+                }
+            }
+        }
+    }
+
     // If the collection starts with a starting point value, not MAX_VALUE,
     // the message should be requested the newest messages at once because there may be no new messages in the cache
     private void loadLatestMessagesForCache() {
@@ -520,6 +561,17 @@ public LiveData<Pair<BaseMessage, SendbirdException>> onFeedbackDeleted() {
         return feedbackDeleted;
     }
 
+    /**
+     * Returns LiveData that can be observed for the result of updating the new line.
+     *
+     * @return The NewLineData that holds the prev and current positions of the new line.
+     * since 3.24.0
+     */
+    @NonNull
+    public LiveData<NewLineData> onNewLineUpdated() {
+        return newLineUpdated;
+    }
+
     @Override
     public boolean hasNext() {
         return collection == null || collection.getHasNext();
@@ -669,8 +721,10 @@ private void markMessagesAsShouldShowSuggestedReplies(List<BaseMessage> messages
         for (BaseMessage message : messages) {
             boolean shouldShowSuggestedReplies = MessageExtensionsKt.getShouldShowSuggestedReplies(message);
             if (shouldShowSuggestedReplies) {
-                MessageExtensionsKt.setShouldShowSuggestedReplies(message, false);
-                cachedMessages.update(message);
+                final BaseMessage updated = cachedMessages.update(message);
+                if (updated != null) {
+                    MessageExtensionsKt.setShouldShowSuggestedReplies(updated, false);
+                }
             }
         }
 
@@ -685,14 +739,18 @@ private void markMessagesAsShouldShowSuggestedReplies(List<BaseMessage> messages
 
             BaseMessage lastMessage = messages.get(0);
             if (lastMessage != null && !lastMessage.getSuggestedReplies().isEmpty()) {
-                MessageExtensionsKt.setShouldShowSuggestedReplies(lastMessage, true);
-                cachedMessages.update(lastMessage);
+                final BaseMessage updated = cachedMessages.update(lastMessage);
+                if (updated != null) {
+                    MessageExtensionsKt.setShouldShowSuggestedReplies(updated, true);
+                }
             }
         } else if (suggestedRepliesFor == SuggestedRepliesFor.ALL_MESSAGES) {
             for (BaseMessage message : messages) {
                 if (!message.getSuggestedReplies().isEmpty()) {
-                    MessageExtensionsKt.setShouldShowSuggestedReplies(message, true);
-                    cachedMessages.update(message);
+                    final BaseMessage updated = cachedMessages.update(message);
+                    if (updated != null) {
+                        MessageExtensionsKt.setShouldShowSuggestedReplies(updated, true);
+                    }
                 }
             }
         }
@@ -712,11 +770,174 @@ private TypingIndicatorMessage createTypingIndicatorMessage() {
         return null;
     }
 
+    /**
+     * Marks the channel as read.
+     *
+     * since 3.24.0
+     */
     public void markAsRead() {
+        Logger.dev(">> ChannelViewModel::markAsRead()");
         if (!isChatScreenVisible) return;
 
-        Logger.dev("markAsRead");
-        if (channel != null) channel.markAsRead(null);
+        if (channel == null) return;
+        channel.markAsRead(null);
+
+        if (channelConfig.getEnableMarkAsUnread()) {
+            channelUnreadInfo.setNewLineExistInChannel(false);
+        }
+    }
+
+    private void tryMarkAsRead() {
+        Logger.dev(">> ChannelViewModel::tryMarkAsRead()");
+        boolean enableMarkAsUnread = channelConfig.getEnableMarkAsUnread();
+        if (!enableMarkAsUnread) {
+            markAsRead();
+        }
+    }
+
+    /**
+     * Marks the message as unread.
+     *
+     * @param message The message to be marked as unread
+     * @param isUserRequestedUnread Indicates whether the unread action is requested by the user or not.
+     * since 3.24.0
+     */
+    public void markAsUnread(@NonNull BaseMessage message, boolean isUserRequestedUnread) {
+        Logger.dev(">> ChannelViewModel::markAsUnread()");
+        if (channel == null) return;
+
+        if (isUserRequestedUnread) {
+            channelUnreadInfo.setHasUserMarkedUnread(true);
+        }
+        markAsUnreadInternal(message);
+    }
+
+    private void markAsUnreadInternal(@NonNull BaseMessage message) {
+        Logger.dev(">> ChannelViewModel::markAsUnreadInternal()");
+        if (channel == null) return;
+
+        channel.markAsUnread(message, null);
+    }
+
+    /**
+     * Updates the read status when a new line message becomes visible to the user.
+     * If there are no new unseen messages after the new line, marks the channel as read.
+     * Otherwise, marks the message at the new line as unread.
+     *
+     * since 3.24.0
+     */
+    public void onNewLineSeen() {
+        Logger.dev(">> ChannelViewModel::onNewLineSeen()");
+        if (channel == null || !channelConfig.getEnableMarkAsUnread()) return;
+        if (channelUnreadInfo.getHasUserMarkedUnread()) return;
+
+        channelUnreadInfo.setHasSeenNewLine(true);
+
+        BaseMessage firstUnseenMessage = channelUnreadInfo.getFirstUnseenMessage();
+        if (firstUnseenMessage == null) {
+            markAsRead();
+        } else {
+            markAsUnreadInternal(firstUnseenMessage);
+        }
+    }
+
+    /**
+     * Updates the scroll state of the channel.
+     *
+     * @param isScrollEndReached The flag indicating whether the scroll end is reached or not.
+     * since 3.24.0
+     */
+    public void onScrollChanged(boolean isScrollEndReached) {
+        if (channel == null || isScrollEnd == isScrollEndReached) return;
+
+        isScrollEnd = isScrollEndReached;
+
+        if (isScrollEnd) {
+            if (channelConfig.getEnableMarkAsUnread()) {
+                channelUnreadInfo.clearUnseenMessages();
+
+                if (channelUnreadInfo.shouldClearNewLine()) {
+                    markAsRead();
+                }
+            }
+
+        }
+    }
+
+    /**
+     * Updates the new line position in the message list.
+     * Also updates NewLineData if the position changes.
+     *
+     * since 3.24.0
+     */
+    public void updateNewLine() {
+        Logger.d(">> ChannelViewModel::updateNewLine()");
+        if (channel == null) return;
+
+        if (!channelConfig.getEnableMarkAsUnread()) return;
+
+        BaseMessage oldestMessage = cachedMessages.getOldestMessage();
+        BaseMessage lastMessage = channel.getLastMessage();
+
+        if (oldestMessage == null || lastMessage == null) {
+            channelUnreadInfo.setNewLineExistInChannel(false);
+            return;
+        }
+
+        boolean isNewLineExistInChannel = (channel.getMyLastRead() < channel.getLastMessage().getCreatedAt()) || MessageExtensionsKt.getNewLineMessageId() != null;
+        channelUnreadInfo.setNewLineExistInChannel(isNewLineExistInChannel);
+
+        if (!channelUnreadInfo.isNewLineExistInChannel()) {
+            return;
+        }
+
+        Long newLineMessageId = MessageExtensionsKt.getNewLineMessageId();
+        NewLineData prevNewLineData = newLineUpdated.getValue();
+        boolean isNewLineInLoadedMessages = channel.getMyLastRead() >= oldestMessage.getCreatedAt();
+
+        if (!isNewLineInLoadedMessages) {
+            boolean hasPreviousNewLine = newLineMessageId != null && prevNewLineData != null;
+
+            if (hasPreviousNewLine) {
+                NewLineData newLineData = new NewLineData(prevNewLineData.getCurrentPosition(), null);
+                refreshNewLineData(newLineData, null);
+            }
+        } else {
+            refreshNewLineInLoadedMessages(channel.getMyLastRead(), prevNewLineData);
+        }
+    }
+
+    private void refreshNewLineInLoadedMessages(long myLastRead, @Nullable NewLineData prevNewLineData) {
+        Integer prevNewLinePositionIndex = prevNewLineData == null ? null : prevNewLineData.getCurrentPosition();
+        Integer newLinePositionIndex = null;
+
+        List<BaseMessage> messages = cachedMessages.toList();
+
+        // cachedMessages is descending order.
+        // run from latest message to oldest message to find first unread message.
+        for (int i = 0; i < messages.size(); i++) {
+            BaseMessage message = messages.get(i);
+
+            boolean isFirstReadMessage = myLastRead >= message.getCreatedAt();
+            if (isFirstReadMessage && newLinePositionIndex != null) {
+                NewLineData newLineData = new NewLineData(prevNewLinePositionIndex, newLinePositionIndex);
+                long targetMessageId = messages.get(newLinePositionIndex).getMessageId();
+
+                refreshNewLineData(newLineData, targetMessageId);
+                break;
+            }
+
+            boolean isNewLineAllowedMessage = !(message instanceof CustomizableMessage) && !(message.isSilent());
+            if (isNewLineAllowedMessage) {
+                newLinePositionIndex = i;
+            }
+        }
+    }
+
+    @UiThread
+    private synchronized void refreshNewLineData(NewLineData newLineData, @Nullable Long messageId) {
+        MessageExtensionsKt.setNewLineMessageId(messageId);
+        newLineUpdated.setValue(newLineData);
     }
 
     public void setIsChatScreenVisible(boolean visible) {
@@ -801,7 +1022,7 @@ public void onApiResult(@Nullable List<BaseMessage> apiResultList, @Nullable Sen
                     cachedMessages.addAll(apiResultList);
                     notifyDataSetChanged(StringSet.ACTION_INIT_FROM_REMOTE);
                     if (!apiResultList.isEmpty()) {
-                        markAsRead();
+                        tryMarkAsRead();
                     }
                 }
                 messageLoadState.postValue(MessageLoadState.LOAD_ENDED);
@@ -838,6 +1059,7 @@ public List<BaseMessage> loadPrevious() throws Exception {
                     if (messages != null) {
                         cachedMessages.addAll(messages);
                     }
+                    updateNewLine();
                     result.set(messages);
                     notifyDataSetChanged(StringSet.ACTION_PREVIOUS);
                 }
diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/FileDownloader.java b/uikit/src/main/java/com/sendbird/uikit/vm/FileDownloader.java
index ab96d321..14dafa22 100644
--- a/uikit/src/main/java/com/sendbird/uikit/vm/FileDownloader.java
+++ b/uikit/src/main/java/com/sendbird/uikit/vm/FileDownloader.java
@@ -6,7 +6,6 @@
 import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
 import com.sendbird.android.exception.SendbirdException;
 import com.sendbird.android.message.FileMessage;
 import com.sendbird.android.message.Thumbnail;
@@ -103,15 +102,14 @@ public boolean isDownloading(@NonNull String url) {
     }
 
     public void saveFile(@NonNull Context context, @NonNull String url,
-                         @NonNull String type, @NonNull String filename) throws Exception {
+                         @NonNull String type, @NonNull String filename, @NonNull String cacheKey) throws Exception {
         if (downloadingFileSet.contains(url)) {
             return;
         }
 
         try {
             downloadingFileSet.add(url);
-            final RequestManager glide = Glide.with(context);
-            File file = glide.asFile().load(url).submit().get();
+            File file = GlideCachedUrlLoader.load(Glide.with(context).asFile(), url, cacheKey).submit().get();
             FileUtils.saveFile(context, file, type, filename);
         } finally {
             downloadingFileSet.remove(url);
diff --git a/uikit/src/main/res/drawable-hdpi/icon_mark_as_unread.png b/uikit/src/main/res/drawable-hdpi/icon_mark_as_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..79f48dc8291a3b549dfdf3dd6de7cb92850e613d
GIT binary patch
literal 836
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#&H|6fVg?3*IUvlacGk)SD9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~y$2Bw>yE{-7;jBn@k7G5@xXp6UCYvA3&c$2}H
zv1bCWhVT_1hM5Yojl42y3~C!@GMH&x(tNml>(}-AonP(B-*4@Gul2L@+_Wj@895YN
zCLF6|`ZVFWm9%W>pWoBZE&0r=BCY&AEd9#P_!Itf_xiQ76uEt2`@jG5^i%3L0xjDG
z|M)$B_M=*3^10WK&u7i(n_2$-AJ--8bIvbo&i?toeMQ41$qCmDPxeH}E#-Q5`pC_c
z)lIUKPlbJm$qVSXB)fX<#X`N`Ub$r_Qo5~VSI_(_c`nsKE&1rVt6tj+^bXIw^>x$A
zI~${BI&*HZ*4fg#yx?+W-}{od1LuzGYZmWutu^yzuUS+(`G?%;?ndv&qOXdh_Sqj&
zzjb`8hndES1<&Hnh}QZZ(b?F&{qm$2n=egz!D-}EtiMg=mvzdFyW8_Tw;VaPH#51c
z>B6KJ=U3Q!-_n)M@Z2(Sk8>=aH+$6V(j9iWC!aDK<?XP2^j$=6uI{P#g+2S+qUX5Z
zKiIb~$Y;ZR`Lv74waUL-`i+z$7c$sh)4sLA^;g~RhNjcM<X(&A25gu<IpCpNLA%Gi
zMxP(Q9oOC5{H`SKQQ^`{;x|}NGK#*~_)k!msr>z^hkN3JOYGb}xL0IZYgo;#=T_d!
zYO+W2*yWdd8uvD``M=k&;tRer)1>^_QsurUtX!_#ju)K*wg`ymvJlUd^$T-Uc5N?Q
z^|0V!&7=h>I~$wUZVAbl-26IWrQq5N+n#XFJO0|MBP=6&)4|^>+}35Vdd*AVzB%_v
z*Rm%E*jv4NUW8dHJi0Aoxwrec&*OW_pR|p$!zSN*`R72@jD&PCPyYAUg>v5=vOOW6
z6=S7Q*>-7>W@Y1~MVdDqH7`ziv#=$@i%%ikM3sG#@~lb99-_V{Cobt&_Jk$LHMmI0
xaFM2EbHK$Zb38jTyu=(D1)P9MQQ*^r`-wHJ!QzLu%K{TUgQu&X%Q~loCIHrUcNqWx

literal 0
HcmV?d00001

diff --git a/uikit/src/main/res/drawable-mdpi/icon_mark_as_unread.png b/uikit/src/main/res/drawable-mdpi/icon_mark_as_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..142faadd452b09c512a3d99e452c778c33a60ab5
GIT binary patch
literal 522
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBx%r+hjv*C{Z)f!8HX8`I?JsNUIlv*=C}`AV
z-st;+t;fO4!~F$YO7pbf&M5)G=j;z8-k<C@QDDydhYkG9U6VxeE!37Pc76PAcSK!i
zsmvnjN4JGa{xosSFpRV}z91FoleJ)G&dlp(kAI$<V^D8?z2{cY@w0}<dF3uupSYE_
z{o|R-hZrAQdSsYPw$f|->1FVeiTx9=@XkIypDH)QXo1ISo93n7ZjCN>lX>{L_)__a
zquH5}r<5aq^jYkAGBaB@xBlVU+X1s?%01k3MYpzXJ;&oywt<JdyEO#A9ZLFsEvSVv
zkKeYJjn6~q-jeClRD1$H%0D={?L)++C7kvP(l;@u-9AyI+4v+ilk?RAIcvFij+pIB
z&u!ptJ$=$$Y+2;`2N9nITY2lIFM6)O*IwqQ<h(<xB8#$ja%s)6LPIM#q)!_zm!0r`
zU%Ph8ThV+`S(zEa>%w#l$|NijyaU$8JjmP3%}^~aqa~dhA64{a@rp+EIgVK>E@7Ln
hBVN})k<|J+hTlw!gKj<kCku=^22WQ%mvv4FO#mJl(+&Ut

literal 0
HcmV?d00001

diff --git a/uikit/src/main/res/drawable-xhdpi/icon_mark_as_unread.png b/uikit/src/main/res/drawable-xhdpi/icon_mark_as_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..4096a282ae948fa591b4d1bdbbce3747046e8512
GIT binary patch
literal 937
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^b&H|6fVg?2=RS;(M3{v?36l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-P=1GAl{i(^Oy<J-Hh3oko}v_0f+V+uMnO+YK*
zWdmOTXUT*B#}^J47-cO&1gs`ldsrFV>NHMP>)aCb?b+h*GcEVOIkGAKwE4|REI^|f
zEI#^aoa}vke5Zxq2ZM9}Eb3b~138k<>*gFj!}Ivd@%@gE|5#X`b)VaHcctLNhs!QM
z-m9+@ac1w=JIlglmTzyZeOWYDi!*V3it&q=JYBmd>i0iCTljOj))~$7Q!@*#&T=yr
z-Mjcc)S&2{_T@`FS<k;|2;I!IE<9W^Yrkz<(`jRk&&5S2wS%kK&c4>xx$ZYJ#?vY%
zV_#-ec;U@GMiMHrW+r}b@5x!KUIU4<`F`frSv)_|ZEyG<|69{;&%C^U)joZ%7k(eV
z*XaK~^mWZ%w)@%(Z*c4W>-1)QXmzdcw@F@><8&LB<F^i}=`Sz)u~N90<sQ@WvKXJa
z9uG?OuJAGCOEzAw46s(4-g@Bm7Lf}3Ql-Z0J43C%d8vG>y&1M;!^x5v(H_?xe63r#
zFIx48)F1oxzp^)kJF(Q|Ew3tMS9N>ve9tS^cT*%9<F^I>+_Be4;lt@UJvA@;4y-r+
zxHXc=-}<-yKH-Xck^f6t4;0?9u%D{;&aZWwy>P`$zx?Rg&JpXIIQH~ie=H>{Y;AM?
zU%;Ua-enI3r2FqW?a{O8-}QLTyF-d+)(YiGRyid+zA-CBrt!RgMaKR>wmm0S>Hi6N
z`toR05zD&cuYbDrKH-R&cKHim-X!G$$-R&68M{Bs4XU1W@7$g)v%Ukz1aDX{NxLUJ
z=E#w0>{Z@S$U?f{_NA{JkNzl4jEnoYJ9bz1-{tZlZa+Lz)Rzd=mh2Sbzj(y=eZNt}
zXMwx=KdjaA*mNfp^S(PeYqs;Y=0=^!=HIN((~Z{d^**ZSvj4#zpFb^gH(KaUNtT!O
z(0_CK)8;Ul*)#dAZf%!;zBo*-V)lWzT-k5SZI9i}UK%7{l5p>3UhCoCckXM|Ou0No
zUt(SBGlA<CkEGmV9(QER6!t2wD?DP_x8s-~PQh|rP+|vy6OZI?oM~FoFW&MR#PxLb
Kb6Mw<&;$V4C$J3w

literal 0
HcmV?d00001

diff --git a/uikit/src/main/res/drawable-xxhdpi/icon_mark_as_unread.png b/uikit/src/main/res/drawable-xxhdpi/icon_mark_as_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c23510163619405e100514f123fe11c0f960e67
GIT binary patch
literal 1442
zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&oCO|{#S9FJ79h;%I?XTvD9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~y$23B)V7srqa#<zF>=iYXcY5QpI`aj>wQBOLh
zMOslhWUj(nmLT;G>&9J<mpPyK2;?hNGVK=LVdKGg=Rlc@T%~=St^9*-g^oo5pC)g1
znYe`oXaf{DT#w_dxcNHq-rQ$rUw(ghasGY&Vu@#EGiG1D!=2$FlV*D+Z$>-k=hPYf
zzv_QD6b4>auFJdhcP)#ENc+v~dlUB0E%~o4*=1E{{VV!7d*$-f`5xanXX$196a87e
zdFny$iC^53bRW&FuDe|FKJ@+Tjp55zn=0x{9}Riky8Z2)$kob$r}yjae!@8`EjHoy
zn??T?Y@27Y{btsz(uHp~ckQ~Wem1k|ShV<^eVUuYnxpD3$)v6R7}mN?xBT8}#lTvd
z%)R~>EFAytnZ7evdH0v53g(C;yUabg2j9+4F3WQGwP49~^)=5Wf9qC;7TkU|XGP~T
zi(7gc`SUf-P3}wh9r<|4dhdXGzQcR2ve;|fkJ3ndbGmoxufH9Z8IQDV-7f@cJe2SK
z-2E#obz#q|*IOgc3zzH*$drCQZ^gu-@E00WCY)ok?AcL!&e2=9Q!8irp8t*3ALl1=
zzU-NJE$sHnT9K)rkBHvC!9B6BAjk0B%Fj`(PjfOvrU_ilo6}uxbUdza<+@hYJ(H&g
z_AgJn5aBjqy1}z!EN`Fp?)hT^Vl00#dj->>8PdWgYXpF3%lzodpXFzIIdApfZWZEB
z&hxoY$M>m7qByzfTd}hKVmbeJlG^;U`m%%dmEUgLJ-NSR+PRzhiz62PU84VQt4+_o
z3M<FzUpo9p<=xK(hD7*<>~=rjJ9EJyj$N_VTcuxFZVqN;xw~#fS+Z?<*s6vFx3`7w
zKDf`MI@IYxZg-aXt!H8BoeQcr1n+)mXBr*qa^WratLN@bZ$f|eNH@K6-gP2*wV?gH
zsanb}>T<5+o#0>oc6Hx^-<t#t_jfG#y;;!EzI(y%EkLSs!SAg>d->xo#Z6yU=WrpM
z<?eQaGx1u|pZ$2_dD<7)uG#V@YwkPyRfQ~XQ<wg<kM#L2ewDN7n@HQvOJ7c_F7Gg3
zC1CVi<Wcn{%dYo+!X<mk?ma%;D+{FEetmTl_M1IR*zqvebCE+_K+18ksiWw|>CDBy
z7Mv14shDv_@vWoh?q936J6<?3vFv|sh;y!h$ubVBe>(4<`|+-BTTr-ei<JA^?-#2~
zS$d~0=?J%)chdHm%iSyvsq;5iJ4x4k>0KI<*~}l7(7GUTfY8R46@DK#@B27q?y~Za
zu96W84VSM-J`;HPuJ+;ntm|bnrWRz{X*;jhHZhD}mz`R%)W&js>-^u_JAW3*wpFg?
zS-bYak(!(9rmkEnI%~$nu;<N2TQ)ff8~+PQJ5xL(+5U^!=eimH((Qc$n2Y3GHl5wW
ze=K>C)WpvU+h*3!|2U&JE#$MW;)nJ$zFklKxgNg#p197$xXCTEJ+ba8&+j?&oi1po
z%9cziI~%L{nPJIv0h4KADo@sPNEPq0KYP|-`{9~PPWrmjF8$4udtjK<CQ5BIwHH>T
d!RQ5j{~0c+XRKb`_hJ@E%+uA+Wt~$(69BebqQ3wD

literal 0
HcmV?d00001

diff --git a/uikit/src/main/res/drawable-xxxhdpi/icon_mark_as_unread.png b/uikit/src/main/res/drawable-xxxhdpi/icon_mark_as_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..456ff4a611cd4e2f9270703613e2155be2f643a6
GIT binary patch
literal 1979
zcmd5-`7;}c7f;Zt6k9Dy=~{}`(Na{T6{)Lqv~;Pf2eDM_m#AZjG^CNPSjR4{FQP%%
zb*wL<j&*Dtai(=dTU3K2MI|h0l8rkmoBp!he_&_6Z{}T}&&+#o=DnGhal_M11#|)g
z00303y1RJGyzrAAIw-RazAH~;PASGcFdhIf_xPm1N@zii3<Sn|yEy?U4BZu3qJVI`
z?g#)h<{aJ&IRF4C-ni=GcryveXU!)Z^FKkKhhe+{EAU?dt@4$4BMq0^j&DI<Y0&%t
zH*+iGE@|Y}U;bHcnO3XAOeMmf@qV%qETb9dFZLB)myth=M%Z}DI(!yf8ufTUm0O`W
z2Hd|i-m$k6I?L+pDdwQWiC|tKOkOeWA=oQ1zLkWcc4$HPf^9T-HTeYe<qK0ugoSab
zrg#x>w+_|(Vtqb{Jhs%MGS_QLSMq<}W)s$vS}NdP-_)t2H~v_J4XWzVPiOjekHnws
z)0@fop}L5Esjg!->YP*$vwL2Q6-VbFOOCY;+jH)Y@e%ph8J%A7`>%4Sbo=oP?Isx2
ze+l+{&fa2TJojU{Pd*QO;eMO}buylF)~bzkeYYznebOO&CTw2Kf99-JFnD$Se3&-x
zvTY!IfKRMih<?2DXV!1&`Xd)pJ6_-oGzD>p5{H8A-H7p;t-zgMjtHy}c@7210lxcd
zEuris#>K^YYkp{Pzx~y(S0`s)a#s;~B0}*{wVJ@HS0sd4)$2>lY6Ggo+0#LKS$0?U
z@SD29Rm4pkZ;ui&G?p9trf5?%7VEbXF?=abc?E@kv;*Ocp|q>J90<h){OB($@=Q?W
zWP%Z<B=!wt?7m2OWqUBa#_yfJAEz?1_PH$zm02suM_#P&^QouZ^C}Yi&Zux&JE)0~
zPxY%K-K#_AYvlI*1DYC9QG5E|K?aJyIsV`W7Ozr*1^2v<CM2cY*|C+(GTBUZGoh(D
zi>Q&LL8-HTtqz0@+c27?Z-4HJWLdkFAU`nXrxcs#G!ZM(`K{(>>d_0r5cWNS?TW-O
zm{1vkLBxY1RIUG$laP6LSwE#q)uRzKJ$CLLo6+yBJpcQk;%J<`^0bP!BTe_UNitH{
zdZnvIiRgSZ2H|rjBjIs(RZ_ODn_zm#dv51K^Z`Pjf^wRY7U-B|dW*_5(i)GOZx7!}
zaM~_z1j_{&0DXpLV^~rvJPu-LCaiA#RP_lCmQbp8Cu6YuH;YDUMO?#4DVC&GN7H@k
zyZwk`^#liL3GUCQvYBG9#BxYWtHgc;<9M?7kzI!Cd49XVz6JUidF7}jUFegPue#<G
zZ%*1?3jZZA6;j|6ltzW3%q;2OW!4I9U9r93<QF~h55jwRuOy5O^VvY|2I**3aiK}s
zR$e$$wtIocgF=J!!(C*%ku5`UHicK`<03fC_%`V=nlK$2RFTW}DxG+Ft}!_eeb6qP
zT|s2);3m#jNE@o5+$e8hXcJo}b;2r4TkXF0y7dRP4t~PAB5{DE-hH`pYv`SgN)7tj
zp7CJAxz#R5J7hk?vyFahKhd!Z463shWI<;_F;CK#yJE|<o207zxdrG*Uw7^+jC?Qs
zO%Yv*vZ>`4SjN@??K3XYmC$)kg|2K@fyzNJx|2k<PH9I3E@xs&a1esNB)@TRZt;76
z$)#H@{P&Yl<L1;;iXIzhBpUH=$NJY!b&|cj?2s1HC~)yZ%nomAv=mov**2N__v+M*
z;da@H2lvn*A;fZT%2bbXf&>Njv#0)d`;QHCxI1=~6Rc*7k>mciK2BU{9_~dee%e|)
zM=9zyxdZGUZCR}+a}$G0iBMp3nDb^WKQLVQVBeT_ov@Y@ISYRJB_h0ST!b`iXVwLe
zQwH$=?0e=K?FLac4$wJ7?(;3l2KxUY#&6%_Dkzh;oOfrca9Ip_y3poh@Cd@>GVNvp
zOv2)7&I~Gu4N6k-mLha|klSvl=v`>Z*(I%j&YLl%jDjQ2l4{^2CC_hszmOrKNaGlb
zj~fo6^$z-(AXD@aGa-4v!>GaP6@sSW4;Oil8P?wSK_1YwnCcw<-XHFJD|OK0!YnJf
zP)VNBB$ri~i5(u8hWQ_o)mrDQp~$CwLyrG`7i%13`fUUAAs1k(pq$^5G#e|B=;8$O
z&M?Iv+te)AU;TuhjTZMVAQhAsTj0`W(rF0ZC`C_8m0!5F$l|)!(PA(>rrs)+e2T*x
z1}O(4sHABoN0V1Z?*OaGZbFj7ZCe{RCs#i|X@qGfitG=^oDw;OETr`f98SwP4mxI`
uZX9&xTIUU7Qn}^7N~{Hb{&Rmvc1lvkTlN(h`*VkSK7m(VJzXeHaQt6!MXv?`

literal 0
HcmV?d00001

diff --git a/uikit/src/main/res/layout/sb_activity.xml b/uikit/src/main/res/layout/sb_activity.xml
index 154fe9ea..2f1e1c6c 100644
--- a/uikit/src/main/res/layout/sb_activity.xml
+++ b/uikit/src/main/res/layout/sb_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sb_activity_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/uikit/src/main/res/layout/sb_view_admin_message_component.xml b/uikit/src/main/res/layout/sb_view_admin_message_component.xml
index 37db534d..fb8cdf22 100644
--- a/uikit/src/main/res/layout/sb_view_admin_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_admin_message_component.xml
@@ -1,22 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    android:paddingTop="@dimen/sb_size_4"
-    android:paddingBottom="@dimen/sb_size_4"
-    android:paddingStart="@dimen/sb_size_50"
-    android:paddingEnd="@dimen/sb_size_50"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="@dimen/sb_size_12"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tvMessage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:paddingTop="@dimen/sb_size_4"
+        android:paddingBottom="@dimen/sb_size_4"
+        android:paddingStart="@dimen/sb_size_50"
+        android:paddingEnd="@dimen/sb_size_50"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/uikit/src/main/res/layout/sb_view_message_recycler_view.xml b/uikit/src/main/res/layout/sb_view_message_recycler_view.xml
index 9eb5ef82..15e446de 100644
--- a/uikit/src/main/res/layout/sb_view_message_recycler_view.xml
+++ b/uikit/src/main/res/layout/sb_view_message_recycler_view.xml
@@ -80,4 +80,53 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <LinearLayout
+        android:id="@+id/vgUnreadCountTooltip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvBanner" >
+
+        <TextView
+            android:id="@+id/tvUnreadCountTooltipText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:paddingEnd="@dimen/sb_size_4"
+            android:singleLine="true"
+            android:paddingStart="@dimen/sb_size_16"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/vgUnreadCountTooltipClose"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <FrameLayout
+            android:id="@+id/vgUnreadCountTooltipClose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/sb_size_4"
+            android:paddingEnd="@dimen/sb_size_16"
+            android:paddingVertical="@dimen/sb_size_12"
+            android:layout_gravity="center"
+            android:gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tvUnreadCountTooltipText"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/ivUnreadCountTooltipClose"
+                android:layout_width="@dimen/sb_size_14"
+                android:layout_height="@dimen/sb_size_14"
+                android:src="@drawable/icon_close" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/uikit/src/main/res/layout/sb_view_my_file_image_message_component.xml b/uikit/src/main/res/layout/sb_view_my_file_image_message_component.xml
index b8db26d4..1f886214 100644
--- a/uikit/src/main/res/layout/sb_view_my_file_image_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_file_image_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tvSentAt"
         android:layout_width="wrap_content"
@@ -56,7 +65,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanel"
         />
 
diff --git a/uikit/src/main/res/layout/sb_view_my_file_message_component.xml b/uikit/src/main/res/layout/sb_view_my_file_message_component.xml
index 1d87ee4c..67f348b6 100644
--- a/uikit/src/main/res/layout/sb_view_my_file_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_file_message_component.xml
@@ -6,8 +6,17 @@
     android:paddingStart="@dimen/sb_size_12"
     android:paddingEnd="@dimen/sb_size_12"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <com.sendbird.uikit.internal.ui.messages.MyMessageStatusView
         android:id="@+id/ivStatus"
         android:layout_width="wrap_content"
@@ -49,7 +58,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanelWithReactions"
         android:visibility="gone"/>
 
diff --git a/uikit/src/main/res/layout/sb_view_my_file_video_message_component.xml b/uikit/src/main/res/layout/sb_view_my_file_video_message_component.xml
index 157d15f5..9b20e0da 100644
--- a/uikit/src/main/res/layout/sb_view_my_file_video_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_file_video_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tvSentAt"
         android:layout_width="wrap_content"
@@ -56,7 +65,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanel"
         android:visibility="gone"/>
 
diff --git a/uikit/src/main/res/layout/sb_view_my_message_component.xml b/uikit/src/main/res/layout/sb_view_my_message_component.xml
index c7e1d9fb..6247760d 100644
--- a/uikit/src/main/res/layout/sb_view_my_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tvSentAt"
         android:layout_width="wrap_content"
@@ -56,7 +65,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanel"
         />
 
diff --git a/uikit/src/main/res/layout/sb_view_my_multiple_files_message_component.xml b/uikit/src/main/res/layout/sb_view_my_multiple_files_message_component.xml
index 41cf2816..fb214022 100644
--- a/uikit/src/main/res/layout/sb_view_my_multiple_files_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_multiple_files_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tvSentAt"
         android:layout_width="wrap_content"
@@ -56,7 +65,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanel"
         />
 
diff --git a/uikit/src/main/res/layout/sb_view_my_user_message_component.xml b/uikit/src/main/res/layout/sb_view_my_user_message_component.xml
index afbd5366..e582bcbf 100644
--- a/uikit/src/main/res/layout/sb_view_my_user_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_user_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/brBottom"
         android:layout_width="wrap_content"
@@ -57,7 +66,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanel"
         android:visibility="gone"/>
 
diff --git a/uikit/src/main/res/layout/sb_view_my_voice_message_component.xml b/uikit/src/main/res/layout/sb_view_my_voice_message_component.xml
index 46a04f44..68ddaccc 100644
--- a/uikit/src/main/res/layout/sb_view_my_voice_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_my_voice_message_component.xml
@@ -6,8 +6,17 @@
     android:paddingStart="@dimen/sb_size_12"
     android:paddingEnd="@dimen/sb_size_12"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <com.sendbird.uikit.internal.ui.messages.MyMessageStatusView
         android:id="@+id/ivStatus"
         android:layout_width="wrap_content"
@@ -49,7 +58,7 @@
         android:layout_height="wrap_content"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
         app:layout_constraintBottom_toTopOf="@id/contentPanelWithReactions"
         android:visibility="gone"/>
 
diff --git a/uikit/src/main/res/layout/sb_view_new_line.xml b/uikit/src/main/res/layout/sb_view_new_line.xml
new file mode 100644
index 00000000..69e812a4
--- /dev/null
+++ b/uikit/src/main/res/layout/sb_view_new_line.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/tvNewMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="New messages" />
+
+    <View
+        android:id="@+id/vLineLeft"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginEnd="8dp"
+        android:background="@color/primary_200"
+        app:layout_constraintTop_toTopOf="@id/tvNewMessage"
+        app:layout_constraintBottom_toBottomOf="@id/tvNewMessage"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/tvNewMessage" />
+
+    <View
+        android:id="@+id/vLineRight"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginStart="8dp"
+        android:background="@color/primary_200"
+        app:layout_constraintTop_toTopOf="@id/tvNewMessage"
+        app:layout_constraintBottom_toBottomOf="@id/tvNewMessage"
+        app:layout_constraintStart_toEndOf="@id/tvNewMessage"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/uikit/src/main/res/layout/sb_view_other_file_image_message_component.xml b/uikit/src/main/res/layout/sb_view_other_file_image_message_component.xml
index bf67d21c..5681bad0 100644
--- a/uikit/src/main/res/layout/sb_view_other_file_image_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_file_image_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivProfileView"
         android:layout_width="@dimen/sb_size_26"
@@ -27,8 +36,8 @@
         android:paddingStart="@dimen/sb_size_50"
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/contentTopBarrier"
@@ -44,8 +53,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanel"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanel"
diff --git a/uikit/src/main/res/layout/sb_view_other_file_message_component.xml b/uikit/src/main/res/layout/sb_view_other_file_message_component.xml
index 8489ba75..7deea2ad 100644
--- a/uikit/src/main/res/layout/sb_view_other_file_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_file_message_component.xml
@@ -6,8 +6,17 @@
     android:paddingStart="@dimen/sb_size_12"
     android:paddingEnd="@dimen/sb_size_12"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivProfileView"
         android:layout_width="@dimen/sb_size_26"
@@ -27,8 +36,8 @@
         android:paddingStart="@dimen/sb_size_50"
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/contentTopBarrier"
@@ -44,8 +53,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanelWithReactions"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanelWithReactions"
diff --git a/uikit/src/main/res/layout/sb_view_other_file_video_message_component.xml b/uikit/src/main/res/layout/sb_view_other_file_video_message_component.xml
index d9e8a02a..749675ed 100644
--- a/uikit/src/main/res/layout/sb_view_other_file_video_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_file_video_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivProfileView"
         android:layout_width="@dimen/sb_size_26"
@@ -27,8 +36,8 @@
         android:paddingStart="@dimen/sb_size_50"
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/contentTopBarrier"
@@ -44,8 +53,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanel"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanel"
diff --git a/uikit/src/main/res/layout/sb_view_other_message_component.xml b/uikit/src/main/res/layout/sb_view_other_message_component.xml
index 334cc6c7..618ff8f9 100644
--- a/uikit/src/main/res/layout/sb_view_other_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_message_component.xml
@@ -6,8 +6,17 @@
     android:paddingStart="@dimen/sb_size_12"
     android:paddingEnd="@dimen/sb_size_12"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivProfileView"
         android:layout_width="@dimen/sb_size_26"
@@ -27,8 +36,8 @@
         android:paddingStart="@dimen/sb_size_50"
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/contentTopBarrier"
@@ -44,8 +53,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanel"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanel"
diff --git a/uikit/src/main/res/layout/sb_view_other_multiple_files_message_component.xml b/uikit/src/main/res/layout/sb_view_other_multiple_files_message_component.xml
index 7c72ed87..85cb53b4 100644
--- a/uikit/src/main/res/layout/sb_view_other_multiple_files_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_multiple_files_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivProfileView"
         android:layout_width="@dimen/sb_size_26"
@@ -27,8 +36,8 @@
         android:paddingStart="@dimen/sb_size_50"
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/contentTopBarrier"
@@ -44,8 +53,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanel"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanel"
diff --git a/uikit/src/main/res/layout/sb_view_other_user_message_component.xml b/uikit/src/main/res/layout/sb_view_other_user_message_component.xml
index 7fc1f067..aeefa29f 100644
--- a/uikit/src/main/res/layout/sb_view_other_user_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_user_message_component.xml
@@ -8,6 +8,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/brBottom"
         android:layout_width="wrap_content"
@@ -35,7 +44,7 @@
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <TextView
         android:id="@+id/tvSentAt"
@@ -63,8 +72,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanel"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanel"
diff --git a/uikit/src/main/res/layout/sb_view_other_voice_message_component.xml b/uikit/src/main/res/layout/sb_view_other_voice_message_component.xml
index 789d56cc..021286dc 100644
--- a/uikit/src/main/res/layout/sb_view_other_voice_message_component.xml
+++ b/uikit/src/main/res/layout/sb_view_other_voice_message_component.xml
@@ -6,8 +6,17 @@
     android:paddingStart="@dimen/sb_size_12"
     android:paddingEnd="@dimen/sb_size_12"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.sendbird.uikit.internal.ui.messages.NewLineView
+        android:id="@+id/newLineView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/sb_size_16"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivProfileView"
         android:layout_width="@dimen/sb_size_26"
@@ -27,8 +36,8 @@
         android:paddingStart="@dimen/sb_size_50"
         android:paddingEnd="@dimen/sb_size_50"
         android:paddingBottom="@dimen/sb_size_4"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/contentTopBarrier"
@@ -44,8 +53,8 @@
         android:layout_marginStart="@dimen/sb_size_12"
         android:translationY="@dimen/sb_size_10"
         app:layout_constraintStart_toEndOf="@+id/ivProfileView"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/newLineView"
+        app:layout_constraintBottom_toTopOf="@+id/contentPanelWithReactions"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentPanelWithReactions"
diff --git a/uikit/src/main/res/values/attrs.xml b/uikit/src/main/res/values/attrs.xml
index dac03dbf..5368cff1 100644
--- a/uikit/src/main/res/values/attrs.xml
+++ b/uikit/src/main/res/values/attrs.xml
@@ -340,6 +340,11 @@
         <attr name="sb_chat_notification_sent_at_text_appearance" format="reference"/>
     </declare-styleable>
 
+    <declare-styleable name="MessageView.NewLineView">
+        <attr name="sb_new_line_background" format="reference"/>
+        <attr name="sb_new_line_text_appearance" format="reference"/>
+    </declare-styleable>
+
     <declare-styleable name="Emoji">
         <attr name="sb_emoji_background" format="reference"/>
         <attr name="sb_emoji_more_button_src" format="reference"/>
@@ -393,6 +398,8 @@
         <attr name="sb_message_recyclerview_background" format="reference"/>
         <attr name="sb_message_recyclerview_tooltip_background" format="reference"/>
         <attr name="sb_message_recyclerview_tooltip_textappearance" format="reference"/>
+        <attr name="sb_message_recyclerview_unread_count_tooltip_textappearance" format="reference"/>
+        <attr name="sb_message_recyclerview_unread_count_tooltip_icon_tint" format="color|reference"/>
         <attr name="sb_message_typing_indicator_textappearance" format="reference"/>
         <attr name="sb_message_recyclerview_banner_background" format="reference"/>
         <attr name="sb_message_recyclerview_banner_textappearance" format="reference"/>
diff --git a/uikit/src/main/res/values/strings.xml b/uikit/src/main/res/values/strings.xml
index 9804d2ed..e99cf991 100644
--- a/uikit/src/main/res/values/strings.xml
+++ b/uikit/src/main/res/values/strings.xml
@@ -25,7 +25,10 @@
     <string name="sb_text_channel_message_badge_edited">&#160;(edited)</string>
     <string name="sb_text_channel_tooltip">%d new message</string>
     <string name="sb_text_channel_tooltip_with_count">%d new messages</string>
+    <string name="sb_text_channel_unread_count_tooltip">%s unread message</string>
+    <string name="sb_text_channel_unread_count_tooltip_with_count">%s unread messages</string>
     <string name="sb_text_channel_anchor_copy">Copy</string>
+    <string name="sb_text_channel_anchor_mark_as_unread">Mark as unread</string>
     <string name="sb_text_channel_anchor_save">Save</string>
     <string name="sb_text_channel_anchor_edit">Edit</string>
     <string name="sb_text_channel_anchor_delete">Delete</string>
@@ -47,6 +50,7 @@
     <string name="sb_text_channel_reaction_count_max">99</string>
     <string name="sb_text_channel_message_empty">No messages</string>
     <string name="sb_text_channel_message_unavailable">Message unavailable</string>
+    <string name="sb_text_channel_message_unread_count_max">99+</string>
     <string name="sb_text_notification_fallback_title">(Template error)</string>
     <string name="sb_text_notification_fallback_description">Can\'t read this notification.</string>
     <string name="sb_text_notification_channel_message_empty">No notifications</string>
@@ -165,7 +169,7 @@
     <string name="sb_text_group">Group</string>
     <string name="sb_text_super_group">Supergroup</string>
     <string name="sb_text_broadcast">Broadcast</string>
-    <string name="sb_text_information_channel_frozen">Channel frozen</string>
+    <string name="sb_text_information_channel_frozen">Channel is frozen</string>
     <string name="sb_text_operator">Operator</string>
     <string name="sb_text_menu_operators">Operators</string>
     <string name="sb_text_menu_muted_members">Muted members</string>
diff --git a/uikit/src/main/res/values/styles.xml b/uikit/src/main/res/values/styles.xml
index 27b81903..6b721a53 100755
--- a/uikit/src/main/res/values/styles.xml
+++ b/uikit/src/main/res/values/styles.xml
@@ -257,6 +257,8 @@
         <item name="sb_message_recyclerview_background">@color/background_50</item>
         <item name="sb_message_recyclerview_tooltip_background">@drawable/selector_tooltip_background_light</item>
         <item name="sb_message_recyclerview_tooltip_textappearance">@style/SendbirdCaption1Primary300</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_textappearance">@style/SendbirdBody2OnLight02</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_icon_tint">@color/primary_main</item>
         <item name="sb_message_recyclerview_banner_background">@drawable/sb_shape_channel_information_bg</item>
         <item name="sb_message_recyclerview_banner_textappearance">@style/SendbirdCaption2OnLight01</item>
         <item name="sb_message_typing_indicator_textappearance">@style/SendbirdCaption1OnLight02</item>
@@ -446,6 +448,8 @@
         <item name="sb_message_recyclerview_background">@color/background_50</item>
         <item name="sb_message_recyclerview_tooltip_background">@drawable/selector_tooltip_background_light</item>
         <item name="sb_message_recyclerview_tooltip_textappearance">@style/SendbirdCaption1Primary300</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_textappearance">@style/SendbirdBody2OnLight02</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_icon_tint">@color/primary_main</item>
         <item name="sb_message_recyclerview_banner_background">@drawable/sb_shape_channel_information_bg</item>
         <item name="sb_message_recyclerview_banner_textappearance">@style/SendbirdCaption2OnLight01</item>
         <item name="sb_message_typing_indicator_textappearance">@style/SendbirdCaption1OnLight02</item>
@@ -1045,6 +1049,11 @@
         <item name="sb_feedback_bad_button">@drawable/selector_feedback_bad_button_light</item>
     </style>
 
+    <style name="Widget.Sendbird.Message.NewLineView">
+        <item name="sb_new_line_background">@color/primary_main</item>
+        <item name="sb_new_line_text_appearance">@style/SendbirdCaption3Primary300</item>
+    </style>
+
     <!-- DialogView -->
     <style name="Widget.Sendbird.DialogView">
         <item name="sb_dialog_view_background">@drawable/sb_rounded_rectangle_light</item>
diff --git a/uikit/src/main/res/values/styles_dark.xml b/uikit/src/main/res/values/styles_dark.xml
index 89050352..134bf634 100644
--- a/uikit/src/main/res/values/styles_dark.xml
+++ b/uikit/src/main/res/values/styles_dark.xml
@@ -369,6 +369,8 @@
         <item name="sb_message_recyclerview_background">@color/background_600</item>
         <item name="sb_message_recyclerview_tooltip_background">@drawable/selector_tooltip_background_dark</item>
         <item name="sb_message_recyclerview_tooltip_textappearance">@style/SendbirdCaption1Primary200</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_textappearance">@style/SendbirdBody2OnDark02</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_icon_tint">@color/primary_light</item>
         <item name="sb_message_recyclerview_banner_background">@drawable/sb_shape_channel_information_bg</item>
         <item name="sb_message_recyclerview_banner_textappearance">@style/SendbirdCaption2OnLight01</item>
         <item name="sb_message_typing_indicator_textappearance">@style/SendbirdCaption1OnDark02</item>
@@ -559,6 +561,8 @@
         <item name="sb_message_recyclerview_background">@color/background_600</item>
         <item name="sb_message_recyclerview_tooltip_background">@drawable/selector_tooltip_background_dark</item>
         <item name="sb_message_recyclerview_tooltip_textappearance">@style/SendbirdCaption1Primary200</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_textappearance">@style/SendbirdBody2OnDark02</item>
+        <item name="sb_message_recyclerview_unread_count_tooltip_icon_tint">@color/primary_light</item>
         <item name="sb_message_recyclerview_banner_background">@drawable/sb_shape_channel_information_bg</item>
         <item name="sb_message_recyclerview_banner_textappearance">@style/SendbirdCaption2OnLight01</item>
         <item name="sb_message_typing_indicator_textappearance">@style/SendbirdCaption1OnDark02</item>
@@ -1110,4 +1114,9 @@
         <item name="sb_multiple_files_message_background_color">@color/background_400</item>
         <item name="sb_multiple_files_message_item_background_color">@color/background_500</item>
     </style>
+
+    <style name="Widget.Sendbird.Dark.Message.NewLineView">
+        <item name="sb_new_line_background">@color/primary_light</item>
+        <item name="sb_new_line_text_appearance">@style/SendbirdCaption3Primary200</item>
+    </style>
 </resources>

From 26b49c7221604d8955a57619b43f39d4c98afd5c Mon Sep 17 00:00:00 2001
From: Simon Cierniewski <793657+SimonCierniewski@users.noreply.github.com>
Date: Mon, 18 Aug 2025 12:07:12 +0200
Subject: [PATCH 19/25] Hide image title to fix edge to edge (#21)

---
 .../com/sendbird/uikit/fragments/PhotoViewFragment.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java
index 9513843e..c7298fa8 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/PhotoViewFragment.java
@@ -42,7 +42,6 @@
 import com.sendbird.uikit.internal.tasks.JobResultTask;
 import com.sendbird.uikit.internal.tasks.TaskQueue;
 import com.sendbird.uikit.log.Logger;
-import com.sendbird.uikit.utils.DateUtils;
 import com.sendbird.uikit.utils.DialogUtils;
 import com.sendbird.uikit.utils.MessageUtils;
 import com.sendbird.uikit.utils.TextUtils;
@@ -89,7 +88,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         Logger.d("PhotoViewFragment::onViewCreated()");
-        binding.ivClose.setOnClickListener(v -> shouldActivityFinish());
+//        binding.ivClose.setOnClickListener(v -> shouldActivityFinish());
+        binding.ivClose.setVisibility(View.GONE);   // Hide close button because shouldActivityFinish() is commented out and doesn't work
 
         Bundle args = getArguments();
         if (args != null) {
@@ -179,8 +179,8 @@ protected void onDrawPage() {
         final String plainUrl = this.plainUrl == null ? "" : this.plainUrl;
         final String requestId = this.requestId == null ? "" : this.requestId;
 
-        tvTitle.setText(senderNickname);
-        tvCreatedAt.setText(DateUtils.formatTime(requireContext(), this.createdAt));
+//        tvTitle.setText(senderNickname);      // Text only contains UUID of the user and doesn't support the cutout
+//        tvCreatedAt.setText(DateUtils.formatTime(requireContext(), this.createdAt));
         loading.setVisibility(View.VISIBLE);
 
         if (url != null) {

From 7c735682b2865e3d9fa13b949902884a6095b936 Mon Sep 17 00:00:00 2001
From: kevinwang <kevin.wang@carrot.co>
Date: Wed, 10 Dec 2025 14:48:00 -0500
Subject: [PATCH 20/25] Played with versions and dependencies to get a working
 build

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 66c44243..3644f29c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.9.22'
+    ext.kotlin_version = '2.2.21'
     ext.paparazzi_version = '1.3.1'
 
     dependencies {
@@ -14,8 +14,8 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
+    id 'com.android.application' version '8.6.0' apply false
+    id 'com.android.library' version '8.6.0' apply false
     id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
     id 'com.google.gms.google-services' version '4.3.15' apply false
 }

From 42ae535ee061d50e27ad0346eda8e15d79df1274 Mon Sep 17 00:00:00 2001
From: kevinwang <kevin.wang@carrot.co>
Date: Thu, 11 Dec 2025 14:55:27 -0500
Subject: [PATCH 21/25] Sendbird change

---
 uikit/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uikit/build.gradle b/uikit/build.gradle
index 54dfa118..6fb2f634 100644
--- a/uikit/build.gradle
+++ b/uikit/build.gradle
@@ -10,12 +10,12 @@ plugins {
 version = UIKIT_VERSION
 android {
     namespace 'com.sendbird.uikit'
-    compileSdk 34
+    compileSdk 35
 
     version = UIKIT_VERSION
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode Integer.parseInt(UIKIT_VERSION_CODE)
         versionName UIKIT_VERSION
 

From 4eb77a77741e44b65242942b14141e68847dd8d1 Mon Sep 17 00:00:00 2001
From: kevinwang <kevin.wang@carrot.co>
Date: Mon, 15 Dec 2025 10:45:17 -0500
Subject: [PATCH 22/25] Removed deprecated import
 kotlinx.android.parcel.Parcelize, Reverted back to Kotlin 1.9.22, AGP 8.6.0
 and Gradle 8.7

---
 build.gradle       |  2 +-
 uikit/build.gradle | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3644f29c..b4d44b99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '2.2.21'
+    ext.kotlin_version = '1.9.22'
     ext.paparazzi_version = '1.3.1'
 
     dependencies {
diff --git a/uikit/build.gradle b/uikit/build.gradle
index 6fb2f634..a3949234 100644
--- a/uikit/build.gradle
+++ b/uikit/build.gradle
@@ -50,8 +50,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/LICENSE', 'META-INF/LICENSE.txt']
+        }
     }
 
     kotlinOptions {
@@ -83,7 +93,7 @@ dependencies {
     implementation "androidx.viewpager2:viewpager2:1.1.0"
     implementation 'com.google.android.material:material:1.5.0'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-
+    implementation "androidx.core:core-ktx:1.13.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
 }

From 5033cf67d606f540dc119c775a66d53bef37aea5 Mon Sep 17 00:00:00 2001
From: kevinwang <kevin.wang@carrot.co>
Date: Tue, 16 Dec 2025 09:57:42 -0500
Subject: [PATCH 23/25] Lint fixes

---
 .../internal/ui/widgets/ThemeableSnackbar.kt  |  2 +
 uikit/src/main/res/values-es/strings.xml      | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt
index 6cd9de84..3831e5b8 100644
--- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt
+++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt
@@ -1,5 +1,6 @@
 package com.sendbird.uikit.internal.ui.widgets
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.util.AttributeSet
@@ -24,6 +25,7 @@ internal class ThemeableSnackbar @JvmOverloads constructor(
     private val binding: SbViewMentionLimitAlertBinding
     private var snackbar: Snackbar? = null
 
+    @SuppressLint("RestrictedApi")
     fun init(anchorView: View) {
         if (this.parent != null) (this.parent as ViewGroup).removeAllViews()
         val snackbar = Snackbar.make(anchorView, "", Snackbar.LENGTH_INDEFINITE).apply {
diff --git a/uikit/src/main/res/values-es/strings.xml b/uikit/src/main/res/values-es/strings.xml
index 365e906b..5149cbfc 100644
--- a/uikit/src/main/res/values-es/strings.xml
+++ b/uikit/src/main/res/values-es/strings.xml
@@ -54,6 +54,7 @@
     <string name="sb_text_notification_channel_list_error">Algo salió mal.</string>
 
     <!-- Channel Settings -->
+    <string name="sb_text_feedback_remove_comment">Eliminar comentarios</string>
     <string name="sb_text_channel_settings_moderations">Moderaciones</string>
     <string name="sb_text_channel_settings_notification">Notificaciones</string>
     <string name="sb_text_channel_settings_members">Miembros</string>
@@ -82,6 +83,7 @@
     <string name="sb_text_toast_success_start_upload_file">Subiendo&#8230;</string>
     <string name="sb_text_toast_success_start_download_file">Descargando&#8230;</string>
     <string name="sb_text_toast_success_download_file">Archivo guardado</string>
+    <string name="sb_text_toast_failure_feedback_delete">No se pudo eliminar. Inténtalo de nuevo.</string>
     <string name="sb_text_button_edit">Editar</string>
     <string name="sb_text_button_invite">Invitar</string>
     <string name="sb_text_button_cancel">Cancelar</string>
@@ -92,6 +94,7 @@
     <string name="sb_text_button_selected">Seleccionado</string>
     <string name="sb_text_button_add">Agregar</string>
     <string name="sb_text_button_ok">Aceptar</string>
+    <string name="sb_text_button_submit">Enviar</string>
     <string name="sb_text_ellipsis">&#8230;</string>
 
     <!--  Message Thread  -->
@@ -222,4 +225,53 @@
     <string name="sb_forms_invalid_form_field">Verifica el valor</string>
     <string name="sb_forms_submit_failed">Erro en la entrega</string>
     <string name="sb_forms_optional">(opcional)</string>
+    <string name="sb_fragment_photo_view_close_description">cerrar</string>
+    <string name="sb_fragment_photo_view_save_description">guardar</string>
+    <string name="sb_fragment_photo_view_delete_description">eliminar</string>
+    <string name="sb_view_channel_list_item_broadcast_icon_description">canal de emisión</string>
+    <string name="sb_view_channel_list_item_frozen_icon_description">canal congelado</string>
+    <string name="sb_view_channel_profile_input_select_channel_cover_description">seleccionar cubierta del canal</string>
+    <string name="sb_view_channel_profile_input_clear_channel_name_description">nombre del canal claro</string>
+    <string name="sb_view_feed_notification_unread_indicator_description">mensaje no leído</string>
+    <string name="sb_view_header_left_button_description">atrás</string>
+    <string name="sb_view_header_right_button_description">menú</string>
+    <string name="sb_view_image_file_description">archivo de imagen</string>
+    <string name="sb_view_member_item_profile_description">perfil de miembro</string>
+    <string name="sb_view_member_item_action_button_description">acción</string>
+    <string name="sb_view_message_input_close_reply_description">cerrar respuesta</string>
+    <string name="sb_view_message_input_add_button_description">añadir</string>
+    <string name="sb_view_message_input_send_button_description">enviar mensaje</string>
+    <string name="sb_view_message_input_voice_recorder_button_description">enviar mensaje de voz</string>
+    <string name="sb_view_message_recycler_view_scroll_to_bottom_description">desplazarse hasta la parte inferior</string>
+    <string name="sb_view_my_file_image_message_description">mi mensaje con imagen</string>
+    <string name="sb_view_my_file_video_message_description">mi mensaje de vídeo</string>
+    <string name="sb_view_my_quoted_file_message_description">mi mensaje de respuesta</string>
+    <string name="sb_view_ogtag_image_description">ogtag</string>
+    <string name="sb_view_open_channel_file_image_message_description">mensaje con imagen</string>
+    <string name="sb_view_open_channel_file_video_message_description">mensaje de vídeo</string>
+    <string name="sb_view_other_file_image_message_description">otro mensaje con imagen</string>
+    <string name="sb_view_other_file_video_message_description">otro mensaje de vídeo</string>
+    <string name="sb_view_other_quoted_file_message_description">otro mensaje de archivo respondido</string>
+    <string name="sb_view_parent_message_info_menu_icon_description">menú de mensajes para padres</string>
+    <string name="sb_view_search_bar_clear_button_description">texto sin cifrar</string>
+    <string name="sb_view_suggested_mention_item_profile_description">perfil de mención sugerido</string>
+    <string name="sb_view_toast_success_description">éxito</string>
+    <string name="sb_view_toast_error_description">error</string>
+    <string name="sb_view_voice_message_play_button_description">jugar</string>
+    <string name="sb_view_voice_message_pause_button_description">pausa</string>
+    <string name="sb_view_voice_message_input_record_button_description">registro</string>
+    <string name="sb_view_voice_message_input_play_button_description">jugar</string>
+    <string name="sb_view_voice_message_input_stop_button_description">detener</string>
+    <string name="sb_view_voice_message_input_pause_button_description">pausa</string>
+    <string name="sb_view_voice_message_input_send_button_description">enviar</string>
+    <string name="sb_edittext_hint_default_description">introducir texto</string>
+    <string name="sb_emoji_default_description">emoji</string>
+    <string name="sb_sender_profile_description">perfil del remitente</string>
+    <string name="sb_channel_cover_description">cubierta del canal</string>
+    <string name="sb_text_feedback_comment_title">Proporcione comentarios adicionales (opcional)</string>
+    <string name="sb_text_feedback_comment_hint">Deja un comentario</string>
+    <string name="sb_text_feedback_edit_comment">Editar comentario</string>
+    <string name="sb_text_toast_success_feedback_update">Cambios guardados.</string>
+    <string name="sb_text_toast_failure_feedback_submit">No se pudo enviar. Inténtalo de nuevo.</string>
+    <string name="sb_text_toast_failure_feedback_update">No se pudo guardar. Inténtalo de nuevo.</string>
 </resources>

From 65cd9057eb7059cc0fba4ac5d1543712fb942665 Mon Sep 17 00:00:00 2001
From: kevinwang <kevin.wang@carrot.co>
Date: Wed, 17 Dec 2025 10:55:44 -0500
Subject: [PATCH 24/25] Updated gradle version

---
 gradle/wrapper/gradle-wrapper.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a09cf491..0a87b180 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 02 15:36:41 KST 2022
+#Wed Dec 17 10:53:20 EST 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

From 8aedf1708e7ab540f6c1389a796594d45fbc03af Mon Sep 17 00:00:00 2001
From: kevinwang <kevin.wang@carrot.co>
Date: Wed, 17 Dec 2025 11:28:56 -0500
Subject: [PATCH 25/25] Reverted version change

---
 uikit/build.gradle | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/uikit/build.gradle b/uikit/build.gradle
index a3949234..368244f2 100644
--- a/uikit/build.gradle
+++ b/uikit/build.gradle
@@ -50,18 +50,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
-    packagingOptions {
-        resources {
-            excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/LICENSE', 'META-INF/LICENSE.txt']
-        }
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {