Skip to content

Commit 8f8ddea

Browse files
darshanbhanushalidarshanbhanushali
committed
Android UI Kit v2.1.10
1 parent d5c3f60 commit 8f8ddea

276 files changed

Lines changed: 3147 additions & 3928 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ dependencies {
5858

5959
implementation 'com.google.android.material:material:1.2.0-alpha05'
6060
implementation 'com.facebook.shimmer:shimmer:0.4.0'
61+
6162
//
6263
implementation 'com.cometchat:pro-android-chat-sdk:2.1.7-beta3'
6364
}

‎app/src/main/java/com/cometchat/pro/androiduikit/ComponentFragments/AvatarFragment.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import android.os.Bundle;
77
import android.text.Editable;
88
import android.text.TextWatcher;
9-
import android.util.Log;
109
import android.view.LayoutInflater;
1110
import android.view.View;
1211
import android.view.ViewGroup;
@@ -15,16 +14,13 @@
1514
import androidx.annotation.NonNull;
1615
import androidx.fragment.app.Fragment;
1716

18-
import com.cometchat.pro.androiduikit.ColorPickerDialog;
1917
import com.cometchat.pro.androiduikit.R;
2018
import com.cometchat.pro.core.CometChat;
21-
import com.cometchat.pro.uikit.Avatar;
19+
import com.cometchat.pro.uikit.ui_components.shared.cometchatAvatar.CometChatAvatar;
2220
import com.google.android.material.textfield.TextInputEditText;
2321
import com.google.android.material.textfield.TextInputLayout;
2422

25-
import java.util.Random;
26-
27-
import utils.Utils;
23+
import com.cometchat.pro.uikit.ui_resources.utils.Utils;
2824

