diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df4944f..e9fb80ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Changelog +### v3.9.3 (Oct 26, 2023) with Chat SDK `v4.13.0` +* Improve stability. + ### v3.9.2 (Oct 12, 2023) with Chat SDK `v4.12.3` * Added `setVoiceRecorderConfig(VoiceRecorderConfig)` and `getVoiceRecorderConfig()` in `SendbirdUIKit`. * Added `setOnEmojiReactionUserListProfileClickListener(OnItemClickListener)` in `ChannelFragment.Builder` and `MessageThreadFragment.Builder`. diff --git a/gradle.properties b/gradle.properties index 08787af9..2630eb6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ org.gradle.jvmargs=-Xmx1536m # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -UIKIT_VERSION = 3.9.2 +UIKIT_VERSION = 3.9.3 UIKIT_VERSION_CODE = 1 diff --git a/uikit/build.gradle b/uikit/build.gradle index cacf5237..03168b5c 100644 --- a/uikit/build.gradle +++ b/uikit/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Sendbird - api 'com.sendbird.sdk:sendbird-chat:4.12.3' + api 'com.sendbird.sdk:sendbird-chat:4.13.0' implementation 'com.github.bumptech.glide:glide:4.13.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0' diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/BannedUserListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/BannedUserListFragment.java index 9e8a4b2e..13467770 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/BannedUserListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/BannedUserListFragment.java @@ -273,7 +273,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -294,7 +294,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } 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 99c1e5a3..cfda2024 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/BaseMessageListFragment.java @@ -436,21 +436,16 @@ void showConfirmDialog(@NonNull String message) { } void showEmojiActionsDialog(@NonNull BaseMessage message, @NonNull DialogListItem[] actions) { - if (getContext() == null) { - return; - } - + boolean showMoreButton = false; List emojiList = EmojiManager.getAllEmojis(); - int shownEmojiSize = emojiList.size(); - boolean showMoreButton = false; if (emojiList.size() > 6) { showMoreButton = true; shownEmojiSize = 5; } emojiList = emojiList.subList(0, shownEmojiSize); - final Context contextThemeWrapper = ContextUtils.extractModuleThemeContext(getContext(), getModule().getParams().getTheme(), R.attr.sb_component_list); + final Context contextThemeWrapper = ContextUtils.extractModuleThemeContext(requireContext(), getModule().getParams().getTheme(), R.attr.sb_component_list); final EmojiListView emojiListView = EmojiListView.create(contextThemeWrapper, emojiList, message.getReactions(), showMoreButton); hideKeyboard(); if (actions.length > 0 || emojiList.size() > 0) { @@ -502,7 +497,7 @@ private static Map> getReactionUserInfo(@NonNull GroupChann return result; } - private void hideKeyboard() { + void hideKeyboard() { if (getView() != null) { SoftInputUtils.hideSoftKeyboard(getView()); } 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 b28e8c29..09251707 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelFragment.java @@ -17,6 +17,7 @@ import androidx.annotation.StyleRes; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.sendbird.android.channel.GroupChannel; import com.sendbird.android.channel.Role; import com.sendbird.android.message.BaseMessage; @@ -708,15 +709,16 @@ void showMessageContextMenu(@NonNull View anchorView, @NonNull BaseMessage messa final DialogListItem[] actions = items.toArray(new DialogListItem[size]); if (getViewModel().getChannel() != null && !(ChannelConfig.canSendReactions(channelConfig, getViewModel().getChannel()))) { final RecyclerView messageListView = getModule().getMessageListComponent().getRecyclerView(); - if (getContext() == null || messageListView == null || size <= 0) return; + if (getContext() == null || messageListView == null || size == 0) return; MessageAnchorDialog messageAnchorDialog = new MessageAnchorDialog.Builder(anchorView, messageListView, actions) .setOnItemClickListener(createMessageActionListener(message)) .setOnDismissListener(() -> anchorDialogShowing.set(false)) .build(); messageAnchorDialog.show(); anchorDialogShowing.set(true); - } else if (MessageUtils.isUnknownType(message)) { - if (getContext() == null || size <= 0) return; + } else if (MessageUtils.isUnknownType(message) || !MessageUtils.isSucceed(message)) { + if (getContext() == null || size == 0) return; + hideKeyboard(); DialogUtils.showListBottomDialog(requireContext(), actions, createMessageActionListener(message)); } else { showEmojiActionsDialog(message, actions); @@ -869,7 +871,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -890,7 +892,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { this.bundle = new Bundle(); - this.bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + this.bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } this.bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelListFragment.java index 86c1a654..4055ce59 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelListFragment.java @@ -285,7 +285,7 @@ public static class Builder { * Constructor */ public Builder() { - this(SendbirdUIKit.getDefaultThemeMode()); + this(0); } /** @@ -304,7 +304,9 @@ public Builder(@NonNull SendbirdUIKit.ThemeMode themeMode) { */ public Builder(@StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } } /** diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelPushSettingFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelPushSettingFragment.java index 5c864382..be420eae 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelPushSettingFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelPushSettingFragment.java @@ -186,7 +186,7 @@ public static class Builder { * since 3.0.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -209,7 +209,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelSettingsFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelSettingsFragment.java index ef00dea6..0113dc2f 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelSettingsFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChannelSettingsFragment.java @@ -409,7 +409,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -430,7 +430,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ChatNotificationChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ChatNotificationChannelFragment.java index 120492fe..dd4d07b7 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ChatNotificationChannelFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ChatNotificationChannelFragment.java @@ -278,7 +278,7 @@ public static class Builder { * since 3.5.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -301,7 +301,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/CreateChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/CreateChannelFragment.java index 3101fa21..b8c2f493 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/CreateChannelFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/CreateChannelFragment.java @@ -265,7 +265,7 @@ public static class Builder { * Constructor */ public Builder() { - this(SendbirdUIKit.getDefaultThemeMode()); + this(0); } /** @@ -305,7 +305,9 @@ public Builder(@StyleRes int customThemeResId) { */ public Builder(@StyleRes int customThemeResId, @NonNull CreatableChannelType type) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putSerializable(StringSet.KEY_SELECTED_CHANNEL_TYPE, type); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/CreateOpenChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/CreateOpenChannelFragment.java index c6eaa2e6..e8fdc2d1 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/CreateOpenChannelFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/CreateOpenChannelFragment.java @@ -323,7 +323,7 @@ public static class Builder { * since 3.2.0 */ public Builder() { - this(SendbirdUIKit.getDefaultThemeMode()); + this(0); } /** @@ -344,7 +344,9 @@ public Builder(@NonNull SendbirdUIKit.ThemeMode themeMode) { */ public Builder(@StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } } /** diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/FeedNotificationChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/FeedNotificationChannelFragment.java index 9529ea35..569de5b5 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/FeedNotificationChannelFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/FeedNotificationChannelFragment.java @@ -305,7 +305,7 @@ public static class Builder { * since 3.5.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -328,7 +328,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/InviteUserFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/InviteUserFragment.java index 96ad471e..fc389ff4 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/InviteUserFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/InviteUserFragment.java @@ -262,7 +262,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -285,7 +285,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/MemberListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/MemberListFragment.java index 8c8c72ac..1e81b311 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/MemberListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/MemberListFragment.java @@ -301,7 +301,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -322,7 +322,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/MessageSearchFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/MessageSearchFragment.java index 3f6621b4..34f359e1 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/MessageSearchFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/MessageSearchFragment.java @@ -271,7 +271,7 @@ public static class Builder { * since 2.1.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -294,7 +294,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java index 51ccb13c..dde06c10 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java @@ -514,10 +514,12 @@ protected boolean onMessageContextMenuItemClicked(@NonNull BaseMessage message, void showMessageContextMenu(@NonNull View anchorView, @NonNull BaseMessage message, @NonNull List items) { int size = items.size(); final DialogListItem[] actions = items.toArray(new DialogListItem[size]); - if (!(getViewModel().getChannel() != null && - ChannelConfig.canSendReactions(channelConfig, getViewModel().getChannel())) || - MessageUtils.isUnknownType(message)) { - if (getContext() == null || size <= 0) return; + if (!(getViewModel().getChannel() != null && ChannelConfig.canSendReactions(channelConfig, getViewModel().getChannel())) || + MessageUtils.isUnknownType(message) || + !MessageUtils.isSucceed(message) + ) { + if (getContext() == null || size == 0) return; + hideKeyboard(); DialogUtils.showListBottomDialog(requireContext(), actions, createMessageActionListener(message)); } else { showEmojiActionsDialog(message, actions); @@ -625,7 +627,7 @@ public static class Builder { * since 3.3.0 */ public Builder(@NonNull String channelUrl, @NonNull BaseMessage parentMessage) { - this(channelUrl, parentMessage, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, parentMessage, 0); } /** @@ -650,7 +652,9 @@ public Builder(@NonNull String channelUrl, @NonNull BaseMessage parentMessage, @ */ public Builder(@NonNull String channelUrl, @NonNull BaseMessage parentMessage, @StyleRes int customThemeResId) { this.bundle = new Bundle(); - this.bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + this.bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } this.bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); this.bundle.putByteArray(StringSet.KEY_PARENT_MESSAGE, parentMessage.serialize()); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ModerationFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ModerationFragment.java index d660c7aa..95ba7a67 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ModerationFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ModerationFragment.java @@ -225,7 +225,7 @@ public static class Builder { * since 1.2.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -248,7 +248,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/MutedMemberListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/MutedMemberListFragment.java index f50f303c..709f7f70 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/MutedMemberListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/MutedMemberListFragment.java @@ -274,7 +274,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -295,7 +295,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelBannedUserListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelBannedUserListFragment.java index 1690bda0..7103aabd 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelBannedUserListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelBannedUserListFragment.java @@ -289,7 +289,7 @@ public static class Builder { * since 3.1.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -312,7 +312,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } 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 09540508..5e6674b7 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java @@ -1076,7 +1076,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -1097,7 +1097,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelListFragment.java index e8908be4..252cc0fa 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelListFragment.java @@ -229,7 +229,7 @@ public static class Builder { * Constructor */ public Builder() { - this(SendbirdUIKit.getDefaultThemeMode()); + this(0); } /** @@ -248,7 +248,9 @@ public Builder(@NonNull SendbirdUIKit.ThemeMode themeMode) { */ public Builder(@StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } } /** diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelModerationFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelModerationFragment.java index a4bf4471..f61c298c 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelModerationFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelModerationFragment.java @@ -192,7 +192,7 @@ public static class Builder { * since 3.1.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -215,7 +215,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelMutedParticipantListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelMutedParticipantListFragment.java index 6984a52b..763371a8 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelMutedParticipantListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelMutedParticipantListFragment.java @@ -289,7 +289,7 @@ public static class Builder { * since 3.1.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -312,7 +312,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelOperatorListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelOperatorListFragment.java index 44ea8a14..90b1dc68 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelOperatorListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelOperatorListFragment.java @@ -288,7 +288,7 @@ public static class Builder { * since 3.1.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -311,7 +311,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelRegisterOperatorFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelRegisterOperatorFragment.java index 4e20a4ae..5f33da92 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelRegisterOperatorFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelRegisterOperatorFragment.java @@ -214,7 +214,7 @@ public static class Builder { * since 3.1.0 */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -237,7 +237,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelSettingsFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelSettingsFragment.java index 753271a7..51c63758 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelSettingsFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelSettingsFragment.java @@ -402,7 +402,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -423,7 +423,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OperatorListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OperatorListFragment.java index 9e8e703d..81db3821 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/OperatorListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OperatorListFragment.java @@ -277,7 +277,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -298,7 +298,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/ParticipantListFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/ParticipantListFragment.java index bfe78b7a..6753ec09 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/ParticipantListFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/ParticipantListFragment.java @@ -277,7 +277,7 @@ public static class Builder { * @param channelUrl the url of the channel will be implemented. */ public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -298,7 +298,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/RegisterOperatorFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/RegisterOperatorFragment.java index f867af26..9fb80dec 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/RegisterOperatorFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/RegisterOperatorFragment.java @@ -201,7 +201,7 @@ public static class Builder { private RegisterOperatorFragment customFragment; public Builder(@NonNull String channelUrl) { - this(channelUrl, SendbirdUIKit.getDefaultThemeMode()); + this(channelUrl, 0); } /** @@ -224,7 +224,9 @@ public Builder(@NonNull String channelUrl, @NonNull SendbirdUIKit.ThemeMode them */ public Builder(@NonNull String channelUrl, @StyleRes int customThemeResId) { bundle = new Bundle(); - bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + if (customThemeResId != 0) { + bundle.putInt(StringSet.KEY_THEME_RES_ID, customThemeResId); + } bundle.putString(StringSet.KEY_CHANNEL_URL, channelUrl); } diff --git a/uikit/src/main/java/com/sendbird/uikit/model/EmojiManager.kt b/uikit/src/main/java/com/sendbird/uikit/model/EmojiManager.kt index 9d8a84b9..4cf903ed 100644 --- a/uikit/src/main/java/com/sendbird/uikit/model/EmojiManager.kt +++ b/uikit/src/main/java/com/sendbird/uikit/model/EmojiManager.kt @@ -94,10 +94,10 @@ object EmojiManager { get() = allEmojiMap.values.toList() /** - * Returns the [<] corresponding to emoji category id + * Returns the [List] corresponding to emoji category id * * @param emojiCategoryId Emoji category id - * @return The [<] corresponding to emoji category id + * @return The [List] corresponding to emoji category id * @since 1.1.0 */ @JvmStatic 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 ce07e5f9..9177572c 100644 --- a/uikit/src/main/java/com/sendbird/uikit/utils/MessageUtils.java +++ b/uikit/src/main/java/com/sendbird/uikit/utils/MessageUtils.java @@ -58,6 +58,11 @@ public static boolean isFailed(@NonNull BaseMessage message) { return status == SendingStatus.FAILED || status == SendingStatus.CANCELED; } + public static boolean isSucceed(@NonNull BaseMessage message) { + final SendingStatus status = message.getSendingStatus(); + return status == SendingStatus.SUCCEEDED; + } + public static boolean isGroupChanged(@Nullable BaseMessage frontMessage, @Nullable BaseMessage backMessage, @NonNull MessageListUIParams messageListUIParams) { return frontMessage == null || frontMessage.getSender() == null ||