Android UI Kit v3.0.0-beta1-2

Author: darshanbhanushali

README.md

@@ -13,7 +13,7 @@
 ![GitHub repo size](https://img.shields.io/github/repo-size/cometchat-pro/android-java-chat-app)
 ![GitHub contributors](https://img.shields.io/github/contributors/cometchat-pro/android-java-chat-app)
 ![GitHub stars](https://img.shields.io/github/stars/cometchat-pro/android-java-chat-app?style=social)
-![Version](https://shields.io/badge/version-v2.1.1--1-orange)
+![Version](https://shields.io/badge/version-v3.0.0--beta1--2-orange)
 ![Twitter Follow](https://img.shields.io/twitter/follow/cometchat?style=social)
 
 <img src="https://files.readme.io/952af91-UI_Kit__1.png"/>
@@ -56,7 +56,7 @@ Build and run the Sample App.
 
 # Learn more about UI-Kit
 
-Learn more about how to integrate [UI Kit](https://github.com/cometchat-pro/android-java-chat-ui-kit/blob/master/README.md) inside your app.
+Learn more about how to integrate [UI Kit](https://github.com/cometchat-pro/android-java-chat-ui-kit/blob/v3/README.md) inside your app.
 <br/>
 <hr/>
 

app/release/output.json

@@ -91,6 +91,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     .build();
         Log.e( "startCallActivity: ",sessionID+" "+type);
         CometChat.startCall(callSettings, new CometChat.OngoingCallListener() {
+
             @Override
             public void onUserListUpdated(List<User> list) {
                 Log.e( "onUserListUpdated: ",list.toString() );

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

@@ -10,6 +10,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -76,6 +77,8 @@ public class CometChatGroupList extends Fragment  {
 
     private LinearLayout noGroupLayout;
 
+    private SwipeRefreshLayout swipeRefreshLayout;
+
     private List<Group> groupList = new ArrayList<>();
 
     private static final String TAG = "CometChatGroupList";
@@ -95,6 +98,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         noGroupLayout = view.findViewById(R.id.no_group_layout);
         etSearch = view.findViewById(R.id.search_bar);
         clearSearch = view.findViewById(R.id.clear_search);
+        swipeRefreshLayout = view.findViewById(R.id.swipeToRefresh);
 
         ivCreateGroup = view.findViewById(R.id.create_group);
         ivCreateGroup.setImageTintList(ColorStateList.valueOf(Color.parseColor(UISettings.getColor())));
@@ -183,6 +187,14 @@ public void OnItemClick(Group group, int position) {
                     event.OnItemClick(group,position);
             }
         });
+        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                groupsRequest=null;
+                rvGroupList.clear();
+                fetchGroup();
+            }
+        });
         return view;
     }
 
@@ -215,6 +227,8 @@ public void onSuccess(List<Group> groups) {
                     noGroupLayout.setVisibility(View.GONE);
                     rvGroupList.setVisibility(View.VISIBLE);
                 }
+                if (swipeRefreshLayout.isRefreshing())
+                    swipeRefreshLayout.setRefreshing(false);
             }
             @Override
             public void onError(CometChatException e) {

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

@@ -2173,8 +2173,8 @@ public void onResume() {
         checkOnGoingCall();
         if (!(resultIntentCode== UIKitConstants.RequestCode.GALLERY ||
                 resultIntentCode== UIKitConstants.RequestCode.CAMERA ||
-                resultIntentCode == UIKitConstants.RequestCode.FILE) ||
-                resultIntentCode == UIKitConstants.RequestCode.AUDIO) {
+                resultIntentCode == UIKitConstants.RequestCode.FILE ||
+                resultIntentCode == UIKitConstants.RequestCode.AUDIO)) {
             rvChatListView.removeItemDecoration(stickyHeaderDecoration);
             messagesRequest = null;
             messageAdapter = null;

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/messages/message_list/CometChatMessageList.java

@@ -1190,6 +1190,7 @@ public void onSuccess(List<BaseMessage> baseMessages) {
                 initMessageAdapter(baseMessages);
                 if (baseMessages.size() != 0) {
                     stopHideShimmer();
+                    noReplyMessages.setVisibility(GONE);
                     BaseMessage baseMessage = baseMessages.get(baseMessages.size() - 1);
                     markMessageAsRead(baseMessage);
                 }
@@ -1696,10 +1697,11 @@ private void scrollToBottom() {
      * @param baseMessage is object of BaseMessage.class. It is message which is been marked as read.
      */
     private void markMessageAsRead(BaseMessage baseMessage) {
-        if (type.equals(CometChatConstants.RECEIVER_TYPE_USER))
-            CometChat.markAsRead(baseMessage.getId(), baseMessage.getSender().getUid(), baseMessage.getReceiverType());
-        else
-            CometChat.markAsRead(baseMessage.getId(), baseMessage.getReceiverUid(), baseMessage.getReceiverType());
+        CometChat.markAsRead(baseMessage); // used for v3
+//        if (type.equals(CometChatConstants.RECEIVER_TYPE_USER))
+//            CometChat.markAsRead(baseMessage.getId(), baseMessage.getSender().getUid(), baseMessage.getReceiverType());
+//        else
+//            CometChat.markAsRead(baseMessage.getId(), baseMessage.getReceiverUid(), baseMessage.getReceiverType());
     }
 
 

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/messages/thread_message_list/CometChatThreadMessageList.java

@@ -359,7 +359,7 @@ protected FilterResults performFiltering(CharSequence charSequence) {
                                 conversation.getLastMessage().getCategory().equals(CometChatConstants.CATEGORY_MESSAGE) &&
                                 conversation.getLastMessage().getType().equals(CometChatConstants.MESSAGE_TYPE_TEXT)
                                 && ((TextMessage)conversation.getLastMessage()).getText()!=null
-                                && ((TextMessage)conversation.getLastMessage()).getText().contains(searchKeyword)) {
+                                && ((TextMessage)conversation.getLastMessage()).getText().toLowerCase().contains(searchKeyword.toLowerCase())) {
                             tempFilter.add(conversation);
                         }
                     }

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/shared/cometchatConversations/CometChatConversationsAdapter.java

@@ -97,6 +97,8 @@ public void onBindViewHolder(@NonNull UserViewHolder userViewHolder, int i) {
         }
         if (user.getStatus().equals(CometChatConstants.USER_STATUS_ONLINE))
             userViewHolder.userListRowBinding.statusIndicator.setVisibility(View.VISIBLE);
+        else
+            userViewHolder.userListRowBinding.statusIndicator.setVisibility(View.GONE);
 
         userViewHolder.userListRowBinding.statusIndicator.setUserStatus(user.getStatus());
         userViewHolder.userListRowBinding.txtUserName.setText(user.getName());

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/shared/cometchatUsers/CometChatUsersAdapter.java

@@ -38,6 +38,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.cometchat.pro.core.CometChat;
 import com.cometchat.pro.core.UsersRequest;
@@ -85,8 +86,6 @@ public class CometChatUserList extends Fragment {
 
     private boolean isSearching;
 
-    private CometChatUsersAdapter userListAdapter;
-
     private UsersRequest usersRequest;    // Use to fetch users
 
     private CometChatUsers rvUserList;  // Use to display list of users
@@ -103,6 +102,8 @@ public class CometChatUserList extends Fragment {
 
     private LinearLayout noUserLayout;
 
+    private SwipeRefreshLayout swipeRefreshLayout;
+
     private List<User> userList = new ArrayList<>();
 
     public CometChatUserList() {
@@ -116,6 +117,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.fragment_cometchat_userlist, container, false);
         title = view.findViewById(R.id.tv_title);
         title.setTypeface(FontUtils.getInstance(getActivity()).getTypeFace(FontUtils.robotoMedium));
+        swipeRefreshLayout = view.findViewById(R.id.swipeToRefresh);
         rvUserList = view.findViewById(R.id.rv_user_list);
         noUserLayout = view.findViewById(R.id.no_user_layout);
         etSearch = view.findViewById(R.id.search_bar);
@@ -198,6 +200,16 @@ public void OnItemClick(User user, int position) {
                     events.OnItemClick(user,position);
             }
         });
+
+        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                usersRequest=null;
+                rvUserList.clear();
+                fetchUsers();
+            }
+        });
+
         return view;
     }
 
@@ -248,6 +260,8 @@ public void onSuccess(List<User> users) {
                     rvUserList.setVisibility(View.VISIBLE);
                     noUserLayout.setVisibility(View.GONE);
                 }
+                if (swipeRefreshLayout.isRefreshing())
+                    swipeRefreshLayout.setRefreshing(false);
             }
 
             @Override

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/users/user_list/CometChatUserList.java

@@ -317,6 +317,9 @@ public static String localized(CometChatException e) {
         } else if (e.getCode().equalsIgnoreCase(ERROR_FEATURE_NOT_FOUND_MESSAGE)) {
             return new CometChatException(ERROR_FEATURE_NOT_FOUND_MESSAGE,
                     errorContext.getString(R.string.err_feature_not_found)).getMessage();
+        } else if (e.getCode().equalsIgnoreCase(ERROR_EXTENSION_NOT_FOUND_MESSAGE)) {
+            return new CometChatException(ERROR_EXTENSION_NOT_FOUND_MESSAGE,
+                    errorContext.getString(R.string.extension_not_found)).getMessage();
         }
 //        else if (e.getCode().equalsIgnoreCase())
         else {
@@ -327,8 +330,7 @@ public static class Extension {
         public static String localized(CometChatException e,String extensionId) {
             if (e.getCode().equalsIgnoreCase(ERR_EXTENSION_NOT_FOUND)) {
                 return new CometChatException(ERR_EXTENSION_NOT_FOUND,
-                        String.format(errorContext.getString(R.string.extension_not_found),
-                                extensionId)).getMessage();
+                        extensionId+":"+errorContext.getString(R.string.extension_not_found)).getMessage();
             } else if (e.getCode().equalsIgnoreCase(ERR_EXTENSION_NOT_ENABLED)) {
                 return new CometChatException(ERR_EXTENSION_NOT_ENABLED,
                         errorContext.getString(R.string.extension_is_not_enabled)).getMessage();