diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 5b80310..b54adb1 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,17 +1,26 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://C:/FlutterSDK/flutter/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/async" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/cli" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/collection" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/convert" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/core" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/developer" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/ffi" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/html" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/indexed_db" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/io" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/js" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/js_util" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/math" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/svg" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/web_audio" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/web_gl" />
+      <root url="file://G:/flutter/bin/cache/dart-sdk/lib/web_sql" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dfda312..ceac72e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <type id="android" />
+  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Android API 22 Platform" project-jdk-type="Android SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b40cb42..5100a54 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,297 +3,51 @@
   <component name="AndroidLogFilters">
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
   </component>
+  <component name="BranchesTreeState">
+    <expand>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </expand>
+    <select />
+  </component>
   <component name="ChangeListManager">
-    <list default="true" id="8cd5033f-b00c-497c-981a-e7515066adb1" name="Default Changelist" comment="Revert: success.png">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README_CN.md" beforeDir="false" afterPath="$PROJECT_DIR$/README_CN.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/lib/dialog/alert_dialog.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/dialog/alert_dialog.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/lib/dialog/notice_dialog.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/dialog/notice_dialog.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/flutter_custom_dialog.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/flutter_custom_dialog.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" 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" />
+    <list default="true" id="8cd5033f-b00c-497c-981a-e7515066adb1" name="Default Changelist" comment="" />
     <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="-604530121">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="dart" value="1" />
-          <entry key="gitignore" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Dart" value="1" />
-          <entry key="PLAIN_TEXT" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dart" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="Dart" value="1" />
-        </counts>
-      </usages-collector>
-    </session>
-    <session id="2142450520">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="4" />
-          <entry key="project.open.time.0" value="1" />
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.6" value="1" />
-          <entry key="project.opened" value="7" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="dart" value="274" />
-          <entry key="md" value="241" />
-          <entry key="txt" value="16" />
-          <entry key="yaml" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="Dart" value="274" />
-          <entry key="PLAIN_TEXT" value="257" />
-          <entry key="YAML" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="dart" value="6" />
-          <entry key="java" value="2" />
-          <entry key="md" value="7" />
-          <entry key="yaml" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Dart" value="6" />
-          <entry key="JAVA" value="2" />
-          <entry key="PLAIN_TEXT" value="7" />
-          <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="false">
-        <entry file="file://$PROJECT_DIR$/lib/flutter_custom_dialog.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="359">
-              <caret line="25" column="20" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README_CN.md">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="42">
-              <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1068">
-              <caret line="63" column="14" selection-start-line="63" selection-start-column="14" selection-end-line="63" selection-end-column="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/dialog/notice_dialog.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="3" selection-start-line="3" selection-end-line="34" selection-end-column="1" />
-              <folding>
-                <element signature="e#0#39#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/dialog/alert_dialog.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="359">
-              <caret line="493" column="6" selection-start-line="493" selection-start-column="6" selection-end-line="493" selection-end-column="6" />
-              <folding>
-                <element signature="e#0#39#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-599">
-              <caret line="87" column="38" selection-start-line="87" selection-start-column="38" selection-end-line="87" selection-end-column="38" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/flutter_custom_dialog_widget.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#0#39#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>SNAPSHOTSNAPSHOT</find>
-      <find>SNAPSHOT</find>
-      <find>showNotice</find>
-      <find>animatedFunc</find>
-      <find>showC</find>
-      <find>scaleIn</find>
-    </findStrings>
-  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[71e357bd]" />
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RESET_MODE" value="MIXED" />
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/test/flutter_custom_dialog_test.dart" />
-        <option value="$PROJECT_DIR$/example/lib/dialog/notice_dialog.dart" />
-        <option value="$PROJECT_DIR$/example/lib/dialog/alert_dialog.dart" />
-        <option value="$PROJECT_DIR$/example/lib/main.dart" />
-        <option value="$PROJECT_DIR$/lib/flutter_custom_dialog.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/README_CN.md" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1912" />
-    <option name="y" value="-243" />
-    <option name="width" value="1096" />
-    <option name="height" value="1896" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="AndroidView" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="flutter-custom-dialog" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-custom-dialog" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter-custom-dialog" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-custom-dialog" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter-custom-dialog" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-custom-dialog" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter-custom-dialog" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-custom-dialog" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="dialog" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter-custom-dialog" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-custom-dialog" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-        <option name="show-excluded-files" value="false" />
-      </pane>
-    </panes>
+  <component name="ProjectId" id="1zoK36Pgj92azm2wGX13q2s15Qq" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SearchEverywhereHistoryKey" value="FlutterP&#9;PSI&#9;JAVA://yy.inc.flutter_custom_dialog.FlutterCustomDialogPlugin" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
+    <property name="dart.analysis.tool.window.visible" value="false" />
     <property name="io.flutter.reload.alreadyRun" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <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>
