Android UI Kit v2.4.0-1

README.md

@@ -16,7 +16,7 @@ The UI Kit is developed to keep developers in mind and aims to reduce developmen
 [![Platform](https://img.shields.io/badge/Language-Java-yellowgreen.svg)](#)
 <img src="https://img.shields.io/badge/Repo%20Size-9.26%20MB-blue" />
 ![GitHub contributors](https://img.shields.io/github/contributors/cometchat-pro/android-java-chat-ui-kit)
-![Version](https://shields.io/badge/version-v2.3.5--2-orange)
+![Version](https://shields.io/badge/version-v2.4.0--1-orange)
 ![GitHub stars](https://img.shields.io/github/stars/cometchat-pro/android-java-chat-ui-kit?style=social)
 ![Twitter Follow](https://img.shields.io/twitter/follow/cometchat?style=social)
 
@@ -71,7 +71,12 @@ allprojects {
 
 ```groovy
 dependencies {
-  implementation 'com.cometchat:pro-android-chat-sdk:2.3.5'
+    implementation 'com.cometchat:pro-android-chat-sdk:2.4.0'
+    
+    /** From v2.4+ onwards, Voice & Video Calling functionality has been 
+    moved to a separate library. In case you plan to use the calling 
+    feature, please add the Calling dependency.**/
+    implementation 'com.cometchat:pro-android-calls-sdk:2.1.0'
 }
 ```
 

uikit/build.gradle

@@ -90,6 +90,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     //cometchat
-    compileOnly'com.cometchat:pro-android-chat-sdk:2.3.5'
+    compileOnly 'com.cometchat:pro-android-chat-sdk:2.4.0'
+    compileOnly 'com.cometchat:pro-android-calls-sdk:2.1.0'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0'
 }

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/calls/call_list/CometChatCallList.java

@@ -21,6 +21,7 @@
 import com.cometchat.pro.uikit.R;
 import com.cometchat.pro.uikit.ui_components.shared.cometchatCalls.CometChatCalls;
 import com.cometchat.pro.uikit.ui_resources.utils.CometChatError;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 import com.facebook.shimmer.ShimmerFrameLayout;
 import com.google.android.material.tabs.TabLayout;
 
@@ -103,13 +104,13 @@ public void onClick(View v) {
             viewPager.setAdapter(tabAdapter);
         }
         tabLayout.setupWithViewPager(viewPager);
-        if (FeatureRestriction.getColor()!=null) {
-            phoneAddIv.setImageTintList(ColorStateList.valueOf(Color.parseColor(FeatureRestriction.getColor())));
+        if (UIKitSettings.getColor()!=null) {
+            phoneAddIv.setImageTintList(ColorStateList.valueOf(Color.parseColor(UIKitSettings.getColor())));
             Drawable wrappedDrawable = DrawableCompat.wrap(getResources().
                     getDrawable(R.drawable.tab_layout_background_active));
-            DrawableCompat.setTint(wrappedDrawable, Color.parseColor(FeatureRestriction.getColor()));
+            DrawableCompat.setTint(wrappedDrawable, Color.parseColor(UIKitSettings.getColor()));
             tabLayout.getTabAt(tabLayout.getSelectedTabPosition()).view.setBackground(wrappedDrawable);
-            tabLayout.setSelectedTabIndicatorColor(Color.parseColor(FeatureRestriction.getColor()));
+            tabLayout.setSelectedTabIndicatorColor(Color.parseColor(UIKitSettings.getColor()));
         } else {
             tabLayout.getTabAt(tabLayout.getSelectedTabPosition()).
                     view.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
@@ -118,10 +119,10 @@ public void onClick(View v) {
         tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
-                if (FeatureRestriction.getColor()!=null) {
+                if (UIKitSettings.getColor()!=null) {
                     Drawable wrappedDrawable = DrawableCompat.wrap(getResources().
                             getDrawable(R.drawable.tab_layout_background_active));
-                    DrawableCompat.setTint(wrappedDrawable, Color.parseColor(FeatureRestriction.getColor()));
+                    DrawableCompat.setTint(wrappedDrawable, Color.parseColor(UIKitSettings.getColor()));
                     tab.view.setBackground(wrappedDrawable);
                 }
                 else

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/calls/call_list/CometChatNewCallList.java

@@ -48,6 +48,7 @@
 import com.cometchat.pro.uikit.R;
 import com.cometchat.pro.uikit.ui_components.shared.CometChatSnackBar;
 import com.cometchat.pro.uikit.ui_resources.utils.CometChatError;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 import com.facebook.shimmer.ShimmerFrameLayout;
 
 import java.util.List;
@@ -106,10 +107,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         CometChatError.init(this);
         ImageView imageView = new ImageView(this);
         imageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_back_arrow_selected));
-        if (FeatureRestriction.getColor()!=null) {
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
+        if (UIKitSettings.getColor()!=null) {
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
             imageView.setImageTintList(ColorStateList.valueOf(
-                    Color.parseColor(FeatureRestriction.getColor())));
+                    Color.parseColor(UIKitSettings.getColor())));
         } else
             imageView.setImageTintList(
                     ColorStateList.valueOf(getResources().getColor(R.color.colorPrimary)));

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/calls/call_manager/CometChatStartCallActivity.java

@@ -25,8 +25,8 @@
 import com.cometchat.pro.core.CallSettings;
 import com.cometchat.pro.core.CometChat;
 import com.cometchat.pro.exceptions.CometChatException;
+import com.cometchat.pro.models.AudioMode;
 import com.cometchat.pro.models.User;
-import com.cometchat.pro.rtc.model.AudioMode;
 import com.cometchat.pro.uikit.R;
 import com.cometchat.pro.uikit.ui_components.calls.call_manager.ongoing_call.OngoingCallService;
 import com.cometchat.pro.uikit.ui_components.shared.CometChatSnackBar;
@@ -98,13 +98,13 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.e( "startCallActivity: ",sessionID+" "+type);
         CometChat.startCall(callSettings, new CometChat.OngoingCallListener() {
             @Override
-            public void onAudioModesUpdated(List<AudioMode> list) {
-                Log.e( "onAudioModesUpdated: ",list.toString() );
+            public void onUserListUpdated(List<User> list) {
+                Log.e( "onUserListUpdated: ",list.toString() );
             }
 
             @Override
-            public void onUserListUpdated(List<User> list) {
-                Log.e( "onUserListUpdated: ",list.toString() );
+            public void onAudioModesUpdated(List<AudioMode> list) {
+                Log.e("onAudioModesUpdated: ",list.toString() );
             }
 
             @Override
@@ -123,7 +123,7 @@ public void onUserLeft(User user) {
                             mainView, getString(R.string.user_left)+":"+ user.getName(),
                             CometChatSnackBar.INFO);
                     Log.e("onUserLeft: ", user.getUid());
-                    if (callSettings.isDefaultLayout()) {
+                    if (callSettings.getMode().equals(CallSettings.MODE_SINGLE)) {
                         endCall();
                     }
                 } else {

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/chats/CometChatConversationList.java

@@ -34,6 +34,7 @@
 import com.cometchat.pro.models.Action;
 import com.cometchat.pro.models.Group;
 import com.cometchat.pro.models.MessageReceipt;
+import com.cometchat.pro.models.TypingIndicator;
 import com.cometchat.pro.models.User;
 import com.cometchat.pro.uikit.ui_components.shared.CometChatSnackBar;
 import com.cometchat.pro.uikit.ui_components.shared.cometchatConversations.CometChatConversations;
@@ -451,6 +452,18 @@ public void onMessageDeleted(BaseMessage message) {
                 if (rvConversationList!=null)
                     rvConversationList.refreshConversation(message);
             }
+
+            @Override
+            public void onTypingStarted(TypingIndicator typingIndicator) {
+                if (rvConversationList!=null)
+                    rvConversationList.setTypingIndicator(typingIndicator,false);
+            }
+
+            @Override
+            public void onTypingEnded(TypingIndicator typingIndicator) {
+                if (rvConversationList!=null)
+                    rvConversationList.setTypingIndicator(typingIndicator,true);
+            }
         });
         CometChat.addGroupListener(TAG, new CometChat.GroupListener() {
             @Override

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/cometchat_ui/CometChatUI.java

@@ -41,6 +41,7 @@
 import com.cometchat.pro.uikit.ui_components.shared.CometChatSnackBar;
 import com.cometchat.pro.uikit.ui_resources.utils.CometChatError;
 import com.cometchat.pro.uikit.ui_resources.utils.EncryptionUtils;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -198,9 +199,9 @@ private void initViewComponent() {
 
         activityCometChatUnifiedBinding.bottomNavigation.setOnNavigationItemSelectedListener(this);
 
-        if (FeatureRestriction.getColor()!=null && !FeatureRestriction.getColor().isEmpty()) {
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
-            int widgetColor = Color.parseColor(FeatureRestriction.getColor());
+        if (UIKitSettings.getColor()!=null && !UIKitSettings.getColor().isEmpty()) {
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
+            int widgetColor = Color.parseColor(UIKitSettings.getColor());
             ColorStateList colorStateList = new ColorStateList(new int[][] {
                     { -android.R.attr.state_selected }, {} }, new int[] { Color.GRAY, widgetColor });
 

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/add_members/CometChatAddMembersActivity.java

@@ -13,6 +13,7 @@
 
 import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
 import com.cometchat.pro.uikit.ui_settings.FeatureRestriction;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 
 public class CometChatAddMembersActivity extends AppCompatActivity {
 
@@ -23,8 +24,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_screen);
         handleIntent();
-        if (FeatureRestriction.getColor()!=null)
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
+        if (UIKitSettings.getColor()!=null)
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
     }
 
     private void handleIntent() {

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/admin_moderator_list/CometChatAdminModeratorListActivity.java

@@ -13,6 +13,7 @@
 
 import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
 import com.cometchat.pro.uikit.ui_settings.FeatureRestriction;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 
 public class CometChatAdminModeratorListActivity extends AppCompatActivity {
 
@@ -29,8 +30,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_screen);
         handleIntent();
-        if (FeatureRestriction.getColor()!=null)
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
+        if (UIKitSettings.getColor()!=null)
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
     }
 
     private void handleIntent() {

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/banned_members/CometChatBanMembersActivity.java

@@ -10,6 +10,7 @@
 import android.view.View;
 
 import com.cometchat.pro.uikit.R;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 import com.google.android.material.appbar.MaterialToolbar;
 
 import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
@@ -32,8 +33,8 @@ public void onClick(View v) {
             }
         });
         handleIntent();
-        if (FeatureRestriction.getColor()!=null)
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
+        if (UIKitSettings.getColor()!=null)
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
         CometChatBanMembers banFragment = new CometChatBanMembers();
         Bundle bundle = new Bundle();
         bundle.putString(UIKitConstants.IntentStrings.GUID,guid);

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/create_group/CometChatCreateGroupActivity.java

@@ -12,6 +12,7 @@
 import com.cometchat.pro.uikit.R;
 
 import com.cometchat.pro.uikit.ui_settings.FeatureRestriction;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 
 public class CometChatCreateGroupActivity extends AppCompatActivity {
 
@@ -26,8 +27,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_screen);
         Fragment fragment = new CometChatCreateGroup();
         getSupportFragmentManager().beginTransaction().replace(R.id.frame_fragment,fragment).commit();
-        if (FeatureRestriction.getColor()!=null)
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
+        if (UIKitSettings.getColor()!=null)
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
     }
 
 

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/group_details/CometChatGroupDetailActivity.java

@@ -1022,7 +1022,7 @@ public void afterTextChanged(Editable s) {
                 if(!s.toString().isEmpty())
                 {
                     avatar.setVisibility(View.VISIBLE);
-                    Glide.with(CometChatGroupDetailActivity.this).load(s.toString()).into(avatar);
+                    avatar.setAvatar(s.toString());
                 } else
                     avatar.setVisibility(View.GONE);
             }

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/group_list/CometChatGroupList.java

@@ -152,7 +152,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         CometChatError.init(getContext());
         ivCreateGroup = view.findViewById(R.id.create_group);
-        ivCreateGroup.setImageTintList(ColorStateList.valueOf(Color.parseColor(FeatureRestriction.getColor())));
+        ivCreateGroup.setImageTintList(ColorStateList.valueOf(Color.parseColor(UIKitSettings.getColor())));
 
         isTitleVisible();
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/group_members/CometChatGroupMemberListActivity.java

@@ -13,6 +13,7 @@
 
 import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
 import com.cometchat.pro.uikit.ui_settings.FeatureRestriction;
+import com.cometchat.pro.uikit.ui_settings.UIKitSettings;
 
 public class CometChatGroupMemberListActivity extends AppCompatActivity {
 
@@ -42,8 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
         bundle.putBoolean(UIKitConstants.IntentStrings.TRANSFER_OWNERSHIP,transferOwnerShip);
         fragment.setArguments(bundle);
         getSupportFragmentManager().beginTransaction().replace(R.id.frame_fragment,fragment).commit();
-        if (FeatureRestriction.getColor()!=null)
-            getWindow().setStatusBarColor(Color.parseColor(FeatureRestriction.getColor()));
+        if (UIKitSettings.getColor()!=null)
+            getWindow().setStatusBarColor(Color.parseColor(UIKitSettings.getColor()));
     }
 
 

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/messages/forward_message/CometChatForwardMessageActivity.java

@@ -231,10 +231,10 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
 
             @Override
             public void afterTextChanged(Editable editable) {
-                 if (editable.toString().length()!=0) {
-                     if (conversationListAdapter != null)
-                         conversationListAdapter.getFilter().filter(editable.toString());
-                 }
+                if (editable.toString().length()!=0) {
+                    if (conversationListAdapter != null)
+                        conversationListAdapter.getFilter().filter(editable.toString());
+                }
             }
         });
 
@@ -294,7 +294,7 @@ public void onClick(View vw) {
                     checkUserList();
                 }
                 else {
-                   CometChatSnackBar.show(CometChatForwardMessageActivity.this,
+                    CometChatSnackBar.show(CometChatForwardMessageActivity.this,
                             selectedUsers,
                             getString(R.string.forward_to_5_at_a_time), CometChatSnackBar.WARNING);
                 }
@@ -333,7 +333,11 @@ public void onClick(View view) {
                             }
 
                         }).start();
-                    } else if (messageType != null && messageType.equals(CometChatConstants.MESSAGE_TYPE_IMAGE)) {
+                    } else if (messageType != null &&
+                            (messageType.equals(CometChatConstants.MESSAGE_TYPE_IMAGE) ||
+                                    messageType.equals(CometChatConstants.MESSAGE_TYPE_AUDIO) ||
+                                    messageType.equals(CometChatConstants.MESSAGE_TYPE_FILE) ||
+                                    messageType.equals(CometChatConstants.MESSAGE_TYPE_VIDEO))) {
                         new Thread(() -> {
                             for (int i = 0; i <= userList.size() - 1; i++) {
                                 Conversation conversation = new ArrayList<>(userList.values()).get(i);
@@ -547,9 +551,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
-         if (item.getItemId()==android.R.id.home){
-             onBackPressed();
-         }
+        if (item.getItemId()==android.R.id.home){
+            onBackPressed();
+        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -582,7 +586,7 @@ public void onSuccess(List<Conversation> conversationsList) {
 
             @Override
             public void onError(CometChatException e) {
-               CometChatSnackBar.show(CometChatForwardMessageActivity.this,
+                CometChatSnackBar.show(CometChatForwardMessageActivity.this,
                         rvConversationList, CometChatError.localized(e), CometChatSnackBar.ERROR);
             }
         });