diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index d802ea4..198ee0a 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,27 +1,26 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/ffi" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/wasm" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_gl" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_sql" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/async" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/cli" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/collection" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/convert" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/core" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/developer" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/ffi" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/html" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/indexed_db" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/io" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/js" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/js_util" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/math" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/svg" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/web_audio" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/web_gl" />
+      <root url="file://$USER_HOME$/DevTools/flutter/flutter-stable/bin/cache/dart-sdk/lib/web_sql" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index e27bedf..53449da 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -2,7 +2,6 @@
   <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
     <CLASSES>
       <root url="file://$PROJECT_DIR$" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-3.1.3" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b65c88d..4f0d6b7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?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 29 Platform" project-jdk-type="Android SDK" />
   <component name="ProjectType">
     <option name="id" value="io.flutter" />
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7b6c8cc..b3c04fe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,199 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+  </component>
   <component name="AndroidLogFilters">
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="53a09522-4d1a-44fe-8794-f932d2af4d5f" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.idea/workspace.xml" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/.dart_tool/" />
-    <ignored path="$PROJECT_DIR$/.pub/" />
-    <ignored path="$PROJECT_DIR$/build/" />
-    <ignored path="$PROJECT_DIR$/example/.dart_tool/" />
-    <ignored path="$PROJECT_DIR$/example/.pub/" />
-    <ignored path="$PROJECT_DIR$/example/build/" />
-    <ignored path="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.dart_tool/" />
-    <ignored path="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/.pub/" />
-    <ignored path="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/build/" />
-    <ignored path="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/example/.dart_tool/" />
-    <ignored path="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/example/.pub/" />
-    <ignored path="$PROJECT_DIR$/example/ios/.symlinks/plugins/airplane_mode_detection/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="ChangesViewManager">
+    <option name="groupingKeys">
+      <option value="directory" />
+    </option>
+  </component>
   <component name="DefaultGradleProjectSettings">
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_29" />
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/airplane_mode_detection.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="18" selection-start-line="18" selection-end-line="18" />
-            </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="885">
-              <caret line="64" column="91" selection-start-line="64" selection-start-column="73" selection-end-line="64" selection-end-column="91" />
-              <folding>
-                <element signature="e#0#39#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="8" column="3" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[SerialNumber@ae19a056]" />
   <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$/android/src/main/java/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.java" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/ios/Classes/SwiftAirplaneModeDetectionPlugin.swift" />
-        <option value="$PROJECT_DIR$/example/lib/main.dart" />
-        <option value="$PROJECT_DIR$/lib/airplane_mode_detection.dart" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="23" />
-    <option name="width" value="840" />
-    <option name="height" value="975" />
-  </component>
+  <component name="ProjectId" id="1vP2RBgXiI6uItRXdwH5NXKXdqm" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="airplane_mode_detection_example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter_airplane_mode_detection" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_airplane_mode_detection" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <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 name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/android/src/main/kotlin/flutter" />
+      <recent name="$PROJECT_DIR$/android/src/main/kotlin" />
+    </key>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -216,105 +79,28 @@
       <is-autoscroll-to-source value="true" />
     </todo-panel>
   </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1680" height="975" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2753358" />
-      <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="Resources Explorer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Favorites" order="8" side_tool="true" />
-      <window_info anchor="bottom" id="Dart Analysis" order="0" />
-      <window_info anchor="bottom" id="Run" order="1" weight="0.37485844" />
-      <window_info anchor="bottom" id="TODO" order="2" weight="0.3297362" />
-      <window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Logcat" order="4" weight="0.3297362" />
-      <window_info anchor="bottom" id="Debug" order="5" />
-      <window_info anchor="bottom" id="Terminal" order="6" weight="0.3295583" />
-      <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.3297362" />
-      <window_info anchor="bottom" id="Find" order="10" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.3295583" />
-      <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="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.packages" />
-    <entry file="file://$PROJECT_DIR$/android/src/main/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="22" column="74" selection-start-line="22" selection-start-column="74" selection-end-line="22" selection-end-column="74" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#606#607#0" expanded="true" />
-            <element signature="e#649#650#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="2" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/airplane_mode_detection_test.dart" />
-    <entry file="file://$PROJECT_DIR$/ios/Classes/SwiftAirplaneModeDetectionPlugin.swift" />
-    <entry file="file://$PROJECT_DIR$/lib/airplane_mode_detection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="885">
-          <caret line="64" column="91" selection-start-line="64" selection-start-column="73" selection-end-line="64" selection-end-column="91" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/java/flutter/moum/airplane_mode_detection_example/MainActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="3" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+  <component name="WindowStateProjectService">
+    <state x="100" y="53" width="1720" height="923" key="DiffContextDialog" timestamp="1626452177453">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="100" y="53" width="1720" height="923" key="DiffContextDialog/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1626452177453" />
+    <state x="100" y="77" width="1720" height="901" key="DiffContextDialog/0.25.1920.1055/1920.25.1280.999@0.25.1920.1055" timestamp="1626451762136" />
+    <state x="0" y="25" key="FileDocumentManager.FileCacheConflict" timestamp="1626449658343">
+      <screen x="0" y="25" width="1920" height="1055" />
+    </state>
+    <state x="0" y="25" key="FileDocumentManager.FileCacheConflict/0.25.1920.1055/1920.25.1280.999@0.25.1920.1055" timestamp="1626449658343" />
+    <state x="538" y="163" key="RollbackChangesDialog" timestamp="1626453226429">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="538" y="163" key="RollbackChangesDialog/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1626453226429" />
+    <state x="538" y="163" key="RollbackChangesDialog/0.0.1920.1080/1920.25.1280.999@0.0.1920.1080" timestamp="1626451680825" />
+    <state x="660" y="279" width="600" height="522" key="find.popup" timestamp="1626451088247">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="660" y="279" width="600" height="522" key="find.popup/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1626451088247" />
+    <state x="625" y="241" width="670" height="676" key="search.everywhere.popup" timestamp="1626601656863">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="625" y="241" width="670" height="676" key="search.everywhere.popup/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1626601656863" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53fd5c1..362536b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,3 +6,8 @@
 
 * Plugin update
 
