diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..7e36594
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..681f41a
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/shrikanthravi.xml b/.idea/dictionaries/shrikanthravi.xml
deleted file mode 100644
index 96755bd..0000000
--- a/.idea/dictionaries/shrikanthravi.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="shrikanthravi" />
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 102c7ac..a9654ae 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..eb2873e
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3aa0ad5..37a7509 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,67 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Android</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Android</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bd762c3..71e6205 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ChatViewLibrary.iml" filepath="$PROJECT_DIR$/ChatViewLibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/chatview/chatview.iml" filepath="$PROJECT_DIR$/chatview/chatview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ChatView.iml" filepath="$PROJECT_DIR$/.idea/modules/ChatView.iml" group="ChatView" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app.iml" group="ChatView/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/chatview/chatview.iml" filepath="$PROJECT_DIR$/.idea/modules/chatview/chatview.iml" group="ChatView/chatview" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3a74b71..b953e88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.shrikanthravi.chatviewlibrary"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -20,26 +20,25 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
-    compile 'com.github.zagum:Android-ExpandIcon:1.2.1'
-    compile 'com.balysv:material-ripple:1.0.2'
-    compile 'com.github.SilenceDut:ExpandableLayout:1.2.0'
-    compile 'jp.wasabeef:recyclerview-animators:2.3.0'
-    compile 'com.zhihu.android:matisse:0.4.3'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    compile 'de.hdodenhof:circleimageview:2.2.0'
-    compile 'com.github.lopei:collageview:0.1.3'
-    compile 'com.wang.avi:library:2.1.3'
-    compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.14'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.13'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.github.zagum:Android-ExpandIcon:1.3.0'
+    implementation 'com.balysv:material-ripple:1.0.2'
+    implementation 'com.github.SilenceDut:ExpandableLayout:1.3.0'
+    implementation 'jp.wasabeef:recyclerview-animators:2.3.0'
+    implementation 'com.zhihu.android:matisse:0.4.3'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
+    implementation 'com.github.lopei:collageview:0.1.3'
+    implementation 'com.wang.avi:library:2.1.3'
+    implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.14'
+    implementation "org.permissionsdispatcher:permissionsdispatcher:4.7.0"
+    annotationProcessor "org.permissionsdispatcher:permissionsdispatcher-processor:4.7.0"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(':chatview')
 }
diff --git a/app/src/androidTest/java/com/shrikanthravi/chatviewlibrary/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/shrikanthravi/chatviewlibrary/ExampleInstrumentedTest.java
index 93b0a25..c0a2f2c 100644
--- a/app/src/androidTest/java/com/shrikanthravi/chatviewlibrary/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/shrikanthravi/chatviewlibrary/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.shrikanthravi.chatviewlibrary;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fb52209..3d25fdd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.shrikanthravi.chatviewlibrary">
-    <uses-feature android:name="android.hardware.camera" android:required="false"></uses-feature>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -18,6 +22,7 @@
         <activity android:name=".ChatViewTestActivity"
             android:hardwareAccelerated="true"
             android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateHidden"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -26,7 +31,7 @@
             </intent-filter>
         </activity>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/com/shrikanthravi/chatviewlibrary/ChatViewTestActivity.java b/app/src/main/java/com/shrikanthravi/chatviewlibrary/ChatViewTestActivity.java
index 4b5c7f8..96e872f 100644
--- a/app/src/main/java/com/shrikanthravi/chatviewlibrary/ChatViewTestActivity.java
+++ b/app/src/main/java/com/shrikanthravi/chatviewlibrary/ChatViewTestActivity.java
@@ -1,51 +1,58 @@
 package com.shrikanthravi.chatviewlibrary;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.ContentUris;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.database.Cursor;
-import android.graphics.Bitmap;
 import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
+import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.FileProvider;
+
 import com.balysv.materialripple.MaterialRippleLayout;
 import com.github.zagum.expandicon.ExpandIconView;
-import com.shrikanthravi.chatview.widget.ChatView;
 import com.shrikanthravi.chatview.data.Message;
+import com.shrikanthravi.chatview.widget.ChatView;
 import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
 import com.zhihu.matisse.engine.impl.PicassoEngine;
-import com.zhihu.matisse.filter.Filter;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import permissions.dispatcher.NeedsPermission;
+import permissions.dispatcher.RuntimePermissions;
+
+@RuntimePermissions
 public class ChatViewTestActivity extends AppCompatActivity {
 
 
     HorizontalScrollView moreHSV;
     ExpandIconView expandIconView;
     MaterialRippleLayout galleryMRL;
-    public static int imagePickerRequestCode=10;
-    public static int SELECT_VIDEO=11;
-    public static int CAMERA_REQUEST=12;
-    public static int SELECT_AUDIO=13;
+    public static int imagePickerRequestCode = 10;
+    public static int SELECT_VIDEO = 11;
+    public static int CAMERA_REQUEST = 12;
+    public static int SELECT_AUDIO = 13;
     ChatView chatView;
     ImageView sendIcon;
     EditText messageET;
-    boolean switchbool=true;
+    boolean switchbool = true;
     boolean more = false;
     List<Uri> mSelected;
 
@@ -63,17 +70,15 @@ protected void onCreate(Bundle savedInstanceState) {
         //Initialization start
         moreHSV = findViewById(R.id.moreLL1);
         expandIconView = findViewById(R.id.expandIconView1);
-        expandIconView.setState(1,false);
+        expandIconView.setState(1, false);
         galleryMRL = findViewById(R.id.galleryMRL1);
-        mSelected  = new ArrayList<>();
-
-
+        mSelected = new ArrayList<>();
 
         //Send button click listerer
         chatView.setOnClickSendButtonListener(new ChatView.OnClickSendButtonListener() {
             @Override
             public void onSendButtonClick(String body) {
-                if(switchbool) {
+                if (switchbool) {
                     Message message = new Message();
                     message.setBody(body);
                     message.setMessageType(Message.MessageType.RightSimpleImage);
@@ -82,9 +87,8 @@ public void onSendButtonClick(String body) {
                     message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/groot"));
                     chatView.addMessage(message);
 
-                    switchbool=false;
-                }
-                else{
+                    switchbool = false;
+                } else {
                     Message message1 = new Message();
                     message1.setBody(body);
                     message1.setMessageType(Message.MessageType.LeftSimpleMessage);
@@ -93,7 +97,7 @@ public void onSendButtonClick(String body) {
                     message1.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/hodor"));
                     chatView.addMessage(message1);
 
-                    switchbool=true;
+                    switchbool = true;
                 }
             }
         });
@@ -102,14 +106,7 @@ public void onSendButtonClick(String body) {
         chatView.setOnClickGalleryButtonListener(new ChatView.OnClickGalleryButtonListener() {
             @Override
             public void onGalleryButtonClick() {
-                Matisse.from(ChatViewTestActivity.this)
-                        .choose(MimeType.allOf())
-                        .countable(true)
-                        .maxSelectable(9)
-                        .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
-                        .thumbnailScale(0.85f)
-                        .imageEngine(new PicassoEngine())
-                        .forResult(imagePickerRequestCode);
+                ChatViewTestActivityPermissionsDispatcher.pickImageFilesWithPermissionCheck(ChatViewTestActivity.this);
             }
         });
 
@@ -117,9 +114,7 @@ public void onGalleryButtonClick() {
         chatView.setOnClickVideoButtonListener(new ChatView.OnClickVideoButtonListener() {
             @Override
             public void onVideoButtonClick() {
-                Intent i = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Video.Media.EXTERNAL_CONTENT_URI);
-                i.setType("video/*");
-                startActivityForResult(i, SELECT_VIDEO);
+                ChatViewTestActivityPermissionsDispatcher.pickVideoFileWithPermissionCheck(ChatViewTestActivity.this);
             }
         });
 
@@ -127,14 +122,7 @@ public void onVideoButtonClick() {
         chatView.setOnClickCameraButtonListener(new ChatView.OnClickCameraButtonListener() {
             @Override
             public void onCameraButtonClicked() {
-                Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
-                File file = new File(Environment.getExternalStorageDirectory(), "MyPhoto.jpg");
-                file.delete();
-                File file1 = new File(Environment.getExternalStorageDirectory(), "MyPhoto.jpg");
-
-                Uri uri = FileProvider.getUriForFile(ChatViewTestActivity.this, getApplicationContext().getPackageName() + ".provider", file1);
-                cameraIntent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, uri);
-                startActivityForResult(cameraIntent, CAMERA_REQUEST);
+                ChatViewTestActivityPermissionsDispatcher.captureImageWithPermissionCheck(ChatViewTestActivity.this);
             }
         });
 
@@ -142,19 +130,53 @@ public void onCameraButtonClicked() {
         chatView.setOnClickAudioButtonListener(new ChatView.OnClickAudioButtonListener() {
             @Override
             public void onAudioButtonClicked() {
-                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
-                i.setType("audio/*");
-                //String[] mimetypes = {"audio/3gp", "audio/AMR", "audio/mp3"};
-                //i.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
-                startActivityForResult(i, SELECT_AUDIO);
+                ChatViewTestActivityPermissionsDispatcher.pickAudioFileWithPermissionCheck(ChatViewTestActivity.this);
             }
         });
 
 
     }
 
+    @NeedsPermission({Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA})
+    void captureImage() {
+        Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        File file = new File(Environment.getExternalStorageDirectory(), "MyPhoto.jpg");
+        file.delete();
+        File file1 = new File(Environment.getExternalStorageDirectory(), "MyPhoto.jpg");
 
-    public String getTime(){
+        Uri uri = FileProvider.getUriForFile(ChatViewTestActivity.this, getApplicationContext().getPackageName() + ".provider", file1);
+        cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+        startActivityForResult(cameraIntent, CAMERA_REQUEST);
+    }
+
+    @NeedsPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+    void pickVideoFile() {
+        Intent i = new Intent(Intent.ACTION_PICK, MediaStore.Video.Media.EXTERNAL_CONTENT_URI);
+        i.setType("video/*");
+        startActivityForResult(i, SELECT_VIDEO);
+    }
+
+    @NeedsPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+    void pickImageFiles() {
+        Matisse.from(ChatViewTestActivity.this)
+                .choose(MimeType.allOf())
+                .countable(true)
+                .maxSelectable(9)
+                .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
+                .thumbnailScale(0.85f)
+                .imageEngine(new PicassoEngine())
+                .forResult(imagePickerRequestCode);
+    }
+
+    @NeedsPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+    void pickAudioFile() {
+        Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+        i.setType("audio/*");
+        startActivityForResult(i, SELECT_AUDIO);
+    }
+
+
+    public String getTime() {
         java.util.Calendar calendar = java.util.Calendar.getInstance();
         SimpleDateFormat mdformat = new SimpleDateFormat("dd MMM yyyy HH:mm");
         String time = mdformat.format(calendar.getTime());
@@ -162,35 +184,38 @@ public String getTime(){
     }
 
 
-
     public static String getRandomText() {
         Random generator = new Random();
         StringBuilder randomStringBuilder = new StringBuilder();
         int randomLength = generator.nextInt(30);
         char tempChar;
-        for (int i = 0; i < randomLength; i++){
+        for (int i = 0; i < randomLength; i++) {
             tempChar = (char) (generator.nextInt(96) + 32);
             randomStringBuilder.append(tempChar);
         }
         return randomStringBuilder.toString();
     }
 
-
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        // NOTE: delegate the permission handling to generated method
+        ChatViewTestActivityPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
+    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
 
-
-        switch (requestCode){
-            case 10:{
+        switch (requestCode) {
+            case 10: {
 
                 //Image Selection result
-                if(resultCode==RESULT_OK){
+                if (resultCode == RESULT_OK) {
                     mSelected = Matisse.obtainResult(data);
 
-                    if(switchbool) {
+                    if (switchbool) {
                         if (mSelected.size() == 1) {
                             Message message = new Message();
                             message.setBody(messageET.getText().toString().trim());
@@ -200,7 +225,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                             message.setImageList(mSelected);
                             message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/groot"));
                             chatView.addMessage(message);
-                            switchbool=false;
+                            switchbool = false;
                         } else {
 
                             Message message = new Message();
@@ -211,10 +236,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                             message.setImageList(mSelected);
                             message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/groot"));
                             chatView.addMessage(message);
-                            switchbool=false;
+                            switchbool = false;
                         }
-                    }
-                    else{
+                    } else {
 
                         if (mSelected.size() == 1) {
                             Message message = new Message();
@@ -225,7 +249,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                             message.setImageList(mSelected);
                             message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/hodor"));
                             chatView.addMessage(message);
-                            switchbool=true;
+                            switchbool = true;
                         } else {
 
                             Message message = new Message();
@@ -236,23 +260,23 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                             message.setImageList(mSelected);
                             message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/hodor"));
                             chatView.addMessage(message);
-                            switchbool=true;
+                            switchbool = true;
                         }
 
                     }
                 }
                 break;
             }
-            case 11:{
+            case 11: {
 
                 //Video Selection Result
-                if(resultCode == RESULT_OK) {
+                if (resultCode == RESULT_OK) {
                     if (switchbool) {
                         Message message = new Message();
                         message.setMessageType(Message.MessageType.RightVideo);
                         message.setTime(getTime());
                         message.setUserName("Groot");
-                        message.setVideoUri(Uri.parse(getPathVideo(data.getData())));
+                        message.setVideoUri(Uri.parse(getVideoPath(ChatViewTestActivity.this, data.getData())));
                         message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/groot"));
                         chatView.addMessage(message);
                         switchbool = false;
@@ -262,7 +286,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                         message.setMessageType(Message.MessageType.LeftVideo);
                         message.setTime(getTime());
                         message.setUserName("Hodor");
-                        message.setVideoUri(Uri.parse(getPathVideo(data.getData())));
+                        message.setVideoUri(Uri.parse(getVideoPath(ChatViewTestActivity.this, data.getData())));
                         message.setUserIcon(Uri.parse("android.resource://com.shrikanthravi.chatviewlibrary/drawable/hodor"));
                         chatView.addMessage(message);
                         switchbool = true;
@@ -270,7 +294,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 }
                 break;
             }
-            case 12:{
+            case 12: {
 
                 //Image Capture result
 
@@ -310,8 +334,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 }
                 break;
             }
-            case 13:{
-                if(resultCode == RESULT_OK){
+            case 13: {
+                if (resultCode == RESULT_OK) {
                     if (switchbool) {
                         Message message = new Message();
                         message.setMessageType(Message.MessageType.RightAudio);
@@ -340,36 +364,102 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
 
+    //region get media path
+
+    @SuppressLint("NewApi")
+    public static String getVideoPath(Context context, Uri uri){
+        String selection = null;
+        String[] selectionArgs = null;
+        // Uri is different in versions after KITKAT (Android 4.4), we need to
+        if (Build.VERSION.SDK_INT >= 19 && DocumentsContract.isDocumentUri(context.getApplicationContext(), uri)) {
+            if (isExternalStorageDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                return Environment.getExternalStorageDirectory() + "/" + split[1];
+            } else if (isDownloadsDocument(uri)) {
+                final String id = DocumentsContract.getDocumentId(uri);
+                uri = ContentUris.withAppendedId(
+                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+            } else if (isMediaDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+                if ("image".equals(type)) {
+                    uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                } else if ("video".equals(type)) {
+                    uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                } else if ("audio".equals(type)) {
+                    uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                }
+                selection = "_id=?";
+                selectionArgs = new String[]{
+                        split[1]
+                };
+            }
+        }
+        if ("content".equalsIgnoreCase(uri.getScheme())) {
 
 
+            if (isGooglePhotosUri(uri)) {
+                return uri.getLastPathSegment();
+            }
 
+            String[] projection = {
+                    MediaStore.Images.Media.DATA
+            };
+            Cursor cursor = null;
+            try {
+                cursor = context.getContentResolver()
+                        .query(uri, projection, selection, selectionArgs, null);
+                int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                if (cursor.moveToFirst()) {
+                    return cursor.getString(column_index);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if ("file".equalsIgnoreCase(uri.getScheme())) {
+            return uri.getPath();
+        }
+        return null;
+    }
+
+    public static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
 
+    public static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
 
-    public String getPathVideo(Uri uri) {
-        System.out.println("getpath "+uri.toString());
-        String[] projection = { MediaStore.Video.Media.DATA };
-        Cursor cursor = managedQuery(uri, projection, null, null, null);
-        if(cursor!=null) {
-            int column_index = cursor.getColumnIndexOrThrow(MediaStore.Video.Media.DATA);
-            cursor.moveToFirst();
-            return cursor.getString(column_index);
-        }
-        else return null;
+    public static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
     }
 
+    public static boolean isGooglePhotosUri(Uri uri) {
+        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+    }
+
+    //endregion
+
     public String getPathAudio(Uri uri) {
-        System.out.println("getpath "+uri.toString());
-        String[] projection = { MediaStore.Audio.Media.DATA };
-        Cursor cursor = getContentResolver().query(uri, projection, null, null, null);
-
-        int columnIndex = cursor.getColumnIndex(projection[0]);
-        cursor.moveToFirst();
-        if(cursor!=null) {
-            return cursor.getString(columnIndex);
+        System.out.println("getpath " + uri.toString());
+        String filePath = "";
+        String fileId = DocumentsContract.getDocumentId(uri);
+        // Split at colon, use second item in the array
+        String id = fileId.split(":")[1];
+        String[] column = {MediaStore.Audio.Media.DATA};
+        String selector = MediaStore.Audio.Media._ID + "=?";
+        Cursor cursor = getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                column, selector, new String[]{id}, null);
+        int columnIndex = cursor.getColumnIndex(column[0]);
+        if (cursor.moveToFirst()) {
+            filePath = cursor.getString(columnIndex);
         }
-        else return null;
-    }
+        cursor.close();
+        return filePath;
 
+    }
 
 
 }
diff --git a/app/src/main/java/com/shrikanthravi/chatviewlibrary/EndlessRecyclerOnScrollListener.java b/app/src/main/java/com/shrikanthravi/chatviewlibrary/EndlessRecyclerOnScrollListener.java
index 64e42b8..3c4c228 100644
--- a/app/src/main/java/com/shrikanthravi/chatviewlibrary/EndlessRecyclerOnScrollListener.java
+++ b/app/src/main/java/com/shrikanthravi/chatviewlibrary/EndlessRecyclerOnScrollListener.java
@@ -5,8 +5,8 @@
  */
 
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 public abstract class EndlessRecyclerOnScrollListener extends RecyclerView.OnScrollListener {
 //    public static String TAG = EndlessRecyclerOnScrollListener.class.getSimpleName();
diff --git a/app/src/main/java/com/shrikanthravi/chatviewlibrary/ImageFFActivity.java b/app/src/main/java/com/shrikanthravi/chatviewlibrary/ImageFFActivity.java
index 788fdbe..483cdd1 100644
--- a/app/src/main/java/com/shrikanthravi/chatviewlibrary/ImageFFActivity.java
+++ b/app/src/main/java/com/shrikanthravi/chatviewlibrary/ImageFFActivity.java
@@ -1,16 +1,13 @@
 package com.shrikanthravi.chatviewlibrary;
 
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.transition.Explode;
 import android.transition.TransitionInflater;
 import android.view.View;
 import android.view.ViewTreeObserver;
-import android.view.Window;
 
 import com.github.chrisbanes.photoview.PhotoView;
-import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
 public class ImageFFActivity extends AppCompatActivity {
diff --git a/app/src/main/java/com/shrikanthravi/chatviewlibrary/ProfileActivity.java b/app/src/main/java/com/shrikanthravi/chatviewlibrary/ProfileActivity.java
index 2c5d2e5..3152a8c 100644
--- a/app/src/main/java/com/shrikanthravi/chatviewlibrary/ProfileActivity.java
+++ b/app/src/main/java/com/shrikanthravi/chatviewlibrary/ProfileActivity.java
@@ -2,9 +2,8 @@
 
 
 import android.graphics.Typeface;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.transition.TransitionInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
diff --git a/app/src/main/res/layout/activity_chat_view_test.xml b/app/src/main/res/layout/activity_chat_view_test.xml
index 3b47d6a..8173859 100644
--- a/app/src/main/res/layout/activity_chat_view_test.xml
+++ b/app/src/main/res/layout/activity_chat_view_test.xml
@@ -28,7 +28,7 @@
         android:background="@drawable/gradient1"
         android:layout_alignParentBottom="true">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -174,7 +174,7 @@
                 </LinearLayout>
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/chat_row_item.xml b/app/src/main/res/layout/chat_row_item.xml
index a7d7c93..0157524 100644
--- a/app/src/main/res/layout/chat_row_item.xml
+++ b/app/src/main/res/layout/chat_row_item.xml
@@ -23,7 +23,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -34,7 +34,7 @@
                     android:layout_width="25dp"
                     android:layout_height="25dp"
                     android:src="@drawable/man2"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
                     android:background="@drawable/left_tv_bg"/>
             </LinearLayout>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:cardElevation="4dp"
@@ -72,7 +72,7 @@
                     android:visibility="gone"
                     android:padding="8dp" />
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </RelativeLayout>
         <TextView
             android:layout_width="wrap_content"
@@ -123,7 +123,7 @@
                         android:paddingTop="5dp"
                         android:paddingBottom="5dp"
                         android:background="@drawable/right_tv_bg"/>
-                    <android.support.v7.widget.CardView
+                    <androidx.cardview.widget.CardView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         app:cardElevation="4dp"
@@ -144,7 +144,7 @@
                             android:layout_height="wrap_content"
                             android:visibility="gone"
                             android:padding="8dp" />
-                    </android.support.v7.widget.CardView>
+                    </androidx.cardview.widget.CardView>
 
                 </RelativeLayout>
                     <ImageView
diff --git a/build.gradle b/build.gradle
index d3530ae..f8fadc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/chatview/build.gradle b/chatview/build.gradle
index 5c707b4..9d05300 100644
--- a/chatview/build.gradle
+++ b/chatview/build.gradle
@@ -3,17 +3,17 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.shrikanth7698'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 29
 
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -30,25 +30,23 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
 
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
-    compile 'com.github.zagum:Android-ExpandIcon:1.2.1'
-    compile 'com.balysv:material-ripple:1.0.2'
-    compile 'com.github.SilenceDut:ExpandableLayout:1.2.0'
-    compile 'jp.wasabeef:recyclerview-animators:2.3.0'
-    compile 'com.zhihu.android:matisse:0.4.3'
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.github.zagum:Android-ExpandIcon:1.3.0'
+    implementation 'com.balysv:material-ripple:1.0.2'
+    implementation 'com.github.SilenceDut:ExpandableLayout:1.3.0'
+    implementation 'jp.wasabeef:recyclerview-animators:2.3.0'
+    implementation 'com.zhihu.android:matisse:0.4.3'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    compile 'de.hdodenhof:circleimageview:2.2.0'
-    compile 'com.github.lopei:collageview:0.1.3'
-    compile 'com.wang.avi:library:2.1.3'
-    compile 'com.github.marcinmoskala:ArcSeekBar:0.31'
-    compile 'com.github.ohoussein.playpauseview:playpauseview:1.0.2'
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
+    implementation 'com.github.lopei:collageview:0.1.3'
+    implementation 'com.wang.avi:library:2.1.3'
+    implementation 'com.github.marcinmoskala:ArcSeekBar:0.31'
+    implementation 'com.github.ohoussein.playpauseview:playpauseview:1.0.2'
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/chatview/src/androidTest/java/com/shrikanthravi/chatview/ExampleInstrumentedTest.java b/chatview/src/androidTest/java/com/shrikanthravi/chatview/ExampleInstrumentedTest.java
index 928051e..8ad435b 100644
--- a/chatview/src/androidTest/java/com/shrikanthravi/chatview/ExampleInstrumentedTest.java
+++ b/chatview/src/androidTest/java/com/shrikanthravi/chatview/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.shrikanthravi.chatview;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/chatview/src/main/java/com/shrikanthravi/chatview/activities/ImageFFActivity.java b/chatview/src/main/java/com/shrikanthravi/chatview/activities/ImageFFActivity.java
index ac0a0c7..5ad6d31 100644
--- a/chatview/src/main/java/com/shrikanthravi/chatview/activities/ImageFFActivity.java
+++ b/chatview/src/main/java/com/shrikanthravi/chatview/activities/ImageFFActivity.java
@@ -1,6 +1,6 @@
 package com.shrikanthravi.chatview.activities;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.transition.TransitionInflater;
 import android.view.View;
diff --git a/chatview/src/main/java/com/shrikanthravi/chatview/activities/VideoFFActivity.java b/chatview/src/main/java/com/shrikanthravi/chatview/activities/VideoFFActivity.java
index 73982d6..af4c42e 100644
--- a/chatview/src/main/java/com/shrikanthravi/chatview/activities/VideoFFActivity.java
+++ b/chatview/src/main/java/com/shrikanthravi/chatview/activities/VideoFFActivity.java
@@ -1,13 +1,12 @@
 package com.shrikanthravi.chatview.activities;
 
 import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.graphics.Matrix;
 import android.graphics.SurfaceTexture;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Surface;
diff --git a/chatview/src/main/java/com/shrikanthravi/chatview/data/MessageAdapter.java b/chatview/src/main/java/com/shrikanthravi/chatview/data/MessageAdapter.java
index 689c490..ef5396e 100644
--- a/chatview/src/main/java/com/shrikanthravi/chatview/data/MessageAdapter.java
+++ b/chatview/src/main/java/com/shrikanthravi/chatview/data/MessageAdapter.java
@@ -4,64 +4,49 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
-import android.graphics.SurfaceTexture;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.provider.MediaStore;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
 import android.view.LayoutInflater;
-import android.view.Surface;
-import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import android.widget.VideoView;
 
-import com.balysv.materialripple.MaterialRippleLayout;
+import androidx.cardview.widget.CardView;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.lopei.collageview.CollageView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import com.nostra13.universalimageloader.utils.DiskCacheUtils;
-import com.nostra13.universalimageloader.utils.L;
 import com.ohoussein.playpause.PlayPauseView;
 import com.shrikanthravi.chatview.R;
 import com.shrikanthravi.chatview.activities.ImageFFActivity;
 import com.shrikanthravi.chatview.activities.VideoFFActivity;
 import com.shrikanthravi.chatview.utils.FontChanger;
-
 import com.silencedut.expandablelayout.ExpandableLayout;
 import com.squareup.picasso.Picasso;
 
 import java.io.File;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Handler;
-
 
 import static android.content.ContentValues.TAG;
 
@@ -94,7 +79,7 @@ public class MessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     private int rightBubbleTextColor = android.R.color.white;
     private int timeTextColor = android.R.color.tab_indicator_text;
     private int senderNameTextColor = android.R.color.tab_indicator_text;
-    private float textSize = 20;
+    private float textSize = 14;
 
     public MessageAdapter(List<Message> verticalList, Context context,RecyclerView recyclerView) {
 
diff --git a/chatview/src/main/java/com/shrikanthravi/chatview/widget/ChatView.java b/chatview/src/main/java/com/shrikanthravi/chatview/widget/ChatView.java
index 5135c1e..d5e3020 100644
--- a/chatview/src/main/java/com/shrikanthravi/chatview/widget/ChatView.java
+++ b/chatview/src/main/java/com/shrikanthravi/chatview/widget/ChatView.java
@@ -2,13 +2,11 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.graphics.Typeface;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -206,7 +204,7 @@ protected void setAttributes(TypedArray attrs){
         setTimeTextColor(attrs.getColor(R.styleable.ChatView_timeTextColor,mContext.getResources().getColor(timeTextColor)));
         setSenderNameTextColor(attrs.getColor(R.styleable.ChatView_senderNameTextColor,getResources().getColor(senderNameTextColor)));
         showSenderName(attrs.getBoolean(R.styleable.ChatView_showSenderName,showSenderName));
-        setTextSize(attrs.getDimension(R.styleable.ChatView_textSize,20));
+        setTextSize(attrs.getDimension(R.styleable.ChatView_textSize,14));
         setChatViewBackgroundColor(attrs.getColor(R.styleable.ChatView_chatViewBackgroundColor,getResources().getColor(chatViewBackgroundColor)));
 
 
diff --git a/chatview/src/main/res/layout/left_audio_layout.xml b/chatview/src/main/res/layout/left_audio_layout.xml
index 7a43521..8d36159 100644
--- a/chatview/src/main/res/layout/left_audio_layout.xml
+++ b/chatview/src/main/res/layout/left_audio_layout.xml
@@ -35,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -50,7 +50,7 @@
                         android:id="@+id/leftBubbleIconIV"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/chatview/src/main/res/layout/left_image_layout.xml b/chatview/src/main/res/layout/left_image_layout.xml
index cf798c2..ac9ec13 100644
--- a/chatview/src/main/res/layout/left_image_layout.xml
+++ b/chatview/src/main/res/layout/left_image_layout.xml
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -51,8 +51,8 @@
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
 
-                </android.support.v7.widget.CardView>
-                <android.support.v7.widget.CardView
+                </androidx.cardview.widget.CardView>
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardElevation="4dp"
@@ -68,7 +68,7 @@
                         android:background="@drawable/left_iv_bg"
                         />
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </LinearLayout>
 
diff --git a/chatview/src/main/res/layout/left_images_layout.xml b/chatview/src/main/res/layout/left_images_layout.xml
index 101f0d6..4f9a4eb 100644
--- a/chatview/src/main/res/layout/left_images_layout.xml
+++ b/chatview/src/main/res/layout/left_images_layout.xml
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -50,8 +50,8 @@
                         android:layout_height="25dp"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
-                <android.support.v7.widget.CardView
+                </androidx.cardview.widget.CardView>
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardElevation="4dp"
@@ -65,7 +65,7 @@
                         android:visibility="visible"
                         android:padding="8dp" />
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </LinearLayout>
 
diff --git a/chatview/src/main/res/layout/left_text_layout.xml b/chatview/src/main/res/layout/left_text_layout.xml
index 307e2c3..524f36d 100644
--- a/chatview/src/main/res/layout/left_text_layout.xml
+++ b/chatview/src/main/res/layout/left_text_layout.xml
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -50,7 +50,7 @@
                         android:id="@+id/leftBubbleIconIV"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/chatview/src/main/res/layout/left_typing_layout.xml b/chatview/src/main/res/layout/left_typing_layout.xml
index acb8d75..3a70786 100644
--- a/chatview/src/main/res/layout/left_typing_layout.xml
+++ b/chatview/src/main/res/layout/left_typing_layout.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
         android:orientation="horizontal">
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:cardCornerRadius="12.5dp"
@@ -24,7 +24,7 @@
                 android:id="@+id/leftBubbleIconIV"
                 android:scaleType="centerCrop"
                 android:src="@drawable/profile_icon"/>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
         <com.wang.avi.AVLoadingIndicatorView
             android:layout_width="30dp"
             android:layout_height="30dp"
diff --git a/chatview/src/main/res/layout/left_video_layout.xml b/chatview/src/main/res/layout/left_video_layout.xml
index 9169a9b..ced5f01 100644
--- a/chatview/src/main/res/layout/left_video_layout.xml
+++ b/chatview/src/main/res/layout/left_video_layout.xml
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -51,8 +51,8 @@
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
 
-                </android.support.v7.widget.CardView>
-                <android.support.v7.widget.CardView
+                </androidx.cardview.widget.CardView>
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardElevation="4dp"
@@ -65,7 +65,7 @@
                         android:orientation="horizontal"
                         android:minHeight="200dp"
                         android:id="@+id/videoLL"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </LinearLayout>
 
diff --git a/chatview/src/main/res/layout/right_audio_layout.xml b/chatview/src/main/res/layout/right_audio_layout.xml
index 6d8bfd8..da1008d 100644
--- a/chatview/src/main/res/layout/right_audio_layout.xml
+++ b/chatview/src/main/res/layout/right_audio_layout.xml
@@ -75,7 +75,7 @@
                     android:scaleType="centerCrop"
                     android:src="@drawable/profile_icon"/>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -90,7 +90,7 @@
                         android:id="@+id/rightBubbleIconIV"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/chatview/src/main/res/layout/right_image_layout.xml b/chatview/src/main/res/layout/right_image_layout.xml
index f06c5f9..09cc698 100644
--- a/chatview/src/main/res/layout/right_image_layout.xml
+++ b/chatview/src/main/res/layout/right_image_layout.xml
@@ -39,7 +39,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
-                    <android.support.v7.widget.CardView
+                    <androidx.cardview.widget.CardView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         app:cardElevation="4dp"
@@ -54,10 +54,10 @@
                             android:visibility="visible"
                             android:background="@drawable/right_iv_bg"
                             />
-                    </android.support.v7.widget.CardView>
+                    </androidx.cardview.widget.CardView>
 
                 </RelativeLayout>
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -72,7 +72,7 @@
                         android:id="@+id/rightBubbleIconIV"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/chatview/src/main/res/layout/right_images_layout.xml b/chatview/src/main/res/layout/right_images_layout.xml
index 53f563c..2f2461d 100644
--- a/chatview/src/main/res/layout/right_images_layout.xml
+++ b/chatview/src/main/res/layout/right_images_layout.xml
@@ -40,7 +40,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
-                    <android.support.v7.widget.CardView
+                    <androidx.cardview.widget.CardView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         app:cardElevation="4dp"
@@ -53,10 +53,10 @@
                             android:layout_height="wrap_content"
                             android:visibility="visible"
                             android:padding="8dp" />
-                    </android.support.v7.widget.CardView>
+                    </androidx.cardview.widget.CardView>
 
                 </RelativeLayout>
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -71,7 +71,7 @@
                         android:scaleType="centerCrop"
                         android:id="@+id/rightBubbleIconIV"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/chatview/src/main/res/layout/right_text_layout.xml b/chatview/src/main/res/layout/right_text_layout.xml
index ad2e4b8..431c606 100644
--- a/chatview/src/main/res/layout/right_text_layout.xml
+++ b/chatview/src/main/res/layout/right_text_layout.xml
@@ -54,7 +54,7 @@
                         android:background="@drawable/right_tv_bg"/>
 
                 </RelativeLayout>
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -69,7 +69,7 @@
                         android:id="@+id/rightBubbleIconIV"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/chatview/src/main/res/layout/right_video_layout.xml b/chatview/src/main/res/layout/right_video_layout.xml
index efc21d9..75b0db8 100644
--- a/chatview/src/main/res/layout/right_video_layout.xml
+++ b/chatview/src/main/res/layout/right_video_layout.xml
@@ -39,7 +39,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
-                    <android.support.v7.widget.CardView
+                    <androidx.cardview.widget.CardView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         app:cardElevation="4dp"
@@ -52,10 +52,10 @@
                             android:orientation="horizontal"
                             android:minHeight="200dp"
                             android:id="@+id/videoLL"/>
-                    </android.support.v7.widget.CardView>
+                    </androidx.cardview.widget.CardView>
 
                 </RelativeLayout>
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="12.5dp"
@@ -70,7 +70,7 @@
                         android:id="@+id/rightBubbleIconIV"
                         android:scaleType="centerCrop"
                         android:src="@drawable/profile_icon"/>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/chatview/src/main/res/layout/widget_chatview.xml b/chatview/src/main/res/layout/widget_chatview.xml
index 07c0c83..60a1ebd 100644
--- a/chatview/src/main/res/layout/widget_chatview.xml
+++ b/chatview/src/main/res/layout/widget_chatview.xml
@@ -5,13 +5,13 @@
     android:id="@+id/rootRL"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@id/sendLL"
             android:id="@+id/chatRV">
 
-        </android.support.v7.widget.RecyclerView>
+        </androidx.recyclerview.widget.RecyclerView>
 
 
     <LinearLayout
@@ -21,7 +21,7 @@
         android:background="@drawable/gradient1"
         android:layout_alignParentBottom="true">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -162,7 +162,8 @@
                             android:layout_width="40dp"
                             android:id="@+id/expandIconView"
                             android:layout_height="40dp"
-                            android:layout_gravity="center"/>
+                            android:layout_gravity="center"
+                            app:eiv_padding="12dp"/>
                     </com.balysv.materialripple.MaterialRippleLayout>
                     <EditText
                         android:layout_width="match_parent"
@@ -192,6 +193,7 @@
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:tint="@android:color/black"
+                            android:padding="5dp"
                             android:src="@drawable/mic_icon"/>
                     </com.balysv.materialripple.MaterialRippleLayout>
 
@@ -203,7 +205,6 @@
                         android:layout_marginLeft="4dp"
                         android:layout_marginTop="2dp"
                         android:layout_marginBottom="2dp"
-
                         android:layout_marginRight="4dp"
                         app:mrl_rippleRoundedCorners="30dp"
                         app:mrl_rippleOverlay="true">
@@ -211,6 +212,7 @@
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:src="@drawable/send_icon"
+                            android:padding="8dp"
                             android:tint="@color/colorAccent"
                             android:layout_gravity="center"/>
                     </com.balysv.materialripple.MaterialRippleLayout>
@@ -218,7 +220,7 @@
                 </LinearLayout>
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f8a3c01..58bf4ab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 12 16:42:22 IST 2018
+#Sat Jul 18 15:03:31 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip