diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9bc1db0..ee470e4 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
new file mode 100644
index 0000000..595be42
Binary files /dev/null and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..ae78c11 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,113 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <codeStyleSettings language="XML">
+      <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/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9fc1d18..606e30c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?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="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
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 c0f68ed..8357b4c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,31 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="imagepreview/src/main/res/layout/activity_image_preview.xml" value="0.27717391304347827" />
+        <entry key="imagepreview/src/main/res/layout/item_preview.xml" value="0.3770833333333333" />
+        <entry key="imagepreview/src/main/res/layout/provider_path.xml" value="0.39166666666666666" />
+        <entry key="imagepreview/src/main/res/menu/menu_save_share.xml" value="0.39166666666666666" />
+        <entry key="imagepreview/src/main/res/xml/file_provider_paths.xml" value="0.39166666666666666" />
+      </map>
+    </option>
+  </component>
   <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="5">
+        <list size="15">
           <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="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="15">
           <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" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 69c269e..8a1f4f5 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,10 @@
 ### Developed by
 [Himangi Patel](https://www.github.com/himangipatel)
 
+### Customized by
+[Softpal](https://www.github.com/softpal)
+
+[![](https://jitpack.io/v/softpal/ImagesPreview.svg)](https://jitpack.io/#softpal/ImagesPreview)
 
 **Features**
 
@@ -22,19 +26,20 @@ Add repository url and dependency in application module gradle file:
 	}
   
   	dependencies {
-	      compile 'com.github.himangipatel:ImagesPreview:0.0.5'
+	      implementation 'com.github.softpal:ImagesPreview:1.3'
 	}
 
 ## Usage
 **1. Start by creating an instance of FilePickUtils and LifeCycleCallBackManager.**
 
-```java
+```javascript
             final ArrayList<PreviewFile> previewFiles = new ArrayList<>();
-	     previewFiles.add(new PreviewFile(image path,image description));
+	        previewFiles.add(new PreviewFile(image path,image description));
 	     
             Intent intent = new Intent(AppointmentDetailActivity.this, ImagePreviewActivity.class);
             intent.putExtra(ImagePreviewActivity.IMAGE_LIST, previewFiles);
             intent.putExtra(ImagePreviewActivity.CURRENT_ITEM, position);
+            intent.putExtra(ImagePreviewActivity.SHOULD_CACHE, true);
             startActivity(intent);
  ```
  
diff --git a/app/build.gradle b/app/build.gradle
index aa3c59e..332d2ef 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.himangi.imagepreviewdemo"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        applicationId "com.softpal.imagepreviewdemo"
+        minSdkVersion 17
+        targetSdkVersion 29
+        versionCode 3
+        versionName "1.2"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -16,14 +16,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    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 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(':imagepreview')
+
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 }
diff --git a/app/src/androidTest/java/com/himangi/imagepreviewdemo/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/softpal/imagepreviewdemo/ExampleInstrumentedTest.java
similarity index 71%
rename from app/src/androidTest/java/com/himangi/imagepreviewdemo/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/softpal/imagepreviewdemo/ExampleInstrumentedTest.java
index 95484d3..5399540 100644
--- a/app/src/androidTest/java/com/himangi/imagepreviewdemo/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/softpal/imagepreviewdemo/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
-package com.himangi.imagepreviewdemo;
+package com.softpal.imagepreviewdemo;
 
 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;
@@ -21,6 +21,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.himangi.imagepreviewdemo", appContext.getPackageName());
+        assertEquals("com.softpal.imagepreviewdemo", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d5c158..0f02948 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.himangi.imagepreviewdemo">
+    package="com.softpal.imagepreviewdemo">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:usesCleartextTraffic="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.softpal.imagepreviewdemo.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/himangi/imagepreviewdemo/MainActivity.java b/app/src/main/java/com/himangi/imagepreviewdemo/MainActivity.java
deleted file mode 100644
index 2d26136..0000000
--- a/app/src/main/java/com/himangi/imagepreviewdemo/MainActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.himangi.imagepreviewdemo;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
-import com.himangi.imagepreview.ImagePreviewActivity;
-import com.himangi.imagepreview.PreviewFile;
-
-import java.util.ArrayList;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        ArrayList<PreviewFile> imageList = new ArrayList<>();
-        imageList.add(new PreviewFile("http://u01.appmifile.com/images/2016/10/21/c31c157f-97a2-479c-a2a3-74baf9790bb9.jpg", "Himangi Patel"));
-        imageList.add(new PreviewFile("https://nebula.wsimg.com/12e33523b6e7341bb7045fa321cdd463?AccessKeyId=63190F15169737A11884&disposition=0&alloworigin=1", ""));
-        imageList.add(new PreviewFile("http://avantgallery.com/wp-content/uploads/2016/02/Nick-Veasey-Selfie-23x29.5.jpg", ""));
-        imageList.add(new PreviewFile("https://cdn.pixabay.com/photo/2016/09/30/09/52/x-ray-1704855_960_720.jpg", "Main Activity"));
-        imageList.add(new PreviewFile("http://cdn.emgn.com/wp-content/uploads/2015/08/X-ray-Balarina.jpg", "Image Preview screen demo"));
-        imageList.add(new PreviewFile("https://cdn.pixabay.com/photo/2016/09/30/09/52/x-ray-1704855_960_720.jpg", ""));
-        Intent intent = new Intent(MainActivity.this,
-                ImagePreviewActivity.class);
-        intent.putExtra(ImagePreviewActivity.IMAGE_LIST,
-                imageList);
-        intent.putExtra(ImagePreviewActivity.CURRENT_ITEM, 3);
-        startActivity(intent);
-
-    }
-}
diff --git a/app/src/main/java/com/softpal/imagepreviewdemo/MainActivity.java b/app/src/main/java/com/softpal/imagepreviewdemo/MainActivity.java
new file mode 100644
index 0000000..6f007a4
--- /dev/null
+++ b/app/src/main/java/com/softpal/imagepreviewdemo/MainActivity.java
@@ -0,0 +1,76 @@
+package com.softpal.imagepreviewdemo;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.softpal.imagepreview.ImagePreviewActivity;
+import com.softpal.imagepreview.PreviewFile;
+
+import java.util.ArrayList;
+
+public class MainActivity extends AppCompatActivity
+{
+	private final int TED_GALLERY_IMAGE_PREVIEW = 1122;
+	private ImageView ivResult;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_main);
+		
+		ivResult = findViewById(R.id.iv_result_image);
+		
+		ArrayList<PreviewFile> imageList = new ArrayList<>();
+		imageList.add(new PreviewFile("http://u01.appmifile.com/images/2016/10/21/c31c157f-97a2-479c-a2a3-74baf9790bb9.jpg","Himangi Patel"));
+		imageList.add(new PreviewFile("https://nebula.wsimg.com/12e33523b6e7341bb7045fa321cdd463?AccessKeyId=63190F15169737A11884&disposition=0&alloworigin=1",""));
+		imageList.add(new PreviewFile("http://avantgallery.com/wp-content/uploads/2016/02/Nick-Veasey-Selfie-23x29.5.jpg",""));
+		imageList.add(new PreviewFile("https://cdn.pixabay.com/photo/2016/09/30/09/52/x-ray-1704855_960_720.jpg","Main Activity"));
+		imageList.add(new PreviewFile("https://cloudsek.com/wp-content/uploads/2020/07/Android-main.jpg","Image Preview screen demo"));
+		imageList.add(new PreviewFile("https://cdn.pixabay.com/photo/2016/09/30/09/52/x-ray-1704855_960_720.jpg",""));
+		Intent intent = new Intent(MainActivity.this,ImagePreviewActivity.class);
+		intent.putExtra(ImagePreviewActivity.IMAGE_LIST,imageList);
+		intent.putExtra(ImagePreviewActivity.CURRENT_ITEM,3);
+		intent.putExtra(ImagePreviewActivity.SHOULD_CACHE,true);
+		
+		// if you want to get uri of selected image file you should pass **IS_ACCEPT_CANCEL_AVAILABLE / isAcceptCancelAvailable** true
+		boolean isAcceptCancelAvailable = true;
+		
+		if(isAcceptCancelAvailable)
+		{
+			intent.putExtra(ImagePreviewActivity.IS_ACCEPT_CANCEL_AVAILABLE,isAcceptCancelAvailable);
+			startActivityForResult(intent,TED_GALLERY_IMAGE_PREVIEW);
+		}
+		else
+		{
+			startActivity(intent);
+		}
+	}
+	
+	public void onActivityResult(int requestCode,int resultCode,Intent data)
+	{
+		super.onActivityResult(requestCode,resultCode,data);
+		
+		if(requestCode == TED_GALLERY_IMAGE_PREVIEW)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				boolean result = data.getBooleanExtra("imageOK",false);
+				if(result)
+				{
+					String uri = data.getStringExtra("imageUri");
+					
+					Uri ivUri = Uri.parse(uri);
+					
+					Glide.with(this)
+					     .load(ivUri)
+					     .into(ivResult);
+				}
+			}
+		}
+	}
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 84f1951..29bdb28 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,12 +7,22 @@
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/tv_main"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="50dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/iv_result_image"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_main"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/test/java/com/himangi/imagepreviewdemo/ExampleUnitTest.java b/app/src/test/java/com/softpal/imagepreviewdemo/ExampleUnitTest.java
similarity index 90%
rename from app/src/test/java/com/himangi/imagepreviewdemo/ExampleUnitTest.java
rename to app/src/test/java/com/softpal/imagepreviewdemo/ExampleUnitTest.java
index 7f0d59b..8a616cc 100644
--- a/app/src/test/java/com/himangi/imagepreviewdemo/ExampleUnitTest.java
+++ b/app/src/test/java/com/softpal/imagepreviewdemo/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.himangi.imagepreviewdemo;
+package com.softpal.imagepreviewdemo;
 
 import org.junit.Test;
 
diff --git a/build.gradle b/build.gradle
index eccff49..0b34e5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
-        
+        classpath 'com.android.tools.build:gradle:3.5.2'
+        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
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 743d692..8de5058 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # 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.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92ff23c..935fd57 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 20 11:44:40 IST 2018
+#Mon Nov 18 17:12:50 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/imagepreview/build.gradle b/imagepreview/build.gradle
index 1e028c3..902cbdc 100644
--- a/imagepreview/build.gradle
+++ b/imagepreview/build.gradle
@@ -1,18 +1,17 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+group='com.github.softpal'
+version='v1.4'
 
 android {
-    compileSdkVersion 27
-
-
-
+    compileSdkVersion 30
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 17
+        targetSdkVersion 29
+        versionCode 4
+        versionName "1.4"
 
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -27,13 +26,18 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     ////  //Glide
-    implementation 'com.github.bumptech.glide:glide:4.4.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
-    testImplementation 'junit:junit:4.12'
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+    testImplementation 'junit:junit:4.13.2'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    //Asking permission for Dangerous Permissions like WRITE_EXTERNAL_STORAGE
+    implementation 'gun0912.ted:tedpermission:2.2.1'
+
+    implementation 'com.squareup.picasso:picasso:2.71828'
 }
diff --git a/imagepreview/src/androidTest/java/com/himangi/imagepreview/ExampleInstrumentedTest.java b/imagepreview/src/androidTest/java/com/softpal/imagepreview/ExampleInstrumentedTest.java
similarity index 71%
rename from imagepreview/src/androidTest/java/com/himangi/imagepreview/ExampleInstrumentedTest.java
rename to imagepreview/src/androidTest/java/com/softpal/imagepreview/ExampleInstrumentedTest.java
index 4efd892..66a7008 100644
--- a/imagepreview/src/androidTest/java/com/himangi/imagepreview/ExampleInstrumentedTest.java
+++ b/imagepreview/src/androidTest/java/com/softpal/imagepreview/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
-package com.himangi.imagepreview;
+package com.softpal.imagepreview;
 
 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;
@@ -21,6 +21,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.himangi.imagepreview.test", appContext.getPackageName());
+        assertEquals("com.softpal.imagepreview.test", appContext.getPackageName());
     }
 }
diff --git a/imagepreview/src/main/AndroidManifest.xml b/imagepreview/src/main/AndroidManifest.xml
index eace187..dcf21f2 100644
--- a/imagepreview/src/main/AndroidManifest.xml
+++ b/imagepreview/src/main/AndroidManifest.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.himangi.imagepreview">
+    package="com.softpal.imagepreview">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <application>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <application
+        android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true"
+        >
         <activity
-            android:name=".ImagePreviewActivity"
+            android:name="com.softpal.imagepreview.ImagePreviewActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.softpal.imagepreview.myfileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/imagepreview/src/main/java/com/himangi/imagepreview/CheckPermission.java b/imagepreview/src/main/java/com/himangi/imagepreview/CheckPermission.java
deleted file mode 100644
index 739a78a..0000000
--- a/imagepreview/src/main/java/com/himangi/imagepreview/CheckPermission.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.himangi.imagepreview;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
-
-/**
- * Created by Himangi on 20/4/18
- */
-public class CheckPermission {
-
-    public static final int PERMISSION_STORAGE = 100;
-
-    public static boolean hasPermission(String permission, Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return ContextCompat.checkSelfPermission(context, permission)
-                    == PackageManager.PERMISSION_GRANTED;
-        }
-        return true;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    public static void requestPerm(String[] permissions, int requestCode, Activity activity) {
-        activity.requestPermissions(permissions, requestCode);
-    }
-}
diff --git a/imagepreview/src/main/java/com/himangi/imagepreview/ImagePreviewActivity.java b/imagepreview/src/main/java/com/himangi/imagepreview/ImagePreviewActivity.java
deleted file mode 100644
index cf60db8..0000000
--- a/imagepreview/src/main/java/com/himangi/imagepreview/ImagePreviewActivity.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.himangi.imagepreview;
-
-import android.Manifest;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.transition.Transition;
-
-import java.util.List;
-
-public class ImagePreviewActivity extends AppCompatActivity implements OnItemClickListener<PreviewFile> {
-
-
-    public static String IMAGE_LIST = "intent_image_item";
-    public static String CURRENT_ITEM = "current_item";
-
-    public Toolbar toolbar;
-    ViewPager vPager;
-    private List<PreviewFile> mUriList;
-    private Bitmap mBitmap;
-    private String view;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // requestWindowFeature(Window.FEATURE_NO_TITLE);
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_image_preview);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-        toolbar = findViewById(R.id.toolbar);
-        vPager = findViewById(R.id.vPager);
-        setSupportActionBar(toolbar);
-        toolbar.setTitle("");
-        toolbar.setSubtitle("");
-        getSupportActionBar().setDisplayShowTitleEnabled(false);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onBackPressed();
-            }
-        });
-        setUpViews();
-    }
-
-    private void setUpViews() {
-
-        mUriList = (List<PreviewFile>)
-                getIntent().getSerializableExtra(IMAGE_LIST);
-
-        SlideAdapter slideAdapter =
-                new SlideAdapter(this, mUriList, this);
-        vPager.setAdapter(slideAdapter);
-
-        vPager.setCurrentItem(getIntent().getIntExtra(CURRENT_ITEM, 0));
-
-        vPager.setPageTransformer(false, new ViewPager.PageTransformer() {
-            @Override
-            public void transformPage(@NonNull View page, float position) {
-                float normalizedPosition = Math.abs(Math.abs(position) - 1);
-                page.setScaleX(normalizedPosition / 2 + 0.5f);
-                page.setScaleY(normalizedPosition / 2 + 0.5f);
-            }
-        });
-    }
-
-    @Override
-    public void onItemClick(PreviewFile item) {
-        toolbar.setVisibility(toolbar.getVisibility() == View.VISIBLE ?
-                View.INVISIBLE : View.VISIBLE);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_save_share, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.menu_save) {
-            view = "Save";
-            Glide.with(ImagePreviewActivity.this)
-                    .asBitmap()
-                    .load(mUriList.get(vPager.getCurrentItem()).getImageURL())
-                    .into(new SimpleTarget<Bitmap>() {
-                        @Override
-                        public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
-                            handleSavePermission(resource);
-                            // hideProgressDialog();
-                        }
-                    });
-        } else if (item.getItemId() == R.id.menu_share) {
-            view = "Share";
-            Glide.with(ImagePreviewActivity.this)
-                    .asBitmap()
-                    .load(mUriList.get(vPager.getCurrentItem()).getImageURL())
-                    .into(new SimpleTarget<Bitmap>() {
-                        @Override
-                        public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
-                            handleSharePermission(resource);
-                        }
-                    });
-        }
-        return true;
-    }
-
-    private void handleSavePermission(Bitmap resource) {
-        String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (CheckPermission.hasPermission(permission, ImagePreviewActivity.this)) {
-                Util.saveImageToGallery(ImagePreviewActivity.this, resource);
-            } else {
-                mBitmap = resource;
-                CheckPermission.requestPerm(new String[]{permission},
-                        CheckPermission.PERMISSION_STORAGE, ImagePreviewActivity.this);
-            }
-        } else {
-            Util.saveImageToGallery(ImagePreviewActivity.this, resource);
-        }
-    }
-
-    private void handleSharePermission(Bitmap resource) {
-        String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (CheckPermission.hasPermission(permission, ImagePreviewActivity.this)) {
-                Intent intent = new Intent(Intent.ACTION_SEND);
-                intent.setType("image/jpeg");
-                intent.putExtra(Intent.EXTRA_STREAM, Util.shareImage(ImagePreviewActivity.this, resource));
-                startActivity(Intent.createChooser(intent, "Share Image"));
-            } else {
-                mBitmap = resource;
-                CheckPermission.requestPerm(new String[]{permission},
-                        CheckPermission.PERMISSION_STORAGE, ImagePreviewActivity.this);
-            }
-        } else {
-            Intent intent = new Intent(Intent.ACTION_SEND);
-            intent.setType("image/jpeg");
-            intent.putExtra(Intent.EXTRA_STREAM, Util.shareImage(ImagePreviewActivity.this, resource));
-            startActivity(Intent.createChooser(intent, "Share Image"));
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == CheckPermission.PERMISSION_STORAGE) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                if (view.equals("Save")) {
-                    handleSavePermission(mBitmap);
-                } else {
-                    handleSharePermission(mBitmap);
-                }
-            } else {
-                for (int i = 0, len = permissions.length; i < len; i++) {
-                    String permission = permissions[i];
-                    if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
-                        // user rejected the permission
-                        boolean showRationale = shouldShowRequestPermissionRationale(permission);
-                        if (Manifest.permission.WRITE_EXTERNAL_STORAGE.equals(permission)
-                                || Manifest.permission.READ_EXTERNAL_STORAGE.equals(permission)) {
-                            if (!showRationale) {
-                                showAlertDialog();
-                            } else
-                                shouldShowRequestPermissionRationale(permission);
-                        }
-                    }
-                }
-            }
-
-        }
-
-    }
-
-    private void showAlertDialog() {
-        AlertDialog.Builder builder =
-                new AlertDialog.Builder(ImagePreviewActivity.this).setPositiveButton("GO TO SETTING",
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                dialog.dismiss();
-                                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                                Uri uri = Uri.fromParts("package", getPackageName(), null);
-                                intent.setData(uri);
-                                startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton("DENY", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                dialog.dismiss();
-                            }
-                        })
-                        .setTitle("Permission denied")
-                        .setMessage("Without storage permission the app" +
-                                " is unable to open gallery or to save photos." +
-                                " Are you sure want to deny this permission?");
-        builder.create().show();
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
-    }
-}
diff --git a/imagepreview/src/main/java/com/himangi/imagepreview/SlideAdapter.java b/imagepreview/src/main/java/com/himangi/imagepreview/SlideAdapter.java
deleted file mode 100644
index 7af13bf..0000000
--- a/imagepreview/src/main/java/com/himangi/imagepreview/SlideAdapter.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.himangi.imagepreview;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.github.chrisbanes.photoview.PhotoView;
-
-import java.util.List;
-
-public class SlideAdapter extends PagerAdapter {
-
-    private Context context;
-    private List<PreviewFile> list;
-    private OnItemClickListener<PreviewFile> listener;
-
-    public SlideAdapter(Context context, List<PreviewFile> list, OnItemClickListener<PreviewFile> listener) {
-        this.context = context;
-        this.list = list;
-        this.listener = listener;
-    }
-
-    @Override
-    public int getCount() {
-        return list.size();
-    }
-
-    @Override
-    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-        return view == object;
-    }
-
-    @NonNull
-    @Override
-    public Object instantiateItem(@NonNull ViewGroup container, final int position) {
-
-        LayoutInflater layoutInflater = (LayoutInflater)
-                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        assert layoutInflater != null;
-        View view = layoutInflater.inflate(R.layout.item_preview, container, false);
-
-        PhotoView image = view.findViewById(R.id.iv_preview);
-        final TextView tvImageDescription = view.findViewById(R.id.tvImageDescription);
-
-        Glide.with(context)
-                .load(list.get(position).getImageURL())
-                .into(image);
-
-        if (list.get(position).getImageDescription().isEmpty()) {
-            tvImageDescription.setVisibility(View.GONE);
-        } else {
-            tvImageDescription.setVisibility(View.VISIBLE);
-            tvImageDescription.setText(list.get(position).getImageDescription());
-        }
-
-        image.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                listener.onItemClick(list.get(position));
-                if (!list.get(position).getImageDescription().isEmpty()) {
-                    tvImageDescription.setVisibility(tvImageDescription.getVisibility() == View.VISIBLE ?
-                            View.INVISIBLE : View.VISIBLE);
-                }
-            }
-        });
-
-        container.addView(view);
-        return view;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-        container.removeView((RelativeLayout) object);
-    }
-}
\ No newline at end of file
diff --git a/imagepreview/src/main/java/com/himangi/imagepreview/Util.java b/imagepreview/src/main/java/com/himangi/imagepreview/Util.java
deleted file mode 100644
index 0e75bb7..0000000
--- a/imagepreview/src/main/java/com/himangi/imagepreview/Util.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.himangi.imagepreview;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Environment;
-import android.os.SystemClock;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.io.File;
-import java.io.FileOutputStream;
-
-/**
- * Created by Himangi on 20/4/18
- */
-public class Util {
-
-    public static void saveImageToGallery(Context context, Bitmap bitmap) {
-        File photo =
-                new File(getAppFolder(context),
-                        SystemClock.currentThreadTimeMillis() + ".jpg");
-        try {
-
-            FileOutputStream fos = new FileOutputStream(photo.getPath());
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-            fos.close();
-            if (photo.exists()) {
-                ContentValues values = new ContentValues();
-
-                values.put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis());
-                values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
-                values.put(MediaStore.MediaColumns.DATA, photo.getAbsolutePath());
-
-                context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-                Toast.makeText(context, "Image saved to Gallery", Toast.LENGTH_SHORT).show();
-            }
-        } catch (Exception e) {
-            Log.e("Picture", "Exception in photoCallback", e);
-        }
-    }
-
-    public static Uri shareImage(Context context, Bitmap bitmap) {
-        File photo =
-                new File(getAppFolder(context),
-                        SystemClock.currentThreadTimeMillis() + ".jpg");
-        try {
-
-            FileOutputStream fos = new FileOutputStream(photo.getPath());
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-            fos.close();
-            if (photo.exists()) {
-                ContentValues values = new ContentValues();
-
-                values.put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis());
-                values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
-                values.put(MediaStore.MediaColumns.DATA, photo.getAbsolutePath());
-
-                return context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-            }
-        } catch (Exception e) {
-            Log.e("Picture", "Exception in photoCallback", e);
-        }
-        return null;
-    }
-
-    private static String getAppName(Context context) {
-        final PackageManager pm = context.getApplicationContext().getPackageManager();
-        ApplicationInfo ai;
-        try {
-            ai = pm.getApplicationInfo(context.getPackageName(), 0);
-        } catch (final PackageManager.NameNotFoundException e) {
-            ai = null;
-        }
-        return (String) (ai != null ? pm.getApplicationLabel(ai) : "(unknown)");
-    }
-
-    private static File getWorkingDirectory() {
-        File directory =
-                new File(Environment.getExternalStorageDirectory(), BuildConfig.APPLICATION_ID);
-        if (!directory.exists()) {
-            directory.mkdir();
-        }
-        return directory;
-    }
-
-    public static File getAppFolder(Context context) {
-        File photoDirectory = new File(getWorkingDirectory().getAbsolutePath(),
-                getAppName(context.getApplicationContext()));
-        if (!photoDirectory.exists()) {
-            photoDirectory.mkdir();
-        }
-        return photoDirectory;
-
-    }
-
-}
-
diff --git a/imagepreview/src/main/java/com/softpal/imagepreview/ImagePreviewActivity.java b/imagepreview/src/main/java/com/softpal/imagepreview/ImagePreviewActivity.java
new file mode 100644
index 0000000..b33a0ab
--- /dev/null
+++ b/imagepreview/src/main/java/com/softpal/imagepreview/ImagePreviewActivity.java
@@ -0,0 +1,227 @@
+package com.softpal.imagepreview;
+
+import android.Manifest;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.StrictMode;
+import android.provider.Settings;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.gun0912.tedpermission.PermissionListener;
+import com.gun0912.tedpermission.TedPermission;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+public class ImagePreviewActivity extends AppCompatActivity implements OnItemClickListener<PreviewFile>
+{
+	
+	public static String IMAGE_LIST = "intent_image_item";
+	public static String CURRENT_ITEM = "current_item";
+	public static String SHOULD_CACHE = "should_cache";
+	public static String IS_ACCEPT_CANCEL_AVAILABLE = "is_accept_cancel_available";
+	
+	public static Toolbar toolbar;
+	ViewPager vPager;
+	PermissionListener permissionListener_save = null, permissionListener_share = null;
+	private List<PreviewFile> mUriList;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		// requestWindowFeature(Window.FEATURE_NO_TITLE);
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_image_preview);
+		getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		
+		/*StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+		StrictMode.setVmPolicy(builder.build());*/
+		
+		toolbar = findViewById(R.id.toolbar);
+		vPager = findViewById(R.id.vPager);
+		setSupportActionBar(toolbar);
+		toolbar.setTitle("");
+		toolbar.setSubtitle("");
+		getSupportActionBar().setDisplayShowTitleEnabled(false);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setDisplayShowHomeEnabled(true);
+		toolbar.setNavigationOnClickListener(new View.OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				onBackPressed();
+			}
+		});
+		setUpViews();
+	}
+	
+	private void setUpViews()
+	{
+		mUriList = (List<PreviewFile>)getIntent().getSerializableExtra(IMAGE_LIST);
+		boolean shouldCache = getIntent().getBooleanExtra(SHOULD_CACHE,false);
+		boolean isAcceptCancelAvailable = getIntent().getBooleanExtra(IS_ACCEPT_CANCEL_AVAILABLE,false);
+		if(mUriList != null)
+		{
+			SlideAdapter slideAdapter = new SlideAdapter(this,mUriList,this,shouldCache,isAcceptCancelAvailable);
+			vPager.setAdapter(slideAdapter);
+			
+			vPager.setCurrentItem(getIntent().getIntExtra(CURRENT_ITEM,0));
+			
+			vPager.setPageTransformer(false,new ViewPager.PageTransformer()
+			{
+				@Override
+				public void transformPage(@NonNull View page,float position)
+				{
+					float normalizedPosition = Math.abs(Math.abs(position) - 1);
+					page.setScaleX(normalizedPosition / 2 + 0.5f);
+					page.setScaleY(normalizedPosition / 2 + 0.5f);
+				}
+			});
+		}
+	}
+	
+	@Override
+	public boolean onSupportNavigateUp()
+	{
+		onBackPressed();
+		return true;
+	}
+	
+	@Override
+	public void onItemClick(PreviewFile item)
+	{
+		toolbar.setVisibility(toolbar.getVisibility() == View.VISIBLE ? View.INVISIBLE : View.VISIBLE);
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		getMenuInflater().inflate(R.menu.menu_save_share,menu);
+		return true;
+	}
+	
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		if(item.getItemId() == R.id.menu_save)
+		{
+			Glide.with(ImagePreviewActivity.this).asBitmap().load(mUriList.get(vPager.getCurrentItem()).getImageURL()).into(new CustomTarget<Bitmap>()
+			{
+				@Override
+				public void onResourceReady(Bitmap resource,Transition<? super Bitmap> transition)
+				{
+					handleSavePermission(resource);
+				}
+				
+				@Override
+				public void onLoadCleared(@Nullable Drawable placeholder)
+				{
+				
+				}
+			});
+		}
+		else if(item.getItemId() == R.id.menu_share)
+		{
+			Glide.with(ImagePreviewActivity.this).asBitmap().load(mUriList.get(vPager.getCurrentItem()).getImageURL()).into(new CustomTarget<Bitmap>()
+			{
+				@Override
+				public void onResourceReady(Bitmap resource,Transition<? super Bitmap> transition)
+				{
+					handleSharePermission(resource);
+				}
+				
+				@Override
+				public void onLoadCleared(@Nullable Drawable placeholder)
+				{
+				
+				}
+			});
+		}
+		return true;
+	}
+	
+	private void handleSavePermission(final Bitmap resource)
+	{
+		permissionListener_save = new PermissionListener()
+		{
+			@Override
+			public void onPermissionGranted()
+			{
+				Util.saveToInternalStorage(ImagePreviewActivity.this,resource);
+			}
+			
+			@Override
+			public void onPermissionDenied(List<String> deniedPermissions)
+			{
+				return;
+			}
+		};
+		TedPermission.with(ImagePreviewActivity.this).setPermissionListener(permissionListener_save).setRationaleMessage(getResources().getString(R.string.perm_storage_msg)).setDeniedMessage(getResources().getString(R.string.denied_message)).setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).check();
+	}
+	
+	private void handleSharePermission(final Bitmap resource)
+	{
+		permissionListener_share = new PermissionListener()
+		{
+			@Override
+			public void onPermissionGranted()
+			{
+				Util.shareBitmap(ImagePreviewActivity.this, resource);
+			}
+			
+			@Override
+			public void onPermissionDenied(List<String> deniedPermissions)
+			{
+				return;
+			}
+		};
+		TedPermission.with(ImagePreviewActivity.this).setPermissionListener(permissionListener_share).setRationaleMessage(getResources().getString(R.string.perm_storage_msg)).setDeniedMessage(getResources().getString(R.string.denied_message)).setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).check();
+	}
+	
+	private void showAlertDialog()
+	{
+		AlertDialog.Builder builder = new AlertDialog.Builder(ImagePreviewActivity.this).setPositiveButton("GO TO SETTING",new DialogInterface.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog,int which)
+			{
+				dialog.dismiss();
+				Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+				Uri uri = Uri.fromParts("package",getPackageName(),null);
+				intent.setData(uri);
+				startActivity(intent);
+			}
+		}).setNegativeButton("DENY",new DialogInterface.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog,int which)
+			{
+				dialog.dismiss();
+			}
+		}).setTitle("Permission denied").setMessage("Without storage permission the app" + " is unable to open gallery or to save photos." + " Are you sure want to deny this permission?");
+		builder.create().show();
+	}
+}
diff --git a/imagepreview/src/main/java/com/himangi/imagepreview/OnItemClickListener.java b/imagepreview/src/main/java/com/softpal/imagepreview/OnItemClickListener.java
similarity index 70%
rename from imagepreview/src/main/java/com/himangi/imagepreview/OnItemClickListener.java
rename to imagepreview/src/main/java/com/softpal/imagepreview/OnItemClickListener.java
index 62ce582..298b095 100644
--- a/imagepreview/src/main/java/com/himangi/imagepreview/OnItemClickListener.java
+++ b/imagepreview/src/main/java/com/softpal/imagepreview/OnItemClickListener.java
@@ -1,4 +1,4 @@
-package com.himangi.imagepreview;
+package com.softpal.imagepreview;
 
 public interface OnItemClickListener<T> {
         void onItemClick(T item);
diff --git a/imagepreview/src/main/java/com/himangi/imagepreview/PreviewFile.java b/imagepreview/src/main/java/com/softpal/imagepreview/PreviewFile.java
similarity index 95%
rename from imagepreview/src/main/java/com/himangi/imagepreview/PreviewFile.java
rename to imagepreview/src/main/java/com/softpal/imagepreview/PreviewFile.java
index c87f6bf..5765a47 100644
--- a/imagepreview/src/main/java/com/himangi/imagepreview/PreviewFile.java
+++ b/imagepreview/src/main/java/com/softpal/imagepreview/PreviewFile.java
@@ -1,4 +1,4 @@
-package com.himangi.imagepreview;
+package com.softpal.imagepreview;
 
 import java.io.Serializable;
 
diff --git a/imagepreview/src/main/java/com/softpal/imagepreview/SlideAdapter.java b/imagepreview/src/main/java/com/softpal/imagepreview/SlideAdapter.java
new file mode 100644
index 0000000..4a01001
--- /dev/null
+++ b/imagepreview/src/main/java/com/softpal/imagepreview/SlideAdapter.java
@@ -0,0 +1,172 @@
+package com.softpal.imagepreview;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.provider.MediaStore;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.appcompat.app.AppCompatActivity;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
+import com.github.chrisbanes.photoview.PhotoView;
+
+import java.io.IOException;
+import java.util.List;
+
+public class SlideAdapter extends PagerAdapter
+{
+	private static String TAG = SlideAdapter.class.getSimpleName();
+	private Context context;
+	private List<PreviewFile> list;
+	private OnItemClickListener<PreviewFile> listener;
+	private boolean shouldCache;
+	private boolean isAcceptCancelAvailable;
+	
+	public SlideAdapter(Context context,List<PreviewFile> list,OnItemClickListener<PreviewFile> listener,boolean shouldCache,boolean isAccpetRejectAvailable)
+	{
+		this.context = context;
+		this.list = list;
+		this.listener = listener;
+		this.shouldCache = shouldCache;
+		this.isAcceptCancelAvailable = isAccpetRejectAvailable;
+	}
+	
+	@Override
+	public int getCount()
+	{
+		int size = 0;
+		if(list != null && list.size() > 0)
+		{
+			size = list.size();
+		}
+		return size;
+	}
+	
+	@NonNull
+	@Override
+	public Object instantiateItem(@NonNull ViewGroup container,final int position)
+	{
+			LayoutInflater layoutInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			assert layoutInflater != null;
+			View view = layoutInflater.inflate(R.layout.item_preview,container,false);
+			
+			PhotoView image = view.findViewById(R.id.iv_preview);
+			ImageView accept = view.findViewById(R.id.iv_accept_image);
+			ImageView cancel = view.findViewById(R.id.iv_reject_image);
+			final TextView tvImageDescription = view.findViewById(R.id.tvImageDescription);
+			
+			final String uriImage = list.get(position).getImageURL();
+			Bitmap bitmap;
+			
+			if(uriImage != null)
+			{
+				Uri uri = Uri.parse(uriImage);
+				
+				try
+				{
+					Log.v("SlideAdapter", "instantiateItem uri : "+uri);
+					bitmap = MediaStore.Images.Media.getBitmap(context.getContentResolver(),uri);
+					image.setImageBitmap(bitmap);
+				}
+				catch(IOException e)
+				{
+					e.printStackTrace();
+				}
+			}
+			
+			if(shouldCache)
+			{
+				Glide.with(context).load(list.get(position).getImageURL()).into(image);
+			}
+			else
+			{
+				Glide.with(context).load(list.get(position).getImageURL()).apply(RequestOptions.skipMemoryCacheOf(true)).apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.NONE)).into(image);
+			}
+			
+			if(list.get(position).getImageDescription().isEmpty())
+			{
+				tvImageDescription.setVisibility(View.GONE);
+			}
+			else
+			{
+				tvImageDescription.setVisibility(View.VISIBLE);
+				tvImageDescription.setText(list.get(position).getImageDescription());
+			}
+			
+			image.setOnClickListener(new View.OnClickListener()
+			{
+				@Override
+				public void onClick(View v)
+				{
+					listener.onItemClick(list.get(position));
+					if(! list.get(position).getImageDescription().isEmpty())
+					{
+						tvImageDescription.setVisibility(tvImageDescription.getVisibility() == View.VISIBLE ? View.INVISIBLE : View.VISIBLE);
+					}
+				}
+			});
+			
+			if(isAcceptCancelAvailable)
+			{
+				accept.setVisibility(View.VISIBLE);
+				cancel.setVisibility(View.VISIBLE);
+				
+				accept.setOnClickListener(new View.OnClickListener()
+				{
+					@Override
+					public void onClick(View v)
+					{
+						Intent sendIntent = new Intent();
+						sendIntent.putExtra("imageOK",true);
+						sendIntent.putExtra("imageUri",uriImage);
+						((AppCompatActivity)context).setResult(Activity.RESULT_OK,sendIntent);
+						((AppCompatActivity)context).finish();
+					}
+				});
+				
+				cancel.setOnClickListener(new View.OnClickListener()
+				{
+					@Override
+					public void onClick(View v)
+					{
+						Intent sendIntent = new Intent();
+						sendIntent.putExtra("imageOK",false);
+						((AppCompatActivity)context).setResult(Activity.RESULT_OK,sendIntent);
+						((AppCompatActivity)context).finish();
+					}
+				});
+			}
+			else
+			{
+				accept.setVisibility(View.GONE);
+				cancel.setVisibility(View.GONE);
+			}
+			
+			container.addView(view);
+			return view;
+	}
+	
+	@Override
+	public void destroyItem(@NonNull ViewGroup container,int position,@NonNull Object object)
+	{
+		container.removeView((RelativeLayout)object);
+	}
+	
+	@Override
+	public boolean isViewFromObject(@NonNull View view,@NonNull Object object)
+	{
+		return view == object;
+	}
+}
\ No newline at end of file
diff --git a/imagepreview/src/main/java/com/softpal/imagepreview/Util.java b/imagepreview/src/main/java/com/softpal/imagepreview/Util.java
new file mode 100644
index 0000000..dfd3b4e
--- /dev/null
+++ b/imagepreview/src/main/java/com/softpal/imagepreview/Util.java
@@ -0,0 +1,349 @@
+package com.softpal.imagepreview;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.os.StrictMode;
+import android.os.SystemClock;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.squareup.picasso.Picasso;
+import com.squareup.picasso.Target;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import androidx.annotation.RequiresApi;
+import androidx.core.content.FileProvider;
+
+/**
+ Created by Himangi on 20/4/18
+ */
+public class Util
+{
+	
+	public static void saveImageToGallery(Context context,Bitmap bitmap)
+	{
+		File photo = new File(getAppFolder(context),SystemClock.currentThreadTimeMillis() + ".jpg");
+		try
+		{
+			/*FileOutputStream fos = new FileOutputStream(photo.getPath());
+			bitmap.compress(Bitmap.CompressFormat.JPEG,100,fos);
+			fos.close();*/
+			if(photo.exists())
+			{
+				ContentValues values = new ContentValues();
+				
+				values.put(MediaStore.Images.Media.DATE_TAKEN,System.currentTimeMillis());
+				values.put(MediaStore.Images.Media.MIME_TYPE,"image/jpeg");
+				values.put(MediaStore.MediaColumns.DATA,photo.getAbsolutePath());
+				
+				context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,values);
+				Toast.makeText(context,"Image saved to Gallery",Toast.LENGTH_SHORT).show();
+			}
+		}
+		catch(Exception e)
+		{
+			Log.e("Picture","Exception in photoCallback",e);
+		}
+	}
+	
+	
+	public static void saveToInternalStorage(Context context,Bitmap bitmapImage){
+		
+		File mypath=new File(getAppFolder(context),SystemClock.currentThreadTimeMillis() + ".jpg");
+		
+		FileOutputStream fos = null;
+		try {
+			fos = new FileOutputStream(mypath);
+			bitmapImage.compress(Bitmap.CompressFormat.PNG, 100, fos);
+			Toast.makeText(context,"Image saved to Gallery",Toast.LENGTH_SHORT).show();
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if(fos != null)
+				{
+					fos.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		getAppFolder(context).getAbsolutePath();
+	}
+	
+	public static File getAppFolder(Context context)
+	{
+		File photoDirectory = new File(getWorkingDirectory().getAbsolutePath(),getAppName(context.getApplicationContext()));
+		if(! photoDirectory.exists())
+		{
+			photoDirectory.mkdir();
+		}
+		return photoDirectory;
+	}
+	
+	private static File getWorkingDirectory()
+	{
+		File directory = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),BuildConfig.LIBRARY_PACKAGE_NAME);
+		if(! directory.exists())
+		{
+			directory.mkdir();
+		}
+		return directory;
+	}
+	
+	private static String getAppName(Context context)
+	{
+		ApplicationInfo ai = null;
+		String appLabel = "(unknown)";
+		if(context != null)
+		{
+			final PackageManager pm = context.getApplicationContext().getPackageManager();
+			try
+			{
+				ai = pm.getApplicationInfo(context.getPackageName(),0);
+				appLabel = pm.getApplicationLabel(ai).toString();
+			}
+			catch(final PackageManager.NameNotFoundException e)
+			{
+				ai = null;
+			}
+		}
+		return ai != null ? appLabel : "(unknown)";
+	}
+	
+	public static Uri shareImage(Context context,Bitmap bitmap)
+	{
+		File photo = new File(getAppFolder(context),SystemClock.currentThreadTimeMillis() + ".jpg");
+		try
+		{
+			FileOutputStream fos = new FileOutputStream(photo.getPath());
+			bitmap.compress(Bitmap.CompressFormat.JPEG,100,fos);
+			fos.close();
+			if(photo.exists())
+			{
+				ContentValues values = new ContentValues();
+				
+				values.put(MediaStore.Images.Media.DATE_TAKEN,System.currentTimeMillis());
+				values.put(MediaStore.Images.Media.MIME_TYPE,"image/jpeg");
+				values.put(MediaStore.MediaColumns.DATA,photo.getAbsolutePath());
+				return context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,values);
+				//https://cdn.pixabay.com/photo/2016/09/30/09/52/x-ray-1704855_960_720.jpg
+			}
+		}
+		catch(Exception e)
+		{
+			Log.e("Picture","Exception in photoCallback",e);
+		}
+		return null;
+	}
+	
+	public static void shareBitmap (Context context, Bitmap bitmap) {
+		try {
+			Intent share = new Intent(Intent.ACTION_SEND);
+			share.setType("image/jpeg");
+			ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+			bitmap.compress(Bitmap.CompressFormat.JPEG,100,bytes);
+			File f = new File(getAppFolder(context), SystemClock.currentThreadTimeMillis() + ".jpg");
+			FileOutputStream fo = null;
+			try {
+				boolean status = f.createNewFile();
+				fo = new FileOutputStream(f);
+				fo.write(bytes.toByteArray());
+				
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			finally
+			{
+				if(fo!=null){
+					fo.flush();
+					fo.close();
+				}
+			}
+			File folder = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"com.softpal.imagepreview/ImagesPreview/"+System.currentTimeMillis() + ".jpg");
+			String path = folder.getPath();
+			Uri myImagesdir = Uri.parse("content://" + path);
+			
+			share.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+			share.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+			share.putExtra(Intent.EXTRA_STREAM, Uri.parse(f.getAbsolutePath()));
+			//share.setDataAndType(myImagesdir,"image/jpeg");
+			context.startActivity(share);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+	public static void shareBitmap2(Context context,Bitmap bitmap){
+		ContentValues values = new ContentValues();
+		values.put(MediaStore.Images.Media.DISPLAY_NAME, "IMG1024.JPG");
+		values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
+		values.put(MediaStore.Images.Media.IS_PENDING, 1);
+		
+		ContentResolver resolver = context.getContentResolver();
+		Uri collection = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
+		Uri item = resolver.insert(collection, values);
+		
+		try (ParcelFileDescriptor pfd = resolver.openFileDescriptor(item,"w",null)) {
+			// Write data into the pending image.
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+		// Now that we're finished, release the "pending" status, and allow other apps
+		// to view the image.
+		values.clear();
+		values.put(MediaStore.Images.Media.IS_PENDING, 0);
+		resolver.update(item, values, null, null);
+	}
+	
+	public static void shareBitmap3 (Context context, Bitmap bitmap) {
+		StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+		StrictMode.setVmPolicy(builder.build());
+		
+		
+		File f =  new File(context.getExternalCacheDir()+"/"+context.getResources().getString(R.string.app_name)+".png");
+		Intent shareIntent;
+		
+		
+		try {
+			FileOutputStream outputStream = new FileOutputStream(f);
+			bitmap.compress(Bitmap.CompressFormat.PNG,100,outputStream);
+			
+			outputStream.flush();
+			outputStream.close();
+			shareIntent = new Intent(Intent.ACTION_SEND);
+			shareIntent.setType("image/jpg");
+			
+			Uri bmpUri = Uri.parse("file://"+f.getPath());
+			shareIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
+			shareIntent.putExtra(Intent.EXTRA_TEXT,"Hey please check this application " + "https://play.google.com/store/apps/details?id=" +context.getPackageName());
+			shareIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			
+			
+			
+		}catch (Exception e){
+			throw new RuntimeException(e);
+		}
+		context.startActivity(Intent.createChooser(shareIntent,"Share Picture"));
+	}
+	
+	private boolean isExternalStorageWritable() {
+		return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
+	}
+	
+	// Checks if a volume containing external storage is available to at least read.
+	private boolean isExternalStorageReadable() {
+		return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED) ||
+		       Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED_READ_ONLY);
+	}
+	
+	public static void shareImageWithFileProvider(Context context, Bitmap bitmap){
+		try
+		{
+			File folder = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"com.softpal.imagepreview/ImagesPreview/"+System.currentTimeMillis() + ".jpg");
+			Intent intent = new Intent(Intent.ACTION_SEND);
+			String path = folder.getPath();
+			Uri myImagesdir = Uri.parse("content://" + path);
+			intent.setDataAndType(myImagesdir,"images/jpg");
+			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+			context.startActivity(intent);
+		}
+		catch(Exception e){
+			e.printStackTrace();
+		}
+	}
+	
+	public static void dummyMethod(Context context, Bitmap bitmap){
+		Intent shareIntent;
+		String path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)+"/Share.png";
+		OutputStream out = null;
+		File file=new File(path);
+		try {
+			out = new FileOutputStream(file);
+			bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+			out.flush();
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		path=file.getPath();
+		Uri bmpUri = Uri.parse("file://"+path);
+		shareIntent = new Intent(android.content.Intent.ACTION_SEND);
+		shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		shareIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
+		shareIntent.putExtra(Intent.EXTRA_TEXT,"Hey please check this application " + "https://play.google.com/store/apps/details?id=" +context.getPackageName());
+		shareIntent.setType("image/png");
+		context.startActivity(Intent.createChooser(shareIntent,"Share with"));
+		
+	}
+	
+	public static void shareImageUrl(final Context context){
+		Picasso.get().load("https://cdn.pixabay.com/photo/2016/09/30/09/52/x-ray-1704855_960_720.jpg").into(new Target()
+		{
+			@Override
+			public void onBitmapLoaded(Bitmap bitmap,Picasso.LoadedFrom from)
+			{
+				Log.v("Util", "=====> onBitmapLoaded");
+				Intent intent = new Intent(Intent.ACTION_SEND);
+				intent.setType("image/*");
+				intent.putExtra(Intent.EXTRA_STREAM, getBitmapFromView(context, bitmap));
+				context.startActivity(Intent.createChooser(intent, "Share Image"));
+			}
+			
+			@Override
+			public void onBitmapFailed(Exception e,Drawable errorDrawable)
+			{
+				Log.v("Util", "=====> onBitmapFailed");
+			}
+			
+			@Override
+			public void onPrepareLoad(Drawable placeHolderDrawable)
+			{
+				Log.v("Util", "=====> onPrepareLoad");
+			}
+		});
+	}
+	
+	public static Uri getBitmapFromView(Context context, Bitmap bitmap){
+		Uri bmpUri = null;
+		try{
+			File file = new File(context.getExternalCacheDir(), System.currentTimeMillis() + ".jpg");
+			FileOutputStream fos = new FileOutputStream(file);
+			bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+			fos.close();
+			bmpUri = Uri.fromFile(file);
+		}
+		catch(FileNotFoundException e)
+		{
+			e.printStackTrace();
+		}
+		catch(IOException exception)
+		{
+			exception.printStackTrace();
+		}
+		return bmpUri;
+	}
+}
+
diff --git a/imagepreview/src/main/res/drawable/ic_accept_image.xml b/imagepreview/src/main/res/drawable/ic_accept_image.xml
new file mode 100644
index 0000000..e0407bf
--- /dev/null
+++ b/imagepreview/src/main/res/drawable/ic_accept_image.xml
@@ -0,0 +1,6 @@
+<vector android:alpha="0.89" android:height="35dp"
+    android:viewportHeight="64" android:viewportWidth="64"
+    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="m46.025,18.086l-21.914,24.221 -6.91,-7.637c-0.74,-0.82 -2.006,-0.881 -2.824,-0.142 -0.818,0.741 -0.883,2.006 -0.141,2.825l8.048,8.894c0.368,0.536 0.979,0.85 1.627,0.85 0.073,0 0.146,-0.03 0.22,-0.039 0.051,0.004 0.1,0.032 0.15,0.032 0.592,0 1.166,-0.266 1.555,-0.725l23.154,-25.595c0.742,-0.82 0.678,-2.085 -0.141,-2.826 -0.818,-0.741 -2.083,-0.68 -2.824,0.142z"/>
+    <path android:fillColor="#ffffff" android:pathData="M31.998,0C14.354,0 0,14.355 0,32s14.354,32 31.998,32C49.645,64 64,49.645 64,32S49.645,0 31.998,0zM31.998,60C16.561,60 4,47.439 4,32S16.561,4 31.998,4C47.438,4 60,16.561 60,32S47.438,60 31.998,60z"/>
+</vector>
diff --git a/imagepreview/src/main/res/drawable/ic_reject_image.xml b/imagepreview/src/main/res/drawable/ic_reject_image.xml
new file mode 100644
index 0000000..d6abc91
--- /dev/null
+++ b/imagepreview/src/main/res/drawable/ic_reject_image.xml
@@ -0,0 +1,6 @@
+<vector android:alpha="0.89" android:height="35dp"
+    android:viewportHeight="475.2" android:viewportWidth="475.2"
+    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M405.6,69.6C360.7,24.7 301.1,0 237.6,0s-123.1,24.7 -168,69.6S0,174.1 0,237.6s24.7,123.1 69.6,168s104.5,69.6 168,69.6s123.1,-24.7 168,-69.6s69.6,-104.5 69.6,-168S450.5,114.5 405.6,69.6zM386.5,386.5c-39.8,39.8 -92.7,61.7 -148.9,61.7s-109.1,-21.9 -148.9,-61.7c-82.1,-82.1 -82.1,-215.7 0,-297.8C128.5,48.9 181.4,27 237.6,27s109.1,21.9 148.9,61.7C468.6,170.8 468.6,304.4 386.5,386.5z"/>
+    <path android:fillColor="#ffffff" android:pathData="M342.3,132.9c-5.3,-5.3 -13.8,-5.3 -19.1,0l-85.6,85.6L152,132.9c-5.3,-5.3 -13.8,-5.3 -19.1,0c-5.3,5.3 -5.3,13.8 0,19.1l85.6,85.6l-85.6,85.6c-5.3,5.3 -5.3,13.8 0,19.1c2.6,2.6 6.1,4 9.5,4s6.9,-1.3 9.5,-4l85.6,-85.6l85.6,85.6c2.6,2.6 6.1,4 9.5,4c3.5,0 6.9,-1.3 9.5,-4c5.3,-5.3 5.3,-13.8 0,-19.1l-85.4,-85.6l85.6,-85.6C347.6,146.7 347.6,138.2 342.3,132.9z"/>
+</vector>
diff --git a/imagepreview/src/main/res/layout/activity_image_preview.xml b/imagepreview/src/main/res/layout/activity_image_preview.xml
index 6807cfb..950016d 100644
--- a/imagepreview/src/main/res/layout/activity_image_preview.xml
+++ b/imagepreview/src/main/res/layout/activity_image_preview.xml
@@ -7,13 +7,13 @@
     android:background="@android:color/black"
     android:orientation="vertical">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/vPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:overScrollMode="never" />
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/imagepreview/src/main/res/layout/item_preview.xml b/imagepreview/src/main/res/layout/item_preview.xml
index 88ae8e2..efe2c32 100644
--- a/imagepreview/src/main/res/layout/item_preview.xml
+++ b/imagepreview/src/main/res/layout/item_preview.xml
@@ -1,23 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rl_preview_adapter"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.github.chrisbanes.photoview.PhotoView
-        android:id="@+id/iv_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <TextView
         android:id="@+id/tvImageDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="20dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="40dp"
         android:background="#40000000"
         android:gravity="center"
         android:padding="20dp"
         android:text="@string/app_name"
         android:textColor="@android:color/white" />
 
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/iv_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <ImageView
+        android:id="@+id/iv_reject_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="30dp"
+        android:layout_marginBottom="30dp"
+        app:srcCompat="@drawable/ic_reject_image"
+        tools:ignore="VectorDrawableCompat"
+        android:visibility="gone"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="30dp"
+        android:contentDescription="reject" />
+
+    <ImageView
+        android:id="@+id/iv_accept_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="30dp"
+        app:srcCompat="@drawable/ic_accept_image"
+        tools:ignore="VectorDrawableCompat"
+        android:visibility="gone"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="30dp"
+        android:contentDescription="accept" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/imagepreview/src/main/res/values/strings.xml b/imagepreview/src/main/res/values/strings.xml
index 2b30d81..fc4819a 100644
--- a/imagepreview/src/main/res/values/strings.xml
+++ b/imagepreview/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">imagepreview</string>
+
+    <string name="denied_message">If you reject permission,you cannot save image\nPlease turn on permissions at [Setting] > [Permission]</string>
+    <string name="perm_storage_msg">App needs Storage permission to save image on device</string>
 </resources>
diff --git a/imagepreview/src/main/res/xml/file_provider_paths.xml b/imagepreview/src/main/res/xml/file_provider_paths.xml
new file mode 100644
index 0000000..6157057
--- /dev/null
+++ b/imagepreview/src/main/res/xml/file_provider_paths.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="images" path="Pictures" />
+    <external-path name="external_files" path="."/>
+    <external-path name="files_root" path="Download/com.softpal.imagepreview/ImagesPreview"/>
+</paths>
\ No newline at end of file
diff --git a/imagepreview/src/test/java/com/himangi/imagepreview/ExampleUnitTest.java b/imagepreview/src/test/java/com/softpal/imagepreview/ExampleUnitTest.java
similarity index 91%
rename from imagepreview/src/test/java/com/himangi/imagepreview/ExampleUnitTest.java
rename to imagepreview/src/test/java/com/softpal/imagepreview/ExampleUnitTest.java
index aeadcc4..22b06ee 100644
--- a/imagepreview/src/test/java/com/himangi/imagepreview/ExampleUnitTest.java
+++ b/imagepreview/src/test/java/com/softpal/imagepreview/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.himangi.imagepreview;
+package com.softpal.imagepreview;
 
 import org.junit.Test;