Skip to content

Commit cf3e5c7

Browse files
darshanbhanushalidarshanbhanushali
committed
Android UI Kit v3.0.0-1
1 parent cc7bd47 commit cf3e5c7

File tree

381 files changed

+4560
-5024
lines changed

Some content is hidden

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

381 files changed

+4560
-5024
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<img src="https://img.shields.io/badge/Repo%20Size-18.6%20MB-blue" />
1414
![GitHub contributors](https://img.shields.io/github/contributors/cometchat-pro/android-java-chat-app)
1515
![GitHub stars](https://img.shields.io/github/stars/cometchat-pro/android-java-chat-app?style=social)
16-
![Version](https://shields.io/badge/version-v3.0.0--beta4--2-orange)
16+
![Version](https://shields.io/badge/version-v3.0.0--1-orange)
1717
![Twitter Follow](https://img.shields.io/twitter/follow/cometchat?style=social)
1818

1919
<img src="https://files.readme.io/952af91-UI_Kit__1.png"/>

‎app/build.gradle‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
defaultConfig {
66
applicationId "com.cometchat.pro.androiduikit"
7-
minSdkVersion 21
8-
targetSdkVersion 29
7+
minSdkVersion 24
8+
targetSdkVersion 30
99
versionCode 1
1010
renderscriptSupportModeEnabled true
1111
multiDexEnabled true
@@ -28,7 +28,8 @@ android {
2828
}
2929
buildTypes {
3030
release {
31-
minifyEnabled false
31+
minifyEnabled true
32+
shrinkResources true
3233
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3334
}
3435

@@ -75,6 +76,7 @@ dependencies {
7576
implementation 'com.google.android.material:material:1.2.0-alpha05'
7677
implementation 'com.facebook.shimmer:shimmer:0.4.0'
7778

78-
//
79-
implementation 'com.cometchat:pro-android-chat-sdk:3.0.0-beta4'
79+
implementation 'com.cometchat:pro-android-chat-sdk:3.0.0'
80+
implementation 'com.cometchat:pro-android-calls-sdk:2.1.0'
81+
8082
}

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

Lines changed: 63 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,25 @@
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;
13-
import android.widget.RadioGroup;
1412

1513
import androidx.annotation.NonNull;
1614
import androidx.fragment.app.Fragment;
1715

18-
import com.cometchat.pro.androiduikit.ColorPickerDialog;
1916
import com.cometchat.pro.androiduikit.R;
2017
import com.cometchat.pro.core.CometChat;
2118
import com.cometchat.pro.uikit.ui_components.shared.cometchatAvatar.CometChatAvatar;
2219
import com.cometchat.pro.uikit.ui_resources.utils.Utils;
2320
import com.google.android.material.textfield.TextInputEditText;
2421
import com.google.android.material.textfield.TextInputLayout;
2522

26-
import java.util.Random;
27-
2823
public class AvatarFragment extends Fragment {
2924

3025
private Context context;
3126

32-
private TextInputLayout borderWidthLayout;
27+
private TextInputLayout borderWidthLayout,borderRadiusLayout;
3328

3429
public AvatarFragment() {
3530
// Required empty public constructor
@@ -67,22 +62,26 @@ public void afterTextChanged(Editable editable) {
6762

6863
}
6964
});
70-
RadioGroup shapegroup = view.findViewById(R.id.shapeGroup);
71-
shapegroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
72-
@Override
73-
public void onCheckedChanged(RadioGroup radioGroup, int i) {
74-
if (i==R.id.circle)
75-
{
76-
avatar.setShape("circle");
77-
refreshAvatar(avatar);
78-
}
79-
else
80-
{
81-
avatar.setShape("rectangle");
82-
refreshAvatar(avatar);
83-
}
65+
TextInputEditText borderRadius = view.findViewById(R.id.borderRadius);
66+
borderRadiusLayout = view.findViewById(R.id.borderRadius_layout);
67+
borderRadius.addTextChangedListener(new TextWatcher() {
68+
@Override
69+
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
70+
71+
}
72+
73+
@Override
74+
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
75+
if (charSequence.length()>0)
76+
avatar.setCornerRadius(Integer.parseInt(charSequence.toString()));
77+
}
78+
79+
@Override
80+
public void afterTextChanged(Editable editable) {
81+
8482
}
8583
});
84+
8685
view.findViewById(R.id.red).setOnClickListener(new View.OnClickListener() {
8786
@Override
8887
public void onClick(View view) {
@@ -125,6 +124,50 @@ public void onClick(View view) {
125124
refreshAvatar(avatar);
126125
}
127126
});
127+
128+
129+
view.findViewById(R.id.bg_red).setOnClickListener(new View.OnClickListener() {
130+
@Override
131+
public void onClick(View view) {
132+
avatar.setBackgroundColor(getResources().getColor(R.color.red));
133+
// refreshAvatar(avatar);
134+
}
135+
});
136+
view.findViewById(R.id.bg_yellow).setOnClickListener(new View.OnClickListener() {
137+
@Override
138+
public void onClick(View view) {
139+
avatar.setBackgroundColor(getResources().getColor(R.color.yellow));
140+
refreshAvatar(avatar);
141+
}
142+
});
143+
view.findViewById(R.id.bg_purple).setOnClickListener(new View.OnClickListener() {
144+
@Override
145+
public void onClick(View view) {
146+
avatar.setBackgroundColor(getResources().getColor(R.color.purple));
147+
refreshAvatar(avatar);
148+
}
149+
});
150+
view.findViewById(R.id.bg_green).setOnClickListener(new View.OnClickListener() {
151+
@Override
152+
public void onClick(View view) {
153+
avatar.setBackgroundColor(getResources().getColor(R.color.green));
154+
refreshAvatar(avatar);
155+
}
156+
});
157+
view.findViewById(R.id.bg_blue).setOnClickListener(new View.OnClickListener() {
158+
@Override
159+
public void onClick(View view) {
160+
avatar.setBackgroundColor(getResources().getColor(R.color.blue));
161+
refreshAvatar(avatar);
162+
}
163+
});
164+
view.findViewById(R.id.bg_violet).setOnClickListener(new View.OnClickListener() {
165+
@Override
166+
public void onClick(View view) {
167+
avatar.setBackgroundColor(getResources().getColor(R.color.violet));
168+
refreshAvatar(avatar);
169+
}
170+
});
128171
checkDarkMode();
129172
return view;
130173
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public void OnItemClick(Call var, int position) {
7474
intent.putExtra(UIKitConstants.IntentStrings.UID, user.getUid());
7575
intent.putExtra(UIKitConstants.IntentStrings.NAME, user.getName());
7676
intent.putExtra(UIKitConstants.IntentStrings.AVATAR, user.getAvatar());
77+
intent.putExtra(UIKitConstants.IntentStrings.LINK,user.getLink());
7778
intent.putExtra(UIKitConstants.IntentStrings.STATUS, user.getStatus());
7879
intent.putExtra(UIKitConstants.IntentStrings.IS_BLOCKED_BY_ME, user.isBlockedByMe());
7980
intent.putExtra(UIKitConstants.IntentStrings.FROM_CALL_LIST,true);
@@ -161,7 +162,7 @@ public void onSuccess(List<BaseMessage> baseMessages) {
161162
public void onError(CometChatException e) {
162163
Log.e( "onError: ",e.getMessage() );
163164
if (rvCallList!=null)
164-
Snackbar.make(rvCallList, com.cometchat.pro.uikit.R.string.call_list_error,Snackbar.LENGTH_LONG).show();
165+
Snackbar.make(rvCallList, R.string.err_default_message,Snackbar.LENGTH_LONG).show();
165166
}
166167
});
167168
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public void OnItemClick(Conversation conversation, int position) {
6767
intent.putExtra(UIKitConstants.IntentStrings.UID,((User)conversation.getConversationWith()).getUid());
6868
intent.putExtra(UIKitConstants.IntentStrings.AVATAR,((User)conversation.getConversationWith()).getAvatar());
6969
intent.putExtra(UIKitConstants.IntentStrings.STATUS,((User)conversation.getConversationWith()).getStatus());
70+
intent.putExtra(UIKitConstants.IntentStrings.LINK,((User)conversation.getConversationWith()).getLink());
7071
}
7172
startActivity(intent);
7273
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public void OnItemClick(User user, int position) {
5151
intent.putExtra(UIKitConstants.IntentStrings.TYPE, CometChatConstants.RECEIVER_TYPE_USER);
5252
intent.putExtra(UIKitConstants.IntentStrings.NAME,user.getName());
5353
intent.putExtra(UIKitConstants.IntentStrings.UID,user.getUid());
54+
intent.putExtra(UIKitConstants.IntentStrings.LINK,user.getLink());
5455
intent.putExtra(UIKitConstants.IntentStrings.AVATAR,user.getAvatar());
5556
intent.putExtra(UIKitConstants.IntentStrings.STATUS,user.getStatus());
5657
startActivity(intent);

‎app/src/main/java/com/cometchat/pro/androiduikit/ComponentLoadActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public void userIntent(User user) {
132132
intent.putExtra(UIKitConstants.IntentStrings.AVATAR, user.getAvatar());
133133
intent.putExtra(UIKitConstants.IntentStrings.STATUS, user.getStatus());
134134
intent.putExtra(UIKitConstants.IntentStrings.NAME, user.getName());
135+
intent.putExtra(UIKitConstants.IntentStrings.LINK,user.getLink());
135136
intent.putExtra(UIKitConstants.IntentStrings.TYPE, CometChatConstants.RECEIVER_TYPE_USER);
136137
startActivity(intent);
137138
}

‎app/src/main/java/com/cometchat/pro/androiduikit/SelectActivity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public void onClick(View v) {
6363
} else {
6464
logout.setBackgroundColor(getResources().getColor(R.color.textColorWhite));
6565
}
66-
6766
unifiedLaunch.setOnClickListener(new View.OnClickListener() {
6867
@Override
6968
public void onClick(View view) {

‎app/src/main/java/com/cometchat/pro/androiduikit/UIKitApplication.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.app.NotificationChannel;
55
import android.app.NotificationManager;
66
import android.os.Build;
7-
import android.util.Log;
87
import android.widget.Toast;
98

109

@@ -32,7 +31,6 @@ public void onSuccess(String s) {
3231
UIKitSettings.setAppID(AppConfig.AppDetails.APP_ID);
3332
UIKitSettings.setAuthKey(AppConfig.AppDetails.AUTH_KEY);
3433
CometChat.setSource("ui-kit","android","java");
35-
Log.d(TAG, "onSuccess: "+s);
3634
}
3735

3836
@Override

‎app/src/main/java/com/cometchat/pro/androiduikit/constants/AppConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ public class AppConfig {
44

55
public class AppDetails {
66

7-
public static final String APP_ID = "XXXXXXXXXXXXXX";
7+
public static final String APP_ID = "191246b4c2a97f28";
88

9-
public static final String AUTH_KEY = "XXXXXXXXXXXXXXXXXXXXXXXX";
9+
public static final String AUTH_KEY = "a5e156f0a4ff6d78ba3df949d4b7bbdbf09535a7";
1010

11-
public static final String REGION = "XX";
11+
public static final String REGION = "us";
1212
}
1313
}
1414

0 commit comments

Comments
 (0)