Skip to content

Commit 8951175

Browse files
vivekCometChatvivekCometChat
authored
Merge pull request #42 from cometchat-pro/dev
v3.0.15-pluto.beta2.1
2 parents c2d716f + 149a509 commit 8951175

File tree

117 files changed

+1937
-965
lines changed

Some content is hidden

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

117 files changed

+1937
-965
lines changed

‎CONTRIBUTING.md‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# Contributing
2+
3+
When contributing to this repository, please first discuss the change you wish to make via issue,
4+
email, or any other method with the owners of this repository before making a change.
5+
6+
Please note we have a code of conduct, please follow it in all your interactions with the project.
7+
8+
## Pull Request Process
9+
10+
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
11+
build.
12+
2. Update the README.md with details of changes to the interface, this includes new environment
13+
variables, exposed ports, useful file locations and container parameters.
14+
3. Increase the version numbers in any examples files and the README.md to the new version that this
15+
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
16+
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
17+
do not have permission to do that, you may request the second reviewer to merge it for you.
18+
19+
## Code of Conduct
20+
21+
### Our Pledge
22+
23+
In the interest of fostering an open and welcoming environment, we as
24+
contributors and maintainers pledge to making participation in our project and
25+
our community a harassment-free experience for everyone, regardless of age, body
26+
size, disability, ethnicity, gender identity and expression, level of experience,
27+
nationality, personal appearance, race, religion, or sexual identity and
28+
orientation.
29+
30+
### Our Standards
31+
32+
Examples of behavior that contributes to creating a positive environment
33+
include:
34+
35+
* Using welcoming and inclusive language
36+
* Being respectful of differing viewpoints and experiences
37+
* Gracefully accepting constructive criticism
38+
* Focusing on what is best for the community
39+
* Showing empathy towards other community members
40+
41+
Examples of unacceptable behavior by participants include:
42+
43+
* The use of sexualized language or imagery and unwelcome sexual attention or
44+
advances
45+
* Trolling, insulting/derogatory comments, and personal or political attacks
46+
* Public or private harassment
47+
* Publishing others' private information, such as a physical or electronic
48+
address, without explicit permission
49+
* Other conduct which could reasonably be considered inappropriate in a
50+
professional setting
51+
52+
### Our Responsibilities
53+
54+
Project maintainers are responsible for clarifying the standards of acceptable
55+
behavior and are expected to take appropriate and fair corrective action in
56+
response to any instances of unacceptable behavior.
57+
58+
Project maintainers have the right and responsibility to remove, edit, or
59+
reject comments, commits, code, wiki edits, issues, and other contributions
60+
that are not aligned to this Code of Conduct, or to ban temporarily or
61+
permanently any contributor for other behaviors that they deem inappropriate,
62+
threatening, offensive, or harmful.
63+
64+
### Scope
65+
66+
This Code of Conduct applies both within project spaces and in public spaces
67+
when an individual is representing the project or its community. Examples of
68+
representing a project or community include using an official project e-mail
69+
address, posting via an official social media account, or acting as an appointed
70+
representative at an online or offline event. Representation of a project may be
71+
further defined and clarified by project maintainers.
72+
73+
### Enforcement
74+
75+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
76+
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
77+
complaints will be reviewed and investigated and will result in a response that
78+
is deemed necessary and appropriate to the circumstances. The project team is
79+
obligated to maintain confidentiality with regard to the reporter of an incident.
80+
Further details of specific enforcement policies may be posted separately.
81+
82+
Project maintainers who do not follow or enforce the Code of Conduct in good
83+
faith may face temporary or permanent repercussions as determined by other
84+
members of the project's leadership.
85+
86+
### Attribution
87+
88+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
89+
available at [http://contributor-covenant.org/version/1/4][version]
90+
91+
[homepage]: http://contributor-covenant.org
92+
[version]: http://contributor-covenant.org/version/1/4/

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 CometChat Inc.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎Readme.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Before you begin, ensure you have met the following requirements:<br/>
2929

3030
<hr/>
3131

32-
## Installing Android Java Chat Pluto UI Kit :wrench:
32+
## Installing Android Java Chat UI Kit :wrench:
3333

34-
Simply clone the project from [android-java-chat-pluto-uikit](https://github.com/cometchat-pro/android-java-chat-ui-kit/tree/pluto) repository.
34+
Simply clone the project from [android-java-chat-app](https://github.com/cometchat-pro-samples/android-java-chat-app/) repository.
3535

3636

3737
### Running the sample app
@@ -54,13 +54,13 @@ Build and run the Sample App.
5454

5555
# Learn more about UI-Kit
5656

57-
Learn more about how to integrate [Pluto UI Kit](https://www.cometchat.com/docs/java-uikit-beta/integration) inside your app.
57+
Learn more about how to integrate [UI Kit](https://www.cometchat.com/docs/java-uikit-beta/integration) inside your app.
5858
<br/>
5959
<hr/>
6060

6161
## Troubleshooting
6262

63-
- To read the full documentation on UI Kit integration visit our [Documentation](https://www.cometchat.com/docs/pluto-java-beta/overview) .
63+
- To read the full documentation on UI Kit integration visit our [Documentation](https://www.cometchat.com/docs/java-uikit-beta/integration) .
6464

6565
- Facing any issues while integrating or installing the UI Kit please <a href="https://app.cometchat.io/"> connect with us via real time support present in CometChat Dashboard.</a>.
6666

@@ -73,6 +73,8 @@ Thanks to the following people who have contributed to this project:
7373

7474
[👨‍💻 @vivekprajapati 💻](https://github.com/vivekCometChat)
7575

76+
[Contribution guidelines for this project]()
77+
7678
---
7779

7880
## :mailbox: Contact
@@ -81,4 +83,8 @@ Contact us via real time support present in [CometChat Dashboard.](https://app.c
8183

8284
---
8385

86+
## License
87+
88+
This project uses the following license: [License.md](LICENSE).
89+
8490

‎SECURITY.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Security Policy
2+
3+
This document outlines the Responsible Disclosure Program for CometChat Pro
4+
5+
## Responsible Disclosure Policy
6+
7+
At CometChat we take security seriously and consider it a top priority. Since a
8+
public disclosure of a security vulnerability could put the entire
9+
community at risk, we require that potential vulnerabilities are kept
10+
confidential until they are confirmed and fixed. We appreciate your efforts in
11+
keeping CometChat Pro and its users safe by responsibly disclosing any security
12+
vulnerability. Rest assured we will make every effort to acknowledge your
13+
contributions.
14+
15+
## Reporting a vulnerability
16+
17+
To report any security related issues, please communicate with the CometChat Pro security team by sending an email to [email protected]

‎app/build.gradle‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ plugins {
33
}
44

55
android {
6-
compileSdk 32
6+
compileSdk 33
77

88
defaultConfig {
99
applicationId "com.cometchat.pro.javasampleapp"
1010
minSdk 21
11-
targetSdk 32
12-
versionCode 1
13-
versionName "1.1"
11+
targetSdk 33
12+
versionCode 2
13+
versionName "2.1"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
manifestPlaceholders = [file_provider: "com.cometchat.pro.javasampleapp"]
@@ -26,17 +26,15 @@ android {
2626
sourceCompatibility JavaVersion.VERSION_1_8
2727
targetCompatibility JavaVersion.VERSION_1_8
2828
}
29-
dataBinding {
30-
enabled = true
31-
}
3229
}
3330

3431
dependencies {
35-
implementation 'com.cometchat:pro-android-java-chat-ui-kit:3.0.9-pluto.beta.1.1'
36-
implementation 'androidx.appcompat:appcompat:1.5.0'
37-
implementation 'com.google.android.material:material:1.6.1'
32+
implementation 'com.cometchat:pro-android-java-chat-ui-kit:3.0.15-pluto.beta2.1'
33+
implementation 'androidx.appcompat:appcompat:1.6.1'
34+
implementation 'com.google.android.material:material:1.8.0'
3835
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3936
testImplementation 'junit:junit:4.13.2'
40-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
41-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
37+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
38+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
39+
implementation 'com.cometchat:pro-android-calls-sdk:3.0.0'
4240
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.cometchat.pro.javasampleapp">
55

6+
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
8+
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
9+
<uses-permission android:name="android.permission.WAKE_LOCK" />
10+
611
<application
712
android:name="com.cometchat.pro.javasampleapp.Application"
813
android:allowBackup="true"
@@ -14,29 +19,30 @@
1419
android:roundIcon="@mipmap/ic_launcher_round"
1520
android:supportsRtl="true"
1621
android:theme="@style/Theme.PlutoUiKitSampleApp"
22+
tools:replace="android:theme"
1723
tools:targetApi="31">
1824
<activity
19-
android:name="com.cometchat.pro.javasampleapp.activity.CreateUserActivity"
20-
android:screenOrientation="portrait"
21-
android:exported="false" />
25+
android:name=".activity.CreateUserActivity"
26+
android:exported="false"
27+
android:screenOrientation="portrait" />
2228
<activity
23-
android:name="com.cometchat.pro.javasampleapp.activity.ComponentLaunchActivity"
29+
android:name=".activity.ComponentLaunchActivity"
2430
android:exported="false"
2531
android:screenOrientation="portrait" />
2632
<activity
27-
android:name="com.cometchat.pro.javasampleapp.activity.ComponentListActivity"
33+
android:name=".activity.ComponentListActivity"
2834
android:exported="false"
2935
android:screenOrientation="portrait" />
3036
<activity
31-
android:name="com.cometchat.pro.javasampleapp.activity.LoginActivity"
37+
android:name=".activity.LoginActivity"
3238
android:exported="false"
3339
android:screenOrientation="portrait" />
3440
<activity
35-
android:name="com.cometchat.pro.javasampleapp.activity.HomeActivity"
41+
android:name=".activity.HomeActivity"
3642
android:exported="false"
3743
android:screenOrientation="portrait" />
3844
<activity
39-
android:name="com.cometchat.pro.javasampleapp.activity.MainActivity"
45+
android:name=".activity.MainActivity"
4046
android:exported="true"
4147
android:screenOrientation="portrait">
4248
<intent-filter>

‎app/src/main/java/com/cometchat/pro/javasampleapp/AppConstants.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
public class AppConstants {
44

5-
public static final String APP_ID = "XXXXXXXXXXXXXXXX";
5+
public static final String APP_ID = "XXXXXXXXXXXXXX";
66

7-
public static final String AUTH_KEY = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
7+
public static final String AUTH_KEY = "XXXXXXXXXXXXXXXXXXXXXXXX";
88

99
public static final String REGION = "XX";
1010

‎app/src/main/java/com/cometchat/pro/javasampleapp/AppUtils.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package com.cometchat.pro.javasampleapp;
2+
3+
import com.cometchat.pro.core.CometChat;
4+
import com.cometchat.pro.exceptions.CometChatException;
5+
import com.cometchat.pro.models.Group;
6+
import com.cometchat.pro.models.User;
7+
8+
public class AppUtils {
9+
private static Group group;
10+
private static User user;
11+
12+
public static void fetchDefaultObjects() {
13+
CometChat.getGroup("supergroup", new CometChat.CallbackListener<Group>() {
14+
@Override
15+
public void onSuccess(Group group_) {
16+
group = group_;
17+
}
18+
19+
@Override
20+
public void onError(CometChatException e) {
21+
22+
}
23+
});
24+
CometChat.getUser("superhero5", new CometChat.CallbackListener<User>() {
25+
@Override
26+
public void onSuccess(User user_) {
27+
user = user_;
28+
}
29+
30+
@Override
31+
public void onError(CometChatException e) {
32+
33+
}
34+
});
35+
}
36+
37+
public static Group getDefaultGroup() {
38+
return group;
39+
}
40+
41+
public static User getDefaultUser() {
42+
return user;
43+
}
44+
45+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import androidx.annotation.NonNull;
66
import androidx.appcompat.app.AppCompatDelegate;
77

8+
import com.cometchat.chatuikit.shared.resources.utils.Utils;
89
import com.cometchat.pro.core.CometChat;
910

1011

0 commit comments

Comments
 (0)