Skip to content

Commit 4f669c7

Browse files
vivekCometChatvivekCometChat
authored
Merge pull request #64 from cometchat/v4
V4
2 parents 32cd94e + 59b035c commit 4f669c7

22 files changed

+885
-13
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 4 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 2
13-
versionName "4.0.3"
12+
versionCode 3
13+
versionName "1.0.2"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
manifestPlaceholders = [file_provider: "com.cometchat.javasampleapp"]
@@ -30,12 +30,12 @@ android {
3030
}
3131

3232
dependencies {
33-
implementation 'com.cometchat:chat-uikit-android:4.0.+'
33+
implementation 'com.cometchat:chat-uikit-android:4.1.+'
3434
implementation 'androidx.appcompat:appcompat:1.6.1'
3535
implementation 'com.google.android.material:material:1.8.0'
3636
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3737
testImplementation 'junit:junit:4.13.2'
3838
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
3939
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
40-
implementation 'com.cometchat:calls-sdk-android:4.0.1'
40+
implementation 'com.cometchat:calls-sdk-android:4.0.2'
4141
}

‎app/src/main/java/com/cometchat/javasampleapp/activity/ComponentLaunchActivity.java‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.res.ColorStateList;
44
import android.os.Bundle;
5-
import android.view.View;
65
import android.widget.LinearLayout;
76

87
import androidx.appcompat.app.AppCompatActivity;
@@ -13,6 +12,12 @@
1312
import com.cometchat.javasampleapp.AppUtils;
1413
import com.cometchat.javasampleapp.R;
1514
import com.cometchat.javasampleapp.fragments.calls.CallButtonFragment;
15+
import com.cometchat.javasampleapp.fragments.calls.CallLogDetailsFragment;
16+
import com.cometchat.javasampleapp.fragments.calls.CallLogHistoryFragment;
17+
import com.cometchat.javasampleapp.fragments.calls.CallLogParticipantsFragment;
18+
import com.cometchat.javasampleapp.fragments.calls.CallLogRecordingFragment;
19+
import com.cometchat.javasampleapp.fragments.calls.CallLogWithDetailsFragment;
20+
import com.cometchat.javasampleapp.fragments.calls.CallLogsFragment;
1621
import com.cometchat.javasampleapp.fragments.conversations.ContactsFragment;
1722
import com.cometchat.javasampleapp.fragments.conversations.ConversationsFragment;
1823
import com.cometchat.javasampleapp.fragments.conversations.ConversationsWithMessagesFragment;
@@ -52,6 +57,7 @@
5257

5358
public class ComponentLaunchActivity extends AppCompatActivity {
5459
private LinearLayout parentView;
60+
5561
@Override
5662
protected void onCreate(Bundle savedInstanceState) {
5763
super.onCreate(savedInstanceState);
@@ -123,23 +129,36 @@ protected void onCreate(Bundle savedInstanceState) {
123129
loadFragment(new AudioBubbleFragment());
124130
} else if (id == R.id.files_bubble) {
125131
loadFragment(new FileBubbleFragment());
126-
}else if (id == R.id.form_bubble) {
132+
} else if (id == R.id.form_bubble) {
127133
loadFragment(new FormBubbleFragment());
128-
}else if (id == R.id.card_bubble) {
134+
} else if (id == R.id.card_bubble) {
129135
loadFragment(new CardBubbleFragment());
130136
} else if (id == R.id.media_recorder) {
131137
loadFragment(new MediaRecorderFragment());
132138
} else if (id == R.id.contacts) {
133139
loadFragment(new ContactsFragment());
134-
}else if (id == R.id.messageInformation) {
140+
} else if (id == R.id.messageInformation) {
135141
loadFragment(new MessageInformationFragment());
142+
} else if (id == R.id.call_logs) {
143+
loadFragment(new CallLogsFragment());
144+
} else if (id == R.id.call_logs_details) {
145+
loadFragment(new CallLogDetailsFragment());
146+
} else if (id == R.id.call_logs_with_details) {
147+
loadFragment(new CallLogWithDetailsFragment());
148+
} else if (id == R.id.call_log_participants) {
149+
loadFragment(new CallLogParticipantsFragment());
150+
} else if (id == R.id.call_log_recording) {
151+
loadFragment(new CallLogRecordingFragment());
152+
} else if (id == R.id.call_log_history) {
153+
loadFragment(new CallLogHistoryFragment());
136154
}
137155
}
156+
138157
private void setUpUI() {
139-
if(AppUtils.isNightMode(this)){
140-
Utils.setStatusBarColor(this, ContextCompat.getColor(this,R.color.app_background_dark));
141-
parentView.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(this,R.color.app_background_dark)));
142-
}else {
158+
if (AppUtils.isNightMode(this)) {
159+
Utils.setStatusBarColor(this, ContextCompat.getColor(this, R.color.app_background_dark));
160+
parentView.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.app_background_dark)));
161+
} else {
143162
Utils.setStatusBarColor(this, getResources().getColor(R.color.app_background));
144163
parentView.setBackgroundTintList(ColorStateList.valueOf(getResources().getColor(R.color.app_background)));
145164
}

‎app/src/main/java/com/cometchat/javasampleapp/activity/ComponentListActivity.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ protected void onCreate(Bundle savedInstanceState) {
7373

7474
//calls
7575
findViewById(R.id.call_button).setOnClickListener(view -> handleIntent(R.id.call_button));
76+
findViewById(R.id.call_logs).setOnClickListener(view -> handleIntent(R.id.call_logs));
77+
findViewById(R.id.call_logs_details).setOnClickListener(view -> handleIntent(R.id.call_logs_details));
78+
findViewById(R.id.call_logs_with_details).setOnClickListener(view -> handleIntent(R.id.call_logs_with_details));
79+
findViewById(R.id.call_log_participants).setOnClickListener(view -> handleIntent(R.id.call_log_participants));
80+
findViewById(R.id.call_log_recording).setOnClickListener(view -> handleIntent(R.id.call_log_recording));
81+
findViewById(R.id.call_log_history).setOnClickListener(view -> handleIntent(R.id.call_log_history));
7682

7783
//shared
7884

‎app/src/main/java/com/cometchat/javasampleapp/fragments/calls/CallLogDetailsFragment.java‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
package com.cometchat.javasampleapp.fragments.calls;
2+
3+
import android.os.Bundle;
4+
5+
import androidx.fragment.app.Fragment;
6+
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.cometchat.calls.constants.CometChatCallsConstants;
12+
import com.cometchat.calls.model.CallLog;
13+
import com.cometchat.calls.model.CallUser;
14+
import com.cometchat.calls.model.Participant;
15+
import com.cometchat.calls.model.Recording;
16+
import com.cometchat.chatuikit.calls.calldetails.CometChatCallLogDetails;
17+
import com.cometchat.chatuikit.shared.cometchatuikit.CometChatUIKit;
18+
import com.cometchat.javasampleapp.R;
19+
20+
import java.util.ArrayList;
21+
import java.util.List;
22+
23+
public class CallLogDetailsFragment extends Fragment {
24+
private CometChatCallLogDetails cometChatCallLogDetails;
25+
26+
@Override
27+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
28+
Bundle savedInstanceState) {
29+
// Inflate the layout for this fragment
30+
View view = inflater.inflate(R.layout.fragment_call_details, container, false);
31+
cometChatCallLogDetails = view.findViewById(R.id.call_logs_details);
32+
createCallLog();
33+
return view;
34+
}
35+
36+
public void createCallLog() {
37+
if (CometChatUIKit.getLoggedInUser() != null) {
38+
CallUser initiator = new CallUser();
39+
initiator.setAvatar(CometChatUIKit.getLoggedInUser().getAvatar());
40+
initiator.setUid(CometChatUIKit.getLoggedInUser().getUid());
41+
initiator.setName(CometChatUIKit.getLoggedInUser().getName());
42+
43+
CallUser receiver = new CallUser();
44+
receiver.setUid("UID233");
45+
receiver.setName("Kevin");
46+
receiver.setAvatar("https://data-us.cometchat.io/assets/images/avatars/spiderman.png");
47+
48+
49+
List<Participant> participants = new ArrayList<>();
50+
51+
Participant participant = new Participant();
52+
participant.setUid(CometChatUIKit.getLoggedInUser().getUid());
53+
participant.setName(CometChatUIKit.getLoggedInUser().getName());
54+
participant.setAvatar(CometChatUIKit.getLoggedInUser().getAvatar());
55+
participant.setJoinedAt(1327349241);
56+
participant.setTotalDurationInMinutes(1327349241);
57+
58+
Participant participant1 = new Participant();
59+
participant1.setUid("UID233");
60+
participant1.setName("Kevin");
61+
participant1.setAvatar("https://data-us.cometchat.io/assets/images/avatars/spiderman.png");
62+
participant1.setJoinedAt(1327349241);
63+
participant1.setHasJoined(true);
64+
participant1.setTotalDurationInMinutes(1327349241);
65+
66+
participants.add(participant);
67+
participants.add(participant1);
68+
69+
List<Recording> recordings = new ArrayList<>();
70+
71+
Recording recording = new Recording();
72+
recording.setRecordingURL("https://recordings-us.cometchat.io/236497dcc2cd529b/2023-12-15/v1.us.236497dcc2cd529b.170264141733632a2e3171d8a5dcb1f82b743fbc2730422263_2023-12-15-11-57-16.mp4");
73+
recording.setDuration(1327349241);
74+
recording.setRid("RID2023");
75+
76+
Recording recording1 = new Recording();
77+
recording1.setRecordingURL("https://recordings-us.cometchat.io/236497dcc2cd529b/2023-12-15/v1.us.236497dcc2cd529b.170264141733632a2e3171d8a5dcb1f82b743fbc2730422263_2023-12-15-11-57-16.mp4");
78+
recording1.setDuration(1327349241);
79+
recording1.setRid("RID2023-1");
80+
recordings.add(recording);
81+
recordings.add(recording1);
82+
83+
CallLog callLog = new CallLog();
84+
callLog.setInitiatedAt(1327349241);
85+
callLog.setInitiator(initiator);
86+
callLog.setReceiver(receiver);
87+
callLog.setStatus(CometChatCallsConstants.CALL_STATUS_BUSY);
88+
callLog.setType(CometChatCallsConstants.CALL_TYPE_AUDIO);
89+
callLog.setParticipants(participants);
90+
callLog.setRecordings(recordings);
91+
callLog.setReceiverType(CometChatCallsConstants.RECEIVER_TYPE_USER);
92+
cometChatCallLogDetails.setCall(callLog);
93+
}
94+
}
95+
}

‎app/src/main/java/com/cometchat/javasampleapp/fragments/calls/CallLogHistoryFragment.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.cometchat.javasampleapp.fragments.calls;
2+
3+
import android.os.Bundle;
4+
5+
import androidx.fragment.app.Fragment;
6+
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.cometchat.chatuikit.calls.callhistory.CometChatCallLogHistory;
12+
import com.cometchat.javasampleapp.R;
13+
14+
15+
public class CallLogHistoryFragment extends Fragment {
16+
private CometChatCallLogHistory cometChatCallLogHistory;
17+
18+
@Override
19+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
20+
Bundle savedInstanceState) {
21+
// Inflate the layout for this fragment
22+
View view = inflater.inflate(R.layout.fragment_call_log_history, container, false);
23+
24+
cometChatCallLogHistory = view.findViewById(R.id.call_logs_history);
25+
return view;
26+
}
27+
}

‎app/src/main/java/com/cometchat/javasampleapp/fragments/calls/CallLogParticipantsFragment.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package com.cometchat.javasampleapp.fragments.calls;
2+
3+
import android.os.Bundle;
4+
5+
import androidx.fragment.app.Fragment;
6+
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.cometchat.calls.model.Participant;
12+
import com.cometchat.chatuikit.calls.callparticipants.CometChatCallLogParticipants;
13+
import com.cometchat.chatuikit.calls.callrecordings.CometChatCallLogRecordings;
14+
import com.cometchat.chatuikit.shared.cometchatuikit.CometChatUIKit;
15+
import com.cometchat.javasampleapp.R;
16+
17+
import java.util.ArrayList;
18+
import java.util.List;
19+
20+
public class CallLogParticipantsFragment extends Fragment {
21+
private CometChatCallLogParticipants cometChatCallLogParticipants;
22+
23+
@Override
24+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
25+
Bundle savedInstanceState) {
26+
// Inflate the layout for this fragment
27+
View view = inflater.inflate(R.layout.fragment_call_log_participants, container, false);
28+
cometChatCallLogParticipants = view.findViewById(R.id.call_logs_participants);
29+
createCallParticipants();
30+
return view;
31+
}
32+
33+
private void createCallParticipants() {
34+
List<Participant> participants = new ArrayList<>();
35+
36+
Participant participant = new Participant();
37+
participant.setUid(CometChatUIKit.getLoggedInUser().getUid());
38+
participant.setName(CometChatUIKit.getLoggedInUser().getName());
39+
participant.setAvatar(CometChatUIKit.getLoggedInUser().getAvatar());
40+
participant.setJoinedAt(1327349241);
41+
participant.setHasJoined(true);
42+
participant.setTotalDurationInMinutes(1327349241);
43+
44+
Participant participant1 = new Participant();
45+
participant1.setUid("UID233");
46+
participant1.setName("Kevin");
47+
participant1.setAvatar("https://data-us.cometchat.io/assets/images/avatars/spiderman.png");
48+
participant1.setJoinedAt(1327349241);
49+
participant1.setHasJoined(true);
50+
participant1.setTotalDurationInMinutes(1327349241);
51+
52+
participants.add(participant);
53+
participants.add(participant1);
54+
cometChatCallLogParticipants.setParticipantList(participants);
55+
}
56+
57+
58+
}

‎app/src/main/java/com/cometchat/javasampleapp/fragments/calls/CallLogRecordingFragment.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.cometchat.javasampleapp.fragments.calls;
2+
3+
import android.os.Bundle;
4+
5+
import androidx.fragment.app.Fragment;
6+
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.cometchat.calls.model.Recording;
12+
import com.cometchat.chatuikit.calls.callrecordings.CometChatCallLogRecordings;
13+
import com.cometchat.javasampleapp.R;
14+
15+
import java.util.ArrayList;
16+
import java.util.List;
17+
18+
19+
public class CallLogRecordingFragment extends Fragment {
20+
21+
private CometChatCallLogRecordings cometChatCallLogRecordings;
22+
23+
@Override
24+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
25+
Bundle savedInstanceState) {
26+
// Inflate the layout for this fragment
27+
View view = inflater.inflate(R.layout.fragment_call_log_recording, container, false);
28+
cometChatCallLogRecordings = view.findViewById(R.id.call_logs_recordings);
29+
createCallRecordings();
30+
return view;
31+
}
32+
33+
private void createCallRecordings() {
34+
List<Recording> recordings = new ArrayList<>();
35+
36+
Recording recording = new Recording();
37+
recording.setRecordingURL("https://recordings-us.cometchat.io/236497dcc2cd529b/2023-12-15/v1.us.236497dcc2cd529b.170264141733632a2e3171d8a5dcb1f82b743fbc2730422263_2023-12-15-11-57-16.mp4");
38+
recording.setDuration(1327349241);
39+
recording.setRid("RID2023");
40+
41+
Recording recording1 = new Recording();
42+
recording1.setRecordingURL("https://recordings-us.cometchat.io/236497dcc2cd529b/2023-12-15/v1.us.236497dcc2cd529b.170264141733632a2e3171d8a5dcb1f82b743fbc2730422263_2023-12-15-11-57-16.mp4");
43+
recording1.setDuration(1327349241);
44+
recording1.setRid("RID2023-1");
45+
recordings.add(recording);
46+
recordings.add(recording1);
47+
cometChatCallLogRecordings.setRecordingList(recordings);
48+
}
49+
}

‎app/src/main/java/com/cometchat/javasampleapp/fragments/calls/CallLogWithDetailsFragment.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.cometchat.javasampleapp.fragments.calls;
2+
3+
import android.os.Bundle;
4+
5+
import androidx.fragment.app.Fragment;
6+
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.cometchat.javasampleapp.R;
12+
13+
public class CallLogWithDetailsFragment extends Fragment {
14+
@Override
15+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
16+
Bundle savedInstanceState) {
17+
// Inflate the layout for this fragment
18+
return inflater.inflate(R.layout.fragment_call_log_with_details, container, false);
19+
}
20+
}

‎app/src/main/java/com/cometchat/javasampleapp/fragments/calls/CallLogsFragment.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
package com.cometchat.javasampleapp.fragments.calls;
3+
4+
import android.os.Bundle;
5+
6+
import androidx.fragment.app.Fragment;
7+
8+
import android.view.LayoutInflater;
9+
import android.view.View;
10+
import android.view.ViewGroup;
11+
12+
import com.cometchat.javasampleapp.R;
13+
14+
public class CallLogsFragment extends Fragment {
15+
@Override
16+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
17+
Bundle savedInstanceState) {
18+
// Inflate the layout for this fragment
19+
return inflater.inflate(R.layout.fragment_call_logs, container, false);
20+
}
21+
}

0 commit comments

Comments
 (0)