+## 2.0.0-nullsafety
+
+* Add Null Safety
+* Fix Deprecated APIs
+
diff --git a/android/airplane_mode_detection_android.iml b/android/airplane_mode_detection_android.iml
deleted file mode 100644
index ccde066..0000000
--- a/android/airplane_mode_detection_android.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/src/main/libs" />
-        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/src/main/proguard_logs" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Flutter for Android" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 94fa4f0..f1f0b3a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,13 +2,15 @@ group 'flutter.moum.airplane_mode_detection'
 version '1.0'
 
 buildscript {
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -20,15 +22,19 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    lintOptions {
-        disable 'InvalidPackage'
     }
 }
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
diff --git a/android/gradle.properties b/android/gradle.properties
index 2bd6f4f..94adc3a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,2 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
similarity index 100%
rename from example/android/gradle/wrapper/gradle-wrapper.jar
rename to android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 019065d..3c9d085 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/example/android/gradlew b/android/gradlew
old mode 100644
new mode 100755
similarity index 100%
rename from example/android/gradlew
rename to android/gradlew
diff --git a/example/android/gradlew.bat b/android/gradlew.bat
old mode 100644
new mode 100755
similarity index 96%
rename from example/android/gradlew.bat
rename to android/gradlew.bat
index 8a0b282..aec9973
--- a/example/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/local.properties b/android/local.properties
deleted file mode 100644
index 6111f08..0000000
--- a/android/local.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-sdk.dir=C:\\Users\\samsung\\AppData\\Local\\Android\\Sdk
-flutter.sdk=C:\\flutter
\ No newline at end of file
diff --git a/android/src/main/java/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.java b/android/src/main/java/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.java
deleted file mode 100644
index 5992888..0000000
--- a/android/src/main/java/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package flutter.moum.airplane_mode_detection;
-
-import android.os.Build;
-import android.provider.Settings;
-
-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;
-
-/** AirplaneModeDetectionPlugin */
-public class AirplaneModeDetectionPlugin implements MethodCallHandler {
-  /** Plugin registration. */
-  private Registrar mRegistrar;
-
-  private AirplaneModeDetectionPlugin(Registrar registrar){
-      this.mRegistrar = registrar;
-  }
-
-  public static void registerWith(Registrar registrar) {
-    final MethodChannel channel = new MethodChannel(registrar.messenger(), "airplane_mode_detection");
-    channel.setMethodCallHandler(new AirplaneModeDetectionPlugin(registrar));
-  }
-
-    @Override
-    public void onMethodCall(MethodCall call, Result result) {
-        if (call.method.equals("getPlatformVersion")) {
-            result.success("Android " + android.os.Build.VERSION.RELEASE);
-        }else if (call.method.equals("detectAirplaneMode")) {
-            if(isAirModeOn())
-                result.success("ON");
-            else
-                result.success("OFF");
-        } else {
-            result.notImplemented();
-        }
-    }
-
-    private Boolean isAirModeOn() {
-        Boolean isAirplaneMode;
-        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1){
-            isAirplaneMode = Settings.System.getInt(mRegistrar.context().getContentResolver(),
-                    Settings.System.AIRPLANE_MODE_ON, 0) == 1;
-        }else{
-            isAirplaneMode = Settings.Global.getInt(mRegistrar.context().getContentResolver(),
-                    Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
-        }
-        return isAirplaneMode;
-    }
-}
diff --git a/android/src/main/kotlin/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.kt b/android/src/main/kotlin/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.kt
new file mode 100644
index 0000000..b4e256e
--- /dev/null
+++ b/android/src/main/kotlin/flutter/moum/airplane_mode_detection/AirplaneModeDetectionPlugin.kt
@@ -0,0 +1,50 @@
+package flutter.moum.airplane_mode_detection;
+
+import android.content.Context
+import android.os.Build
+import android.provider.Settings.Global
+import android.provider.Settings.System
+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
+
+/** FlutterAirplaneModeDetectionPlugin */
+class AirplaneModeDetectionPlugin : FlutterPlugin, MethodCallHandler {
+    private lateinit var context: Context
+
+    /// 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 lateinit var channel: MethodChannel
+
+    override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        channel = MethodChannel(flutterPluginBinding.binaryMessenger, "airplane_mode_detection")
+        channel.setMethodCallHandler(this)
+        context = flutterPluginBinding.applicationContext
+    }
+
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+        if (call.method == "detectAirplaneMode") {
+            result.success(if (isAirplaneModeOn()) "ON" else "OFF")
+        } else {
+            result.notImplemented()
+        }
+    }
+
+    override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+        channel.setMethodCallHandler(null)
+    }
+
+
+    private fun isAirplaneModeOn(): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            return System.getInt(context.contentResolver, System.AIRPLANE_MODE_ON, 0) == 1
+        }
+
+        return Global.getInt(context.contentResolver, Global.AIRPLANE_MODE_ON, 0) == 1
+    }
+}
diff --git a/android/src/main/kotlin/flutter/moum/flutter_airplane_mode_detection/FlutterAirplaneModeDetectionPlugin.kt b/android/src/main/kotlin/flutter/moum/flutter_airplane_mode_detection/FlutterAirplaneModeDetectionPlugin.kt
new file mode 100644
index 0000000..efefa6b
--- /dev/null
+++ b/android/src/main/kotlin/flutter/moum/flutter_airplane_mode_detection/FlutterAirplaneModeDetectionPlugin.kt
@@ -0,0 +1,35 @@
+package flutter.moum.flutter_airplane_mode_detection
+
+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
+
+/** FlutterAirplaneModeDetectionPlugin */
+class FlutterAirplaneModeDetectionPlugin: FlutterPlugin, MethodCallHandler {
+  /// 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 lateinit var channel : MethodChannel
+
+  override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "flutter_airplane_mode_detection")
+    channel.setMethodCallHandler(this)
+  }
+
+  override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    if (call.method == "getPlatformVersion") {
+      result.success("Android ${android.os.Build.VERSION.RELEASE}")
+    } else {
+      result.notImplemented()
+    }
+  }
+
+  override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+    channel.setMethodCallHandler(null)
+  }
+}
diff --git a/example/.flutter-plugins b/example/.flutter-plugins
deleted file mode 100644
index b0f991a..0000000
--- a/example/.flutter-plugins
+++ /dev/null
@@ -1,2 +0,0 @@
-airplane_mode_detection=/Users/chokyungjin/Documents/GitHub/flutter_airplane_mode_detection/
-fluttertoast=/Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-3.1.3/
diff --git a/example/.gitignore b/example/.gitignore
index 2ddde2a..0fa6b67 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -22,52 +22,25 @@
 
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
 /build/
 
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
+# Web related
+lib/generated_plugin_registrant.dart
 
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
+# Symbolication related
+app.*.symbols
 
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/example/.idea/libraries/Dart_SDK.xml b/example/.idea/libraries/Dart_SDK.xml
deleted file mode 100644
index 333a382..0000000
--- a/example/.idea/libraries/Dart_SDK.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<component name="libraryTable">
-  <library name="Dart SDK">
-    <CLASSES>
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://C:\flutter/bin/cache/dart-sdk/lib/typed_data" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/example/.idea/libraries/Flutter_for_Android.xml b/example/.idea/libraries/Flutter_for_Android.xml
deleted file mode 100644
index 172b967..0000000
--- a/example/.idea/libraries/Flutter_for_Android.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Flutter for Android">
-    <CLASSES>
-      <root url="jar://C:\flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
diff --git a/example/.idea/libraries/KotlinJavaRuntime.xml b/example/.idea/libraries/KotlinJavaRuntime.xml
deleted file mode 100644
index 2b96ac4..0000000
--- a/example/.idea/libraries/KotlinJavaRuntime.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="KotlinJavaRuntime">
-    <CLASSES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
diff --git a/example/.idea/modules.xml b/example/.idea/modules.xml
deleted file mode 100644
index d923546..0000000
--- a/example/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/airplane_mode_detection_example.iml" filepath="$PROJECT_DIR$/airplane_mode_detection_example.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android/airplane_mode_detection_example_android.iml" filepath="$PROJECT_DIR$/android/airplane_mode_detection_example_android.iml" />
-    </modules>
-  </component>
-</project>
diff --git a/example/.idea/runConfigurations/main_dart.xml b/example/.idea/runConfigurations/main_dart.xml
deleted file mode 100644
index aab7b5c..0000000
--- a/example/.idea/runConfigurations/main_dart.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/example/.idea/workspace.xml b/example/.idea/workspace.xml
deleted file mode 100644
index 5b3388c..0000000
--- a/example/.idea/workspace.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="ToolWindowManager">
-    <editor active="true" />
-    <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-    </layout>
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <option name="show-excluded-files" value="false" />
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="dart.analysis.tool.window.force.activate" value="true" />
-    <property name="show.migrate.to.gradle.popup" value="false" />
-  </component>
-</project>
diff --git a/example/.packages b/example/.packages
deleted file mode 100644
index a5c8213..0000000
--- a/example/.packages
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by pub on 2019-10-09 18:09:19.118568.
-airplane_mode_detection:../lib/
-archive:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.10/lib/
-args:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.2/lib/
-async:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.3.0/lib/
-boolean_selector:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.5/lib/
-charcode:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib/
-collection:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib/
-convert:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/
-crypto:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.3/lib/
-cupertino_icons:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib/
-flutter:file:///Users/chokyungjin/flutter/packages/flutter/lib/
-flutter_test:file:///Users/chokyungjin/flutter/packages/flutter_test/lib/
-fluttertoast:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-3.1.3/lib/
-image:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.4/lib/
-matcher:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.5/lib/
-meta:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.7/lib/
-path:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/
-pedantic:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.8.0+1/lib/
-petitparser:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/lib/
-quiver:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.5/lib/
-sky_engine:file:///Users/chokyungjin/flutter/bin/cache/pkg/sky_engine/lib/
-source_span:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5/lib/
-stack_trace:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib/
-stream_channel:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/lib/
-string_scanner:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/
-term_glyph:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/
-test_api:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.5/lib/
-typed_data:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/
-vector_math:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib/
-xml:file:///Users/chokyungjin/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.5.0/lib/
-airplane_mode_detection_example:lib/
diff --git a/example/android/.gitignore b/example/android/.gitignore
new file mode 100644
index 0000000..0a741cb
--- /dev/null
+++ b/example/android/.gitignore
@@ -0,0 +1,11 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
diff --git a/example/android/.gradle/4.10.2/fileChanges/last-build.bin b/example/android/.gradle/4.10.2/fileChanges/last-build.bin
deleted file mode 100644
index f76dd23..0000000
Binary files a/example/android/.gradle/4.10.2/fileChanges/last-build.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/fileContent/fileContent.lock b/example/android/.gradle/4.10.2/fileContent/fileContent.lock
deleted file mode 100644
index 2a7d21e..0000000
Binary files a/example/android/.gradle/4.10.2/fileContent/fileContent.lock and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/fileHashes/fileHashes.bin b/example/android/.gradle/4.10.2/fileHashes/fileHashes.bin
deleted file mode 100644
index d3c5d4d..0000000
Binary files a/example/android/.gradle/4.10.2/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/fileHashes/fileHashes.lock b/example/android/.gradle/4.10.2/fileHashes/fileHashes.lock
deleted file mode 100644
index 62cd554..0000000
Binary files a/example/android/.gradle/4.10.2/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin b/example/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index 1c9ad77..0000000
Binary files a/example/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/gc.properties b/example/android/.gradle/4.10.2/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/example/android/.gradle/4.10.2/javaCompile/classAnalysis.bin b/example/android/.gradle/4.10.2/javaCompile/classAnalysis.bin
deleted file mode 100644
index 78cd282..0000000
Binary files a/example/android/.gradle/4.10.2/javaCompile/classAnalysis.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin b/example/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin
deleted file mode 100644
index 9bfe4e3..0000000
Binary files a/example/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/javaCompile/javaCompile.lock b/example/android/.gradle/4.10.2/javaCompile/javaCompile.lock
deleted file mode 100644
index 85ff960..0000000
Binary files a/example/android/.gradle/4.10.2/javaCompile/javaCompile.lock and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/javaCompile/taskHistory.bin b/example/android/.gradle/4.10.2/javaCompile/taskHistory.bin
deleted file mode 100644
index 1731503..0000000
Binary files a/example/android/.gradle/4.10.2/javaCompile/taskHistory.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/taskHistory/taskHistory.bin b/example/android/.gradle/4.10.2/taskHistory/taskHistory.bin
deleted file mode 100644
index e07444b..0000000
Binary files a/example/android/.gradle/4.10.2/taskHistory/taskHistory.bin and /dev/null differ
diff --git a/example/android/.gradle/4.10.2/taskHistory/taskHistory.lock b/example/android/.gradle/4.10.2/taskHistory/taskHistory.lock
deleted file mode 100644
index 476a0c5..0000000
Binary files a/example/android/.gradle/4.10.2/taskHistory/taskHistory.lock and /dev/null differ
diff --git a/example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 177e5d3..0000000
Binary files a/example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/example/android/.gradle/buildOutputCleanup/cache.properties b/example/android/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index 3f2fd01..0000000
--- a/example/android/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Wed Oct 09 14:08:04 KST 2019
-gradle.version=4.10.2
diff --git a/example/android/.gradle/buildOutputCleanup/outputFiles.bin b/example/android/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 547068b..0000000
Binary files a/example/android/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ
diff --git a/example/android/.gradle/vcs-1/gc.properties b/example/android/.gradle/vcs-1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/example/android/airplane_mode_detection_example_android.iml b/example/android/airplane_mode_detection_example_android.iml
deleted file mode 100644
index 467f2eb..0000000
--- a/example/android/airplane_mode_detection_example_android.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/app/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/app/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/app/src/main/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/app/src/main/libs" />
-        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/app/src/main/proguard_logs" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/app/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Flutter for Android" level="project" />
-  </component>
-</module>
\ No newline at end of file
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
deleted file mode 100644
index 079cabf..0000000
--- a/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.flutter.plugins;
-
-import io.flutter.plugin.common.PluginRegistry;
-import flutter.moum.airplane_mode_detection.AirplaneModeDetectionPlugin;
-import io.github.ponnamkarthik.toast.fluttertoast.FluttertoastPlugin;
-
-/**
- * Generated file. Do not edit.
- */
-public final class GeneratedPluginRegistrant {
-  public static void registerWith(PluginRegistry registry) {
-    if (alreadyRegisteredWith(registry)) {
-      return;
-    }
-    AirplaneModeDetectionPlugin.registerWith(registry.registrarFor("flutter.moum.airplane_mode_detection.AirplaneModeDetectionPlugin"));
-    FluttertoastPlugin.registerWith(registry.registrarFor("io.github.ponnamkarthik.toast.fluttertoast.FluttertoastPlugin"));
-  }
-
-  private static boolean alreadyRegisteredWith(PluginRegistry registry) {
-    final String key = GeneratedPluginRegistrant.class.getCanonicalName();
-    if (registry.hasPlugin(key)) {
-      return true;
-    }
-    registry.registrarFor(key);
-    return false;
-  }
-}
diff --git a/example/android/app/src/main/kotlin/flutter/moum/flutter_airplane_mode_detection_example/MainActivity.kt b/example/android/app/src/main/kotlin/flutter/moum/flutter_airplane_mode_detection_example/MainActivity.kt
new file mode 100644
index 0000000..3ffb166
--- /dev/null
+++ b/example/android/app/src/main/kotlin/flutter/moum/flutter_airplane_mode_detection_example/MainActivity.kt
@@ -0,0 +1,6 @@
+package flutter.moum.flutter_airplane_mode_detection_example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/example/android/app/src/main/res/values-night/styles.xml b/example/android/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..449a9f9
--- /dev/null
+++ b/example/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/example/android/local.properties b/example/android/local.properties
deleted file mode 100644
index 481874c..0000000
--- a/example/android/local.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-sdk.dir=/Users/chokyungjin/Library/Android/sdk
-flutter.sdk=/Users/chokyungjin/flutter
-flutter.buildMode=debug
\ No newline at end of file
diff --git a/example/build/app.dill.track.dill b/example/build/app.dill.track.dill
deleted file mode 100644
index 90ebba1..0000000
Binary files a/example/build/app.dill.track.dill and /dev/null differ
diff --git a/example/build/frontend_server.d b/example/build/frontend_server.d
deleted file mode 100644
index 1e1e06f..0000000
--- a/example/build/frontend_server.d
+++ /dev/null
@@ -1 +0,0 @@
-frontend_server.d: /Users/chokyungjin/flutter/bin/cache/artifacts/engine/darwin-x64/frontend_server.dart.snapshot
diff --git a/example/build/last_build_run.json b/example/build/last_build_run.json
deleted file mode 100644
index 07c650e..0000000
--- a/example/build/last_build_run.json
+++ /dev/null
@@ -1 +0,0 @@
-["--track-widget-creation"]
\ No newline at end of file
diff --git a/example/ios/.gitignore b/example/ios/.gitignore
new file mode 100644
index 0000000..151026b
--- /dev/null
+++ b/example/ios/.gitignore
@@ -0,0 +1,33 @@
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/ephemeral/
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3
diff --git a/example/ios/Flutter/Generated.xcconfig b/example/ios/Flutter/Generated.xcconfig
deleted file mode 100644
index f0ae856..0000000
--- a/example/ios/Flutter/Generated.xcconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-// This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/chokyungjin/flutter
-FLUTTER_APPLICATION_PATH=/Users/chokyungjin/Documents/GitHub/flutter_airplane_mode_detection/example
-FLUTTER_TARGET=/Users/chokyungjin/Documents/GitHub/flutter_airplane_mode_detection/example/lib/main.dart
-FLUTTER_BUILD_DIR=build
-SYMROOT=${SOURCE_ROOT}/../build/ios
-FLUTTER_FRAMEWORK_DIR=/Users/chokyungjin/flutter/bin/cache/artifacts/engine/ios
-FLUTTER_BUILD_NAME=1.0.0
-FLUTTER_BUILD_NUMBER=1
-TRACK_WIDGET_CREATION=true
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
deleted file mode 100755
index 2e126ee..0000000
--- a/example/ios/Flutter/flutter_export_environment.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/chokyungjin/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/chokyungjin/Documents/GitHub/flutter_airplane_mode_detection/example"
-export "FLUTTER_TARGET=/Users/chokyungjin/Documents/GitHub/flutter_airplane_mode_detection/example/lib/main.dart"
-export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "FLUTTER_FRAMEWORK_DIR=/Users/chokyungjin/flutter/bin/cache/artifacts/engine/ios"
-export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1"
-export "TRACK_WIDGET_CREATION=true"
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..f9b0d7c
--- /dev/null
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?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>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..f9b0d7c
--- /dev/null
+++ b/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?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>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/example/ios/Runner/GeneratedPluginRegistrant.h b/example/ios/Runner/GeneratedPluginRegistrant.h
deleted file mode 100644
index 3b700eb..0000000
--- a/example/ios/Runner/GeneratedPluginRegistrant.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-#ifndef GeneratedPluginRegistrant_h
-#define GeneratedPluginRegistrant_h
-
-#import <Flutter/Flutter.h>
-
-@interface GeneratedPluginRegistrant : NSObject
-+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
-@end
-
-#endif /* GeneratedPluginRegistrant_h */
diff --git a/example/ios/Runner/GeneratedPluginRegistrant.m b/example/ios/Runner/GeneratedPluginRegistrant.m
deleted file mode 100644
index d953e96..0000000
--- a/example/ios/Runner/GeneratedPluginRegistrant.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-#import "GeneratedPluginRegistrant.h"
-#import <airplane_mode_detection/AirplaneModeDetectionPlugin.h>
-#import <fluttertoast/FluttertoastPlugin.h>
-
-@implementation GeneratedPluginRegistrant
-
-+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
-  [AirplaneModeDetectionPlugin registerWithRegistrar:[registry registrarForPlugin:@"AirplaneModeDetectionPlugin"]];
-  [FluttertoastPlugin registerWithRegistrar:[registry registrarForPlugin:@"FluttertoastPlugin"]];
-}
-
-@end
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 5a2df3b..b5c386b 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,63 +7,49 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.10"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.2"
+    version: "2.0.0-nullsafety"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
-  charcode:
+    version: "2.1.0"
+  characters:
     dependency: transitive
     description:
-      name: charcode
+      name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
-  collection:
+    version: "1.1.0"
+  charcode:
     dependency: transitive
     description:
-      name: collection
+      name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
-  convert:
+    version: "1.2.0"
+  clock:
     dependency: transitive
     description:
-      name: convert
+      name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.1.0"
+  collection:
     dependency: transitive
     description:
-      name: crypto
+      name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "1.15.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -71,6 +57,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.2"
+  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
@@ -81,62 +74,46 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  fluttertoast:
+  flutter_web_plugins:
     dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  fluttertoast:
+    dependency: "direct main"
     description:
       name: fluttertoast
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
-  image:
+    version: "8.0.7"
+  js:
     dependency: transitive
     description:
-      name: image
+      name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "0.6.3"
   matcher:
     dependency: transitive
     description:
       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.3.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"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
-  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
@@ -148,62 +125,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.3.0"
   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"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.5.0"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=2.0.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 4d328f9..f6b89a7 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -12,6 +12,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
+  fluttertoast: ^8.0.7
 
 dev_dependencies:
   flutter_test:
diff --git a/example/airplane_mode_detection_example.iml b/flutter_airplane_mode_detection.iml
similarity index 86%
rename from example/airplane_mode_detection_example.iml
rename to flutter_airplane_mode_detection.iml
index e5c8371..429df7d 100644
--- a/example/airplane_mode_detection_example.iml
+++ b/flutter_airplane_mode_detection.iml
@@ -4,15 +4,16 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <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/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/ios/.gitignore b/ios/.gitignore
index aa479fd..0c88507 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -34,4 +34,5 @@ Icon?
 .tags*
 
 /Flutter/Generated.xcconfig
+/Flutter/ephemeral/
 /Flutter/flutter_export_environment.sh
\ No newline at end of file
diff --git a/lib/airplane_mode_detection.dart b/lib/airplane_mode_detection.dart
index 6e63484..abd1434 100644
--- a/lib/airplane_mode_detection.dart
+++ b/lib/airplane_mode_detection.dart
@@ -6,13 +6,9 @@ class AirplaneModeDetection {
   static const MethodChannel _channel =
       const MethodChannel('airplane_mode_detection');
 
-  static Future<String> get platformVersion async {
-    final String version = await _channel.invokeMethod('getPlatformVersion');
-    return version;
-  }
+  static Future<String> get platformVersion async =>
+      (await _channel.invokeMethod('getPlatformVersion'))!;
 
-  static Future<String> detectAirplaneMode() async {
-    final String airplanemode = await _channel.invokeMethod('detectAirplaneMode');
-    return airplanemode;
-  }
+  static Future<String> detectAirplaneMode() async =>
+      (await _channel.invokeMethod('detectAirplaneMode'))!;
 }
diff --git a/lib/flutter_airplane_mode_detection.dart b/lib/flutter_airplane_mode_detection.dart
new file mode 100644
index 0000000..d297ce7
--- /dev/null
+++ b/lib/flutter_airplane_mode_detection.dart
@@ -0,0 +1,14 @@
+
+import 'dart:async';
+
+import 'package:flutter/services.dart';
+
+class FlutterAirplaneModeDetection {
+  static const MethodChannel _channel =
+      const MethodChannel('flutter_airplane_mode_detection');
+
+  static Future<String?> get platformVersion async {
+    final String? version = await _channel.invokeMethod('getPlatformVersion');
+    return version;
+  }
+}
diff --git a/pubspec.lock b/pubspec.lock
index c7cff9d..9e82bb7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,62 +1,55 @@
 # 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: "2.0.10"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.6.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"
