From 43ae962390ac51cd79b418f592073b14a871ece1 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <lohanidamodar@users.noreply.github.com>
Date: Tue, 4 Jan 2022 22:11:25 +0545
Subject: [PATCH] Bug fixes and updates (#95)

* update dependencies

* apply strict linter - conflict

* Workaround for NPE, ignore IDE project files.

* Bump version, upgrade dependencies.

* Ignored files cleanup.

* More deleted files.

* Delete flutter_plugin_pdf_viewer.iml

* More Eclipse artifacts cleanup.

* Update Gradle dependencies.

* Upgrade old Flutter embedding.

* Upgrade Flutter embedding.

* Better error logging, maybe properly time cache deletion.

* Make sure file is closed when done.

* Make sure file is closed when done, better this time.

* Use initFileURLWithPath to create a valid file path

The NSURL init method initFileURLWithPath will ensure that the file:/// prefix is in place
as well as making sure that any whitespace characters within the original path string
are encoded correctly when creating the url.

* Release implicitly retained CGPDFDocument and release retained CGPDFPage

* Update pubspec.yaml

* Update pubspec.yaml

* Pn 53 (#94)

* I removed the line from 42 to 63 for deleting unused saved cache files.
It makes memory problem when you try to open the PDF after several times.

* remove .idea folder

Co-authored-by: Eko Prasetyo <ekoprasetyolnh@gmail.com>

* more fixes and updates

* updates

* fixes for state problems

* upgrade ersion number

* update

* bug fixes

Co-authored-by: Ahmed Masoud <47630729+maxzod@users.noreply.github.com>
Co-authored-by: Ahmed Masoud <maxzod66@gmail.com>
Co-authored-by: Enver ALTIN <enveraltin@users.noreply.github.com>
Co-authored-by: Robert Hillary <robert.hillary@zuhlke.com>
Co-authored-by: Eko Prasetyo <ekoprasetyolnh@gmail.com>
---
 .gitignore                                    |   5 +
 .idea/flutter_pdf_viewer.iml                  |  18 -
 .idea/libraries/Dart_SDK.xml                  |  27 -
 .idea/libraries/Flutter_Plugins.xml           |  11 -
 .idea/misc.xml                                |   4 -
 .idea/modules.xml                             |  11 -
 .idea/vcs.xml                                 |   6 -
 .idea/workspace.xml                           | 544 ------------------
 .vscode/launch.json                           |  14 -
 CHANGELOG.md                                  |   7 +-
 analysis_options.yaml                         |   1 +
 android/.classpath                            |   6 -
 android/.gitignore                            |   3 +
 android/.project                              |  23 -
 .../org.eclipse.buildship.core.prefs          |  13 -
 android/build.gradle                          |   4 +-
 .../FlutterPluginPdfViewerPlugin.java         | 192 ++++---
 example/android/.project                      |  17 -
 .../org.eclipse.buildship.core.prefs          |  13 -
 example/android/app/.classpath                |   6 -
 example/android/app/.project                  |  23 -
 .../org.eclipse.buildship.core.prefs          |   2 -
 example/android/app/build.gradle              |  12 +-
 .../android/app/src/main/AndroidManifest.xml  |   9 +-
 .../plugins/GeneratedPluginRegistrant.java    |  34 ++
 .../MainActivity.java                         |  13 -
 .../app/src/profile/AndroidManifest.xml       |   2 +-
 example/android/build.gradle                  |   2 +-
 example/android/gradle.properties             |   1 -
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +-
 example/ios/Flutter/AppFrameworkInfo.plist    |   2 +-
 example/ios/Flutter/Flutter.podspec           |  18 +
 example/ios/Podfile                           |  61 +-
 example/ios/Podfile.lock                      |  40 +-
 example/ios/Runner.xcodeproj/project.pbxproj  |  71 +--
 .../contents.xcworkspacedata                  |   2 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |   2 +-
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 -
 example/lib/main.dart                         | 153 ++---
 example/pubspec.lock                          |  72 +--
 flutter_plugin_pdf_viewer.iml                 |  20 -
 ios/Classes/FlutterPluginPdfViewerPlugin.m    |  37 +-
 lib/advance_pdf_viewer.dart                   |   5 +-
 lib/src/document.dart                         |  58 +-
 lib/src/page.dart                             |  32 +-
 lib/src/page_picker.dart                      |   4 +-
 lib/src/viewer.dart                           | 163 +++---
 lib/src/zoomable_widget.dart                  | 139 ++---
 pubspec.lock                                  |  69 +--
 pubspec.yaml                                  |  11 +-
 50 files changed, 614 insertions(+), 1382 deletions(-)
 delete mode 100644 .idea/flutter_pdf_viewer.iml
 delete mode 100644 .idea/libraries/Dart_SDK.xml
 delete mode 100644 .idea/libraries/Flutter_Plugins.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 .vscode/launch.json
 create mode 100644 analysis_options.yaml
 delete mode 100644 android/.classpath
 delete mode 100644 android/.project
 delete mode 100644 android/.settings/org.eclipse.buildship.core.prefs
 delete mode 100644 example/android/.project
 delete mode 100644 example/android/.settings/org.eclipse.buildship.core.prefs
 delete mode 100644 example/android/app/.classpath
 delete mode 100644 example/android/app/.project
 delete mode 100644 example/android/app/.settings/org.eclipse.buildship.core.prefs
 create mode 100644 example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
 delete mode 100644 example/android/app/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer_example/MainActivity.java
 create mode 100644 example/ios/Flutter/Flutter.podspec
 delete mode 100644 example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 delete mode 100644 flutter_plugin_pdf_viewer.iml

diff --git a/.gitignore b/.gitignore
index f226b14..e8d3882 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,8 @@ build/
 example/ios/Flutter/flutter_export_environment.sh
 example/.flutter-plugins-dependencies
 android/.idea/
+
+.idea/
+android/.settings/
+
+.vscode/
diff --git a/.idea/flutter_pdf_viewer.iml b/.idea/flutter_pdf_viewer.iml
deleted file mode 100644
index 55d90fc..0000000
--- a/.idea/flutter_pdf_viewer.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/example/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-    <orderEntry type="library" name="Flutter Plugins" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
deleted file mode 100644
index 80c115f..0000000
--- a/.idea/libraries/Dart_SDK.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="libraryTable">
-  <library name="Dart SDK">
-    <CLASSES>
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/web_gl" />
-      <root url="file://C:/src/flutter/bin/cache/dart-sdk/lib/web_sql" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
deleted file mode 100644
index 24324de..0000000
--- a/.idea/libraries/Flutter_Plugins.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
-    <CLASSES>
-      <root url="file://C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-0.5.0+1" />
-      <root url="file://C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.3" />
-      <root url="file://$PROJECT_DIR$" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 99ae653..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index fd5603f..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/flutter_pdf_viewer.iml" filepath="$PROJECT_DIR$/.idea/flutter_pdf_viewer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/flutter_pdf_viewer.iml" filepath="$PROJECT_DIR$/flutter_pdf_viewer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android/flutter_pdf_viewer_android.iml" filepath="$PROJECT_DIR$/android/flutter_pdf_viewer_android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/example/android/flutter_pdf_viewer_example_android.iml" filepath="$PROJECT_DIR$/example/android/flutter_pdf_viewer_example_android.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 2ef968f..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="d25dbd07-759c-41ff-b4dd-eb33ccbe59a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/app/src/debug/AndroidManifest.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/.dart_tool/" />
-    <ignored path="$PROJECT_DIR$/.idea/" />
-    <ignored path="$PROJECT_DIR$/.pub/" />
-    <ignored path="$PROJECT_DIR$/build/" />
-    <ignored path="$PROJECT_DIR$/example/.pub/" />
-    <ignored path="$PROJECT_DIR$/example/build/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-594781471">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="1" />
-          <entry key="project.open.time.18" value="2" />
-          <entry key="project.opened" value="2" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dart" value="732" />
-          <entry key="java" value="79" />
-          <entry key="m" value="132" />
-          <entry key="yaml" value="77" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="Dart" value="732" />
-          <entry key="JAVA" value="79" />
-          <entry key="ObjectiveC" value="132" />
-          <entry key="YAML" value="77" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="dart" value="1" />
-          <entry key="h" value="1" />
-          <entry key="java" value="1" />
-          <entry key="m" value="1" />
-          <entry key="xml" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Dart" value="1" />
-          <entry key="JAVA" value="1" />
-          <entry key="ObjectiveC" value="2" />
-          <entry key="XML" value="1" />
-        </counts>
-      </usages-collector>
-    </session>
-    <session id="816314960">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="4" />
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.open.time.11" value="1" />
-          <entry key="project.open.time.14" value="2" />
-          <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="5" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="dart" value="2" />
-          <entry key="gradle" value="1" />
-          <entry key="java" value="1" />
-          <entry key="xml" value="1" />
-          <entry key="yaml" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Dart" value="2" />
-          <entry key="Groovy" value="1" />
-          <entry key="JAVA" value="1" />
-          <entry key="XML" value="1" />
-          <entry key="YAML" value="1" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="25" column="3" selection-start-line="25" selection-start-column="3" selection-end-line="25" selection-end-column="3" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/flutter_pdf_viewer.dart" />
-        <option value="$PROJECT_DIR$/ios/Classes/FlutterPdfViewerPlugin.m" />
-        <option value="$PROJECT_DIR$/android/src/main/java/pt/tribeiro/flutter_pdf_viewer/FlutterPdfViewerPlugin.java" />
-        <option value="$PROJECT_DIR$/example/lib/main.dart" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="414" />
-    <option name="y" value="62" />
-    <option name="width" value="1408" />
-    <option name="height" value="967" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State />
-          <State>
-            <id>Android</id>
-          </State>
-          <State>
-            <id>Class metricsJava</id>
-          </State>
-          <State>
-            <id>Class structureJava</id>
-          </State>
-          <State>
-            <id>Cloning issuesJava</id>
-          </State>
-          <State>
-            <id>Code style issuesJava</id>
-          </State>
-          <State>
-            <id>CorrectnessLintAndroid</id>
-          </State>
-          <State>
-            <id>Dart</id>
-          </State>
-          <State>
-            <id>Declaration redundancyJava</id>
-          </State>
-          <State>
-            <id>DeclarationGroovy</id>
-          </State>
-          <State>
-            <id>Dependency issuesJava</id>
-          </State>
-          <State>
-            <id>EncapsulationJava</id>
-          </State>
-          <State>
-            <id>Error handlingGroovy</id>
-          </State>
-          <State>
-            <id>Error handlingJava</id>
-          </State>
-          <State>
-            <id>FinalizationJava</id>
-          </State>
-          <State>
-            <id>Flutter</id>
-          </State>
-          <State>
-            <id>Google Cloud Endpoints</id>
-          </State>
-          <State>
-            <id>Groovy</id>
-          </State>
-          <State>
-            <id>HTML</id>
-          </State>
-          <State>
-            <id>ImportsJava</id>
-          </State>
-          <State>
-            <id>Inheritance issuesJava</id>
-          </State>
-          <State>
-            <id>InitializationJava</id>
-          </State>
-          <State>
-            <id>InternationalizationJava</id>
-          </State>
-          <State>
-            <id>InternationalizationLintAndroid</id>
-          </State>
-          <State>
-            <id>J2ME issuesJava</id>
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Java 5Java language level migration aidsJava</id>
-          </State>
-          <State>
-            <id>Java interop issuesKotlin</id>
-          </State>
-          <State>
-            <id>Java language level migration aidsJava</id>
-          </State>
-          <State>
-            <id>JavadocJava</id>
-          </State>
-          <State>
-            <id>Kotlin</id>
-          </State>
-          <State>
-            <id>LintAndroid</id>
-          </State>
-          <State>
-            <id>MemoryJava</id>
-          </State>
-          <State>
-            <id>Method metricsJava</id>
-          </State>
-          <State>
-            <id>Naming conventionsJava</id>
-          </State>
-          <State>
-            <id>Naming conventionsKotlin</id>
-          </State>
-          <State>
-            <id>Packaging issuesJava</id>
-          </State>
-          <State>
-            <id>PerformanceJava</id>
-          </State>
-          <State>
-            <id>PerformanceLintAndroid</id>
-          </State>
-          <State>
-            <id>Potentially confusing code constructsGroovy</id>
-          </State>
-          <State>
-            <id>Probable bugsJava</id>
-          </State>
-          <State>
-            <id>Probable bugsKotlin</id>
-          </State>
-          <State>
-            <id>Properties Files</id>
-          </State>
-          <State>
-            <id>Redundant constructsKotlin</id>
-          </State>
-          <State>
-            <id>RegExp</id>
-          </State>
-          <State>
-            <id>SecurityJava</id>
-          </State>
-          <State>
-            <id>SecurityLintAndroid</id>
-          </State>
-          <State>
-            <id>Threading issuesGroovy</id>
-          </State>
-          <State>
-            <id>Threading issuesJava</id>
-          </State>
-          <State>
-            <id>VisibilityJava</id>
-          </State>
-          <State>
-            <id>XML</id>
-          </State>
-        </expanded-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="flutter_pdf_viewer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_pdf_viewer" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_pdf_viewer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_pdf_viewer" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_pdf_viewer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_pdf_viewer" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_pdf_viewer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_pdf_viewer" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_pdf_viewer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_pdf_viewer" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-        <option name="show-excluded-files" value="false" />
-      </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="dart.analysis.tool.window.force.activate" value="false" />
-    <property name="last_opened_file_path" value="C:/src/flutter" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.0" />
-    <property name="settings.editor.selected.configurable" value="flutter.settings" />
-    <property name="show.migrate.to.gradle.popup" value="false" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="d25dbd07-759c-41ff-b4dd-eb33ccbe59a6" name="Default Changelist" comment="" />
-      <created>1551973615649</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1551973615649</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
-    <editor active="true" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18763326" />
-      <window_info id="Captures" order="1" side_tool="true" />
-      <window_info id="Structure" order="2" side_tool="true" />
-      <window_info id="Image Layers" order="3" />
-      <window_info id="Designer" order="4" />
-      <window_info id="Build Variants" order="5" side_tool="true" />
-      <window_info id="Capture Tool" order="6" />
-      <window_info id="Favorites" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Dart Analysis" order="0" sideWeight="0.49946696" weight="0.3286334" />
-      <window_info anchor="bottom" id="Run" order="1" sideWeight="0.4989339" weight="0.329718" />
-      <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.4989339" weight="0.329718" />
-      <window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Logcat" order="4" />
-      <window_info anchor="bottom" id="Debug" order="5" sideWeight="0.4989339" weight="0.329718" />
-      <window_info active="true" anchor="bottom" id="Event Log" order="6" sideWeight="0.5010661" side_tool="true" visible="true" weight="0.329718" />
-      <window_info anchor="bottom" id="Flutter Performance" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Find" order="9" />
-      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.49946696" visible="true" weight="0.3286334" />
-      <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.49840087" weight="0.329718" />
-      <window_info anchor="right" id="Assistant" visible="true" weight="0.3336887" />
-      <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" order="1" />
-      <window_info anchor="right" id="Theme Preview" order="2" />
-      <window_info anchor="right" id="Flutter Inspector" order="3" />
-      <window_info anchor="right" id="Flutter Outline" order="4" />
-      <window_info anchor="right" id="Palette&#9;" order="5" />
-    </layout>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="Dart">
-          <url>file://$PROJECT_DIR$/example/lib/main.dart</url>
-          <line>17</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/android/src/main/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/ios/Classes/FlutterPdfViewerPlugin.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/ios/Classes/FlutterPdfViewerPlugin.m">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="464">
-          <caret line="74" column="25" selection-start-line="74" selection-start-column="25" selection-end-line="74" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/flutter_pdf_viewer.dart" />
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/pt/tribeiro/flutter_pdf_viewer/FlutterPdfViewerPlugin.java" />
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/build.gradle">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="19" column="36" lean-forward="true" selection-start-line="19" selection-start-column="35" selection-end-line="19" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/java/pt/tribeiro/flutter_pdf_viewer_example/MainActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="25" column="3" selection-start-line="25" selection-start-column="3" selection-end-line="25" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Android</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>flutter_pdf_viewer</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Dart SDK</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 345b640..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Flutter",
-            "type": "dart",
-            "request": "launch",
-            "program": "./example/lib/main.dart"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6a9ada..70973fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
-# 2.0.0
+
+## 2.0.1
+* Bug fixes related to cache
+* improvements
+
+## 2.0.0
 * Null safety upgrade
 * Fixed some issues
 * new `numberPickerConfirmWidget`
diff --git a/analysis_options.yaml b/analysis_options.yaml
new file mode 100644
index 0000000..55309e9
--- /dev/null
+++ b/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lint/analysis_options.yaml
diff --git a/android/.classpath b/android/.classpath
deleted file mode 100644
index eb19361..0000000
--- a/android/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>
diff --git a/android/.gitignore b/android/.gitignore
index c6cbe56..62425c2 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -6,3 +6,6 @@
 .DS_Store
 /build
 /captures
+.project
+.classpath
+.settings/
diff --git a/android/.project b/android/.project
deleted file mode 100644
index 6f9050a..0000000
--- a/android/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flutter_plugin_pdf_viewer</name>
-	<comment>Project android created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
deleted file mode 100644
index 5628deb..0000000
--- a/android/.settings/org.eclipse.buildship.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-arguments=--scan
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0-20191016123526+0000))
-connection.project.dir=
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.4.jdk/Contents/Home
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
diff --git a/android/build.gradle b/android/build.gradle
index 3efafc3..e165f24 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,10 +22,10 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/android/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer/FlutterPluginPdfViewerPlugin.java b/android/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer/FlutterPluginPdfViewerPlugin.java
index 9c23001..2757086 100644
--- a/android/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer/FlutterPluginPdfViewerPlugin.java
+++ b/android/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer/FlutterPluginPdfViewerPlugin.java
@@ -1,106 +1,131 @@
 package pt.tribeiro.flutter_plugin_pdf_viewer;
 
+import android.app.Activity;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.pdf.PdfRenderer;
-import android.os.Environment;
-import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.os.*;
 import android.util.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
-import android.os.HandlerThread;
-import android.os.Process;
-import android.os.Handler;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.util.Locale;
 
 /**
  * FlutterPluginPdfViewerPlugin
  */
-public class FlutterPluginPdfViewerPlugin implements MethodCallHandler {
-    private static Registrar instance;
-    private HandlerThread handlerThread;
+public class FlutterPluginPdfViewerPlugin implements FlutterPlugin, MethodCallHandler, ActivityAware {
+    private static final String TAG = "PdfViewerPlugin";
+
     private Handler backgroundHandler;
     private final Object pluginLocker = new Object();
     private final String filePrefix = "FlutterPluginPdfViewer";
 
-    /**
-     * Plugin registration.
-     */
-    public static void registerWith(Registrar registrar) {
-        final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter_plugin_pdf_viewer");
-        instance = registrar;
-        channel.setMethodCallHandler(new FlutterPluginPdfViewerPlugin());
+    /// The MethodChannel that will the communication between Flutter and native Android
+    ///
+    /// This local reference serves to register the plugin with the Flutter Engine and unregister it
+    /// when the Flutter Engine is detached from the Activity
+    private MethodChannel channel;
+    private Context context;
+    private Activity activity;
+
+    @Override
+    public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
+        channel = new MethodChannel(binding.getBinaryMessenger(), "flutter_plugin_pdf_viewer");
+        channel.setMethodCallHandler(this);
+        context = binding.getApplicationContext();
+    }
+
+    @Override
+    public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+        channel.setMethodCallHandler(null);
     }
 
     @Override
-    public void onMethodCall(final MethodCall call, final Result result) {
+    public void onMethodCall(@NonNull final MethodCall call, @NonNull final Result result) {
         synchronized (pluginLocker) {
             if (backgroundHandler == null) {
-                handlerThread = new HandlerThread("flutterPdfViewer", Process.THREAD_PRIORITY_BACKGROUND);
+                HandlerThread handlerThread = new HandlerThread("flutterPdfViewer", Process.THREAD_PRIORITY_BACKGROUND);
                 handlerThread.start();
                 backgroundHandler = new Handler(handlerThread.getLooper());
             }
         }
-        final Handler mainThreadHandler = new Handler();
-        backgroundHandler.post(//
+        final Handler mainThreadHandler = new Handler(Looper.myLooper());
+        backgroundHandler.post(
                 new Runnable() {
                     @Override
                     public void run() {
                         switch (call.method) {
-                        case "getNumberOfPages":
-                            final String numResult = getNumberOfPages((String) call.argument("filePath"));
-                            mainThreadHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    result.success(numResult);
-                                }
-                            });
-                            break;
-                        case "getPage":
-                            final String pageResult = getPage((String) call.argument("filePath"),
-                                    (int) call.argument("pageNumber"));
-                            mainThreadHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    result.success(pageResult);
+                            case "getNumberOfPages":
+                                final String numResult = getNumberOfPages((String) call.argument("filePath"));
+                                mainThreadHandler.post(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        result.success(numResult);
+                                    }
+                                });
+                                break;
+                            case "getPage":
+                                Integer pageNumber = call.<Integer>argument("pageNumber");
+                                final String pageResult = getPage((String) call.argument("filePath"), pageNumber);
+                                if (pageResult == null) {
+                                    Log.d(TAG, "Retrieving page failed.");
+                                    result.notImplemented();
                                 }
-                            });
-                            break;
-                        default:
-                            result.notImplemented();
-                            break;
+                                mainThreadHandler.post(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        result.success(pageResult);
+                                    }
+                                });
+                                break;
+                            default:
+                                result.notImplemented();
+                                break;
                         }
                     }
