diff --git a/build.gradle b/build.gradle
index d794233..c300e0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version="1.6.0"
+    ext.kotlin_version="1.8.22"
     repositories {
         google()
         mavenCentral()
@@ -10,9 +10,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/filepicker/build.gradle b/filepicker/build.gradle
index 3c53526..b600a48 100644
--- a/filepicker/build.gradle
+++ b/filepicker/build.gradle
@@ -7,12 +7,12 @@ apply plugin: 'maven-publish'
 group='com.github.rosuH'
 
 android {
+    namespace 'me.rosuh.filepicker'
     defaultConfig {
-        minSdkVersion 16
-        compileSdk 33
-        targetSdkVersion 33
+        minSdkVersion 21
+        compileSdk 35
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -28,8 +28,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
@@ -49,18 +49,17 @@ afterEvaluate {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly 'com.squareup.picasso:picasso:2.5.2'
-    compileOnly ("com.github.bumptech.glide:glide:4.9.0") {
+    compileOnly 'com.squareup.picasso:picasso:2.71828'
+    compileOnly ('com.github.bumptech.glide:glide:5.0.5') {
         exclude group: "com.android.support"
     }
-    def kotlin_version = '1.6.0'
+    def kotlin_version = '1.8.22'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    testImplementation 'junit:junit:4.13.2'
+    // Removed androidTest dependencies to avoid minSdk conflicts in library module
 }
diff --git a/filepicker/src/main/java/me/rosuh/filepicker/engine/PicassoEngine.kt b/filepicker/src/main/java/me/rosuh/filepicker/engine/PicassoEngine.kt
index 60f9365..0340a97 100644
--- a/filepicker/src/main/java/me/rosuh/filepicker/engine/PicassoEngine.kt
+++ b/filepicker/src/main/java/me/rosuh/filepicker/engine/PicassoEngine.kt
@@ -18,12 +18,12 @@ class PicassoEngine : ImageEngine {
         placeholder: Int
     ) {
         if (url?.startsWith("http") == true) {
-            Picasso.with(context)
+            Picasso.get()
                 .load(url)
                 .placeholder(placeholder)
                 .into(imageView)
         } else {
-            Picasso.with(context)
+            Picasso.get()
                 .load(File(url))
                 .placeholder(placeholder)
                 .into(imageView)
diff --git a/filepicker/src/main/res/values-v21/styles.xml b/filepicker/src/main/res/values-v21/styles.xml
deleted file mode 100644
index a4d8841..0000000
--- a/filepicker/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<resources>
-
-    <style name="FilePickerThemeRail" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/rail_color_primary</item>
-        <item name="colorPrimaryDark">@color/rail_color_primary_dark</item>
-        <item name="colorAccent">@color/rail_color_accent</item>
-        <item name="android:buttonStyle">@style/FilePickerThemeRailButtonStyle</item>
-        <item name="android:textColor">@color/rail_text_color</item>
-        <item name="android:textColorPrimary">@color/rail_textColor_Primary</item>
-    </style>
-
-    <style name="FilePickerThemeRailButtonStyle" parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:background">@drawable/btn_selector_file_picker_rail</item>
-    </style>
-
-    <!--https://material.io/design/material-studies/reply.html#-->
-    <style name="FilePickerThemeReply" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/reply_color_primary</item>
-        <item name="colorPrimaryDark">@color/reply_color_primary_dark</item>
-        <item name="colorAccent">@color/reply_color_accent</item>
-        <item name="android:buttonStyle">@style/FilePickerThemeReplyButtonStyle</item>
-        <item name="android:textColor">@color/reply_text_color</item>
-        <item name="android:textColorPrimary">@color/reply_textColor_Primary</item>
-    </style>
-
-    <style name="FilePickerThemeReplyButtonStyle" parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:background">@drawable/btn_selector_file_picker_reply</item>
-    </style>
-
-    <!--https://material.io/design/material-studies/crane.html#about-crane-->
-    <style name="FilePickerThemeCrane" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/crane_color_primary</item>
-        <item name="colorPrimaryDark">@color/crane_color_primary_dark</item>
-        <item name="colorAccent">@color/crane_color_accent</item>
-        <item name="android:buttonStyle">@style/FilePickerThemeCraneButtonStyle</item>
-        <item name="android:textColor">@color/crane_text_color</item>
-        <item name="android:textColorPrimary">@color/crane_textColor_Primary</item>
-    </style>
-
-    <style name="FilePickerThemeCraneButtonStyle" parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:background">@drawable/btn_selector_file_picker_crane</item>
-    </style>
-
-    <!--https://material.io/design/material-studies/shrine.html#about-shrine-->
-    <style name="FilePickerThemeShrine" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/shrine_color_primary</item>
-        <item name="colorPrimaryDark">@color/shrine_color_primary_dark</item>
-        <item name="colorAccent">@color/shrine_color_accent</item>
-        <item name="android:buttonStyle">@style/FilePickerThemeShrineButtonStyle</item>
-        <item name="android:textColor">@color/shrine_text_color</item>
-        <item name="android:textColorPrimary">@color/shrine_textColor_Primary</item>
-    </style>
-
-    <style name="FilePickerThemeShrineButtonStyle" parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:background">@drawable/btn_selector_file_picker_shrine</item>
-    </style>
-</resources>
diff --git a/filepicker/src/main/res/values/styles.xml b/filepicker/src/main/res/values/styles.xml
index d35c344..b776eb1 100644
--- a/filepicker/src/main/res/values/styles.xml
+++ b/filepicker/src/main/res/values/styles.xml
@@ -1,6 +1,11 @@
-<resources>
-
-    <style name="FilePickerThemeRail" parent="Theme.AppCompat.Light.NoActionBar">
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="FilePickerTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item
+            name="android:windowOptOutEdgeToEdgeEnforcement"
+            tools:targetApi="35">true
+        </item>
+    </style>
+    <style name="FilePickerThemeRail" parent="FilePickerTheme">
         <item name="colorPrimary">@color/rail_color_primary</item>
         <item name="colorPrimaryDark">@color/rail_color_primary_dark</item>
         <item name="colorAccent">@color/rail_color_accent</item>
@@ -15,7 +20,7 @@
 
 
     <!--https://material.io/design/material-studies/reply.html#-->
-    <style name="FilePickerThemeReply" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="FilePickerThemeReply" parent="FilePickerTheme">
         <item name="colorPrimary">@color/reply_color_primary</item>
         <item name="colorPrimaryDark">@color/reply_color_primary_dark</item>
         <item name="colorAccent">@color/reply_color_accent</item>
@@ -29,7 +34,7 @@
     </style>
 
     <!--https://material.io/design/material-studies/crane.html#about-crane-->
-    <style name="FilePickerThemeCrane" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="FilePickerThemeCrane" parent="FilePickerTheme">
         <item name="colorPrimary">@color/crane_color_primary</item>
         <item name="colorPrimaryDark">@color/crane_color_primary_dark</item>
         <item name="colorAccent">@color/crane_color_accent</item>
@@ -42,7 +47,7 @@
         <item name="background">@drawable/btn_selector_file_picker_crane</item>
     </style>
     <!--https://material.io/design/material-studies/shrine.html#about-shrine-->
-    <style name="FilePickerThemeShrine" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="FilePickerThemeShrine" parent="FilePickerTheme">
         <item name="colorPrimary">@color/shrine_color_primary</item>
         <item name="colorPrimaryDark">@color/shrine_color_primary_dark</item>
         <item name="colorAccent">@color/shrine_color_accent</item>
diff --git a/gradle.properties b/gradle.properties
index ab9f75a..29d6e1d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# JVM arguments for Gradle 8.5 with JDK 21
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961f..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cdd91f7..aa05115 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 16 10:42:32 CST 2020
+#Mon Oct 06 22:17:01 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,127 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# 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
+#
+#      https://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.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d..6689b85 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,19 +25,23 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/sample/build.gradle b/sample/build.gradle
index 4f73e41..f7f5641 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android'
 
 
 android {
+    namespace 'me.rosuh.sample'
     defaultConfig {
         applicationId "me.rosuh.androidfilepicker"
-        minSdkVersion 19
-        compileSdk 33
-        targetSdkVersion 33
+        minSdkVersion 21
+        compileSdk 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -25,24 +25,24 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':filepicker')
-    implementation ("com.github.bumptech.glide:glide:4.14.2") {
+    implementation ('com.github.bumptech.glide:glide:5.0.5') {
         exclude group: "com.android.support"
     }
 //    implementation 'com.squareup.picasso:picasso:2.5.2'
 //    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
 }
diff --git a/sample/src/main/java/me/rosuh/sample/SampleActivity.kt b/sample/src/main/java/me/rosuh/sample/SampleActivity.kt
index 5e52b09..1babfa2 100644
--- a/sample/src/main/java/me/rosuh/sample/SampleActivity.kt
+++ b/sample/src/main/java/me/rosuh/sample/SampleActivity.kt
@@ -40,332 +40,7 @@ import java.util.concurrent.Executors
 
 
 class SampleActivity : AppCompatActivity() {
-    /**
-     * 自定义文件过滤器
-     */
-    private val fileFilter = object : AbstractFileFilter() {
-        override fun doFilter(listData: ArrayList<FileItemBeanImpl>): ArrayList<FileItemBeanImpl> {
-            val iterator = listData.iterator()
-            while (iterator.hasNext()) {
-                val item = iterator.next()
-                // 如果是文件夹则略过
-                if (item.isDir) continue
-                // 判断文件类型是否是图片
-                if (item.fileType !is RasterImageFileType) {
-                    iterator.remove()
-                }
-            }
-
-            return listData
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.demo_activity_main)
-        // Register ActivityResult handler
-        val requestPermissions = registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { results ->
-            // Handle permission requests results
-            // See the permission example in the Android platform samples: https://github.com/android/platform-samples
-        }
-
-        // Permission request logic
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            requestPermissions.launch(arrayOf(READ_MEDIA_IMAGES, READ_MEDIA_VIDEO, READ_MEDIA_AUDIO))
-        } else {
-            requestPermissions.launch(arrayOf(READ_EXTERNAL_STORAGE))
-        }
-        // 单选
-        findViewById<View>(R.id.btn_single).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .imageEngine(object : ImageEngine {
-                    override fun loadImage(
-                        context: Context?,
-                        imageView: ImageView?,
-                        url: String?,
-                        placeholder: Int
-                    ) {
-                        // 应该使用 loadImage 传递过来的 context，而不是您自己的 context
-                        // You should use the context passed by loadImage(), not your own context
-                        Glide
-                            .with(context!!)
-                            .load(url)
-                            .into(imageView!!)
-                    }
-                })
-                .enableSingleChoice()
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-        // 只展示文件夹
-        findViewById<View>(R.id.btn_only_dir).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .filter(object : AbstractFileFilter() {
-                    override fun doFilter(listData: ArrayList<FileItemBeanImpl>): ArrayList<FileItemBeanImpl> {
-                        return ArrayList(listData.filter { item ->
-                            item.isDir
-                        })
-                    }
-                })
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-        // 只展示图片
-        findViewById<View>(R.id.btn_only_image).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .threadPool(Executors.newSingleThreadExecutor(), autoShutdown = false)
-                .filter(object : AbstractFileFilter() {
-                    override fun doFilter(listData: ArrayList<FileItemBeanImpl>): ArrayList<FileItemBeanImpl> {
-                        return ArrayList(listData.filter { item ->
-                            ((item.isDir) || (item.fileType is RasterImageFileType))
-                        })
-                    }
-                })
-                .setItemClickListener(object : FileItemOnClickListener {
-                    override fun onItemClick(
-                        itemAdapter: FileListAdapter,
-                        itemView: View,
-                        position: Int
-                    ) {
-                        Log.i(TAG, "onItemClick: $itemAdapter, $itemView, $position")
-                    }
-
-                    override fun onItemChildClick(
-                        itemAdapter: FileListAdapter,
-                        itemView: View,
-                        position: Int
-                    ) {
-                        Log.i(TAG, "onItemChildClick: $itemAdapter, $itemView, $position")
-                    }
-
-                    override fun onItemLongClick(
-                        itemAdapter: FileListAdapter,
-                        itemView: View,
-                        position: Int
-                    ) {
-                        Log.i(TAG, "onItemLongClick: $itemAdapter, $itemView, $position")
-                    }
-
-                })
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-
-        // 显示隐藏文件，. 符号开头的
-        findViewById<View>(R.id.btn_display_hidden).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .showHiddenFiles(true)
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-
-        // 单选文件夹
-        findViewById<View>(R.id.btn_single_dir).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .enableSingleChoice()
-                .setTheme(getRandomTheme())
-                .filter(object : AbstractFileFilter() {
-                    override fun doFilter(listData: ArrayList<FileItemBeanImpl>): ArrayList<FileItemBeanImpl> {
-                        return ArrayList(listData.filter { item ->
-                            item.isDir
-                        })
-                    }
-                })
-                .setItemClickListener(object :ItemClickListener {
-                    override fun onItemClick(
-                        itemAdapter: FileListAdapter,
-                        itemView: View,
-                        position: Int
-                    ): Boolean {
-                        Toast.makeText(itemView.context, "OnItemClick#$position", Toast.LENGTH_SHORT).show()
-                        return false
-                    }
-
-                    override fun onItemChildClick(
-                        itemAdapter: FileListAdapter,
-                        itemView: View,
-                        position: Int
-                    ): Boolean {
-                        Toast.makeText(itemView.context, "onItemChildClick#$position", Toast.LENGTH_SHORT).show()
-                        return true
-                    }
-
-                    override fun onItemLongClick(
-                        itemAdapter: FileListAdapter,
-                        itemView: View,
-                        position: Int
-                    ): Boolean {
-                        Toast.makeText(itemView.context, "onItemLongClick#$position", Toast.LENGTH_SHORT).show()
-                        return false
-                    }
-
-                })
-                .skipDirWhenSelect(false)
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-        // 多选文件
-        findViewById<View>(R.id.btn_multi_file).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .maxSelectable(2)
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-        // 多选文件夹
-        findViewById<View>(R.id.btn_multi_dir).setOnClickListener {
-            FilePickerManager
-                .from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .maxSelectable(2)
-                .filter(object : AbstractFileFilter() {
-                    override fun doFilter(listData: ArrayList<FileItemBeanImpl>): ArrayList<FileItemBeanImpl> {
-                        return ArrayList(listData.filter { item ->
-                            item.isDir
-                        })
-                    }
-                })
-                .skipDirWhenSelect(false)
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-        // 自定义根目录
-        findViewById<View>(R.id.btn_custom_root_path).setOnClickListener {
-            FilePickerManager.from(this@SampleActivity)
-                .storageType("⬇️", FilePickerConfig.STORAGE_CUSTOM_ROOT_PATH)
-                .setTheme(getRandomTheme())
-                // 不指定名称则为导航栏将显示绝对路径
-//                .storageType(FilePickerConfig.STORAGE_CUSTOM_ROOT_PATH)
-                .setCustomRootPath("/storage/emulated/0/Download")
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-        // 自定义文件类型
-        // the new api for register your custom file type
-        findViewById<View>(R.id.btn_custom_file_type).setOnClickListener {
-            FilePickerManager.from(this@SampleActivity)
-                .setTheme(getRandomTheme())
-                .registerFileType(arrayListOf(AudioFileType()))
-                .forResult(FilePickerManager.REQUEST_CODE)
-        }
-
-        findViewById<Button>(R.id.btn_show_in_fragment).setOnClickListener {
-            SampleFragment.show(supportFragmentManager, "SampleFragment")
-        }
-    }
-
-    private fun getRandomTheme(): Int {
-        return arrayListOf(
-            R.style.FilePickerThemeRail,
-            R.style.FilePickerThemeCrane,
-            R.style.FilePickerThemeReply,
-            R.style.FilePickerThemeShrine
-        ).run {
-            shuffle()
-            first()
-        }
-    }
-
-    //<editor-fold desc="Custom File type example">
-    /**
-     * 自定义文件类型。通过路径或文件名来判断是否符合类型
-     * Customize the file type. Determine if it matches the type by path or filename.
-     */
-    class CustomFileType(
-        override val fileType: String = "",
-        override val fileIconResId: Int = R.drawable.ic_unknown_file_picker
-    ) : FileType {
-        override fun verify(fileName: String): Boolean {
-            return fileName.endsWith("123")
-        }
-    }
-
-    /**
-     * 自定义文件检测器。
-     * 检测是否符合您的类型，如果是，那么填充到[FileItemBeanImpl.fileType]中
-     * Custom file detector.
-     * detects if it matches your type, and if so, then fill it into [FileItemBeanImpl.fileType]
-     */
-    internal class CustomFileDetector : AbstractFileDetector() {
-        private val customFileType by lazy { CustomFileType() }
-
-        override fun fillFileType(itemBeanImpl: FileItemBeanImpl): FileItemBeanImpl {
-            // detected file type by yourself and fill your type to [FileItemBeanImpl]
-            if (customFileType.verify(itemBeanImpl.fileName)) {
-                itemBeanImpl.fileType = customFileType
-            }
-            return itemBeanImpl
-        }
-    }
-    //</editor-fold>
-
-    class SampleFragment : DialogFragment() {
-
-        override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
-        ): View? {
-            return inflater.inflate(R.layout.fragment_sample, container, false)
-        }
-
-        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-            super.onViewCreated(view, savedInstanceState)
-            view.findViewById<Button>(R.id.btn_go).setOnClickListener {
-                FilePickerManager.from(this)
-                    .setText(
-                        "A",
-                        "B",
-                        hadSelectedStrRes = R.string.demo_test_had_selected,
-                        confirmText = "C",
-                        emptyListTips = "E"
-                    )
-                    .setItemClickListener(object : SimpleItemClickListener() {
-                        override fun onItemClick(
-                            itemAdapter: FileListAdapter,
-                            itemView: View,
-                            position: Int
-                        ) {
-                            super.onItemClick(itemAdapter, itemView, position)
-                            Toast.makeText(
-                                activity,
-                                "${itemAdapter.dataList[position].fileName} was clicked",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    })
-                    .forResult(1001)
-            }
-        }
-
-        companion object {
-            fun show(supportFragmentManager: FragmentManager?, s: String) {
-                supportFragmentManager?.let { SampleFragment().show(it, s) }
-            }
-
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        when (requestCode) {
-            FilePickerManager.REQUEST_CODE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    val list = FilePickerManager.obtainData(release = true)
-                    val rv = findViewById<RecyclerView>(R.id.rv_main)
-                    rv.adapter = SampleAdapter(layoutInflater, ArrayList(list))
-                    rv.layoutManager =
-                        LinearLayoutManager(this@SampleActivity)
-                } else {
-                    Toast.makeText(this@SampleActivity, "没有选择图片", Toast.LENGTH_SHORT).show()
-                }
-            }
-        }
-    }
-
-    companion object {
-        const val TAG = "SampleActivity"
     }
 }