@@ -319,41 +73,30 @@
       <option name="project" value="LOCAL" />
       <updated>1571837363555</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="#Migrate to null safety v1.1.0">
+      <created>1629115967010</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1629115967010</updated>
+    </task>
+    <task id="LOCAL-00004" summary="try to fix Android V2 embedding">
+      <created>1634888281195</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1634888281195</updated>
+    </task>
+    <task id="LOCAL-00005" summary="try to fix Android V2 embedding">
+      <created>1634889158582</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1634889158582</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
-  <component name="ToolWindowManager">
-    <frame x="1912" y="-243" width="1096" height="1896" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17953669" />
-      <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" weight="0.32962137" />
-      <window_info anchor="bottom" id="Run" order="1" visible="true" weight="0.3298791" />
-      <window_info anchor="bottom" id="TODO" order="2" />
-      <window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Logcat" order="4" weight="0.3298791" />
-      <window_info anchor="bottom" id="Debug" order="5" />
-      <window_info anchor="bottom" id="Terminal" order="6" weight="0.3298791" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Flutter Performance" order="8" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.3529073" />
-      <window_info active="true" anchor="bottom" id="Messages" order="10" visible="true" weight="0.22853957" />
-      <window_info anchor="bottom" id="Find" order="11" weight="0.3298791" />
-      <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="Vcs.Log.History.Properties">
     <option name="COLUMN_ORDER">
       <list>
@@ -370,122 +113,54 @@
         <entry key="MAIN">
           <value>
             <State>
-              <option name="RECENTLY_FILTERED_USER_GROUPS">
-                <collection />
-              </option>
-              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-                <collection />
-              </option>
-              <option name="COLUMN_ORDER">
-                <list>
-                  <option value="0" />
-                  <option value="1" />
-                  <option value="2" />
-                  <option value="3" />
-                </list>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
               </option>
             </State>
           </value>
         </entry>
       </map>
     </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="HEAD" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Revert: success.png" />
     <MESSAGE value="Revert: yaml" />
-    <option name="LAST_COMMIT_MESSAGE" value="Revert: yaml" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/flutter_custom_dialog_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/yy/inc/flutter_custom_dialog/FlutterCustomDialogPlugin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/flutter_custom_dialog_widget.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-599">
-          <caret line="87" column="38" selection-start-line="87" selection-start-column="38" selection-end-line="87" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/dialog/notice_dialog.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" selection-start-line="3" selection-end-line="34" selection-end-column="1" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/flutter_custom_dialog.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="359">
-          <caret line="25" column="20" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/dialog/alert_dialog.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="359">
-          <caret line="493" column="6" selection-start-line="493" selection-start-column="6" selection-end-line="493" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README_CN.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1068">
-          <caret line="63" column="14" selection-start-line="63" selection-start-column="14" selection-end-line="63" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
+    <MESSAGE value="#Migrate to null safety v1.1.0" />
+    <MESSAGE value="try to fix Android V2 embedding" />
+    <option name="LAST_COMMIT_MESSAGE" value="try to fix Android V2 embedding" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1662602810227">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040/1920.0.1080.1880@0.0.1920.1040" timestamp="1662602810227" />
+    <state x="753" y="433" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1662602812692">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="753" y="433" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.0.1080.1880@0.0.1920.1040" timestamp="1662602812692" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0231a5..de32932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,4 +77,24 @@
 
 ## 1.0.19
 
-* fix a padding bug
\ No newline at end of file
+* fix a padding bug
+
+## 1.0.20
+
+* add a useRootNavigator property
+
+## 1.0.21
+
+* Add SpaceEvenly Gravity
+
+## 1.1.0
+
+* Migrate to null safety
+
+## 1.1.1
+
+* try to fix Android V2 embedding
+
+## 1.2.0
+
+* fix Android V2 embedding
\ No newline at end of file
diff --git a/README.md b/README.md
index 19ef156..ea40c23 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![pub package](https://img.shields.io/pub/v/flutter_custom_dialog.svg)](https://pub.dev/packages/flutter_custom_dialog)
 
-**[Lanuage ~~]** [English](README.md) | [中文文档](README_CN.md)
+**[Language ~~]** [English](README.md) | [中文文档](README_CN.md)
 
 Global dialog function encapsulation, with a semantic way to fill the content inside the dialog, the current function provided
 
@@ -17,7 +17,7 @@ Global dialog function encapsulation, with a semantic way to fill the content in
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.19
+  flutter_custom_dialog: ^1.3.0
 ```
 
 **2、import**
@@ -278,6 +278,7 @@ animatedFunc|Animation of dialog|Emerge from the middle
 showCallBack|dialog show callbacks|not
 dismissCallBack|dialog dismiss callbacks|not
 barrierDismissible|Whether to click to pop up the external disappear|true
+useRootNavigator|Whether to use root navigation|true
 
 * After setting gravity, set gravityAnimationEnable = true if animation is needed
 * If the decoration property is set, the backgroundColor and borderRadius are not in effect; they are mutually exclusive
diff --git a/README_CN.md b/README_CN.md
index 539ca47..f502f6c 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -15,7 +15,7 @@
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.19
+  flutter_custom_dialog: ^1.3.0
 ```
 
 **2、import**
@@ -276,6 +276,7 @@ animatedFunc|弹窗出现的动画|从中间出现
 showCallBack|弹窗展示的回调|无
 dismissCallBack|弹窗消失的回调|无
 barrierDismissible|是否点击弹出外部消失|true
+useRootNavigator|是否使用根导航|true
 
 * 设置完gravity后，若需要动画则设置gravityAnimationEnable = true
 * 若设置decoration属性，则backgroundColor和borderRadius不生效，他们是互斥关系
diff --git a/android/build.gradle b/android/build.gradle
index 464905f..4b2409a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,7 +25,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 20
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/android/gradle.properties b/android/gradle.properties
index 2bd6f4f..e60119f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,2 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
 
diff --git a/android/src/main/java/yy/inc/flutter_custom_dialog/FlutterCustomDialogPlugin.java b/android/src/main/java/yy/inc/flutter_custom_dialog/FlutterCustomDialogPlugin.java
index b708bf4..c901469 100644
--- a/android/src/main/java/yy/inc/flutter_custom_dialog/FlutterCustomDialogPlugin.java
+++ b/android/src/main/java/yy/inc/flutter_custom_dialog/FlutterCustomDialogPlugin.java
@@ -1,25 +1,35 @@
 package yy.inc.flutter_custom_dialog;
 
+import androidx.annotation.NonNull;
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
 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;
 
 /** FlutterCustomDialogPlugin */
-public class FlutterCustomDialogPlugin implements MethodCallHandler {
-  /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
-    final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter_custom_dialog");
-    channel.setMethodCallHandler(new FlutterCustomDialogPlugin());
+public class FlutterCustomDialogPlugin implements FlutterPlugin, MethodCallHandler {
+
+  private MethodChannel channel;
+
+  @Override
+  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+    channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "flutter_custom_dialog");
+    channel.setMethodCallHandler(this);
   }
 
   @Override
-  public void onMethodCall(MethodCall call, Result result) {
+  public void onMethodCall(@NonNull MethodCall call, @NonNull  Result result) {
     if (call.method.equals("getPlatformVersion")) {
       result.success("Android " + android.os.Build.VERSION.RELEASE);
     } else {
       result.notImplemented();
     }
   }
+
+  @Override
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {
+    channel.setMethodCallHandler(null);
+  }
 }
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
new file mode 100644
index 0000000..b4f3407
--- /dev/null
+++ b/example/.flutter-plugins-dependencies
@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_custom_dialog","path":"C:\\\\YYLive4-OpenSource\\\\flutter-custom-dialog\\\\","dependencies":[]}],"android":[{"name":"flutter_custom_dialog","path":"C:\\\\YYLive4-OpenSource\\\\flutter-custom-dialog\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_custom_dialog","dependencies":[]}],"date_created":"2022-09-08 10:51:06.169356","version":"2.5.3"}
\ No newline at end of file
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 37e040a..29dbb25 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "yy.inc.flutter_custom_dialog_example"
-        minSdkVersion 16
+        minSdkVersion 20
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index a7cbfba..0063516 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="flutter_custom_dialog_example"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -22,12 +21,18 @@
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
             <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+            <meta-data
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>
diff --git a/example/android/app/src/main/java/yy/inc/flutter_custom_dialog_example/MainActivity.java b/example/android/app/src/main/java/yy/inc/flutter_custom_dialog_example/MainActivity.java
index 5c5a420..eaf5cf2 100644
--- a/example/android/app/src/main/java/yy/inc/flutter_custom_dialog_example/MainActivity.java
+++ b/example/android/app/src/main/java/yy/inc/flutter_custom_dialog_example/MainActivity.java
@@ -1,13 +1,7 @@
 package yy.inc.flutter_custom_dialog_example;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
+
 }
diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml
index 00fa441..9fa09fc 100644
--- a/example/android/app/src/main/res/values/styles.xml
+++ b/example/android/app/src/main/res/values/styles.xml
@@ -5,4 +5,8 @@
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
 </resources>
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 2bd6f4f..94adc3a 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,2 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
index 29b4ef4..a6ae7d7 100755
--- a/example/ios/Flutter/flutter_export_environment.sh
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,8 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=C:\FlutterSDK\flutter"
-export "FLUTTER_APPLICATION_PATH=C:\YYLive4-OpenSource\flutter-custom-dialog\flutter_custom_dialog\example"
+export "FLUTTER_ROOT=G:\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\YYLive4-OpenSource\flutter-custom-dialog\example"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build\ios"
-export "FLUTTER_FRAMEWORK_DIR=C:\FlutterSDK\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"
diff --git a/example/lib/dialog/develop_dialog.dart b/example/lib/dialog/develop_dialog.dart
new file mode 100644
index 0000000..16e8898
--- /dev/null
+++ b/example/lib/dialog/develop_dialog.dart
@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_dialog/flutter_custom_dialog.dart';
+
+YYDialog YYFixTextFieldDialog() {
+  return YYDialog().build()
+    ..width = 120
+    ..height = 110
+    ..backgroundColor = Colors.white
+    ..borderRadius = 10.0
+    ..gravity = Gravity.bottom
+    ..widget(
+      Padding(
+        padding: EdgeInsets.all(24),
+        child: TextField(),
+      ),
+    )
+    ..show();
+}
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 2a6d449..2d7693f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -8,6 +8,8 @@ import 'package:flutter_custom_dialog_example/dialog/progress_dialog.dart';
 import 'package:flutter_custom_dialog_example/dialog/notice_dialog.dart';
 import 'package:flutter_custom_dialog/flutter_custom_dialog.dart';
 
+import 'dialog/develop_dialog.dart';
+
 void main() => runApp(MyApp());
 
 var titleTextStyle = TextStyle(fontSize: 22, color: Colors.black);
@@ -72,7 +74,7 @@ showAlertDialog(BuildContext context) {
         ),
         Row(
           children: <Widget>[
-            makeTextButton("bottomsheet", () {
+            makeTextButton("bottom\nsheet", () {
               YYBottomSheetDialog();
             }),
             makeTextButton("progress", () {
@@ -201,6 +203,12 @@ showAlertDialog(BuildContext context) {
                 doubleButtonGravity: Gravity.center,
               );
             }),
+            makeTextButton("space\nEvenly", () {
+              YYAlertDialogWithGravity(
+                width: 250.0,
+                doubleButtonGravity: Gravity.spaceEvenly,
+              );
+            }),
           ],
         ),
         Text("5、dialog animation"),
@@ -237,7 +245,7 @@ showDevelopDialog(BuildContext context) {
         Text("1、debug"),
         Row(
           children: <Widget>[
-            makeTextButton("fix dismiss\nbug in v1.0.1", () {
+            makeTextButton("fix dismiss\nbug", () {
               Navigator.push(
                 context,
                 MaterialPageRoute(
@@ -258,6 +266,9 @@ showDevelopDialog(BuildContext context) {
                         )),
               );
             }),
+            makeTextButton("fix textfield", () {
+              YYFixTextFieldDialog();
+            }),
           ],
         ),
       ],
@@ -267,7 +278,7 @@ showDevelopDialog(BuildContext context) {
 
 Widget makeTextButton(title, Function() function) {
   return SizedBox(
-    width: 70.0,
+    width: 65.0,
     height: 35.0,
     child: RaisedButton(
       padding: EdgeInsets.all(0.0),
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 10ee4b2..0197b10 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,35 +7,56 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.1.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.3.1"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.15.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -47,7 +68,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.20"
+    version: "1.1.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -59,35 +80,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.7"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
+    version: "1.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -99,55 +106,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.10.0"
diff --git a/lib/flutter_custom_dialog.dart b/lib/flutter_custom_dialog.dart
index fb480e3..63686ca 100644
--- a/lib/flutter_custom_dialog.dart
+++ b/lib/flutter_custom_dialog.dart
@@ -7,26 +7,31 @@ export 'package:flutter_custom_dialog/flutter_custom_dialog.dart';
 class YYDialog {
   //================================弹窗属性======================================
   List<Widget> widgetList = []; //弹窗内部所有组件
-  static BuildContext _context; //弹窗上下文
-  BuildContext context; //弹窗上下文
+  static BuildContext? _context; //弹窗上下文
+  BuildContext? context; //弹窗上下文
 
-  double width; //弹窗宽度
-  double height; //弹窗高度
+  double? width; //弹窗宽度
+  double? height; //弹窗高度
   Duration duration = Duration(milliseconds: 250); //弹窗动画出现的时间
   Gravity gravity = Gravity.center; //弹窗出现的位置
   bool gravityAnimationEnable = false; //弹窗出现的位置带有的默认动画是否可用
   Color barrierColor = Colors.black.withOpacity(.3); //弹窗外的背景色
-  BoxConstraints constraints; //弹窗约束
-  Function(Widget child, Animation<double> animation) animatedFunc; //弹窗出现的动画
+  BoxConstraints? constraints; //弹窗约束
+  Function(Widget child, Animation<double> animation)? animatedFunc; //弹窗出现的动画
   bool barrierDismissible = true; //是否点击弹出外部消失
   EdgeInsets margin = EdgeInsets.all(0.0); //弹窗布局的外边距
 
-  Decoration decoration; //弹窗内的装饰，与backgroundColor和borderRadius互斥
+  /// 用于有多个navigator嵌套的情况，默认为true
+  /// @params useRootNavigator=false，push是用的是当前布局的context
+  /// @params useRootNavigator=true，push是用的嵌套根布局的context
+  bool useRootNavigator = true;
+
+  Decoration? decoration; //弹窗内的装饰，与backgroundColor和borderRadius互斥
   Color backgroundColor = Colors.white; //弹窗内的背景色
   double borderRadius = 0.0; //弹窗圆角
 
-  Function() showCallBack; //展示的回调
-  Function() dismissCallBack; //消失的回调
+  Function()? showCallBack; //展示的回调
+  Function()? dismissCallBack; //消失的回调
 
   get isShowing => _isShowing; //当前 弹窗是否可见
   bool _isShowing = false;
@@ -36,7 +41,7 @@ class YYDialog {
     _context = ctx;
   }
 
-  YYDialog build([BuildContext ctx]) {
+  YYDialog build([BuildContext? ctx]) {
     if (ctx == null && _context != null) {
       this.context = _context;
       return this;
@@ -96,13 +101,15 @@ class YYDialog {
     fontSize1,
     fontWeight1,
     fontFamily1,
-    VoidCallback onTap1,
+    VoidCallback? onTap1,
+    buttonPadding1 = const EdgeInsets.all(0.0),
     text2,
     color2,
     fontSize2,
     fontWeight2,
     fontFamily2,
     onTap2,
+    buttonPadding2 = const EdgeInsets.all(0.0),
   }) {
     return this.widget(
       SizedBox(
@@ -110,44 +117,48 @@ class YYDialog {
         child: Row(
           mainAxisAlignment: getRowMainAxisAlignment(gravity),
           children: <Widget>[
-            FlatButton(
+            TextButton(
               onPressed: () {
                 if (onTap1 != null) onTap1();
                 if (isClickAutoDismiss) {
                   dismiss();
                 }
               },
-              padding: EdgeInsets.all(0.0),
-              child: Text(
-                text1 ?? "",
-                style: TextStyle(
-                  color: color1 ?? null,
-                  fontSize: fontSize1 ?? null,
+              style: TextButton.styleFrom(
+                primary: color1 ?? Colors.black,
+                padding: buttonPadding1,
+                textStyle: TextStyle(
+                  fontSize: fontSize1 ?? 18.0,
                   fontWeight: fontWeight1,
                   fontFamily: fontFamily1,
-                ),
+                )
+              ),
+              child: Text(
+                text1 ?? "",
               ),
             ),
             Visibility(
               visible: withDivider,
               child: VerticalDivider(),
             ),
-            FlatButton(
+            TextButton(
               onPressed: () {
                 if (onTap2 != null) onTap2();
                 if (isClickAutoDismiss) {
                   dismiss();
                 }
               },
-              padding: EdgeInsets.all(0.0),
+              style: TextButton.styleFrom(
+                primary: color2 ?? Colors.black,
+                padding: buttonPadding2,
+                textStyle: TextStyle(
+                fontSize: fontSize2 ?? 14.0,
+                fontWeight: fontWeight2,
+                fontFamily: fontFamily2,
+                ),
+              ),
               child: Text(
                 text2 ?? "",
-                style: TextStyle(
-                  color: color2 ?? Colors.black,
-                  fontSize: fontSize2 ?? 14.0,
-                  fontWeight: fontWeight2,
-                  fontFamily: fontFamily2,
-                ),
               ),
             )
           ],
@@ -157,10 +168,10 @@ class YYDialog {
   }
 
   YYDialog listViewOfListTile({
-    List<ListTileItem> items,
-    double height,
+    List<ListTileItem>? items,
+    double? height,
     isClickAutoDismiss = true,
-    Function(int) onClickItemListener,
+    Function(int)? onClickItemListener,
   }) {
     return this.widget(
       Container(
@@ -168,7 +179,7 @@ class YYDialog {
         child: ListView.builder(
           padding: EdgeInsets.all(0.0),
           shrinkWrap: true,
-          itemCount: items.length,
+          itemCount: items?.length ?? 0,
           itemBuilder: (BuildContext context, int index) {
             return Material(
               color: Colors.white,
@@ -182,15 +193,15 @@ class YYDialog {
                       dismiss();
                     }
                   },
-                  contentPadding: items[index].padding ?? EdgeInsets.all(0.0),
-                  leading: items[index].leading,
+                  contentPadding: items?[index].padding ?? EdgeInsets.all(0.0),
+                  leading: items?[index].leading,
                   title: Text(
-                    items[index].text ?? "",
+                    items?[index].text ?? "",
                     style: TextStyle(
-                      color: items[index].color ?? null,
-                      fontSize: items[index].fontSize ?? null,
-                      fontWeight: items[index].fontWeight,
-                      fontFamily: items[index].fontFamily,
+                      color: items?[index].color ?? null,
+                      fontSize: items?[index].fontSize ?? null,
+                      fontWeight: items?[index].fontWeight,
+                      fontFamily: items?[index].fontFamily,
                     ),
                   ),
                 ),
@@ -203,14 +214,14 @@ class YYDialog {
   }
 
   YYDialog listViewOfRadioButton({
-    List<RadioItem> items,
-    double height,
-    Color color,
-    Color activeColor,
-    int intialValue,
-    Function(int) onClickItemListener,
+    List<RadioItem>? items,
+    double? height,
+    Color? color,
+    Color? activeColor,
+    int? intialValue,
+    Function(int)? onClickItemListener,
   }) {
-    Size size = MediaQuery.of(context).size;
+    Size size = MediaQuery.of(context!).size;
     return this.widget(
       Container(
         height: height,
@@ -263,7 +274,7 @@ class YYDialog {
     CustomDialog(
       gravity: gravity,
       gravityAnimationEnable: gravityAnimationEnable,
-      context: this.context,
+      context: this.context!,
       barrierColor: barrierColor,
       animatedFunc: animatedFunc,
       barrierDismissible: barrierDismissible,
@@ -293,13 +304,9 @@ class YYDialog {
                   isShowingChange: (bool isShowingChange) {
                     // showing or dismiss Callback
                     if (isShowingChange) {
-                      if (showCallBack != null) {
-                        showCallBack();
-                      }
+                      showCallBack?.call();
                     } else {
-                      if (dismissCallBack != null) {
-                        dismissCallBack();
-                      }
+                      dismissCallBack?.call();
                     }
                     _isShowing = isShowingChange;
                   },
@@ -314,7 +321,7 @@ class YYDialog {
 
   void dismiss() {
     if (_isShowing) {
-      Navigator.of(context, rootNavigator: true).pop();
+      Navigator.of(context!, rootNavigator: useRootNavigator).pop();
     }
   }
 
@@ -381,6 +388,9 @@ class YYDialog {
       case Gravity.right:
         mainAxisAlignment = MainAxisAlignment.end;
         break;
+      case Gravity.spaceEvenly:
+        mainAxisAlignment = MainAxisAlignment.spaceEvenly;
+        break;
       case Gravity.center:
       default:
         mainAxisAlignment = MainAxisAlignment.center;
@@ -393,7 +403,7 @@ class YYDialog {
 ///弹窗的内容作为可变组件
 class CustomDialogChildren extends StatefulWidget {
   final List<Widget> widgetList; //弹窗内部所有组件
-  final Function(bool) isShowingChange;
+  final Function(bool)? isShowingChange;
 
   CustomDialogChildren({this.widgetList = const [], this.isShowingChange});
 
@@ -404,7 +414,9 @@ class CustomDialogChildren extends StatefulWidget {
 class CustomDialogChildState extends State<CustomDialogChildren> {
   @override
   Widget build(BuildContext context) {
-    widget.isShowingChange(true);
+    if (widget.isShowingChange != null) {
+      widget.isShowingChange!(true);
+    }
     return Column(
       children: widget.widgetList,
     );
@@ -412,7 +424,9 @@ class CustomDialogChildState extends State<CustomDialogChildren> {
 
   @override
   void dispose() {
-    widget.isShowingChange(false);
+    if (widget.isShowingChange != null) {
+      widget.isShowingChange!(false);
+    }
     super.dispose();
   }
 }
@@ -421,24 +435,24 @@ class CustomDialogChildState extends State<CustomDialogChildren> {
 class CustomDialog {
   BuildContext _context;
   Widget _child;
-  Duration _duration;
-  Color _barrierColor;
-  RouteTransitionsBuilder _transitionsBuilder;
-  bool _barrierDismissible;
-  Gravity _gravity;
+  Duration? _duration;
+  Color? _barrierColor;
+  RouteTransitionsBuilder? _transitionsBuilder;
+  bool? _barrierDismissible;
+  Gravity? _gravity;
   bool _gravityAnimationEnable;
-  Function _animatedFunc;
+  Function? _animatedFunc;
 
   CustomDialog({
-    @required Widget child,
-    @required BuildContext context,
-    Duration duration,
-    Color barrierColor,
-    RouteTransitionsBuilder transitionsBuilder,
-    Gravity gravity,
-    bool gravityAnimationEnable,
-    Function animatedFunc,
-    bool barrierDismissible,
+    required Widget child,
+    required BuildContext context,
+    Duration? duration,
+    Color? barrierColor,
+    RouteTransitionsBuilder? transitionsBuilder,
+    Gravity? gravity,
+    bool gravityAnimationEnable = false,
+    Function? animatedFunc,
+    bool? barrierDismissible,
   })  : _child = child,
         _context = context,
         _gravity = gravity,
@@ -521,7 +535,7 @@ class CustomDialog {
 
     //自定义动画
     if (_animatedFunc != null) {
-      return _animatedFunc(child, animation);
+      return _animatedFunc!(child, animation);
     }
 
     //不需要默认动画
@@ -550,6 +564,7 @@ enum Gravity {
   leftTop,
   rightBottom,
   leftBottom,
+  spaceEvenly,
 }
 //============================================================================
 
@@ -565,13 +580,13 @@ class ListTileItem {
     this.fontFamily,
   });
 
-  EdgeInsets padding;
-  Widget leading;
-  String text;
-  Color color;
-  double fontSize;
-  FontWeight fontWeight;
-  String fontFamily;
+  EdgeInsets? padding;
+  Widget? leading;
+  String? text;
+  Color? color;
+  double? fontSize;
+  FontWeight? fontWeight;
+  String? fontFamily;
 }
 
 class RadioItem {
@@ -584,11 +599,11 @@ class RadioItem {
     this.onTap,
   });
 
-  EdgeInsets padding;
-  String text;
-  Color color;
-  double fontSize;
-  FontWeight fontWeight;
-  Function(int) onTap;
+  EdgeInsets? padding;
+  String? text;
+  Color? color;
+  double? fontSize;
+  FontWeight? fontWeight;
+  Function(int)? onTap;
 }
 //============================================================================
diff --git a/lib/flutter_custom_dialog_widget.dart b/lib/flutter_custom_dialog_widget.dart
index 4978476..9114a9d 100644
--- a/lib/flutter_custom_dialog_widget.dart
+++ b/lib/flutter_custom_dialog_widget.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
 
 import 'package:flutter_custom_dialog/flutter_custom_dialog.dart';
@@ -5,7 +7,7 @@ export 'package:flutter_custom_dialog/flutter_custom_dialog_widget.dart';
 
 class YYRadioListTile extends StatefulWidget {
   YYRadioListTile({
-    Key key,
+    Key? key,
     this.items,
     this.intialValue,
     this.color,
@@ -14,11 +16,11 @@ class YYRadioListTile extends StatefulWidget {
   })  : assert(items != null),
         super(key: key);
 
-  final List<RadioItem> items;
-  final Color color;
-  final Color activeColor;
+  final List<RadioItem>? items;
+  final Color? color;
+  final Color? activeColor;
   final intialValue;
-  final Function(int) onChanged;
+  final Function(int)? onChanged;
 
   @override
   State<StatefulWidget> createState() {
@@ -45,19 +47,28 @@ class YYRadioListTileState extends State<YYRadioListTile> {
     return ListView.builder(
       padding: EdgeInsets.all(0.0),
       shrinkWrap: true,
-      itemCount: widget.items.length,
+      itemCount: widget.items?.length ?? 0,
       itemBuilder: (BuildContext context, int index) {
         return Material(
           color: widget.color,
           child: RadioListTile(
-            title: Text(widget.items[index].text),
+            title: Text(
+              widget.items?[index].text ?? "",
+              style: TextStyle(
+                  fontSize: widget.items?[index].fontSize ?? 14,
+                  fontWeight:
+                      widget.items?[index].fontWeight ?? FontWeight.normal,
+                  color: widget.items?[index].color ?? Colors.black),
+            ),
             value: index,
             groupValue: groupId,
             activeColor: widget.activeColor,
-            onChanged: (int value) {
+            onChanged: (int? value) {
               setState(() {
-                widget.onChanged(value);
-                groupId = value;
+                if (widget.onChanged != null) {
+                  widget.onChanged!(value ?? 0);
+                }
+                groupId = value ?? -1;
               });
             },
           ),
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..c154f3d
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Aug 16 16:54:26 CST 2021
+sdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk
diff --git a/pubspec.lock b/pubspec.lock
index aebdafa..4fe6b9f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,28 +7,49 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.1.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.3.1"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.15.0"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -45,35 +66,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.7"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
+    version: "1.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -85,55 +92,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.10.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 220c3ed..0f7102b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: flutter_custom_dialog
 description: Semantic dialog | Made In YY.inc | Welcome to contribute
-version: 1.0.19
-author: AndroidHensen <xyj510402535@qq.com>
+version: 1.3.0
 homepage: https://github.com/YYFlutter/flutter-custom-dialog.git
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=1.10.0"
 
 dependencies:
   flutter:
@@ -25,8 +25,12 @@ flutter:
   # be modified. They are used by the tooling to maintain consistency when
   # adding or updating assets for this project.
   plugin:
-    androidPackage: yy.inc.flutter_custom_dialog
-    pluginClass: FlutterCustomDialogPlugin
+    platforms:
+      android:
+        package: yy.inc.flutter_custom_dialog
+        pluginClass: FlutterCustomDialogPlugin
+      ios:
+        pluginClass: FlutterCustomDialogPlugin
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets: