Merge pull request #49 from cometchat-pro/dev

Dev

Author: vivekCometChat

README.md

@@ -5,6 +5,14 @@
 		</p>	
 	</div>	
 </div>
+</br></br>
+
+> **Note**
+
+Version 4 CometChat UI Kits 
+
+We’ve introduced a major update to CometChat UI kits. Version 4 features a modular architecture that gives you enhanced flexibility to build and customize your web and mobile apps. Please switch to the branch [v4](https://github.com/cometchat-pro/cometchat-chat-sample-app-android-java/tree/v4) to check out the sample app based on this version. [Visit our documentation](https://www.cometchat.com/docs/android-v4-uikit/overview) to read more about this.
+<br/><br/>
 
 # Android Java Chat App
 
@@ -27,7 +35,7 @@ CometChat Kitchen Sink Sample App (built using CometChat UIKit) is a fully funct
 Before you begin, ensure you have met the following requirements:<br/>
  ✅ &nbsp; You have `Android Studio` installed in your machine.<br/>
  ✅ &nbsp; You have a `Android Device or Emulator` with Android Version 6.0 or above.<br/>
- ✅ &nbsp; You have read [CometChat Key Concepts](https://prodocs.cometchat.com/v2.1/docs/concepts).<br/>
+ ✅ &nbsp; You have read [CometChat Key Concepts](https://www.cometchat.com/docs/java-chat-ui-kit/key-concepts).<br/>
 
 <hr/>
 
@@ -40,7 +48,7 @@ Simply clone the project from [android-java-chat-app](https://github.com/cometch
 
 To Run to sample app you have to do the following changes by Adding **APP_ID**, **AUTH_KEY** and  **REGION_CODE**
 
-   You can obtain your  *APP_ID*, *AUTH_KEY* and *REGION_CODE* from [CometChat-Pro Dashboard](https://app.cometchat.io/)
+   You can obtain your  *APP_ID*, *AUTH_KEY* and *REGION_CODE* from [CometChat Dashboard](https://app.cometchat.com/)
 
    - Open the project in Android Studio.
 
@@ -54,17 +62,17 @@ src="https://files.readme.io/9f23df2-app_credentials.png">
 Build and run the Sample App.
 </hr>
 
-# Learn more about UI-Kit
+# Learn more about UIKit
 
 Learn more about how to integrate [UI Kit](https://github.com/cometchat-pro/android-java-chat-ui-kit/blob/master/README.md) inside your app.
 <br/>
 <hr/>
 
 ## Troubleshooting
 
-- To read the full documentation on UI Kit integration visit our [Documentation](https://prodocs.cometchat.com/v2.1/docs/android-ui-kit)  .
+- To read the full documentation on UI Kit integration visit our [Documentation](https://www.cometchat.com/docs/java-chat-ui-kit/overview).
 
-- 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>.
+- Facing any issues while integrating or installing the UI Kit please <a href="https://app.cometchat.com/"> connect with us via real time support present in CometChat Dashboard.</a>.
 
 ---
 
@@ -83,7 +91,7 @@ Thanks to the following people who have contributed to this project:
 
 ## :mailbox: Contact
 
-Contact us via real time support present in [CometChat Dashboard.](https://app.cometchat.io/)
+Contact us via real time support present in [CometChat Dashboard.](https://app.cometchat.com/)
 
 ---
 

app/build.gradle

@@ -76,7 +76,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation 'com.facebook.shimmer:shimmer:0.4.0'
 
-    implementation 'com.cometchat:pro-android-chat-sdk:3.0.9'
+    implementation 'com.cometchat:pro-android-chat-sdk:3.0.16'
     implementation 'com.cometchat:pro-android-calls-sdk:2.2.0'
 
 }

app/src/androidTest/java/com/cometchat/pro/androiduikit/utils/AvatarBorderMatcher.java

@@ -46,9 +46,9 @@ protected boolean matchesSafely(View target) {
             return false;
         }
         CometChatAvatar avatarA = new CometChatAvatar(context);
-        avatarA.setImageDrawable(imageView.getDrawable());
+        avatarA.setDrawable(imageView.getDrawable());
         CometChatAvatar avatarB = new CometChatAvatar(context);
-        avatarB.setImageDrawable(expectedDrawable);
+        avatarB.setDrawable(expectedDrawable);
         return avatarA.getBorderWidth()==avatarB.getBorderWidth()?true:false;
     }
 

uikit/build.gradle

@@ -6,7 +6,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 32
         versionCode 1
-        versionName "3.0.9-4"
+        versionName "3.0.16-1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         renderscriptSupportModeEnabled true
@@ -90,7 +90,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     //cometchat
-    implementation 'com.cometchat:pro-android-chat-sdk:3.0.9'
+    implementation 'com.cometchat:pro-android-chat-sdk:3.0.16'
     implementation 'com.cometchat:pro-android-calls-sdk:2.2.0'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0'
 }

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/users/user_list/CometChatUserList.java

@@ -312,7 +312,7 @@ public void onError(CometChatException e) {
      * @see UsersRequest
      */
     private void searchUser(String s) {
-        UsersRequest usersRequest = new UsersRequest.UsersRequestBuilder().setSearchKeyword(s).setLimit(100).build();
+        UsersRequest usersRequest = new UsersRequest.UsersRequestBuilder().friendsOnly(UIKitSettings.getUsersMode()==UserMode.FRIENDS).setSearchKeyword(s).setLimit(100).build();
         usersRequest.fetchNext(new CometChat.CallbackListener<List<User>>() {
             @Override
             public void onSuccess(List<User> users) {

uikit/src/main/java/com/cometchat/pro/uikit/ui_resources/utils/Utils.java

@@ -674,7 +674,7 @@ public static String getOutputMediaFile(Context context) {
 //            String var1 = Environment.getExternalStorageDirectory() + "/" + context.getResources().getString(R.string.app_name) + "/"
 //                    + "audio/";
         createDirectory(dir);
-        return dir + (new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date()) + ".mp3";
+        return dir + (new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date()) + ".m4a";
 
     }