-  collection:
+    version: "1.2.0"
+  clock:
     dependency: transitive
     description:
-      name: collection
+      name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
-  convert:
+    version: "1.1.0"
+  collection:
     dependency: transitive
     description:
-      name: convert
+      name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.15.0"
+  fake_async:
     dependency: transitive
     description:
-      name: crypto
+      name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -67,62 +60,27 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  fluttertoast:
-    dependency: "direct main"
-    description:
-      name: fluttertoast
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.3"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       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.3.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"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
-  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
@@ -134,62 +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.3.0"
   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"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.5.0"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 97c6904..05e59a0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,16 +1,15 @@
 name: airplane_mode_detection
 description: Flutter plugin that allows you to detect and check mobile airplane mode callback functions on iOS and Android.
-version: 1.0.0
-author: chokyungjin<chokj1472@gmail.com>, moonyoungCHAE<Xpf_fl@naver.com>, FlutterMoum Group<fluttermoum@gmail.com>
+version: 2.0.0-nullsafety
 homepage: https://github.com/flutter-moum/flutter_airplane_mode_detection_
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
+  flutter: '>=2.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  fluttertoast: ^7.0.4
 
 dev_dependencies:
   flutter_test:
@@ -26,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: flutter.moum.airplane_mode_detection
-    pluginClass: AirplaneModeDetectionPlugin
+    platforms:
+      android:
+        package: flutter.moum.airplane_mode_detection
+        pluginClass: AirplaneModeDetectionPlugin
+      ios:
+        pluginClass: AirplaneModeDetectionPlugin
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets:
diff --git a/test/flutter_airplane_mode_detection_test.dart b/test/flutter_airplane_mode_detection_test.dart
new file mode 100644
index 0000000..f3cebe7
--- /dev/null
+++ b/test/flutter_airplane_mode_detection_test.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_airplane_mode_detection/flutter_airplane_mode_detection.dart';
+
+void main() {
+  const MethodChannel channel = MethodChannel('flutter_airplane_mode_detection');
+
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUp(() {
+    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+      return '42';
+    });
+  });
+
+  tearDown(() {
+    channel.setMockMethodCallHandler(null);
+  });
+
+  test('getPlatformVersion', () async {
+    expect(await FlutterAirplaneModeDetection.platformVersion, '42');
+  });
+}