2925
public class AvatarFragment extends Fragment {
3026

@@ -46,7 +42,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4642
Bundle savedInstanceState) {
4743
// Inflate the layout for this fragment
4844
View view = inflater.inflate(R.layout.fragment_avatar, container, false);
49-
Avatar avatar = view.findViewById(R.id.avataricon);
45+
CometChatAvatar avatar = view.findViewById(R.id.avataricon);
5046
avatar.setBorderColor(getResources().getColor(R.color.colorPrimaryDark));
5147
avatar.setAvatar(CometChat.getLoggedInUser().getAvatar());
5248
TextInputEditText borderWidth = view.findViewById(R.id.borderWidth);
@@ -148,7 +144,7 @@ public void onAttach(@NonNull Context context) {
148144
super.onAttach(context);
149145
this.context = context;
150146
}
151-
public void refreshAvatar(Avatar avatar)
147+
public void refreshAvatar(CometChatAvatar avatar)
152148
{
153149
avatar.setAvatar(CometChat.getLoggedInUser());
154150
}

‎app/src/main/java/com/cometchat/pro/androiduikit/ComponentFragments/BadgeCountFragment.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;
10-
import android.widget.RadioGroup;
11-
import android.widget.Toast;
1210

1311
import androidx.fragment.app.Fragment;
1412

1513
import com.cometchat.pro.androiduikit.R;
16-
import com.cometchat.pro.uikit.BadgeCount;
17-
import com.cometchat.pro.uikit.StatusIndicator;
14+
import com.cometchat.pro.uikit.ui_components.shared.cometchatBadgeCount.CometChatBadgeCount;
1815
import com.google.android.material.textfield.TextInputEditText;
1916
import com.google.android.material.textfield.TextInputLayout;
2017

21-
import utils.Utils;
18+
import com.cometchat.pro.uikit.ui_resources.utils.Utils;
2219

2320
public class BadgeCountFragment extends Fragment {
2421

@@ -35,7 +32,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
3532
Bundle savedInstanceState) {
3633
// Inflate the layout for this fragment
3734
View view = inflater.inflate(R.layout.fragment_badge_count, container, false);
38-
BadgeCount badgeCount = view.findViewById(R.id.badgeCount);
35+
CometChatBadgeCount badgeCount = view.findViewById(R.id.badgeCount);
3936
badgeCountLayout = view.findViewById(R.id.badgeCount_layout);
4037
badgeCountSizeLayout = view.findViewById(R.id.badgeCountSize_layout);
4138
badgeCountEdt = view.findViewById(R.id.badgeCount_edt);
@@ -192,7 +189,7 @@ private void checkDarkMode() {
192189
}
193190
}
194191

195-
private void refreshbadgeCount(BadgeCount badgeCount) {
192+
private void refreshbadgeCount(CometChatBadgeCount badgeCount) {
196193
badgeCount.setCount(count);
197194
}
198195
}

‎app/src/main/java/com/cometchat/pro/androiduikit/ComponentFragments/CallListViewFragment.java‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,29 @@
1515
import androidx.recyclerview.widget.RecyclerView;
1616

1717
import com.cometchat.pro.androiduikit.R;
18-
import com.cometchat.pro.constants.CometChatConstants;
1918
import com.cometchat.pro.core.Call;
2019
import com.cometchat.pro.core.CometChat;
2120
import com.cometchat.pro.core.MessagesRequest;
2221
import com.cometchat.pro.exceptions.CometChatException;
2322
import com.cometchat.pro.models.BaseMessage;
2423
import com.cometchat.pro.models.Group;
2524
import com.cometchat.pro.models.User;
26-
import com.cometchat.pro.uikit.CometChatCallList;
25+
import com.cometchat.pro.uikit.ui_components.shared.cometchatCalls.CometChatCalls;
2726
import com.facebook.shimmer.ShimmerFrameLayout;
2827
import com.google.android.material.snackbar.Snackbar;
2928

3029
import java.util.Collections;
3130
import java.util.List;
3231

33-
import constant.StringContract;
34-
import listeners.OnItemClickListener;
35-
import screen.CometChatGroupDetailScreenActivity;
36-
import screen.CometChatUserDetailScreenActivity;
37-
import screen.messagelist.CometChatMessageListActivity;
38-
import utils.CallUtils;
39-
import utils.Utils;
32+
import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
33+
import com.cometchat.pro.uikit.ui_resources.utils.item_clickListener.OnItemClickListener;
34+
import com.cometchat.pro.uikit.ui_components.groups.group_details.CometChatGroupDetailActivity;
35+
import com.cometchat.pro.uikit.ui_components.users.user_details.CometChatUserDetailScreenActivity;
36+
import com.cometchat.pro.uikit.ui_resources.utils.CallUtils;
4037

4138
public class CallListViewFragment extends Fragment {
4239

43-
private CometChatCallList rvCallList;
40+
private CometChatCalls rvCallList;
4441

4542
private LinearLayout noCallView;
4643

@@ -61,7 +58,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
6158
rvCallList.setItemClickListener(new OnItemClickListener<Call>() {
6259
@Override
6360
public void OnItemClick(Call var, int position) {
64-
if (var.getReceiverType().equals(CometChatConstants.RECEIVER_TYPE_USER)) {
61+
if (var.getReceiverType().equals(com.cometchat.pro.constants.CometChatConstants.RECEIVER_TYPE_USER)) {
6562
User user;
6663
if (var.getSender().getUid().equals(CometChat.getLoggedInUser().getUid())) {
6764
user = ((User)var.getCallReceiver());
@@ -71,27 +68,27 @@ public void OnItemClick(Call var, int position) {
7168
user = var.getSender();
7269
}
7370
Intent intent = new Intent(getContext(), CometChatUserDetailScreenActivity.class);
74-
intent.putExtra(StringContract.IntentStrings.UID, user.getUid());
75-
intent.putExtra(StringContract.IntentStrings.NAME, user.getName());
76-
intent.putExtra(StringContract.IntentStrings.AVATAR, user.getAvatar());
77-
intent.putExtra(StringContract.IntentStrings.STATUS, user.getStatus());
78-
intent.putExtra(StringContract.IntentStrings.IS_BLOCKED_BY_ME, user.isBlockedByMe());
79-
intent.putExtra(StringContract.IntentStrings.FROM_CALL_LIST,true);
71+
intent.putExtra(UIKitConstants.IntentStrings.UID, user.getUid());
72+
intent.putExtra(UIKitConstants.IntentStrings.NAME, user.getName());
73+
intent.putExtra(UIKitConstants.IntentStrings.AVATAR, user.getAvatar());
74+
intent.putExtra(UIKitConstants.IntentStrings.STATUS, user.getStatus());
75+
intent.putExtra(UIKitConstants.IntentStrings.IS_BLOCKED_BY_ME, user.isBlockedByMe());
76+
intent.putExtra(UIKitConstants.IntentStrings.FROM_CALL_LIST,true);
8077
startActivity(intent);
8178
}
8279
else {
8380
Group group;
8481
group = ((Group)var.getCallReceiver());
85-
Intent intent = new Intent(getContext(), CometChatGroupDetailScreenActivity.class);
86-
intent.putExtra(StringContract.IntentStrings.GUID, group.getGuid());
87-
intent.putExtra(StringContract.IntentStrings.NAME, group.getName());
88-
intent.putExtra(StringContract.IntentStrings.AVATAR, group.getIcon());
89-
intent.putExtra(StringContract.IntentStrings.MEMBER_SCOPE, group.getScope());
90-
intent.putExtra(StringContract.IntentStrings.MEMBER_COUNT,group.getMembersCount());
91-
intent.putExtra(StringContract.IntentStrings.GROUP_OWNER, group.getOwner());
92-
intent.putExtra(StringContract.IntentStrings.GROUP_DESC,group.getDescription());
93-
intent.putExtra(StringContract.IntentStrings.GROUP_PASSWORD,group.getPassword());
94-
intent.putExtra(StringContract.IntentStrings.GROUP_TYPE,group.getGroupType());
82+
Intent intent = new Intent(getContext(), CometChatGroupDetailActivity.class);
83+
intent.putExtra(UIKitConstants.IntentStrings.GUID, group.getGuid());
84+
intent.putExtra(UIKitConstants.IntentStrings.NAME, group.getName());
85+
intent.putExtra(UIKitConstants.IntentStrings.AVATAR, group.getIcon());
86+
intent.putExtra(UIKitConstants.IntentStrings.MEMBER_SCOPE, group.getScope());
87+
intent.putExtra(UIKitConstants.IntentStrings.MEMBER_COUNT,group.getMembersCount());
88+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_OWNER, group.getOwner());
89+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_DESC,group.getDescription());
90+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_PASSWORD,group.getPassword());
91+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_TYPE,group.getGroupType());
9592
startActivity(intent);
9693
}
9794
}
@@ -103,16 +100,16 @@ public void OnItemClick(Call var, int position) {
103100
@Override
104101
public void onSuccess(Call call) {
105102
Log.e( "onSuccess: ",call.toString());
106-
if (var.getReceiverType().equals(CometChatConstants.RECEIVER_TYPE_USER)) {
103+
if (var.getReceiverType().equals(com.cometchat.pro.constants.CometChatConstants.RECEIVER_TYPE_USER)) {
107104
User user;
108105
if (var.getSender().getUid().equals(CometChat.getLoggedInUser().getUid())) {
109106
user = ((User) var.getCallReceiver());
110107
} else {
111108
user = var.getSender();
112109
}
113-
CallUtils.startCallIntent(getContext(), user, CometChatConstants.CALL_TYPE_AUDIO, true, call.getSessionId());
110+
CallUtils.startCallIntent(getContext(), user, com.cometchat.pro.constants.CometChatConstants.CALL_TYPE_AUDIO, true, call.getSessionId());
114111
} else
115-
CallUtils.startGroupCallIntent(getContext(),((Group)call.getCallReceiver()),CometChatConstants.CALL_TYPE_AUDIO,true,call.getSessionId());
112+
CallUtils.startGroupCallIntent(getContext(),((Group)call.getCallReceiver()), com.cometchat.pro.constants.CometChatConstants.CALL_TYPE_AUDIO,true,call.getSessionId());
116113
}
117114

118115
@Override
@@ -141,7 +138,7 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat
141138
private void getCallList() {
142139
if (messagesRequest == null)
143140
{
144-
messagesRequest = new MessagesRequest.MessagesRequestBuilder().setCategory(CometChatConstants.CATEGORY_CALL).setLimit(30).build();
141+
messagesRequest = new MessagesRequest.MessagesRequestBuilder().setCategory(com.cometchat.pro.constants.CometChatConstants.CATEGORY_CALL).setLimit(30).build();
145142
}
146143

147144
messagesRequest.fetchPrevious(new CometChat.CallbackListener<List<BaseMessage>>() {

‎app/src/main/java/com/cometchat/pro/androiduikit/ComponentFragments/ConversationListViewFragment.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import com.cometchat.pro.androiduikit.R;
1515
import com.cometchat.pro.androiduikit.databinding.FragmentConversationListBinding;
16-
import com.cometchat.pro.constants.CometChatConstants;
1716
import com.cometchat.pro.core.CometChat;
1817
import com.cometchat.pro.core.ConversationsRequest;
1918
import com.cometchat.pro.exceptions.CometChatException;
@@ -23,9 +22,9 @@
2322

2423
import java.util.List;
2524

26-
import constant.StringContract;
27-
import listeners.OnItemClickListener;
28-
import screen.messagelist.CometChatMessageListActivity;
25+
import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
26+
import com.cometchat.pro.uikit.ui_resources.utils.item_clickListener.OnItemClickListener;
27+
import com.cometchat.pro.uikit.ui_components.messages.message_list.CometChatMessageListActivity;
2928

3029
public class ConversationListViewFragment extends Fragment {
3130

@@ -49,24 +48,24 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4948
@Override
5049
public void OnItemClick(Conversation conversation, int position) {
5150
Intent intent = new Intent(getContext(), CometChatMessageListActivity.class);
52-
intent.putExtra(StringContract.IntentStrings.TYPE,conversation.getConversationType());
53-
if (conversation.getConversationType().equals(CometChatConstants.CONVERSATION_TYPE_GROUP))
51+
intent.putExtra(UIKitConstants.IntentStrings.TYPE,conversation.getConversationType());
52+
if (conversation.getConversationType().equals(com.cometchat.pro.constants.CometChatConstants.CONVERSATION_TYPE_GROUP))
5453
{
55-
intent.putExtra(StringContract.IntentStrings.NAME,((Group)conversation.getConversationWith()).getName());
56-
intent.putExtra(StringContract.IntentStrings.GUID,((Group)conversation.getConversationWith()).getGuid());
57-
intent.putExtra(StringContract.IntentStrings.GROUP_OWNER,((Group)conversation.getConversationWith()).getOwner());
58-
intent.putExtra(StringContract.IntentStrings.AVATAR,((Group)conversation.getConversationWith()).getIcon());
59-
intent.putExtra(StringContract.IntentStrings.GROUP_TYPE,((Group)conversation.getConversationWith()).getGroupType());
60-
intent.putExtra(StringContract.IntentStrings.MEMBER_COUNT,((Group)conversation.getConversationWith()).getMembersCount());
61-
intent.putExtra(StringContract.IntentStrings.GROUP_DESC,((Group)conversation.getConversationWith()).getDescription());
62-
intent.putExtra(StringContract.IntentStrings.GROUP_PASSWORD,((Group)conversation.getConversationWith()).getPassword());
54+
intent.putExtra(UIKitConstants.IntentStrings.NAME,((Group)conversation.getConversationWith()).getName());
55+
intent.putExtra(UIKitConstants.IntentStrings.GUID,((Group)conversation.getConversationWith()).getGuid());
56+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_OWNER,((Group)conversation.getConversationWith()).getOwner());
57+
intent.putExtra(UIKitConstants.IntentStrings.AVATAR,((Group)conversation.getConversationWith()).getIcon());
58+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_TYPE,((Group)conversation.getConversationWith()).getGroupType());
59+
intent.putExtra(UIKitConstants.IntentStrings.MEMBER_COUNT,((Group)conversation.getConversationWith()).getMembersCount());
60+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_DESC,((Group)conversation.getConversationWith()).getDescription());
61+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_PASSWORD,((Group)conversation.getConversationWith()).getPassword());
6362
}
6463
else
6564
{
66-
intent.putExtra(StringContract.IntentStrings.NAME,((User)conversation.getConversationWith()).getName());
67-
intent.putExtra(StringContract.IntentStrings.UID,((User)conversation.getConversationWith()).getUid());
68-
intent.putExtra(StringContract.IntentStrings.AVATAR,((User)conversation.getConversationWith()).getAvatar());
69-
intent.putExtra(StringContract.IntentStrings.STATUS,((User)conversation.getConversationWith()).getStatus());
65+
intent.putExtra(UIKitConstants.IntentStrings.NAME,((User)conversation.getConversationWith()).getName());
66+
intent.putExtra(UIKitConstants.IntentStrings.UID,((User)conversation.getConversationWith()).getUid());
67+
intent.putExtra(UIKitConstants.IntentStrings.AVATAR,((User)conversation.getConversationWith()).getAvatar());
68+
intent.putExtra(UIKitConstants.IntentStrings.STATUS,((User)conversation.getConversationWith()).getStatus());
7069
}
7170
startActivity(intent);
7271
}

‎app/src/main/java/com/cometchat/pro/androiduikit/ComponentFragments/GroupListViewFragment.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@
1414

1515
import com.cometchat.pro.androiduikit.R;
1616
import com.cometchat.pro.androiduikit.databinding.FragmentGroupListBinding;
17-
import com.cometchat.pro.constants.CometChatConstants;
1817
import com.cometchat.pro.core.CometChat;
1918
import com.cometchat.pro.core.GroupsRequest;
2019
import com.cometchat.pro.exceptions.CometChatException;
2120
import com.cometchat.pro.models.Group;
2221

2322
import java.util.List;
2423

25-
import constant.StringContract;
26-
import listeners.OnItemClickListener;
27-
import screen.messagelist.CometChatMessageListActivity;
24+
import com.cometchat.pro.uikit.ui_resources.constants.UIKitConstants;
25+
import com.cometchat.pro.uikit.ui_resources.utils.item_clickListener.OnItemClickListener;
26+
import com.cometchat.pro.uikit.ui_components.messages.message_list.CometChatMessageListActivity;
2827

2928
public class GroupListViewFragment extends Fragment {
3029

@@ -41,15 +40,15 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
4140
@Override
4241
public void OnItemClick(Group group, int position) {
4342
Intent intent = new Intent(getContext(), CometChatMessageListActivity.class);
44-
intent.putExtra(StringContract.IntentStrings.NAME,group.getName());
45-
intent.putExtra(StringContract.IntentStrings.GROUP_OWNER,group.getOwner());
46-
intent.putExtra(StringContract.IntentStrings.GUID,group.getGuid());
47-
intent.putExtra(StringContract.IntentStrings.AVATAR,group.getIcon());
48-
intent.putExtra(StringContract.IntentStrings.GROUP_TYPE,group.getGroupType());
49-
intent.putExtra(StringContract.IntentStrings.TYPE,CometChatConstants.RECEIVER_TYPE_GROUP);
50-
intent.putExtra(StringContract.IntentStrings.MEMBER_COUNT,group.getMembersCount());
51-
intent.putExtra(StringContract.IntentStrings.GROUP_DESC,group.getDescription());
52-
intent.putExtra(StringContract.IntentStrings.GROUP_PASSWORD,group.getPassword());
43+
intent.putExtra(UIKitConstants.IntentStrings.NAME,group.getName());
44+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_OWNER,group.getOwner());
45+
intent.putExtra(UIKitConstants.IntentStrings.GUID,group.getGuid());
46+
intent.putExtra(UIKitConstants.IntentStrings.AVATAR,group.getIcon());
47+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_TYPE,group.getGroupType());
48+
intent.putExtra(UIKitConstants.IntentStrings.TYPE, com.cometchat.pro.constants.CometChatConstants.RECEIVER_TYPE_GROUP);
49+
intent.putExtra(UIKitConstants.IntentStrings.MEMBER_COUNT,group.getMembersCount());
50+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_DESC,group.getDescription());
51+
intent.putExtra(UIKitConstants.IntentStrings.GROUP_PASSWORD,group.getPassword());
5352
startActivity(intent);
5453
}
5554

0 commit comments

Comments
 (0)