-                });
+                }
+        );
     }
 
     private String getNumberOfPages(String filePath) {
-        File pdf = new File(filePath);
-        try {
-            clearCacheDir();
-            PdfRenderer renderer = new PdfRenderer(ParcelFileDescriptor.open(pdf, ParcelFileDescriptor.MODE_READ_ONLY));
-            Bitmap bitmap;
+        try (PdfRenderer renderer = new PdfRenderer(getPdfFile(filePath))) {
             final int pageCount = renderer.getPageCount();
-            return String.format("%d", pageCount);
+            if (!clearCacheDir()) {
+                Log.d("NumPages", "getNumberOfPages: failed to clean cache.");
+            }
+            return String.format(Locale.US, "%d", pageCount);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
         return null;
     }
 
+    private ParcelFileDescriptor getPdfFile(String filePath) throws FileNotFoundException {
+        File pdfFile = new File(filePath);
+        if (!pdfFile.canRead()) {
+            Log.d(TAG, "getPdfFile: Can't read file: " + filePath);
+        }
+        return ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY);
+    }
+
     private boolean clearCacheDir() {
         try {
-            File directory = instance.context().getCacheDir();
+            File directory = context.getCacheDir();
             FilenameFilter myFilter = new FilenameFilter() {
                 @Override
                 public boolean accept(File dir, String name) {
@@ -109,9 +134,10 @@ public boolean accept(File dir, String name) {
             };
             File[] files = directory.listFiles(myFilter);
             // Log.d("Cache Files", "Size: " + files.length);
-            for (int i = 0; i < files.length; i++) {
-                // Log.d("Files", "FileName: " + files[i].getName());
-                files[i].delete();
+            for (File file : files != null ? files : new File[0]) {
+                if (!file.delete()) {
+                    Log.d("Cache files", String.format("Deleting file %s failed.", file.getName()));
+                }
             }
             return true;
         } catch (Exception ex) {
@@ -127,11 +153,15 @@ private String getFileNameFromPath(String name) {
     }
 
     private String createTempPreview(Bitmap bmp, String name, int page) {
+        if (context == null) {
+            Log.d(TAG, "createTempPreview: Context is null!");
+            return null;
+        }
         String fileNameOnly = getFileNameFromPath(name);
         File file;
         try {
-            String fileName = String.format("%s-%d.png", fileNameOnly, page);
-            file = File.createTempFile(fileName, null, instance.context().getCacheDir());
+            String fileName = String.format(Locale.US, "%s-%d.png", fileNameOnly, page);
+            file = File.createTempFile(fileName, null, context.getCacheDir());
             FileOutputStream out = new FileOutputStream(file);
             bmp.compress(Bitmap.CompressFormat.PNG, 100, out);
             out.flush();
@@ -143,19 +173,18 @@ private String createTempPreview(Bitmap bmp, String name, int page) {
         return file.getAbsolutePath();
     }
 
-    private String getPage(String filePath, int pageNumber) {
-        File pdf = new File(filePath);
-        try {
-            PdfRenderer renderer = new PdfRenderer(ParcelFileDescriptor.open(pdf, ParcelFileDescriptor.MODE_READ_ONLY));
+    private String getPage(String filePath, @Nullable Integer pageNumber) {
+        try (PdfRenderer renderer = new PdfRenderer(getPdfFile(filePath))) {
             final int pageCount = renderer.getPageCount();
-            if (pageNumber > pageCount) {
+            if (pageNumber == null || pageNumber > pageCount) {
                 pageNumber = pageCount;
             }
 
             PdfRenderer.Page page = renderer.openPage(--pageNumber);
 
-            double width = instance.activity().getResources().getDisplayMetrics().densityDpi * page.getWidth();
-            double height = instance.activity().getResources().getDisplayMetrics().densityDpi * page.getHeight();
+            final int densityDpi = activity.getResources().getDisplayMetrics().densityDpi;
+            double width = densityDpi * page.getWidth();
+            double height = densityDpi * page.getHeight();
             final double docRatio = width / height;
 
             width = 2048;
@@ -166,19 +195,38 @@ private String getPage(String filePath, int pageNumber) {
             canvas.drawColor(Color.WHITE);
             // Render to bitmap
             page.render(bitmap, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
+            String ret;
             try {
-                return createTempPreview(bitmap, filePath, pageNumber);
+                ret = createTempPreview(bitmap, filePath, pageNumber);
             } finally {
-                // close the page
                 page.close();
-                // close the renderer
                 renderer.close();
             }
+            return ret;
         } catch (Exception ex) {
             System.out.println(ex.getMessage());
             ex.printStackTrace();
         }
-
         return null;
     }
+
+    @Override
+    public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
+        activity = binding.getActivity();
+    }
+
+    @Override
+    public void onDetachedFromActivityForConfigChanges() {
+        activity = null;
+    }
+
+    @Override
+    public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
+        activity = binding.getActivity();
+    }
+
+    @Override
+    public void onDetachedFromActivity() {
+        activity = null;
+    }
 }
diff --git a/example/android/.project b/example/android/.project
deleted file mode 100644
index 17c95d4..0000000
--- a/example/android/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android</name>
-	<comment>Project android_ created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs
deleted file mode 100644
index 5628deb..0000000
--- a/example/android/.settings/org.eclipse.buildship.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-arguments=--scan
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0-20191016123526+0000))
-connection.project.dir=
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.4.jdk/Contents/Home
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
diff --git a/example/android/app/.classpath b/example/android/app/.classpath
deleted file mode 100644
index eb19361..0000000
--- a/example/android/app/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>
diff --git a/example/android/app/.project b/example/android/app/.project
deleted file mode 100644
index ac485d7..0000000
--- a/example/android/app/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>app</name>
-	<comment>Project app created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/example/android/app/.settings/org.eclipse.buildship.core.prefs b/example/android/app/.settings/org.eclipse.buildship.core.prefs
deleted file mode 100644
index b1886ad..0000000
--- a/example/android/app/.settings/org.eclipse.buildship.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-connection.project.dir=..
-eclipse.preferences.version=1
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index de2e629..ffaf493 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new Exception("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "pt.tribeiro.flutter_pdf_viewer_example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -55,7 +55,7 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index e0cb5b2..0236abb 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="pt.tribeiro.flutter_plugin_pdf_viewer_example">
-
-<uses-permission android:name="android.permission.INTERNET"/>
+    <!-- Flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -13,7 +15,7 @@
         android:label="pdf_viewer_example"
         android:icon="@mipmap/ic_launcher">
         <activity
-            android:name=".MainActivity"
+            android:name="io.flutter.embedding.android.FlutterActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -30,6 +32,7 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <meta-data android:name="flutterEmbedding" android:value="2"/>
         </activity>
     </application>
 </manifest>
diff --git a/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
new file mode 100644
index 0000000..a16c65d
--- /dev/null
+++ b/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -0,0 +1,34 @@
+package io.flutter.plugins;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import io.flutter.Log;
+
+import io.flutter.embedding.engine.FlutterEngine;
+
+/**
+ * Generated file. Do not edit.
+ * This file is generated by the Flutter tool based on the
+ * plugins that support the Android platform.
+ */
+@Keep
+public final class GeneratedPluginRegistrant {
+  private static final String TAG = "GeneratedPluginRegistrant";
+  public static void registerWith(@NonNull FlutterEngine flutterEngine) {
+    try {
+      flutterEngine.getPlugins().add(new pt.tribeiro.flutter_plugin_pdf_viewer.FlutterPluginPdfViewerPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin advance_pdf_viewer, pt.tribeiro.flutter_plugin_pdf_viewer.FlutterPluginPdfViewerPlugin", e);
+    }
+    try {
+      flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
+    }
+    try {
+      flutterEngine.getPlugins().add(new com.tekartik.sqflite.SqflitePlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin sqflite, com.tekartik.sqflite.SqflitePlugin", e);
+    }
+  }
+}
diff --git a/example/android/app/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer_example/MainActivity.java b/example/android/app/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer_example/MainActivity.java
deleted file mode 100644
index 20303d4..0000000
--- a/example/android/app/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer_example/MainActivity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package pt.tribeiro.flutter_plugin_pdf_viewer_example;
-
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
-}
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
index 2c4cc5f..ac443d3 100644
--- a/example/android/app/src/profile/AndroidManifest.xml
+++ b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pt.tribeiro.flutter_pdf_viewer_example">
+    package="pt.tribeiro.flutter_plugin_pdf_viewer_example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/example/android/build.gradle b/example/android/build.gradle
index bb8a303..fab3c2e 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 38c8d45..94adc3a 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 2819f02..828299d 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Thu May 27 13:16:22 TRT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
index 9367d48..8d4492f 100644
--- a/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Flutter/Flutter.podspec b/example/ios/Flutter/Flutter.podspec
new file mode 100644
index 0000000..663d5b2
--- /dev/null
+++ b/example/ios/Flutter/Flutter.podspec
@@ -0,0 +1,18 @@
+#
+# NOTE: This podspec is NOT to be published. It is only used as a local source!
+#       This is a generated file; do not edit or check into version control.
+#
+
+Pod::Spec.new do |s|
+  s.name             = 'Flutter'
+  s.version          = '1.0.0'
+  s.summary          = 'High-performance, high-fidelity mobile apps.'
+  s.homepage         = 'https://flutter.io'
+  s.license          = { :type => 'MIT' }
+  s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
+  s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
+  s.ios.deployment_target = '9.0'
+  # Framework linking is handled by Flutter tooling, not CocoaPods.
+  # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
+  s.vendored_frameworks = 'path/to/nothing'
+end
diff --git a/example/ios/Podfile b/example/ios/Podfile
index d077b08..f7d6a5e 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -10,60 +10,29 @@ project 'Runner', {
   'Release' => :release,
 }
 
-def parse_KV_file(file, separator='=')
-  file_abs_path = File.expand_path(file)
-  if !File.exists? file_abs_path
-    return [];
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
   end
-  pods_ary = []
-  skip_line_start_symbols = ["#", "/"]
-  File.foreach(file_abs_path) { |line|
-      next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
-      plugin = line.split(pattern=separator)
-      if plugin.length == 2
-        podname = plugin[0].strip()
-        path = plugin[1].strip()
-        podpath = File.expand_path("#{path}", file_abs_path)
-        pods_ary.push({:name => podname, :path => podpath});
-      else
-        puts "Invalid plugin specification: #{line}"
-      end
-  }
-  return pods_ary
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
-target 'Runner' do
-  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
-  # referring to absolute paths on developers' machines.
-  system('rm -rf .symlinks')
-  system('mkdir -p .symlinks/plugins')
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
-  # Flutter Pods
-  generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
-  if generated_xcode_build_settings.empty?
-    puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
-  end
-  generated_xcode_build_settings.map { |p|
-    if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
-      symlink = File.join('.symlinks', 'flutter')
-      File.symlink(File.dirname(p[:path]), symlink)
-      pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
-    end
-  }
+flutter_ios_podfile_setup
 
-  # Plugin Pods
-  plugin_pods = parse_KV_file('../.flutter-plugins')
-  plugin_pods.map { |p|
-    symlink = File.join('.symlinks', 'plugins', p[:name])
-    File.symlink(p[:path], symlink)
-    pod p[:name], :path => File.join(symlink, 'ios')
-  }
+target 'Runner' do
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['ENABLE_BITCODE'] = 'NO'
-    end
+    flutter_additional_ios_build_settings(target)
   end
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 17071d9..d21683b 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,43 +1,43 @@
 PODS:
-  - Flutter (1.0.0)
-  - flutter_plugin_pdf_viewer (1.0.4):
+  - advance_pdf_viewer (1.0.5):
     - Flutter
+  - Flutter (1.0.0)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - path_provider (0.0.1):
+  - path_provider_ios (0.0.1):
     - Flutter
-  - sqflite (0.0.1):
+  - sqflite (0.0.2):
     - Flutter
-    - FMDB (~> 2.7.2)
+    - FMDB (>= 2.7.5)
 
 DEPENDENCIES:
-  - Flutter (from `.symlinks/flutter/ios`)
-  - flutter_plugin_pdf_viewer (from `.symlinks/plugins/flutter_plugin_pdf_viewer/ios`)
-  - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - advance_pdf_viewer (from `.symlinks/plugins/advance_pdf_viewer/ios`)
+  - Flutter (from `Flutter`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - FMDB
 
 EXTERNAL SOURCES:
+  advance_pdf_viewer:
+    :path: ".symlinks/plugins/advance_pdf_viewer/ios"
   Flutter:
-    :path: ".symlinks/flutter/ios"
-  flutter_plugin_pdf_viewer:
-    :path: ".symlinks/plugins/flutter_plugin_pdf_viewer/ios"
-  path_provider:
-    :path: ".symlinks/plugins/path_provider/ios"
+    :path: Flutter
+  path_provider_ios:
+    :path: ".symlinks/plugins/path_provider_ios/ios"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
-  flutter_plugin_pdf_viewer: 17f908f9d9c947bc74df607f323631c9403d8362
+  advance_pdf_viewer: 5c832f382b4ca84fe735f893b7e91aa830c27d7b
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
-  sqflite: d1612813fa7db7c667bed9f1d1b508deffc56999
+  path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
+  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
 
-PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09
+PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.11.2
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 4aee550..259ae9a 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,17 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
-		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6D55BAC56DE10BABF0AC1F65 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 891A8C9FF5B821D232AB24A2 /* libPods-Runner.a */; };
-		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
-		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
@@ -29,8 +25,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
-				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -40,21 +34,22 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		261B8F2B90675232BFD11D30 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		891A8C9FF5B821D232AB24A2 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		AD925B29B8AA2BE1BBD3FA75 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		F34B8A221C50DAEAF0F62311 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -62,8 +57,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
-				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
 				6D55BAC56DE10BABF0AC1F65 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -82,6 +75,9 @@
 		95832890FED17C9D15108BDA /* Pods */ = {
 			isa = PBXGroup;
 			children = (
+				F34B8A221C50DAEAF0F62311 /* Pods-Runner.debug.xcconfig */,
+				AD925B29B8AA2BE1BBD3FA75 /* Pods-Runner.release.xcconfig */,
+				261B8F2B90675232BFD11D30 /* Pods-Runner.profile.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -89,9 +85,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
 				9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -156,7 +150,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				03FA7B63A3760F7F81A4C00F /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -173,7 +166,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -215,28 +208,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		03FA7B63A3760F7F81A4C00F /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -249,7 +220,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
 		3F2081737C9EFB1B7CA0E85F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -324,7 +295,6 @@
 /* Begin XCBuildConfiguration section */
 		249021D3217E4FDB00AE95B9 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -362,7 +332,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -383,7 +353,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -396,7 +369,6 @@
 		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -440,7 +412,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -450,7 +422,6 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -488,7 +459,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -508,7 +479,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -531,7 +505,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a1..919434a 100644
--- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 786d6aa..f156018 100644
--- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 949b678..0000000
--- a/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
-</dict>
-</plist>
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 40a1bcf..2cd6f8f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:advance_pdf_viewer/advance_pdf_viewer.dart';
 
-void main() => runApp(MyApp());
+void main() => runApp(MaterialApp(
+      home: MyApp(),
+    ));
 
 class MyApp extends StatefulWidget {
   @override
@@ -30,7 +32,7 @@ class _MyAppState extends State<MyApp> {
       document = await PDFDocument.fromAsset('assets/sample2.pdf');
     } else if (value == 2) {
       document = await PDFDocument.fromURL(
-        "http://conorlastowka.com/book/CitationNeededBook-Sample.pdf",
+        "https://unec.edu.az/application/uploads/2014/12/pdf-sample.pdf",
         /* cacheManager: CacheManager(
           Config(
             "customCacheKey",
@@ -43,86 +45,85 @@ class _MyAppState extends State<MyApp> {
       document = await PDFDocument.fromAsset('assets/sample.pdf');
     }
     setState(() => _isLoading = false);
+    Navigator.pop(context);
   }
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      home: Scaffold(
-        drawer: Drawer(
-          child: Column(
-            children: <Widget>[
-              SizedBox(height: 36),
-              ListTile(
-                title: Text('Load from Assets'),
-                onTap: () {
-                  changePDF(1);
-                },
-              ),
-              ListTile(
-                title: Text('Load from URL'),
-                onTap: () {
-                  changePDF(2);
-                },
-              ),
-              ListTile(
-                title: Text('Restore default'),
-                onTap: () {
-                  changePDF(3);
-                },
-              ),
-            ],
-          ),
-        ),
-        appBar: AppBar(
-          title: const Text('FlutterPluginPDFViewer'),
+    return Scaffold(
+      drawer: Drawer(
+        child: Column(
+          children: <Widget>[
+            SizedBox(height: 36),
+            ListTile(
+              title: Text('Load from Assets'),
+              onTap: () {
+                changePDF(1);
+              },
+            ),
+            ListTile(
+              title: Text('Load from URL'),
+              onTap: () {
+                changePDF(2);
+              },
+            ),
+            ListTile(
+              title: Text('Restore default'),
+              onTap: () {
+                changePDF(3);
+              },
+            ),
+          ],
         ),
-        body: Center(
-          child: _isLoading
-              ? Center(child: CircularProgressIndicator())
-              : PDFViewer(
-                  document: document,
-                  zoomSteps: 1,
-                  //uncomment below line to preload all pages
-                  // lazyLoad: false,
-                  // uncomment below line to scroll vertically
-                  // scrollDirection: Axis.vertical,
+      ),
+      appBar: AppBar(
+        title: const Text('FlutterPluginPDFViewer'),
+      ),
+      body: Center(
+        child: _isLoading
+            ? Center(child: CircularProgressIndicator())
+            : PDFViewer(
+                document: document,
+                zoomSteps: 1,
+                //uncomment below line to preload all pages
+                // lazyLoad: false,
+                // uncomment below line to scroll vertically
+                // scrollDirection: Axis.vertical,
 
-                  //uncomment below code to replace bottom navigation with your own
-                  /* navigationBuilder:
-                      (context, page, totalPages, jumpToPage, animateToPage) {
-                    return ButtonBar(
-                      alignment: MainAxisAlignment.spaceEvenly,
-                      children: <Widget>[
-                        IconButton(
-                          icon: Icon(Icons.first_page),
-                          onPressed: () {
-                            jumpToPage()(page: 0);
-                          },
-                        ),
-                        IconButton(
-                          icon: Icon(Icons.arrow_back),
-                          onPressed: () {
-                            animateToPage(page: page - 2);
-                          },
-                        ),
-                        IconButton(
-                          icon: Icon(Icons.arrow_forward),
-                          onPressed: () {
-                            animateToPage(page: page);
-                          },
-                        ),
-                        IconButton(
-                          icon: Icon(Icons.last_page),
-                          onPressed: () {
-                            jumpToPage(page: totalPages - 1);
-                          },
-                        ),
-                      ],
-                    );
-                  }, */
-                ),
-        ),
+                //uncomment below code to replace bottom navigation with your own
+                /* navigationBuilder:
+                          (context, page, totalPages, jumpToPage, animateToPage) {
+                        return ButtonBar(
+                          alignment: MainAxisAlignment.spaceEvenly,
+                          children: <Widget>[
+                            IconButton(
+                              icon: Icon(Icons.first_page),
+                              onPressed: () {
+                                jumpToPage()(page: 0);
+                              },
+                            ),
+                            IconButton(
+                              icon: Icon(Icons.arrow_back),
+                              onPressed: () {
+                                animateToPage(page: page - 2);
+                              },
+                            ),
+                            IconButton(
+                              icon: Icon(Icons.arrow_forward),
+                              onPressed: () {
+                                animateToPage(page: page);
+                              },
+                            ),
+                            IconButton(
+                              icon: Icon(Icons.last_page),
+                              onPressed: () {
+                                jumpToPage(page: totalPages - 1);
+                              },
+                            ),
+                          ],
+                        );
+                      }, */
+              ),
       ),
     );
   }
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 4702643..92116da 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,21 +7,14 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.2"
+    version: "2.0.1"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -35,14 +28,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -63,7 +56,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -103,7 +96,7 @@ packages:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.3.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -123,13 +116,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.2"
   infinite_listview:
     dependency: transitive
     description:
@@ -143,14 +129,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   numberpicker:
     dependency: transitive
     description:
@@ -171,14 +157,28 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.8"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  path_provider_ios:
+    dependency: transitive
+    description:
+      name: path_provider_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.7"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.2"
   path_provider_macos:
     dependency: transitive
     description:
@@ -199,7 +199,7 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.4"
   pedantic:
     dependency: transitive
     description:
@@ -207,13 +207,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.11.0"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.2"
   platform:
     dependency: transitive
     description:
@@ -309,7 +302,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.3"
   typed_data:
     dependency: transitive
     description:
@@ -330,7 +323,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
@@ -345,13 +338,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.2"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.24.0-10"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
diff --git a/flutter_plugin_pdf_viewer.iml b/flutter_plugin_pdf_viewer.iml
deleted file mode 100644
index 1bf5f5c..0000000
--- a/flutter_plugin_pdf_viewer.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/example/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-    <orderEntry type="library" name="Flutter Plugins" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/ios/Classes/FlutterPluginPdfViewerPlugin.m b/ios/Classes/FlutterPluginPdfViewerPlugin.m
index 5919a46..4e3dde1 100644
--- a/ios/Classes/FlutterPluginPdfViewerPlugin.m
+++ b/ios/Classes/FlutterPluginPdfViewerPlugin.m
@@ -1,7 +1,6 @@
 #import "FlutterPluginPdfViewerPlugin.h"
 
 static NSString* const kDirectory = @"FlutterPluginPdfViewer";
-static NSString* const kFilePath = @"file:///";
 static NSString* kFileName = @"";
 
 @implementation FlutterPluginPdfViewerPlugin
@@ -31,14 +30,10 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 
 -(NSString *)getNumberOfPages:(NSString *)url
 {
-    NSURL * sourcePDFUrl;
-    if([url containsString:kFilePath]){
-        sourcePDFUrl = [NSURL URLWithString:url];
-    }else{
-        sourcePDFUrl = [NSURL URLWithString:[kFilePath stringByAppendingString:url]];
-    }
-    CGPDFDocumentRef SourcePDFDocument = CGPDFDocumentCreateWithURL((__bridge CFURLRef)sourcePDFUrl);
-    size_t numberOfPages = CGPDFDocumentGetNumberOfPages(SourcePDFDocument);
+    NSURL * sourcePDFUrl = [[NSURL alloc] initFileURLWithPath:url];
+    CGPDFDocumentRef sourcePDFDocument = CGPDFDocumentCreateWithURL((__bridge CFURLRef)sourcePDFUrl);
+    size_t numberOfPages = CGPDFDocumentGetNumberOfPages(sourcePDFDocument);
+    CGPDFDocumentRelease(sourcePDFDocument);
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
     NSString *temporaryDirectory = [paths objectAtIndex:0];
     NSString *filePathAndDirectory = [temporaryDirectory stringByAppendingPathComponent:kDirectory];
@@ -62,20 +57,14 @@ -(NSString *)getNumberOfPages:(NSString *)url
 
     kFileName = [[NSUUID UUID] UUIDString];
     NSLog(@"[FlutterPluginPdfViewer] File has %zd pages", numberOfPages);
-    NSLog(@"[FlutterPluginPdfViewer] File will be saved in cache as %@", kFileName);
     return [NSString stringWithFormat:@"%zd", numberOfPages];
 }
 
 -(NSString*)getPage:(NSString *)url ofPage:(size_t)pageNumber
 {
-    NSURL * sourcePDFUrl;
-    if([url containsString:kFilePath]){
-        sourcePDFUrl = [NSURL URLWithString:url];
-    }else{
-        sourcePDFUrl = [NSURL URLWithString:[kFilePath stringByAppendingString:url]];
-    }
-    CGPDFDocumentRef SourcePDFDocument = CGPDFDocumentCreateWithURL((__bridge CFURLRef)sourcePDFUrl);
-    size_t numberOfPages = CGPDFDocumentGetNumberOfPages(SourcePDFDocument);
+    NSURL * sourcePDFUrl = [[NSURL alloc] initFileURLWithPath:url];
+    CGPDFDocumentRef sourcePDFDocument = CGPDFDocumentCreateWithURL((__bridge CFURLRef)sourcePDFUrl);
+    size_t numberOfPages = CGPDFDocumentGetNumberOfPages(sourcePDFDocument);
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
     NSString *temporaryDirectory = [paths objectAtIndex:0];
     NSString *filePathAndDirectory = [temporaryDirectory stringByAppendingPathComponent:kDirectory];
@@ -93,11 +82,11 @@ -(NSString*)getPage:(NSString *)url ofPage:(size_t)pageNumber
         NSLog(@"Create directory error: %@", error);
         return nil;
     }
-    CGPDFPageRef SourcePDFPage = CGPDFDocumentGetPage(SourcePDFDocument, pageNumber);
-    CGPDFPageRetain(SourcePDFPage);
+    CGPDFPageRef sourcePDFPage = CGPDFDocumentGetPage(sourcePDFDocument, pageNumber);
+    CGPDFPageRetain(sourcePDFPage);
     NSString *relativeOutputFilePath = [NSString stringWithFormat:@"%@/%@-%d.png", kDirectory, kFileName, (int)pageNumber];
     NSString *imageFilePath = [temporaryDirectory stringByAppendingPathComponent:relativeOutputFilePath];
-    CGRect sourceRect = CGPDFPageGetBoxRect(SourcePDFPage, kCGPDFMediaBox);
+    CGRect sourceRect = CGPDFPageGetBoxRect(sourcePDFPage, kCGPDFMediaBox);
     UIGraphicsBeginPDFContextToFile(imageFilePath, sourceRect, nil);
     // Calculate resolution
     // Set DPI to 300
@@ -115,12 +104,14 @@ -(NSString*)getPage:(NSString *)url ofPage:(size_t)pageNumber
     CGContextTranslateCTM(currentContext, 0.0, height);
     CGContextScaleCTM(currentContext, dpi, -dpi);
     CGContextSaveGState(currentContext);
-    CGContextDrawPDFPage (currentContext, SourcePDFPage);
+    CGContextDrawPDFPage (currentContext, sourcePDFPage);
     CGContextRestoreGState(currentContext);
     UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
     [UIImagePNGRepresentation(image) writeToFile: imageFilePath atomically:YES];
+    CGPDFPageRelease(sourcePDFPage);
+    CGPDFDocumentRelease(sourcePDFDocument);
     return imageFilePath;
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/lib/advance_pdf_viewer.dart b/lib/advance_pdf_viewer.dart
index 9dbc068..94a3f6a 100644
--- a/lib/advance_pdf_viewer.dart
+++ b/lib/advance_pdf_viewer.dart
@@ -1,7 +1,8 @@
 library advance_pdf_viewer;
 
+export 'package:flutter_cache_manager/flutter_cache_manager.dart';
+
 export 'src/document.dart' show PDFDocument;
 export 'src/page.dart' show PDFPage;
-export 'src/viewer.dart' show PDFViewer, IndicatorPosition;
 export 'src/tooltip.dart' show PDFViewerTooltip;
-export 'package:flutter_cache_manager/flutter_cache_manager.dart';
+export 'src/viewer.dart' show PDFViewer, IndicatorPosition;
diff --git a/lib/src/document.dart b/lib/src/document.dart
index d159e72..669cda8 100644
--- a/lib/src/document.dart
+++ b/lib/src/document.dart
@@ -1,30 +1,31 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:advance_pdf_viewer/src/page.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:advance_pdf_viewer/src/page.dart';
 import 'package:path_provider/path_provider.dart';
 
 class PDFDocument {
   static const MethodChannel _channel =
-      const MethodChannel('flutter_plugin_pdf_viewer');
+      MethodChannel('flutter_plugin_pdf_viewer');
 
   String? _filePath;
   late int count;
-  List<PDFPage> _pages = [];
+  final _pages = <PDFPage>[];
   bool _preloaded = false;
+  String? get filePath => _filePath;
 
   /// Load a PDF File from a given File
   /// [File file], file to be loaded
   ///
   static Future<PDFDocument> fromFile(File file) async {
-    PDFDocument document = PDFDocument();
+    final document = PDFDocument();
     document._filePath = file.path;
     try {
-      var pageCount = await _channel
+      final pageCount = await _channel
           .invokeMethod('getNumberOfPages', {'filePath': file.path});
-      document.count = document.count = int.parse(pageCount);
+      document.count = document.count = int.parse(pageCount as String);
     } catch (e) {
       throw Exception('Error reading PDF!');
     }
@@ -40,14 +41,14 @@ class PDFDocument {
   static Future<PDFDocument> fromURL(String url,
       {Map<String, String>? headers, CacheManager? cacheManager}) async {
     // Download into cache
-    File f = await (cacheManager ?? DefaultCacheManager())
+    final f = await (cacheManager ?? DefaultCacheManager())
         .getSingleFile(url, headers: headers);
-    PDFDocument document = PDFDocument();
+    final document = PDFDocument();
     document._filePath = f.path;
     try {
-      var pageCount =
+      final pageCount =
           await _channel.invokeMethod('getNumberOfPages', {'filePath': f.path});
-      document.count = document.count = int.parse(pageCount);
+      document.count = document.count = int.parse(pageCount as String);
     } catch (e) {
       throw Exception('Error reading PDF!');
     }
@@ -60,20 +61,20 @@ class PDFDocument {
   static Future<PDFDocument> fromAsset(String asset) async {
     File file;
     try {
-      var dir = await getApplicationDocumentsDirectory();
-      file = File("${dir.path}/file.pdf");
-      var data = await rootBundle.load(asset);
-      var bytes = data.buffer.asUint8List();
+      final dir = await getApplicationDocumentsDirectory();
+      file = File("${dir.path}/${DateTime.now().millisecondsSinceEpoch}.pdf");
+      final data = await rootBundle.load(asset);
+      final bytes = data.buffer.asUint8List();
       await file.writeAsBytes(bytes, flush: true);
     } catch (e) {
       throw Exception('Error parsing asset file!');
     }
-    PDFDocument document = PDFDocument();
+    final document = PDFDocument();
     document._filePath = file.path;
     try {
-      var pageCount = await _channel
+      final pageCount = await _channel
           .invokeMethod('getNumberOfPages', {'filePath': file.path});
-      document.count = document.count = int.parse(pageCount);
+      document.count = document.count = int.parse(pageCount as String);
     } catch (e) {
       throw Exception('Error reading PDF!');
     }
@@ -93,10 +94,10 @@ class PDFDocument {
   }) async {
     assert(page > 0);
     if (_preloaded && _pages.isNotEmpty) return _pages[page - 1];
-    var data = await _channel
+    final data = await _channel
         .invokeMethod('getPage', {'filePath': _filePath, 'pageNumber': page});
-    return new PDFPage(
-      data,
+    return PDFPage(
+      data as String?,
       page,
       onZoomChanged: onZoomChanged,
       zoomSteps: zoomSteps ?? 3,
@@ -118,7 +119,7 @@ class PDFDocument {
       final data = await _channel.invokeMethod(
           'getPage', {'filePath': _filePath, 'pageNumber': countvar});
       _pages.add(PDFPage(
-        data,
+        data as String?,
         countvar,
         onZoomChanged: onZoomChanged,
         zoomSteps: zoomSteps ?? 3,
@@ -134,14 +135,23 @@ class PDFDocument {
   // Stream all pages
   Stream<PDFPage?> getAll({final Function(double)? onZoomChanged}) {
     return Future.forEach<PDFPage?>(List.filled(count, null), (i) async {
-      print(i);
       final data = await _channel
           .invokeMethod('getPage', {'filePath': _filePath, 'pageNumber': i});
-      return new PDFPage(
-        data,
+      return PDFPage(
+        data as String?,
         1,
         onZoomChanged: onZoomChanged,
       );
     }).asStream() as Stream<PDFPage?>;
   }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PDFDocument &&
+          runtimeType == other.runtimeType &&
+          _filePath == other._filePath;
+
+  @override
+  int get hashCode => Object.hash(_filePath, count);
 }
diff --git a/lib/src/page.dart b/lib/src/page.dart
index bc6c7df..d691e2c 100644
--- a/lib/src/page.dart
+++ b/lib/src/page.dart
@@ -19,7 +19,7 @@ class PDFPage extends StatefulWidget {
   final double minScale;
   final double maxScale;
   final double panLimit;
-  PDFPage(
+  const PDFPage(
     this.imgPath,
     this.num, {
     this.onZoomChanged,
@@ -50,25 +50,27 @@ class _PDFPageState extends State<PDFPage> {
     }
   }
 
-  _repaint() {
+  void _repaint() {
     provider = FileImage(File(widget.imgPath!));
     final resolver = provider.resolve(createLocalImageConfiguration(context));
-    resolver.addListener(ImageStreamListener((imgInfo, alreadyPainted) {
-      if (!alreadyPainted) setState(() {});
-    }));
+    resolver.addListener(
+      ImageStreamListener(
+        (imgInfo, alreadyPainted) {
+          if (!alreadyPainted && mounted) setState(() {});
+        },
+      ),
+    );
   }
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-        decoration: null,
-        child: ZoomableWidget(
-          onZoomChanged: widget.onZoomChanged,
-          zoomSteps: widget.zoomSteps,
-          minScale: widget.minScale,
-          panLimit: widget.panLimit,
-          maxScale: widget.maxScale,
-          child: Image(image: provider),
-        ));
+    return ZoomableWidget(
+      onZoomChanged: widget.onZoomChanged,
+      zoomSteps: widget.zoomSteps,
+      minScale: widget.minScale,
+      panLimit: widget.panLimit,
+      maxScale: widget.maxScale,
+      child: Image(image: provider),
+    );
   }
 }
diff --git a/lib/src/page_picker.dart b/lib/src/page_picker.dart
index 36013fe..78ca579 100644
--- a/lib/src/page_picker.dart
+++ b/lib/src/page_picker.dart
@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
 import 'package:numberpicker/numberpicker.dart';
 
 class PagePicker extends StatefulWidget {
-  PagePicker({
+  const PagePicker({
     required this.title,
     required this.maxValue,
     required this.initialValue,
@@ -40,8 +40,8 @@ class _PagePickerState extends State<PagePicker> {
       ),
       actions: [
         TextButton(
-          child: widget.numberPickerConfirmWidget ?? Text('OK'),
           onPressed: () => Navigator.of(context).pop(_currentValue),
+          child: widget.numberPickerConfirmWidget ?? const Text('OK'),
         ),
       ],
     );
diff --git a/lib/src/viewer.dart b/lib/src/viewer.dart
index c1383a3..a0d74a8 100644
--- a/lib/src/viewer.dart
+++ b/lib/src/viewer.dart
@@ -1,7 +1,6 @@
+import 'package:advance_pdf_viewer/advance_pdf_viewer.dart';
 import 'package:advance_pdf_viewer/src/page_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:advance_pdf_viewer/advance_pdf_viewer.dart';
-import 'package:numberpicker/numberpicker.dart';
 
 /// enum to describe indicator position
 enum IndicatorPosition { topLeft, topRight, bottomLeft, bottomRight }
@@ -58,7 +57,7 @@ class PDFViewer extends StatefulWidget {
   )? navigationBuilder;
   final Widget? progressIndicator;
 
-  PDFViewer({
+  const PDFViewer({
     Key? key,
     required this.document,
     this.scrollDirection,
@@ -83,7 +82,7 @@ class PDFViewer extends StatefulWidget {
     this.pickerIconColor,
     this.onPageChanged,
   }) : super(key: key);
-
+  @override
   _PDFViewerState createState() => _PDFViewerState();
 }
 
@@ -93,57 +92,62 @@ class _PDFViewerState extends State<PDFViewer> {
   bool _swipeEnabled = true;
   List<PDFPage?>? _pages;
   late PageController _pageController;
-  final Duration animationDuration = Duration(milliseconds: 200);
-  final Curve animationCurve = Curves.easeIn;
+  final animationDuration = const Duration(milliseconds: 200);
+  final animationCurve = Curves.easeIn;
 
   @override
   void initState() {
     super.initState();
+    _initialize();
+  }
+
+  void _initialize() {
     _pages = List.filled(widget.document.count, null);
     _pageController = widget.controller ?? PageController();
     _pageNumber = _pageController.initialPage + 1;
-    if (!widget.lazyLoad)
-      widget.document.preloadPages(
-        onZoomChanged: onZoomChanged,
-        zoomSteps: widget.zoomSteps,
-        minScale: widget.minScale,
-        maxScale: widget.maxScale,
-        panLimit: widget.panLimit,
-      );
+    if (!widget.lazyLoad) _preloadPages();
+  }
+
+  @override
+  void didUpdateWidget(PDFViewer oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.document.filePath != widget.document.filePath) {
+      _initialize();
+      _isLoading = true;
+      _loadPage();
+    }
   }
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _pageNumber = _pageController.initialPage + 1;
-    _isLoading = true;
-    _pages = List.filled(widget.document.count,null);
-    // _loadAllPages();
+    _initialize();
     _loadPage();
   }
 
-  @override
-  void didUpdateWidget(PDFViewer oldWidget) {
-    super.didUpdateWidget(oldWidget);
-  }
+  Future<void> _preloadPages() async {
+    int countvar = 1;
+    for (final _ in List.filled(widget.document.count, null)) {
+      final data = await widget.document.get(
+        page: countvar,
+        onZoomChanged: onZoomChanged,
+        zoomSteps: widget.zoomSteps,
+        minScale: widget.minScale,
+        maxScale: widget.maxScale,
+        panLimit: widget.panLimit,
+      );
+      _pages![countvar - 1] = data;
 
-  onZoomChanged(double scale) {
-    if (scale != 1.0) {
-      setState(() {
-        _swipeEnabled = false;
-      });
-    } else {
-      setState(() {
-        _swipeEnabled = true;
-      });
+      countvar++;
     }
   }
 
-  _loadPage() async {
+  void onZoomChanged(double scale) =>
+      setState(() => _swipeEnabled = scale == 1.0);
+
+  Future<void> _loadPage() async {
     if (_pages![_pageNumber - 1] != null) return;
-    setState(() {
-      _isLoading = true;
-    });
+    setState(() => _isLoading = true);
     final data = await widget.document.get(
       page: _pageNumber,
       onZoomChanged: onZoomChanged,
@@ -153,29 +157,29 @@ class _PDFViewerState extends State<PDFViewer> {
       panLimit: widget.panLimit,
     );
     _pages![_pageNumber - 1] = data;
-    if (mounted) {
-      setState(() {
-        _isLoading = false;
-      });
-    }
+    if (mounted) setState(() => _isLoading = false);
   }
 
-  _animateToPage({int? page}) {
-    _pageController.animateToPage(page != null ? page : _pageNumber - 1,
+  void _animateToPage({int? page}) {
+    _pageController.animateToPage(page ?? _pageNumber - 1,
         duration: animationDuration, curve: animationCurve);
   }
 
-  _jumpToPage({int? page}) {
-    _pageController.jumpToPage(page != null ? page : _pageNumber - 1);
+  void _jumpToPage({int? page}) {
+    _pageController.jumpToPage(page ?? _pageNumber - 1);
   }
 
   Widget _drawIndicator() {
-    Widget child = GestureDetector(
+    final child = GestureDetector(
         onTap:
             widget.showPicker && widget.document.count > 1 ? _pickPage : null,
         child: Container(
-            padding:
-                EdgeInsets.only(top: 4.0, left: 16.0, bottom: 4.0, right: 16.0),
+            padding: const EdgeInsets.only(
+              top: 4.0,
+              left: 16.0,
+              bottom: 4.0,
+              right: 16.0,
+            ),
             decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(4.0),
                 color: widget.indicatorBackground),
@@ -199,21 +203,20 @@ class _PDFViewerState extends State<PDFViewer> {
     }
   }
 
-  _pickPage() {
-    showDialog<int>(
-        context: context,
-        builder: (BuildContext context) {
-          return PagePicker(
-            title: widget.tooltip.pick,
-            maxValue: widget.document.count,
-            initialValue: _pageNumber,
-          );
-        }).then((int? value) {
-      if (value != null) {
-        _pageNumber = value;
-        _jumpToPage();
-      }
-    });
+  Future<void> _pickPage() async {
+    final value = await showDialog<int?>(
+      context: context,
+      builder: (_) => PagePicker(
+        title: widget.tooltip.pick,
+        maxValue: widget.document.count,
+        initialValue: _pageNumber,
+      ),
+    );
+
+    if (value != null) {
+      _pageNumber = value;
+      _jumpToPage();
+    }
   }
 
   @override
@@ -225,11 +228,9 @@ class _PDFViewerState extends State<PDFViewer> {
             physics:
                 _swipeEnabled && widget.enableSwipeNavigation && !_isLoading
                     ? null
-                    : NeverScrollableScrollPhysics(),
+                    : const NeverScrollableScrollPhysics(),
             onPageChanged: (page) {
-              setState(() {
-                _pageNumber = page + 1;
-              });
+              setState(() => _pageNumber = page + 1);
               _loadPage();
               widget.onPageChanged?.call(page);
             },
@@ -238,28 +239,26 @@ class _PDFViewerState extends State<PDFViewer> {
             itemCount: _pages?.length ?? 0,
             itemBuilder: (context, index) => _pages![index] == null
                 ? Center(
-                    child:
-                        widget.progressIndicator ?? CircularProgressIndicator(),
+                    child: widget.progressIndicator ??
+                        const CircularProgressIndicator.adaptive(),
                   )
                 : _pages![index]!,
           ),
-          (widget.showIndicator && !_isLoading)
-              ? _drawIndicator()
-              : Container(),
+          if (widget.showIndicator && !_isLoading) _drawIndicator(),
         ],
       ),
       floatingActionButton: widget.showPicker && widget.document.count > 1
           ? FloatingActionButton(
               elevation: 4.0,
               tooltip: widget.tooltip.jump,
-              child: Icon(
-                Icons.view_carousel,
-                color: widget.pickerIconColor ?? Colors.white,
-              ),
               backgroundColor: widget.pickerButtonColor ?? Colors.blue,
               onPressed: () {
                 _pickPage();
               },
+              child: Icon(
+                Icons.view_carousel,
+                color: widget.pickerIconColor ?? Colors.white,
+              ),
             )
           : null,
       floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
@@ -273,12 +272,12 @@ class _PDFViewerState extends State<PDFViewer> {
                   _animateToPage,
                 )
               : BottomAppBar(
-                  child: new Row(
+                  child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: <Widget>[
                       Expanded(
                         child: IconButton(
-                          icon: Icon(Icons.first_page),
+                          icon: const Icon(Icons.first_page),
                           tooltip: widget.tooltip.first,
                           onPressed: _pageNumber == 1 || _isLoading
                               ? null
@@ -290,7 +289,7 @@ class _PDFViewerState extends State<PDFViewer> {
                       ),
                       Expanded(
                         child: IconButton(
-                          icon: Icon(Icons.chevron_left),
+                          icon: const Icon(Icons.chevron_left),
                           tooltip: widget.tooltip.previous,
                           onPressed: _pageNumber == 1 || _isLoading
                               ? null
@@ -303,12 +302,10 @@ class _PDFViewerState extends State<PDFViewer> {
                                 },
                         ),
                       ),
-                      widget.showPicker
-                          ? Expanded(child: Text(''))
-                          : SizedBox(width: 1),
+                      if (widget.showPicker) const Spacer(),
                       Expanded(
                         child: IconButton(
-                          icon: Icon(Icons.chevron_right),
+                          icon: const Icon(Icons.chevron_right),
                           tooltip: widget.tooltip.next,
                           onPressed:
                               _pageNumber == widget.document.count || _isLoading
@@ -324,7 +321,7 @@ class _PDFViewerState extends State<PDFViewer> {
                       ),
                       Expanded(
                         child: IconButton(
-                          icon: Icon(Icons.last_page),
+                          icon: const Icon(Icons.last_page),
                           tooltip: widget.tooltip.last,
                           onPressed:
                               _pageNumber == widget.document.count || _isLoading
diff --git a/lib/src/zoomable_widget.dart b/lib/src/zoomable_widget.dart
index eb14c6b..ad21205 100644
--- a/lib/src/zoomable_widget.dart
+++ b/lib/src/zoomable_widget.dart
@@ -4,43 +4,29 @@ import 'dart:math';
 import 'package:flutter/widgets.dart';
 
 class ZoomableWidget extends StatefulWidget {
-  ZoomableWidget({
+  const ZoomableWidget({
     Key? key,
-    this.minScale: 0.7,
-    this.maxScale: 1.4,
-    this.initialScale: 1.0,
-    this.initialOffset: Offset.zero,
-    this.initialRotation: 0.0,
-    this.enableZoom: true,
-    this.panLimit: 1.0,
-    this.singleFingerPan: true,
-    this.multiFingersPan: true,
-    this.enableRotate: false,
+    this.minScale = 0.7,
+    this.maxScale = 1.4,
+    this.initialScale = 1.0,
+    this.initialOffset = Offset.zero,
+    this.initialRotation = 0.0,
+    this.enableZoom = true,
+    this.panLimit = 1.0,
+    this.singleFingerPan = true,
+    this.multiFingersPan = true,
+    this.enableRotate = false,
     this.child,
     this.onTap,
-    this.zoomSteps: 0,
-    this.autoCenter: false,
-    this.bounceBackBoundary: true,
-    this.enableFling: true,
-    this.flingFactor: 1.0,
+    this.zoomSteps = 0,
+    this.autoCenter = false,
+    this.bounceBackBoundary = true,
+    this.enableFling = true,
+    this.flingFactor = 1.0,
     this.onZoomChanged,
-    this.resetDuration: const Duration(milliseconds: 250),
-    this.resetCurve: Curves.easeInOut,
-  })  : assert(minScale != null),
-        assert(maxScale != null),
-        assert(initialScale != null),
-        assert(initialOffset != null),
-        assert(initialRotation != null),
-        assert(enableZoom != null),
-        assert(panLimit != null),
-        assert(singleFingerPan != null),
-        assert(multiFingersPan != null),
-        assert(enableRotate != null),
-        assert(zoomSteps != null),
-        assert(autoCenter != null),
-        assert(bounceBackBoundary != null),
-        assert(enableFling != null),
-        assert(flingFactor != null);
+    this.resetDuration = const Duration(milliseconds: 250),
+    this.resetCurve = Curves.easeInOut,
+  }) : super(key: key);
 
   /// The minimum size for scaling.
   final double minScale;
@@ -133,7 +119,7 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
 
   void _onScaleStart(ScaleStartDetails details) {
     if (_childSize == Size.zero) {
-      final RenderBox renderbox = _key.currentContext!.findRenderObject() as RenderBox;
+      final renderbox = _key.currentContext!.findRenderObject()! as RenderBox;
       _childSize = renderbox.size;
     }
     setState(() {
@@ -145,44 +131,35 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
   }
 
   void _onScaleUpdate(ScaleUpdateDetails details) {
-    Size boundarySize = _boundarySize;
+    final boundarySize = _boundarySize;
 
-    Size _marginSize = const Size(100.0, 100.0);
+    const _marginSize = Size(100.0, 100.0);
 
     _duration = const Duration(milliseconds: 50);
     _curve = Curves.easeOut;
 
     setState(() {
-      if (widget.enableRotate)
-        _rotation = (_previousRotation + details.rotation).clamp(-pi, pi);
+      if (widget.enableRotate) _rotation = (_previousRotation + details.rotation).clamp(-pi, pi);
       if (widget.enableZoom && details.scale != 1.0) {
-        _zoom = (_previousZoom * details.scale)
-            .clamp(widget.minScale, widget.maxScale);
+        _zoom = (_previousZoom * details.scale).clamp(widget.minScale, widget.maxScale);
         if (widget.onZoomChanged != null) widget.onZoomChanged!(_zoom);
       }
     });
 
-    if ((widget.singleFingerPan && details.scale == 1.0) ||
-        (widget.multiFingersPan && details.scale != 1.0)) {
-      Offset _panRealOffset = (details.focalPoint -
-              _zoomOriginOffset +
-              _previousPanOffset * _previousZoom) /
-          _zoom;
+    if ((widget.singleFingerPan && details.scale == 1.0) || (widget.multiFingersPan && details.scale != 1.0)) {
+      final _panRealOffset = (details.focalPoint - _zoomOriginOffset + _previousPanOffset * _previousZoom) / _zoom;
 
       if (widget.panLimit == 0.0) {
         _pan = _panRealOffset;
       } else {
-        Offset _baseOffset = Offset(
-          _panRealOffset.dx
-              .clamp(-boundarySize.width / 2, boundarySize.width / 2),
-          _panRealOffset.dy
-              .clamp(-boundarySize.height / 2, boundarySize.height / 2),
+        final _baseOffset = Offset(
+          _panRealOffset.dx.clamp(-boundarySize.width / 2, boundarySize.width / 2),
+          _panRealOffset.dy.clamp(-boundarySize.height / 2, boundarySize.height / 2),
         );
 
         Offset _marginOffset = _panRealOffset - _baseOffset;
-        double _widthFactor = sqrt(_marginOffset.dx.abs()) / _marginSize.width;
-        double _heightFactor =
-            sqrt(_marginOffset.dy.abs()) / _marginSize.height;
+        final _widthFactor = sqrt(_marginOffset.dx.abs()) / _marginSize.width;
+        final _heightFactor = sqrt(_marginOffset.dy.abs()) / _marginSize.height;
         _marginOffset = Offset(
           _marginOffset.dx * _widthFactor * 2,
           _marginOffset.dy * _heightFactor * 2,
@@ -194,7 +171,7 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
   }
 
   void _onScaleEnd(ScaleEndDetails details) {
-    Size boundarySize = _boundarySize;
+    final boundarySize = _boundarySize;
 
     _duration = widget.resetDuration;
     _curve = widget.resetCurve;
@@ -204,8 +181,7 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
     if (magnitude > 800.0 * _zoom && widget.enableFling) {
       final Offset direction = velocity / magnitude;
       final double distance = (Offset.zero & context.size!).shortestSide;
-      final Offset endOffset =
-          _pan + direction * distance * widget.flingFactor * 0.5;
+      final Offset endOffset = _pan + direction * distance * widget.flingFactor * 0.5;
       _pan = Offset(
         endOffset.dx.clamp(-boundarySize.width / 2, boundarySize.width / 2),
         endOffset.dy.clamp(-boundarySize.height / 2, boundarySize.height / 2),
@@ -222,14 +198,13 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
   }
 
   Size get _boundarySize {
-    Size _boundarySize = Size(
+    final _boundarySize = Size(
           (_containerSize.width == _childSize.width)
               ? (_containerSize.width - _childSize.width / _zoom).abs()
               : (_containerSize.width - _childSize.width * _zoom).abs() / _zoom,
           (_containerSize.height == _childSize.height)
               ? (_containerSize.height - _childSize.height / _zoom).abs()
-              : (_containerSize.height - _childSize.height * _zoom).abs() /
-                  _zoom,
+              : (_containerSize.height - _childSize.height * _zoom).abs() / _zoom,
         ) *
         widget.panLimit;
 
@@ -242,8 +217,7 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
     _duration = widget.resetDuration;
     _curve = widget.resetCurve;
 
-    if (widget.zoomSteps > 0)
-      _stepLength = (widget.maxScale - 1.0) / widget.zoomSteps;
+    if (widget.zoomSteps > 0) _stepLength = (widget.maxScale - 1.0) / widget.zoomSteps;
 
     double _tmpZoom = _zoom + _stepLength;
     if (_tmpZoom > widget.maxScale || _stepLength == 0.0) _tmpZoom = 1.0;
@@ -263,7 +237,7 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
 
   @override
   Widget build(BuildContext context) {
-    if (widget.child == null) return SizedBox();
+    if (widget.child == null) return const SizedBox();
 
     return CustomMultiChildLayout(
       delegate: _ZoomableWidgetLayout(),
@@ -278,8 +252,7 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
             rotation: _rotation,
             child: LayoutBuilder(
               builder: (BuildContext context, BoxConstraints constraints) {
-                _containerSize =
-                    Size(constraints.maxWidth, constraints.maxHeight);
+                _containerSize = Size(constraints.maxWidth, constraints.maxHeight);
                 return Center(
                   child: Container(key: _key, child: widget.child),
                 );
@@ -290,12 +263,12 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
         LayoutId(
           id: _ZoomableWidgetLayout.gestureContainer,
           child: GestureDetector(
-            child: Container(color: Color(0)),
             onScaleStart: _onScaleStart,
             onScaleUpdate: _onScaleUpdate,
             onScaleEnd: widget.bounceBackBoundary ? _onScaleEnd : null,
             onDoubleTap: _handleDoubleTap,
             onTap: widget.onTap,
+            child: Container(color: const Color(0x00000000)),
           ),
         ),
       ],
@@ -306,16 +279,14 @@ class _ZoomableWidgetState extends State<ZoomableWidget> {
 class _ZoomableWidgetLayout extends MultiChildLayoutDelegate {
   _ZoomableWidgetLayout();
 
-  static final String gestureContainer = 'gesturecontainer';
-  static final String painter = 'painter';
+  static const String gestureContainer = 'gesturecontainer';
+  static const String painter = 'painter';
 
   @override
   void performLayout(Size size) {
-    layoutChild(gestureContainer,
-        BoxConstraints.tightFor(width: size.width, height: size.height));
+    layoutChild(gestureContainer, BoxConstraints.tightFor(width: size.width, height: size.height));
     positionChild(gestureContainer, Offset.zero);
-    layoutChild(painter,
-        BoxConstraints.tightFor(width: size.width, height: size.height));
+    layoutChild(painter, BoxConstraints.tightFor(width: size.width, height: size.height));
     positionChild(painter, Offset.zero);
   }
 
@@ -339,8 +310,7 @@ class _ZoomableChild extends ImplicitlyAnimatedWidget {
   final Widget child;
 
   @override
-  ImplicitlyAnimatedWidgetState<ImplicitlyAnimatedWidget> createState() =>
-      _ZoomableChildState();
+  ImplicitlyAnimatedWidgetState<ImplicitlyAnimatedWidget> createState() => _ZoomableChildState();
 }
 
 class _ZoomableChildState extends AnimatedWidgetBaseState<_ZoomableChild> {
@@ -350,24 +320,19 @@ class _ZoomableChildState extends AnimatedWidgetBaseState<_ZoomableChild> {
   DoubleTween? _rotation;
 
   @override
-  void forEachTween(visitor) {
-    _zoom = visitor(
-        _zoom, widget.zoom, (dynamic value) => DoubleTween(begin: value)) as DoubleTween?;
-    _panOffset = visitor(_panOffset, widget.panOffset,
-        (dynamic value) => OffsetTween(begin: value)) as OffsetTween?;
-    _rotation = visitor(_rotation, widget.rotation,
-        (dynamic value) => DoubleTween(begin: value)) as DoubleTween?;
+  void forEachTween(TweenVisitor<dynamic> visitor) {
+    _zoom = visitor(_zoom, widget.zoom, (dynamic value) => DoubleTween(begin: value as double?)) as DoubleTween?;
+    _panOffset = visitor(_panOffset, widget.panOffset, (dynamic value) => OffsetTween(begin: value as Offset?)) as OffsetTween?;
+    _rotation = visitor(_rotation, widget.rotation, (dynamic value) => DoubleTween(begin: value as double?)) as DoubleTween?;
   }
 
   @override
   Widget build(BuildContext context) {
     return Transform(
       alignment: Alignment.center,
-      origin: Offset(-(_panOffset!.evaluate(animation)?.dx ?? 0),
-          -(_panOffset!.evaluate(animation)?.dy ?? 0)),
+      origin: Offset(-(_panOffset!.evaluate(animation)?.dx ?? 0), -(_panOffset!.evaluate(animation)?.dy ?? 0)),
       transform: Matrix4.identity()
-        ..translate(_panOffset?.evaluate(animation)?.dx,
-            _panOffset?.evaluate(animation)?.dy ?? 0)
+        ..translate(_panOffset?.evaluate(animation)?.dx, _panOffset?.evaluate(animation)?.dy ?? 0)
         ..scale(_zoom!.evaluate(animation), _zoom!.evaluate(animation)),
       child: Transform.rotate(
         angle: _rotation!.evaluate(animation) ?? 0,
@@ -381,12 +346,12 @@ class DoubleTween extends Tween<double?> {
   DoubleTween({double? begin, double? end}) : super(begin: begin, end: end);
 
   @override
-  double lerp(double t) => (begin! + (end! - begin!) * t);
+  double lerp(double t) => begin! + (end! - begin!) * t;
 }
 
 class OffsetTween extends Tween<Offset?> {
   OffsetTween({Offset? begin, Offset? end}) : super(begin: begin, end: end);
 
   @override
-  Offset lerp(double t) => (begin! + (end! - begin!) * t);
+  Offset lerp(double t) => begin! + (end! - begin!) * t;
 }
diff --git a/pubspec.lock b/pubspec.lock
index 742a2bb..163ac25 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,13 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.2"
   async:
     dependency: transitive
     description:
@@ -21,7 +14,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -56,7 +49,7 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   file:
     dependency: transitive
     description:
@@ -75,7 +68,7 @@ packages:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.3.0"
   http:
     dependency: transitive
     description:
@@ -90,13 +83,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.2"
   infinite_listview:
     dependency: transitive
     description:
@@ -104,13 +90,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  lint:
+    dependency: "direct dev"
+    description:
+      name: lint
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   numberpicker:
     dependency: "direct main"
     description:
@@ -131,14 +124,28 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.8"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  path_provider_ios:
+    dependency: transitive
+    description:
+      name: path_provider_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.7"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.2"
   path_provider_macos:
     dependency: transitive
     description:
@@ -159,7 +166,7 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.4"
   pedantic:
     dependency: transitive
     description:
@@ -167,13 +174,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.11.0"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.1.0"
   platform:
     dependency: transitive
     description:
@@ -269,7 +269,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
@@ -284,13 +284,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.1.1"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
-  flutter: ">=1.24.0-10"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index b639174..f371b77 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,18 +1,21 @@
 name: advance_pdf_viewer
 description: A flutter plugin for handling PDF files. Works on both Android & iOS
-version: 2.0.0
+version: 2.0.1
 homepage: https://github.com/lohanidamodar/pdf_viewer
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.17.0 <2.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_cache_manager: ^3.0.2
+  flutter_cache_manager: ^3.3.0
   numberpicker: ^2.1.1
-  path_provider: ^2.0.1
+  path_provider: ^2.0.8
+
+dev_dependencies:
+  lint: ^1.5.3
 
 flutter:
   plugin: