diff --git a/README.md b/README.md
index 4ad209d..6a38ea7 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,13 @@ Effect on landscape screen:
 
 ## Download
 ```groovy
-implementation 'com.yanzhenjie:album:2.1.3'
+repositories {
+    maven { url "https://jitpack.io" }
+}
+
+dependencies {
+    compile 'com.github.imliujun:album:3.0.2'
+}
 ```
 
 ## Usage
diff --git a/album/build.gradle b/album/build.gradle
index de3d1fa..3aa559f 100644
--- a/album/build.gradle
+++ b/album/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: rootProject.ext.plugins.library
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = 'com.github.imliujun'
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -20,4 +23,29 @@ dependencies {
     api rootProject.ext.dependencies.mediaScanner
 }
 
-apply from: 'https://raw.githubusercontent.com/yanzhenjie/bintray/master/maven.gradle'
\ No newline at end of file
+//apply from: 'https://raw.githubusercontent.com/yanzhenjie/bintray/master/maven.gradle'
+
+
+// build a jar with source files
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    classpath += configurations.compile
+}
+
+// build a jar with javadoc
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
\ No newline at end of file
diff --git a/album/src/main/AndroidManifest.xml b/album/src/main/AndroidManifest.xml
index a59a969..43f7b39 100644
--- a/album/src/main/AndroidManifest.xml
+++ b/album/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2017 Yan Zhenjie.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +20,9 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
-    <application>
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
+    
+    <application android:requestLegacyExternalStorage="true">
         <activity
             android:name=".app.album.AlbumActivity"
             android:configChanges="orientation|screenSize"
diff --git a/album/src/main/java/com/yanzhenjie/album/Action.java b/album/src/main/java/com/yanzhenjie/album/Action.java
index 2d72109..de9e6d6 100644
--- a/album/src/main/java/com/yanzhenjie/album/Action.java
+++ b/album/src/main/java/com/yanzhenjie/album/Action.java
@@ -15,7 +15,7 @@
  */
 package com.yanzhenjie.album;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * <p>Any action takes place.</p>
diff --git a/album/src/main/java/com/yanzhenjie/album/Album.java b/album/src/main/java/com/yanzhenjie/album/Album.java
index 7e531c2..f703b93 100644
--- a/album/src/main/java/com/yanzhenjie/album/Album.java
+++ b/album/src/main/java/com/yanzhenjie/album/Album.java
@@ -18,7 +18,6 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
-import android.support.annotation.IntDef;
 import android.util.Log;
 
 import com.yanzhenjie.album.api.AlbumMultipleWrapper;
@@ -42,6 +41,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * <p>Entrance.</p>
  * Created by Yan Zhenjie on 2016/10/23.
@@ -103,14 +106,18 @@ public final class Album {
      *
      * @param albumConfig {@link AlbumConfig}.
      */
-    public static void initialize(AlbumConfig albumConfig) {
-        if (sAlbumConfig == null) sAlbumConfig = albumConfig;
-        else Log.w("Album", new IllegalStateException("Illegal operation, only allowed to configure once."));
+    public static void initialize(@Nullable AlbumConfig albumConfig) {
+        if (sAlbumConfig == null) {
+            sAlbumConfig = albumConfig;
+        } else {
+            Log.w("Album", new IllegalStateException("Illegal operation, only allowed to configure once."));
+        }
     }
 
     /**
      * Get the album configuration.
      */
+    @NonNull
     public static AlbumConfig getAlbumConfig() {
         if (sAlbumConfig == null) {
             sAlbumConfig = AlbumConfig.newBuilder(null).build();
@@ -121,168 +128,192 @@ public static AlbumConfig getAlbumConfig() {
     /**
      * Open the camera from the activity.
      */
-    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(Context context) {
+    @NonNull
+    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(@NonNull Context context) {
         return new AlbumCamera(context);
     }
 
     /**
      * Select images.
      */
-    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(Context context) {
+    @NonNull
+    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(@NonNull Context context) {
         return new ImageChoice(context);
     }
 
     /**
      * Select videos.
      */
-    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(Context context) {
+    @NonNull
+    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(@NonNull Context context) {
         return new VideoChoice(context);
     }
 
     /**
      * Select images and videos.
      */
-    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(Context context) {
+    @NonNull
+    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(@NonNull Context context) {
         return new AlbumChoice(context);
     }
 
     /**
      * Preview picture.
      */
-    public static GalleryWrapper gallery(Context context) {
+    @NonNull
+    public static GalleryWrapper gallery(@NonNull Context context) {
         return new GalleryWrapper(context);
     }
 
     /**
      * Preview Album.
      */
-    public static GalleryAlbumWrapper galleryAlbum(Context context) {
+    @NonNull
+    public static GalleryAlbumWrapper galleryAlbum(@NonNull Context context) {
         return new GalleryAlbumWrapper(context);
     }
 
     /**
      * Open the camera from the activity.
      */
-    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(Activity activity) {
+    @NonNull
+    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(@NonNull Activity activity) {
         return new AlbumCamera(activity);
     }
 
     /**
      * Select images.
      */
-    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(Activity activity) {
+    @NonNull
+    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(@NonNull Activity activity) {
         return new ImageChoice(activity);
     }
 
     /**
      * Select videos.
      */
-    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(Activity activity) {
+    @NonNull
+    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(@NonNull Activity activity) {
         return new VideoChoice(activity);
     }
 
     /**
      * Select images and videos.
      */
-    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(Activity activity) {
+    @NonNull
+    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(@NonNull Activity activity) {
         return new AlbumChoice(activity);
     }
 
     /**
      * Preview picture.
      */
-    public static BasicGalleryWrapper<GalleryWrapper, String, String, String> gallery(Activity activity) {
+    @NonNull
+    public static BasicGalleryWrapper<GalleryWrapper, String, String, String> gallery(@NonNull Activity activity) {
         return new GalleryWrapper(activity);
     }
 
     /**
      * Preview Album.
      */
-    public static BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> galleryAlbum(Activity activity) {
+    @NonNull
+    public static BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> galleryAlbum(@NonNull Activity activity) {
         return new GalleryAlbumWrapper(activity);
     }
 
     /**
      * Open the camera from the activity.
      */
-    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(Fragment fragment) {
+    @NonNull
+    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(@NonNull Fragment fragment) {
         return new AlbumCamera(fragment.getActivity());
     }
 
     /**
      * Select images.
      */
-    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(Fragment fragment) {
+    @NonNull
+    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(@NonNull Fragment fragment) {
         return new ImageChoice(fragment.getActivity());
     }
 
     /**
      * Select videos.
      */
-    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(Fragment fragment) {
+    @NonNull
+    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(@NonNull Fragment fragment) {
         return new VideoChoice(fragment.getActivity());
     }
 
     /**
      * Select images and videos.
      */
-    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(Fragment fragment) {
+    @NonNull
+    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(@NonNull Fragment fragment) {
         return new AlbumChoice(fragment.getActivity());
     }
 
     /**
      * Preview picture.
      */
-    public static BasicGalleryWrapper<GalleryWrapper, String, String, String> gallery(Fragment fragment) {
+    @NonNull
+    public static BasicGalleryWrapper<GalleryWrapper, String, String, String> gallery(@NonNull Fragment fragment) {
         return new GalleryWrapper(fragment.getActivity());
     }
 
     /**
      * Preview Album.
      */
-    public static BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> galleryAlbum(Fragment fragment) {
+    @NonNull
+    public static BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> galleryAlbum(@NonNull Fragment fragment) {
         return new GalleryAlbumWrapper(fragment.getActivity());
     }
 
     /**
      * Open the camera from the activity.
      */
-    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(android.support.v4.app.Fragment fragment) {
+    @NonNull
+    public static Camera<ImageCameraWrapper, VideoCameraWrapper> camera(@NonNull androidx.fragment.app.Fragment fragment) {
         return new AlbumCamera(fragment.getContext());
     }
 
     /**
      * Select images.
      */
-    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(android.support.v4.app.Fragment fragment) {
+    @NonNull
+    public static Choice<ImageMultipleWrapper, ImageSingleWrapper> image(@NonNull androidx.fragment.app.Fragment fragment) {
         return new ImageChoice(fragment.getContext());
     }
 
     /**
      * Select videos.
      */
-    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(android.support.v4.app.Fragment fragment) {
+    @NonNull
+    public static Choice<VideoMultipleWrapper, VideoSingleWrapper> video(@NonNull androidx.fragment.app.Fragment fragment) {
         return new VideoChoice(fragment.getContext());
     }
 
     /**
      * Select images and videos.
      */
-    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(android.support.v4.app.Fragment fragment) {
+    @NonNull
+    public static Choice<AlbumMultipleWrapper, AlbumSingleWrapper> album(@NonNull androidx.fragment.app.Fragment fragment) {
         return new AlbumChoice(fragment.getContext());
     }
 
     /**
      * Preview picture.
      */
-    public static BasicGalleryWrapper<GalleryWrapper, String, String, String> gallery(android.support.v4.app.Fragment fragment) {
+    @NonNull
+    public static BasicGalleryWrapper<GalleryWrapper, String, String, String> gallery(@NonNull androidx.fragment.app.Fragment fragment) {
         return new GalleryWrapper(fragment.getContext());
     }
 
     /**
      * Preview Album.
      */
-    public static BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> galleryAlbum(android.support.v4.app.Fragment fragment) {
+    @NonNull
+    public static BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> galleryAlbum(@NonNull androidx.fragment.app.Fragment fragment) {
         return new GalleryAlbumWrapper(fragment.getContext());
     }
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/AlbumCameraFile.java b/album/src/main/java/com/yanzhenjie/album/AlbumCameraFile.java
new file mode 100644
index 0000000..592bc74
--- /dev/null
+++ b/album/src/main/java/com/yanzhenjie/album/AlbumCameraFile.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2017 Yan Zhenjie.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yanzhenjie.album;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.yanzhenjie.album.util.AlbumUtils;
+
+/**
+ * Created by cc on 2020/7/22.
+ */
+public class AlbumCameraFile implements Parcelable {
+    
+    public AlbumCameraFile(Uri uri, String path) {
+        this.uri = uri;
+        this.path = path;
+    }
+    
+    public static AlbumCameraFile getAlbumCameraFile(Context context, String filePath) {
+        return new AlbumCameraFile(AlbumUtils.getUri(context, filePath), filePath);
+    }
+    
+    /**
+     * File uri.
+     */
+    private Uri uri;
+    /**
+     * File path.
+     */
+    private String path;
+    
+    public Uri getUri() {
+        return uri;
+    }
+    
+    public void setUri(Uri uri) {
+        this.uri = uri;
+    }
+    
+    public String getPath() {
+        return path;
+    }
+    
+    public void setPath(String path) {
+        this.path = path;
+    }
+    
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+    
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(this.uri, flags);
+        dest.writeString(this.path);
+    }
+    
+    public AlbumCameraFile() {
+    }
+    
+    protected AlbumCameraFile(Parcel in) {
+        this.uri = in.readParcelable(Uri.class.getClassLoader());
+        this.path = in.readString();
+    }
+    
+    
+    public static final Parcelable.Creator<AlbumCameraFile> CREATOR = new Parcelable.Creator<AlbumCameraFile>() {
+        @Override
+        public AlbumCameraFile createFromParcel(Parcel source) {
+            return new AlbumCameraFile(source);
+        }
+        
+        @Override
+        public AlbumCameraFile[] newArray(int size) {
+            return new AlbumCameraFile[size];
+        }
+    };
+    
+    @Override
+    public String toString() {
+        return "AlbumCameraFile{" +
+            "uri=" + uri +
+            ", path='" + path + '\'' +
+            '}';
+    }
+}
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/AlbumFile.java b/album/src/main/java/com/yanzhenjie/album/AlbumFile.java
index 931c192..953dfbc 100644
--- a/album/src/main/java/com/yanzhenjie/album/AlbumFile.java
+++ b/album/src/main/java/com/yanzhenjie/album/AlbumFile.java
@@ -15,13 +15,15 @@
  */
 package com.yanzhenjie.album;
 
+import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
+
 /**
  * Created by YanZhenjie on 2017/8/15.
  */
@@ -36,9 +38,9 @@ public class AlbumFile implements Parcelable, Comparable<AlbumFile> {
     }
 
     /**
-     * File path.
+     * File uri.
      */
-    private String mPath;
+    private Uri uri;
     /**
      * Folder mName.
      */
@@ -68,9 +70,9 @@ public class AlbumFile implements Parcelable, Comparable<AlbumFile> {
      */
     private long mDuration;
     /**
-     * Thumb path.
+     * Thumb path uri.
      */
-    private String mThumbPath;
+    private Uri mThumbUri;
     /**
      * MediaType.
      */
@@ -90,10 +92,11 @@ public AlbumFile() {
     @Override
     public int compareTo(AlbumFile o) {
         long time = o.getAddDate() - getAddDate();
-        if (time > Integer.MAX_VALUE)
+        if (time > Integer.MAX_VALUE) {
             return Integer.MAX_VALUE;
-        else if (time < -Integer.MAX_VALUE)
+        } else if (time < -Integer.MAX_VALUE) {
             return -Integer.MAX_VALUE;
+        }
         return (int) time;
     }
 
@@ -101,9 +104,9 @@ else if (time < -Integer.MAX_VALUE)
     public boolean equals(Object obj) {
         if (obj != null && obj instanceof AlbumFile) {
             AlbumFile o = (AlbumFile) obj;
-            String inPath = o.getPath();
-            if (mPath != null && inPath != null) {
-                return mPath.equals(inPath);
+            Uri inPath = o.getUri();
+            if (uri != null && inPath != null) {
+                return uri.equals(inPath);
             }
         }
         return super.equals(obj);
@@ -111,15 +114,15 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return mPath != null ? mPath.hashCode() : super.hashCode();
+        return uri != null ? uri.hashCode() : super.hashCode();
     }
 
-    public String getPath() {
-        return mPath;
+    public Uri getUri() {
+        return uri;
     }
 
-    public void setPath(String path) {
-        mPath = path;
+    public void setUri(Uri uri) {
+        this.uri = uri;
     }
 
     public String getBucketName() {
@@ -178,12 +181,12 @@ public void setDuration(long duration) {
         mDuration = duration;
     }
 
-    public String getThumbPath() {
-        return mThumbPath;
+    public Uri getThumbUri() {
+        return mThumbUri;
     }
 
-    public void setThumbPath(String thumbPath) {
-        mThumbPath = thumbPath;
+    public void setThumbUri(Uri thumbUri) {
+        mThumbUri = thumbUri;
     }
 
     @MediaType
@@ -211,35 +214,22 @@ public void setDisable(boolean disable) {
         this.isDisable = disable;
     }
 
-    protected AlbumFile(Parcel in) {
-        mPath = in.readString();
-        mBucketName = in.readString();
-        mMimeType = in.readString();
-        mAddDate = in.readLong();
-        mLatitude = in.readFloat();
-        mLongitude = in.readFloat();
-        mSize = in.readLong();
-        mDuration = in.readLong();
-        mThumbPath = in.readString();
-        mMediaType = in.readInt();
-        isChecked = in.readByte() != 0;
-        isDisable = in.readByte() != 0;
-    }
-
     @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(mPath);
-        dest.writeString(mBucketName);
-        dest.writeString(mMimeType);
-        dest.writeLong(mAddDate);
-        dest.writeFloat(mLatitude);
-        dest.writeFloat(mLongitude);
-        dest.writeLong(mSize);
-        dest.writeLong(mDuration);
-        dest.writeString(mThumbPath);
-        dest.writeInt(mMediaType);
-        dest.writeByte((byte) (isChecked ? 1 : 0));
-        dest.writeByte((byte) (isDisable ? 1 : 0));
+    public String toString() {
+        return "AlbumFile{" +
+            "uri=" + uri +
+            ", mBucketName='" + mBucketName + '\'' +
+            ", mMimeType='" + mMimeType + '\'' +
+            ", mAddDate=" + mAddDate +
+            ", mLatitude=" + mLatitude +
+            ", mLongitude=" + mLongitude +
+            ", mSize=" + mSize +
+            ", mDuration=" + mDuration +
+            ", mThumbUri='" + mThumbUri + '\'' +
+            ", mMediaType=" + mMediaType +
+            ", isChecked=" + isChecked +
+            ", isDisable=" + isDisable +
+            '}';
     }
 
     @Override
@@ -247,10 +237,41 @@ public int describeContents() {
         return 0;
     }
 
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(this.uri, flags);
+        dest.writeString(this.mBucketName);
+        dest.writeString(this.mMimeType);
+        dest.writeLong(this.mAddDate);
+        dest.writeFloat(this.mLatitude);
+        dest.writeFloat(this.mLongitude);
+        dest.writeLong(this.mSize);
+        dest.writeLong(this.mDuration);
+        dest.writeParcelable(this.mThumbUri, flags);
+        dest.writeInt(this.mMediaType);
+        dest.writeByte(this.isChecked ? (byte) 1 : (byte) 0);
+        dest.writeByte(this.isDisable ? (byte) 1 : (byte) 0);
+    }
+
+    protected AlbumFile(Parcel in) {
+        this.uri = in.readParcelable(Uri.class.getClassLoader());
+        this.mBucketName = in.readString();
+        this.mMimeType = in.readString();
+        this.mAddDate = in.readLong();
+        this.mLatitude = in.readFloat();
+        this.mLongitude = in.readFloat();
+        this.mSize = in.readLong();
+        this.mDuration = in.readLong();
+        this.mThumbUri = in.readParcelable(Uri.class.getClassLoader());
+        this.mMediaType = in.readInt();
+        this.isChecked = in.readByte() != 0;
+        this.isDisable = in.readByte() != 0;
+    }
+
     public static final Creator<AlbumFile> CREATOR = new Creator<AlbumFile>() {
         @Override
-        public AlbumFile createFromParcel(Parcel in) {
-            return new AlbumFile(in);
+        public AlbumFile createFromParcel(Parcel source) {
+            return new AlbumFile(source);
         }
 
         @Override
@@ -258,5 +279,4 @@ public AlbumFile[] newArray(int size) {
             return new AlbumFile[size];
         }
     };
-
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/AlbumLoader.java b/album/src/main/java/com/yanzhenjie/album/AlbumLoader.java
index d6872cd..eb90acf 100644
--- a/album/src/main/java/com/yanzhenjie/album/AlbumLoader.java
+++ b/album/src/main/java/com/yanzhenjie/album/AlbumLoader.java
@@ -15,8 +15,14 @@
  */
 package com.yanzhenjie.album;
 
+import android.content.Context;
+import android.net.Uri;
+import android.view.View;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * <p>Used to load the preview, it should be customized.</p>
  * Created by Yan Zhenjie on 2017/3/31.
@@ -25,12 +31,31 @@ public interface AlbumLoader {
 
     AlbumLoader DEFAULT = new AlbumLoader() {
         @Override
-        public void load(ImageView imageView, AlbumFile albumFile) {
+        public void load(@NonNull ImageView imageView, @NonNull AlbumFile albumFile) {
+        }
+
+        @Override
+        public void load(@NonNull ImageView imageView, @NonNull Uri url) {
         }
 
+        @NonNull
         @Override
-        public void load(ImageView imageView, String url) {
+        public View getPreviewView(@NonNull Context context,
+                                   @NonNull AlbumFile albumFile,
+                                   View.OnClickListener onClickListener,
+                                   View.OnClickListener longClickListener) {
+            return new ImageView(context);
         }
+
+        @NonNull
+        @Override
+        public View getPreviewView(@NonNull Context context,
+                                   @NonNull Uri uri,
+                                   View.OnClickListener onClickListener,
+                                   View.OnClickListener longClickListener) {
+            return new ImageView(context);
+        }
+
     };
 
     /**
@@ -39,14 +64,36 @@ public void load(ImageView imageView, String url) {
      * @param imageView {@link ImageView}.
      * @param albumFile the media object may be a picture or video.
      */
-    void load(ImageView imageView, AlbumFile albumFile);
+    void load(@NonNull ImageView imageView, @NonNull AlbumFile albumFile);
 
     /**
      * Load thumbnails of pictures or videos, either local file or remote file.
      *
      * @param imageView {@link ImageView}.
-     * @param url       The url of the file, local path or remote path.
+     * @param uri       The uri of the file, local path or remote path.
+     */
+    void load(@NonNull ImageView imageView, @NonNull Uri uri);
+
+    /**
+     * 获取大图预览的 View，开发者可以自由使用自己加载大图的组件
+     *
+     * @return 加载大图的组件
+     */
+    @NonNull
+    View getPreviewView(@NonNull Context context,
+                        @NonNull AlbumFile albumFile,
+                        @Nullable View.OnClickListener onClickListener,
+                        @Nullable View.OnClickListener longClickListener);
+
+    /**
+     * 获取大图预览的 View，开发者可以自由使用自己加载大图的组件
+     *
+     * @return 加载大图的组件
      */
-    void load(ImageView imageView, String url);
+    @NonNull
+    View getPreviewView(@NonNull Context context,
+                        @NonNull Uri uri,
+                        @Nullable View.OnClickListener onClickListener,
+                        @Nullable View.OnClickListener longClickListener);
 
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/api/AlbumMultipleWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/AlbumMultipleWrapper.java
index 5bc9489..29902c7 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/AlbumMultipleWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/AlbumMultipleWrapper.java
@@ -17,7 +17,9 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.AlbumFile;
@@ -35,7 +37,7 @@ public class AlbumMultipleWrapper extends BasicChoiceAlbumWrapper<AlbumMultipleW
     private int mLimitCount = Integer.MAX_VALUE;
     private Filter<Long> mDurationFilter;
 
-    public AlbumMultipleWrapper(Context context) {
+    public AlbumMultipleWrapper(@NonNull Context context) {
         super(context);
     }
 
@@ -44,7 +46,8 @@ public AlbumMultipleWrapper(Context context) {
      *
      * @param checked the data list.
      */
-    public final AlbumMultipleWrapper checkedList(ArrayList<AlbumFile> checked) {
+    @NonNull
+    public final AlbumMultipleWrapper checkedList(@Nullable ArrayList<AlbumFile> checked) {
         this.mChecked = checked;
         return this;
     }
@@ -54,6 +57,7 @@ public final AlbumMultipleWrapper checkedList(ArrayList<AlbumFile> checked) {
      *
      * @param count the maximum number.
      */
+    @NonNull
     public AlbumMultipleWrapper selectCount(@IntRange(from = 1, to = Integer.MAX_VALUE) int count) {
         this.mLimitCount = count;
         return this;
@@ -64,7 +68,8 @@ public AlbumMultipleWrapper selectCount(@IntRange(from = 1, to = Integer.MAX_VAL
      *
      * @param filter filter.
      */
-    public AlbumMultipleWrapper filterDuration(Filter<Long> filter) {
+    @NonNull
+    public AlbumMultipleWrapper filterDuration(@Nullable Filter<Long> filter) {
         this.mDurationFilter = filter;
         return this;
     }
diff --git a/album/src/main/java/com/yanzhenjie/album/api/BasicAlbumWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/BasicAlbumWrapper.java
index c01735c..ca839b1 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/BasicAlbumWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/BasicAlbumWrapper.java
@@ -16,11 +16,13 @@
 package com.yanzhenjie.album.api;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.api.widget.Widget;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * <p>Album basic wrapper.</p>
  * Created by yanzhenjie on 17-3-29.
@@ -28,12 +30,16 @@
 public abstract class BasicAlbumWrapper<Returner extends BasicAlbumWrapper, Result, Cancel, Checked> {
 
     final Context mContext;
+    @Nullable
     Action<Result> mResult;
+    @Nullable
     Action<Cancel> mCancel;
+    @NonNull
     Widget mWidget;
+    @Nullable
     Checked mChecked;
 
-    BasicAlbumWrapper(Context context) {
+    BasicAlbumWrapper(@NonNull Context context) {
         this.mContext = context;
         mWidget = Widget.getDefaultWidget(context);
     }
@@ -43,7 +49,8 @@ public abstract class BasicAlbumWrapper<Returner extends BasicAlbumWrapper, Resu
      *
      * @param result action when producing result.
      */
-    public final Returner onResult(Action<Result> result) {
+    @NonNull
+    public final Returner onResult(@Nullable Action<Result> result) {
         this.mResult = result;
         return (Returner) this;
     }
@@ -53,7 +60,8 @@ public final Returner onResult(Action<Result> result) {
      *
      * @param cancel action when canceled.
      */
-    public final Returner onCancel(Action<Cancel> cancel) {
+    @NonNull
+    public final Returner onCancel(@Nullable Action<Cancel> cancel) {
         this.mCancel = cancel;
         return (Returner) this;
     }
@@ -63,7 +71,8 @@ public final Returner onCancel(Action<Cancel> cancel) {
      *
      * @param widget the widget.
      */
-    public final Returner widget(@Nullable Widget widget) {
+    @NonNull
+    public final Returner widget(@NonNull Widget widget) {
         this.mWidget = widget;
         return (Returner) this;
     }
diff --git a/album/src/main/java/com/yanzhenjie/album/api/BasicCameraWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/BasicCameraWrapper.java
index 7a74c8f..d5869c3 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/BasicCameraWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/BasicCameraWrapper.java
@@ -16,21 +16,27 @@
 package com.yanzhenjie.album.api;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 
 import com.yanzhenjie.album.Action;
+import com.yanzhenjie.album.AlbumCameraFile;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Created by YanZhenjie on 2017/8/18.
  */
 public abstract class BasicCameraWrapper<Returner extends BasicCameraWrapper> {
-
+    @NonNull
     Context mContext;
-    Action<String> mResult;
+    @Nullable
+    Action<AlbumCameraFile> mResult;
+    @Nullable
     Action<String> mCancel;
+    @Nullable
     String mFilePath;
 
-    public BasicCameraWrapper(Context context) {
+    public BasicCameraWrapper(@NonNull Context context) {
         this.mContext = context;
     }
 
@@ -39,7 +45,8 @@ public BasicCameraWrapper(Context context) {
      *
      * @param result action when producing result.
      */
-    public final Returner onResult(Action<String> result) {
+    @NonNull
+    public final Returner onResult(@Nullable Action<AlbumCameraFile> result) {
         this.mResult = result;
         return (Returner) this;
     }
@@ -49,7 +56,8 @@ public final Returner onResult(Action<String> result) {
      *
      * @param cancel action when canceled.
      */
-    public final Returner onCancel(Action<String> cancel) {
+    @NonNull
+    public final Returner onCancel(@Nullable Action<String> cancel) {
         this.mCancel = cancel;
         return (Returner) this;
     }
@@ -59,6 +67,7 @@ public final Returner onCancel(Action<String> cancel) {
      *
      * @param filePath storage path.
      */
+    @NonNull
     public Returner filePath(@Nullable String filePath) {
         this.mFilePath = filePath;
         return (Returner) this;
diff --git a/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceAlbumWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceAlbumWrapper.java
index cc7eb1d..62aee73 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceAlbumWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceAlbumWrapper.java
@@ -16,7 +16,7 @@
 package com.yanzhenjie.album.api;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 /**
  * Created by YanZhenjie on 2017/11/8.
diff --git a/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceVideoWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceVideoWrapper.java
index 0c89b3e..afa453b 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceVideoWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceVideoWrapper.java
@@ -16,7 +16,7 @@
 package com.yanzhenjie.album.api;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 /**
  * Created by YanZhenjie on 2017/11/8.
diff --git a/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceWrapper.java
index 0b54ba0..d74b277 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/BasicChoiceWrapper.java
@@ -16,7 +16,9 @@
 package com.yanzhenjie.album.api;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.yanzhenjie.album.Filter;
 
@@ -40,6 +42,7 @@ public abstract class BasicChoiceWrapper<Returner extends BasicChoiceWrapper, Re
     /**
      * Turn on the camera function.
      */
+    @NonNull
     public Returner camera(boolean hasCamera) {
         this.mHasCamera = hasCamera;
         return (Returner) this;
@@ -50,6 +53,7 @@ public Returner camera(boolean hasCamera) {
      *
      * @param count the number of columns.
      */
+    @NonNull
     public Returner columnCount(@IntRange(from = 2, to = 4) int count) {
         this.mColumnCount = count;
         return (Returner) this;
@@ -60,7 +64,8 @@ public Returner columnCount(@IntRange(from = 2, to = 4) int count) {
      *
      * @param filter filter.
      */
-    public Returner filterSize(Filter<Long> filter) {
+    @NonNull
+    public Returner filterSize(@Nullable Filter<Long> filter) {
         this.mSizeFilter = filter;
         return (Returner) this;
     }
@@ -70,7 +75,7 @@ public Returner filterSize(Filter<Long> filter) {
      *
      * @param filter filter.
      */
-    public Returner filterMimeType(Filter<String> filter) {
+    public Returner filterMimeType(@Nullable Filter<String> filter) {
         this.mMimeTypeFilter = filter;
         return (Returner) this;
     }
diff --git a/album/src/main/java/com/yanzhenjie/album/api/BasicGalleryWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/BasicGalleryWrapper.java
index c9ccb74..3347031 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/BasicGalleryWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/BasicGalleryWrapper.java
@@ -16,9 +16,9 @@
 package com.yanzhenjie.album.api;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 
-import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.ItemAction;
 
 import java.util.ArrayList;
@@ -33,7 +33,7 @@ public abstract class BasicGalleryWrapper<Returner extends BasicGalleryWrapper,
     int mCurrentPosition;
     boolean mCheckable;
 
-    public BasicGalleryWrapper(Context context) {
+    public BasicGalleryWrapper(@NonNull Context context) {
         super(context);
     }
 
diff --git a/album/src/main/java/com/yanzhenjie/album/api/GalleryAlbumWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/GalleryAlbumWrapper.java
index e42beed..5575b5f 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/GalleryAlbumWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/GalleryAlbumWrapper.java
@@ -23,13 +23,15 @@
 import com.yanzhenjie.album.app.gallery.GalleryActivity;
 import com.yanzhenjie.album.app.gallery.GalleryAlbumActivity;
 
+import androidx.annotation.NonNull;
+
 /**
  * <p>Gallery wrapper.</p>
  * Created by yanzhenjie on 17-3-29.
  */
 public class GalleryAlbumWrapper extends BasicGalleryWrapper<GalleryAlbumWrapper, AlbumFile, String, AlbumFile> {
 
-    public GalleryAlbumWrapper(Context context) {
+    public GalleryAlbumWrapper(@NonNull Context context) {
         super(context);
     }
 
diff --git a/album/src/main/java/com/yanzhenjie/album/api/ImageCameraWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/ImageCameraWrapper.java
index b548016..f5ca62e 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/ImageCameraWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/ImageCameraWrapper.java
@@ -21,16 +21,19 @@
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.app.camera.CameraActivity;
 
+import androidx.annotation.NonNull;
+
 /**
  * <p>Camera wrapper.</p>
  * Created by Yan Zhenjie on 2017/4/18.
  */
 public class ImageCameraWrapper extends BasicCameraWrapper<ImageCameraWrapper> {
 
-    public ImageCameraWrapper(Context context) {
+    public ImageCameraWrapper(@NonNull Context context) {
         super(context);
     }
 
+    @Override
     public void start() {
         CameraActivity.sResult = mResult;
         CameraActivity.sCancel = mCancel;
diff --git a/album/src/main/java/com/yanzhenjie/album/api/ImageMultipleWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/ImageMultipleWrapper.java
index 644dab5..2ddf6a6 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/ImageMultipleWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/ImageMultipleWrapper.java
@@ -17,7 +17,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntRange;
 
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.AlbumFile;
@@ -25,6 +24,10 @@
 
 import java.util.ArrayList;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Created by YanZhenjie on 2017/8/16.
  */
@@ -33,7 +36,7 @@ public final class ImageMultipleWrapper extends BasicChoiceWrapper<ImageMultiple
     @IntRange(from = 1, to = Integer.MAX_VALUE)
     private int mLimitCount = Integer.MAX_VALUE;
 
-    public ImageMultipleWrapper(Context context) {
+    public ImageMultipleWrapper(@NonNull Context context) {
         super(context);
     }
 
@@ -42,7 +45,8 @@ public ImageMultipleWrapper(Context context) {
      *
      * @param checked the data list.
      */
-    public final ImageMultipleWrapper checkedList(ArrayList<AlbumFile> checked) {
+    @NonNull
+    public final ImageMultipleWrapper checkedList(@Nullable ArrayList<AlbumFile> checked) {
         this.mChecked = checked;
         return this;
     }
@@ -52,6 +56,7 @@ public final ImageMultipleWrapper checkedList(ArrayList<AlbumFile> checked) {
      *
      * @param count the maximum number.
      */
+    @NonNull
     public ImageMultipleWrapper selectCount(@IntRange(from = 1, to = Integer.MAX_VALUE) int count) {
         this.mLimitCount = count;
         return this;
diff --git a/album/src/main/java/com/yanzhenjie/album/api/VideoCameraWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/VideoCameraWrapper.java
index e90fa29..240d0b0 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/VideoCameraWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/VideoCameraWrapper.java
@@ -17,7 +17,8 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.app.camera.CameraActivity;
@@ -32,7 +33,7 @@ public class VideoCameraWrapper extends BasicCameraWrapper<VideoCameraWrapper> {
     private long mLimitDuration = Integer.MAX_VALUE;
     private long mLimitBytes = Integer.MAX_VALUE;
 
-    public VideoCameraWrapper(Context context) {
+    public VideoCameraWrapper(@NonNull Context context) {
         super(context);
     }
 
@@ -41,6 +42,7 @@ public VideoCameraWrapper(Context context) {
      *
      * @param quality should be 0 or 1.
      */
+    @NonNull
     public VideoCameraWrapper quality(@IntRange(from = 0, to = 1) int quality) {
         this.mQuality = quality;
         return this;
@@ -51,6 +53,7 @@ public VideoCameraWrapper quality(@IntRange(from = 0, to = 1) int quality) {
      *
      * @param duration the maximum number of seconds.
      */
+    @NonNull
     public VideoCameraWrapper limitDuration(@IntRange(from = 1) long duration) {
         this.mLimitDuration = duration;
         return this;
@@ -61,11 +64,13 @@ public VideoCameraWrapper limitDuration(@IntRange(from = 1) long duration) {
      *
      * @param bytes the size of the byte.
      */
+    @NonNull
     public VideoCameraWrapper limitBytes(@IntRange(from = 1) long bytes) {
         this.mLimitBytes = bytes;
         return this;
     }
 
+    @Override
     public void start() {
         CameraActivity.sResult = mResult;
         CameraActivity.sCancel = mCancel;
diff --git a/album/src/main/java/com/yanzhenjie/album/api/VideoMultipleWrapper.java b/album/src/main/java/com/yanzhenjie/album/api/VideoMultipleWrapper.java
index b2f4091..b1cf205 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/VideoMultipleWrapper.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/VideoMultipleWrapper.java
@@ -17,7 +17,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.AlbumFile;
diff --git a/album/src/main/java/com/yanzhenjie/album/api/camera/AlbumCamera.java b/album/src/main/java/com/yanzhenjie/album/api/camera/AlbumCamera.java
index df4a41f..2a846cf 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/camera/AlbumCamera.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/camera/AlbumCamera.java
@@ -20,6 +20,8 @@
 import com.yanzhenjie.album.api.ImageCameraWrapper;
 import com.yanzhenjie.album.api.VideoCameraWrapper;
 
+import androidx.annotation.NonNull;
+
 /**
  * Created by YanZhenjie on 2017/8/18.
  */
@@ -27,15 +29,17 @@ public class AlbumCamera implements Camera<ImageCameraWrapper, VideoCameraWrappe
 
     private Context mContext;
 
-    public AlbumCamera(Context context) {
+    public AlbumCamera(@NonNull Context context) {
         mContext = context;
     }
 
+    @NonNull
     @Override
     public ImageCameraWrapper image() {
         return new ImageCameraWrapper(mContext);
     }
 
+    @NonNull
     @Override
     public VideoCameraWrapper video() {
         return new VideoCameraWrapper(mContext);
diff --git a/album/src/main/java/com/yanzhenjie/album/api/widget/Widget.java b/album/src/main/java/com/yanzhenjie/album/api/widget/Widget.java
index 5fce9d7..8176fc6 100644
--- a/album/src/main/java/com/yanzhenjie/album/api/widget/Widget.java
+++ b/album/src/main/java/com/yanzhenjie/album/api/widget/Widget.java
@@ -19,10 +19,10 @@
 import android.content.res.ColorStateList;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IntDef;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntDef;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 
 import com.yanzhenjie.album.R;
diff --git a/album/src/main/java/com/yanzhenjie/album/app/Contract.java b/album/src/main/java/com/yanzhenjie/album/app/Contract.java
index 310852f..c340a30 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/Contract.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/Contract.java
@@ -28,6 +28,8 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  * Created by YanZhenjie on 2018/4/7.
  */
@@ -43,7 +45,7 @@ public interface AlbumPresenter extends BasePresenter {
         /**
          * Click camera.
          */
-        void clickCamera(View v);
+        void clickCamera(@NonNull View v);
 
         /**
          * Try to check item.
@@ -51,7 +53,7 @@ public interface AlbumPresenter extends BasePresenter {
          * @param button view.
          * @param position position of item.
          */
-        void tryCheckItem(CompoundButton button, int position);
+        void tryCheckItem(@NonNull CompoundButton button, int position);
 
         /**
          * Try to preview item.
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/AlbumActivity.java b/album/src/main/java/com/yanzhenjie/album/app/album/AlbumActivity.java
index 0cd4b54..128d990 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/AlbumActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/AlbumActivity.java
@@ -19,9 +19,6 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.PopupMenu;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,6 +26,7 @@
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.Album;
+import com.yanzhenjie.album.AlbumCameraFile;
 import com.yanzhenjie.album.AlbumFile;
 import com.yanzhenjie.album.AlbumFolder;
 import com.yanzhenjie.album.Filter;
@@ -46,29 +44,38 @@
 import com.yanzhenjie.album.widget.LoadingDialog;
 import com.yanzhenjie.mediascanner.MediaScanner;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
+
 /**
  * <p>Responsible for controlling the album data and the overall logic.</p>
  * Created by Yan Zhenjie on 2016/10/17.
  */
 public class AlbumActivity extends BaseActivity implements
-        Contract.AlbumPresenter,
-        MediaReadTask.Callback,
-        GalleryActivity.Callback,
-        PathConvertTask.Callback,
-        ThumbnailBuildTask.Callback {
+    Contract.AlbumPresenter,
+    MediaReadTask.Callback,
+    GalleryActivity.Callback,
+    PathConvertTask.Callback,
+    ThumbnailBuildTask.Callback {
 
     private static final int CODE_ACTIVITY_NULL = 1;
     private static final int CODE_PERMISSION_STORAGE = 1;
 
+    @Nullable
     public static Filter<Long> sSizeFilter;
+    @Nullable
     public static Filter<String> sMimeFilter;
+    @Nullable
     public static Filter<Long> sDurationFilter;
 
+    @Nullable
     public static Action<ArrayList<AlbumFile>> sResult;
+    @Nullable
     public static Action<String> sCancel;
 
     private List<AlbumFolder> mAlbumFolders;
@@ -149,7 +156,9 @@ private int createView() {
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         mView.onConfigurationChanged(newConfig);
-        if (mFolderDialog != null && !mFolderDialog.isShowing()) mFolderDialog = null;
+        if (mFolderDialog != null && !mFolderDialog.isShowing()) {
+            mFolderDialog = null;
+        }
     }
 
     @Override
@@ -163,20 +172,20 @@ protected void onPermissionGranted(int code) {
     @Override
     protected void onPermissionDenied(int code) {
         new AlertDialog.Builder(this)
-                .setCancelable(false)
-                .setTitle(R.string.album_title_permission_failed)
-                .setMessage(R.string.album_permission_storage_failed_hint)
-                .setPositiveButton(R.string.album_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        callbackCancel();
-                    }
-                })
-                .show();
+            .setCancelable(false)
+            .setTitle(R.string.album_title_permission_failed)
+            .setMessage(R.string.album_permission_storage_failed_hint)
+            .setPositiveButton(R.string.album_ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    callbackCancel();
+                }
+            })
+            .show();
     }
 
     @Override
-    public void onScanCallback(ArrayList<AlbumFolder> albumFolders, ArrayList<AlbumFile> checkedFiles) {
+    public void onScanCallback(@NonNull ArrayList<AlbumFolder> albumFolders, @NonNull ArrayList<AlbumFile> checkedFiles) {
         mMediaReadTask = null;
         switch (mChoiceMode) {
             case Album.MODE_MULTIPLE: {
@@ -213,9 +222,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case CODE_ACTIVITY_NULL: {
                 if (resultCode == RESULT_OK) {
-                    String imagePath = NullActivity.parsePath(data);
-                    String mimeType = AlbumUtils.getMimeType(imagePath);
-                    if (!TextUtils.isEmpty(mimeType)) mCameraAction.onAction(imagePath);
+                    AlbumCameraFile albumCameraFile = NullActivity.parseAlbumCameraFile(data);
+                    String mimeType = AlbumUtils.getMimeType(albumCameraFile.getPath());
+                    if (!TextUtils.isEmpty(mimeType)) {
+                        mCameraAction.onAction(albumCameraFile);
+                    }
                 } else {
                     callbackCancel();
                 }
@@ -235,7 +246,9 @@ public void onItemClick(View view, int position) {
                 }
             });
         }
-        if (!mFolderDialog.isShowing()) mFolderDialog.show();
+        if (!mFolderDialog.isShowing()) {
+            mFolderDialog.show();
+        }
     }
 
     /**
@@ -248,8 +261,8 @@ private void showFolderAlbumFiles(int position) {
     }
 
     @Override
-    public void clickCamera(View v) {
-        int hasCheckSize = mCheckedList.size();
+    public void clickCamera(@NonNull View v) {
+        int hasCheckSize = mCheckedList == null ? 0 : mCheckedList.size();
         if (hasCheckSize >= mLimitCount) {
             int messageRes;
             switch (mFunction) {
@@ -309,48 +322,49 @@ public boolean onMenuItemClick(MenuItem item) {
 
     private void takePicture() {
         String filePath;
-        if (mCurrentFolder == 0) {
-            filePath = AlbumUtils.randomJPGPath();
-        } else {
-            File file = new File(mAlbumFolders.get(mCurrentFolder).getAlbumFiles().get(0).getPath());
-            filePath = AlbumUtils.randomJPGPath(file.getParentFile());
-        }
+        filePath = AlbumUtils.randomJPGPath(this.getApplicationContext());
+        //        if (mCurrentFolder == 0) {
+        //            filePath = AlbumUtils.randomJPGPath(this.getApplicationContext());
+        //        } else {
+        ////            File file = new File(mAlbumFolders.get(mCurrentFolder).getAlbumFiles().get(0).getPath());
+        //            filePath = AlbumUtils.randomJPGPath(this.getApplicationContext());
+        //        }
         Album.camera(this)
-                .image()
-                .filePath(filePath)
-                .onResult(mCameraAction)
-                .start();
+            .image()
+            .filePath(filePath)
+            .onResult(mCameraAction)
+            .start();
     }
 
     private void takeVideo() {
         String filePath;
-        if (mCurrentFolder == 0) {
-            filePath = AlbumUtils.randomMP4Path();
-        } else {
-            File file = new File(mAlbumFolders.get(mCurrentFolder).getAlbumFiles().get(0).getPath());
-            filePath = AlbumUtils.randomMP4Path(file.getParentFile());
-        }
+        //        if (mCurrentFolder == 0) {
+        //            fileUri = AlbumUtils.randomMP4Path(this.getApplicationContext());
+        //        } else {
+        //            File file = new File(mAlbumFolders.get(mCurrentFolder).getAlbumFiles().get(0).getPath());
+        //            fileUri = AlbumUtils.randomMP4Path(this.getApplicationContext(), file.getParentFile());
+        //        }
+        filePath = AlbumUtils.randomMP4Path(this.getApplicationContext());
         Album.camera(this)
-                .video()
-                .filePath(filePath)
-                .quality(mQuality)
-                .limitDuration(mLimitDuration)
-                .limitBytes(mLimitBytes)
-                .onResult(mCameraAction)
-                .start();
+            .video()
+            .filePath(filePath)
+            .quality(mQuality)
+            .limitDuration(mLimitDuration)
+            .limitBytes(mLimitBytes)
+            .onResult(mCameraAction)
+            .start();
     }
 
-    private Action<String> mCameraAction = new Action<String>() {
+    private Action<AlbumCameraFile> mCameraAction = new Action<AlbumCameraFile>() {
         @Override
-        public void onAction(@NonNull String result) {
+        public void onAction(@NonNull AlbumCameraFile result) {
             if (mMediaScanner == null) {
                 mMediaScanner = new MediaScanner(AlbumActivity.this);
             }
-            mMediaScanner.scan(result);
-
+            mMediaScanner.scan(result.getPath());
             PathConversion conversion = new PathConversion(sSizeFilter, sMimeFilter, sDurationFilter);
-            PathConvertTask task = new PathConvertTask(conversion, AlbumActivity.this);
-            task.execute(result);
+            PathConvertTask task = new PathConvertTask(AlbumActivity.this, conversion, AlbumActivity.this);
+            task.execute(result.getPath());
         }
     };
 
@@ -364,8 +378,11 @@ public void onConvertStart() {
     public void onConvertCallback(AlbumFile albumFile) {
         albumFile.setChecked(!albumFile.isDisable());
         if (albumFile.isDisable()) {
-            if (mFilterVisibility) addFileToList(albumFile);
-            else mView.toast(getString(R.string.album_take_file_unavailable));
+            if (mFilterVisibility) {
+                addFileToList(albumFile);
+            } else {
+                mView.toast(getString(R.string.album_take_file_unavailable));
+            }
         } else {
             addFileToList(albumFile);
         }
@@ -376,8 +393,11 @@ public void onConvertCallback(AlbumFile albumFile) {
     private void addFileToList(AlbumFile albumFile) {
         if (mCurrentFolder != 0) {
             List<AlbumFile> albumFiles = mAlbumFolders.get(0).getAlbumFiles();
-            if (albumFiles.size() > 0) albumFiles.add(0, albumFile);
-            else albumFiles.add(albumFile);
+            if (albumFiles.size() > 0) {
+                albumFiles.add(0, albumFile);
+            } else {
+                albumFiles.add(albumFile);
+            }
         }
 
         AlbumFolder albumFolder = mAlbumFolders.get(mCurrentFolder);
@@ -411,7 +431,7 @@ private void addFileToList(AlbumFile albumFile) {
     }
 
     @Override
-    public void tryCheckItem(CompoundButton button, int position) {
+    public void tryCheckItem(@NonNull CompoundButton button, int position) {
         AlbumFile albumFile = mAlbumFolders.get(mCurrentFolder).getAlbumFiles().get(position);
         if (button.isChecked()) {
             if (mCheckedList.size() >= mLimitCount) {
@@ -458,8 +478,8 @@ public void tryPreviewItem(int position) {
         switch (mChoiceMode) {
             case Album.MODE_SINGLE: {
                 AlbumFile albumFile = mAlbumFolders.get(mCurrentFolder).getAlbumFiles().get(position);
-//                albumFile.setChecked(true);
-//                mView.notifyItem(position);
+                //                albumFile.setChecked(true);
+                //                mView.notifyItem(position);
                 mCheckedList.add(albumFile);
                 setCheckedCount();
 
@@ -501,16 +521,18 @@ public void onPreviewComplete() {
     }
 
     @Override
-    public void onPreviewChanged(AlbumFile albumFile) {
+    public void onPreviewChanged(@NonNull AlbumFile albumFile) {
         ArrayList<AlbumFile> albumFiles = mAlbumFolders.get(mCurrentFolder).getAlbumFiles();
         int position = albumFiles.indexOf(albumFile);
         int notifyPosition = mHasCamera ? position + 1 : position;
         mView.notifyItem(notifyPosition);
 
         if (albumFile.isChecked()) {
-            if (!mCheckedList.contains(albumFile)) mCheckedList.add(albumFile);
+            if (!mCheckedList.contains(albumFile)) {
+                mCheckedList.add(albumFile);
+            }
         } else {
-            if (mCheckedList.contains(albumFile)) mCheckedList.remove(albumFile);
+            mCheckedList.remove(albumFile);
         }
         setCheckedCount();
     }
@@ -544,7 +566,9 @@ public void complete() {
 
     @Override
     public void onBackPressed() {
-        if (mMediaReadTask != null) mMediaReadTask.cancel(true);
+        if (mMediaReadTask != null) {
+            mMediaReadTask.cancel(true);
+        }
         callbackCancel();
     }
 
@@ -552,7 +576,7 @@ public void onBackPressed() {
      * Callback result action.
      */
     private void callbackResult() {
-        ThumbnailBuildTask task = new ThumbnailBuildTask(this, mCheckedList, this);
+        ThumbnailBuildTask task = new ThumbnailBuildTask(this.getApplicationContext(), mCheckedList, this);
         task.execute();
     }
 
@@ -563,8 +587,10 @@ public void onThumbnailStart() {
     }
 
     @Override
-    public void onThumbnailCallback(ArrayList<AlbumFile> albumFiles) {
-        if (sResult != null) sResult.onAction(albumFiles);
+    public void onThumbnailCallback(@NonNull ArrayList<AlbumFile> albumFiles) {
+        if (sResult != null) {
+            sResult.onAction(albumFiles);
+        }
         dismissLoadingDialog();
         finish();
     }
@@ -573,7 +599,9 @@ public void onThumbnailCallback(ArrayList<AlbumFile> albumFiles) {
      * Callback cancel action.
      */
     private void callbackCancel() {
-        if (sCancel != null) sCancel.onAction("User canceled.");
+        if (sCancel != null) {
+            sCancel.onAction("User canceled.");
+        }
         finish();
     }
 
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/AlbumAdapter.java b/album/src/main/java/com/yanzhenjie/album/app/album/AlbumAdapter.java
index d4e7eaa..48567e0 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/AlbumAdapter.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/AlbumAdapter.java
@@ -17,9 +17,9 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/AlbumView.java b/album/src/main/java/com/yanzhenjie/album/app/album/AlbumView.java
index 643a1bb..4303158 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/AlbumView.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/AlbumView.java
@@ -19,10 +19,10 @@
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/FolderAdapter.java b/album/src/main/java/com/yanzhenjie/album/app/album/FolderAdapter.java
index 74daa5f..aed9d84 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/FolderAdapter.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/FolderAdapter.java
@@ -17,8 +17,8 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.support.v7.widget.AppCompatRadioButton;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.widget.AppCompatRadioButton;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/FolderDialog.java b/album/src/main/java/com/yanzhenjie/album/app/album/FolderDialog.java
index 427bd15..7419e84 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/FolderDialog.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/FolderDialog.java
@@ -19,15 +19,14 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
 import android.view.Window;
-import android.widget.FrameLayout;
 
 import com.yanzhenjie.album.AlbumFolder;
 import com.yanzhenjie.album.R;
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/GalleryActivity.java b/album/src/main/java/com/yanzhenjie/album/app/album/GalleryActivity.java
index d235365..6b9dd85 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/GalleryActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/GalleryActivity.java
@@ -16,7 +16,9 @@
 package com.yanzhenjie.album.app.album;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.AlbumFile;
@@ -193,6 +195,6 @@ public interface Callback {
          *
          * @param albumFile target item.
          */
-        void onPreviewChanged(AlbumFile albumFile);
+        void onPreviewChanged(@NonNull AlbumFile albumFile);
     }
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/NullActivity.java b/album/src/main/java/com/yanzhenjie/album/app/album/NullActivity.java
index f9bb853..12f29ed 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/NullActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/NullActivity.java
@@ -17,11 +17,12 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.Album;
+import com.yanzhenjie.album.AlbumCameraFile;
 import com.yanzhenjie.album.R;
 import com.yanzhenjie.album.api.widget.Widget;
 import com.yanzhenjie.album.app.Contract;
@@ -31,39 +32,39 @@
  * Created by YanZhenjie on 2017/3/28.
  */
 public class NullActivity extends BaseActivity implements Contract.NullPresenter {
-
+    
     private static final String KEY_OUTPUT_IMAGE_PATH = "KEY_OUTPUT_IMAGE_PATH";
-
-    public static String parsePath(Intent intent) {
-        return intent.getStringExtra(KEY_OUTPUT_IMAGE_PATH);
+    
+    public static AlbumCameraFile parseAlbumCameraFile(Intent intent) {
+        return intent.getParcelableExtra(KEY_OUTPUT_IMAGE_PATH);
     }
-
+    
     private Widget mWidget;
     private int mQuality = 1;
     private long mLimitDuration;
     private long mLimitBytes;
-
+    
     private Contract.NullView mView;
-
+    
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.album_activity_null);
         mView = new NullView(this, this);
-
+        
         Bundle argument = getIntent().getExtras();
         assert argument != null;
         int function = argument.getInt(Album.KEY_INPUT_FUNCTION);
         boolean hasCamera = argument.getBoolean(Album.KEY_INPUT_ALLOW_CAMERA);
-
+        
         mQuality = argument.getInt(Album.KEY_INPUT_CAMERA_QUALITY);
         mLimitDuration = argument.getLong(Album.KEY_INPUT_CAMERA_DURATION);
         mLimitBytes = argument.getLong(Album.KEY_INPUT_CAMERA_BYTES);
-
+        
         mWidget = argument.getParcelable(Album.KEY_INPUT_WIDGET);
         mView.setupViews(mWidget);
         mView.setTitle(mWidget.getTitle());
-
+        
         switch (function) {
             case Album.FUNCTION_CHOICE_IMAGE: {
                 mView.setMessage(R.string.album_not_found_image);
@@ -83,35 +84,35 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 throw new AssertionError("This should not be the case.");
             }
         }
-
+        
         if (!hasCamera) {
             mView.setMakeImageDisplay(false);
             mView.setMakeVideoDisplay(false);
         }
     }
-
+    
     @Override
     public void takePicture() {
         Album.camera(this)
-                .image()
-                .onResult(mCameraAction)
-                .start();
+            .image()
+            .onResult(mCameraAction)
+            .start();
     }
-
+    
     @Override
     public void takeVideo() {
         Album.camera(this)
-                .video()
-                .quality(mQuality)
-                .limitDuration(mLimitDuration)
-                .limitBytes(mLimitBytes)
-                .onResult(mCameraAction)
-                .start();
+            .video()
+            .quality(mQuality)
+            .limitDuration(mLimitDuration)
+            .limitBytes(mLimitBytes)
+            .onResult(mCameraAction)
+            .start();
     }
-
-    private Action<String> mCameraAction = new Action<String>() {
+    
+    private Action<AlbumCameraFile> mCameraAction = new Action<AlbumCameraFile>() {
         @Override
-        public void onAction(@NonNull String result) {
+        public void onAction(@NonNull AlbumCameraFile result) {
             Intent intent = new Intent();
             intent.putExtra(KEY_OUTPUT_IMAGE_PATH, result);
             setResult(RESULT_OK, intent);
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/NullView.java b/album/src/main/java/com/yanzhenjie/album/app/album/NullView.java
index 53ab655..300c231 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/NullView.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/NullView.java
@@ -18,8 +18,8 @@
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReadTask.java b/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReadTask.java
index 055c343..f4b551f 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReadTask.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReadTask.java
@@ -24,6 +24,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * <p>Image scan task.</p>
  * Created by Yan Zhenjie on 2017/3/28.
@@ -36,7 +39,7 @@ public interface Callback {
          *
          * @param albumFolders album folder list.
          */
-        void onScanCallback(ArrayList<AlbumFolder> albumFolders, ArrayList<AlbumFile> checkedFiles);
+        void onScanCallback(@NonNull ArrayList<AlbumFolder> albumFolders, @NonNull ArrayList<AlbumFile> checkedFiles);
     }
 
     static class ResultWrapper {
@@ -49,15 +52,16 @@ static class ResultWrapper {
     private MediaReader mMediaReader;
     private Callback mCallback;
 
-    public MediaReadTask(int function, List<AlbumFile> checkedFiles, MediaReader mediaReader, Callback callback) {
+    public MediaReadTask(int function, @Nullable List<AlbumFile> checkedFiles, @NonNull MediaReader mediaReader, @NonNull Callback callback) {
         this.mFunction = function;
         this.mCheckedFiles = checkedFiles;
         this.mMediaReader = mediaReader;
         this.mCallback = callback;
     }
 
+    @NonNull
     @Override
-    protected ResultWrapper doInBackground(Void... params) {
+    protected ResultWrapper doInBackground(@Nullable Void... params) {
         ArrayList<AlbumFolder> albumFolders;
         switch (mFunction) {
             case Album.FUNCTION_CHOICE_IMAGE: {
@@ -98,7 +102,7 @@ protected ResultWrapper doInBackground(Void... params) {
     }
 
     @Override
-    protected void onPostExecute(ResultWrapper wrapper) {
+    protected void onPostExecute(@NonNull ResultWrapper wrapper) {
         mCallback.onScanCallback(wrapper.mAlbumFolders, wrapper.mAlbumFiles);
     }
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReader.java b/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReader.java
index 7acdced..d756078 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReader.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/data/MediaReader.java
@@ -16,16 +16,24 @@
 package com.yanzhenjie.album.app.album.data;
 
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
 import android.database.Cursor;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 
 import com.yanzhenjie.album.AlbumFile;
 import com.yanzhenjie.album.AlbumFolder;
 import com.yanzhenjie.album.Filter;
 import com.yanzhenjie.album.R;
+import com.yanzhenjie.album.util.AlbumUtils;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -35,36 +43,37 @@
  * Created by YanZhenjie on 2017/8/15.
  */
 public class MediaReader {
-
+    
     private Context mContext;
-
+    
     private Filter<Long> mSizeFilter;
     private Filter<String> mMimeFilter;
     private Filter<Long> mDurationFilter;
     private boolean mFilterVisibility;
-
+    
     public MediaReader(Context context, Filter<Long> sizeFilter, Filter<String> mimeFilter, Filter<Long> durationFilter, boolean filterVisibility) {
         this.mContext = context;
-
+        
         this.mSizeFilter = sizeFilter;
         this.mMimeFilter = mimeFilter;
         this.mDurationFilter = durationFilter;
         this.mFilterVisibility = filterVisibility;
     }
-
+    
     /**
      * Image attribute.
      */
     private static final String[] IMAGES = {
-            MediaStore.Images.Media.DATA,
-            MediaStore.Images.Media.BUCKET_DISPLAY_NAME,
-            MediaStore.Images.Media.MIME_TYPE,
-            MediaStore.Images.Media.DATE_ADDED,
-            MediaStore.Images.Media.LATITUDE,
-            MediaStore.Images.Media.LONGITUDE,
-            MediaStore.Images.Media.SIZE
+        MediaStore.Images.Media.DATA,
+        MediaStore.Images.Media.BUCKET_DISPLAY_NAME,
+        MediaStore.Images.Media.MIME_TYPE,
+        MediaStore.Images.Media.DATE_ADDED,
+        MediaStore.Images.Media.LATITUDE,
+        MediaStore.Images.Media.LONGITUDE,
+        MediaStore.Images.Media.SIZE,
+        MediaStore.Images.Media._ID
     };
-
+    
     /**
      * Scan for image files.
      */
@@ -72,71 +81,100 @@ public MediaReader(Context context, Filter<Long> sizeFilter, Filter<String> mime
     private void scanImageFile(Map<String, AlbumFolder> albumFolderMap, AlbumFolder allFileFolder) {
         ContentResolver contentResolver = mContext.getContentResolver();
         Cursor cursor = contentResolver.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                IMAGES,
-                null,
-                null,
-                null);
-
+            IMAGES,
+            null,
+            null,
+            null);
+        
         if (cursor != null) {
             while (cursor.moveToNext()) {
-                String path = cursor.getString(0);
-                String bucketName = cursor.getString(1);
-                String mimeType = cursor.getString(2);
-                long addDate = cursor.getLong(3);
-                float latitude = cursor.getFloat(4);
-                float longitude = cursor.getFloat(5);
-                long size = cursor.getLong(6);
-
-                AlbumFile imageFile = new AlbumFile();
-                imageFile.setMediaType(AlbumFile.TYPE_IMAGE);
-                imageFile.setPath(path);
-                imageFile.setBucketName(bucketName);
-                imageFile.setMimeType(mimeType);
-                imageFile.setAddDate(addDate);
-                imageFile.setLatitude(latitude);
-                imageFile.setLongitude(longitude);
-                imageFile.setSize(size);
-
-                if (mSizeFilter != null && mSizeFilter.filter(size)) {
-                    if (!mFilterVisibility) continue;
-                    imageFile.setDisable(true);
-                }
-                if (mMimeFilter != null && mMimeFilter.filter(mimeType)) {
-                    if (!mFilterVisibility) continue;
-                    imageFile.setDisable(true);
-                }
-
-                allFileFolder.addAlbumFile(imageFile);
-                AlbumFolder albumFolder = albumFolderMap.get(bucketName);
-
-                if (albumFolder != null)
-                    albumFolder.addAlbumFile(imageFile);
-                else {
-                    albumFolder = new AlbumFolder();
-                    albumFolder.setName(bucketName);
-                    albumFolder.addAlbumFile(imageFile);
-
-                    albumFolderMap.put(bucketName, albumFolder);
+                try {
+                    //Android Q 公有目录只能通过Content Uri + id的方式访问，以前的File路径全部无效，如果是Video，记得换成MediaStore.Videos
+                    String id = cursor.getString(7);
+                    Uri uri = Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id);
+                    String path = cursor.getString(0);
+                    String bucketName = cursor.getString(1);
+                    String mimeType = cursor.getString(2);
+                    long addDate = cursor.getLong(3);
+                    float latitude = 0;
+                    float longitude = 0;
+                    if (AlbumUtils.isBeforeAndroidTen()) {
+                        latitude = cursor.getFloat(4);
+                        longitude = cursor.getFloat(5);
+                    } else {
+                        float[] latLong = getMediaLatLong(uri);
+                        if (latLong.length > 1) {
+                            latitude = latLong[0];
+                            longitude = latLong[1];
+                        }
+                    }
+                    long size = cursor.getLong(6);
+                    
+                    //                    if (!AlbumUtils.isBeforeAndroidTen()) {
+                    //                        path = MediaStore.Images.Media
+                    //                            .EXTERNAL_CONTENT_URI
+                    //                            .buildUpon()
+                    //                            .appendPath(String.valueOf(id)).build().toString();
+                    //                    }
+                    AlbumFile imageFile = new AlbumFile();
+                    imageFile.setMediaType(AlbumFile.TYPE_IMAGE);
+                    //                    imageFile.setPath(path);
+                    imageFile.setUri(uri);
+                    imageFile.setBucketName(bucketName);
+                    imageFile.setMimeType(mimeType);
+                    imageFile.setAddDate(addDate);
+                    imageFile.setLatitude(latitude);
+                    imageFile.setLongitude(longitude);
+                    imageFile.setSize(size);
+                    
+                    if (mSizeFilter != null && mSizeFilter.filter(size)) {
+                        if (!mFilterVisibility) {
+                            continue;
+                        }
+                        imageFile.setDisable(true);
+                    }
+                    if (mMimeFilter != null && mMimeFilter.filter(mimeType)) {
+                        if (!mFilterVisibility) {
+                            continue;
+                        }
+                        imageFile.setDisable(true);
+                    }
+                    
+                    allFileFolder.addAlbumFile(imageFile);
+                    AlbumFolder albumFolder = albumFolderMap.get(bucketName);
+                    
+                    if (albumFolder != null) {
+                        albumFolder.addAlbumFile(imageFile);
+                    } else {
+                        albumFolder = new AlbumFolder();
+                        albumFolder.setName(bucketName);
+                        albumFolder.addAlbumFile(imageFile);
+                        
+                        albumFolderMap.put(bucketName, albumFolder);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
             cursor.close();
         }
     }
-
+    
     /**
      * Video attribute.
      */
     private static final String[] VIDEOS = {
-            MediaStore.Video.Media.DATA,
-            MediaStore.Video.Media.BUCKET_DISPLAY_NAME,
-            MediaStore.Video.Media.MIME_TYPE,
-            MediaStore.Video.Media.DATE_ADDED,
-            MediaStore.Video.Media.LATITUDE,
-            MediaStore.Video.Media.LONGITUDE,
-            MediaStore.Video.Media.SIZE,
-            MediaStore.Video.Media.DURATION
+        MediaStore.Video.Media.DATA,
+        MediaStore.Video.Media.BUCKET_DISPLAY_NAME,
+        MediaStore.Video.Media.MIME_TYPE,
+        MediaStore.Video.Media.DATE_ADDED,
+        MediaStore.Video.Media.LATITUDE,
+        MediaStore.Video.Media.LONGITUDE,
+        MediaStore.Video.Media.SIZE,
+        MediaStore.Video.Media.DURATION,
+        MediaStore.Video.Media._ID
     };
-
+    
     /**
      * Scan for image files.
      */
@@ -144,25 +182,43 @@ private void scanImageFile(Map<String, AlbumFolder> albumFolderMap, AlbumFolder
     private void scanVideoFile(Map<String, AlbumFolder> albumFolderMap, AlbumFolder allFileFolder) {
         ContentResolver contentResolver = mContext.getContentResolver();
         Cursor cursor = contentResolver.query(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
-                VIDEOS,
-                null,
-                null,
-                null);
-
+            VIDEOS,
+            null,
+            null,
+            null);
+        
         if (cursor != null) {
             while (cursor.moveToNext()) {
+                String id = cursor.getString(8);
                 String path = cursor.getString(0);
+                Uri uri = Uri.withAppendedPath(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, id);
                 String bucketName = cursor.getString(1);
                 String mimeType = cursor.getString(2);
                 long addDate = cursor.getLong(3);
-                float latitude = cursor.getFloat(4);
-                float longitude = cursor.getFloat(5);
+                float latitude = 0f;
+                float longitude = 0f;
+                if (AlbumUtils.isBeforeAndroidTen()) {
+                    latitude = cursor.getFloat(4);
+                    longitude = cursor.getFloat(5);
+                } else {
+                    float[] latLong = getMediaLatLong(uri);
+                    if (latLong != null && latLong.length > 1) {
+                        latitude = latLong[0];
+                        longitude = latLong[1];
+                    }
+                }
                 long size = cursor.getLong(6);
                 long duration = cursor.getLong(7);
-
+                //                if (!AlbumUtils.isBeforeAndroidTen()) {
+                //                    path = MediaStore.Video.Media
+                //                        .EXTERNAL_CONTENT_URI
+                //                        .buildUpon()
+                //                        .appendPath(String.valueOf(id)).build().toString();
+                //                }
                 AlbumFile videoFile = new AlbumFile();
                 videoFile.setMediaType(AlbumFile.TYPE_VIDEO);
-                videoFile.setPath(path);
+                //                videoFile.setPath(path);
+                videoFile.setUri(uri);
                 videoFile.setBucketName(bucketName);
                 videoFile.setMimeType(mimeType);
                 videoFile.setAddDate(addDate);
@@ -170,37 +226,158 @@ private void scanVideoFile(Map<String, AlbumFolder> albumFolderMap, AlbumFolder
                 videoFile.setLongitude(longitude);
                 videoFile.setSize(size);
                 videoFile.setDuration(duration);
-
+                
                 if (mSizeFilter != null && mSizeFilter.filter(size)) {
-                    if (!mFilterVisibility) continue;
+                    if (!mFilterVisibility) {
+                        continue;
+                    }
                     videoFile.setDisable(true);
                 }
                 if (mMimeFilter != null && mMimeFilter.filter(mimeType)) {
-                    if (!mFilterVisibility) continue;
+                    if (!mFilterVisibility) {
+                        continue;
+                    }
                     videoFile.setDisable(true);
                 }
                 if (mDurationFilter != null && mDurationFilter.filter(duration)) {
-                    if (!mFilterVisibility) continue;
+                    if (!mFilterVisibility) {
+                        continue;
+                    }
                     videoFile.setDisable(true);
                 }
-
+                
                 allFileFolder.addAlbumFile(videoFile);
                 AlbumFolder albumFolder = albumFolderMap.get(bucketName);
-
-                if (albumFolder != null)
+                
+                if (albumFolder != null) {
                     albumFolder.addAlbumFile(videoFile);
-                else {
+                } else {
                     albumFolder = new AlbumFolder();
                     albumFolder.setName(bucketName);
                     albumFolder.addAlbumFile(videoFile);
-
+                    
                     albumFolderMap.put(bucketName, albumFolder);
                 }
             }
             cursor.close();
         }
     }
-
+    
+    private float[] getMediaLatLong(Uri mediaUri) {
+        float[] latLong = new float[2];
+        if (!AlbumUtils.isBeforeAndroidTen()) {
+            InputStream stream;
+            try {
+                // 从ExifInterface类获取位置信息
+                mediaUri = MediaStore.setRequireOriginal(mediaUri);
+                stream = mContext.getContentResolver().openInputStream(mediaUri);
+                if (stream != null) {
+                    ExifInterface exifInterface = new ExifInterface(stream);
+                    exifInterface.getLatLong(latLong);
+                    // Don't reuse the stream associated with the instance of "ExifInterface".
+                    stream.close();
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+        return latLong;
+    }
+    
+    public static String getFilePathByUriBeforeAndroidQ(Context context, Uri uri) {
+        String path = null;
+        // 以 file:// 开头的
+        if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
+            path = uri.getPath();
+            return path;
+        }
+        // 以 content:// 开头的，比如 content://media/extenral/images/media/17766
+        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()) && Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+            Cursor cursor = context.getContentResolver().query(uri, new String[]{MediaStore.Images.Media.DATA}, null, null, null);
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                    if (columnIndex > -1) {
+                        path = cursor.getString(columnIndex);
+                    }
+                }
+                cursor.close();
+            }
+            return path;
+        }
+        // 4.4及之后的 是以 content:// 开头的，比如 content://com.android.providers.media.documents/document/image%3A235700
+        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            if (DocumentsContract.isDocumentUri(context, uri)) {
+                if (isExternalStorageDocument(uri)) {
+                    // ExternalStorageProvider
+                    final String docId = DocumentsContract.getDocumentId(uri);
+                    final String[] split = docId.split(":");
+                    final String type = split[0];
+                    if ("primary".equalsIgnoreCase(type)) {
+                        path = Environment.getExternalStorageDirectory() + "/" + split[1];
+                        return path;
+                    }
+                } else if (isDownloadsDocument(uri)) {
+                    // DownloadsProvider
+                    final String id = DocumentsContract.getDocumentId(uri);
+                    final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"),
+                        Long.valueOf(id));
+                    path = getDataColumn(context, contentUri, null, null);
+                    return path;
+                } else if (isMediaDocument(uri)) {
+                    // MediaProvider
+                    final String docId = DocumentsContract.getDocumentId(uri);
+                    final String[] split = docId.split(":");
+                    final String type = split[0];
+                    Uri contentUri = null;
+                    if ("image".equals(type)) {
+                        contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                    } else if ("video".equals(type)) {
+                        contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                    } else if ("audio".equals(type)) {
+                        contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                    }
+                    final String selection = "_id=?";
+                    final String[] selectionArgs = new String[]{split[1]};
+                    path = getDataColumn(context, contentUri, selection, selectionArgs);
+                    return path;
+                }
+            }
+        }
+        return null;
+    }
+    
+    private static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
+        Cursor cursor = null;
+        final String column = "_data";
+        final String[] projection = {column};
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                final int column_index = cursor.getColumnIndexOrThrow(column);
+                return cursor.getString(column_index);
+            }
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return null;
+    }
+    
+    private static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+    
+    private static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
+    
+    private static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
+    }
+    
+    
     /**
      * Scan the list of pictures in the library.
      */
@@ -210,13 +387,13 @@ public ArrayList<AlbumFolder> getAllImage() {
         AlbumFolder allFileFolder = new AlbumFolder();
         allFileFolder.setChecked(true);
         allFileFolder.setName(mContext.getString(R.string.album_all_images));
-
+        
         scanImageFile(albumFolderMap, allFileFolder);
-
+        
         ArrayList<AlbumFolder> albumFolders = new ArrayList<>();
         Collections.sort(allFileFolder.getAlbumFiles());
         albumFolders.add(allFileFolder);
-
+        
         for (Map.Entry<String, AlbumFolder> folderEntry : albumFolderMap.entrySet()) {
             AlbumFolder albumFolder = folderEntry.getValue();
             Collections.sort(albumFolder.getAlbumFiles());
@@ -224,7 +401,7 @@ public ArrayList<AlbumFolder> getAllImage() {
         }
         return albumFolders;
     }
-
+    
     /**
      * Scan the list of videos in the library.
      */
@@ -234,13 +411,13 @@ public ArrayList<AlbumFolder> getAllVideo() {
         AlbumFolder allFileFolder = new AlbumFolder();
         allFileFolder.setChecked(true);
         allFileFolder.setName(mContext.getString(R.string.album_all_videos));
-
+        
         scanVideoFile(albumFolderMap, allFileFolder);
-
+        
         ArrayList<AlbumFolder> albumFolders = new ArrayList<>();
         Collections.sort(allFileFolder.getAlbumFiles());
         albumFolders.add(allFileFolder);
-
+        
         for (Map.Entry<String, AlbumFolder> folderEntry : albumFolderMap.entrySet()) {
             AlbumFolder albumFolder = folderEntry.getValue();
             Collections.sort(albumFolder.getAlbumFiles());
@@ -248,7 +425,7 @@ public ArrayList<AlbumFolder> getAllVideo() {
         }
         return albumFolders;
     }
-
+    
     /**
      * Get all the multimedia files, including videos and pictures.
      */
@@ -258,14 +435,14 @@ public ArrayList<AlbumFolder> getAllMedia() {
         AlbumFolder allFileFolder = new AlbumFolder();
         allFileFolder.setChecked(true);
         allFileFolder.setName(mContext.getString(R.string.album_all_images_videos));
-
+        
         scanImageFile(albumFolderMap, allFileFolder);
         scanVideoFile(albumFolderMap, allFileFolder);
-
+        
         ArrayList<AlbumFolder> albumFolders = new ArrayList<>();
         Collections.sort(allFileFolder.getAlbumFiles());
         albumFolders.add(allFileFolder);
-
+        
         for (Map.Entry<String, AlbumFolder> folderEntry : albumFolderMap.entrySet()) {
             AlbumFolder albumFolder = folderEntry.getValue();
             Collections.sort(albumFolder.getAlbumFiles());
@@ -273,5 +450,5 @@ public ArrayList<AlbumFolder> getAllMedia() {
         }
         return albumFolders;
     }
-
+    
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConversion.java b/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConversion.java
index 9ab92a3..a82ec35 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConversion.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConversion.java
@@ -15,9 +15,8 @@
  */
 package com.yanzhenjie.album.app.album.data;
 
+import android.content.Context;
 import android.media.MediaPlayer;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
 
 import com.yanzhenjie.album.AlbumFile;
@@ -26,32 +25,35 @@
 
 import java.io.File;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+
 /**
  * Created by YanZhenjie on 2017/10/18.
  */
 public class PathConversion {
-
+    
     private Filter<Long> mSizeFilter;
     private Filter<String> mMimeFilter;
     private Filter<Long> mDurationFilter;
-
+    
     public PathConversion(Filter<Long> sizeFilter, Filter<String> mimeFilter, Filter<Long> durationFilter) {
         this.mSizeFilter = sizeFilter;
         this.mMimeFilter = mimeFilter;
         this.mDurationFilter = durationFilter;
     }
-
+    
     @WorkerThread
     @NonNull
-    public AlbumFile convert(String filePath) {
+    public AlbumFile convert(Context context, String filePath) {
         File file = new File(filePath);
-
+        
         AlbumFile albumFile = new AlbumFile();
-        albumFile.setPath(filePath);
-
+        albumFile.setUri(AlbumUtils.getUri(context, filePath));
+        
         File parentFile = file.getParentFile();
         albumFile.setBucketName(parentFile.getName());
-
+        
         String mimeType = AlbumUtils.getMimeType(filePath);
         albumFile.setMimeType(mimeType);
         long nowTime = System.currentTimeMillis();
@@ -59,20 +61,22 @@ public AlbumFile convert(String filePath) {
         albumFile.setSize(file.length());
         int mediaType = 0;
         if (!TextUtils.isEmpty(mimeType)) {
-            if (mimeType.contains("video"))
+            if (mimeType.contains("video")) {
                 mediaType = AlbumFile.TYPE_VIDEO;
-            if (mimeType.contains("image"))
+            }
+            if (mimeType.contains("image")) {
                 mediaType = AlbumFile.TYPE_IMAGE;
+            }
         }
         albumFile.setMediaType(mediaType);
-
+        
         if (mSizeFilter != null && mSizeFilter.filter(file.length())) {
             albumFile.setDisable(true);
         }
         if (mMimeFilter != null && mMimeFilter.filter(mimeType)) {
             albumFile.setDisable(true);
         }
-
+        
         if (mediaType == AlbumFile.TYPE_VIDEO) {
             MediaPlayer player = new MediaPlayer();
             try {
@@ -83,12 +87,12 @@ public AlbumFile convert(String filePath) {
             } finally {
                 player.release();
             }
-
+            
             if (mDurationFilter != null && mDurationFilter.filter(albumFile.getDuration())) {
                 albumFile.setDisable(true);
             }
         }
         return albumFile;
     }
-
+    
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConvertTask.java b/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConvertTask.java
index 74aef9a..70c9c85 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConvertTask.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/data/PathConvertTask.java
@@ -15,6 +15,7 @@
  */
 package com.yanzhenjie.album.app.album.data;
 
+import android.content.Context;
 import android.os.AsyncTask;
 
 import com.yanzhenjie.album.AlbumFile;
@@ -23,13 +24,13 @@
  * Created by YanZhenjie on 2017/10/18.
  */
 public class PathConvertTask extends AsyncTask<String, Void, AlbumFile> {
-
+    
     public interface Callback {
         /**
          * The task begins.
          */
         void onConvertStart();
-
+        
         /**
          * Callback results.
          *
@@ -37,25 +38,27 @@ public interface Callback {
          */
         void onConvertCallback(AlbumFile albumFile);
     }
-
+    
     private PathConversion mConversion;
     private Callback mCallback;
-
-    public PathConvertTask(PathConversion conversion, Callback callback) {
+    private Context mContext;
+    
+    public PathConvertTask(Context context, PathConversion conversion, Callback callback) {
+        this.mContext = context;
         this.mConversion = conversion;
         this.mCallback = callback;
     }
-
+    
     @Override
     protected void onPreExecute() {
         mCallback.onConvertStart();
     }
-
+    
     @Override
     protected AlbumFile doInBackground(String... params) {
-        return mConversion.convert(params[0]);
+        return mConversion.convert(mContext, params[0]);
     }
-
+    
     @Override
     protected void onPostExecute(AlbumFile file) {
         mCallback.onConvertCallback(file);
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuildTask.java b/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuildTask.java
index 6263d6c..bedf4e2 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuildTask.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuildTask.java
@@ -22,6 +22,9 @@
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Created by YanZhenjie on 2017/10/15.
  */
@@ -38,18 +41,23 @@ public interface Callback {
          *
          * @param albumFiles result.
          */
-        void onThumbnailCallback(ArrayList<AlbumFile> albumFiles);
+        void onThumbnailCallback(@NonNull ArrayList<AlbumFile> albumFiles);
     }
 
     private ArrayList<AlbumFile> mAlbumFiles;
     private Callback mCallback;
 
     private ThumbnailBuilder mThumbnailBuilder;
+    private Context mContext;
 
-    public ThumbnailBuildTask(Context context, ArrayList<AlbumFile> albumFiles, Callback callback) {
+    public ThumbnailBuildTask(@NonNull Context context, @Nullable ArrayList<AlbumFile> albumFiles, @NonNull Callback callback) {
         this.mAlbumFiles = albumFiles;
+        if (mAlbumFiles == null) {
+            mAlbumFiles = new ArrayList<>();
+        }
         this.mCallback = callback;
-        this.mThumbnailBuilder = new ThumbnailBuilder(context);
+        this.mContext = context;
+        this.mThumbnailBuilder = new ThumbnailBuilder(mContext);
     }
 
     @Override
@@ -57,21 +65,22 @@ protected void onPreExecute() {
         mCallback.onThumbnailStart();
     }
 
+    @NonNull
     @Override
-    protected ArrayList<AlbumFile> doInBackground(Void... params) {
+    protected ArrayList<AlbumFile> doInBackground(@NonNull Void... params) {
         for (AlbumFile albumFile : mAlbumFiles) {
             int mediaType = albumFile.getMediaType();
             if (mediaType == AlbumFile.TYPE_IMAGE) {
-                albumFile.setThumbPath(mThumbnailBuilder.createThumbnailForImage(albumFile.getPath()));
+                albumFile.setThumbUri(mThumbnailBuilder.createThumbnailForImage(mContext, albumFile.getUri(), albumFile.getMimeType()));
             } else if (mediaType == AlbumFile.TYPE_VIDEO) {
-                albumFile.setThumbPath(mThumbnailBuilder.createThumbnailForVideo(albumFile.getPath()));
+                albumFile.setThumbUri(mThumbnailBuilder.createThumbnailForVideo(mContext, albumFile.getUri()));
             }
         }
         return mAlbumFiles;
     }
 
     @Override
-    protected void onPostExecute(ArrayList<AlbumFile> albumFiles) {
+    protected void onPostExecute(@NonNull ArrayList<AlbumFile> albumFiles) {
         mCallback.onThumbnailCallback(albumFiles);
     }
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuilder.java b/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuilder.java
index 55deefc..e9606b5 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuilder.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/album/data/ThumbnailBuilder.java
@@ -21,161 +21,183 @@
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 import android.media.MediaMetadataRetriever;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
 import android.text.TextUtils;
 import android.webkit.URLUtil;
 
 import com.yanzhenjie.album.util.AlbumUtils;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
+import java.io.FileDescriptor;
 import java.io.FileOutputStream;
 import java.util.HashMap;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
 /**
  * Created by YanZhenjie on 2017/10/15.
  */
 public class ThumbnailBuilder {
-
+    
     private static final int THUMBNAIL_SIZE = 360;
     private static final int THUMBNAIL_QUALITY = 80;
-
+    
     private File mCacheDir;
-
+    
     public ThumbnailBuilder(Context context) {
         this.mCacheDir = AlbumUtils.getAlbumRootPath(context);
-        if (mCacheDir.exists() && mCacheDir.isFile()) mCacheDir.delete();
-        if (!mCacheDir.exists()) mCacheDir.mkdirs();
+        if (mCacheDir.exists() && mCacheDir.isFile()) {
+            mCacheDir.delete();
+        }
+        if (!mCacheDir.exists()) {
+            mCacheDir.mkdirs();
+        }
     }
-
+    
     /**
      * Create a thumbnail for the image.
      *
-     * @param imagePath image path.
+     * @param imageUri image path.
      * @return thumbnail path.
      */
     @WorkerThread
     @Nullable
-    public String createThumbnailForImage(String imagePath) {
-        if (TextUtils.isEmpty(imagePath)) return null;
-
-        File inFile = new File(imagePath);
-        if (!inFile.exists()) return null;
-
-        File thumbnailFile = randomPath(imagePath);
-        if (thumbnailFile.exists()) return thumbnailFile.getAbsolutePath();
-
-        Bitmap inBitmap = readImageFromPath(imagePath, THUMBNAIL_SIZE, THUMBNAIL_SIZE);
-        if (inBitmap == null) return null;
-
+    public Uri createThumbnailForImage(Context context, Uri imageUri, String mimeType) {
+        if (imageUri == null || TextUtils.isEmpty(imageUri.toString())) {
+            return null;
+        }
+        
+        //        File inFile = new File(imagePath);
+        //        if (!inFile.exists()) {
+        //            return null;
+        //        }
+        
+        File thumbnailFile = randomPath(imageUri.toString());
+        if (thumbnailFile.exists()) {
+            return AlbumUtils.getUri(context, thumbnailFile.getAbsolutePath());
+        }
+        
+        Bitmap inBitmap = readImageFromPath(context, imageUri, THUMBNAIL_SIZE, THUMBNAIL_SIZE, mimeType);
+        if (inBitmap == null) {
+            return null;
+        }
+        
         ByteArrayOutputStream compressStream = new ByteArrayOutputStream();
         inBitmap.compress(Bitmap.CompressFormat.JPEG, THUMBNAIL_QUALITY, compressStream);
-
+        
         try {
             compressStream.close();
             thumbnailFile.createNewFile();
-
             FileOutputStream writeStream = new FileOutputStream(thumbnailFile);
             writeStream.write(compressStream.toByteArray());
             writeStream.flush();
             writeStream.close();
-            return thumbnailFile.getAbsolutePath();
+            return AlbumUtils.getUri(context, thumbnailFile.getAbsolutePath());
         } catch (Exception ignored) {
             return null;
         }
     }
-
+    
     /**
      * Create a thumbnail for the video.
      *
-     * @param videoPath video path.
+     * @param videoUri video path.
      * @return thumbnail path.
      */
     @WorkerThread
     @Nullable
-    public String createThumbnailForVideo(String videoPath) {
-        if (TextUtils.isEmpty(videoPath)) return null;
-
-        File thumbnailFile = randomPath(videoPath);
-        if (thumbnailFile.exists()) return thumbnailFile.getAbsolutePath();
-
+    public Uri createThumbnailForVideo(Context context, Uri videoUri) {
+        if (videoUri == null || TextUtils.isEmpty(videoUri.toString())) {
+            return null;
+        }
+        
+        File thumbnailFile = randomPath(videoUri.toString());
+        if (thumbnailFile.exists()) {
+            return AlbumUtils.getUri(context, thumbnailFile.getAbsolutePath());
+        }
+        
         try {
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-            if (URLUtil.isNetworkUrl(videoPath)) {
-                retriever.setDataSource(videoPath, new HashMap<String, String>());
+            if (URLUtil.isNetworkUrl(videoUri.toString())) {
+                retriever.setDataSource(videoUri.toString(), new HashMap<String, String>());
             } else {
-                retriever.setDataSource(videoPath);
+                ParcelFileDescriptor parcelFileDescriptor = context.getContentResolver().openFileDescriptor(videoUri, "r");
+                FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
+                retriever.setDataSource(fileDescriptor);
             }
             Bitmap bitmap = retriever.getFrameAtTime();
             thumbnailFile.createNewFile();
             bitmap.compress(Bitmap.CompressFormat.JPEG, THUMBNAIL_QUALITY, new FileOutputStream(thumbnailFile));
-            return thumbnailFile.getAbsolutePath();
+            return AlbumUtils.getUri(context, thumbnailFile.getAbsolutePath());
         } catch (Exception ignored) {
             return null;
         }
     }
-
+    
     private File randomPath(String filePath) {
         String outFilePath = AlbumUtils.getMD5ForString(filePath) + ".album";
         return new File(mCacheDir, outFilePath);
     }
-
+    
     /**
      * Deposit in the province read images, mViewWidth is high, the greater the picture clearer, but also the memory.
      *
-     * @param imagePath pictures in the path of the memory card.
+     * @param imageUri pictures in the path of the memory card.
      * @return bitmap.
      */
     @Nullable
-    public static Bitmap readImageFromPath(String imagePath, int width, int height) {
-        File imageFile = new File(imagePath);
-        if (imageFile.exists()) {
-            try {
-                BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(imageFile));
-                BitmapFactory.Options options = new BitmapFactory.Options();
-                options.inJustDecodeBounds = true;
-                BitmapFactory.decodeStream(inputStream, null, options);
-                inputStream.close();
-
-                options.inJustDecodeBounds = false;
-                options.inSampleSize = computeSampleSize(options, width, height);
-
-                Bitmap sampledBitmap = null;
-                boolean attemptSuccess = false;
-                while (!attemptSuccess) {
-                    inputStream = new BufferedInputStream(new FileInputStream(imageFile));
-                    try {
-                        sampledBitmap = BitmapFactory.decodeStream(inputStream, null, options);
-                        attemptSuccess = true;
-                    } catch (Exception e) {
-                        options.inSampleSize *= 2;
-                    }
-                    inputStream.close();
+    public static Bitmap readImageFromPath(Context context, Uri imageUri, int width, int height, String mimeType) {
+        ParcelFileDescriptor parcelFileDescriptor = null;
+        try {
+            parcelFileDescriptor = context.getContentResolver().openFileDescriptor(imageUri, "r");
+            FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFileDescriptor(fileDescriptor, null, options);
+            options.inJustDecodeBounds = false;
+            options.inSampleSize = computeSampleSize(options, width, height);
+            Bitmap sampledBitmap = null;
+            boolean attemptSuccess = false;
+            while (!attemptSuccess ) {
+                try {
+                    sampledBitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor, null, options);
+                    attemptSuccess = true;
+                } catch (Exception e) {
+                    options.inSampleSize *= 2;
                 }
-
-                String lowerPath = imagePath.toLowerCase();
-                if (lowerPath.endsWith(".jpg") || lowerPath.endsWith(".jpeg")) {
-                    int degrees = computeDegree(imagePath);
-                    if (degrees > 0) {
-                        Matrix matrix = new Matrix();
-                        matrix.setRotate(degrees);
-                        Bitmap newBitmap = Bitmap.createBitmap(sampledBitmap, 0, 0, sampledBitmap.getWidth(), sampledBitmap.getHeight(), matrix, true);
-                        if (newBitmap != sampledBitmap) {
-                            sampledBitmap.recycle();
-                            sampledBitmap = newBitmap;
-                        }
+            }
+            
+            if (mimeType.endsWith("jpg") || mimeType.endsWith("jpeg")) {
+                int degrees = computeDegree(context, imageUri, fileDescriptor);
+                if (degrees > 0) {
+                    Matrix matrix = new Matrix();
+                    matrix.setRotate(degrees);
+                    Bitmap newBitmap = Bitmap.createBitmap(sampledBitmap, 0, 0, sampledBitmap.getWidth(), sampledBitmap.getHeight(), matrix, true);
+                    if (newBitmap != sampledBitmap) {
+                        sampledBitmap.recycle();
+                        sampledBitmap = newBitmap;
                     }
                 }
-                return sampledBitmap;
-            } catch (Exception ignored) {
             }
+            return sampledBitmap;
+        } catch (Exception ignored) {
+            ignored.printStackTrace();
+        } finally {
+            try {
+                if (parcelFileDescriptor != null) {
+                    parcelFileDescriptor.close();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            
         }
         return null;
     }
-
+    
     private static int computeSampleSize(BitmapFactory.Options options, int width, int height) {
         int inSampleSize = 1;
         if (options.outWidth > width || options.outHeight > height) {
@@ -185,24 +207,37 @@ private static int computeSampleSize(BitmapFactory.Options options, int width, i
         }
         return inSampleSize;
     }
-
-    private static int computeDegree(String path) {
+    
+    private static int computeDegree(Context context, Uri imageUri, FileDescriptor fileDescriptor) {
         try {
-            ExifInterface exifInterface = new ExifInterface(path);
-            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
-            switch (orientation) {
-                case ExifInterface.ORIENTATION_ROTATE_90: {
-                    return 90;
+            ExifInterface exifInterface = null;
+            
+            if (AlbumUtils.isBeforeAndroidTen()) {
+                String filePath = MediaReader.getFilePathByUriBeforeAndroidQ(context, imageUri);
+                if (!TextUtils.isEmpty(filePath)) {
+                    exifInterface = new ExifInterface(filePath);
                 }
-                case ExifInterface.ORIENTATION_ROTATE_180: {
-                    return 180;
-                }
-                case ExifInterface.ORIENTATION_ROTATE_270: {
-                    return 270;
-                }
-                default: {
-                    return 0;
+            } else {
+                exifInterface = new ExifInterface(fileDescriptor);
+            }
+            if (exifInterface != null) {
+                int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+                switch (orientation) {
+                    case ExifInterface.ORIENTATION_ROTATE_90: {
+                        return 90;
+                    }
+                    case ExifInterface.ORIENTATION_ROTATE_180: {
+                        return 180;
+                    }
+                    case ExifInterface.ORIENTATION_ROTATE_270: {
+                        return 270;
+                    }
+                    default: {
+                        return 0;
+                    }
                 }
+            } else {
+                return 0;
             }
         } catch (Exception e) {
             return 0;
diff --git a/album/src/main/java/com/yanzhenjie/album/app/camera/CameraActivity.java b/album/src/main/java/com/yanzhenjie/album/app/camera/CameraActivity.java
index 5732593..6e4fefc 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/camera/CameraActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/camera/CameraActivity.java
@@ -19,12 +19,11 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.Album;
+import com.yanzhenjie.album.AlbumCameraFile;
 import com.yanzhenjie.album.R;
 import com.yanzhenjie.album.mvp.BaseActivity;
 import com.yanzhenjie.album.util.AlbumUtils;
@@ -32,32 +31,37 @@
 
 import java.io.File;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
 /**
  * Created by YanZhenjie on 2017/8/16.
  */
 public class CameraActivity extends BaseActivity {
-
+    
     private static final String INSTANCE_CAMERA_FUNCTION = "INSTANCE_CAMERA_FUNCTION";
     private static final String INSTANCE_CAMERA_FILE_PATH = "INSTANCE_CAMERA_FILE_PATH";
     private static final String INSTANCE_CAMERA_QUALITY = "INSTANCE_CAMERA_QUALITY";
     private static final String INSTANCE_CAMERA_DURATION = "INSTANCE_CAMERA_DURATION";
     private static final String INSTANCE_CAMERA_BYTES = "INSTANCE_CAMERA_BYTES";
-
+    
     private static final int CODE_PERMISSION_IMAGE = 1;
     private static final int CODE_PERMISSION_VIDEO = 2;
-
+    
     private static final int CODE_ACTIVITY_TAKE_IMAGE = 1;
     private static final int CODE_ACTIVITY_TAKE_VIDEO = 2;
 
-    public static Action<String> sResult;
+    @Nullable
+    public static Action<AlbumCameraFile> sResult;
+    @Nullable
     public static Action<String> sCancel;
-
+    
     private int mFunction;
     private String mCameraFilePath;
     private int mQuality;
     private long mLimitDuration;
     private long mLimitBytes;
-
+    
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,18 +83,28 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             mQuality = bundle.getInt(Album.KEY_INPUT_CAMERA_QUALITY);
             mLimitDuration = bundle.getLong(Album.KEY_INPUT_CAMERA_DURATION);
             mLimitBytes = bundle.getLong(Album.KEY_INPUT_CAMERA_BYTES);
-
+            
             switch (mFunction) {
                 case Album.FUNCTION_CAMERA_IMAGE: {
-                    if (TextUtils.isEmpty(mCameraFilePath))
+                    if (TextUtils.isEmpty(mCameraFilePath)) {
                         mCameraFilePath = AlbumUtils.randomJPGPath(this);
-                    requestPermission(PERMISSION_TAKE_PICTURE, CODE_PERMISSION_IMAGE);
+                    }
+                    if (AlbumUtils.isBeforeAndroidTen()) {
+                        requestPermission(PERMISSION_TAKE_PICTURE, CODE_PERMISSION_IMAGE);
+                    } else {
+                        requestPermission(PERMISSION_TAKE_PICTURE_29, CODE_PERMISSION_IMAGE);
+                    }
                     break;
                 }
                 case Album.FUNCTION_CAMERA_VIDEO: {
-                    if (TextUtils.isEmpty(mCameraFilePath))
+                    if (TextUtils.isEmpty(mCameraFilePath)) {
                         mCameraFilePath = AlbumUtils.randomMP4Path(this);
-                    requestPermission(PERMISSION_TAKE_VIDEO, CODE_PERMISSION_VIDEO);
+                    }
+                    if (AlbumUtils.isBeforeAndroidTen()) {
+                        requestPermission(PERMISSION_TAKE_VIDEO, CODE_PERMISSION_VIDEO);
+                    } else {
+                        requestPermission(PERMISSION_TAKE_VIDEO_29, CODE_PERMISSION_VIDEO);
+                    }
                     break;
                 }
                 default: {
@@ -99,7 +113,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             }
         }
     }
-
+    
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putInt(INSTANCE_CAMERA_FUNCTION, mFunction);
@@ -109,7 +123,7 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putLong(INSTANCE_CAMERA_BYTES, mLimitBytes);
         super.onSaveInstanceState(outState);
     }
-
+    
     @Override
     protected void onPermissionGranted(int code) {
         switch (code) {
@@ -126,7 +140,7 @@ protected void onPermissionGranted(int code) {
             }
         }
     }
-
+    
     @Override
     protected void onPermissionDenied(int code) {
         int messageRes;
@@ -144,18 +158,18 @@ protected void onPermissionDenied(int code) {
             }
         }
         new AlertDialog.Builder(this)
-                .setCancelable(false)
-                .setTitle(R.string.album_title_permission_failed)
-                .setMessage(messageRes)
-                .setPositiveButton(R.string.album_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        callbackCancel();
-                    }
-                })
-                .show();
+            .setCancelable(false)
+            .setTitle(R.string.album_title_permission_failed)
+            .setMessage(messageRes)
+            .setPositiveButton(R.string.album_ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    callbackCancel();
+                }
+            })
+            .show();
     }
-
+    
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -173,16 +187,20 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
         }
     }
-
+    
     private void callbackResult() {
-        if (sResult != null) sResult.onAction(mCameraFilePath);
+        if (sResult != null) {
+            sResult.onAction(AlbumCameraFile.getAlbumCameraFile(this.getApplicationContext(), mCameraFilePath));
+        }
         sResult = null;
         sCancel = null;
         finish();
     }
-
+    
     private void callbackCancel() {
-        if (sCancel != null) sCancel.onAction("User canceled.");
+        if (sCancel != null) {
+            sCancel.onAction("User canceled.");
+        }
         sResult = null;
         sCancel = null;
         finish();
diff --git a/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryActivity.java b/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryActivity.java
index d0296c7..0b284ea 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryActivity.java
@@ -16,7 +16,7 @@
 package com.yanzhenjie.album.app.gallery;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.Album;
@@ -60,6 +60,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         assert argument != null;
         mWidget = argument.getParcelable(Album.KEY_INPUT_WIDGET);
         mPathList = argument.getStringArrayList(Album.KEY_INPUT_CHECKED_LIST);
+        if (mPathList == null) {
+            mPathList = new ArrayList<>();
+        }
         mCurrentPosition = argument.getInt(Album.KEY_INPUT_CURRENT_POSITION);
         mCheckable = argument.getBoolean(Album.KEY_INPUT_GALLERY_CHECKABLE);
 
diff --git a/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryAlbumActivity.java b/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryAlbumActivity.java
index 7a93268..25080d3 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryAlbumActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryAlbumActivity.java
@@ -16,7 +16,6 @@
 package com.yanzhenjie.album.app.gallery;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.Album;
@@ -30,15 +29,21 @@
 
 import java.util.ArrayList;
 
+import androidx.annotation.Nullable;
+
 /**
  * Created by YanZhenjie on 2017/8/16.
  */
 public class GalleryAlbumActivity extends BaseActivity implements Contract.GalleryPresenter {
 
+    @Nullable
     public static Action<ArrayList<AlbumFile>> sResult;
+    @Nullable
     public static Action<String> sCancel;
 
+    @Nullable
     public static ItemAction<AlbumFile> sClick;
+    @Nullable
     public static ItemAction<AlbumFile> sLongClick;
 
     private Widget mWidget;
@@ -75,7 +80,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     private void setCheckedCount() {
         int checkedCount = 0;
         for (AlbumFile albumFile : mAlbumFiles) {
-            if (albumFile.isChecked()) checkedCount += 1;
+            if (albumFile.isChecked()) {
+                checkedCount += 1;
+            }
         }
 
         String completeText = getString(R.string.album_menu_finish);
@@ -103,15 +110,21 @@ public void onCurrentChanged(int position) {
         mView.setSubTitle(position + 1 + " / " + mAlbumFiles.size());
 
         AlbumFile albumFile = mAlbumFiles.get(position);
-        if (mCheckable) mView.setChecked(albumFile.isChecked());
+        if (mCheckable) {
+            mView.setChecked(albumFile.isChecked());
+        }
         mView.setLayerDisplay(albumFile.isDisable());
 
         if (albumFile.getMediaType() == AlbumFile.TYPE_VIDEO) {
-            if (!mCheckable) mView.setBottomDisplay(true);
+            if (!mCheckable) {
+                mView.setBottomDisplay(true);
+            }
             mView.setDuration(AlbumUtils.convertDuration(albumFile.getDuration()));
             mView.setDurationDisplay(true);
         } else {
-            if (!mCheckable) mView.setBottomDisplay(false);
+            if (!mCheckable) {
+                mView.setBottomDisplay(false);
+            }
             mView.setDurationDisplay(false);
         }
     }
@@ -129,7 +142,9 @@ public void complete() {
         if (sResult != null) {
             ArrayList<AlbumFile> checkedList = new ArrayList<>();
             for (AlbumFile albumFile : mAlbumFiles) {
-                if (albumFile.isChecked()) checkedList.add(albumFile);
+                if (albumFile.isChecked()) {
+                    checkedList.add(albumFile);
+                }
             }
             sResult.onAction(checkedList);
         }
@@ -138,7 +153,9 @@ public void complete() {
 
     @Override
     public void onBackPressed() {
-        if (sCancel != null) sCancel.onAction("User canceled.");
+        if (sCancel != null) {
+            sCancel.onAction("User canceled.");
+        }
         finish();
     }
 
diff --git a/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryView.java b/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryView.java
index 6eeb562..d8e7bfe 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryView.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/gallery/GalleryView.java
@@ -16,10 +16,10 @@
 package com.yanzhenjie.album.app.gallery;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.AppCompatCheckBox;
+import android.net.Uri;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -37,6 +37,12 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.core.widget.CompoundButtonCompat;
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * Created by YanZhenjie on 2018/4/9.
  */
@@ -92,7 +98,7 @@ public void setupViews(Widget widget, boolean checkable) {
             mCheckBox.setVisibility(View.GONE);
         } else {
             ColorStateList itemSelector = widget.getMediaItemCheckSelector();
-            mCheckBox.setSupportButtonTintList(itemSelector);
+            CompoundButtonCompat.setButtonTintList(mCheckBox, itemSelector);
             mCheckBox.setTextColor(itemSelector);
         }
 
@@ -107,12 +113,18 @@ public void onPageSelected(int position) {
     @Override
     public void bindData(List<Data> dataList) {
         PreviewAdapter<Data> adapter = new PreviewAdapter<Data>(getContext(), dataList) {
+
+            @NonNull
             @Override
-            protected void loadPreview(ImageView imageView, Data item, int position) {
-                if (item instanceof String) {
-                    Album.getAlbumConfig().getAlbumLoader().load(imageView, (String)item);
+            protected View getView(Context context, Data item, int position, @Nullable View.OnClickListener onClickListener, @Nullable View.OnClickListener longClickListener) {
+                if (item instanceof Uri) {
+                    return Album.getAlbumConfig().getAlbumLoader().getPreviewView(context, (Uri) item, onClickListener, longClickListener);
+                } else if (item instanceof String) {
+                    return Album.getAlbumConfig().getAlbumLoader().getPreviewView(context, Uri.parse((String) item), onClickListener, longClickListener);
                 } else if (item instanceof AlbumFile) {
-                    Album.getAlbumConfig().getAlbumLoader().load(imageView, (AlbumFile)item);
+                    return Album.getAlbumConfig().getAlbumLoader().getPreviewView(context, (AlbumFile) item, onClickListener, longClickListener);
+                } else {
+                    return new ImageView(context);
                 }
             }
         };
diff --git a/album/src/main/java/com/yanzhenjie/album/app/gallery/PreviewAdapter.java b/album/src/main/java/com/yanzhenjie/album/app/gallery/PreviewAdapter.java
index d1dc3cf..d973c0f 100644
--- a/album/src/main/java/com/yanzhenjie/album/app/gallery/PreviewAdapter.java
+++ b/album/src/main/java/com/yanzhenjie/album/app/gallery/PreviewAdapter.java
@@ -16,14 +16,11 @@
 package com.yanzhenjie.album.app.gallery;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.yanzhenjie.album.widget.photoview.AttacherImageView;
-import com.yanzhenjie.album.widget.photoview.PhotoViewAttacher;
 
 import java.util.List;
 
@@ -31,8 +28,7 @@
  * <p>Adapter of preview the big picture.</p>
  * Created by Yan Zhenjie on 2016/10/19.
  */
-public abstract class PreviewAdapter<T> extends PagerAdapter
-    implements PhotoViewAttacher.OnViewTapListener, View.OnLongClickListener {
+public abstract class PreviewAdapter<T> extends PagerAdapter {
 
     private Context mContext;
     private List<T> mPreviewList;
@@ -76,38 +72,17 @@ public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
     @NonNull
     @Override
     public Object instantiateItem(@NonNull ViewGroup container, int position) {
-        AttacherImageView imageView = new AttacherImageView(mContext);
-        imageView.setLayoutParams(new ViewGroup.LayoutParams(-1, -1));
-        loadPreview(imageView, mPreviewList.get(position), position);
-        container.addView(imageView);
-
-        final PhotoViewAttacher attacher = new PhotoViewAttacher(imageView);
-        if (mItemClickListener != null) {
-            attacher.setOnViewTapListener(this);
-        }
-        if (mItemLongClickListener != null) {
-            attacher.setOnLongClickListener(this);
-        }
-        imageView.setAttacher(attacher);
-
-        return imageView;
+        View view = getView(mContext, mPreviewList.get(position), position, mItemClickListener, mItemLongClickListener);
+        container.addView(view);
+        return view;
     }
 
     @Override
     public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-        container.removeView(((View)object));
-    }
-
-    @Override
-    public void onViewTap(View v, float x, float y) {
-        mItemClickListener.onClick(v);
+        container.removeView(((View) object));
     }
-
-    @Override
-    public boolean onLongClick(View v) {
-        mItemLongClickListener.onClick(v);
-        return true;
-    }
-
-    protected abstract void loadPreview(ImageView imageView, T item, int position);
+    
+    @NonNull
+    protected abstract View getView(Context context, T item, int position, @Nullable View.OnClickListener onClickListener, @Nullable View.OnClickListener longClickListener);
+    
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/ActivitySource.java b/album/src/main/java/com/yanzhenjie/album/mvp/ActivitySource.java
index 37a8abe..a99677d 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/ActivitySource.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/ActivitySource.java
@@ -18,11 +18,11 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.view.SupportMenuInflater;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.view.SupportMenuInflater;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/BaseActivity.java b/album/src/main/java/com/yanzhenjie/album/mvp/BaseActivity.java
index fad37cd..3f0ba85 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/BaseActivity.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/BaseActivity.java
@@ -19,11 +19,11 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.PermissionChecker;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.PermissionChecker;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.util.AlbumUtils;
@@ -36,18 +36,25 @@
  * Created by YanZhenjie on 2018/4/6.
  */
 public class BaseActivity extends AppCompatActivity implements Bye {
-
+    
     public static final String[] PERMISSION_TAKE_PICTURE = {"android.permission.CAMERA", "android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"};
+    
+    public static final String[] PERMISSION_TAKE_PICTURE_29 = {"android.permission.CAMERA", "android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE", "android.permission.ACCESS_MEDIA_LOCATION"};
+    
+    
     public static final String[] PERMISSION_TAKE_VIDEO = {"android.permission.CAMERA", "android.permission.RECORD_AUDIO", "android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"};
+    
+    public static final String[] PERMISSION_TAKE_VIDEO_29 = {"android.permission.CAMERA", "android.permission.RECORD_AUDIO", "android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE", "android.permission.ACCESS_MEDIA_LOCATION"};
+    
     public static final String[] PERMISSION_STORAGE = {"android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"};
-
+    
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Locale locale = Album.getAlbumConfig().getLocale();
         AlbumUtils.applyLanguageForContext(this, locale);
     }
-
+    
     /**
      * Request permission.
      */
@@ -65,24 +72,27 @@ protected void requestPermission(String[] permissions, int code) {
             onPermissionGranted(code);
         }
     }
-
+    
     @Override
     public final void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (isGrantedResult(grantResults)) onPermissionGranted(requestCode);
-        else onPermissionDenied(requestCode);
+        if (isGrantedResult(grantResults)) {
+            onPermissionGranted(requestCode);
+        } else {
+            onPermissionDenied(requestCode);
+        }
     }
-
+    
     protected void onPermissionGranted(int code) {
     }
-
+    
     protected void onPermissionDenied(int code) {
     }
-
+    
     @Override
     public void bye() {
         onBackPressed();
     }
-
+    
     private static List<String> getDeniedPermissions(Context context, String... permissions) {
         List<String> deniedList = new ArrayList<>(2);
         for (String permission : permissions) {
@@ -92,10 +102,12 @@ private static List<String> getDeniedPermissions(Context context, String... perm
         }
         return deniedList;
     }
-
+    
     private static boolean isGrantedResult(int... grantResults) {
         for (int result : grantResults) {
-            if (result == PackageManager.PERMISSION_DENIED) return false;
+            if (result == PackageManager.PERMISSION_DENIED) {
+                return false;
+            }
         }
         return true;
     }
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/BaseFragment.java b/album/src/main/java/com/yanzhenjie/album/mvp/BaseFragment.java
index ad1e7c2..df59ff3 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/BaseFragment.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/BaseFragment.java
@@ -17,9 +17,9 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/BasePresenter.java b/album/src/main/java/com/yanzhenjie/album/mvp/BasePresenter.java
index b29daaa..b251f6b 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/BasePresenter.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/BasePresenter.java
@@ -15,7 +15,7 @@
  */
 package com.yanzhenjie.album.mvp;
 
-import android.arch.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleOwner;
 
 /**
  * <p>Presenter of MVP.</p>
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/BaseView.java b/album/src/main/java/com/yanzhenjie/album/mvp/BaseView.java
index 665df1a..e7dadac 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/BaseView.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/BaseView.java
@@ -16,23 +16,23 @@
 package com.yanzhenjie.album.mvp;
 
 import android.app.Activity;
-import android.arch.lifecycle.GenericLifecycleObserver;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
+import androidx.lifecycle.GenericLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -366,7 +366,7 @@ public void snackBar(CharSequence message) {
         Snackbar snackbar = Snackbar.make(mSource.getView(), message, Snackbar.LENGTH_SHORT);
         View view = snackbar.getView();
         view.setBackgroundColor(getColor(R.color.albumColorPrimaryBlack));
-        TextView textView = view.findViewById(android.support.design.R.id.snackbar_text);
+        TextView textView = view.findViewById(R.id.snackbar_text);
         textView.setTextColor(Color.WHITE);
         snackbar.show();
     }
@@ -375,7 +375,7 @@ public void snackBar(@StringRes int message) {
         Snackbar snackbar = Snackbar.make(mSource.getView(), message, Snackbar.LENGTH_SHORT);
         View view = snackbar.getView();
         view.setBackgroundColor(getColor(R.color.albumColorPrimaryBlack));
-        TextView textView = view.findViewById(android.support.design.R.id.snackbar_text);
+        TextView textView = view.findViewById(R.id.snackbar_text);
         textView.setTextColor(Color.WHITE);
         snackbar.show();
     }
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/Source.java b/album/src/main/java/com/yanzhenjie/album/mvp/Source.java
index 7006950..5518fb3 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/Source.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/Source.java
@@ -17,9 +17,9 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
diff --git a/album/src/main/java/com/yanzhenjie/album/mvp/ViewSource.java b/album/src/main/java/com/yanzhenjie/album/mvp/ViewSource.java
index 01c9c86..1aa3582 100644
--- a/album/src/main/java/com/yanzhenjie/album/mvp/ViewSource.java
+++ b/album/src/main/java/com/yanzhenjie/album/mvp/ViewSource.java
@@ -15,13 +15,14 @@
  */
 package com.yanzhenjie.album.mvp;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.view.SupportMenuInflater;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.view.SupportMenuInflater;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
diff --git a/album/src/main/java/com/yanzhenjie/album/provider/CameraFileProvider.java b/album/src/main/java/com/yanzhenjie/album/provider/CameraFileProvider.java
index 9d39c73..a4d527b 100644
--- a/album/src/main/java/com/yanzhenjie/album/provider/CameraFileProvider.java
+++ b/album/src/main/java/com/yanzhenjie/album/provider/CameraFileProvider.java
@@ -16,7 +16,7 @@
 package com.yanzhenjie.album.provider;
 
 import android.content.Context;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 /**
  * <p>For external access to files.</p>
diff --git a/album/src/main/java/com/yanzhenjie/album/util/AlbumUtils.java b/album/src/main/java/com/yanzhenjie/album/util/AlbumUtils.java
index a8164b6..7d4fdbb 100644
--- a/album/src/main/java/com/yanzhenjie/album/util/AlbumUtils.java
+++ b/album/src/main/java/com/yanzhenjie/album/util/AlbumUtils.java
@@ -27,10 +27,6 @@
 import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -49,14 +45,19 @@
 import java.util.Locale;
 import java.util.UUID;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.core.graphics.drawable.DrawableCompat;
+
 /**
  * <p>Helper for album.</p>
  * Created by Yan Zhenjie on 2016/10/30.
  */
 public class AlbumUtils {
-
+    
     private static final String CACHE_DIRECTORY = "AlbumCache";
-
+    
     /**
      * Get a writable root directory.
      *
@@ -65,25 +66,26 @@ public class AlbumUtils {
      */
     @NonNull
     public static File getAlbumRootPath(Context context) {
-        if (sdCardIsAvailable()) {
-            return new File(Environment.getExternalStorageDirectory(), CACHE_DIRECTORY);
+        if (sdCardIsAvailable(context)) {
+            return new File(context.getExternalCacheDir(), CACHE_DIRECTORY);
         } else {
             return new File(context.getFilesDir(), CACHE_DIRECTORY);
         }
     }
-
+    
     /**
      * SD card is available.
      *
      * @return true when available, other wise is false.
      */
-    public static boolean sdCardIsAvailable() {
+    public static boolean sdCardIsAvailable(Context context) {
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            return Environment.getExternalStorageDirectory().canWrite();
-        } else
+            return context.getExternalCacheDir().canWrite();
+        } else {
             return false;
+        }
     }
-
+    
     /**
      * Setting {@link Locale} for {@link Context}.
      *
@@ -103,7 +105,7 @@ public static Context applyLanguageForContext(@NonNull Context context, @NonNull
             return context;
         }
     }
-
+    
     /**
      * Take picture.
      *
@@ -119,7 +121,7 @@ public static void takeImage(@NonNull Activity activity, int requestCode, File o
         intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
         activity.startActivityForResult(intent, requestCode);
     }
-
+    
     /**
      * Take video.
      *
@@ -144,7 +146,7 @@ public static void takeVideo(@NonNull Activity activity, int requestCode, File o
         intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
         activity.startActivityForResult(intent, requestCode);
     }
-
+    
     /**
      * Generates an externally accessed URI based on path.
      *
@@ -162,102 +164,78 @@ public static Uri getUri(@NonNull Context context, @NonNull File outPath) {
         }
         return uri;
     }
-
+    
     /**
-     * Generate a random jpg file path.
-     *
-     * @return file path.
-     *
-     * @deprecated use {@link #randomJPGPath(Context)} instead.
-     */
-    @NonNull
-    @Deprecated
-    public static String randomJPGPath() {
-        File bucket = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
-        return randomJPGPath(bucket);
-    }
-
-    /**
-     * Generate a random jpg file path.
+     * Generates an externally accessed URI based on path.
      *
      * @param context context.
-     *
-     * @return file path.
+     * @param outPath file path.
+     * @return the uri address of the file.
      */
     @NonNull
-    public static String randomJPGPath(Context context) {
-        if(!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
-            return randomJPGPath(context.getCacheDir());
-        }
-        return randomJPGPath();
+    public static Uri getUri(@NonNull Context context, @NonNull String outPath) {
+        return getUri(context, new File(outPath));
     }
-
+    
     /**
      * Generates a random jpg file path in the specified directory.
      *
-     * @param bucket specify the directory.
      * @return file path.
      */
     @NonNull
-    public static String randomJPGPath(File bucket) {
-        return randomMediaPath(bucket, ".jpg");
+    public static String randomJPGPath(@NonNull Context context) {
+        return randomJPGPath(getAlbumRootPath(context));
     }
-
+    
     /**
-     * Generate a random mp4 file path.
+     * Generates a random jpg file path in the specified directory.
      *
+     * @param bucket specify the directory.
      * @return file path.
-     *
-     * @deprecated use {@link #randomMP4Path(Context)} instead.
      */
     @NonNull
-    @Deprecated
-    public static String randomMP4Path() {
-        File bucket = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES);
-        return randomMP4Path(bucket);
+    public static String randomJPGPath(@NonNull File bucket) {
+        String outFileName = AlbumUtils.getNowDateTime("yyyyMMdd_HHmmssSSS") + "_" + getMD5ForString(UUID.randomUUID().toString()) + ".jpg";
+        if (bucket.exists() && bucket.isFile()) {
+            bucket.delete();
+        }
+        if (!bucket.exists()) {
+            bucket.mkdirs();
+        }
+        File file = new File(bucket, outFileName);
+        return file.getAbsolutePath();
     }
-
+    
     /**
      * Generate a random mp4 file path.
      *
      * @param context context.
-     *
      * @return file path.
      */
     @NonNull
-    public static String randomMP4Path(Context context) {
-        if(!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
-            return randomMP4Path(context.getCacheDir());
-        }
-        return randomMP4Path();
+    public static String randomMP4Path(@NonNull Context context) {
+        return randomMP4Path(getAlbumRootPath(context));
     }
-
+    
     /**
      * Generates a random mp4 file path in the specified directory.
      *
      * @return file path.
      */
     @NonNull
-    public static String randomMP4Path(File bucket) {
-        return randomMediaPath(bucket, ".mp4");
-    }
-
-    /**
-     * Generates a random file path using the specified suffix name in the specified directory.
-     *
-     * @param bucket    specify the directory.
-     * @param extension extension.
-     * @return file path.
-     */
-    @NonNull
-    private static String randomMediaPath(File bucket, String extension) {
-        if (bucket.exists() && bucket.isFile()) bucket.delete();
-        if (!bucket.exists()) bucket.mkdirs();
-        String outFilePath = AlbumUtils.getNowDateTime("yyyyMMdd_HHmmssSSS") + "_" + getMD5ForString(UUID.randomUUID().toString()) + extension;
-        File file = new File(bucket, outFilePath);
+    public static String randomMP4Path(@NonNull File bucket) {
+        String outFileName = AlbumUtils.getNowDateTime("yyyyMMdd_HHmmssSSS") + "_" + getMD5ForString(UUID.randomUUID().toString()) + ".mp4";
+        if (bucket.exists() && bucket.isFile()) {
+            bucket.delete();
+        }
+        if (!bucket.exists()) {
+            bucket.mkdirs();
+        }
+        File file = new File(bucket, outFileName);
         return file.getAbsolutePath();
+        
     }
-
+    
     /**
      * Format the current time in the specified format.
      *
@@ -269,7 +247,7 @@ public static String getNowDateTime(@NonNull String format) {
         Date curDate = new Date(System.currentTimeMillis());
         return formatter.format(curDate);
     }
-
+    
     /**
      * Get the mime type of the file in the url.
      *
@@ -278,12 +256,14 @@ public static String getNowDateTime(@NonNull String format) {
      */
     public static String getMimeType(String url) {
         String extension = getExtension(url);
-        if (!MimeTypeMap.getSingleton().hasExtension(extension)) return "";
-
+        if (!MimeTypeMap.getSingleton().hasExtension(extension)) {
+            return "";
+        }
+        
         String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
         return TextUtils.isEmpty(mimeType) ? "" : mimeType;
     }
-
+    
     /**
      * Get the file extension in url.
      *
@@ -295,7 +275,7 @@ public static String getExtension(String url) {
         String extension = MimeTypeMap.getFileExtensionFromUrl(url);
         return TextUtils.isEmpty(extension) ? "" : extension;
     }
-
+    
     /**
      * Specifies a tint for {@code drawable}.
      *
@@ -305,7 +285,7 @@ public static String getExtension(String url) {
     public static void setDrawableTint(@NonNull Drawable drawable, @ColorInt int color) {
         DrawableCompat.setTint(DrawableCompat.wrap(drawable.mutate()), color);
     }
-
+    
     /**
      * Specifies a tint for {@code drawable}.
      *
@@ -319,7 +299,7 @@ public static Drawable getTintDrawable(@NonNull Drawable drawable, @ColorInt int
         DrawableCompat.setTint(drawable, color);
         return drawable;
     }
-
+    
     /**
      * {@link ColorStateList}.
      *
@@ -338,7 +318,7 @@ public static ColorStateList getColorStateList(@ColorInt int normal, @ColorInt i
         int[] colors = new int[]{highLight, highLight, highLight, normal, normal, normal};
         return new ColorStateList(states, colors);
     }
-
+    
     /**
      * Change part of the color of CharSequence.
      *
@@ -354,7 +334,7 @@ public static SpannableString getColorText(@NonNull CharSequence content, int st
         stringSpan.setSpan(new ForegroundColorSpan(color), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         return stringSpan;
     }
-
+    
     /**
      * Return a color-int from alpha, red, green, blue components.
      *
@@ -368,7 +348,7 @@ public static int getAlphaColor(@ColorInt int color, @IntRange(from = 0, to = 25
         int blue = Color.blue(color);
         return Color.argb(alpha, red, green, blue);
     }
-
+    
     /**
      * Generate divider.
      *
@@ -381,7 +361,7 @@ public static Divider getDivider(@ColorInt int color) {
         }
         return new Api20ItemDivider(color);
     }
-
+    
     /**
      * Time conversion.
      *
@@ -394,7 +374,7 @@ public static String convertDuration(@IntRange(from = 1) long duration) {
         int hour = (int) (duration / 3600);
         int minute = (int) ((duration - hour * 3600) / 60);
         int second = (int) (duration - hour * 3600 - minute * 60);
-
+        
         String hourValue = "";
         String minuteValue;
         String secondValue;
@@ -427,7 +407,7 @@ public static String convertDuration(@IntRange(from = 1) long duration) {
         }
         return hourValue + minuteValue + secondValue;
     }
-
+    
     /**
      * Get the MD5 value of string.
      *
@@ -455,4 +435,11 @@ public static String getMD5ForString(String content) {
         }
         return md5Buffer.toString();
     }
+    
+    /**
+     * @return 是否是 Android 10 （Q） 之前的版本
+     */
+    public static boolean isBeforeAndroidTen() {
+        return android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || Environment.isExternalStorageLegacy();
+    }
 }
\ No newline at end of file
diff --git a/album/src/main/java/com/yanzhenjie/album/util/SystemBar.java b/album/src/main/java/com/yanzhenjie/album/util/SystemBar.java
index 0ba13fb..efd9385 100644
--- a/album/src/main/java/com/yanzhenjie/album/util/SystemBar.java
+++ b/album/src/main/java/com/yanzhenjie/album/util/SystemBar.java
@@ -18,7 +18,7 @@
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/ColorProgressBar.java b/album/src/main/java/com/yanzhenjie/album/widget/ColorProgressBar.java
index ba33f6a..f677116 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/ColorProgressBar.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/ColorProgressBar.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 import android.util.AttributeSet;
 import android.widget.ProgressBar;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/FixViewPager.java b/album/src/main/java/com/yanzhenjie/album/widget/FixViewPager.java
similarity index 93%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/FixViewPager.java
rename to album/src/main/java/com/yanzhenjie/album/widget/FixViewPager.java
index f505811..9c3b404 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/FixViewPager.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/FixViewPager.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview;
+package com.yanzhenjie.album.widget;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/LoadingDialog.java b/album/src/main/java/com/yanzhenjie/album/widget/LoadingDialog.java
index 7f40158..e9e9a44 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/LoadingDialog.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/LoadingDialog.java
@@ -17,9 +17,9 @@
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 import android.widget.TextView;
 
 import com.yanzhenjie.album.R;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/SquareCardView.java b/album/src/main/java/com/yanzhenjie/album/widget/SquareCardView.java
index ac60d83..2eb8493 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/SquareCardView.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/SquareCardView.java
@@ -17,9 +17,9 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 
 /**
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/SquareFrameLayout.java b/album/src/main/java/com/yanzhenjie/album/widget/SquareFrameLayout.java
index a4f52e8..c8977fc 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/SquareFrameLayout.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/SquareFrameLayout.java
@@ -17,8 +17,8 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/SquareImageView.java b/album/src/main/java/com/yanzhenjie/album/widget/SquareImageView.java
index f455c29..3cbc522 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/SquareImageView.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/SquareImageView.java
@@ -17,13 +17,13 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 
 /**
  * Created by YanZhenjie on 2018/4/19.
  */
-public class SquareImageView extends android.support.v7.widget.AppCompatImageView {
+public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView {
 
     private Configuration mConfig;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/SquareRelativeLayout.java b/album/src/main/java/com/yanzhenjie/album/widget/SquareRelativeLayout.java
index 1e56ccd..da94540 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/SquareRelativeLayout.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/SquareRelativeLayout.java
@@ -17,10 +17,9 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
-import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 /**
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/TransferLayout.java b/album/src/main/java/com/yanzhenjie/album/widget/TransferLayout.java
index 67dfefa..5b67f94 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/TransferLayout.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/TransferLayout.java
@@ -16,8 +16,8 @@
 package com.yanzhenjie.album.widget;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/divider/Api20ItemDivider.java b/album/src/main/java/com/yanzhenjie/album/widget/divider/Api20ItemDivider.java
index 462d635..e8e8822 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/divider/Api20ItemDivider.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/divider/Api20ItemDivider.java
@@ -17,11 +17,11 @@
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.support.annotation.ColorInt;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.ColorInt;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.View;
 
 /**
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/divider/Api21ItemDivider.java b/album/src/main/java/com/yanzhenjie/album/widget/divider/Api21ItemDivider.java
index ac0f91a..77fcb67 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/divider/Api21ItemDivider.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/divider/Api21ItemDivider.java
@@ -17,8 +17,8 @@
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.support.annotation.ColorInt;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/divider/ColorDrawer.java b/album/src/main/java/com/yanzhenjie/album/widget/divider/ColorDrawer.java
index ba8e4d6..29121de 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/divider/ColorDrawer.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/divider/ColorDrawer.java
@@ -17,7 +17,7 @@
 
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 /**
  * Created by YanZhenjie on 2018/4/20.
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/divider/Divider.java b/album/src/main/java/com/yanzhenjie/album/widget/divider/Divider.java
index f38ceda..e14fb3c 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/divider/Divider.java
+++ b/album/src/main/java/com/yanzhenjie/album/widget/divider/Divider.java
@@ -15,7 +15,7 @@
  */
 package com.yanzhenjie.album.widget.divider;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * <p>Divider of {@code RecyclerView}, you can get the width and height of the line.</p>
diff --git a/album/src/main/res/layout/album_activity_album_dark.xml b/album/src/main/res/layout/album_activity_album_dark.xml
index 84462cd..220def1 100644
--- a/album/src/main/res/layout/album_activity_album_dark.xml
+++ b/album/src/main/res/layout/album_activity_album_dark.xml
@@ -18,15 +18,15 @@
     style="@style/Album.MatchParent"
     android:background="@color/albumPageLight">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         style="@style/Album.AppBar.General">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Album.Toolbar.Dark" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/album_content_album"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/album/src/main/res/layout/album_activity_album_light.xml b/album/src/main/res/layout/album_activity_album_light.xml
index 96f5fd7..5764ba3 100644
--- a/album/src/main/res/layout/album_activity_album_light.xml
+++ b/album/src/main/res/layout/album_activity_album_light.xml
@@ -18,15 +18,15 @@
     style="@style/Album.MatchParent"
     android:background="@color/albumPageLight">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         style="@style/Album.AppBar.General">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Album.Toolbar.Light" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/album_content_album"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/album/src/main/res/layout/album_activity_gallery.xml b/album/src/main/res/layout/album_activity_gallery.xml
index 4aab2ba..8dcdbca 100644
--- a/album/src/main/res/layout/album_activity_gallery.xml
+++ b/album/src/main/res/layout/album_activity_gallery.xml
@@ -18,7 +18,7 @@
     style="@style/Album.MatchParent"
     android:background="@color/albumColorPrimaryBlack">
 
-    <com.yanzhenjie.album.widget.photoview.FixViewPager
+    <com.yanzhenjie.album.widget.FixViewPager
         android:id="@+id/view_pager"
         style="@style/Album.MatchParent" />
 
@@ -26,14 +26,14 @@
         style="@style/Album.MatchParent"
         android:fitsSystemWindows="true">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
             style="@style/Album.AppBar.General.Transparent">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Album.Toolbar.Dark" />
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <FrameLayout
             style="@style/Album.WrapContent.WidthMatchParent"
@@ -58,7 +58,7 @@
                     android:textColor="@color/albumFontLight"
                     android:visibility="gone" />
 
-                <android.support.v7.widget.AppCompatCheckBox
+                <androidx.appcompat.widget.AppCompatCheckBox
                     android:id="@+id/check_box"
                     style="@style/Album.CheckBox.WrapContent"
                     android:layout_alignParentEnd="true"
diff --git a/album/src/main/res/layout/album_activity_null.xml b/album/src/main/res/layout/album_activity_null.xml
index cc4b8f4..c66d14e 100644
--- a/album/src/main/res/layout/album_activity_null.xml
+++ b/album/src/main/res/layout/album_activity_null.xml
@@ -18,15 +18,15 @@
     style="@style/Album.MatchParent"
     android:background="@color/albumPageLight">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         style="@style/Album.AppBar.General">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Album.Toolbar.Dark" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
         style="@style/Album.MatchParent"
@@ -39,7 +39,7 @@
             style="@style/Album.WrapContent"
             android:textColor="@color/albumFontHint" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_camera_image"
             style="@style/Album.Button.WrapContent"
             android:layout_marginTop="@dimen/album_dp_15"
@@ -50,7 +50,7 @@
             android:text="@string/album_camera_image_capture"
             android:textColor="@color/albumFontLight" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_camera_video"
             style="@style/Album.Button.WrapContent"
             android:layout_marginTop="@dimen/album_dp_15"
diff --git a/album/src/main/res/layout/album_content_album.xml b/album/src/main/res/layout/album_content_album.xml
index d3703d9..b48678a 100644
--- a/album/src/main/res/layout/album_content_album.xml
+++ b/album/src/main/res/layout/album_content_album.xml
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         style="@style/Album.WrapContent.WidthMatchParent"
         android:layout_below="@id/app_bar_layout" />
@@ -25,7 +25,7 @@
         android:layout_alignParentBottom="true"
         android:background="@color/albumSheetBottom">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_switch_dir"
             style="@style/Album.TextButton.WrapContent.SheetBottom"
             android:layout_alignParentLeft="true"
@@ -33,7 +33,7 @@
             android:drawableEnd="@drawable/album_abc_spinner_white"
             android:drawableRight="@drawable/album_abc_spinner_white" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_preview"
             style="@style/Album.TextButton.WrapContent.SheetBottom"
             android:layout_alignParentEnd="true"
diff --git a/album/src/main/res/layout/album_dialog_floder.xml b/album/src/main/res/layout/album_dialog_floder.xml
index 5653655..146cba4 100644
--- a/album/src/main/res/layout/album_dialog_floder.xml
+++ b/album/src/main/res/layout/album_dialog_floder.xml
@@ -14,7 +14,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rv_content_list"
diff --git a/album/src/main/res/layout/album_item_content_image.xml b/album/src/main/res/layout/album_item_content_image.xml
index f8b87d2..6d96ef3 100644
--- a/album/src/main/res/layout/album_item_content_image.xml
+++ b/album/src/main/res/layout/album_item_content_image.xml
@@ -30,7 +30,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true">
 
-            <android.support.v7.widget.AppCompatCheckBox
+            <androidx.appcompat.widget.AppCompatCheckBox
                 android:id="@+id/check_box"
                 style="@style/Album.CheckBox.WrapContent" />
         </com.yanzhenjie.album.widget.TransferLayout>
diff --git a/album/src/main/res/layout/album_item_content_video.xml b/album/src/main/res/layout/album_item_content_video.xml
index 27b4de2..c1ca22a 100644
--- a/album/src/main/res/layout/album_item_content_video.xml
+++ b/album/src/main/res/layout/album_item_content_video.xml
@@ -30,7 +30,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true">
 
-            <android.support.v7.widget.AppCompatCheckBox
+            <androidx.appcompat.widget.AppCompatCheckBox
                 android:id="@+id/check_box"
                 style="@style/Album.CheckBox.WrapContent" />
         </com.yanzhenjie.album.widget.TransferLayout>
diff --git a/album/src/main/res/layout/album_item_dialog_folder.xml b/album/src/main/res/layout/album_item_dialog_folder.xml
index 88da0ab..2ddf7e4 100644
--- a/album/src/main/res/layout/album_item_dialog_folder.xml
+++ b/album/src/main/res/layout/album_item_dialog_folder.xml
@@ -29,7 +29,7 @@
         android:contentDescription="@string/album_title"
         android:scaleType="centerCrop"/>
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <androidx.appcompat.widget.AppCompatRadioButton
         android:id="@+id/rb_gallery_preview_check"
         style="@style/Album.WrapContent"
         android:layout_alignParentEnd="true"
diff --git a/album/src/main/res/layout/album_toolbar_dark.xml b/album/src/main/res/layout/album_toolbar_dark.xml
index 66ef984..a109c27 100644
--- a/album/src/main/res/layout/album_toolbar_dark.xml
+++ b/album/src/main/res/layout/album_toolbar_dark.xml
@@ -14,12 +14,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/app_bar_layout"
     style="@style/Album.AppBar.General">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         style="@style/Album.Toolbar.Dark" />
 
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/album/src/main/res/layout/album_toolbar_light.xml b/album/src/main/res/layout/album_toolbar_light.xml
index 43b7a6c..15de099 100644
--- a/album/src/main/res/layout/album_toolbar_light.xml
+++ b/album/src/main/res/layout/album_toolbar_light.xml
@@ -14,12 +14,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/app_bar_layout"
     style="@style/Album.AppBar.General">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         style="@style/Album.Toolbar.Light" />
 
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 05840ac..83eeb11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
@@ -16,6 +16,10 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
+        maven {
+            url  "http://dl.bintray.com/piasy/maven"
+        }
     }
 }
 
diff --git a/config.gradle b/config.gradle
index 19a4349..966e701 100644
--- a/config.gradle
+++ b/config.gradle
@@ -8,11 +8,11 @@ ext {
 
     android = [
             applicationId    : "com.yanzhenjie.album.sample",
-            compileSdkVersion: 28,
-            buildToolsVersion: "28.0.3",
+            compileSdkVersion: 29,
+            buildToolsVersion: "29.0.3",
 
-            minSdkVersion    : 14,
-            targetSdkVersion : 28,
+            minSdkVersion    : 17,
+            targetSdkVersion : 29,
 
             versionCode      : 27,
             versionName      : "2.1.3",
@@ -46,12 +46,12 @@ ext {
     dependencies = [
             mediaScanner: 'com.yanzhenjie:mediascanner:1.0.3',
 
-            design      : 'com.android.support:design:28.0.0',
-            appCompat   : 'com.android.support:appcompat-v7:28.0.0',
-            recyclerView: 'com.android.support:recyclerview-v7:28.0.0',
-            cardView    : 'com.android.support:cardview-v7:28.0.0',
+            design      : 'com.google.android.material:material:1.0.0',
+            appCompat   : 'androidx.appcompat:appcompat:1.1.0',
+            recyclerView: 'androidx.recyclerview:recyclerview:1.1.0',
+            cardView    : 'androidx.cardview:cardview:1.0.0',
 
-            album       : 'com.yanzhenjie:album:2.1.3',
-            glide       : 'com.github.bumptech.glide:glide:3.8.0'
+            album       : 'com.github.imliujun:album:3.0.2',
+            glide       : 'com.github.bumptech.glide:glide:4.11.0'
     ]
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 01e0ac2..f32badb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,3 @@
-org.gradle.jvmargs=-Xmx1536m
-#systemProp.http.proxyHost=127.0.0.1
-#systemProp.http.proxyPort=12333
-#systemProp.https.proxyHost=127.0.0.1
-#systemProp.https.proxyPort=12333
\ No newline at end of file
+android.enableJetifier=true
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx1536m
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4eafe8e..b1db12b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Jul 23 17:11:57 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/sample/build.gradle b/sample/build.gradle
index ee9a379..143f23c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -11,10 +11,20 @@ android {
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
     }
+
+    //解决  More than one file was found with OS independent path 'META-INF/DEPENDENCIES'
+    packagingOptions {
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
 }
 
 dependencies {
+    //    implementation project(":album")
     implementation rootProject.ext.dependencies.album
+    implementation 'com.facebook.fresco:fresco:2.3.0'
+    implementation "com.github.piasy:BigImageViewer:1.6.6"
+    //    implementation "com.github.piasy:FrescoImageLoader:1.6.6"
+    //    implementation 'com.github.piasy:FrescoImageViewFactory:1.6.6'
 
     implementation rootProject.ext.dependencies.appCompat
     implementation rootProject.ext.dependencies.design
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/Application.java b/sample/src/main/java/com/yanzhenjie/album/sample/Application.java
index 51b383a..38eaa77 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/Application.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/Application.java
@@ -15,6 +15,8 @@
  */
 package com.yanzhenjie.album.sample;
 
+import com.github.piasy.biv.BigImageViewer;
+import com.github.piasy.biv.loader.fresco.FrescoImageLoader;
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.AlbumConfig;
 
@@ -33,11 +35,13 @@ public void onCreate() {
         super.onCreate();
         if (instance == null) {
             instance = this;
+            BigImageViewer.initialize(FrescoImageLoader.with(instance));
 
             Album.initialize(AlbumConfig.newBuilder(this)
-                    .setAlbumLoader(new MediaLoader())
-                    .setLocale(Locale.getDefault())
-                    .build()
+                //                .setAlbumLoader(new MediaLoader())
+                .setAlbumLoader(new FrescoLoader())
+                .setLocale(Locale.getDefault())
+                .build()
             );
         }
     }
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/FrescoLoader.java b/sample/src/main/java/com/yanzhenjie/album/sample/FrescoLoader.java
new file mode 100644
index 0000000..9aee03d
--- /dev/null
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/FrescoLoader.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2017 Yan Zhenjie.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yanzhenjie.album.sample;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.facebook.common.executors.UiThreadImmediateExecutorService;
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.DataSource;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
+import com.facebook.imagepipeline.image.CloseableImage;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.github.piasy.biv.view.BigImageView;
+import com.github.piasy.biv.view.FrescoImageViewFactory;
+import com.yanzhenjie.album.AlbumFile;
+import com.yanzhenjie.album.AlbumLoader;
+import com.yanzhenjie.album.sample.photoview.AttacherImageView;
+import com.yanzhenjie.album.sample.photoview.PhotoViewAttacher;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Created by Yan Zhenjie on 2017/3/31.
+ */
+public class FrescoLoader implements AlbumLoader {
+    
+    @Override
+    public void load(@NonNull ImageView imageView, @NonNull AlbumFile albumFile) {
+        load(imageView, albumFile.getUri());
+    }
+    
+    @Override
+    public void load(@NonNull ImageView imageView, @NonNull Uri uri) {
+        if (imageView instanceof SimpleDraweeView) {
+            imageView.setImageURI(uri);
+        }
+    }
+    
+    @NonNull
+    @Override
+    public View getPreviewView(@NonNull Context context, @NonNull AlbumFile albumFile, final View.OnClickListener onClickListener, final View.OnClickListener longClickListener) {
+        if (albumFile.getMediaType() == AlbumFile.TYPE_VIDEO) {
+            final AttacherImageView view = new AttacherImageView(context);
+            view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            DataSource<CloseableReference<CloseableImage>> dataSource = Fresco.getImagePipeline()
+                .fetchDecodedImage(ImageRequest.fromUri(albumFile.getUri()), context);
+            dataSource.subscribe(new BaseBitmapDataSubscriber() {
+                @Override
+                protected void onNewResultImpl(Bitmap bitmap) {
+                    view.setImageDrawable(new BitmapDrawable(bitmap.copy(bitmap.getConfig(), bitmap.isMutable())));
+                }
+                
+                @Override
+                protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
+                }
+            }, UiThreadImmediateExecutorService.getInstance());
+            final PhotoViewAttacher attacher = new PhotoViewAttacher(view);
+            if (onClickListener != null) {
+                attacher.setOnViewTapListener(new PhotoViewAttacher.OnViewTapListener() {
+                    @Override
+                    public void onViewTap(View v, float x, float y) {
+                        onClickListener.onClick(v);
+                    }
+                });
+            }
+            if (longClickListener != null) {
+                attacher.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View v) {
+                        longClickListener.onClick(v);
+                        return true;
+                    }
+                });
+            }
+            view.setAttacher(attacher);
+            return view;
+        } else {
+            return getPreviewView(context, albumFile.getUri(), onClickListener, longClickListener);
+        }
+    }
+    
+    @NonNull
+    @Override
+    public View getPreviewView(@NonNull Context context, @NonNull Uri uri, @Nullable View.OnClickListener onClickListener, final @Nullable View.OnClickListener longClickListener) {
+        final BigImageView view = new BigImageView(context);
+        view.setImageViewFactory(new FrescoImageViewFactory());
+        view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        view.showImage(uri);
+        view.setOnClickListener(onClickListener);
+        view.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (longClickListener != null) {
+                    longClickListener.onClick(view);
+                }
+                return true;
+            }
+        });
+        return view;
+    }
+    
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/MainActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/MainActivity.java
index e99e465..3ff9f05 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/MainActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/MainActivity.java
@@ -17,9 +17,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import com.yanzhenjie.album.sample.app.AlbumActivity;
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/MediaLoader.java b/sample/src/main/java/com/yanzhenjie/album/sample/MediaLoader.java
index 331e096..09663fa 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/MediaLoader.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/MediaLoader.java
@@ -15,30 +15,71 @@
  */
 package com.yanzhenjie.album.sample;
 
+import android.content.Context;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.yanzhenjie.album.AlbumFile;
 import com.yanzhenjie.album.AlbumLoader;
-import com.yanzhenjie.album.sample.R;
+import com.yanzhenjie.album.sample.photoview.AttacherImageView;
+import com.yanzhenjie.album.sample.photoview.PhotoViewAttacher;
 
 /**
  * Created by Yan Zhenjie on 2017/3/31.
  */
 public class MediaLoader implements AlbumLoader {
-
+    
     @Override
-    public void load(ImageView imageView, AlbumFile albumFile) {
-        load(imageView, albumFile.getPath());
+    public void load(@NonNull ImageView imageView, @NonNull AlbumFile albumFile) {
+        load(imageView, albumFile.getUri());
     }
-
+    
     @Override
-    public void load(ImageView imageView, String url) {
+    public void load(@NonNull ImageView imageView, @NonNull Uri uri) {
         Glide.with(imageView.getContext())
-                .load(url)
-                .error(R.drawable.placeholder)
-                .placeholder(R.drawable.placeholder)
-                .crossFade()
-                .into(imageView);
+            .load(uri)
+            .error(R.drawable.placeholder)
+            .placeholder(R.drawable.placeholder)
+            .into(imageView);
+    }
+    
+    @NonNull
+    @Override
+    public View getPreviewView(@NonNull Context context, @NonNull AlbumFile albumFile, final View.OnClickListener onClickListener, final View.OnClickListener longClickListener) {
+        return getPreviewView(context, albumFile.getUri(), onClickListener, longClickListener);
+    }
+    
+    @NonNull
+    @Override
+    public View getPreviewView(@NonNull Context context, @NonNull Uri uri, @Nullable final View.OnClickListener onClickListener, @Nullable final View.OnClickListener longClickListener) {
+        final AttacherImageView view = new AttacherImageView(context);
+        view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        load(view, uri);
+        PhotoViewAttacher attacher = new PhotoViewAttacher(view);
+        if (onClickListener != null) {
+            attacher.setOnViewTapListener(new PhotoViewAttacher.OnViewTapListener() {
+                @Override
+                public void onViewTap(View v, float x, float y) {
+                    onClickListener.onClick(v);
+                }
+            });
+        }
+        if (longClickListener != null) {
+            attacher.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    longClickListener.onClick(v);
+                    return true;
+                }
+            });
+        }
+        view.setAttacher(attacher);
+        return view;
     }
+    
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/Adapter.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/Adapter.java
index 8ac9ae7..76c2c90 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/Adapter.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/Adapter.java
@@ -16,8 +16,8 @@
 package com.yanzhenjie.album.sample.app;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumActivity.java
index 4145100..71638ef 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumActivity.java
@@ -17,12 +17,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumFilterActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumFilterActivity.java
index 0a02914..0adca4b 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumFilterActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/AlbumFilterActivity.java
@@ -18,13 +18,13 @@
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/CameraActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/CameraActivity.java
index 54c0850..fcbc5a2 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/CameraActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/CameraActivity.java
@@ -15,12 +15,8 @@
  */
 package com.yanzhenjie.album.sample.app;
 
+import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
@@ -29,16 +25,23 @@
 
 import com.yanzhenjie.album.Action;
 import com.yanzhenjie.album.Album;
+import com.yanzhenjie.album.AlbumCameraFile;
 import com.yanzhenjie.album.sample.R;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * Created by YanZhenjie on 2017/8/17.
  */
 public class CameraActivity extends AppCompatActivity {
-
+    
     TextView mTextView;
     private ImageView mImageView;
-
+    
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,66 +51,65 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         ActionBar actionBar = getSupportActionBar();
         assert actionBar != null;
         actionBar.setDisplayHomeAsUpEnabled(true);
-
+        
         mTextView = findViewById(R.id.tv_message);
         mImageView = findViewById(R.id.image_view);
     }
-
+    
     private void takePicture() {
         Album.camera(this)
-                .image()
-//                .filePath()
-                .onResult(new Action<String>() {
-                    @Override
-                    public void onAction(@NonNull String result) {
-                        mTextView.setText(result);
-
-                        Album.getAlbumConfig()
-                                .getAlbumLoader()
-                                .load(mImageView, result);
-                    }
-                })
-                .onCancel(new Action<String>() {
-                    @Override
-                    public void onAction(@NonNull String result) {
-                        Toast.makeText(CameraActivity.this, R.string.canceled, Toast.LENGTH_LONG).show();
-                    }
-                })
-                .start();
+            .image()
+            //                .filePath()
+            .onResult(new Action<AlbumCameraFile>() {
+                @Override
+                public void onAction(@NonNull AlbumCameraFile result) {
+                    mTextView.setText(result.toString());
+                    Album.getAlbumConfig()
+                        .getAlbumLoader()
+                        .load(mImageView, result.getUri());
+                }
+            })
+            .onCancel(new Action<String>() {
+                @Override
+                public void onAction(@NonNull String result) {
+                    Toast.makeText(CameraActivity.this, R.string.canceled, Toast.LENGTH_LONG).show();
+                }
+            })
+            .start();
     }
-
+    
     private void recordVideo() {
         Album.camera(this)
-                .video()
-//                .filePath()
-                .quality(1)
-                .limitDuration(Integer.MAX_VALUE)
-                .limitBytes(Integer.MAX_VALUE)
-                .onResult(new Action<String>() {
-                    @Override
-                    public void onAction(@NonNull String result) {
-                        mTextView.setText(result);
-
-                        Album.getAlbumConfig()
-                                .getAlbumLoader()
-                                .load(mImageView, result);
-                    }
-                })
-                .onCancel(new Action<String>() {
-                    @Override
-                    public void onAction(@NonNull String result) {
-                        Toast.makeText(CameraActivity.this, R.string.canceled, Toast.LENGTH_LONG).show();
-                    }
-                })
-                .start();
+            .video()
+            //                .filePath()
+            .quality(1)
+            .limitDuration(Integer.MAX_VALUE)
+            .limitBytes(Integer.MAX_VALUE)
+            .onResult(new Action<AlbumCameraFile>() {
+                @Override
+                public void onAction(@NonNull AlbumCameraFile result) {
+                    mTextView.setText(result.toString());
+                    
+                    Album.getAlbumConfig()
+                        .getAlbumLoader()
+                        .load(mImageView, result.getUri());
+                }
+            })
+            .onCancel(new Action<String>() {
+                @Override
+                public void onAction(@NonNull String result) {
+                    Toast.makeText(CameraActivity.this, R.string.canceled, Toast.LENGTH_LONG).show();
+                }
+            })
+            .start();
     }
-
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_album_camera, menu);
         return true;
     }
-
+    
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/DefineStyleActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/DefineStyleActivity.java
index bdd0886..40bd1d4 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/DefineStyleActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/DefineStyleActivity.java
@@ -17,12 +17,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/GalleryActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/GalleryActivity.java
index 63496d9..51feb37 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/GalleryActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/GalleryActivity.java
@@ -16,10 +16,6 @@
 package com.yanzhenjie.album.sample.app;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
@@ -32,32 +28,56 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * Created by YanZhenjie on 2017/8/17.
  */
 public class GalleryActivity extends AppCompatActivity {
 
     private static final String[] IMAGE_PATH_LIST = {
-            "http://pic1.win4000.com/mobile/1/520d9410ebc79.jpg", "http://pic1.win4000.com/mobile/1/520d941218b04.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925tn4a5sz3at2.jpg", "http://wapfile.desktx.com/7681280/0925/160925ruuqfaqwuvx.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925a0x5knyt3ue.jpg", "http://wapfile.desktx.com/7681280/0925/160925jrfl5dnvln1.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925csx5pu2ysam.jpg", "http://wapfile.desktx.com/7681280/0925/160925m4lgeuakuc5.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925gcmbg5gycqw.jpg", "http://wapfile.desktx.com/7681280/0925/160925o0zf2pbozw1.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925danhsef1uzu.jpg", "http://wapfile.desktx.com/7681280/0925/160925y5lmcrqslm4.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925njt3dm2hlw0.jpg", "http://wapfile.desktx.com/7681280/0925/160925xgesspjxztt.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925a5dg2zsddtx.jpg", "http://wapfile.desktx.com/7681280/0925/1609252fupmrdasrp.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925lasaphesxkd.jpg", "http://wapfile.desktx.com/7681280/0925/160925ti2kged45bp.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925dsx3uyapoen.jpg", "http://wapfile.desktx.com/7681280/0925/160925largrb3p2l4.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925l0vaht45uy1.jpg", "http://wapfile.desktx.com/7681280/0925/160925054jrhaerro.jpg",
-            "http://wapfile.desktx.com/7681280/0925/1609255mlt2so5yp2.jpg", "http://wapfile.desktx.com/7681280/0925/160925bm3jmwdptie.jpg",
-            "http://wapfile.desktx.com/7681280/0925/1609251brfaryoizu.jpg", "http://wapfile.desktx.com/7681280/0925/1609254qfjkbwjlox.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925memb5c4pcnt.jpg", "http://wapfile.desktx.com/7681280/0925/160925c5i4dbhh2rh.jpg",
-            "http://wapfile.desktx.com/7681280/0925/1609254pmjqhppmah.jpg", "http://wapfile.desktx.com/7681280/0925/16092505gvkuoampz.jpg",
-            "http://wapfile.desktx.com/7681280/0925/1609254dxk3vpsrvj.jpg", "http://wapfile.desktx.com/7681280/0925/160925bgyxuik3j4y.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925jbhhtendosg.jpg", "http://wapfile.desktx.com/7681280/0925/160925knnv51uglia.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925vajxn2aqfkc.jpg", "http://wapfile.desktx.com/7681280/0925/160925xehnehy5frf.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925e2rajc4zi4k.jpg", "http://wapfile.desktx.com/7681280/0925/160925dfxg2wlarga.jpg",
-            "http://wapfile.desktx.com/7681280/0925/160925vuifhcqactt.jpg", "http://wapfile.desktx.com/7681280/0925/160925rcxiez3ikcg.jpg"
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511268196&di=a17c805213846a55eb067565cda0ae0f&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170314%2F20170314093020_61f5e1c760157917576b50b62bc59c80_7.jpeg", "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298118&di=263456f22d8b03397cc467c82c9cd195&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20181003%2F0f8307fe3de6468d8b51c53b276e9e1b.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298118&di=b2944fc7eef07d274d629ba9a2eff5be&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2Fd%2F574bd264dc04f.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298118&di=f6e60ae16352a14b848dba216af784f4&imgtype=0&src=http%3A%2F%2Fp0.qhimg.com%2Ft01dc11f29c01424c6d.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298114&di=156b200f20eb702f2ad3ba8fc5b55ba2&imgtype=0&src=http%3A%2F%2Fpic.feizl.com%2Fupload%2Fallimg%2F170614%2F1410251g5-0.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298114&di=2194e443572fcac6b86e8ca9a3eb9acc&imgtype=0&src=http%3A%2F%2F00.minipic.eastday.com%2F20170303%2F20170303140548_7cb2d40a62600c2ee10f9c826dedfb8b_9.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298112&di=69a2ac37a9b763829f3c26195a7fcbf0&imgtype=0&src=http%3A%2F%2Fn.sinaimg.cn%2Fsinacn18%2F410%2Fw1470h2140%2F20180525%2F59be-haysviy8786664.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298111&di=40e9330ad50aafb884d6699801f1d2d2&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2F2%2F48%2F542c1208181.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298110&di=039ff5882950f28189cea1ad6f1a25e4&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2Fb%2F5680fcc0d31b2.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298110&di=ed3cf8b466ca36997ce94201f392d8c7&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2Fa%2F64%2F79121317058.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298109&di=c95f19699712aa1c51b3bff4f0f6a0cc&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170421%2F20170421142504_aa430cd7552a22e19a91054d15ae0905_14.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298109&di=8ce9291fd03a7e225cfe0f4cf4524769&imgtype=0&src=http%3A%2F%2Fimage.hnol.net%2Fc%2F2013-03%2F20%2F19%2F20130320191211951-2089977.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298256&di=51e80d7ccbda7e72856a9db4d0961afa&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201707%2F17%2F20170717230736_RWUmT.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298255&di=8ec2d086beaa20b3414eb357c4bd2286&imgtype=0&src=http%3A%2F%2Fimg.pconline.com.cn%2Fimages%2Fupload%2Fupc%2Ftx%2Fphotoblog%2F1405%2F28%2Fc3%2F34712742_34712742_1401260899709.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298256&di=d2a6ce2938738d40ae62119e68573b18&imgtype=0&src=http%3A%2F%2Fimg4.cache.netease.com%2Fphoto%2F0026%2F2013-07-08%2F938RKTEP43AJ0026.JPG",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298255&di=fa5fbffe31186ea20df334ab4063725c&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170306%2F20170306111324_d2b7a6d928ad827f4db19f355b9550d4_5.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298255&di=da54af6be9cce91a57426f9cb684d49f&imgtype=0&src=http%3A%2F%2Fi3.17173.itc.cn%2F2008%2Fjr%2F2008%2F11%2F20%2F8.JPG",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298255&di=850c6e1979c1cac2faebe91ec910913a&imgtype=0&src=http%3A%2F%2Fimage.hnol.net%2Fc%2F2016-01%2F30%2F18%2F201601301826324531-3356886.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298254&di=5bc035ef1f5ac4ffb90fbf6fe62027ae&imgtype=0&src=http%3A%2F%2Fp0.ifengimg.com%2Fa%2F2016_33%2Fb9050beb18718b0_size524_w3885_h2745.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298254&di=8cb3d6fac8e62a0291aabde8aad08dab&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20190126%2F6727836cd8c84e3f9f02ecb97f4cc5cc.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298254&di=43f222be11c12cbf8cc77ca55ca08c11&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170506%2F20170506134244_50112ebd2eb624744aa8b957008a8d71_4.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511954989&di=8a4a9739fab70902712c00ff9828428f&imgtype=0&src=http%3A%2F%2Fimg4.imgtn.bdimg.com%2Fit%2Fu%3D3556124484%2C830383795%26fm%3D214%26gp%3D0.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298253&di=82c1aff5dfde5886b2f10338d7733dc0&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2F2018-09-10%2F5b961ed1809f1.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298253&di=65206968f3d93a8e8ad4783356d7fd87&imgtype=0&src=http%3A%2F%2F00.minipic.eastday.com%2F20170122%2F20170122133549_02dc7a8d994ea57c5a7c11421a56eb2f_2.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298253&di=8aa1beeca9e2274fc8bc7055fd815d0f&imgtype=0&src=http%3A%2F%2F00.minipic.eastday.com%2F20170417%2F20170417154748_f05b8931f7bed94d8a76e9f96d784a8b_9.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298253&di=f5fa7bfe3aed8d636fa8716738415d90&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2F7%2F07%2F26501170849.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298253&di=05e0dd05b7ea3e283bcc4a9f189970b5&imgtype=0&src=http%3A%2F%2Fn.sinaimg.cn%2Fsinacn10111%2F710%2Fw1600h2310%2F20181207%2F8102-hpinryc5855494.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298252&di=03c16c31e38886781a1ed04fe3a1f986&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2F7%2Fe8%2Fa8781211260.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298252&di=efc9e9755ae73cfcbeeefc8088165ac1&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170421%2F20170421142504_aa430cd7552a22e19a91054d15ae0905_9.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298252&di=d68706f875990e682a152292beb7bbb3&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170519%2F20170519154440_0791cfd6f5d25410bcde032e77afb40d_2.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298251&di=0064201bef322ecfdc7359f7bbdabb7e&imgtype=0&src=http%3A%2F%2Fwww.deskcar.com%2Fdesktop%2Fstar%2Fchina%2F20151124212913%2F7.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298251&di=41c055afa9f969fa4096fd44e41dc094&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2F5%2F39%2F58581218506.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298251&di=5ebc26be806759d833492f14887fe6bb&imgtype=0&src=http%3A%2F%2Fwww.flybridal.com%2Fhuangse%2FaHR0cDovL3BpYzEud2luNDAwMC5jb20vcGljL2YvMzMvM2I5YjMwMTQyNi5qcGc%3D.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298250&di=237cae63df3dad5ef3a8a61acf6e36b9&imgtype=0&src=http%3A%2F%2Fimg.pconline.com.cn%2Fimages%2Fupload%2Fupc%2Ftx%2Fphotoblog%2F1111%2F24%2Fc2%2F9721899_9721899_1322103707644.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298249&di=79bc09a920abfc3601420db91e3c759d&imgtype=0&src=http%3A%2F%2F00.minipic.eastday.com%2F20170407%2F20170407091825_3cbfafdd9a6fe547be7cab4ae702077e_2.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511298248&di=105a164fdb6c8192b2a8576bcc1250cb&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20181125%2F5369ec03f8274b4c889537fea5b635e9.jpeg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511994779&di=99bddb40e08488550d893ebf8f0ff892&imgtype=0&src=http%3A%2F%2Fimg.improve-yourmemory.com%2Fpic%2F913f45ee741278fc4213e5d861fe2acb-4.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511994779&di=170a327f5f388d45aeafd88a5775c727&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fpic%2F0%2F29%2F163a1215183.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511994778&di=1a37f80710cd3dd09aed0e0ee3fdf772&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2F1%2F50655aa104436.jpg",
+        "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1595511994777&di=d1feb652465b5af592a82f2b6c36a1bc&imgtype=0&src=http%3A%2F%2F01.minipic.eastday.com%2F20170308%2F20170308093953_6e555cf710ad2a15a03ef91239032c85_4.jpeg"
     };
 
     private Toolbar mToolbar;
@@ -80,25 +100,30 @@ public void onClick(View v) {
         });
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
     private void previewImages() {
         ArrayList<String> imageList = new ArrayList<>();
         Collections.addAll(imageList, IMAGE_PATH_LIST);
 
         Album.gallery(this)
-                .checkedList(imageList)
-                .checkable(mCheckBox.isChecked())
-                .widget(
-                        Widget.newDarkBuilder(this)
-                                .title(mToolbar.getTitle().toString())
-                                .build()
-                )
-                .onResult(new Action<ArrayList<String>>() {
-                    @Override
-                    public void onAction(@NonNull ArrayList<String> result) {
-                        // TODO If it is optional, here you can accept the results of user selection.
-                    }
-                })
-                .start();
+            .checkedList(imageList)
+            .checkable(mCheckBox.isChecked())
+            .widget(
+                Widget.newDarkBuilder(this)
+                    .title(mToolbar.getTitle().toString())
+                    .build()
+            )
+            .onResult(new Action<ArrayList<String>>() {
+                @Override
+                public void onAction(@NonNull ArrayList<String> result) {
+                    // TODO If it is optional, here you can accept the results of user selection.
+                }
+            })
+            .start();
     }
 
     @Override
@@ -113,8 +138,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return true;
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
 }
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/ImageActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/ImageActivity.java
index a08c964..f985915 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/ImageActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/ImageActivity.java
@@ -17,12 +17,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/sample/src/main/java/com/yanzhenjie/album/sample/app/VideoActivity.java b/sample/src/main/java/com/yanzhenjie/album/sample/app/VideoActivity.java
index d1894c1..9aaac05 100644
--- a/sample/src/main/java/com/yanzhenjie/album/sample/app/VideoActivity.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/app/VideoActivity.java
@@ -17,12 +17,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/AttacherImageView.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/AttacherImageView.java
similarity index 84%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/AttacherImageView.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/AttacherImageView.java
index 71842d1..582a76e 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/AttacherImageView.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/AttacherImageView.java
@@ -1,15 +1,15 @@
-package com.yanzhenjie.album.widget.photoview;
+package com.yanzhenjie.album.sample.photoview;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 
 /**
  * Created by Yan Zhenjie on 2017/3/31.
  */
 
-public class AttacherImageView extends android.support.v7.widget.AppCompatImageView {
+public class AttacherImageView extends androidx.appcompat.widget.AppCompatImageView {
 
     private PhotoViewAttacher mAttacher;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/Compat.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/Compat.java
similarity index 96%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/Compat.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/Compat.java
index 7bf9dc1..70e7c92 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/Compat.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/Compat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview;
+package com.yanzhenjie.album.sample.photoview;
 
 import android.annotation.TargetApi;
 import android.os.Build.VERSION;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/DefaultOnDoubleTapListener.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/DefaultOnDoubleTapListener.java
similarity index 98%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/DefaultOnDoubleTapListener.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/DefaultOnDoubleTapListener.java
index d1b120c..a0cbf05 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/DefaultOnDoubleTapListener.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/DefaultOnDoubleTapListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview;
+package com.yanzhenjie.album.sample.photoview;
 
 import android.graphics.RectF;
 import android.view.GestureDetector;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/IPhotoView.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/IPhotoView.java
similarity index 99%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/IPhotoView.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/IPhotoView.java
index ab27a5c..75c80dc 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/IPhotoView.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/IPhotoView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview;
+package com.yanzhenjie.album.sample.photoview;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/PhotoViewAttacher.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/PhotoViewAttacher.java
similarity index 98%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/PhotoViewAttacher.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/PhotoViewAttacher.java
index 53ba105..72d8608 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/PhotoViewAttacher.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/PhotoViewAttacher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview;
+package com.yanzhenjie.album.sample.photoview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -22,8 +22,8 @@
 import android.graphics.Matrix.ScaleToFit;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.view.MotionEventCompat;
+import androidx.annotation.Nullable;
+import androidx.core.view.MotionEventCompat;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -35,9 +35,9 @@
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
 
-import com.yanzhenjie.album.widget.photoview.gestures.OnGestureListener;
-import com.yanzhenjie.album.widget.photoview.gestures.VersionedGestureDetector;
-import com.yanzhenjie.album.widget.photoview.scrollerproxy.ScrollerProxy;
+import com.yanzhenjie.album.sample.photoview.gestures.OnGestureListener;
+import com.yanzhenjie.album.sample.photoview.gestures.VersionedGestureDetector;
+import com.yanzhenjie.album.sample.photoview.scrollerproxy.ScrollerProxy;
 
 import java.lang.ref.WeakReference;
 
@@ -118,7 +118,7 @@ private static void setImageViewScaleTypeMatrix(ImageView imageView) {
 
     // Gesture Detectors
     private GestureDetector mGestureDetector;
-    private com.yanzhenjie.album.widget.photoview.gestures.GestureDetector mScaleDragDetector;
+    private com.yanzhenjie.album.sample.photoview.gestures.GestureDetector mScaleDragDetector;
 
     // These are set so we don't keep allocating them on the heap
     private final Matrix mBaseMatrix = new Matrix();
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/CupcakeGestureDetector.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/CupcakeGestureDetector.java
similarity index 98%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/CupcakeGestureDetector.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/CupcakeGestureDetector.java
index 9f31c1c..b3ce78d 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/CupcakeGestureDetector.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/CupcakeGestureDetector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.gestures;
+package com.yanzhenjie.album.sample.photoview.gestures;
 
 import android.content.Context;
 import android.view.MotionEvent;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/EclairGestureDetector.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/EclairGestureDetector.java
similarity index 96%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/EclairGestureDetector.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/EclairGestureDetector.java
index 32053b4..3b57f46 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/EclairGestureDetector.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/EclairGestureDetector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.gestures;
+package com.yanzhenjie.album.sample.photoview.gestures;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.view.MotionEvent;
 
-import com.yanzhenjie.album.widget.photoview.Compat;
+import com.yanzhenjie.album.sample.photoview.Compat;
 
 @TargetApi(5)
 public class EclairGestureDetector extends CupcakeGestureDetector {
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/FroyoGestureDetector.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/FroyoGestureDetector.java
similarity index 97%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/FroyoGestureDetector.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/FroyoGestureDetector.java
index fd50b6e..4349ca2 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/FroyoGestureDetector.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/FroyoGestureDetector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.gestures;
+package com.yanzhenjie.album.sample.photoview.gestures;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/GestureDetector.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/GestureDetector.java
similarity index 93%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/GestureDetector.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/GestureDetector.java
index 8cc90a5..e90c666 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/GestureDetector.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/GestureDetector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.gestures;
+package com.yanzhenjie.album.sample.photoview.gestures;
 
 import android.view.MotionEvent;
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/OnGestureListener.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/OnGestureListener.java
similarity index 93%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/OnGestureListener.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/OnGestureListener.java
index a6356c3..0bda9be 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/OnGestureListener.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/OnGestureListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.gestures;
+package com.yanzhenjie.album.sample.photoview.gestures;
 
 public interface OnGestureListener {
 
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/VersionedGestureDetector.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/VersionedGestureDetector.java
similarity index 96%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/VersionedGestureDetector.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/VersionedGestureDetector.java
index b358c0b..05082ed 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/gestures/VersionedGestureDetector.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/gestures/VersionedGestureDetector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.gestures;
+package com.yanzhenjie.album.sample.photoview.gestures;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/GingerScroller.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/GingerScroller.java
similarity index 96%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/GingerScroller.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/GingerScroller.java
index 592c262..f8f3290 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/GingerScroller.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/GingerScroller.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.scrollerproxy;
+package com.yanzhenjie.album.sample.photoview.scrollerproxy;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/IcsScroller.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/IcsScroller.java
similarity index 93%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/IcsScroller.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/IcsScroller.java
index d165aa6..3a3f2e9 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/IcsScroller.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/IcsScroller.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.scrollerproxy;
+package com.yanzhenjie.album.sample.photoview.scrollerproxy;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/PreGingerScroller.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/PreGingerScroller.java
similarity index 96%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/PreGingerScroller.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/PreGingerScroller.java
index 677c734..04b6b39 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/PreGingerScroller.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/PreGingerScroller.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.scrollerproxy;
+package com.yanzhenjie.album.sample.photoview.scrollerproxy;
 
 import android.content.Context;
 import android.widget.Scroller;
diff --git a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/ScrollerProxy.java b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/ScrollerProxy.java
similarity index 96%
rename from album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/ScrollerProxy.java
rename to sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/ScrollerProxy.java
index 2f2fd1a..652eb00 100644
--- a/album/src/main/java/com/yanzhenjie/album/widget/photoview/scrollerproxy/ScrollerProxy.java
+++ b/sample/src/main/java/com/yanzhenjie/album/sample/photoview/scrollerproxy/ScrollerProxy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanzhenjie.album.widget.photoview.scrollerproxy;
+package com.yanzhenjie.album.sample.photoview.scrollerproxy;
 
 import android.content.Context;
 import android.os.Build.VERSION;
diff --git a/sample/src/main/res/layout/activity_album.xml b/sample/src/main/res/layout/activity_album.xml
index 030c2ea..79ae7eb 100644
--- a/sample/src/main/res/layout/activity_album.xml
+++ b/sample/src/main/res/layout/activity_album.xml
@@ -14,11 +14,11 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     style="@style/Album.MatchParent">
 
     <include layout="@layout/toolbar"/>
 
     <include layout="@layout/activity_list_content"/>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_album_filter.xml b/sample/src/main/res/layout/activity_album_filter.xml
index c914c76..23a7c11 100644
--- a/sample/src/main/res/layout/activity_album_filter.xml
+++ b/sample/src/main/res/layout/activity_album_filter.xml
@@ -14,7 +14,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Album.MatchParent">
 
@@ -32,11 +32,11 @@
             android:text="@string/hint_image_preview_click"
             android:visibility="gone" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             style="@style/Album.WrapContent.WidthMatchParent"
             android:layout_marginTop="@dimen/album_dp_10" />
     </LinearLayout>
 
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_album_ui.xml b/sample/src/main/res/layout/activity_album_ui.xml
index 061233b..aa9b0ba 100644
--- a/sample/src/main/res/layout/activity_album_ui.xml
+++ b/sample/src/main/res/layout/activity_album_ui.xml
@@ -13,10 +13,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.CoordinatorLayout style="@style/Album.MatchParent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/Album.MatchParent">
 
     <include layout="@layout/toolbar" />
 
     <include layout="@layout/activity_list_content" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_camera.xml b/sample/src/main/res/layout/activity_camera.xml
index ed5baaa..33d813d 100644
--- a/sample/src/main/res/layout/activity_camera.xml
+++ b/sample/src/main/res/layout/activity_camera.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2017 Yan Zhenjie.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Album.MatchParent">
 
@@ -31,12 +30,12 @@
             style="@style/Album.WrapContent.WidthMatchParent"
             android:layout_margin="@dimen/album_dp_10" />
 
-        <ImageView
+        <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/image_view"
             style="@style/Album.MatchParent"
             android:contentDescription="@string/app_name"
-            android:scaleType="fitCenter" />
+            app:actualImageScaleType="fitCenter" />
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_gallery.xml b/sample/src/main/res/layout/activity_gallery.xml
index dde472a..2500b6a 100644
--- a/sample/src/main/res/layout/activity_gallery.xml
+++ b/sample/src/main/res/layout/activity_gallery.xml
@@ -14,7 +14,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Album.MatchParent">
@@ -26,12 +26,12 @@
         android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_gallery"
             style="@style/Album.Button.Main"
             android:text="@string/btn_gallery_preview"/>
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/checkbox"
             style="@style/Album.WrapContent"
             android:layout_marginTop="@dimen/album_dp_10"
@@ -40,4 +40,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_list_content.xml b/sample/src/main/res/layout/activity_list_content.xml
index eb287a6..3a4b12d 100644
--- a/sample/src/main/res/layout/activity_list_content.xml
+++ b/sample/src/main/res/layout/activity_list_content.xml
@@ -27,11 +27,11 @@
         android:text="@string/hint_image_preview_click"
         android:visibility="gone" />
 
-    <ImageView
+    <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/image_view"
         style="@style/Album.WrapContent" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         style="@style/Album.WrapContent.WidthMatchParent"
         android:layout_marginTop="@dimen/album_dp_10" />
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 992c0c2..db123c0 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -14,13 +14,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Album.MatchParent">
 
     <include layout="@layout/toolbar_scroll" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         style="@style/Album.MatchParent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -28,7 +28,7 @@
             style="@style/Album.WrapContent.WidthMatchParent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_camera"
                 style="@style/Album.Button.Main"
                 android:text="@string/btn_function_camera" />
@@ -37,39 +37,39 @@
                 style="@style/Album.WrapContent.WidthMatchParent"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatButton
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_image"
                     style="@style/Album.Button.Main"
                     android:layout_weight="1"
                     android:text="@string/btn_function_picture" />
 
-                <android.support.v7.widget.AppCompatButton
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_video"
                     style="@style/Album.Button.Main"
                     android:layout_weight="1"
                     android:text="@string/btn_function_video" />
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_album"
                 style="@style/Album.Button.Main"
                 android:text="@string/btn_function_album" />
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_gallery"
                 style="@style/Album.Button.Main"
                 android:text="@string/btn_function_gallery" />
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_chang_ui"
                 style="@style/Album.Button.Main"
                 android:text="@string/btn_function_change_style" />
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_filter"
                 style="@style/Album.Button.Main"
                 android:text="@string/btn_function_filter" />
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/album_item_content_image.xml b/sample/src/main/res/layout/album_item_content_image.xml
new file mode 100644
index 0000000..2e7df31
--- /dev/null
+++ b/sample/src/main/res/layout/album_item_content_image.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2017 Yan Zhenjie.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<com.yanzhenjie.album.widget.SquareCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Album.Item.Card.MatchParent">
+
+    <RelativeLayout style="@style/Album.MatchParent">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/iv_album_content_image"
+            style="@style/Album.MatchParent"
+            android:contentDescription="@string/album_title"
+            android:scaleType="centerCrop" />
+
+        <com.yanzhenjie.album.widget.TransferLayout
+            style="@style/Album.WrapContent.Transfer"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true">
+
+            <androidx.appcompat.widget.AppCompatCheckBox
+                android:id="@+id/check_box"
+                style="@style/Album.CheckBox.WrapContent" />
+        </com.yanzhenjie.album.widget.TransferLayout>
+
+    </RelativeLayout>
+
+    <FrameLayout
+        android:id="@+id/layout_layer"
+        style="@style/Album.MatchParent"
+        android:background="@color/albumSheetLayer">
+
+        <TextView
+            style="@style/Album.WrapContent"
+            android:layout_gravity="center"
+            android:text="@string/album_item_unavailable"
+            android:textColor="@color/albumFontLight"
+            android:textSize="@dimen/album_sp_16" />
+
+    </FrameLayout>
+
+</com.yanzhenjie.album.widget.SquareCardView>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/album_item_content_video.xml b/sample/src/main/res/layout/album_item_content_video.xml
new file mode 100644
index 0000000..3c0ec35
--- /dev/null
+++ b/sample/src/main/res/layout/album_item_content_video.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2017 Yan Zhenjie.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<com.yanzhenjie.album.widget.SquareCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Album.Item.Card.MatchParent">
+
+    <RelativeLayout style="@style/Album.MatchParent">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/iv_album_content_image"
+            style="@style/Album.MatchParent"
+            android:contentDescription="@string/album_title"
+            android:scaleType="centerCrop" />
+
+        <com.yanzhenjie.album.widget.TransferLayout
+            style="@style/Album.WrapContent.Transfer"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true">
+
+            <androidx.appcompat.widget.AppCompatCheckBox
+                android:id="@+id/check_box"
+                style="@style/Album.CheckBox.WrapContent" />
+        </com.yanzhenjie.album.widget.TransferLayout>
+
+        <TextView
+            android:id="@+id/tv_duration"
+            style="@style/Album.WrapContent"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/album_dp_6"
+            android:layout_marginLeft="@dimen/album_dp_6"
+            android:layout_marginBottom="@dimen/album_dp_6"
+            android:drawableStart="@drawable/album_tag_video_white"
+            android:drawableLeft="@drawable/album_tag_video_white"
+            android:drawablePadding="@dimen/album_dp_4"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:textColor="@color/albumFontLight" />
+
+    </RelativeLayout>
+
+    <FrameLayout
+        android:id="@+id/layout_layer"
+        style="@style/Album.MatchParent"
+        android:background="@color/albumSheetLayer">
+
+        <TextView
+            style="@style/Album.WrapContent"
+            android:layout_gravity="center"
+            android:text="@string/album_item_unavailable"
+            android:textColor="@color/albumFontLight"
+            android:textSize="@dimen/album_sp_16" />
+
+    </FrameLayout>
+</com.yanzhenjie.album.widget.SquareCardView>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/album_item_dialog_folder.xml b/sample/src/main/res/layout/album_item_dialog_folder.xml
new file mode 100644
index 0000000..24b03d4
--- /dev/null
+++ b/sample/src/main/res/layout/album_item_dialog_folder.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2017 Yan Zhenjie.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Album.WrapContent.WidthMatchParent"
+    android:background="?selectableItemBackground"
+    android:padding="@dimen/album_dp_10">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/iv_gallery_preview_image"
+        android:layout_width="@dimen/album_dp_80"
+        android:layout_height="@dimen/album_dp_80"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:contentDescription="@string/album_title"
+        android:scaleType="centerCrop" />
+
+    <androidx.appcompat.widget.AppCompatRadioButton
+        android:id="@+id/rb_gallery_preview_check"
+        style="@style/Album.WrapContent"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:clickable="false" />
+
+    <TextView
+        android:id="@+id/tv_gallery_preview_title"
+        style="@style/Album.WrapContent.WidthMatchParent"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/album_dp_10"
+        android:layout_marginLeft="@dimen/album_dp_10"
+        android:layout_marginEnd="@dimen/album_dp_10"
+        android:layout_marginRight="@dimen/album_dp_10"
+        android:layout_toStartOf="@id/rb_gallery_preview_check"
+        android:layout_toLeftOf="@id/rb_gallery_preview_check"
+        android:layout_toEndOf="@id/iv_gallery_preview_image"
+        android:layout_toRightOf="@id/iv_gallery_preview_image"
+        android:ellipsize="end"
+        android:maxLines="1" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/item_content_image.xml b/sample/src/main/res/layout/item_content_image.xml
index 09fc0ef..41a6cae 100644
--- a/sample/src/main/res/layout/item_content_image.xml
+++ b/sample/src/main/res/layout/item_content_image.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2017 Yan Zhenjie.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<com.yanzhenjie.album.widget.SquareImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/iv_album_content_image"
-    style="@style/Album.MatchParent"
-    android:contentDescription="@string/album_title"
-    android:scaleType="centerCrop" />
\ No newline at end of file
+<com.yanzhenjie.album.widget.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/Album.MatchParent">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/iv_album_content_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/album_title"
+        app:actualImageScaleType="centerCrop"
+        app:viewAspectRatio="1.0" />
+</com.yanzhenjie.album.widget.SquareFrameLayout>
diff --git a/sample/src/main/res/layout/item_content_video.xml b/sample/src/main/res/layout/item_content_video.xml
index 7755cde..6b66897 100644
--- a/sample/src/main/res/layout/item_content_video.xml
+++ b/sample/src/main/res/layout/item_content_video.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2017 Yan Zhenjie.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,22 +16,22 @@
 <com.yanzhenjie.album.widget.SquareRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Album.MatchParent">
 
-    <ImageView
+    <com.facebook.drawee.view.SimpleDraweeView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/iv_album_content_image"
         style="@style/Album.MatchParent"
         android:contentDescription="@string/album_title"
-        android:scaleType="centerCrop" />
+        app:actualImageScaleType="centerCrop" />
 
     <TextView
         android:id="@+id/tv_duration"
         style="@style/Album.WrapContent"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/album_dp_6"
-        android:layout_marginLeft="@dimen/album_dp_6"
         android:layout_marginStart="@dimen/album_dp_6"
+        android:layout_marginLeft="@dimen/album_dp_6"
+        android:layout_marginBottom="@dimen/album_dp_6"
+        android:drawableStart="@drawable/tag_video_white"
         android:drawableLeft="@drawable/tag_video_white"
         android:drawablePadding="@dimen/album_dp_4"
-        android:drawableStart="@drawable/tag_video_white"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/albumFontLight" />
diff --git a/sample/src/main/res/layout/toolbar.xml b/sample/src/main/res/layout/toolbar.xml
index 7602e9f..1439168 100644
--- a/sample/src/main/res/layout/toolbar.xml
+++ b/sample/src/main/res/layout/toolbar.xml
@@ -14,12 +14,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.AppBarLayout
+<com.google.android.material.appbar.AppBarLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Album.WrapContent.WidthMatchParent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         style="@style/Toolbar"/>
 
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/toolbar_scroll.xml b/sample/src/main/res/layout/toolbar_scroll.xml
index 6b8a9f3..1b19495 100644
--- a/sample/src/main/res/layout/toolbar_scroll.xml
+++ b/sample/src/main/res/layout/toolbar_scroll.xml
@@ -14,14 +14,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<android.support.design.widget.AppBarLayout
+<com.google.android.material.appbar.AppBarLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Album.WrapContent.WidthMatchParent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         style="@style/Toolbar"
         app:layout_scrollFlags="enterAlways|snap|enterAlwaysCollapsed"/>
 
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file