Skip to content

Commit b481315

Browse files
v4.3.5
1 parent a5f0398 commit b481315

5 files changed

Lines changed: 25 additions & 14 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "com.cometchat.javasampleapp"
1010
minSdk 21
1111
targetSdk 33
12-
versionCode 8
13-
versionName "4.3.3"
12+
versionCode 9
13+
versionName "4.3.5"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
manifestPlaceholders = [file_provider: "com.cometchat.javasampleapp"]

app/src/main/java/com/cometchat/javasampleapp/Application.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@ public class Application extends android.app.Application {
2020
@Override
2121
public void onCreate() {
2222
super.onCreate();
23-
LISTENER_ID = System.currentTimeMillis() + "";
24-
if(AppUtils.isNightMode(this)){
25-
Palette.getInstance(this).mode(CometChatTheme.MODE.DARK);
23+
addCallListener();
24+
if (AppUtils.isNightMode(this)) {
25+
Palette.getInstance().mode(CometChatTheme.MODE.DARK);
2626
}
2727
}
2828

29-
public static void addCallListener(Context context) {
29+
private void addCallListener() {
30+
LISTENER_ID = System.currentTimeMillis() + "";
3031
CometChat.addCallListener(LISTENER_ID, new CometChat.CallListener() {
3132
@Override
3233
public void onIncomingCallReceived(Call call) {
33-
CometChatCallActivity.launchIncomingCallScreen(context, call, null);
34+
CometChatCallActivity.launchIncomingCallScreen(getApplicationContext(), call, null);
3435
}
3536

3637
@Override
@@ -50,13 +51,20 @@ public void onIncomingCallCancelled(Call call) {
5051
});
5152
}
5253

54+
5355
@Override
5456
public void onConfigurationChanged(@NonNull Configuration newConfig) {
5557
super.onConfigurationChanged(newConfig);
56-
if(AppUtils.isNightMode(this)){
57-
Palette.getInstance(this).mode(CometChatTheme.MODE.DARK);
58-
}else{
59-
Palette.getInstance(this).mode(CometChatTheme.MODE.LIGHT);
58+
setTheme();
59+
}
60+
61+
private void setTheme() {
62+
if (AppUtils.isNightMode(this)) {
63+
Palette.getInstance().mode(CometChatTheme.MODE.DARK);
64+
AppUtils.switchDarkMode();
65+
} else {
66+
Palette.getInstance().mode(CometChatTheme.MODE.LIGHT);
67+
AppUtils.switchLightMode();
6068
}
6169
}
6270

app/src/main/java/com/cometchat/javasampleapp/activity/MainActivity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ protected void onCreate(Bundle savedInstanceState) {
5454
public void onSuccess(String s) {
5555
CometChat.setDemoMetaInfo(getAppMetadata());
5656
if (CometChatUIKit.getLoggedInUser() != null) {
57-
Application.addCallListener(MainActivity.this);
5857
AppUtils.fetchDefaultObjects();
5958
startActivity(new Intent(MainActivity.this, HomeActivity.class));
6059
finish();
@@ -103,7 +102,6 @@ private void login(String uid) {
103102
CometChatUIKit.login(uid, new CometChat.CallbackListener<User>() {
104103
@Override
105104
public void onSuccess(User user) {
106-
Application.addCallListener(MainActivity.this);
107105
AppUtils.fetchDefaultObjects();
108106
startActivity(new Intent(MainActivity.this, HomeActivity.class));
109107
finish();

app/src/main/java/com/cometchat/javasampleapp/fragments/shared/views/ImageBubbleFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import androidx.fragment.app.Fragment;
99

10+
import com.cometchat.chatuikit.shared.resources.theme.Palette;
1011
import com.cometchat.chatuikit.shared.views.CometChatImageBubble.CometChatImageBubble;
1112
import com.cometchat.chatuikit.shared.views.CometChatImageBubble.ImageBubbleStyle;
1213
import com.cometchat.javasampleapp.R;
@@ -19,7 +20,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
1920

2021
CometChatImageBubble imageBubble = view.findViewById(R.id.image_bubble);
2122
imageBubble.setImageUrl("https://data-us.cometchat.io/2379614bd4db65dd/media/1682517838_2050398854_08d684e835e3c003f70f2478f937ed57.jpeg", R.drawable.ic_launcher_background, false);
22-
imageBubble.setStyle(new ImageBubbleStyle().setCornerRadius(18).setTextColor(getResources().getColor(R.color.black)).setBackground(getResources().getColor(com.cometchat.chatuikit.R.color.cometchat_accent100)));
23+
imageBubble.setStyle(new ImageBubbleStyle().setCornerRadius(18).setTextColor(Palette.getInstance().getAccent(getContext())).setBackground(Palette.getInstance().getBackground(getContext())));
2324
imageBubble.setCaption("This is a simple representation of CometChat Image Bubble");
2425
return view;
2526
}

app/src/main/java/com/cometchat/javasampleapp/fragments/shared/views/ListItemFragment.java

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

1414
import com.cometchat.chatuikit.shared.cometchatuikit.CometChatUIKit;
1515
import com.cometchat.chatuikit.shared.resources.theme.CometChatTheme;
16+
import com.cometchat.chatuikit.shared.resources.theme.Palette;
1617
import com.cometchat.chatuikit.shared.utils.ConversationTailView;
1718
import com.cometchat.chatuikit.shared.views.CometChatAvatar.AvatarStyle;
1819
import com.cometchat.chatuikit.shared.views.CometChatBadge.BadgeStyle;
@@ -33,6 +34,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
3334
CometChatTheme theme = CometChatTheme.getInstance();
3435
CometChatListItem groupListItem = view.findViewById(R.id.group_list_item);
3536
groupListItem.setTitle("Superhero");
37+
groupListItem.setTitleColor(Palette.getInstance().getAccent(getContext()));
3638
groupListItem.setSubtitleView(getTextView("8 members"));
3739
groupListItem.setAvatar("https://data-us.cometchat.io/2379614bd4db65dd/media/1682517838_2050398854_08d684e835e3c003f70f2478f937ed57.jpeg", "Superhero");
3840
groupListItem.hideStatusIndicator(true);
@@ -42,6 +44,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
4244
userListItem.setAvatar(CometChatUIKit.getLoggedInUser().getAvatar(), name);
4345
userListItem.setSubtitleView(getTextView(CometChatUIKit.getLoggedInUser().getStatus()));
4446
userListItem.setTitle(name);
47+
userListItem.setTitleColor(Palette.getInstance().getAccent(getContext()));
4548
userListItem.setStatusIndicatorColor(getResources().getColor(com.cometchat.chatuikit.R.color.cometchat_online_green));
4649

4750
CometChatListItem conversationListItem = view.findViewById(R.id.conversation_list_item);
@@ -51,6 +54,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
5154
tailView.getDate().setDate(System.currentTimeMillis() / 1000, Pattern.DAY_DATE_TIME);
5255
tailView.getDate().setStyle(new DateStyle().setTextAppearance(theme.getTypography().getSubtitle1()).setTextColor(theme.getPalette().getAccent600(getContext())));
5356
conversationListItem.setTitle(name);
57+
conversationListItem.setTitleColor(Palette.getInstance().getAccent(getContext()));
5458
conversationListItem.setAvatar(CometChatUIKit.getLoggedInUser().getAvatar(), name);
5559
conversationListItem.setTailView(tailView);
5660
conversationListItem.setSubtitleView(getTextView("Hey, How are you?"));

0 commit comments

Comments
 (0)